From 3d507e98409af91c9b8cadec511f6e5d253bdbed Mon Sep 17 00:00:00 2001
From: Robert Swain <rob@matrix.org>
Date: Fri, 21 Apr 2017 00:05:52 +0200
Subject: [PATCH 001/312] (Room)?Avatar: Request 96x96 avatars on high DPI
 screens

---
 src/Avatar.js                              |  9 +++++----
 src/components/views/avatars/RoomAvatar.js | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index 76f5e55ff0..cb5e6965e3 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -22,8 +22,8 @@ module.exports = {
     avatarUrlForMember: function(member, width, height, resizeMethod) {
         var url = member.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
-            width,
-            height,
+            window.devicePixelRatio > 1.2 ? 96 : width,
+            window.devicePixelRatio > 1.2 ? 96 : height,
             resizeMethod,
             false,
             false
@@ -40,7 +40,9 @@ module.exports = {
     avatarUrlForUser: function(user, width, height, resizeMethod) {
         var url = ContentRepo.getHttpUriForMxc(
             MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
-            width, height, resizeMethod
+            window.devicePixelRatio > 1.2 ? 96 : width,
+            window.devicePixelRatio > 1.2 ? 96 : height,
+            resizeMethod
         );
         if (!url || url.length === 0) {
             return null;
@@ -57,4 +59,3 @@ module.exports = {
         return 'img/' + images[total % images.length] + '.png';
     }
 };
-
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index bfa7575b0c..7ed7bfa9fa 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -59,7 +59,9 @@ module.exports = React.createClass({
             ContentRepo.getHttpUriForMxc(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 props.oobData.avatarUrl,
-                props.width, props.height, props.resizeMethod
+                window.devicePixelRatio > 1.2 ? 96 : props.width,
+                window.devicePixelRatio > 1.2 ? 96 : props.height,
+                props.resizeMethod
             ), // highest priority
             this.getRoomAvatarUrl(props),
             this.getOneToOneAvatar(props),
@@ -74,7 +76,9 @@ module.exports = React.createClass({
 
         return props.room.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
-            props.width, props.height, props.resizeMethod,
+            window.devicePixelRatio > 1.2 ? 96 : props.width,
+            window.devicePixelRatio > 1.2 ? 96 : props.height,
+            props.resizeMethod,
             false
         );
     },
@@ -103,14 +107,18 @@ module.exports = React.createClass({
             }
             return theOtherGuy.getAvatarUrl(
                 MatrixClientPeg.get().getHomeserverUrl(),
-                props.width, props.height, props.resizeMethod,
+                window.devicePixelRatio > 1.2 ? 96 : props.width,
+                window.devicePixelRatio > 1.2 ? 96 : props.height,
+                props.resizeMethod,
                 false
             );
         } else if (userIds.length == 1) {
             return mlist[userIds[0]].getAvatarUrl(
                 MatrixClientPeg.get().getHomeserverUrl(),
-                props.width, props.height, props.resizeMethod,
-                    false
+                window.devicePixelRatio > 1.2 ? 96 : props.width,
+                window.devicePixelRatio > 1.2 ? 96 : props.height,
+                props.resizeMethod,
+                false
             );
         } else {
            return null;

From 8308555489448b956236dde3bcbedcd32be3b5d2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Apr 2017 12:12:37 +0100
Subject: [PATCH 002/312] Mark sync param as optional so that my IDE will stop
 complaining.

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

diff --git a/src/dispatcher.js b/src/dispatcher.js
index 9864cb3807..f3ebed8357 100644
--- a/src/dispatcher.js
+++ b/src/dispatcher.js
@@ -16,13 +16,13 @@ limitations under the License.
 
 'use strict';
 
-var flux = require("flux");
+const flux = require("flux");
 
 class MatrixDispatcher extends flux.Dispatcher {
     /**
      * @param {Object} payload Required. The payload to dispatch.
      *        Must contain at least an 'action' key.
-     * @param {boolean} sync Optional. Pass true to dispatch
+     * @param {boolean=} sync Optional. Pass true to dispatch
      *        synchronously. This is useful for anything triggering
      *        an operation that the browser requires user interaction
      *        for.

From f200e349c9f7b23b28441871abf94bcfe0d08f94 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Apr 2017 12:50:36 +0100
Subject: [PATCH 003/312] Add .idea to .gitignore file so I don't accidentally
 upload my IDE config

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5139d614ad..7006c02403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ npm-debug.log
 
 # test reports created by karma
 /karma-reports
+
+/.idea

From b6ca16fc2f73704536bf93b05db2eeaef040bc98 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Apr 2017 12:56:59 +0100
Subject: [PATCH 004/312] add RoomView state for message being forwarded add
 RoomView action handler for message forward clear forwardingMessage
 onCancelClick RoomView change var into const in render RoomView load
 ForwardMessage from rooms.ForwardMessage if there is a messageForwarding
 object in state show panel in aux

Create ForwardMessage class

Modify RoomHeader so that it shows the cancel button more greedily

reskindex

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/component-index.js                       |  2 +
 src/components/structures/RoomView.js        | 48 ++++++----
 src/components/views/rooms/ForwardMessage.js | 95 ++++++++++++++++++++
 src/components/views/rooms/RoomHeader.js     |  3 +
 4 files changed, 129 insertions(+), 19 deletions(-)
 create mode 100644 src/components/views/rooms/ForwardMessage.js

diff --git a/src/component-index.js b/src/component-index.js
index d6873c6dfd..b9f358467e 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -183,6 +183,8 @@ import views$rooms$EntityTile from './components/views/rooms/EntityTile';
 views$rooms$EntityTile && (module.exports.components['views.rooms.EntityTile'] = views$rooms$EntityTile);
 import views$rooms$EventTile from './components/views/rooms/EventTile';
 views$rooms$EventTile && (module.exports.components['views.rooms.EventTile'] = views$rooms$EventTile);
+import views$rooms$ForwardMessage from './components/views/rooms/ForwardMessage';
+views$rooms$ForwardMessage && (module.exports.components['views.rooms.ForwardMessage'] = views$rooms$ForwardMessage);
 import views$rooms$LinkPreviewWidget from './components/views/rooms/LinkPreviewWidget';
 views$rooms$LinkPreviewWidget && (module.exports.components['views.rooms.LinkPreviewWidget'] = views$rooms$LinkPreviewWidget);
 import views$rooms$MemberDeviceInfo from './components/views/rooms/MemberDeviceInfo';
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index b09b101b8a..ea221e98b7 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -123,6 +123,8 @@ module.exports = React.createClass({
             room: null,
             roomId: null,
             roomLoading: true,
+
+            forwardingMessage: null,
             editingRoomSettings: false,
             uploadingRoomSettings: false,
             numUnreadMessages: 0,
@@ -437,6 +439,11 @@ module.exports = React.createClass({
                     callState: callState
                 });
 
+                break;
+            case 'forward_message':
+                this.setState({
+                    forwardingMessage: payload.content,
+                });
                 break;
         }
     },
@@ -1180,7 +1187,10 @@ module.exports = React.createClass({
     onCancelClick: function() {
         console.log("updateTint from onCancelClick");
         this.updateTint();
-        this.setState({editingRoomSettings: false});
+        this.setState({
+            editingRoomSettings: false,
+            forwardingMessage: null,
+        });
     },
 
     onLeaveClick: function() {
@@ -1462,16 +1472,17 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var RoomHeader = sdk.getComponent('rooms.RoomHeader');
-        var MessageComposer = sdk.getComponent('rooms.MessageComposer');
-        var RoomSettings = sdk.getComponent("rooms.RoomSettings");
-        var AuxPanel = sdk.getComponent("rooms.AuxPanel");
-        var SearchBar = sdk.getComponent("rooms.SearchBar");
-        var ScrollPanel = sdk.getComponent("structures.ScrollPanel");
-        var TintableSvg = sdk.getComponent("elements.TintableSvg");
-        var RoomPreviewBar = sdk.getComponent("rooms.RoomPreviewBar");
-        var Loader = sdk.getComponent("elements.Spinner");
-        var TimelinePanel = sdk.getComponent("structures.TimelinePanel");
+        const RoomHeader = sdk.getComponent('rooms.RoomHeader');
+        const MessageComposer = sdk.getComponent('rooms.MessageComposer');
+        const ForwardMessage = sdk.getComponent("rooms.ForwardMessage");
+        const RoomSettings = sdk.getComponent("rooms.RoomSettings");
+        const AuxPanel = sdk.getComponent("rooms.AuxPanel");
+        const SearchBar = sdk.getComponent("rooms.SearchBar");
+        const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const RoomPreviewBar = sdk.getComponent("rooms.RoomPreviewBar");
+        const Loader = sdk.getComponent("elements.Spinner");
+        const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
 
         if (!this.state.room) {
                 if (this.state.roomLoading) {
@@ -1599,17 +1610,16 @@ module.exports = React.createClass({
             />;
         }
 
-        var aux = null;
-        if (this.state.editingRoomSettings) {
+        let aux = null;
+        if (this.state.forwardingMessage !== null) {
+            aux = <ForwardMessage onCancelClick={this.onCancelClick} collapsedRhs={this.props.collapsedRhs} content={this.state.forwardingMessage} />;
+        } else if (this.state.editingRoomSettings) {
             aux = <RoomSettings ref="room_settings" onSaveClick={this.onSettingsSaveClick} onCancelClick={this.onCancelClick} room={this.state.room} />;
-        }
-        else if (this.state.uploadingRoomSettings) {
+        } else if (this.state.uploadingRoomSettings) {
             aux = <Loader/>;
-        }
-        else if (this.state.searching) {
+        } else if (this.state.searching) {
             aux = <SearchBar ref="search_bar" searchInProgress={this.state.searchInProgress } onCancelClick={this.onCancelSearchClick} onSearch={this.onSearch}/>;
-        }
-        else if (!myMember || myMember.membership !== "join") {
+        } 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.
             var inviterName = undefined;
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
new file mode 100644
index 0000000000..58aac4edd1
--- /dev/null
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -0,0 +1,95 @@
+/*
+ Copyright 2017 Vector Creations Ltd
+ Copyright 2017 Michael Telatynski
+
+ 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 MatrixClientPeg from '../../../MatrixClientPeg';
+import dis from '../../../dispatcher';
+import KeyCode from "../../../KeyCode";
+
+
+module.exports = React.createClass({
+    displayName: 'ForwardMessage',
+
+    propTypes: {
+        content: React.PropTypes.object.isRequired,
+
+        // true if RightPanel is collapsed
+        collapsedRhs: React.PropTypes.bool,
+        onCancelClick: React.PropTypes.func.isRequired,
+    },
+
+    componentWillMount: function() {
+        this._unmounted = false;
+
+        if (!this.props.collapsedRhs) {
+            dis.dispatch({
+                action: 'hide_right_panel',
+            });
+        }
+
+        dis.dispatch({
+            action: 'ui_opacity',
+            sideOpacity: 1.0,
+            middleOpacity: 0.3,
+        });
+    },
+
+    componentDidMount: function() {
+        this.dispatcherRef = dis.register(this.onAction);
+        document.addEventListener('keydown', this._onKeyDown);
+    },
+
+    componentWillUnmount: function() {
+        this._unmounted = true;
+        dis.dispatch({
+            action: 'show_right_panel',
+        });
+        dis.dispatch({
+            action: 'ui_opacity',
+            sideOpacity: 1.0,
+            middleOpacity: 1.0,
+        });
+        dis.unregister(this.dispatcherRef);
+        document.removeEventListener('keydown', this._onKeyDown);
+    },
+
+    onAction: function(payload) {
+        if (payload.action === 'view_room') {
+            MatrixClientPeg.get().sendMessage(payload.room_id, this.props.content);
+        }
+    },
+
+    _onKeyDown: function(ev) {
+        switch (ev.keyCode) {
+            case KeyCode.ESCAPE:
+                this.props.onCancelClick();
+                dis.dispatch({action: 'focus_composer'});
+                break;
+        }
+    },
+
+    render: function() {
+        return (
+            <div className="mx_ForwardMessage">
+
+                <h1>Select a room to send the message to</h1>
+                <h2>Use the left sidebar Room List to select forwarding target</h2>
+
+            </div>
+        );
+    },
+});
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 94f2691f2c..3d2386070c 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -186,6 +186,9 @@ module.exports = React.createClass({
             );
 
             save_button = <AccessibleButton className="mx_RoomHeader_textButton" onClick={this.props.onSaveClick}>Save</AccessibleButton>;
+        }
+
+        if (this.props.onCancelClick) {
             cancel_button = <CancelButton onClick={this.props.onCancelClick}/>;
         }
 

From 64112da25ccb25797dd1cb9a1727fe5ae6c0a468 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Apr 2017 14:01:04 +0100
Subject: [PATCH 005/312] only re-show right panel if it was visible before we
 were mounted

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

diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 58aac4edd1..efecd1381f 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -55,9 +55,13 @@ module.exports = React.createClass({
 
     componentWillUnmount: function() {
         this._unmounted = true;
-        dis.dispatch({
-            action: 'show_right_panel',
-        });
+
+        if (!this.props.collapsedRhs) {
+            dis.dispatch({
+                action: 'show_right_panel',
+            });
+        }
+
         dis.dispatch({
             action: 'ui_opacity',
             sideOpacity: 1.0,

From 665f507537602878bff2373490ede4a7366ae482 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 21 Apr 2017 18:18:35 +0100
Subject: [PATCH 006/312] Update js-sdk dependency

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0a0a51fc0b..67dfa165af 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.6",
+    "matrix-js-sdk": "0.7.7-rc.1",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^15.4.0",

From 2f08340ff0ee2bf767998fbe6d8e2bfee7187752 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 21 Apr 2017 18:22:39 +0100
Subject: [PATCH 007/312] Prepare changelog for v0.8.8-rc.1

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 292e60607d..7d4a69fb5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.8.8-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.8-rc.1) (2017-04-21)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.7...v0.8.8-rc.1)
+
+ * Update js-sdk to fix registration without a captcha (https://github.com/vector-im/riot-web/issues/3621)
+
+
 Changes in [0.8.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.7) (2017-04-12)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.7-rc.4...v0.8.7)

From a55eb00dad61e6485ace58737d44a898c08a41f2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 21 Apr 2017 18:22:39 +0100
Subject: [PATCH 008/312] v0.8.8-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 67dfa165af..38d08344e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.8.7",
+  "version": "0.8.8-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 589d41e3b9f3e17bb960c67540ac235038ae785c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 21 Apr 2017 18:50:29 +0100
Subject: [PATCH 009/312] DRY the code a little bit in anticipation of #813
 which sends a `focus_composer` onCancelClick()

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

diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index efecd1381f..42e2465037 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -81,7 +81,6 @@ module.exports = React.createClass({
         switch (ev.keyCode) {
             case KeyCode.ESCAPE:
                 this.props.onCancelClick();
-                dis.dispatch({action: 'focus_composer'});
                 break;
         }
     },

From 80b8be64d1692f9546d00b8fa167e7dfffe38695 Mon Sep 17 00:00:00 2001
From: turt2live <travpc@gmail.com>
Date: Fri, 21 Apr 2017 15:09:56 -0600
Subject: [PATCH 010/312] Transform h1 and h2 tags to h3 tags

Addresses vector-im/riot-web#1772

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

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 96934d205e..632542ac43 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -165,6 +165,12 @@ var sanitizeHtmlParams = {
             attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
             return { tagName: tagName, attribs : attribs };
         },
+        'h1': function(tagName, attribs) {
+            return { tagName: 'h3', attribs: attribs };
+        },
+        'h2': function(tagName, attribs) {
+            return { tagName: 'h3', attribs: attribs };
+        },
         '*': function(tagName, attribs) {
             // Delete any style previously assigned, style is an allowedTag for font and span
             // because attributes are stripped after transforming

From 24f2aed45f890a630a9c095e44c7f86d57ffe32e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 23 Apr 2017 04:05:50 +0100
Subject: [PATCH 011/312] summarise profile changes in MELS

fixes https://github.com/vector-im/riot-web/issues/3463
---
 src/components/structures/MessagePanel.js     |  4 +---
 .../views/elements/MemberEventListSummary.js  | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 8d50789eb0..87f444d607 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -279,9 +279,7 @@ module.exports = React.createClass({
             this.currentGhostEventId = null;
         }
 
-        var isMembershipChange = (e) =>
-            e.getType() === 'm.room.member'
-            && (!e.getPrevContent() || e.getContent().membership !== e.getPrevContent().membership);
+        var isMembershipChange = (e) => e.getType() === 'm.room.member';
 
         for (i = 0; i < this.props.events.length; i++) {
             var mxEv = this.props.events[i];
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index d7f876c16e..8eb81ae5f1 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -221,6 +221,8 @@ module.exports = React.createClass({
             "banned": beConjugated + " banned",
             "unbanned": beConjugated + " unbanned",
             "kicked": beConjugated + " kicked",
+            "changed_name": "changed name",
+            "changed_avatar": "changed avatar",
         };
 
         if (Object.keys(map).includes(t)) {
@@ -289,7 +291,24 @@ module.exports = React.createClass({
         switch (e.mxEvent.getContent().membership) {
             case 'invite': return 'invited';
             case 'ban': return 'banned';
-            case 'join': return 'joined';
+            case 'join':
+                if (e.mxEvent.getPrevContent().membership === 'join') {
+                    if (e.mxEvent.getContent().displayname !==
+                        e.mxEvent.getPrevContent().displayname)
+                    {
+                        return 'changed_name';
+                    }
+                    else if (e.mxEvent.getContent().avatar_url !==
+                        e.mxEvent.getPrevContent().avatar_url)
+                    {
+                        return 'changed_avatar';
+                    }
+                    console.info("MELS ignoring duplicate membership join event");
+                    return null;
+                }
+                else {
+                    return 'joined';
+                }
             case 'leave':
                 if (e.mxEvent.getSender() === e.mxEvent.getStateKey()) {
                     switch (e.mxEvent.getPrevContent().membership) {

From 0590ce7faf9680d9d720a43de786545e7da5e7e6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 23 Apr 2017 06:06:23 +0100
Subject: [PATCH 012/312] Conform damn you (mostly)

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

diff --git a/src/Notifier.js b/src/Notifier.js
index 92770877b7..617135a2c8 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -15,11 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var MatrixClientPeg = require("./MatrixClientPeg");
-var PlatformPeg = require("./PlatformPeg");
-var TextForEvent = require('./TextForEvent');
-var Avatar = require('./Avatar');
-var dis = require("./dispatcher");
+import MatrixClientPeg from './MatrixClientPeg';
+import PlatformPeg from './PlatformPeg';
+import TextForEvent from './TextForEvent';
+import Avatar from './Avatar';
+import dis from './dispatcher';
 
 /*
  * Dispatches:
@@ -29,7 +29,7 @@ var dis = require("./dispatcher");
  * }
  */
 
-var Notifier = {
+const Notifier = {
     notifsByRoom: {},
 
     notificationMessageForEvent: function(ev) {
@@ -48,16 +48,16 @@ var Notifier = {
             return;
         }
 
-        var msg = this.notificationMessageForEvent(ev);
+        let msg = this.notificationMessageForEvent(ev);
         if (!msg) return;
 
-        var title;
-        if (!ev.sender || room.name == ev.sender.name) {
+        let title;
+        if (!ev.sender || room.name === ev.sender.name) {
             title = room.name;
             // notificationMessageForEvent includes sender,
             // but we already have the sender here
             if (ev.getContent().body) msg = ev.getContent().body;
-        } else if (ev.getType() == 'm.room.member') {
+        } else if (ev.getType() === 'm.room.member') {
             // context is all in the message here, we don't need
             // to display sender info
             title = room.name;
@@ -68,7 +68,7 @@ var Notifier = {
             if (ev.getContent().body) msg = ev.getContent().body;
         }
 
-        var avatarUrl = ev.sender ? Avatar.avatarUrlForMember(
+        const avatarUrl = ev.sender ? Avatar.avatarUrlForMember(
             ev.sender, 40, 40, 'crop'
         ) : null;
 
@@ -83,7 +83,7 @@ var Notifier = {
     },
 
     _playAudioNotification: function(ev, room) {
-        var e = document.getElementById("messageAudio");
+        const e = document.getElementById("messageAudio");
         if (e) {
             e.load();
             e.play();
@@ -95,7 +95,7 @@ var Notifier = {
         this.boundOnSyncStateChange = this.onSyncStateChange.bind(this);
         this.boundOnRoomReceipt = this.onRoomReceipt.bind(this);
         MatrixClientPeg.get().on('Room.timeline', this.boundOnRoomTimeline);
-        MatrixClientPeg.get().on("Room.receipt", this.boundOnRoomReceipt);
+        MatrixClientPeg.get().on('Room.receipt', this.boundOnRoomReceipt);
         MatrixClientPeg.get().on("sync", this.boundOnSyncStateChange);
         this.toolbarHidden = false;
         this.isSyncing = false;
@@ -104,7 +104,7 @@ var Notifier = {
     stop: function() {
         if (MatrixClientPeg.get() && this.boundOnRoomTimeline) {
             MatrixClientPeg.get().removeListener('Room.timeline', this.boundOnRoomTimeline);
-            MatrixClientPeg.get().removeListener("Room.receipt", this.boundOnRoomReceipt);
+            MatrixClientPeg.get().removeListener('Room.receipt', this.boundOnRoomReceipt);
             MatrixClientPeg.get().removeListener('sync', this.boundOnSyncStateChange);
         }
         this.isSyncing = false;
@@ -121,7 +121,7 @@ var Notifier = {
         // make sure that we persist the current setting audio_enabled setting
         // before changing anything
         if (global.localStorage) {
-            if(global.localStorage.getItem('audio_notifications_enabled') == null) {
+            if (global.localStorage.getItem('audio_notifications_enabled') === null) {
                 this.setAudioEnabled(this.isEnabled());
             }
         }
@@ -141,7 +141,7 @@ var Notifier = {
                 if (callback) callback();
                 dis.dispatch({
                     action: "notifier_enabled",
-                    value: true
+                    value: true,
                 });
             });
             // clear the notifications_hidden flag, so that if notifications are
@@ -152,7 +152,7 @@ var Notifier = {
             global.localStorage.setItem('notifications_enabled', 'false');
             dis.dispatch({
                 action: "notifier_enabled",
-                value: false
+                value: false,
             });
         }
     },
@@ -165,7 +165,7 @@ var Notifier = {
 
         if (!global.localStorage) return true;
 
-        var enabled = global.localStorage.getItem('notifications_enabled');
+        const enabled = global.localStorage.getItem('notifications_enabled');
         if (enabled === null) return true;
         return enabled === 'true';
     },
@@ -173,12 +173,12 @@ var Notifier = {
     setAudioEnabled: function(enable) {
         if (!global.localStorage) return;
         global.localStorage.setItem('audio_notifications_enabled',
-                                    enable ? 'true' : 'false');
+            enable ? 'true' : 'false');
     },
 
     isAudioEnabled: function(enable) {
         if (!global.localStorage) return true;
-        var enabled = global.localStorage.getItem(
+        const enabled = global.localStorage.getItem(
             'audio_notifications_enabled');
         // default to true if the popups are enabled
         if (enabled === null) return this.isEnabled();
@@ -192,7 +192,7 @@ var Notifier = {
         // this is nothing to do with notifier_enabled
         dis.dispatch({
             action: "notifier_enabled",
-            value: this.isEnabled()
+            value: this.isEnabled(),
         });
 
         // update the info to localStorage for persistent settings
@@ -215,8 +215,7 @@ var Notifier = {
     onSyncStateChange: function(state) {
         if (state === "SYNCING") {
             this.isSyncing = true;
-        }
-        else if (state === "STOPPED" || state === "ERROR") {
+        } else if (state === "STOPPED" || state === "ERROR") {
             this.isSyncing = false;
         }
     },
@@ -225,10 +224,10 @@ var Notifier = {
         if (toStartOfTimeline) return;
         if (!room) return;
         if (!this.isSyncing) return; // don't alert for any messages initially
-        if (ev.sender && ev.sender.userId == MatrixClientPeg.get().credentials.userId) return;
+        if (ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId) return;
         if (data.timeline.getTimelineSet() !== room.getUnfilteredTimelineSet()) return;
 
-        var actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
+        const actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
         if (actions && actions.notify) {
             if (this.isEnabled()) {
                 this._displayPopupNotification(ev, room);
@@ -240,7 +239,7 @@ var Notifier = {
     },
 
     onRoomReceipt: function(ev, room) {
-        if (room.getUnreadNotificationCount() == 0) {
+        if (room.getUnreadNotificationCount() === 0) {
             // ideally we would clear each notification when it was read,
             // but we have no way, given a read receipt, to know whether
             // the receipt comes before or after an event, so we can't
@@ -255,7 +254,7 @@ var Notifier = {
             }
             delete this.notifsByRoom[room.roomId];
         }
-    }
+    },
 };
 
 if (!global.mxNotifier) {

From 5e8b43f3edc70cd8d73a920c9a231c0f681c43fb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 23 Apr 2017 06:16:25 +0100
Subject: [PATCH 013/312] if we're not granted, show an ErrorDialog with some
 text which needs changing

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

diff --git a/src/Notifier.js b/src/Notifier.js
index 617135a2c8..fed2760732 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -20,6 +20,8 @@ import PlatformPeg from './PlatformPeg';
 import TextForEvent from './TextForEvent';
 import Avatar from './Avatar';
 import dis from './dispatcher';
+import sdk from './index';
+import Modal from './Modal';
 
 /*
  * Dispatches:
@@ -131,6 +133,14 @@ const Notifier = {
             plaf.requestNotificationPermission().done((result) => {
                 if (result !== 'granted') {
                     // The permission request was dismissed or denied
+                    const description = result === 'denied'
+                        ? 'Your browser is not permitting this app to send you notifications.'
+                        : 'It seems you didn\'t accept notifications when your browser asked';
+                    const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+                    Modal.createDialog(ErrorDialog, {
+                        title: 'Unable to enable Notifications',
+                        description,
+                    });
                     return;
                 }
 

From 74e92d6c235e629802184c86d0323587dec9f82f Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 24 Apr 2017 15:44:45 +0100
Subject: [PATCH 014/312] Remove DM-guessing code

---
 src/components/views/rooms/RoomList.js | 53 +++-----------------------
 1 file changed, 6 insertions(+), 47 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 3810f7d4d6..5839b66d1c 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -97,7 +97,7 @@ module.exports = React.createClass({
             if (this.props.selectedRoom) {
                 constantTimeDispatcher.dispatch(
                     "RoomTile.select", this.props.selectedRoom, {}
-                );            
+                );
             }
             constantTimeDispatcher.dispatch(
                 "RoomTile.select", nextProps.selectedRoom, { selected: true }
@@ -265,7 +265,7 @@ module.exports = React.createClass({
     },
 
     onRoomStateMember: function(ev, state, member) {
-        if (ev.getStateKey() === MatrixClientPeg.get().credentials.userId && 
+        if (ev.getStateKey() === MatrixClientPeg.get().credentials.userId &&
             ev.getPrevContent() && ev.getPrevContent().membership === "invite")
         {
             this._delayedRefreshRoomList();
@@ -290,7 +290,7 @@ module.exports = React.createClass({
             this._delayedRefreshRoomList();
         }
         else if (ev.getType() == 'm.push_rules') {
-            this._delayedRefreshRoomList();            
+            this._delayedRefreshRoomList();
         }
     },
 
@@ -318,7 +318,7 @@ module.exports = React.createClass({
         // as needed.
         // Alternatively we'd do something magical with Immutable.js or similar.
         this.setState(this.getRoomLists());
-        
+
         // this._lastRefreshRoomListTs = Date.now();
     },
 
@@ -341,7 +341,7 @@ module.exports = React.createClass({
         MatrixClientPeg.get().getRooms().forEach(function(room) {
             const me = room.getMember(MatrixClientPeg.get().credentials.userId);
             if (!me) return;
-            
+
             // console.log("room = " + room.name + ", me.membership = " + me.membership +
             //             ", sender = " + me.events.member.getSender() +
             //             ", target = " + me.events.member.getStateKey() +
@@ -391,51 +391,10 @@ module.exports = React.createClass({
             }
         });
 
-        if (s.lists["im.vector.fake.direct"].length == 0 &&
-            MatrixClientPeg.get().getAccountData('m.direct') === undefined &&
-            !MatrixClientPeg.get().isGuest())
-        {
-            // scan through the 'recents' list for any rooms which look like DM rooms
-            // and make them DM rooms
-            const oldRecents = s.lists["im.vector.fake.recent"];
-            s.lists["im.vector.fake.recent"] = [];
-
-            for (const room of oldRecents) {
-                const me = room.getMember(MatrixClientPeg.get().credentials.userId);
-
-                if (me && Rooms.looksLikeDirectMessageRoom(room, me)) {
-                    self.listsForRoomId[room.roomId].push("im.vector.fake.direct");
-                    s.lists["im.vector.fake.direct"].push(room);
-                } else {
-                    self.listsForRoomId[room.roomId].push("im.vector.fake.recent");
-                    s.lists["im.vector.fake.recent"].push(room);
-                }
-            }
-
-            // save these new guessed DM rooms into the account data
-            const newMDirectEvent = {};
-            for (const room of s.lists["im.vector.fake.direct"]) {
-                const me = room.getMember(MatrixClientPeg.get().credentials.userId);
-                const otherPerson = Rooms.getOnlyOtherMember(room, me);
-                if (!otherPerson) continue;
-
-                const roomList = newMDirectEvent[otherPerson.userId] || [];
-                roomList.push(room.roomId);
-                newMDirectEvent[otherPerson.userId] = roomList;
-            }
-
-            console.warn("Resetting room DM state to be " + JSON.stringify(newMDirectEvent));
-
-            // if this fails, fine, we'll just do the same thing next time we get the room lists
-            MatrixClientPeg.get().setAccountData('m.direct', newMDirectEvent).done();
-        }
-
-        //console.log("calculated new roomLists; im.vector.fake.recent = " + s.lists["im.vector.fake.recent"]);
-
         // we actually apply the sorting to this when receiving the prop in RoomSubLists.
 
         // we'll need this when we get to iterating through lists programatically - e.g. ctrl-shift-up/down
-/*        
+/*
         this.listOrder = [
             "im.vector.fake.invite",
             "m.favourite",

From 3bd77d56db1a2910e3e8872a84876a1533810a0d Mon Sep 17 00:00:00 2001
From: turt2live <travpc@gmail.com>
Date: Mon, 24 Apr 2017 08:43:51 -0600
Subject: [PATCH 015/312] Allow h1 and h2 tags again. CSS handled by riot-web

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/HtmlUtils.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 632542ac43..a31601790f 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -111,8 +111,7 @@ var sanitizeHtmlParams = {
     allowedTags: [
         'font', // custom to matrix for IRC-style font coloring
         'del', // for markdown
-        // deliberately no h1/h2 to stop people shouting.
-        'h3', 'h4', 'h5', 'h6', 'blockquote', 'p', 'a', 'ul', 'ol',
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'blockquote', 'p', 'a', 'ul', 'ol',
         'nl', 'li', 'b', 'i', 'u', 'strong', 'em', 'strike', 'code', 'hr', 'br', 'div',
         'table', 'thead', 'caption', 'tbody', 'tr', 'th', 'td', 'pre', 'span',
     ],
@@ -165,12 +164,6 @@ var sanitizeHtmlParams = {
             attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/
             return { tagName: tagName, attribs : attribs };
         },
-        'h1': function(tagName, attribs) {
-            return { tagName: 'h3', attribs: attribs };
-        },
-        'h2': function(tagName, attribs) {
-            return { tagName: 'h3', attribs: attribs };
-        },
         '*': function(tagName, attribs) {
             // Delete any style previously assigned, style is an allowedTag for font and span
             // because attributes are stripped after transforming

From bb6dd363d70d9ebeaa650a8349c233251c0b00be Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 10 Apr 2017 12:07:39 +0100
Subject: [PATCH 016/312] unbreak in-app permalinks correctly

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

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index e085b1a27a..c8e20316a9 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -122,7 +122,7 @@ var escapeRegExp = function(string) {
 // anyone else really should be using matrix.to.
 matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
     + escapeRegExp(window.location.host + window.location.pathname) + "|"
-    + "(?:www\\.)?(riot|vector)\\.im/(?:beta|staging|develop)/"
+    + "(?:www\\.)?(?:riot|vector)\\.im/(?:beta|staging|develop)/"
     + ")(#.*)";
 
 matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!).*)";

From cf2cf66caebea125912b1ff228935d2fc2497213 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 22 Apr 2017 21:06:38 +0100
Subject: [PATCH 017/312] fix deep-linking to riot.im/app

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

diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index c8e20316a9..d9b0b78982 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -122,7 +122,7 @@ var escapeRegExp = function(string) {
 // anyone else really should be using matrix.to.
 matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
     + escapeRegExp(window.location.host + window.location.pathname) + "|"
-    + "(?:www\\.)?(?:riot|vector)\\.im/(?:beta|staging|develop)/"
+    + "(?:www\\.)?(?:riot|vector)\\.im/(?:app|beta|staging|develop)/"
     + ")(#.*)";
 
 matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!).*)";

From 8e6981db44c7a765cc26f21c3fde76d5a723debe Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 24 Apr 2017 18:24:28 +0100
Subject: [PATCH 018/312] Prepare changelog for v0.8.8-rc.2

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d4a69fb5b..32f16c46ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.8.8-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.8-rc.2) (2017-04-24)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.8-rc.1...v0.8.8-rc.2)
+
+ * Fix bug where links to Riot would fail to open.
+
+
 Changes in [0.8.8-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.8-rc.1) (2017-04-21)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.7...v0.8.8-rc.1)

From e569144d6f700cf05e52f67b66aa92237ee7546f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 24 Apr 2017 18:24:29 +0100
Subject: [PATCH 019/312] v0.8.8-rc.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 38d08344e0..5fc8bc2750 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.8.8-rc.1",
+  "version": "0.8.8-rc.2",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From fbca0e0d0d320d970826d6112b2b793b1a093530 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 20:03:07 +0100
Subject: [PATCH 020/312] correct cancel appearing when it shouldn't

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9cd5070ad1..91d5e01f78 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1778,7 +1778,7 @@ module.exports = React.createClass({
                     onSearchClick={this.onSearchClick}
                     onSettingsClick={this.onSettingsClick}
                     onSaveClick={this.onSettingsSaveClick}
-                    onCancelClick={this.onCancelClick}
+                    onCancelClick={aux ? this.onCancelClick : null}
                     onForgetClick={
                         (myMember && myMember.membership === "leave") ? this.onForgetClick : null
                     }

From ee560a969a17591ea39590a61bc0f3327e9df8ab Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 20:17:29 +0100
Subject: [PATCH 021/312] upon forwarding message to current room, explicitly
 remove clear from aux

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js        | 2 +-
 src/components/views/rooms/ForwardMessage.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 91d5e01f78..e941c6b1a8 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1614,7 +1614,7 @@ module.exports = React.createClass({
 
         let aux = null;
         if (this.state.forwardingMessage !== null) {
-            aux = <ForwardMessage onCancelClick={this.onCancelClick} collapsedRhs={this.props.collapsedRhs} content={this.state.forwardingMessage} />;
+            aux = <ForwardMessage onCancelClick={this.onCancelClick} currentRoomId={this.state.room.roomId} collapsedRhs={this.props.collapsedRhs} content={this.state.forwardingMessage} />;
         } else if (this.state.editingRoomSettings) {
             aux = <RoomSettings ref="room_settings" onSaveClick={this.onSettingsSaveClick} onCancelClick={this.onCancelClick} room={this.state.room} />;
         } else if (this.state.uploadingRoomSettings) {
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 42e2465037..bb401dde69 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -25,6 +25,7 @@ module.exports = React.createClass({
     displayName: 'ForwardMessage',
 
     propTypes: {
+        currentRoomId: React.PropTypes.string.isRequired,
         content: React.PropTypes.object.isRequired,
 
         // true if RightPanel is collapsed
@@ -74,6 +75,7 @@ module.exports = React.createClass({
     onAction: function(payload) {
         if (payload.action === 'view_room') {
             MatrixClientPeg.get().sendMessage(payload.room_id, this.props.content);
+            if (this.props.currentRoomId === payload.room_id) this.props.onCancelClick();
         }
     },
 

From 4cf9e0c1ae46d22baef4463376b33c7e577f62cc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 22:00:59 +0100
Subject: [PATCH 022/312] Create a way to restore last state of the rhs panel.

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 9b8aa3426a..6df8d99c3a 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -303,6 +303,7 @@ module.exports = React.createClass({
 
     componentDidUpdate: function() {
         if (this.focusComposer) {
+            console.log('is this the shitty duplicate?');
             dis.dispatch({action: 'focus_composer'});
             this.focusComposer = false;
         }
@@ -547,15 +548,23 @@ module.exports = React.createClass({
                 });
                 break;
             case 'hide_right_panel':
+                this.was_rhs_collapsed = this.state.collapse_rhs;
                 this.setState({
                     collapse_rhs: true,
                 });
                 break;
             case 'show_right_panel':
+                this.was_rhs_collapsed = this.state.collapse_rhs;
                 this.setState({
                     collapse_rhs: false,
                 });
                 break;
+            // sets the panel to its state before last show/hide event
+            case 'restore_right_panel':
+                this.setState({
+                    collapse_rhs: this.was_rhs_collapsed,
+                });
+                break;
             case 'ui_opacity':
                 this.setState({
                     sideOpacity: payload.sideOpacity,

From bfba25f3dac7a0279f19300023065032ad251fc3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 22:10:14 +0100
Subject: [PATCH 023/312] we don't care about rhs state anymore as we can just
 restore it sanely

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e941c6b1a8..3e43d6984a 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1614,7 +1614,7 @@ module.exports = React.createClass({
 
         let aux = null;
         if (this.state.forwardingMessage !== null) {
-            aux = <ForwardMessage onCancelClick={this.onCancelClick} currentRoomId={this.state.room.roomId} collapsedRhs={this.props.collapsedRhs} content={this.state.forwardingMessage} />;
+            aux = <ForwardMessage onCancelClick={this.onCancelClick} currentRoomId={this.state.room.roomId} content={this.state.forwardingMessage} />;
         } else if (this.state.editingRoomSettings) {
             aux = <RoomSettings ref="room_settings" onSaveClick={this.onSettingsSaveClick} onCancelClick={this.onCancelClick} room={this.state.room} />;
         } else if (this.state.uploadingRoomSettings) {

From 28a2266f70ee5aaf18d0eb06333e19a6b9e558cc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 22:11:20 +0100
Subject: [PATCH 024/312] tidy up UDE handler

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

diff --git a/src/UnknownDeviceErrorHandler.js b/src/UnknownDeviceErrorHandler.js
index 2aa0573e22..2b1cf23380 100644
--- a/src/UnknownDeviceErrorHandler.js
+++ b/src/UnknownDeviceErrorHandler.js
@@ -22,7 +22,7 @@ let isDialogOpen = false;
 
 const onAction = function(payload) {
     if (payload.action === 'unknown_device_error' && !isDialogOpen) {
-        var UnknownDeviceDialog = sdk.getComponent("dialogs.UnknownDeviceDialog");
+        const UnknownDeviceDialog = sdk.getComponent('dialogs.UnknownDeviceDialog');
         isDialogOpen = true;
         Modal.createDialog(UnknownDeviceDialog, {
             devices: payload.err.devices,
@@ -33,17 +33,17 @@ const onAction = function(payload) {
                 // https://github.com/vector-im/riot-web/issues/3148
                 console.log('UnknownDeviceDialog closed with '+r);
             },
-        }, "mx_Dialog_unknownDevice");
+        }, 'mx_Dialog_unknownDevice');
     }
-}
+};
 
 let ref = null;
 
-export function startListening () {
+export function startListening() {
     ref = dis.register(onAction);
 }
 
-export function stopListening () {
+export function stopListening() {
     if (ref) {
         dis.unregister(ref);
         ref = null;

From 9ae9aeea0746e5190865491f6602346af6fb1327 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 22:14:45 +0100
Subject: [PATCH 025/312] lets improve forwarding :D

ditch double quotes
stop caring about rhs state
always call hide_right_panel, nop if already hidden
use new restore_right_panel to bring it back if it was visible pre-us

actually tell things that we sent a message or failed in doing so
now the UDE works :D

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

diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index bb401dde69..e5be89b2e0 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -18,7 +18,7 @@
 import React from 'react';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
-import KeyCode from "../../../KeyCode";
+import KeyCode from '../../../KeyCode';
 
 
 module.exports = React.createClass({
@@ -28,20 +28,13 @@ module.exports = React.createClass({
         currentRoomId: React.PropTypes.string.isRequired,
         content: React.PropTypes.object.isRequired,
 
-        // true if RightPanel is collapsed
-        collapsedRhs: React.PropTypes.bool,
         onCancelClick: React.PropTypes.func.isRequired,
     },
 
     componentWillMount: function() {
         this._unmounted = false;
 
-        if (!this.props.collapsedRhs) {
-            dis.dispatch({
-                action: 'hide_right_panel',
-            });
-        }
-
+        dis.dispatch({action: 'hide_right_panel'});
         dis.dispatch({
             action: 'ui_opacity',
             sideOpacity: 1.0,
@@ -57,12 +50,7 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         this._unmounted = true;
 
-        if (!this.props.collapsedRhs) {
-            dis.dispatch({
-                action: 'show_right_panel',
-            });
-        }
-
+        dis.dispatch({action: 'restore_right_panel'});
         dis.dispatch({
             action: 'ui_opacity',
             sideOpacity: 1.0,
@@ -74,7 +62,19 @@ module.exports = React.createClass({
 
     onAction: function(payload) {
         if (payload.action === 'view_room') {
-            MatrixClientPeg.get().sendMessage(payload.room_id, this.props.content);
+            const Client = MatrixClientPeg.get();
+            Client.sendMessage(payload.room_id, this.props.content).done(() => {
+                dis.dispatch({action: 'message_sent'});
+            }, (err) => {
+                if (err.name === "UnknownDeviceError") {
+                    dis.dispatch({
+                        action: 'unknown_device_error',
+                        err: err,
+                        room: Client.getRoom(payload.room_id),
+                    });
+                }
+                dis.dispatch({action: 'message_send_failed'});
+            });
             if (this.props.currentRoomId === payload.room_id) this.props.onCancelClick();
         }
     },

From 3997974f0f4036af92187ad1d0d50198ad58710a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 24 Apr 2017 22:16:15 +0100
Subject: [PATCH 026/312] remove debug console log (ignore its content pls)

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 6df8d99c3a..25ec644787 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -303,7 +303,6 @@ module.exports = React.createClass({
 
     componentDidUpdate: function() {
         if (this.focusComposer) {
-            console.log('is this the shitty duplicate?');
             dis.dispatch({action: 'focus_composer'});
             this.focusComposer = false;
         }

From 63dac026a89954f4487a5a95e697051a1e75b108 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Tue, 25 Apr 2017 00:17:46 +0100
Subject: [PATCH 027/312] remove spammy log

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

diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index 8eb81ae5f1..63bd2a7c39 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -303,7 +303,7 @@ module.exports = React.createClass({
                     {
                         return 'changed_avatar';
                     }
-                    console.info("MELS ignoring duplicate membership join event");
+                    // console.log("MELS ignoring duplicate membership join event");
                     return null;
                 }
                 else {

From e64b647799e57045d25aabc6e3c448f1a7e57cd5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Apr 2017 09:25:10 +0100
Subject: [PATCH 028/312] show the room name in the UDE Dialog especially
 useful when it appears after you switch rooms

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

diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index da9c8e8f65..4f3d4301f9 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -149,7 +149,7 @@ export default React.createClass({
             >
                 <GeminiScrollbar autoshow={false} className="mx_Dialog_content">
                     <h4>
-                        This room contains devices that you haven't seen before.
+                        "{this.props.room.name}" contains devices that you haven't seen before.
                     </h4>
                     { warning }
                     Unknown devices:

From 74dabb20873cb4650041710085d2ed06b3476218 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 25 Apr 2017 10:52:44 +0100
Subject: [PATCH 029/312] Released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5fc8bc2750..d14bc2b766 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.7-rc.1",
+    "matrix-js-sdk": "0.7.7",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^15.4.0",

From f6fd7b04ac01d7a7e3ef83ca186d9c462b047cb1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 25 Apr 2017 10:53:58 +0100
Subject: [PATCH 030/312] Prepare changelog for v0.8.8

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32f16c46ae..97dda666de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.8.8](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.8) (2017-04-25)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.8-rc.2...v0.8.8)
+
+ * No changes
+
+
 Changes in [0.8.8-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.8-rc.2) (2017-04-24)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.8-rc.1...v0.8.8-rc.2)

From d81adb234a7581169a2ddbf2f0ee6375e5c340ce Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 25 Apr 2017 10:53:59 +0100
Subject: [PATCH 031/312] v0.8.8

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d14bc2b766..00dc902cc9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.8.8-rc.2",
+  "version": "0.8.8",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 336462366e033a43ac76c133bd74dea1b0222c35 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 11:21:47 +0100
Subject: [PATCH 032/312] Improve country dropdown UX and expose +prefix

A prefix is now exposed through a change to the API for onOptionChange. This now returns the entire country object which includes iso2, prefix etc.

This also shows the prefix in the Registration and Login screens as a prefix to the phone number field.
---
 src/components/views/login/CountryDropdown.js | 18 +++++++--
 src/components/views/login/PasswordLogin.js   | 40 +++++++++++--------
 .../views/login/RegistrationForm.js           | 28 ++++++++-----
 .../views/settings/AddPhoneNumber.js          |  7 ++--
 4 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 7f6b21650d..da4e770093 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -37,6 +37,7 @@ export default class CountryDropdown extends React.Component {
     constructor(props) {
         super(props);
         this._onSearchChange = this._onSearchChange.bind(this);
+        this._onOptionChange = this._onOptionChange.bind(this);
 
         this.state = {
             searchQuery: '',
@@ -48,7 +49,7 @@ export default class CountryDropdown extends React.Component {
             // If no value is given, we start with the first
             // country selected, but our parent component
             // doesn't know this, therefore we do this.
-            this.props.onOptionChange(COUNTRIES[0].iso2);
+            this.props.onOptionChange(COUNTRIES[0]);
         }
     }
 
@@ -58,6 +59,10 @@ export default class CountryDropdown extends React.Component {
         });
     }
 
+    _onOptionChange(iso2) {
+        this.props.onOptionChange(COUNTRIES_BY_ISO2[iso2]);
+    }
+
     _flagImgForIso2(iso2) {
         // Unicode Regional Indicator Symbol letter 'A'
         const RIS_A = 0x1F1E6;
@@ -68,6 +73,10 @@ export default class CountryDropdown extends React.Component {
         );
     }
 
+    getCountryPrefix(iso2) {
+        return COUNTRIES_BY_ISO2[iso2].prefix;
+    }
+
     render() {
         const Dropdown = sdk.getComponent('elements.Dropdown');
 
@@ -102,9 +111,11 @@ export default class CountryDropdown extends React.Component {
         // values between mounting and the initial value propgating
         const value = this.props.value || COUNTRIES[0].iso2;
 
+        const getShortOption = this.props.isSmall ? this._flagImgForIso2 : undefined;
+
         return <Dropdown className={this.props.className}
-            onOptionChange={this.props.onOptionChange} onSearchChange={this._onSearchChange}
-            menuWidth={298} getShortOption={this._flagImgForIso2}
+            onOptionChange={this._onOptionChange} onSearchChange={this._onSearchChange}
+            menuWidth={298} getShortOption={getShortOption}
             value={value} searchEnabled={true}
         >
             {options}
@@ -114,6 +125,7 @@ export default class CountryDropdown extends React.Component {
 
 CountryDropdown.propTypes = {
     className: React.PropTypes.string,
+    isSmall: React.PropTypes.bool,
     onOptionChange: React.PropTypes.func.isRequired,
     value: React.PropTypes.string,
 };
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 568461817c..349dd0d139 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -90,8 +90,11 @@ class PasswordLogin extends React.Component {
     }
 
     onPhoneCountryChanged(country) {
-        this.setState({phoneCountry: country});
-        this.props.onPhoneCountryChanged(country);
+        this.setState({
+            phoneCountry: country.iso2,
+            phonePrefix: country.prefix,
+        });
+        this.props.onPhoneCountryChanged(country.iso2);
     }
 
     onPhoneNumberChanged(ev) {
@@ -121,16 +124,17 @@ class PasswordLogin extends React.Component {
                 const mxidInputClasses = classNames({
                     "mx_Login_field": true,
                     "mx_Login_username": true,
+                    "mx_Login_field_has_prefix": true,
                     "mx_Login_field_has_suffix": Boolean(this.props.hsDomain),
                 });
                 let suffix = null;
                 if (this.props.hsDomain) {
-                    suffix = <div className="mx_Login_username_suffix">
+                    suffix = <div className="mx_Login_field_suffix">
                         :{this.props.hsDomain}
                     </div>;
                 }
-                return <div className="mx_Login_username_group">
-                    <div className="mx_Login_username_prefix">@</div>
+                return <div className="mx_Login_field_group">
+                    <div className="mx_Login_field_prefix">@</div>
                     <input
                         className={mxidInputClasses}
                         key="username_input"
@@ -145,6 +149,7 @@ class PasswordLogin extends React.Component {
                 </div>;
             case PasswordLogin.LOGIN_FIELD_PHONE:
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
+                const prefix = this.state.phonePrefix;
                 return <div className="mx_Login_phoneSection">
                     <CountryDropdown
                         className="mx_Login_phoneCountry"
@@ -152,17 +157,20 @@ class PasswordLogin extends React.Component {
                         onOptionChange={this.onPhoneCountryChanged}
                         value={this.state.phoneCountry}
                     />
-                    <input
-                        className="mx_Login_phoneNumberField mx_Login_field"
-                        ref="phoneNumber"
-                        key="phone_input"
-                        type="text"
-                        name="phoneNumber"
-                        onChange={this.onPhoneNumberChanged}
-                        placeholder="Mobile phone number"
-                        value={this.state.phoneNumber}
-                        autoFocus
-                    />
+                    <div className="mx_Login_field_group">
+                        <div className="mx_Login_field_prefix">+{prefix}</div>
+                        <input
+                            className="mx_Login_phoneNumberField mx_Login_field mx_Login_field_has_prefix"
+                            ref="phoneNumber"
+                            key="phone_input"
+                            type="text"
+                            name="phoneNumber"
+                            onChange={this.onPhoneNumberChanged}
+                            placeholder="Mobile phone number"
+                            value={this.state.phoneNumber}
+                            autoFocus
+                        />
+                    </div>
                 </div>;
         }
     }
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index 4868c9de63..a0b56e30ac 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -270,7 +270,8 @@ module.exports = React.createClass({
 
     _onPhoneCountryChange(newVal) {
         this.setState({
-            phoneCountry: newVal,
+            phoneCountry: newVal.iso2,
+            phonePrefix: newVal.prefix,
         });
     },
 
@@ -316,15 +317,22 @@ module.exports = React.createClass({
                     className="mx_Login_phoneCountry"
                     value={this.state.phoneCountry}
                 />
-                <input type="text" ref="phoneNumber"
-                    placeholder="Mobile phone number (optional)"
-                    defaultValue={this.props.defaultPhoneNumber}
-                    className={this._classForField(
-                        FIELD_PHONE_NUMBER, 'mx_Login_phoneNumberField', 'mx_Login_field'
-                    )}
-                    onBlur={function() {self.validateField(FIELD_PHONE_NUMBER);}}
-                    value={self.state.phoneNumber}
-                />
+
+                <div className="mx_Login_field_group">
+                    <div className="mx_Login_field_prefix">+{this.state.phonePrefix}</div>
+                    <input type="text" ref="phoneNumber"
+                        placeholder="Mobile phone number (optional)"
+                        defaultValue={this.props.defaultPhoneNumber}
+                        className={this._classForField(
+                            FIELD_PHONE_NUMBER,
+                            'mx_Login_phoneNumberField',
+                            'mx_Login_field',
+                            'mx_Login_field_has_prefix'
+                        )}
+                        onBlur={function() {self.validateField(FIELD_PHONE_NUMBER);}}
+                        value={self.state.phoneNumber}
+                    />
+                </div>
             </div>
         );
 
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 3a348393aa..35dd5548d1 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -50,7 +50,7 @@ export default WithMatrixClient(React.createClass({
     },
 
     _onPhoneCountryChange: function(phoneCountry) {
-        this.setState({ phoneCountry: phoneCountry });
+        this.setState({ phoneCountry: phoneCountry.iso2 });
     },
 
     _onPhoneNumberChange: function(ev) {
@@ -149,10 +149,11 @@ export default WithMatrixClient(React.createClass({
                 <div className="mx_UserSettings_profileLabelCell">
                 </div>
                 <div className="mx_UserSettings_profileInputCell">
-                    <div className="mx_Login_phoneSection">
+                    <div className="mx_UserSettings_phoneSection">
                         <CountryDropdown onOptionChange={this._onPhoneCountryChange}
-                            className="mx_Login_phoneCountry"
+                            className="mx_UserSettings_phoneCountry"
                             value={this.state.phoneCountry}
+                            isSmall={true}
                         />
                         <input type="text"
                             ref={this._collectAddMsisdnInput}

From aac02388822e2958e607f66274d7fe7605beed87 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 11:25:14 +0100
Subject: [PATCH 033/312] Remove redundant API for getting country prefix

---
 src/components/views/login/CountryDropdown.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index da4e770093..6323b3f558 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -73,10 +73,6 @@ export default class CountryDropdown extends React.Component {
         );
     }
 
-    getCountryPrefix(iso2) {
-        return COUNTRIES_BY_ISO2[iso2].prefix;
-    }
-
     render() {
         const Dropdown = sdk.getComponent('elements.Dropdown');
 

From 0d4ab072500d6ec2187b901f6a7c38f1d046cfa1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 11:53:14 +0100
Subject: [PATCH 034/312] Fix not autoSelecting first item in dropdown

Fixes https://github.com/vector-im/riot-web/issues/3686
---
 src/components/views/elements/Dropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index a9ecf5b669..074853bb92 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -115,7 +115,7 @@ export default class Dropdown extends React.Component {
 
     componentWillReceiveProps(nextProps) {
         this._reindexChildren(nextProps.children);
-        const firstChild = React.Children.toArray(nextProps.children)[0];
+        const firstChild = nextProps.children[0];
         this.setState({
             highlightedOption: firstChild ? firstChild.key : null,
         });

From 1e9a2e80e99cc160fee60c45ad660aff05755ed8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 11:57:03 +0100
Subject: [PATCH 035/312] Remove empty line

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

diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index a0b56e30ac..2bc2b8946a 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -317,7 +317,6 @@ module.exports = React.createClass({
                     className="mx_Login_phoneCountry"
                     value={this.state.phoneCountry}
                 />
-
                 <div className="mx_Login_field_group">
                     <div className="mx_Login_field_prefix">+{this.state.phonePrefix}</div>
                     <input type="text" ref="phoneNumber"

From 71a119376c15c1255e8f050a371cbb06c055df50 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 17:05:54 +0100
Subject: [PATCH 036/312] Guard against no children

---
 src/components/views/elements/Dropdown.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 074853bb92..b4d2545e04 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -114,6 +114,9 @@ export default class Dropdown extends React.Component {
     }
 
     componentWillReceiveProps(nextProps) {
+        if (!nextProps.children || nextProps.children.length === 0) {
+            return;
+        }
         this._reindexChildren(nextProps.children);
         const firstChild = nextProps.children[0];
         this.setState({

From 96e7479d8b038a21a94d33107c1617811dc38d48 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 17:19:36 +0100
Subject: [PATCH 037/312] Show "jump to message" when message is not paginated

---
 src/components/structures/RoomView.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c158b87ff3..8a355a8f6d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1280,7 +1280,8 @@ module.exports = React.createClass({
 
         // we want to show the bar if the read-marker is off the top of the
         // screen.
-        var showBar = (pos < 0);
+        // If pos is null, the event might not be paginated, so show the unread bar!
+        var showBar = pos < 0 || pos === null;
 
         if (this.state.showTopUnreadMessagesBar != showBar) {
             this.setState({showTopUnreadMessagesBar: showBar},

From bc045698b959f7fe111fa25f345a95b996a1a416 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 25 Apr 2017 18:01:56 +0100
Subject: [PATCH 038/312] Fix for fuse 2.7.2

As of v2.7.2, fuse.js introduces a regression where the second argument to the constructor `Fuse` is assumed to be an object. There was one instance where we were not passing any argument. This fixes that.
---
 src/autocomplete/EmojiProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index a2d77f02a1..d488ac53ae 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -14,7 +14,7 @@ let instance = null;
 export default class EmojiProvider extends AutocompleteProvider {
     constructor() {
         super(EMOJI_REGEX);
-        this.fuse = new Fuse(EMOJI_SHORTNAMES);
+        this.fuse = new Fuse(EMOJI_SHORTNAMES, {});
     }
 
     async getCompletions(query: string, selection: SelectionRange) {

From fa9c2d137330e6e90891132fa3b4a42c4ee03afd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 25 Apr 2017 19:21:09 +0100
Subject: [PATCH 039/312] Fix specifying custom server for registration

Broken by https://github.com/matrix-org/matrix-react-sdk/commit/9cd7914ea51dbfb60f8b84a80cb800282476d3e4
(ServerConfig interface changed but Registration not updated)
---
 .../structures/login/Registration.js          | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 4e0d61e716..5501a39b58 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -123,18 +123,17 @@ module.exports = React.createClass({
         }
     },
 
-    onHsUrlChanged: function(newHsUrl) {
-        this.setState({
-            hsUrl: newHsUrl,
+    onServerConfigChange: function(config) {
+        let newState = {};
+        if (config.hsUrl !== undefined) {
+            newState.hsUrl = config.hsUrl;
+        }
+        if (config.isUrl !== undefined) {
+            newState.isUrl = config.isUrl;
+        }
+        this.setState(newState, function() {
+            this._replaceClient();
         });
-        this._replaceClient();
-    },
-
-    onIsUrlChanged: function(newIsUrl) {
-        this.setState({
-            isUrl: newIsUrl,
-        });
-        this._replaceClient();
     },
 
     _replaceClient: function() {
@@ -390,8 +389,7 @@ module.exports = React.createClass({
                         customIsUrl={this.props.customIsUrl}
                         defaultHsUrl={this.props.defaultHsUrl}
                         defaultIsUrl={this.props.defaultIsUrl}
-                        onHsUrlChanged={this.onHsUrlChanged}
-                        onIsUrlChanged={this.onIsUrlChanged}
+                        onServerConfigChange={this.onServerConfigChange}
                         delayTimeMs={1000}
                     />
                 </div>

From de89c1f7105232478c879d4828c687e14572d02e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Apr 2017 22:00:50 +0100
Subject: [PATCH 040/312] lets make eslint at least somewhat happy

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

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 66a872958c..4d52fa00f2 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -15,9 +15,9 @@ limitations under the License.
 */
 
 'use strict';
-var q = require("q");
-var MatrixClientPeg = require("./MatrixClientPeg");
-var Notifier = require("./Notifier");
+import q from 'q';
+import MatrixClientPeg from './MatrixClientPeg';
+import Notifier from './Notifier';
 
 /*
  * TODO: Make things use this. This is all WIP - see UserSettings.js for usage.
@@ -33,7 +33,7 @@ module.exports = {
     ],
 
     loadProfileInfo: function() {
-        var cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         return cli.getProfileInfo(cli.credentials.userId);
     },
 
@@ -44,7 +44,7 @@ module.exports = {
     loadThreePids: function() {
         if (MatrixClientPeg.get().isGuest()) {
             return q({
-                threepids: []
+                threepids: [],
             }); // guests can't poke 3pid endpoint
         }
         return MatrixClientPeg.get().getThreePids();
@@ -73,19 +73,19 @@ module.exports = {
         Notifier.setAudioEnabled(enable);
     },
 
-    changePassword: function(old_password, new_password) {
-        var cli = MatrixClientPeg.get();
+    changePassword: function(oldPassword, newPassword) {
+        const cli = MatrixClientPeg.get();
 
-        var authDict = {
+        const authDict = {
             type: 'm.login.password',
             user: cli.credentials.userId,
-            password: old_password
+            password: oldPassword,
         };
 
-        return cli.setPassword(authDict, new_password);
+        return cli.setPassword(authDict, newPassword);
     },
 
-    /**
+    /*
      * Returns the email pusher (pusher of type 'email') for a given
      * email address. Email pushers all have the same app ID, so since
      * pushers are unique over (app ID, pushkey), there will be at most
@@ -95,8 +95,8 @@ module.exports = {
         if (pushers === undefined) {
             return undefined;
         }
-        for (var i = 0; i < pushers.length; ++i) {
-            if (pushers[i].kind == 'email' && pushers[i].pushkey == address) {
+        for (let i = 0; i < pushers.length; ++i) {
+            if (pushers[i].kind === 'email' && pushers[i].pushkey === address) {
                 return pushers[i];
             }
         }
@@ -110,7 +110,7 @@ module.exports = {
     addEmailPusher: function(address, data) {
         return MatrixClientPeg.get().setPusher({
             kind: 'email',
-            app_id: "m.email",
+            app_id: 'm.email',
             pushkey: address,
             app_display_name: 'Email Notifications',
             device_display_name: address,
@@ -121,46 +121,46 @@ module.exports = {
     },
 
     getUrlPreviewsDisabled: function() {
-        var event = MatrixClientPeg.get().getAccountData("org.matrix.preview_urls");
+        const event = MatrixClientPeg.get().getAccountData('org.matrix.preview_urls');
         return (event && event.getContent().disable);
     },
 
     setUrlPreviewsDisabled: function(disabled) {
         // FIXME: handle errors
-        return MatrixClientPeg.get().setAccountData("org.matrix.preview_urls", {
-            disable: disabled
+        return MatrixClientPeg.get().setAccountData('org.matrix.preview_urls', {
+            disable: disabled,
         });
     },
 
     getSyncedSettings: function() {
-        var event = MatrixClientPeg.get().getAccountData("im.vector.web.settings");
+        const event = MatrixClientPeg.get().getAccountData('im.vector.web.settings');
         return event ? event.getContent() : {};
     },
 
     getSyncedSetting: function(type, defaultValue = null) {
-        var settings = this.getSyncedSettings();
+        const settings = this.getSyncedSettings();
         return settings.hasOwnProperty(type) ? settings[type] : null;
     },
 
     setSyncedSetting: function(type, value) {
-        var settings = this.getSyncedSettings();
+        const settings = this.getSyncedSettings();
         settings[type] = value;
         // FIXME: handle errors
-        return MatrixClientPeg.get().setAccountData("im.vector.web.settings", settings);
+        return MatrixClientPeg.get().setAccountData('im.vector.web.settings', settings);
     },
 
     getLocalSettings: function() {
-        var localSettingsString = localStorage.getItem('mx_local_settings') || '{}';
+        const localSettingsString = localStorage.getItem('mx_local_settings') || '{}';
         return JSON.parse(localSettingsString);
     },
 
     getLocalSetting: function(type, defaultValue = null) {
-        var settings = this.getLocalSettings();
+        const settings = this.getLocalSettings();
         return settings.hasOwnProperty(type) ? settings[type] : null;
     },
 
     setLocalSetting: function(type, value) {
-        var settings = this.getLocalSettings();
+        const settings = this.getLocalSettings();
         settings[type] = value;
         // FIXME: handle errors
         localStorage.setItem('mx_local_settings', JSON.stringify(settings));
@@ -171,8 +171,8 @@ module.exports = {
         if (MatrixClientPeg.get().isGuest()) return false;
 
         if (localStorage.getItem(`mx_labs_feature_${feature}`) === null) {
-            for (var i = 0; i < this.LABS_FEATURES.length; i++) {
-                var f = this.LABS_FEATURES[i];
+            for (let i = 0; i < this.LABS_FEATURES.length; i++) {
+                const f = this.LABS_FEATURES[i];
                 if (f.id === feature) {
                     return f.default;
                 }
@@ -183,5 +183,5 @@ module.exports = {
 
     setFeatureEnabled: function(feature: string, enabled: boolean) {
         localStorage.setItem(`mx_labs_feature_${feature}`, enabled);
-    }
+    },
 };

From cc53825b062c59e9fc02f7e7a429571c4067c3ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Apr 2017 22:01:35 +0100
Subject: [PATCH 041/312] fix defaultValue on getLocalSetting and
 getSyncedSetting

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

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 4d52fa00f2..9de291249f 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -139,7 +139,7 @@ module.exports = {
 
     getSyncedSetting: function(type, defaultValue = null) {
         const settings = this.getSyncedSettings();
-        return settings.hasOwnProperty(type) ? settings[type] : null;
+        return settings.hasOwnProperty(type) ? settings[type] : defaultValue;
     },
 
     setSyncedSetting: function(type, value) {
@@ -156,7 +156,7 @@ module.exports = {
 
     getLocalSetting: function(type, defaultValue = null) {
         const settings = this.getLocalSettings();
-        return settings.hasOwnProperty(type) ? settings[type] : null;
+        return settings.hasOwnProperty(type) ? settings[type] : defaultValue;
     },
 
     setLocalSetting: function(type, value) {

From 6cbd04045d67197679a318944bdd40eb9d68c697 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 25 Apr 2017 22:17:25 +0100
Subject: [PATCH 042/312] change the now working defaults to what they
 effectively were when defaultValue was broken (hopefully tests now pass)

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 8a3b128908..88230062fe 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -50,7 +50,7 @@ export default class MessageComposer extends React.Component {
             inputState: {
                 style: [],
                 blockType: null,
-                isRichtextEnabled: UserSettingsStore.getSyncedSetting('MessageComposerInput.isRichTextEnabled', true),
+                isRichtextEnabled: UserSettingsStore.getSyncedSetting('MessageComposerInput.isRichTextEnabled', false),
                 wordCount: 0,
             },
             showFormatting: UserSettingsStore.getSyncedSetting('MessageComposer.showFormatting', false),
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 417d003226..8efd2fa579 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -94,7 +94,7 @@ export default class MessageComposerInput extends React.Component {
         this.setDisplayedCompletion = this.setDisplayedCompletion.bind(this);
         this.onMarkdownToggleClicked = this.onMarkdownToggleClicked.bind(this);
 
-        const isRichtextEnabled = UserSettingsStore.getSyncedSetting('MessageComposerInput.isRichTextEnabled', true);
+        const isRichtextEnabled = UserSettingsStore.getSyncedSetting('MessageComposerInput.isRichTextEnabled', false);
 
         this.state = {
             // whether we're in rich text or markdown mode

From 04f44e920192f8528b6d016a0bef2232d2467043 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 26 Apr 2017 13:48:03 +0100
Subject: [PATCH 043/312] Style fixes for LoggedInView

PRing this becaise I was going to change LoggedInView, so did
some code style updates, but then decided the do the change
elsewhere.
---
 src/components/structures/LoggedInView.js | 25 ++++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 4c012b42a8..9f01b0082b 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -162,19 +163,19 @@ export default React.createClass({
     },
 
     render: function() {
-        var LeftPanel = sdk.getComponent('structures.LeftPanel');
-        var RightPanel = sdk.getComponent('structures.RightPanel');
-        var RoomView = sdk.getComponent('structures.RoomView');
-        var UserSettings = sdk.getComponent('structures.UserSettings');
-        var CreateRoom = sdk.getComponent('structures.CreateRoom');
-        var RoomDirectory = sdk.getComponent('structures.RoomDirectory');
-        var HomePage = sdk.getComponent('structures.HomePage');
-        var MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
-        var GuestWarningBar = sdk.getComponent('globals.GuestWarningBar');
-        var NewVersionBar = sdk.getComponent('globals.NewVersionBar');
+        const LeftPanel = sdk.getComponent('structures.LeftPanel');
+        const RightPanel = sdk.getComponent('structures.RightPanel');
+        const RoomView = sdk.getComponent('structures.RoomView');
+        const UserSettings = sdk.getComponent('structures.UserSettings');
+        const CreateRoom = sdk.getComponent('structures.CreateRoom');
+        const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
+        const HomePage = sdk.getComponent('structures.HomePage');
+        const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
+        const GuestWarningBar = sdk.getComponent('globals.GuestWarningBar');
+        const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
 
-        var page_element;
-        var right_panel = '';
+        let page_element;
+        let right_panel = '';
 
         switch (this.props.page_type) {
             case PageTypes.RoomView:

From df283dae4767cbfcb4b073a71a1b384790dae70b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 26 Apr 2017 14:05:09 +0100
Subject: [PATCH 044/312] Show spinner until first sync has completed

Shows the 'forward paginating' spinner until the first sync has
completed.

Fixes https://github.com/vector-im/riot-web/issues/3318
---
 src/components/structures/TimelinePanel.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 8babdaae4a..dde86e1ce9 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1058,11 +1058,18 @@ var TimelinePanel = React.createClass({
         // 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);
+
+        // 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.
+        const forwardPaginating = (
+            this.state.forwardPaginating || MatrixClientPeg.get().getSyncState() == 'PREPARED'
+        );
+
         return (
             <MessagePanel ref="messagePanel"
                     hidden={ this.props.hidden }
                     backPaginating={ this.state.backPaginating }
-                    forwardPaginating={ this.state.forwardPaginating }
+                    forwardPaginating={ forwardPaginating }
                     events={ this.state.events }
                     highlightedEventId={ this.props.highlightedEventId }
                     readMarkerEventId={ this.state.readMarkerEventId }

From 4910a225d13420ee1684c52b60dec62fe2c3bf72 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 26 Apr 2017 17:26:53 +0100
Subject: [PATCH 045/312] Fix spinner that shows until the first sync

Listen for the sync event and update when it changes
---
 src/components/structures/TimelinePanel.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index dde86e1ce9..f07bad0052 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -167,6 +168,9 @@ var TimelinePanel = React.createClass({
 
             backPaginating: false,
             forwardPaginating: false,
+
+            // cache of matrixClient.getSyncState() (but from the 'sync' event)
+            clientSyncState: null,
         };
     },
 
@@ -183,6 +187,7 @@ var TimelinePanel = React.createClass({
         MatrixClientPeg.get().on("Room.receipt", this.onRoomReceipt);
         MatrixClientPeg.get().on("Room.localEchoUpdated", this.onLocalEchoUpdated);
         MatrixClientPeg.get().on("Room.accountData", this.onAccountData);
+        MatrixClientPeg.get().on("sync", this.onSync);
 
         this._initTimeline(this.props);
     },
@@ -251,6 +256,7 @@ var TimelinePanel = React.createClass({
             client.removeListener("Room.receipt", this.onRoomReceipt);
             client.removeListener("Room.localEchoUpdated", this.onLocalEchoUpdated);
             client.removeListener("Room.accountData", this.onAccountData);
+            client.removeListener("sync", this.onSync);
         }
     },
 
@@ -487,6 +493,10 @@ var TimelinePanel = React.createClass({
         }, this.props.onReadMarkerUpdated);
     },
 
+    onSync: function(state, prevState, data) {
+        this.setState({clientSyncState: state});
+    },
+
     sendReadReceipt: function() {
         if (!this.refs.messagePanel) return;
         if (!this.props.manageReadReceipts) return;
@@ -1062,7 +1072,7 @@ var TimelinePanel = React.createClass({
         // 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.
         const forwardPaginating = (
-            this.state.forwardPaginating || MatrixClientPeg.get().getSyncState() == 'PREPARED'
+            this.state.forwardPaginating || this.state.clientSyncState == 'PREPARED'
         );
 
         return (

From 5f0ecc588f9f161b1013c936d619c065aa1ce66e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 26 Apr 2017 17:37:52 +0100
Subject: [PATCH 046/312] Fix dialog reappearing after hitting Enter

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

https://github.com/vector-im/riot-web/issues/3714#issuecomment-297460620 :
> It's as if there are two dialogs and as one closes, the other one appears. For some reason matrix-org/matrix-react-sdk#822 is causing this.
> I've realised it's because the `priorActiveElement` is probably the button that opened the dialog. If this is focused and the enter key is released, this triggers a keyPress which fires once the dialog has closed and the button has been focused :grimacing: the BaseDialog only calls stopPropagation _onKeyDown.

The soln. was to submit the dialog as finished `onKeyUp`. This means the `priorActiveElement` is focussed after any key events that should be associated with the dialog.
---
 src/components/views/dialogs/BaseDialog.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index d0f34c5fbd..279dedbd43 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -57,7 +57,9 @@ export default React.createClass({
         }
     },
 
-    _onKeyDown: function(e) {
+    // Must be when the key is released (and not pressed) otherwise componentWillUnmount
+    // will focus another element which will receive future key events
+    _onKeyUp: function(e) {
         if (e.keyCode === KeyCode.ESCAPE) {
             e.stopPropagation();
             e.preventDefault();
@@ -79,7 +81,7 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div onKeyDown={this._onKeyDown} className={this.props.className}>
+            <div onKeyUp={this._onKeyUp} className={this.props.className}>
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >

From 63224ff16414d355a6678161aeaca38e2e5c0f7a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 26 Apr 2017 18:00:25 +0100
Subject: [PATCH 047/312] Add mx_EventTile_emote class

---
 src/components/views/rooms/EventTile.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9dc1087ce5..d1486d22c9 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -401,8 +401,7 @@ module.exports = WithMatrixClient(React.createClass({
         var msgtype = content.msgtype;
         var eventType = this.props.mxEvent.getType();
 
-        // Info messages are basically information about commands processed on a
-        // room, or emote messages
+        // Info messages are basically information about commands processed on a room
         var isInfoMessage = (eventType !== 'm.room.message');
 
         var EventTileType = sdk.getComponent(eventTileTypes[eventType]);
@@ -430,7 +429,8 @@ module.exports = WithMatrixClient(React.createClass({
             menu: this.state.menu,
             mx_EventTile_verified: this.state.verified == true,
             mx_EventTile_unverified: this.state.verified == false,
-            mx_EventTile_bad: this.props.mxEvent.getContent().msgtype === 'm.bad.encrypted',
+            mx_EventTile_bad: msgtype === 'm.bad.encrypted',
+            mx_EventTile_emote: msgtype === 'm.emote',
             mx_EventTile_redacted: isRedacted,
         });
 

From 8291b36b3efa555713d90bc5c496187ab4d2eeed Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 27 Apr 2017 10:16:24 +0100
Subject: [PATCH 048/312] Use document.onkeydown instead of onkeypress

---
 src/UserActivity.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/UserActivity.js b/src/UserActivity.js
index e7338e17e9..1ae272f5df 100644
--- a/src/UserActivity.js
+++ b/src/UserActivity.js
@@ -32,7 +32,7 @@ class UserActivity {
     start() {
         document.onmousedown = this._onUserActivity.bind(this);
         document.onmousemove = this._onUserActivity.bind(this);
-        document.onkeypress = this._onUserActivity.bind(this);
+        document.onkeydown = this._onUserActivity.bind(this);
         // can't use document.scroll here because that's only the document
         // itself being scrolled. Need to use addEventListener's useCapture.
         // also this needs to be the wheel event, not scroll, as scroll is
@@ -50,7 +50,7 @@ class UserActivity {
     stop() {
         document.onmousedown = undefined;
         document.onmousemove = undefined;
-        document.onkeypress = undefined;
+        document.onkeydown = undefined;
         window.removeEventListener('wheel', this._onUserActivity.bind(this),
                                    { passive: true, capture: true });
     }

From 39de37b547bde50e726ee9a22863bde1585ebe28 Mon Sep 17 00:00:00 2001
From: Robert Swain <rob@matrix.org>
Date: Thu, 27 Apr 2017 12:38:03 +0200
Subject: [PATCH 049/312] *Avatar: Calculate thumbnail dimensions based on
 devicePixelRatio

Multiply the dimension by the device pixel ratio and then round it to
get the width/height of the thumbnail to use in the request.
---
 src/Avatar.js                              |  8 ++++----
 src/components/views/avatars/RoomAvatar.js | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Avatar.js b/src/Avatar.js
index cb5e6965e3..c0127d49af 100644
--- a/src/Avatar.js
+++ b/src/Avatar.js
@@ -22,8 +22,8 @@ module.exports = {
     avatarUrlForMember: function(member, width, height, resizeMethod) {
         var url = member.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
-            window.devicePixelRatio > 1.2 ? 96 : width,
-            window.devicePixelRatio > 1.2 ? 96 : height,
+            Math.floor(width * window.devicePixelRatio),
+            Math.floor(height * window.devicePixelRatio),
             resizeMethod,
             false,
             false
@@ -40,8 +40,8 @@ module.exports = {
     avatarUrlForUser: function(user, width, height, resizeMethod) {
         var url = ContentRepo.getHttpUriForMxc(
             MatrixClientPeg.get().getHomeserverUrl(), user.avatarUrl,
-            window.devicePixelRatio > 1.2 ? 96 : width,
-            window.devicePixelRatio > 1.2 ? 96 : height,
+            Math.floor(width * window.devicePixelRatio),
+            Math.floor(height * window.devicePixelRatio),
             resizeMethod
         );
         if (!url || url.length === 0) {
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 7ed7bfa9fa..8041fd5cd7 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -59,8 +59,8 @@ module.exports = React.createClass({
             ContentRepo.getHttpUriForMxc(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 props.oobData.avatarUrl,
-                window.devicePixelRatio > 1.2 ? 96 : props.width,
-                window.devicePixelRatio > 1.2 ? 96 : props.height,
+                Math.floor(props.width * window.devicePixelRatio),
+                Math.floor(props.height * window.devicePixelRatio),
                 props.resizeMethod
             ), // highest priority
             this.getRoomAvatarUrl(props),
@@ -76,8 +76,8 @@ module.exports = React.createClass({
 
         return props.room.getAvatarUrl(
             MatrixClientPeg.get().getHomeserverUrl(),
-            window.devicePixelRatio > 1.2 ? 96 : props.width,
-            window.devicePixelRatio > 1.2 ? 96 : props.height,
+            Math.floor(props.width * window.devicePixelRatio),
+            Math.floor(props.height * window.devicePixelRatio),
             props.resizeMethod,
             false
         );
@@ -107,16 +107,16 @@ module.exports = React.createClass({
             }
             return theOtherGuy.getAvatarUrl(
                 MatrixClientPeg.get().getHomeserverUrl(),
-                window.devicePixelRatio > 1.2 ? 96 : props.width,
-                window.devicePixelRatio > 1.2 ? 96 : props.height,
+                Math.floor(props.width * window.devicePixelRatio),
+                Math.floor(props.height * window.devicePixelRatio),
                 props.resizeMethod,
                 false
             );
         } else if (userIds.length == 1) {
             return mlist[userIds[0]].getAvatarUrl(
                 MatrixClientPeg.get().getHomeserverUrl(),
-                window.devicePixelRatio > 1.2 ? 96 : props.width,
-                window.devicePixelRatio > 1.2 ? 96 : props.height,
+                Math.floor(props.width * window.devicePixelRatio),
+                Math.floor(props.height * window.devicePixelRatio),
                 props.resizeMethod,
                 false
             );

From 8f7359fce1060fb6c63b11e3ef89fa50abfcfaf1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 27 Apr 2017 14:03:54 +0100
Subject: [PATCH 050/312] Only show jumpToReadMarker bar when RM !== RR

If RM !== RR, use the pos. of the RM to determine whether it is visible, as before.
---
 src/components/structures/RoomView.js      |  8 +-------
 src/components/structures/TimelinePanel.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 8a355a8f6d..a0c36374b6 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1276,13 +1276,7 @@ module.exports = React.createClass({
             return;
         }
 
-        var pos = this.refs.messagePanel.getReadMarkerPosition();
-
-        // we want to show the bar if the read-marker is off the top of the
-        // screen.
-        // If pos is null, the event might not be paginated, so show the unread bar!
-        var showBar = pos < 0 || pos === null;
-
+        const showBar = this.refs.messagePanel.canJumpToReadMarker();
         if (this.state.showTopUnreadMessagesBar != showBar) {
             this.setState({showTopUnreadMessagesBar: showBar},
                           this.onChildResize);
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index f07bad0052..066ab37107 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -766,6 +766,16 @@ var TimelinePanel = React.createClass({
         return null;
     },
 
+    canJumpToReadMarker: function() {
+        // Only show jump bar if RR !== RM. If they are the same, there are only fully
+        // read messages and unread messages. We already have a badge count and the bottom
+        // bar to jump to "live" when we have unread messages.
+        // We want to show the bar if the read-marker is off the top of the screen.
+        // Also, if pos === null, the event might not be paginated - show the unread bar
+        const pos = this.getReadMarkerPosition();
+        return this.state.readMarkerEventId !== this._getCurrentReadReceipt() && (pos < 0 || pos === null);
+    },
+
     /**
      * called by the parent component when PageUp/Down/etc is pressed.
      *

From 2012513c0e0cb560089302d74707a4cb69068b0e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 27 Apr 2017 14:16:50 +0100
Subject: [PATCH 051/312] Allow MELS to have its own RM

This inserts a RM if any of the events in a MELS if the RM is tracking an event within it.

Fixes https://github.com/vector-im/riot-web/issues/3749
---
 src/components/structures/MessagePanel.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 87f444d607..246f351841 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -282,15 +282,16 @@ module.exports = React.createClass({
         var isMembershipChange = (e) => e.getType() === 'm.room.member';
 
         for (i = 0; i < this.props.events.length; i++) {
-            var mxEv = this.props.events[i];
-            var wantTile = true;
-            var eventId = mxEv.getId();
+            let mxEv = this.props.events[i];
+            let wantTile = true;
+            let eventId = mxEv.getId();
+            let readMarkerInMels = false;
 
             if (!EventTile.haveTileForEvent(mxEv)) {
                 wantTile = false;
             }
 
-            var last = (i == lastShownEventIndex);
+            let last = (i == lastShownEventIndex);
 
             // Wrap consecutive member events in a ListSummary, ignore if redacted
             if (isMembershipChange(mxEv) &&
@@ -332,6 +333,9 @@ module.exports = React.createClass({
 
                 let eventTiles = summarisedEvents.map(
                     (e) => {
+                        if (e.getId() === this.props.readMarkerEventId) {
+                            readMarkerInMels = true;
+                        }
                         // In order to prevent DateSeparators from appearing in the expanded form
                         // of MemberEventListSummary, render each member event as if the previous
                         // one was itself. This way, the timestamp of the previous event === the
@@ -356,6 +360,11 @@ module.exports = React.createClass({
                             {eventTiles}
                     </MemberEventListSummary>
                 );
+
+                if (readMarkerInMels) {
+                    ret.push(this._getReadMarkerTile(visible));
+                }
+
                 continue;
             }
 

From 50831796bbf454abb56c209ae3ea1786fdfb9175 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 27 Apr 2017 16:49:23 +0100
Subject: [PATCH 052/312] Remove RHS when viewing RoomDirectory

---
 src/components/structures/LoggedInView.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 9f01b0082b..c4eeb03d5f 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -221,10 +221,8 @@ export default React.createClass({
             case PageTypes.RoomDirectory:
                 page_element = <RoomDirectory
                     ref="roomDirectory"
-                    collapsedRhs={this.props.collapse_rhs}
                     config={this.props.config.roomDirectory}
                 />;
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
                 break;
 
             case PageTypes.HomePage:

From 6313193aa80ae2dd311d13dfc85b9808b953a434 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 27 Apr 2017 16:52:40 +0100
Subject: [PATCH 053/312] Null check readMarkerEventId, update comment

---
 src/components/structures/TimelinePanel.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 066ab37107..f72d35c41c 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -767,13 +767,16 @@ var TimelinePanel = React.createClass({
     },
 
     canJumpToReadMarker: function() {
-        // Only show jump bar if RR !== RM. If they are the same, there are only fully
+        // 1. Do not show jump bar if neither the RM nor the RR are set.
+        // 2. Only show jump bar if RR !== RM. If they are the same, there are only fully
         // read messages and unread messages. We already have a badge count and the bottom
         // bar to jump to "live" when we have unread messages.
-        // We want to show the bar if the read-marker is off the top of the screen.
-        // Also, if pos === null, the event might not be paginated - show the unread bar
+        // 3. We want to show the bar if the read-marker is off the top of the screen.
+        // 4. Also, if pos === null, the event might not be paginated - show the unread bar
         const pos = this.getReadMarkerPosition();
-        return this.state.readMarkerEventId !== this._getCurrentReadReceipt() && (pos < 0 || pos === null);
+        return this.state.readMarkerEventId !== null && // 1.
+            this.state.readMarkerEventId !== this._getCurrentReadReceipt() &&  // 2.
+            (pos < 0 || pos === null); // 3., 4.
     },
 
     /**

From 0b06e979cb1bd0cd3ea3174379782cb6d41f5d77 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 27 Apr 2017 17:57:13 +0100
Subject: [PATCH 054/312] Add optional tintable SVG icon for SimpleRoomHeader

---
 src/components/views/rooms/SimpleRoomHeader.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index 40995d2a72..1559f7ef85 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -19,6 +19,7 @@ limitations under the License.
 import React from 'react';
 import dis from '../../../dispatcher';
 import AccessibleButton from '../elements/AccessibleButton';
+import sdk from '../../../index';
 
 // cancel button which is shared between room header and simple room header
 export function CancelButton(props) {
@@ -43,8 +44,8 @@ export default React.createClass({
         title: React.PropTypes.string,
         onCancelClick: React.PropTypes.func,
 
-        // is the RightPanel collapsed?
-        collapsedRhs: React.PropTypes.bool,
+        // `src` to a TintableSvg. Optional.
+        icon: React.PropTypes.string,
     },
 
     onShowRhsClick: function(ev) {
@@ -53,9 +54,17 @@ export default React.createClass({
 
     render: function() {
         let cancelButton;
+        let icon;
         if (this.props.onCancelClick) {
             cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
         }
+        if (this.props.icon) {
+            const TintableSvg = sdk.getComponent('elements.TintableSvg');
+            icon = <TintableSvg
+                className="mx_RoomHeader_icon" src={this.props.icon}
+                width="25" height="25"
+            />;
+        }
 
         let showRhsButton;
         /* // don't bother cluttering things up with this for now.
@@ -73,6 +82,7 @@ export default React.createClass({
             <div className="mx_RoomHeader" >
                 <div className="mx_RoomHeader_wrapper">
                     <div className="mx_RoomHeader_simpleHeader">
+                        { icon }
                         { this.props.title }
                         { showRhsButton }
                         { cancelButton }

From 88abe54ffe1a1e55ad0f43910e61a40fb711e204 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 27 Apr 2017 17:58:02 +0100
Subject: [PATCH 055/312] Give the SRH its prop back

---
 src/components/views/rooms/SimpleRoomHeader.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index 1559f7ef85..a6f342af86 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -44,6 +44,9 @@ export default React.createClass({
         title: React.PropTypes.string,
         onCancelClick: React.PropTypes.func,
 
+        // is the RightPanel collapsed?
+        collapsedRhs: React.PropTypes.bool,
+
         // `src` to a TintableSvg. Optional.
         icon: React.PropTypes.string,
     },

From 19482d751d82c162321d99c5bf95ac8fe950768b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 28 Apr 2017 00:52:31 +0100
Subject: [PATCH 056/312] comment out spammy CTD logging

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

diff --git a/src/ConstantTimeDispatcher.js b/src/ConstantTimeDispatcher.js
index 265ee11fd4..6c2c3266aa 100644
--- a/src/ConstantTimeDispatcher.js
+++ b/src/ConstantTimeDispatcher.js
@@ -47,7 +47,7 @@ class ConstantTimeDispatcher {
 
     dispatch(type, arg, params) {
         if (!this.listeners[type] || !this.listeners[type][arg]) {
-            console.warn("No registered listeners for dispatch (type=" + type + ", arg=" + arg + ")");
+            //console.warn("No registered listeners for dispatch (type=" + type + ", arg=" + arg + ")");
             return;
         }
         this.listeners[type][arg].forEach(listener=>{

From c9c72036f38e500a88f5b9e0b7b57808a583f0ab Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Fri, 28 Apr 2017 01:00:10 +0100
Subject: [PATCH 057/312] Change wording

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

diff --git a/src/Notifier.js b/src/Notifier.js
index fed2760732..f68b7e562c 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -134,8 +134,10 @@ const Notifier = {
                 if (result !== 'granted') {
                     // The permission request was dismissed or denied
                     const description = result === 'denied'
-                        ? 'Your browser is not permitting this app to send you notifications.'
-                        : 'It seems you didn\'t accept notifications when your browser asked';
+                        ? 'Riot does not have permission to send you notifications'
+                        + ' - please check your browser settings'
+                        : 'Riot was not given permission to send notifications'
+                        + '- please try again';
                     const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
                     Modal.createDialog(ErrorDialog, {
                         title: 'Unable to enable Notifications',

From 47827e0b81c8db6977d2a628451daf9db348c5b5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Fri, 28 Apr 2017 01:00:50 +0100
Subject: [PATCH 058/312] un-eat the space

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

diff --git a/src/Notifier.js b/src/Notifier.js
index f68b7e562c..6473ab4d9c 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -137,7 +137,7 @@ const Notifier = {
                         ? 'Riot does not have permission to send you notifications'
                         + ' - please check your browser settings'
                         : 'Riot was not given permission to send notifications'
-                        + '- please try again';
+                        + ' - please try again';
                     const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
                     Modal.createDialog(ErrorDialog, {
                         title: 'Unable to enable Notifications',

From f5f35e32946a6690615eaecffe77c723f8567950 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 26 Apr 2017 18:59:16 +0100
Subject: [PATCH 059/312] Make the left panel more friendly to new users

https://github.com/vector-im/riot-web/issues/3609
---
 src/components/views/rooms/RoomList.js | 118 +++++++++++++++++++------
 1 file changed, 89 insertions(+), 29 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 96ff65498f..39d3406b73 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -29,7 +29,14 @@ import DMRoomMap from '../../../utils/DMRoomMap';
 var Receipt = require('../../../utils/Receipt');
 var constantTimeDispatcher = require('../../../ConstantTimeDispatcher');
 
-var HIDE_CONFERENCE_CHANS = true;
+const HIDE_CONFERENCE_CHANS = true;
+
+const VERBS = {
+    'm.favourite': 'favourite',
+    'im.vector.fake.direct': 'tag direct chat',
+    'im.vector.fake.recent': 'restore',
+    'm.lowpriority': 'demote',
+};
 
 module.exports = React.createClass({
     displayName: 'RoomList',
@@ -53,6 +60,7 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             isLoadingLeftRooms: false,
+            totalRoomCount: null,
             lists: {},
             incomingCall: null,
         };
@@ -73,8 +81,7 @@ module.exports = React.createClass({
         // lookup for which lists a given roomId is currently in.
         this.listsForRoomId = {};
 
-        var s = this.getRoomLists();
-        this.setState(s);
+        this.refreshRoomList();
 
         // order of the sublists
         //this.listOrder = [];
@@ -317,21 +324,29 @@ module.exports = React.createClass({
         // any changes to it incrementally, updating the appropriate sublists
         // as needed.
         // Alternatively we'd do something magical with Immutable.js or similar.
-        this.setState(this.getRoomLists());
+        const lists = this.getRoomLists();
+        let totalRooms = 0;
+        for (const l of Object.values(lists)) {
+            totalRooms += l.length;
+        }
+        this.setState({
+            lists: this.getRoomLists(),
+            totalRoomCount: totalRooms,
+        });
         
         // this._lastRefreshRoomListTs = Date.now();
     },
 
     getRoomLists: function() {
         var self = this;
-        var s = { lists: {} };
+        const lists = {};
 
-        s.lists["im.vector.fake.invite"] = [];
-        s.lists["m.favourite"] = [];
-        s.lists["im.vector.fake.recent"] = [];
-        s.lists["im.vector.fake.direct"] = [];
-        s.lists["m.lowpriority"] = [];
-        s.lists["im.vector.fake.archived"] = [];
+        lists["im.vector.fake.invite"] = [];
+        lists["m.favourite"] = [];
+        lists["im.vector.fake.recent"] = [];
+        lists["im.vector.fake.direct"] = [];
+        lists["m.lowpriority"] = [];
+        lists["im.vector.fake.archived"] = [];
 
         this.listsForRoomId = {};
         var otherTagNames = {};
@@ -353,7 +368,7 @@ module.exports = React.createClass({
 
             if (me.membership == "invite") {
                 self.listsForRoomId[room.roomId].push("im.vector.fake.invite");
-                s.lists["im.vector.fake.invite"].push(room);
+                lists["im.vector.fake.invite"].push(room);
             }
             else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
                 // skip past this room & don't put it in any lists
@@ -366,8 +381,8 @@ module.exports = React.createClass({
                 if (tagNames.length) {
                     for (var i = 0; i < tagNames.length; i++) {
                         var tagName = tagNames[i];
-                        s.lists[tagName] = s.lists[tagName] || [];
-                        s.lists[tagName].push(room);
+                        lists[tagName] = lists[tagName] || [];
+                        lists[tagName].push(room);
                         self.listsForRoomId[room.roomId].push(tagName);
                         otherTagNames[tagName] = 1;
                     }
@@ -375,46 +390,46 @@ module.exports = React.createClass({
                 else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
                     // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
                     self.listsForRoomId[room.roomId].push("im.vector.fake.direct");
-                    s.lists["im.vector.fake.direct"].push(room);
+                    lists["im.vector.fake.direct"].push(room);
                 }
                 else {
                     self.listsForRoomId[room.roomId].push("im.vector.fake.recent");
-                    s.lists["im.vector.fake.recent"].push(room);
+                    lists["im.vector.fake.recent"].push(room);
                 }
             }
             else if (me.membership === "leave") {
                 self.listsForRoomId[room.roomId].push("im.vector.fake.archived");
-                s.lists["im.vector.fake.archived"].push(room);
+                lists["im.vector.fake.archived"].push(room);
             }
             else {
                 console.error("unrecognised membership: " + me.membership + " - this should never happen");
             }
         });
 
-        if (s.lists["im.vector.fake.direct"].length == 0 &&
+        if (lists["im.vector.fake.direct"].length == 0 &&
             MatrixClientPeg.get().getAccountData('m.direct') === undefined &&
             !MatrixClientPeg.get().isGuest())
         {
             // scan through the 'recents' list for any rooms which look like DM rooms
             // and make them DM rooms
-            const oldRecents = s.lists["im.vector.fake.recent"];
-            s.lists["im.vector.fake.recent"] = [];
+            const oldRecents = lists["im.vector.fake.recent"];
+            lists["im.vector.fake.recent"] = [];
 
             for (const room of oldRecents) {
                 const me = room.getMember(MatrixClientPeg.get().credentials.userId);
 
                 if (me && Rooms.looksLikeDirectMessageRoom(room, me)) {
                     self.listsForRoomId[room.roomId].push("im.vector.fake.direct");
-                    s.lists["im.vector.fake.direct"].push(room);
+                    lists["im.vector.fake.direct"].push(room);
                 } else {
                     self.listsForRoomId[room.roomId].push("im.vector.fake.recent");
-                    s.lists["im.vector.fake.recent"].push(room);
+                    lists["im.vector.fake.recent"].push(room);
                 }
             }
 
             // save these new guessed DM rooms into the account data
             const newMDirectEvent = {};
-            for (const room of s.lists["im.vector.fake.direct"]) {
+            for (const room of lists["im.vector.fake.direct"]) {
                 const me = room.getMember(MatrixClientPeg.get().credentials.userId);
                 const otherPerson = Rooms.getOnlyOtherMember(room, me);
                 if (!otherPerson) continue;
@@ -449,7 +464,7 @@ module.exports = React.createClass({
         ];
 */
 
-        return s;
+        return lists;
     },
 
     _getScrollNode: function() {
@@ -479,6 +494,7 @@ module.exports = React.createClass({
         var incomingCallBox = document.getElementById("incomingCallBox");
         if (incomingCallBox && incomingCallBox.parentElement) {
             var 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;
@@ -502,6 +518,7 @@ module.exports = React.createClass({
     // properly through React
     _initAndPositionStickyHeaders: function(initialise, scrollToPosition) {
         var 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;
@@ -599,6 +616,49 @@ module.exports = React.createClass({
         this.refs.gemscroll.forceUpdate();
     },
 
+    _getEmptyContent: function(section) {
+        let greyed = false;
+        if (this.state.totalRoomCount === 0) {
+            const TintableSvg = sdk.getComponent('elements.TintableSvg');
+            switch (section) {
+                case 'm.favourite':
+                case 'm.lowpriority':
+                    greyed = true;
+                    break;
+                case 'im.vector.fake.direct':
+                    return <div className="mx_RoomList_emptySubListTip">
+                        <div className="mx_RoomList_butonPreview">
+                            <TintableSvg src="img/icons-people.svg" width="25" height="25" />
+                        </div>
+                        Use the button below to chat with someone!
+                    </div>;
+                case 'im.vector.fake.recent':
+                    return <div className="mx_RoomList_emptySubListTip">
+                        <div className="mx_RoomList_butonPreview">
+                            <TintableSvg src="img/icons-directory.svg" width="25" height="25" />
+                        </div>
+                        Use the button below to browse the room directory
+                        <br /><br />
+                        <div className="mx_RoomList_butonPreview">
+                            <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
+                        </div>
+                        or this button to start a new one!
+                    </div>;
+            }
+        }
+        const RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget');
+
+        const labelText = 'Drop here to ' + (VERBS[section] || 'tag ' + section);
+
+        let label;
+        if (greyed) {
+            label = <span className="mx_RoomList_greyedSubListLabel">{labelText}</span>;
+        } else {
+            label = labelText;
+        }
+        return <RoomDropTarget label={label} />;
+    },
+
     render: function() {
         var RoomSubList = sdk.getComponent('structures.RoomSubList');
         var self = this;
@@ -622,7 +682,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['m.favourite'] }
                              label="Favourites"
                              tagName="m.favourite"
-                             verb="favourite"
+                             emptyContent={this._getEmptyContent('m.favourite')}
                              editable={ true }
                              order="manual"
                              incomingCall={ self.state.incomingCall }
@@ -635,7 +695,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
                              label="People"
                              tagName="im.vector.fake.direct"
-                             verb="tag direct chat"
+                             emptyContent={this._getEmptyContent('im.vector.fake.direct')}
                              editable={ true }
                              order="recent"
                              incomingCall={ self.state.incomingCall }
@@ -650,7 +710,7 @@ module.exports = React.createClass({
                              label="Rooms"
                              tagName="im.vector.fake.recent"
                              editable={ true }
-                             verb="restore"
+                             emptyContent={this._getEmptyContent('im.vector.fake.recent')}
                              order="recent"
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
@@ -665,7 +725,7 @@ module.exports = React.createClass({
                              key={ tagName }
                              label={ tagName }
                              tagName={ tagName }
-                             verb={ "tag as " + tagName }
+                             emptyContent={this._getEmptyContent(tagName)}
                              editable={ true }
                              order="manual"
                              incomingCall={ self.state.incomingCall }
@@ -681,7 +741,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['m.lowpriority'] }
                              label="Low priority"
                              tagName="m.lowpriority"
-                             verb="demote"
+                             emptyContent={this._getEmptyContent('m.lowpriority')}
                              editable={ true }
                              order="recent"
                              incomingCall={ self.state.incomingCall }

From 083d5bf4632ca43bc9c255a43946cc6978ab9951 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 28 Apr 2017 11:20:29 +0100
Subject: [PATCH 060/312] Other empty sections no longer need to be greyed

---
 src/components/views/rooms/RoomList.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 39d3406b73..963f5ad425 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -617,14 +617,9 @@ module.exports = React.createClass({
     },
 
     _getEmptyContent: function(section) {
-        let greyed = false;
         if (this.state.totalRoomCount === 0) {
             const TintableSvg = sdk.getComponent('elements.TintableSvg');
             switch (section) {
-                case 'm.favourite':
-                case 'm.lowpriority':
-                    greyed = true;
-                    break;
                 case 'im.vector.fake.direct':
                     return <div className="mx_RoomList_emptySubListTip">
                         <div className="mx_RoomList_butonPreview">
@@ -650,13 +645,7 @@ module.exports = React.createClass({
 
         const labelText = 'Drop here to ' + (VERBS[section] || 'tag ' + section);
 
-        let label;
-        if (greyed) {
-            label = <span className="mx_RoomList_greyedSubListLabel">{labelText}</span>;
-        } else {
-            label = labelText;
-        }
-        return <RoomDropTarget label={label} />;
+        return <RoomDropTarget label={labelText} />;
     },
 
     render: function() {

From 6685cbcb25e76abd9304319e6f2f16dfc53e58f8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Apr 2017 06:13:03 +0100
Subject: [PATCH 061/312] make MessageComposerInput (new and old) warn on
 unload new needs binding due to class this ref being softer couldn't do this
 nicely in MessageComposer/Input as isTyping wasn't propagated.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposerInput.js    | 10 ++++++++++
 src/components/views/rooms/MessageComposerInputOld.js |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 8efd2fa579..672279ef54 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -93,6 +93,7 @@ export default class MessageComposerInput extends React.Component {
         this.onEscape = this.onEscape.bind(this);
         this.setDisplayedCompletion = this.setDisplayedCompletion.bind(this);
         this.onMarkdownToggleClicked = this.onMarkdownToggleClicked.bind(this);
+        this.onPageUnload = this.onPageUnload.bind(this);
 
         const isRichtextEnabled = UserSettingsStore.getSyncedSetting('MessageComposerInput.isRichTextEnabled', false);
 
@@ -233,11 +234,13 @@ export default class MessageComposerInput extends React.Component {
             this.refs.editor,
             this.props.room.roomId
         );
+        window.addEventListener('beforeunload', this.onPageUnload);
     }
 
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
         this.sentHistory.saveLastTextEntry();
+        window.removeEventListener('beforeunload', this.onPageUnload);
     }
 
     componentWillUpdate(nextProps, nextState) {
@@ -249,6 +252,13 @@ export default class MessageComposerInput extends React.Component {
         }
     }
 
+    onPageUnload(event) {
+        if (this.isTyping) {
+            return event.returnValue =
+                'You seem to be typing a message, are you sure you want to quit?';
+        }
+    }
+
     onAction(payload) {
         let editor = this.refs.editor;
         let contentState = this.state.editorState.getCurrentContent();
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index 378644478c..2a992cdf5f 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -177,11 +177,20 @@ export default React.createClass({
         if (this.props.tabComplete) {
             this.props.tabComplete.setTextArea(this.refs.textarea);
         }
+        window.addEventListener('beforeunload', this.onPageUnload);
     },
 
     componentWillUnmount: function() {
         dis.unregister(this.dispatcherRef);
         this.sentHistory.saveLastTextEntry();
+        window.removeEventListener('beforeunload', this.onPageUnload);
+    },
+
+    onPageUnload(event) {
+        if (this.isTyping) {
+            return event.returnValue =
+                'You seem to be typing a message, are you sure you want to quit?';
+        }
     },
 
     onAction: function(payload) {

From daae3bd1ecfae565ff1ed7958c564ff73fb0eae0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Apr 2017 06:25:30 +0100
Subject: [PATCH 062/312] warn on unload when uploading file(s)

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index a0c36374b6..9414a59e01 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -271,6 +271,7 @@ module.exports = React.createClass({
 
         this._updateConfCallNotification();
 
+        window.addEventListener('beforeunload', this.onPageUnload);
         window.addEventListener('resize', this.onResize);
         this.onResize();
 
@@ -353,6 +354,7 @@ module.exports = React.createClass({
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
         }
 
+        window.removeEventListener('beforeunload', this.onPageUnload);
         window.removeEventListener('resize', this.onResize);
 
         document.removeEventListener("keydown", this.onKeyDown);
@@ -365,6 +367,14 @@ module.exports = React.createClass({
         // Tinter.tint(); // reset colourscheme
     },
 
+    onPageUnload(event) {
+        if (ContentMessages.getCurrentUploads().length > 0) {
+            return event.returnValue =
+                'You seem to be uploading files, are you sure you want to quit?';
+        }
+    },
+
+
     onKeyDown: function(ev) {
         let handled = false;
         const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;

From 86a5ff42e952c52218f68937b83ac179fe290b83 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Apr 2017 14:22:06 +0100
Subject: [PATCH 063/312] Change max-len 90->120

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

diff --git a/.eslintrc.js b/.eslintrc.js
index 6cd0e1015e..74790a2964 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -64,7 +64,7 @@ module.exports = {
             // to JSX.
             ignorePattern: '^\\s*<',
             ignoreComments: true,
-            code: 90,
+            code: 120,
         }],
         "valid-jsdoc": ["warn"],
         "new-cap": ["warn"],

From c8fb18dc932bdfe6e64bce328b515a52d6c32607 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Sun, 30 Apr 2017 13:00:47 +0100
Subject: [PATCH 064/312] Pin filesize ver to fix break upstream

https://travis-ci.org/vector-im/riot-web/builds/227340622
https://github.com/avoidwork/filesize.js/issues/87
3.5.7 and 3.5.8 ver released <24h ago and broke stuff for us
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5c96a74f5b..95a82bbb73 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "draft-js-export-markdown": "^0.2.0",
     "emojione": "2.2.3",
     "file-saver": "^1.3.3",
-    "filesize": "^3.1.2",
+    "filesize": "3.5.6",
     "flux": "^2.0.3",
     "fuse.js": "^2.2.0",
     "glob": "^5.0.14",

From 3f25928380b36834e0cbe249938581ede9dc3c6e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 2 May 2017 16:34:39 +0100
Subject: [PATCH 065/312] Fix jumping to an unread event when in MELS

This adds the `data-contained-scroll-tokens` API to elements in `ScrollPanel` which allows arbitrary containers of elements with scroll tokens to declare their contained scroll tokens. When jumping to a scroll token inside a container, the `ScrollPanel` will act as if it is scrolling to the container itself, not the child.

MELS has been modified such that it exposes the scroll tokens of all events that exist within it.This means "Jump to unread message" will work if the unread event is within a MELS (which is any member event, because even individual member events surrounded by other events are put inside a MELS).
---
 src/components/structures/MessagePanel.js               | 1 -
 src/components/structures/ScrollPanel.js                | 5 +++++
 src/components/views/elements/MemberEventListSummary.js | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 246f351841..74aec61511 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -354,7 +354,6 @@ module.exports = React.createClass({
                     <MemberEventListSummary
                         key={key}
                         events={summarisedEvents}
-                        data-scroll-token={eventId}
                         onToggle={this._onWidgetLoad} // Update scroll state
                     >
                             {eventTiles}
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index d43e22e2f1..da3b303d89 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -551,6 +551,11 @@ module.exports = React.createClass({
         var messages = this.refs.itemlist.children;
         for (var i = messages.length-1; i >= 0; --i) {
             var m = messages[i];
+            if (m.dataset.containedScrollTokens &&
+                m.dataset.containedScrollTokens.indexOf(scrollToken) !== -1) {
+                node = m;
+                break;
+            }
             if (!m.dataset.scrollToken) continue;
             if (m.dataset.scrollToken == scrollToken) {
                 node = m;
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index 63bd2a7c39..a24e19577d 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -369,6 +369,7 @@ module.exports = React.createClass({
 
     render: function() {
         const eventsToRender = this.props.events;
+        const eventIds = eventsToRender.map(e => e.getId());
         const fewEvents = eventsToRender.length < this.props.threshold;
         const expanded = this.state.expanded || fewEvents;
 
@@ -379,7 +380,7 @@ module.exports = React.createClass({
 
         if (fewEvents) {
             return (
-                <div className="mx_MemberEventListSummary">
+                <div className="mx_MemberEventListSummary" data-contained-scroll-tokens={eventIds}>
                     {expandedEvents}
                 </div>
             );
@@ -437,7 +438,7 @@ module.exports = React.createClass({
         );
 
         return (
-            <div className="mx_MemberEventListSummary">
+            <div className="mx_MemberEventListSummary" data-contained-scroll-tokens={eventIds}>
                 {toggleButton}
                 {summaryContainer}
                 {expanded ? <div className="mx_MemberEventListSummary_line">&nbsp;</div> : null}

From fe83a99ab709121d2259b25d1a735babb2a022ee Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 2 May 2017 17:36:59 +0100
Subject: [PATCH 066/312] Update ScrollPanel docs

---
 src/components/structures/ScrollPanel.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index da3b303d89..7fa320d784 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -50,6 +50,10 @@ if (DEBUG_SCROLL) {
  * serialise the scroll state, and returned as the 'trackedScrollToken'
  * attribute by getScrollState().
  *
+ * Child elements that contain elements that have scroll tokens must declare the
+ * contained scroll tokens using 'data-contained-scroll-tokens`. When scrolling
+ * to a contained scroll token, the ScrollPanel will scroll to the container.
+ *
  * Some notes about the implementation:
  *
  * The saved 'scrollState' can exist in one of two states:

From 4febc63aeecee7613681749b3aa435cbd25ea17f Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 2 May 2017 17:41:09 +0100
Subject: [PATCH 067/312] Add comment to _scrollToToken

---
 src/components/structures/ScrollPanel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 7fa320d784..3f36fac89b 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -555,6 +555,9 @@ module.exports = React.createClass({
         var messages = this.refs.itemlist.children;
         for (var i = messages.length-1; i >= 0; --i) {
             var m = messages[i];
+            // 'data-contained-scroll-tokens' has been set, indicating that a child
+            // element contains elements that each have a token. Check this array of
+            // tokens for `scrollToken`.
             if (m.dataset.containedScrollTokens &&
                 m.dataset.containedScrollTokens.indexOf(scrollToken) !== -1) {
                 node = m;

From af137f8867dce643232c8edfa92294b8f87b3b89 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 2 May 2017 18:30:46 +0100
Subject: [PATCH 068/312] Validate phone number on login

To prevent confusion when accidently inputting mxid or email. Fixes https://github.com/vector-im/riot-web/issues/3637
---
 src/components/structures/login/Login.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 315a0ea242..a3635177e2 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -23,6 +23,9 @@ import url from 'url';
 import sdk from '../../../index';
 import Login from '../../../Login';
 
+// For validating phone numbers without country codes
+const PHONE_NUMBER_REGEX = /^[0-9\(\)\-\s]*$/;
+
 /**
  * A wire component which glues together login UI components and Login logic
  */
@@ -125,7 +128,16 @@ module.exports = React.createClass({
     },
 
     onPhoneNumberChanged: function(phoneNumber) {
-        this.setState({ phoneNumber: phoneNumber });
+        // Validate the phone number entered
+        if (!PHONE_NUMBER_REGEX.test(phoneNumber)) {
+            this.setState({ errorText: 'The phone number entered looks invalid' });
+            return;
+        }
+
+        this.setState({
+            phoneNumber: phoneNumber,
+            errorText: null,
+        });
     },
 
     onServerConfigChange: function(config) {

From 76e98d42679e5a1167ebad419ec66abfd70f7a3c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 May 2017 21:12:58 +0100
Subject: [PATCH 069/312] improve version hyperlinking removed redundant v
 prefix (key already says version) links to most applicable version/tag
 tag-commit -> commit commit1-commit2-commit3 -> commit1 (v)x.y.z ->
 tag<x.y.z> commit -> commit

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 25 +++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index ba5d5780b4..88e6829514 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -32,13 +32,22 @@ import AccessibleButton from '../views/elements/AccessibleButton';
 
 // if this looks like a release, use the 'version' from package.json; else use
 // the git sha. Prepend version with v, to look like riot-web version
-const REACT_SDK_VERSION = 'dist' in package_json ? `v${package_json.version}` : package_json.gitHead || '<local>';
+const REACT_SDK_VERSION = 'dist' in package_json ? package_json.version : package_json.gitHead || '<local>';
 
 // Simple method to help prettify GH Release Tags and Commit Hashes.
-const GHVersionUrl = function(repo, token) {
-    const uriTail = (token.startsWith('v') && token.includes('.')) ? `releases/tag/${token}` : `commit/${token}`;
-    return `https://github.com/${repo}/${uriTail}`;
-}
+const semVerRegex = /^v?(\d+\.\d+\.\d+)(?:-(?:\d+-g)?(.+))?|$/i;
+const gHVersionLabel = function(repo, token) {
+    const match = token.match(semVerRegex);
+    let url; // assume commit hash
+    if (match && match[1]) { // basic semVer string possibly with commit hash
+        url = (match.length > 1 && match[2])
+            ? `https://github.com/${repo}/commit/${match[2]}`
+            : `https://github.com/${repo}/releases/tag/v${match[1]}`;
+    } else {
+        url = `https://github.com/${repo}/commit/${token.split('-')[0]}`;
+    }
+    return <a href={url}>{token}</a>;
+};
 
 // Enumerate some simple 'flip a bit' UI settings (if any).
 // 'id' gives the key name in the im.vector.web.settings account data event
@@ -911,7 +920,7 @@ module.exports = React.createClass({
         // we are using a version old version of olm. We assume the former.
         let olmVersionString = "<not-enabled>";
         if (olmVersion !== undefined) {
-            olmVersionString = `v${olmVersion[0]}.${olmVersion[1]}.${olmVersion[2]}`;
+            olmVersionString = `${olmVersion[0]}.${olmVersion[1]}.${olmVersion[2]}`;
         }
 
         return (
@@ -995,11 +1004,11 @@ module.exports = React.createClass({
                     </div>
                     <div className="mx_UserSettings_advanced">
                         matrix-react-sdk version: {(REACT_SDK_VERSION !== '<local>')
-                            ? <a href={ GHVersionUrl('matrix-org/matrix-react-sdk', REACT_SDK_VERSION) }>{REACT_SDK_VERSION}</a>
+                            ? gHVersionLabel('matrix-org/matrix-react-sdk', REACT_SDK_VERSION)
                             : REACT_SDK_VERSION
                         }<br/>
                         riot-web version: {(this.state.vectorVersion !== null)
-                            ? <a href={ GHVersionUrl('vector-im/riot-web', this.state.vectorVersion.split('-')[0]) }>{this.state.vectorVersion}</a>
+                            ? gHVersionLabel('vector-im/riot-web', this.state.vectorVersion)
                             : 'unknown'
                         }<br/>
                         olm version: {olmVersionString}<br/>

From 74b2c86f93db0692311750c2a1d38339a44eb72a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 May 2017 21:17:12 +0100
Subject: [PATCH 070/312] tidy up UserSettings

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/UserSettings.js | 177 +++++++++++-----------
 1 file changed, 88 insertions(+), 89 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 88e6829514..4b63c8d888 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -14,25 +14,25 @@ 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 ReactDOM = require('react-dom');
-var sdk = require('../../index');
-var MatrixClientPeg = require("../../MatrixClientPeg");
-var PlatformPeg = require("../../PlatformPeg");
-var Modal = require('../../Modal');
-var dis = require("../../dispatcher");
-var q = require('q');
-var package_json = require('../../../package.json');
-var UserSettingsStore = require('../../UserSettingsStore');
-var GeminiScrollbar = require('react-gemini-scrollbar');
-var Email = require('../../email');
-var AddThreepid = require('../../AddThreepid');
-var SdkConfig = require('../../SdkConfig');
+const React = require('react');
+const ReactDOM = require('react-dom');
+const sdk = require('../../index');
+const MatrixClientPeg = require("../../MatrixClientPeg");
+const PlatformPeg = require("../../PlatformPeg");
+const Modal = require('../../Modal');
+const dis = require("../../dispatcher");
+const q = require('q');
+const packageJson = require('../../../package.json');
+const UserSettingsStore = require('../../UserSettingsStore');
+const GeminiScrollbar = require('react-gemini-scrollbar');
+const Email = require('../../email');
+const AddThreepid = require('../../AddThreepid');
+const SdkConfig = require('../../SdkConfig');
 import AccessibleButton from '../views/elements/AccessibleButton';
 
 // if this looks like a release, use the 'version' from package.json; else use
 // the git sha. Prepend version with v, to look like riot-web version
-const REACT_SDK_VERSION = 'dist' in package_json ? package_json.version : package_json.gitHead || '<local>';
+const REACT_SDK_VERSION = 'dist' in packageJson ? packageJson.version : packageJson.gitHead || '<local>';
 
 // Simple method to help prettify GH Release Tags and Commit Hashes.
 const semVerRegex = /^v?(\d+\.\d+\.\d+)(?:-(?:\d+-g)?(.+))?|$/i;
@@ -59,7 +59,7 @@ const SETTINGS_LABELS = [
     },
     {
         id: 'hideReadReceipts',
-        label: 'Hide read receipts'
+        label: 'Hide read receipts',
     },
     {
         id: 'dontSendTypingNotifications',
@@ -115,7 +115,7 @@ const THEMES = [
         id: 'theme',
         label: 'Dark theme',
         value: 'dark',
-    }
+    },
 ];
 
 
@@ -189,7 +189,7 @@ module.exports = React.createClass({
         });
         this._refreshFromServer();
 
-        var syncedSettings = UserSettingsStore.getSyncedSettings();
+        const syncedSettings = UserSettingsStore.getSyncedSettings();
         if (!syncedSettings.theme) {
             syncedSettings.theme = 'light';
         }
@@ -211,16 +211,16 @@ module.exports = React.createClass({
             middleOpacity: 1.0,
         });
         dis.unregister(this.dispatcherRef);
-        let cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.get();
         if (cli) {
             cli.removeListener("RoomMember.membership", this._onInviteStateChange);
         }
     },
 
     _refreshFromServer: function() {
-        var self = this;
+        const self = this;
         q.all([
-            UserSettingsStore.loadProfileInfo(), UserSettingsStore.loadThreePids()
+            UserSettingsStore.loadProfileInfo(), UserSettingsStore.loadThreePids(),
         ]).done(function(resps) {
             self.setState({
                 avatarUrl: resps[0].avatar_url,
@@ -228,7 +228,7 @@ module.exports = React.createClass({
                 phase: "UserSettings.DISPLAY",
             });
         }, function(error) {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to load user settings: " + error);
             Modal.createDialog(ErrorDialog, {
                 title: "Can't load user settings",
@@ -245,7 +245,7 @@ module.exports = React.createClass({
 
     onAvatarPickerClick: function(ev) {
         if (MatrixClientPeg.get().isGuest()) {
-            var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
+            const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
                 title: "Please Register",
                 description: "Guests can't set avatars. Please register.",
@@ -259,8 +259,8 @@ module.exports = React.createClass({
     },
 
     onAvatarSelected: function(ev) {
-        var self = this;
-        var changeAvatar = this.refs.changeAvatar;
+        const self = this;
+        const changeAvatar = this.refs.changeAvatar;
         if (!changeAvatar) {
             console.error("No ChangeAvatar found to upload image to!");
             return;
@@ -269,9 +269,9 @@ module.exports = React.createClass({
             // dunno if the avatar changed, re-check it.
             self._refreshFromServer();
         }, function(err) {
-            var errMsg = (typeof err === "string") ? err : (err.error || "");
+            // const errMsg = (typeof err === "string") ? err : (err.error || "");
             console.error("Failed to set avatar: " + err);
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
                 title: "Failed to set avatar",
                 description: ((err && err.message) ? err.message : "Operation failed"),
@@ -280,7 +280,7 @@ module.exports = React.createClass({
     },
 
     onLogoutClicked: function(ev) {
-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
             title: "Sign out?",
             description:
@@ -295,7 +295,7 @@ module.exports = React.createClass({
                 <button key="export" className="mx_Dialog_primary"
                         onClick={this._onExportE2eKeysClicked}>
                     Export E2E room keys
-                </button>
+                </button>,
             ],
             onFinished: (confirmed) => {
                 if (confirmed) {
@@ -309,34 +309,33 @@ module.exports = React.createClass({
     },
 
     onPasswordChangeError: function(err) {
-        var errMsg = err.error || "";
+        let errMsg = err.error || "";
         if (err.httpStatus === 403) {
             errMsg = "Failed to change password. Is your password correct?";
-        }
-        else if (err.httpStatus) {
+        } else if (err.httpStatus) {
             errMsg += ` (HTTP status ${err.httpStatus})`;
         }
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         console.error("Failed to change password: " + errMsg);
         Modal.createDialog(ErrorDialog, {
             title: "Error",
-            description: errMsg
+            description: errMsg,
         });
     },
 
     onPasswordChanged: function() {
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createDialog(ErrorDialog, {
             title: "Success",
             description: `Your password was successfully changed. You will not
                           receive push notifications on other devices until you
-                          log back in to them.`
+                          log back in to them.`,
         });
     },
 
     onUpgradeClicked: function() {
         dis.dispatch({
-            action: "start_upgrade_registration"
+            action: "start_upgrade_registration",
         });
     },
 
@@ -350,11 +349,11 @@ module.exports = React.createClass({
     },
 
     _addEmail: function() {
-        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
-        var email_address = this.refs.add_email_input.value;
-        if (!Email.looksValid(email_address)) {
+        const emailAddress = this.refs.add_email_input.value;
+        if (!Email.looksValid(emailAddress)) {
             Modal.createDialog(ErrorDialog, {
                 title: "Invalid Email Address",
                 description: "This doesn't appear to be a valid email address",
@@ -364,7 +363,7 @@ module.exports = React.createClass({
         this._addThreepid = new AddThreepid();
         // we always bind emails when registering, so let's do the
         // same here.
-        this._addThreepid.addEmailAddress(email_address, true).done(() => {
+        this._addThreepid.addEmailAddress(emailAddress, true).done(() => {
             Modal.createDialog(QuestionDialog, {
                 title: "Verification Pending",
                 description: "Please check your email and click on the link it contains. Once this is done, click continue.",
@@ -373,7 +372,7 @@ module.exports = React.createClass({
             });
         }, (err) => {
             this.setState({email_add_pending: false});
-            console.error("Unable to add email address " + email_address + " " + err);
+            console.error("Unable to add email address " + emailAddress + " " + err);
             Modal.createDialog(ErrorDialog, {
                 title: "Unable to add email address",
                 description: ((err && err.message) ? err.message : "Operation failed"),
@@ -427,9 +426,9 @@ module.exports = React.createClass({
             this.setState({email_add_pending: false});
         }, (err) => {
             this.setState({email_add_pending: false});
-            if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
-                var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                var message = "Unable to verify email address. ";
+            if (err.errcode === 'M_THREEPID_AUTH_FAILED') {
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                let message = "Unable to verify email address. ";
                 message += "Please check your email and click on the link it contains. Once this is done, click continue.";
                 Modal.createDialog(QuestionDialog, {
                     title: "Verification Pending",
@@ -438,7 +437,7 @@ module.exports = React.createClass({
                     onFinished: this.onEmailDialogFinished,
                 });
             } else {
-                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Unable to verify email address: " + err);
                 Modal.createDialog(ErrorDialog, {
                     title: "Unable to verify email address",
@@ -478,17 +477,17 @@ module.exports = React.createClass({
 
     _onRejectAllInvitesClicked: function(rooms, ev) {
         this.setState({
-            rejectingInvites: true
+            rejectingInvites: true,
         });
         // reject the invites
-        let promises = rooms.map((room) => {
+        const promises = rooms.map((room) => {
             return MatrixClientPeg.get().leave(room.roomId);
         });
         // purposefully drop errors to the floor: we'll just have a non-zero number on the UI
         // after trying to reject all the invites.
         q.allSettled(promises).then(() => {
             this.setState({
-                rejectingInvites: false
+                rejectingInvites: false,
             });
         }).done();
     },
@@ -501,7 +500,7 @@ module.exports = React.createClass({
                 }, "e2e-export");
             }, {
                 matrixClient: MatrixClientPeg.get(),
-            }
+            },
         );
     },
 
@@ -513,7 +512,7 @@ module.exports = React.createClass({
                 }, "e2e-export");
             }, {
                 matrixClient: MatrixClientPeg.get(),
-            }
+            },
         );
     },
 
@@ -539,7 +538,7 @@ module.exports = React.createClass({
     },
 
     _renderUserInterfaceSettings: function() {
-        var client = MatrixClientPeg.get();
+        // const client = MatrixClientPeg.get();
 
         return (
             <div>
@@ -558,7 +557,7 @@ module.exports = React.createClass({
             <input id="urlPreviewsDisabled"
                    type="checkbox"
                    defaultChecked={ UserSettingsStore.getUrlPreviewsDisabled() }
-                   onChange={ e => UserSettingsStore.setUrlPreviewsDisabled(e.target.checked) }
+                   onChange={ (e) => UserSettingsStore.setUrlPreviewsDisabled(e.target.checked) }
             />
             <label htmlFor="urlPreviewsDisabled">
                 Disable inline URL previews by default
@@ -571,7 +570,7 @@ module.exports = React.createClass({
             <input id={ setting.id }
                    type="checkbox"
                    defaultChecked={ this._syncedSettings[setting.id] }
-                   onChange={ e => UserSettingsStore.setSyncedSetting(setting.id, e.target.checked) }
+                   onChange={ (e) => UserSettingsStore.setSyncedSetting(setting.id, e.target.checked) }
             />
             <label htmlFor={ setting.id }>
                 { setting.label }
@@ -586,7 +585,7 @@ module.exports = React.createClass({
                    name={ setting.id }
                    value={ setting.value }
                    defaultChecked={ this._syncedSettings[setting.id] === setting.value }
-                   onChange={ e => {
+                   onChange={ (e) => {
                             if (e.target.checked) {
                                 UserSettingsStore.setSyncedSetting(setting.id, setting.value);
                             }
@@ -629,8 +628,8 @@ module.exports = React.createClass({
                 <h3>Cryptography</h3>
                 <div className="mx_UserSettings_section mx_UserSettings_cryptoSection">
                     <ul>
-                        <li><label>Device ID:</label>             <span><code>{deviceId}</code></span></li>
-                        <li><label>Device key:</label>            <span><code><b>{identityKey}</b></code></span></li>
+                        <li><label>Device ID:</label>                       <span><code>{deviceId}</code></span></li>
+                        <li><label>Device key:</label>                      <span><code><b>{identityKey}</b></code></span></li>
                     </ul>
                     { importExportButtons }
                 </div>
@@ -648,8 +647,8 @@ module.exports = React.createClass({
                    type="checkbox"
                    defaultChecked={ this._localSettings[setting.id] }
                    onChange={
-                        e => {
-                            UserSettingsStore.setLocalSetting(setting.id, e.target.checked)
+                        (e) => {
+                            UserSettingsStore.setLocalSetting(setting.id, e.target.checked);
                             if (setting.id === 'blacklistUnverifiedDevices') { // XXX: this is a bit ugly
                                 client.setGlobalBlacklistUnverifiedDevices(e.target.checked);
                             }
@@ -663,7 +662,7 @@ module.exports = React.createClass({
     },
 
     _renderDevicesPanel: function() {
-        var DevicesPanel = sdk.getComponent('settings.DevicesPanel');
+        const DevicesPanel = sdk.getComponent('settings.DevicesPanel');
         return (
             <div>
                 <h3>Devices</h3>
@@ -674,7 +673,7 @@ module.exports = React.createClass({
 
     _renderBugReport: function() {
         if (!SdkConfig.get().bug_report_endpoint_url) {
-            return <div />
+            return <div />;
         }
         return (
             <div>
@@ -693,17 +692,17 @@ module.exports = React.createClass({
         // default to enabled if undefined
         if (this.props.enableLabs === false) return null;
 
-        let features = UserSettingsStore.LABS_FEATURES.map(feature => (
+        const features = UserSettingsStore.LABS_FEATURES.map((feature) => (
             <div key={feature.id} className="mx_UserSettings_toggle">
                 <input
                     type="checkbox"
                     id={feature.id}
                     name={feature.id}
                     defaultChecked={ UserSettingsStore.isFeatureEnabled(feature.id) }
-                    onChange={e => {
+                    onChange={(e) => {
                         if (MatrixClientPeg.get().isGuest()) {
                             e.target.checked = false;
-                            var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
+                            const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                             Modal.createDialog(NeedToRegisterDialog, {
                                 title: "Please Register",
                                 description: "Guests can't use labs features. Please register.",
@@ -755,14 +754,14 @@ module.exports = React.createClass({
     },
 
     _renderBulkOptions: function() {
-        let invitedRooms = MatrixClientPeg.get().getRooms().filter((r) => {
+        const invitedRooms = MatrixClientPeg.get().getRooms().filter((r) => {
             return r.hasMembershipState(this._me, "invite");
         });
         if (invitedRooms.length === 0) {
             return null;
         }
 
-        let Spinner = sdk.getComponent("elements.Spinner");
+        const Spinner = sdk.getComponent("elements.Spinner");
 
         let reject = <Spinner />;
         if (!this.state.rejectingInvites) {
@@ -786,9 +785,7 @@ module.exports = React.createClass({
 
     _showSpoiler: function(event) {
         const target = event.target;
-        const hidden = target.getAttribute('data-spoiler');
-
-        target.innerHTML = hidden;
+        target.innerHTML = target.getAttribute('data-spoiler');
 
         const range = document.createRange();
         range.selectNodeContents(target);
@@ -799,12 +796,12 @@ module.exports = React.createClass({
     },
 
     nameForMedium: function(medium) {
-        if (medium == 'msisdn') return 'Phone';
+        if (medium === 'msisdn') return 'Phone';
         return medium[0].toUpperCase() + medium.slice(1);
     },
 
     presentableTextForThreepid: function(threepid) {
-        if (threepid.medium == 'msisdn') {
+        if (threepid.medium === 'msisdn') {
             return '+' + threepid.address;
         } else {
             return threepid.address;
@@ -812,7 +809,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        var Loader = sdk.getComponent("elements.Spinner");
+        const Loader = sdk.getComponent("elements.Spinner");
         switch (this.state.phase) {
             case "UserSettings.LOADING":
                 return (
@@ -824,18 +821,18 @@ module.exports = React.createClass({
                 throw new Error("Unknown state.phase => " + this.state.phase);
         }
         // can only get here if phase is UserSettings.DISPLAY
-        var SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
-        var ChangeDisplayName = sdk.getComponent("views.settings.ChangeDisplayName");
-        var ChangePassword = sdk.getComponent("views.settings.ChangePassword");
-        var ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
-        var Notifications = sdk.getComponent("settings.Notifications");
-        var EditableText = sdk.getComponent('elements.EditableText');
+        const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
+        const ChangeDisplayName = sdk.getComponent("views.settings.ChangeDisplayName");
+        const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
+        const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
+        const Notifications = sdk.getComponent("settings.Notifications");
+        const EditableText = sdk.getComponent('elements.EditableText');
 
-        var avatarUrl = (
+        const avatarUrl = (
             this.state.avatarUrl ? MatrixClientPeg.get().mxcUrlToHttp(this.state.avatarUrl) : null
         );
 
-        var threepidsSection = this.state.threepids.map((val, pidIndex) => {
+        const threepidsSection = this.state.threepids.map((val, pidIndex) => {
             const id = "3pid-" + val.address;
             return (
                 <div className="mx_UserSettings_profileTableRow" key={pidIndex}>
@@ -883,7 +880,7 @@ module.exports = React.createClass({
         threepidsSection.push(addEmailSection);
         threepidsSection.push(addMsisdnSection);
 
-        var accountJsx;
+        let accountJsx;
 
         if (MatrixClientPeg.get().isGuest()) {
             accountJsx = (
@@ -891,8 +888,7 @@ module.exports = React.createClass({
                     Create an account
                 </div>
             );
-        }
-        else {
+        } else {
             accountJsx = (
                 <ChangePassword
                         className="mx_UserSettings_accountTable"
@@ -904,9 +900,9 @@ module.exports = React.createClass({
                         onFinished={this.onPasswordChanged} />
             );
         }
-        var notification_area;
+        let notificationArea;
         if (!MatrixClientPeg.get().isGuest() && this.state.threepids !== undefined) {
-            notification_area = (<div>
+            notificationArea = (<div>
                 <h3>Notifications</h3>
 
                 <div className="mx_UserSettings_section">
@@ -978,7 +974,7 @@ module.exports = React.createClass({
 
                 {this._renderReferral()}
 
-                {notification_area}
+                {notificationArea}
 
                 {this._renderUserInterfaceSettings()}
                 {this._renderLabs()}
@@ -994,7 +990,10 @@ module.exports = React.createClass({
                         Logged in as {this._me}
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        Access Token: <span className="mx_UserSettings_advanced_spoiler" onClick={this._showSpoiler} data-spoiler={ MatrixClientPeg.get().getAccessToken() }>&lt;click to reveal&gt;</span>
+                        Access Token: <span className="mx_UserSettings_advanced_spoiler"
+                                            onClick={this._showSpoiler}
+                                            data-spoiler={ MatrixClientPeg.get().getAccessToken() }
+                        >&lt;click to reveal&gt;</span>
                     </div>
                     <div className="mx_UserSettings_advanced">
                         Homeserver is { MatrixClientPeg.get().getHomeserverUrl() }
@@ -1022,5 +1021,5 @@ module.exports = React.createClass({
                 </GeminiScrollbar>
             </div>
         );
-    }
+    },
 });

From b6fd771b9aaba669ef1b567c6d937f026533c2b4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 3 May 2017 16:21:35 +0100
Subject: [PATCH 071/312] move implementation to MessageComposer to it applies
 to any future composers

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposer.js         | 11 +++++++++++
 src/components/views/rooms/MessageComposerInput.js    | 10 ----------
 src/components/views/rooms/MessageComposerInputOld.js |  9 ---------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 88230062fe..2161198142 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -43,6 +43,7 @@ export default class MessageComposer extends React.Component {
         this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
         this.onInputStateChanged = this.onInputStateChanged.bind(this);
         this.onEvent = this.onEvent.bind(this);
+        this.onPageUnload = this.onPageUnload.bind(this);
 
         this.state = {
             autocompleteQuery: '',
@@ -64,12 +65,22 @@ export default class MessageComposer extends React.Component {
         // marked as encrypted.
         // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
         MatrixClientPeg.get().on("event", this.onEvent);
+
+        window.addEventListener('beforeunload', this.onPageUnload);
     }
 
     componentWillUnmount() {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("event", this.onEvent);
         }
+        window.removeEventListener('beforeunload', this.onPageUnload);
+    }
+
+    onPageUnload(event) {
+        if (this.messageComposerInput && this.messageComposerInput.isTyping) {
+            return event.returnValue =
+                'You seem to be typing a message, are you sure you want to quit?';
+        }
     }
 
     onEvent(event) {
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 672279ef54..8efd2fa579 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -93,7 +93,6 @@ export default class MessageComposerInput extends React.Component {
         this.onEscape = this.onEscape.bind(this);
         this.setDisplayedCompletion = this.setDisplayedCompletion.bind(this);
         this.onMarkdownToggleClicked = this.onMarkdownToggleClicked.bind(this);
-        this.onPageUnload = this.onPageUnload.bind(this);
 
         const isRichtextEnabled = UserSettingsStore.getSyncedSetting('MessageComposerInput.isRichTextEnabled', false);
 
@@ -234,13 +233,11 @@ export default class MessageComposerInput extends React.Component {
             this.refs.editor,
             this.props.room.roomId
         );
-        window.addEventListener('beforeunload', this.onPageUnload);
     }
 
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
         this.sentHistory.saveLastTextEntry();
-        window.removeEventListener('beforeunload', this.onPageUnload);
     }
 
     componentWillUpdate(nextProps, nextState) {
@@ -252,13 +249,6 @@ export default class MessageComposerInput extends React.Component {
         }
     }
 
-    onPageUnload(event) {
-        if (this.isTyping) {
-            return event.returnValue =
-                'You seem to be typing a message, are you sure you want to quit?';
-        }
-    }
-
     onAction(payload) {
         let editor = this.refs.editor;
         let contentState = this.state.editorState.getCurrentContent();
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index 2a992cdf5f..378644478c 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -177,20 +177,11 @@ export default React.createClass({
         if (this.props.tabComplete) {
             this.props.tabComplete.setTextArea(this.refs.textarea);
         }
-        window.addEventListener('beforeunload', this.onPageUnload);
     },
 
     componentWillUnmount: function() {
         dis.unregister(this.dispatcherRef);
         this.sentHistory.saveLastTextEntry();
-        window.removeEventListener('beforeunload', this.onPageUnload);
-    },
-
-    onPageUnload(event) {
-        if (this.isTyping) {
-            return event.returnValue =
-                'You seem to be typing a message, are you sure you want to quit?';
-        }
     },
 
     onAction: function(payload) {

From 356d29939c1deb2ce07694e653e0ee3c6d581d09 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 3 May 2017 16:25:27 +0100
Subject: [PATCH 072/312] also warn when quitting mid-call

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

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 0389b606aa..0cb246973b 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -100,6 +100,10 @@ module.exports = React.createClass({
         this._checkSize();
     },
 
+    componentDidMount: function() {
+        window.addEventListener('beforeunload', this.onPageUnload);
+    },
+
     componentDidUpdate: function() {
         this._checkSize();
     },
@@ -111,6 +115,7 @@ module.exports = React.createClass({
             client.removeListener("sync", this.onSyncStateChange);
             client.removeListener("RoomMember.typing", this.onRoomMemberTyping);
         }
+        window.removeEventListener('beforeunload', this.onPageUnload);
     },
 
     onSyncStateChange: function(state, prevState) {
@@ -128,6 +133,13 @@ module.exports = React.createClass({
         });
     },
 
+    onPageUnload(event) {
+        if (this.props.hasActiveCall) {
+            return event.returnValue =
+                'You seem to be in a call, are you sure you want to quit?';
+        }
+    },
+
     // Check whether current size is greater than 0, if yes call props.onVisible
     _checkSize: function () {
         if (this.props.onVisible && this._getSize()) {

From 9d92f93fcbf7208bc2ee37f3bf2fcb8e15629e07 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 3 May 2017 16:36:57 +0100
Subject: [PATCH 073/312] consolidate call onPageUnload handler into RoomView

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomStatusBar.js | 12 ------------
 src/components/structures/RoomView.js      |  3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 0cb246973b..0389b606aa 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -100,10 +100,6 @@ module.exports = React.createClass({
         this._checkSize();
     },
 
-    componentDidMount: function() {
-        window.addEventListener('beforeunload', this.onPageUnload);
-    },
-
     componentDidUpdate: function() {
         this._checkSize();
     },
@@ -115,7 +111,6 @@ module.exports = React.createClass({
             client.removeListener("sync", this.onSyncStateChange);
             client.removeListener("RoomMember.typing", this.onRoomMemberTyping);
         }
-        window.removeEventListener('beforeunload', this.onPageUnload);
     },
 
     onSyncStateChange: function(state, prevState) {
@@ -133,13 +128,6 @@ module.exports = React.createClass({
         });
     },
 
-    onPageUnload(event) {
-        if (this.props.hasActiveCall) {
-            return event.returnValue =
-                'You seem to be in a call, are you sure you want to quit?';
-        }
-    },
-
     // Check whether current size is greater than 0, if yes call props.onVisible
     _checkSize: function () {
         if (this.props.onVisible && this._getSize()) {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9414a59e01..1b3ed6e80d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -371,6 +371,9 @@ module.exports = React.createClass({
         if (ContentMessages.getCurrentUploads().length > 0) {
             return event.returnValue =
                 'You seem to be uploading files, are you sure you want to quit?';
+        } else if (this._getCallForRoom() && this.state.callState !== 'ended') {
+            return event.returnValue =
+                'You seem to be in a call, are you sure you want to quit?';
         }
     },
 

From bfa3123f9ba7f3aeab19c7205123c4639f7cd1ea Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 4 May 2017 10:00:13 +0100
Subject: [PATCH 074/312] Combine data-scroll-token and
 -contained-scroll-tokens

 - Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens
---
 src/components/structures/MessagePanel.js     |  2 +-
 src/components/structures/ScrollPanel.js      | 41 ++++++++-----------
 .../views/elements/MemberEventListSummary.js  |  6 +--
 .../views/rooms/SearchResultTile.js           |  2 +-
 .../components/structures/ScrollPanel-test.js |  2 +-
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 74aec61511..d4bf147ad5 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -472,7 +472,7 @@ module.exports = React.createClass({
         ret.push(
                 <li key={eventId}
                         ref={this._collectEventNode.bind(this, eventId)}
-                        data-scroll-token={scrollToken}>
+                        data-scroll-tokens={scrollToken}>
                     <EventTile mxEvent={mxEv} continuation={continuation}
                         isRedacted={mxEv.isRedacted()}
                         onWidgetLoad={this._onWidgetLoad}
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 3f36fac89b..50951312e7 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -46,13 +46,13 @@ if (DEBUG_SCROLL) {
  * It also provides a hook which allows parents to provide more list elements
  * when we get close to the start or end of the list.
  *
- * Each child element should have a 'data-scroll-token'. This token is used to
- * serialise the scroll state, and returned as the 'trackedScrollToken'
- * attribute by getScrollState().
+ * Each child element should have a 'data-scroll-tokens'. This string of
+ * comma-separated tokens may contain a single token or many, where many indicates
+ * that the element contains elements that have scroll tokens themselves. The first
+ * token in 'data-scroll-tokens' is used to serialise the scroll state, and returned
+ * as the 'trackedScrollToken' attribute by getScrollState().
  *
- * Child elements that contain elements that have scroll tokens must declare the
- * contained scroll tokens using 'data-contained-scroll-tokens`. When scrolling
- * to a contained scroll token, the ScrollPanel will scroll to the container.
+ * IMPORTANT: INDIVIDUAL TOKENS WITHIN 'data-scroll-tokens' MUST NOT CONTAIN COMMAS.
  *
  * Some notes about the implementation:
  *
@@ -353,8 +353,8 @@ module.exports = React.createClass({
             // Subtract height of tile as if it were unpaginated
             excessHeight -= tile.clientHeight;
             // The tile may not have a scroll token, so guard it
-            if (tile.dataset.scrollToken) {
-                markerScrollToken = tile.dataset.scrollToken;
+            if (tile.dataset.scrollTokens) {
+                markerScrollToken = tile.dataset.scrollTokens.split(',')[0];
             }
             if (tile.clientHeight > excessHeight) {
                 break;
@@ -423,7 +423,8 @@ module.exports = React.createClass({
      *   scroll. false if we are tracking a particular child.
      *
      * string trackedScrollToken: undefined if stuckAtBottom is true; if it is
-     *   false, the data-scroll-token of the child which we are tracking.
+     *   false, the fist token in data-scroll-tokens of the child which we are
+     *   tracking.
      *
      * number pixelOffset: undefined if stuckAtBottom is true; if it is false,
      *   the number of pixels the bottom of the tracked child is above the
@@ -555,16 +556,10 @@ module.exports = React.createClass({
         var messages = this.refs.itemlist.children;
         for (var i = messages.length-1; i >= 0; --i) {
             var m = messages[i];
-            // 'data-contained-scroll-tokens' has been set, indicating that a child
-            // element contains elements that each have a token. Check this array of
-            // tokens for `scrollToken`.
-            if (m.dataset.containedScrollTokens &&
-                m.dataset.containedScrollTokens.indexOf(scrollToken) !== -1) {
-                node = m;
-                break;
-            }
-            if (!m.dataset.scrollToken) continue;
-            if (m.dataset.scrollToken == scrollToken) {
+            // 'data-scroll-tokens' is a DOMString of comma-separated scroll tokens
+            // There might only be one scroll token
+            if (m.dataset.scrollTokens &&
+                m.dataset.scrollTokens.split(',').indexOf(scrollToken) !== -1) {
                 node = m;
                 break;
             }
@@ -580,7 +575,7 @@ module.exports = React.createClass({
         var boundingRect = node.getBoundingClientRect();
         var scrollDelta = boundingRect.bottom + pixelOffset - wrapperRect.bottom;
 
-        debuglog("ScrollPanel: scrolling to token '" + node.dataset.scrollToken + "'+" +
+        debuglog("ScrollPanel: scrolling to token '" + scrollToken + "'+" +
                  pixelOffset + " (delta: "+scrollDelta+")");
 
         if(scrollDelta != 0) {
@@ -603,12 +598,12 @@ module.exports = React.createClass({
 
         for (var i = messages.length-1; i >= 0; --i) {
             var node = messages[i];
-            if (!node.dataset.scrollToken) continue;
+            if (!node.dataset.scrollTokens) continue;
 
             var boundingRect = node.getBoundingClientRect();
             newScrollState = {
                 stuckAtBottom: false,
-                trackedScrollToken: node.dataset.scrollToken,
+                trackedScrollToken: node.dataset.scrollTokens.split(',')[0],
                 pixelOffset: wrapperRect.bottom - boundingRect.bottom,
             };
             // If the bottom of the panel intersects the ClientRect of node, use this node
@@ -620,7 +615,7 @@ module.exports = React.createClass({
                 break;
             }
         }
-        // This is only false if there were no nodes with `node.dataset.scrollToken` set.
+        // This is only false if there were no nodes with `node.dataset.scrollTokens` set.
         if (newScrollState) {
             this.scrollState = newScrollState;
             debuglog("ScrollPanel: saved scroll state", this.scrollState);
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index a24e19577d..ae8678894d 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -369,7 +369,7 @@ module.exports = React.createClass({
 
     render: function() {
         const eventsToRender = this.props.events;
-        const eventIds = eventsToRender.map(e => e.getId());
+        const eventIds = eventsToRender.map(e => e.getId()).join(',');
         const fewEvents = eventsToRender.length < this.props.threshold;
         const expanded = this.state.expanded || fewEvents;
 
@@ -380,7 +380,7 @@ module.exports = React.createClass({
 
         if (fewEvents) {
             return (
-                <div className="mx_MemberEventListSummary" data-contained-scroll-tokens={eventIds}>
+                <div className="mx_MemberEventListSummary" data-scroll-tokens={eventIds}>
                     {expandedEvents}
                 </div>
             );
@@ -438,7 +438,7 @@ module.exports = React.createClass({
         );
 
         return (
-            <div className="mx_MemberEventListSummary" data-contained-scroll-tokens={eventIds}>
+            <div className="mx_MemberEventListSummary" data-scroll-tokens={eventIds}>
                 {toggleButton}
                 {summaryContainer}
                 {expanded ? <div className="mx_MemberEventListSummary_line">&nbsp;</div> : null}
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index 7fac244481..1aba7c9196 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -60,7 +60,7 @@ module.exports = React.createClass({
             }
         }
         return (
-            <li data-scroll-token={eventId+"+"+j}>
+            <li data-scroll-tokens={eventId+"+"+j}>
                 {ret}
             </li>);
     },
diff --git a/test/components/structures/ScrollPanel-test.js b/test/components/structures/ScrollPanel-test.js
index eacaeb5fb4..7ecb74be6f 100644
--- a/test/components/structures/ScrollPanel-test.js
+++ b/test/components/structures/ScrollPanel-test.js
@@ -115,7 +115,7 @@ var Tester = React.createClass({
         //
         // there is an extra 50 pixels of margin at the bottom.
         return (
-            <li key={key} data-scroll-token={key}>
+            <li key={key} data-scroll-tokens={key}>
                 <div style={{height: '98px', margin: '50px', border: '1px solid black',
                              backgroundColor: '#fff8dc' }}>
                    {key}

From 6d9a1f047d1a2a82d3d0ab9596a30eafafb5c626 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 4 May 2017 13:03:04 +0100
Subject: [PATCH 075/312] Typo

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

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 50951312e7..a652bcc827 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -423,7 +423,7 @@ module.exports = React.createClass({
      *   scroll. false if we are tracking a particular child.
      *
      * string trackedScrollToken: undefined if stuckAtBottom is true; if it is
-     *   false, the fist token in data-scroll-tokens of the child which we are
+     *   false, the first token in data-scroll-tokens of the child which we are
      *   tracking.
      *
      * number pixelOffset: undefined if stuckAtBottom is true; if it is false,

From ce119a63643309a22f31e004fe59c69ed37ab9a7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 May 2017 13:55:52 +0100
Subject: [PATCH 076/312] Add buttons to room sub list headers

---
 src/component-index.js                      |  2 +
 src/components/views/elements/RoleButton.js | 75 +++++++++++++++++++++
 src/components/views/rooms/RoomList.js      | 41 +++++++----
 3 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 src/components/views/elements/RoleButton.js

diff --git a/src/component-index.js b/src/component-index.js
index d6873c6dfd..68a734cbf6 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -125,6 +125,8 @@ import views$elements$PowerSelector from './components/views/elements/PowerSelec
 views$elements$PowerSelector && (module.exports.components['views.elements.PowerSelector'] = views$elements$PowerSelector);
 import views$elements$ProgressBar from './components/views/elements/ProgressBar';
 views$elements$ProgressBar && (module.exports.components['views.elements.ProgressBar'] = views$elements$ProgressBar);
+import views$elements$RoleButton from './components/views/elements/RoleButton';
+views$elements$RoleButton && (module.exports.components['views.elements.RoleButton'] = views$elements$RoleButton);
 import views$elements$TintableSvg from './components/views/elements/TintableSvg';
 views$elements$TintableSvg && (module.exports.components['views.elements.TintableSvg'] = views$elements$TintableSvg);
 import views$elements$TruncatedList from './components/views/elements/TruncatedList';
diff --git a/src/components/views/elements/RoleButton.js b/src/components/views/elements/RoleButton.js
new file mode 100644
index 0000000000..06006a5779
--- /dev/null
+++ b/src/components/views/elements/RoleButton.js
@@ -0,0 +1,75 @@
+/*
+Copyright Vector Creations 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 AccessibleButton from './AccessibleButton';
+import dis from '../../../dispatcher';
+import sdk from '../../../index';
+
+export default React.createClass({
+    displayName: 'RoleButton',
+
+    propTypes: {
+        role: PropTypes.string.isRequired,
+        size: PropTypes.string,
+    },
+
+    getDefaultProps: function() {
+        return {
+            size: 25,
+        };
+    },
+
+    _onClick: function(ev) {
+        ev.stopPropagation();
+
+        let action;
+        switch(this.props.role) {
+            case 'start_chat':
+                action = 'view_create_chat';
+                break;
+            case 'room_directory':
+                action = 'view_room_directory';
+                break;
+            case 'create_room':
+                action = 'view_create_room';
+                break;
+        }
+        if (action) dis.dispatch({action: action});
+    },
+
+    _getIconPath() {
+        switch(this.props.role) {
+            case 'start_chat':
+                return 'img/icons-people.svg';
+            case 'room_directory':
+                return 'img/icons-directory.svg';
+            case 'create_room':
+                return 'img/icons-create-room.svg';
+        }
+    },
+
+    render: function() {
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+
+        return (
+            <AccessibleButton className="mx_RoleButton" onClick={ this._onClick }>
+                <TintableSvg src={this._getIconPath()} width={this.props.size} height={this.props.size} />
+            </AccessibleButton>
+        );
+    }
+});
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 963f5ad425..fe75271a25 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,6 +29,7 @@ var Rooms = require('../../../Rooms');
 import DMRoomMap from '../../../utils/DMRoomMap';
 var Receipt = require('../../../utils/Receipt');
 var constantTimeDispatcher = require('../../../ConstantTimeDispatcher');
+import AccessibleButton from '../elements/AccessibleButton';
 
 const HIDE_CONFERENCE_CHANS = true;
 
@@ -617,27 +619,23 @@ module.exports = React.createClass({
     },
 
     _getEmptyContent: function(section) {
+        const RoleButton = sdk.getComponent('elements.RoleButton');
         if (this.state.totalRoomCount === 0) {
             const TintableSvg = sdk.getComponent('elements.TintableSvg');
             switch (section) {
                 case 'im.vector.fake.direct':
                     return <div className="mx_RoomList_emptySubListTip">
-                        <div className="mx_RoomList_butonPreview">
-                            <TintableSvg src="img/icons-people.svg" width="25" height="25" />
-                        </div>
-                        Use the button below to chat with someone!
+                        Press
+                        <RoleButton role='start_chat' size="16" />
+                        to start a chat with someone
                     </div>;
                 case 'im.vector.fake.recent':
                     return <div className="mx_RoomList_emptySubListTip">
-                        <div className="mx_RoomList_butonPreview">
-                            <TintableSvg src="img/icons-directory.svg" width="25" height="25" />
-                        </div>
-                        Use the button below to browse the room directory
-                        <br /><br />
-                        <div className="mx_RoomList_butonPreview">
-                            <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
-                        </div>
-                        or this button to start a new one!
+                        You're not in any rooms yet! Press
+                        <RoleButton role='create_room' size="16" />
+                        to make a room or
+                        <RoleButton role='room_directory' size="16" />
+                        to browse the directory
                     </div>;
             }
         }
@@ -648,6 +646,21 @@ module.exports = React.createClass({
         return <RoomDropTarget label={labelText} />;
     },
 
+    _getHeaderItems: function(section) {
+        const RoleButton = sdk.getComponent('elements.RoleButton');
+        switch (section) {
+            case 'im.vector.fake.direct':
+                return <span className="mx_RoomList_headerButtons">
+                    <RoleButton role='start_chat' size="16" />
+                </span>;
+            case 'im.vector.fake.recent':
+                return <span className="mx_RoomList_headerButtons">
+                    <RoleButton role='room_directory' size="16" />
+                    <RoleButton role='create_room' size="16" />
+                </span>;
+        }
+    },
+
     render: function() {
         var RoomSubList = sdk.getComponent('structures.RoomSubList');
         var self = this;
@@ -685,6 +698,7 @@ module.exports = React.createClass({
                              label="People"
                              tagName="im.vector.fake.direct"
                              emptyContent={this._getEmptyContent('im.vector.fake.direct')}
+                             headerItems={this._getHeaderItems('im.vector.fake.direct')}
                              editable={ true }
                              order="recent"
                              incomingCall={ self.state.incomingCall }
@@ -700,6 +714,7 @@ module.exports = React.createClass({
                              tagName="im.vector.fake.recent"
                              editable={ true }
                              emptyContent={this._getEmptyContent('im.vector.fake.recent')}
+                             headerItems={this._getHeaderItems('im.vector.fake.recent')}
                              order="recent"
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }

From 0998adb36693ed5dd445b360b2b86792b3c6912f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 May 2017 15:02:21 +0100
Subject: [PATCH 077/312] What year is it? Who's the president?

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

diff --git a/src/components/views/elements/RoleButton.js b/src/components/views/elements/RoleButton.js
index 06006a5779..f20b4c6b88 100644
--- a/src/components/views/elements/RoleButton.js
+++ b/src/components/views/elements/RoleButton.js
@@ -1,5 +1,5 @@
 /*
-Copyright Vector Creations Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 6a1d0fbab54d10d6c06d5172f2e7d4d20e138b0f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 May 2017 15:38:09 +0100
Subject: [PATCH 078/312] Make bottom left menu buttons use RoleButton too

---
 src/components/views/elements/RoleButton.js | 53 ++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/RoleButton.js b/src/components/views/elements/RoleButton.js
index f20b4c6b88..60f227a067 100644
--- a/src/components/views/elements/RoleButton.js
+++ b/src/components/views/elements/RoleButton.js
@@ -31,6 +31,13 @@ export default React.createClass({
     getDefaultProps: function() {
         return {
             size: 25,
+            tooltip: false,
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            showTooltip: false,
         };
     },
 
@@ -48,10 +55,39 @@ export default React.createClass({
             case 'create_room':
                 action = 'view_create_room';
                 break;
+            case 'home_page':
+                action = 'view_home_page';
+                break;
+            case 'settings':
+                action = 'view_user_settings';
+                break;
         }
         if (action) dis.dispatch({action: action});
     },
 
+    _onMouseEnter: function() {
+        if (this.props.tooltip) this.setState({showTooltip: true});
+    },
+
+    _onMouseLeave: function() {
+        this.setState({showTooltip: false});
+    },
+
+    _getLabel() {
+        switch(this.props.role) {
+            case 'start_chat':
+                return 'Start chat';
+            case 'room_directory':
+                return 'Room directory';
+            case 'create_room':
+                return 'Create new room';
+            case 'home_page':
+                return 'Welcome page';
+            case 'settings':
+                return 'Settings';
+        }
+    },
+
     _getIconPath() {
         switch(this.props.role) {
             case 'start_chat':
@@ -60,15 +96,30 @@ export default React.createClass({
                 return 'img/icons-directory.svg';
             case 'create_room':
                 return 'img/icons-create-room.svg';
+            case 'home_page':
+                return 'img/icons-home.svg';
+            case 'settings':
+                return 'img/icons-settings.svg';
         }
     },
 
     render: function() {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
+        let tooltip;
+        if (this.state.showTooltip) {
+            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+            tooltip = <RoomTooltip className="mx_RoleButton_tooltip" label={this._getLabel()} />;
+        }
+
         return (
-            <AccessibleButton className="mx_RoleButton" onClick={ this._onClick }>
+            <AccessibleButton className="mx_RoleButton"
+                onClick={this._onClick}
+                onMouseEnter={this._onMouseEnter}
+                onMouseLeave={this._onMouseLeave}
+            >
                 <TintableSvg src={this._getIconPath()} width={this.props.size} height={this.props.size} />
+                {tooltip}
             </AccessibleButton>
         );
     }

From 72df43d22b40884faed5155f289fae467235d205 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 May 2017 15:46:24 +0100
Subject: [PATCH 079/312] Year

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 0b56b87c72..33f6890a2a 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright Vector Creations Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From cb478f11941a1dd622e4a114aca8aa82cddaf302 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 May 2017 15:50:52 +0100
Subject: [PATCH 080/312] no idea why those got in there...

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 4b63c8d888..098d370d65 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -628,8 +628,8 @@ module.exports = React.createClass({
                 <h3>Cryptography</h3>
                 <div className="mx_UserSettings_section mx_UserSettings_cryptoSection">
                     <ul>
-                        <li><label>Device ID:</label>                       <span><code>{deviceId}</code></span></li>
-                        <li><label>Device key:</label>                      <span><code><b>{identityKey}</b></code></span></li>
+                        <li><label>Device ID:</label>             <span><code>{deviceId}</code></span></li>
+                        <li><label>Device key:</label>            <span><code><b>{identityKey}</b></code></span></li>
                     </ul>
                     { importExportButtons }
                 </div>

From 2edfc3e5985ca271992edc83b3d1d6ad3179b8d6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 May 2017 15:51:31 +0100
Subject: [PATCH 081/312] remove commented out code as per review

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 098d370d65..7f6a5f329c 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -538,8 +538,6 @@ module.exports = React.createClass({
     },
 
     _renderUserInterfaceSettings: function() {
-        // const client = MatrixClientPeg.get();
-
         return (
             <div>
                 <h3>User Interface</h3>

From 909cdb6e9aadfb115f38d859a82e0583daa9b114 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 May 2017 16:22:06 +0100
Subject: [PATCH 082/312] Depend on prop-types module

So we can start writing code compatible with new React
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 95a82bbb73..37903252c4 100644
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
     "lodash": "^4.13.1",
     "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
     "optimist": "^0.6.1",
+    "prop-types": "^15.5.8",
     "q": "^1.4.1",
     "react": "^15.4.0",
     "react-addons-css-transition-group": "15.3.2",

From 3c6e301f7fdc4906f2d388ef8e6bd3254434cc48 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 May 2017 16:22:39 +0100
Subject: [PATCH 083/312] Improve regex to ignore trailing -dirty and for rc
 tags

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 7f6a5f329c..46dce8bd2e 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -35,10 +35,10 @@ import AccessibleButton from '../views/elements/AccessibleButton';
 const REACT_SDK_VERSION = 'dist' in packageJson ? packageJson.version : packageJson.gitHead || '<local>';
 
 // Simple method to help prettify GH Release Tags and Commit Hashes.
-const semVerRegex = /^v?(\d+\.\d+\.\d+)(?:-(?:\d+-g)?(.+))?|$/i;
+const semVerRegex = /^v?(\d+\.\d+\.\d+(?:-rc.+)?)(?:-(?:\d+-g)?([0-9a-fA-F]+))?(?:-dirty)?$/i;
 const gHVersionLabel = function(repo, token) {
     const match = token.match(semVerRegex);
-    let url; // assume commit hash
+    let url;
     if (match && match[1]) { // basic semVer string possibly with commit hash
         url = (match.length > 1 && match[2])
             ? `https://github.com/${repo}/commit/${match[2]}`

From da4c2f8b31aeba163f50d9a1c8570bce2b052eaa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Thu, 4 May 2017 16:42:41 +0100
Subject: [PATCH 084/312] Guests can't send RR

so they shouldn't try
lets not hit the HS quite as much
---
 src/components/structures/TimelinePanel.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index f72d35c41c..7bf89973c8 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -503,7 +503,9 @@ var TimelinePanel = React.createClass({
         // This happens on user_activity_end which is delayed, and it's
         // very possible have logged out within that timeframe, so check
         // we still have a client.
-        if (!MatrixClientPeg.get()) return;
+        const cli = MatrixClientPeg.get();
+        // if no client or client is guest don't send RR (vector-im/riot-web#3758)
+        if (!cli || cli.isGuest()) return;
 
         var currentReadUpToEventId = this._getCurrentReadReceipt(true);
         var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);

From 396b38512c8c1b9cea7e217910e7cad8730fd5da Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 May 2017 16:50:47 +0100
Subject: [PATCH 085/312] Remove babelcheck

Nobody is likley to be upgrading from babel 5 any more, so this
can go away now.
---
 package.json          |  4 ++--
 scripts/babelcheck.js | 22 ----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 scripts/babelcheck.js

diff --git a/package.json b/package.json
index 95a82bbb73..836f7fd353 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,8 @@
   },
   "scripts": {
     "reskindex": "scripts/reskindex.js -h header",
-    "build": "node scripts/babelcheck.js && babel src -d lib --source-maps",
-    "start": "node scripts/babelcheck.js && babel src -w -d lib --source-maps",
+    "build": "babel src -d lib --source-maps",
+    "start": "babel src -w -d lib --source-maps",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib",
diff --git a/scripts/babelcheck.js b/scripts/babelcheck.js
deleted file mode 100644
index 14e4a28a70..0000000000
--- a/scripts/babelcheck.js
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-
-var exec = require('child_process').exec;
-
-// Makes sure the babel executable in the path is babel 6 (or greater), not
-// babel 5, which it is if you upgrade from an older version of react-sdk and
-// run 'npm install' since the package has changed to babel-cli, so 'babel'
-// remains installed and the executable in node_modules/.bin remains as babel
-// 5.
-
-exec("babel -V", function (error, stdout, stderr) {
-    if ((error && error.code) || parseInt(stdout.substr(0,1), 10) < 6) {
-        console.log("\033[31m\033[1m"+
-            '*****************************************\n'+
-            '* matrix-react-sdk has moved to babel 6 *\n'+
-            '* Please "rm -rf node_modules && npm i" *\n'+
-            '* then restore links as appropriate     *\n'+
-            '*****************************************\n'+
-        "\033[91m");
-        process.exit(1);
-    }
-});

From f76b9b44897dbf54f94052bc561e9147967d90c7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Thu, 4 May 2017 17:25:23 +0100
Subject: [PATCH 086/312] remove link to issue

not very useful
---
 src/components/structures/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 7bf89973c8..d29a08ceb4 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -504,7 +504,7 @@ var TimelinePanel = React.createClass({
         // very possible have logged out within that timeframe, so check
         // we still have a client.
         const cli = MatrixClientPeg.get();
-        // if no client or client is guest don't send RR (vector-im/riot-web#3758)
+        // if no client or client is guest don't send RR
         if (!cli || cli.isGuest()) return;
 
         var currentReadUpToEventId = this._getCurrentReadReceipt(true);

From 8d4663f43714d8f54a127f12d7fd02620f3c892b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 4 May 2017 18:03:35 +0100
Subject: [PATCH 087/312] Fix lint in Lifecycle.js

---
 src/Lifecycle.js | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index f20716cae6..e3be318b31 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -49,7 +49,7 @@ import sdk from './index';
  * If any of steps 1-4 are successful, it will call {setLoggedIn}, which in
  * turn will raise on_logged_in and will_start_client events.
  *
- * It returns a promise which resolves when the above process completes.
+ * @param {object} opts
  *
  * @param {object} opts.realQueryParams: string->string map of the
  *     query-parameters extracted from the real query-string of the starting
@@ -67,6 +67,7 @@ import sdk from './index';
  * @params {string} opts.guestIsUrl: homeserver URL. Only used if enableGuest is
  *     true; defines the IS to use.
  *
+ * @returns {Promise} a promise which resolves when the above process completes.
  */
 export function loadSession(opts) {
     const realQueryParams = opts.realQueryParams || {};
@@ -127,7 +128,7 @@ export function loadSession(opts) {
 
 function _loginWithToken(queryParams, defaultDeviceDisplayName) {
     // create a temporary MatrixClient to do the login
-    var client = Matrix.createClient({
+    const client = Matrix.createClient({
         baseUrl: queryParams.homeserver,
     });
 
@@ -159,7 +160,7 @@ function _registerAsGuest(hsUrl, isUrl, defaultDeviceDisplayName) {
     // Not really sure where the right home for it is.
 
     // create a temporary MatrixClient to do the login
-    var client = Matrix.createClient({
+    const client = Matrix.createClient({
         baseUrl: hsUrl,
     });
 
@@ -188,30 +189,30 @@ function _restoreFromLocalStorage() {
     if (!localStorage) {
         return q(false);
     }
-    const hs_url = localStorage.getItem("mx_hs_url");
-    const is_url = localStorage.getItem("mx_is_url") || 'https://matrix.org';
-    const access_token = localStorage.getItem("mx_access_token");
-    const user_id = localStorage.getItem("mx_user_id");
-    const device_id = localStorage.getItem("mx_device_id");
+    const hsUrl = localStorage.getItem("mx_hs_url");
+    const isUrl = localStorage.getItem("mx_is_url") || 'https://matrix.org';
+    const accessToken = localStorage.getItem("mx_access_token");
+    const userId = localStorage.getItem("mx_user_id");
+    const deviceId = localStorage.getItem("mx_device_id");
 
-    let is_guest;
+    let isGuest;
     if (localStorage.getItem("mx_is_guest") !== null) {
-        is_guest = localStorage.getItem("mx_is_guest") === "true";
+        isGuest = localStorage.getItem("mx_is_guest") === "true";
     } else {
         // legacy key name
-        is_guest = localStorage.getItem("matrix-is-guest") === "true";
+        isGuest = localStorage.getItem("matrix-is-guest") === "true";
     }
 
-    if (access_token && user_id && hs_url) {
-        console.log("Restoring session for %s", user_id);
+    if (accessToken && userId && hsUrl) {
+        console.log("Restoring session for %s", userId);
         try {
             setLoggedIn({
-                userId: user_id,
-                deviceId: device_id,
-                accessToken: access_token,
-                homeserverUrl: hs_url,
-                identityServerUrl: is_url,
-                guest: is_guest,
+                userId: userId,
+                deviceId: deviceId,
+                accessToken: accessToken,
+                homeserverUrl: hsUrl,
+                identityServerUrl: isUrl,
+                guest: isGuest,
             });
             return q(true);
         } catch (e) {
@@ -352,7 +353,7 @@ export function logout() {
         return;
     }
 
-    return MatrixClientPeg.get().logout().then(onLoggedOut,
+    MatrixClientPeg.get().logout().then(onLoggedOut,
         (err) => {
             // Just throwing an error here is going to be very unhelpful
             // if you're trying to log out because your server's down and
@@ -363,8 +364,8 @@ export function logout() {
             // change your password).
             console.log("Failed to call logout API: token will not be invalidated");
             onLoggedOut();
-        }
-    );
+        },
+    ).done();
 }
 
 /**
@@ -420,7 +421,7 @@ export function stopMatrixClient() {
     UserActivity.stop();
     Presence.stop();
     if (DMRoomMap.shared()) DMRoomMap.shared().stop();
-    var cli = MatrixClientPeg.get();
+    const cli = MatrixClientPeg.get();
     if (cli) {
         cli.stopClient();
         cli.removeAllListeners();

From bfceaa827b4053894f67c74d5112f0a482751c69 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 4 May 2017 18:04:47 +0100
Subject: [PATCH 088/312] Log deviceid at login

- to help understand rageshakes
---
 src/Lifecycle.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index e3be318b31..f34aeae0e5 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -274,9 +274,13 @@ export function initRtsClient(url) {
  */
 export function setLoggedIn(credentials) {
     credentials.guest = Boolean(credentials.guest);
-    console.log("setLoggedIn => %s (guest=%s) hs=%s",
-                credentials.userId, credentials.guest,
-                credentials.homeserverUrl);
+
+    console.log(
+        "setLoggedIn: mxid:", credentials.userId,
+        "deviceId:", credentials.deviceId,
+        "guest:", credentials.guest,
+        "hs:", credentials.homeserverUrl,
+    );
     // This is dispatched to indicate that the user is still in the process of logging in
     // because `teamPromise` may take some time to resolve, breaking the assumption that
     // `setLoggedIn` takes an "instant" to complete, and dispatch `on_logged_in` a few ms

From f86ca5bc97e915ae097f5e4eba459aba9e0973b8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 4 May 2017 18:08:04 +0100
Subject: [PATCH 089/312] Hide empty tips if collapsed

---
 src/components/views/rooms/RoomList.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 33f6890a2a..6f5097840f 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -578,6 +578,12 @@ module.exports = React.createClass({
     },
 
     _getEmptyContent: function(section) {
+        const RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget');
+
+        if (this.props.collapsed) {
+            return <RoomDropTarget label="" />;
+        }
+
         const RoleButton = sdk.getComponent('elements.RoleButton');
         if (this.state.totalRoomCount === 0) {
             const TintableSvg = sdk.getComponent('elements.TintableSvg');
@@ -598,7 +604,6 @@ module.exports = React.createClass({
                     </div>;
             }
         }
-        const RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget');
 
         const labelText = 'Drop here to ' + (VERBS[section] || 'tag ' + section);
 

From e00605571bc9ef68ff9f2cec33b06ee7213ae457 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 May 2017 10:48:54 +0100
Subject: [PATCH 090/312] Fix the spinner to actually appear

We started with clientSyncState being null, which it remained
until the SYNCING event was emitted. We need to set
clientSyncState's initial value correctly.
---
 src/components/structures/TimelinePanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index d29a08ceb4..7c89694a29 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -170,7 +170,7 @@ var TimelinePanel = React.createClass({
             forwardPaginating: false,
 
             // cache of matrixClient.getSyncState() (but from the 'sync' event)
-            clientSyncState: null,
+            clientSyncState: MatrixClientPeg.get().getSyncState(),
         };
     },
 

From 4a5821e1999748a9fae288a08f0def9e4a72f897 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 May 2017 14:25:18 +0100
Subject: [PATCH 091/312] Separate classes for the different buttons

Also rename RoleButton to ActionButton because it's not being
given a Role any more.
---
 src/component-index.js                        | 14 ++++-
 .../{RoleButton.js => ActionButton.js}        | 60 +++----------------
 .../views/elements/CreateRoomButton.js        | 37 ++++++++++++
 src/components/views/elements/HomeButton.js   | 37 ++++++++++++
 .../views/elements/RoomDirectoryButton.js     | 37 ++++++++++++
 .../views/elements/SettingsButton.js          | 37 ++++++++++++
 .../views/elements/StartChatButton.js         | 37 ++++++++++++
 src/components/views/rooms/RoomList.js        | 20 ++++---
 8 files changed, 216 insertions(+), 63 deletions(-)
 rename src/components/views/elements/{RoleButton.js => ActionButton.js} (54%)
 create mode 100644 src/components/views/elements/CreateRoomButton.js
 create mode 100644 src/components/views/elements/HomeButton.js
 create mode 100644 src/components/views/elements/RoomDirectoryButton.js
 create mode 100644 src/components/views/elements/SettingsButton.js
 create mode 100644 src/components/views/elements/StartChatButton.js

diff --git a/src/component-index.js b/src/component-index.js
index 68a734cbf6..090a27d5ed 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -103,10 +103,14 @@ import views$dialogs$UnknownDeviceDialog from './components/views/dialogs/Unknow
 views$dialogs$UnknownDeviceDialog && (module.exports.components['views.dialogs.UnknownDeviceDialog'] = views$dialogs$UnknownDeviceDialog);
 import views$elements$AccessibleButton from './components/views/elements/AccessibleButton';
 views$elements$AccessibleButton && (module.exports.components['views.elements.AccessibleButton'] = views$elements$AccessibleButton);
+import views$elements$ActionButton from './components/views/elements/ActionButton';
+views$elements$ActionButton && (module.exports.components['views.elements.ActionButton'] = views$elements$ActionButton);
 import views$elements$AddressSelector from './components/views/elements/AddressSelector';
 views$elements$AddressSelector && (module.exports.components['views.elements.AddressSelector'] = views$elements$AddressSelector);
 import views$elements$AddressTile from './components/views/elements/AddressTile';
 views$elements$AddressTile && (module.exports.components['views.elements.AddressTile'] = views$elements$AddressTile);
+import views$elements$CreateRoomButton from './components/views/elements/CreateRoomButton';
+views$elements$CreateRoomButton && (module.exports.components['views.elements.CreateRoomButton'] = views$elements$CreateRoomButton);
 import views$elements$DeviceVerifyButtons from './components/views/elements/DeviceVerifyButtons';
 views$elements$DeviceVerifyButtons && (module.exports.components['views.elements.DeviceVerifyButtons'] = views$elements$DeviceVerifyButtons);
 import views$elements$DirectorySearchBox from './components/views/elements/DirectorySearchBox';
@@ -119,14 +123,20 @@ import views$elements$EditableTextContainer from './components/views/elements/Ed
 views$elements$EditableTextContainer && (module.exports.components['views.elements.EditableTextContainer'] = views$elements$EditableTextContainer);
 import views$elements$EmojiText from './components/views/elements/EmojiText';
 views$elements$EmojiText && (module.exports.components['views.elements.EmojiText'] = views$elements$EmojiText);
+import views$elements$HomeButton from './components/views/elements/HomeButton';
+views$elements$HomeButton && (module.exports.components['views.elements.HomeButton'] = views$elements$HomeButton);
 import views$elements$MemberEventListSummary from './components/views/elements/MemberEventListSummary';
 views$elements$MemberEventListSummary && (module.exports.components['views.elements.MemberEventListSummary'] = views$elements$MemberEventListSummary);
 import views$elements$PowerSelector from './components/views/elements/PowerSelector';
 views$elements$PowerSelector && (module.exports.components['views.elements.PowerSelector'] = views$elements$PowerSelector);
 import views$elements$ProgressBar from './components/views/elements/ProgressBar';
 views$elements$ProgressBar && (module.exports.components['views.elements.ProgressBar'] = views$elements$ProgressBar);
-import views$elements$RoleButton from './components/views/elements/RoleButton';
-views$elements$RoleButton && (module.exports.components['views.elements.RoleButton'] = views$elements$RoleButton);
+import views$elements$RoomDirectoryButton from './components/views/elements/RoomDirectoryButton';
+views$elements$RoomDirectoryButton && (module.exports.components['views.elements.RoomDirectoryButton'] = views$elements$RoomDirectoryButton);
+import views$elements$SettingsButton from './components/views/elements/SettingsButton';
+views$elements$SettingsButton && (module.exports.components['views.elements.SettingsButton'] = views$elements$SettingsButton);
+import views$elements$StartChatButton from './components/views/elements/StartChatButton';
+views$elements$StartChatButton && (module.exports.components['views.elements.StartChatButton'] = views$elements$StartChatButton);
 import views$elements$TintableSvg from './components/views/elements/TintableSvg';
 views$elements$TintableSvg && (module.exports.components['views.elements.TintableSvg'] = views$elements$TintableSvg);
 import views$elements$TruncatedList from './components/views/elements/TruncatedList';
diff --git a/src/components/views/elements/RoleButton.js b/src/components/views/elements/ActionButton.js
similarity index 54%
rename from src/components/views/elements/RoleButton.js
rename to src/components/views/elements/ActionButton.js
index 60f227a067..6d6289ddab 100644
--- a/src/components/views/elements/RoleButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -24,8 +24,11 @@ export default React.createClass({
     displayName: 'RoleButton',
 
     propTypes: {
-        role: PropTypes.string.isRequired,
         size: PropTypes.string,
+        tooltip: PropTypes.bool,
+        action: PropTypes.string.isRequired,
+        label: PropTypes.string.isRequired,
+        iconPath: PropTypes.string.isRequired,
     },
 
     getDefaultProps: function() {
@@ -43,26 +46,7 @@ export default React.createClass({
 
     _onClick: function(ev) {
         ev.stopPropagation();
-
-        let action;
-        switch(this.props.role) {
-            case 'start_chat':
-                action = 'view_create_chat';
-                break;
-            case 'room_directory':
-                action = 'view_room_directory';
-                break;
-            case 'create_room':
-                action = 'view_create_room';
-                break;
-            case 'home_page':
-                action = 'view_home_page';
-                break;
-            case 'settings':
-                action = 'view_user_settings';
-                break;
-        }
-        if (action) dis.dispatch({action: action});
+        dis.dispatch({action: this.props.action});
     },
 
     _onMouseEnter: function() {
@@ -73,43 +57,13 @@ export default React.createClass({
         this.setState({showTooltip: false});
     },
 
-    _getLabel() {
-        switch(this.props.role) {
-            case 'start_chat':
-                return 'Start chat';
-            case 'room_directory':
-                return 'Room directory';
-            case 'create_room':
-                return 'Create new room';
-            case 'home_page':
-                return 'Welcome page';
-            case 'settings':
-                return 'Settings';
-        }
-    },
-
-    _getIconPath() {
-        switch(this.props.role) {
-            case 'start_chat':
-                return 'img/icons-people.svg';
-            case 'room_directory':
-                return 'img/icons-directory.svg';
-            case 'create_room':
-                return 'img/icons-create-room.svg';
-            case 'home_page':
-                return 'img/icons-home.svg';
-            case 'settings':
-                return 'img/icons-settings.svg';
-        }
-    },
-
     render: function() {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         let tooltip;
         if (this.state.showTooltip) {
             const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoleButton_tooltip" label={this._getLabel()} />;
+            tooltip = <RoomTooltip className="mx_RoleButton_tooltip" label={this.props.label} />;
         }
 
         return (
@@ -118,7 +72,7 @@ export default React.createClass({
                 onMouseEnter={this._onMouseEnter}
                 onMouseLeave={this._onMouseLeave}
             >
-                <TintableSvg src={this._getIconPath()} width={this.props.size} height={this.props.size} />
+                <TintableSvg src={this.props.iconPath} width={this.props.size} height={this.props.size} />
                 {tooltip}
             </AccessibleButton>
         );
diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
new file mode 100644
index 0000000000..d6b6526d6c
--- /dev/null
+++ b/src/components/views/elements/CreateRoomButton.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2017 Vector Creations 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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+
+const CreateRoomButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_create_chat"
+            label="Create new room"
+            iconPath="img/icons-create-room.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+CreateRoomButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default CreateRoomButton;
diff --git a/src/components/views/elements/HomeButton.js b/src/components/views/elements/HomeButton.js
new file mode 100644
index 0000000000..4c7f295c87
--- /dev/null
+++ b/src/components/views/elements/HomeButton.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2017 Vector Creations 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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+
+const HomeButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_home_page"
+            label="Welcome page"
+            iconPath="img/icons-home.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+HomeButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default HomeButton;
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
new file mode 100644
index 0000000000..651dd8edd0
--- /dev/null
+++ b/src/components/views/elements/RoomDirectoryButton.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2017 Vector Creations 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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+
+const RoomDirectoryButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_room_directory"
+            label="Room directory"
+            iconPath="img/icons-directory.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+RoomDirectoryButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default RoomDirectoryButton;
diff --git a/src/components/views/elements/SettingsButton.js b/src/components/views/elements/SettingsButton.js
new file mode 100644
index 0000000000..51da6e3fd1
--- /dev/null
+++ b/src/components/views/elements/SettingsButton.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2017 Vector Creations 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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+
+const SettingsButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="view_user_settings"
+            label="Settings"
+            iconPath="img/icons-settings.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+SettingsButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default SettingsButton;
diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
new file mode 100644
index 0000000000..66cd911754
--- /dev/null
+++ b/src/components/views/elements/StartChatButton.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2017 Vector Creations 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 sdk from '../../../index';
+import PropTypes from 'prop-types';
+
+const StartChatButton = function(props) {
+    const ActionButton = sdk.getComponent('elements.ActionButton');
+    return (
+        <ActionButton action="start_chat"
+            label="Start chat"
+            iconPath="img/icons-people.svg"
+            size={props.size}
+            tooltip={props.tooltip}
+        />
+    );
+};
+
+StartChatButton.propTypes = {
+    size: PropTypes.string,
+    tooltip: PropTypes.bool,
+};
+
+export default StartChatButton;
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 6f5097840f..5917af5eb1 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -584,22 +584,24 @@ module.exports = React.createClass({
             return <RoomDropTarget label="" />;
         }
 
-        const RoleButton = sdk.getComponent('elements.RoleButton');
+        const StartChatButton = sdk.getComponent('elements.StartChatButton');
+        const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
+        const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
         if (this.state.totalRoomCount === 0) {
             const TintableSvg = sdk.getComponent('elements.TintableSvg');
             switch (section) {
                 case 'im.vector.fake.direct':
                     return <div className="mx_RoomList_emptySubListTip">
                         Press
-                        <RoleButton role='start_chat' size="16" />
+                        <StartChatButton size="16" />
                         to start a chat with someone
                     </div>;
                 case 'im.vector.fake.recent':
                     return <div className="mx_RoomList_emptySubListTip">
                         You're not in any rooms yet! Press
-                        <RoleButton role='create_room' size="16" />
+                        <CreateRoomButton size="16" />
                         to make a room or
-                        <RoleButton role='room_directory' size="16" />
+                        <RoomDirectoryButton size="16" />
                         to browse the directory
                     </div>;
             }
@@ -611,16 +613,18 @@ module.exports = React.createClass({
     },
 
     _getHeaderItems: function(section) {
-        const RoleButton = sdk.getComponent('elements.RoleButton');
+        const StartChatButton = sdk.getComponent('elements.StartChatButton');
+        const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
+        const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
         switch (section) {
             case 'im.vector.fake.direct':
                 return <span className="mx_RoomList_headerButtons">
-                    <RoleButton role='start_chat' size="16" />
+                    <StartChatButton role='start_chat' size="16" />
                 </span>;
             case 'im.vector.fake.recent':
                 return <span className="mx_RoomList_headerButtons">
-                    <RoleButton role='room_directory' size="16" />
-                    <RoleButton role='create_room' size="16" />
+                    <RoomDirectoryButton role='room_directory' size="16" />
+                    <CreateRoomButton role='create_room' size="16" />
                 </span>;
         }
     },

From 4fc4ae1e9907267d97d96ac9c5ac31b6140aac6b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 May 2017 14:56:26 +0100
Subject: [PATCH 092/312] Size is a string, import react

React gets put in by the JSX transpile
---
 src/components/views/elements/ActionButton.js        | 2 +-
 src/components/views/elements/CreateRoomButton.js    | 1 +
 src/components/views/elements/HomeButton.js          | 1 +
 src/components/views/elements/RoomDirectoryButton.js | 1 +
 src/components/views/elements/SettingsButton.js      | 1 +
 src/components/views/elements/StartChatButton.js     | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
index 6d6289ddab..267388daf6 100644
--- a/src/components/views/elements/ActionButton.js
+++ b/src/components/views/elements/ActionButton.js
@@ -33,7 +33,7 @@ export default React.createClass({
 
     getDefaultProps: function() {
         return {
-            size: 25,
+            size: "25",
             tooltip: false,
         };
     },
diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
index d6b6526d6c..e7e526d36b 100644
--- a/src/components/views/elements/CreateRoomButton.js
+++ b/src/components/views/elements/CreateRoomButton.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import sdk from '../../../index';
 import PropTypes from 'prop-types';
 
diff --git a/src/components/views/elements/HomeButton.js b/src/components/views/elements/HomeButton.js
index 4c7f295c87..5c446f24c9 100644
--- a/src/components/views/elements/HomeButton.js
+++ b/src/components/views/elements/HomeButton.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import sdk from '../../../index';
 import PropTypes from 'prop-types';
 
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
index 651dd8edd0..5e68776a15 100644
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ b/src/components/views/elements/RoomDirectoryButton.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import sdk from '../../../index';
 import PropTypes from 'prop-types';
 
diff --git a/src/components/views/elements/SettingsButton.js b/src/components/views/elements/SettingsButton.js
index 51da6e3fd1..c6438da277 100644
--- a/src/components/views/elements/SettingsButton.js
+++ b/src/components/views/elements/SettingsButton.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import sdk from '../../../index';
 import PropTypes from 'prop-types';
 
diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
index 66cd911754..02d5677a7c 100644
--- a/src/components/views/elements/StartChatButton.js
+++ b/src/components/views/elements/StartChatButton.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import sdk from '../../../index';
 import PropTypes from 'prop-types';
 

From 1a0ea29995d38b5ef824b11aa299b98cea12ebd3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 5 May 2017 17:51:14 +0100
Subject: [PATCH 093/312] Remove redundant role elements

---
 src/components/views/rooms/RoomList.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 5917af5eb1..8d396b5536 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -619,12 +619,12 @@ module.exports = React.createClass({
         switch (section) {
             case 'im.vector.fake.direct':
                 return <span className="mx_RoomList_headerButtons">
-                    <StartChatButton role='start_chat' size="16" />
+                    <StartChatButton size="16" />
                 </span>;
             case 'im.vector.fake.recent':
                 return <span className="mx_RoomList_headerButtons">
-                    <RoomDirectoryButton role='room_directory' size="16" />
-                    <CreateRoomButton role='create_room' size="16" />
+                    <RoomDirectoryButton size="16" />
+                    <CreateRoomButton size="16" />
                 </span>;
         }
     },

From 2b71123ddcacb103d2338d8d525fd4922d24ff68 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 6 May 2017 01:45:28 +0100
Subject: [PATCH 094/312] suppress null member rejoins again

reverts https://github.com/matrix-org/matrix-react-sdk/commit/f5fe4b24336a8245b5a08050fefe13b9999d92fb
should fix https://github.com/vector-im/riot-web/issues/3788
---
 src/TextForEvent.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 40d6a49998..3f200a089d 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -65,8 +65,8 @@ function textForMemberEvent(ev) {
                 } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
                     return senderName + " set a profile picture";
                 } else {
-                    // hacky hack for https://github.com/vector-im/vector-web/issues/2020
-                    return senderName + " rejoined the room.";
+                    // suppress null rejoins
+                    return '';
                 }
             } else {
                 if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);

From 2b2b43a7f3d57dcbf53a70817b31d6287974e517 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 7 May 2017 18:15:37 +0100
Subject: [PATCH 095/312] Content in Composer is not lost on unload so it
 should be fine to scare the user thinking they have lost all of their content
 even though when they come back they can cry with joy :D

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 2161198142..88230062fe 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -43,7 +43,6 @@ export default class MessageComposer extends React.Component {
         this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
         this.onInputStateChanged = this.onInputStateChanged.bind(this);
         this.onEvent = this.onEvent.bind(this);
-        this.onPageUnload = this.onPageUnload.bind(this);
 
         this.state = {
             autocompleteQuery: '',
@@ -65,22 +64,12 @@ export default class MessageComposer extends React.Component {
         // marked as encrypted.
         // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
         MatrixClientPeg.get().on("event", this.onEvent);
-
-        window.addEventListener('beforeunload', this.onPageUnload);
     }
 
     componentWillUnmount() {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("event", this.onEvent);
         }
-        window.removeEventListener('beforeunload', this.onPageUnload);
-    }
-
-    onPageUnload(event) {
-        if (this.messageComposerInput && this.messageComposerInput.isTyping) {
-            return event.returnValue =
-                'You seem to be typing a message, are you sure you want to quit?';
-        }
     }
 
     onEvent(event) {

From a14135067005f7d0e07121dcefb29f548c6754da Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 7 May 2017 20:01:55 +0100
Subject: [PATCH 096/312] Explicitly save composer content onUnload small
 oversight, caught by Matthew

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 88230062fe..0ee3c2082d 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -43,6 +43,7 @@ export default class MessageComposer extends React.Component {
         this.onToggleMarkdownClicked = this.onToggleMarkdownClicked.bind(this);
         this.onInputStateChanged = this.onInputStateChanged.bind(this);
         this.onEvent = this.onEvent.bind(this);
+        this.onPageUnload = this.onPageUnload.bind(this);
 
         this.state = {
             autocompleteQuery: '',
@@ -64,12 +65,21 @@ export default class MessageComposer extends React.Component {
         // marked as encrypted.
         // XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
         MatrixClientPeg.get().on("event", this.onEvent);
+
+        window.addEventListener('beforeunload', this.onPageUnload);
     }
 
     componentWillUnmount() {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("event", this.onEvent);
         }
+        window.removeEventListener('beforeunload', this.onPageUnload);
+    }
+
+    onPageUnload(event) {
+        if (this.messageComposerInput) {
+            this.messageComposerInput.sentHistory.saveLastTextEntry();
+        }
     }
 
     onEvent(event) {

From 78e72723440780814fced82cc8a2406c47992464 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Sun, 7 May 2017 20:43:42 +0100
Subject: [PATCH 097/312] Fixes 2 issues with Dialog closing

+ Upload Confirmation dialog would just change focus on ESC and not close
+ Keywords Dialog in UserSettings would also close UserSettings because event bubbled up
---
 src/components/views/dialogs/BaseDialog.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 279dedbd43..d567a0ba9a 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -57,6 +57,12 @@ export default React.createClass({
         }
     },
 
+    // Don't let key down events get any further, so they only trigger this and nothing more
+    _onKeyDown: function(e) {
+        e.stopPropagation();
+        e.preventDefault();
+    },
+    
     // Must be when the key is released (and not pressed) otherwise componentWillUnmount
     // will focus another element which will receive future key events
     _onKeyUp: function(e) {
@@ -81,7 +87,7 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div onKeyUp={this._onKeyUp} className={this.props.className}>
+            <div onKeyDown={this._onKeyDown} onKeyUp={this._onKeyUp} className={this.props.className}>
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >

From 360f1cd250378a54d0305464111b2af57fb79731 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Sun, 7 May 2017 20:57:54 +0100
Subject: [PATCH 098/312] completely missed the ESC check

I need sleep
---
 src/components/views/dialogs/BaseDialog.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index d567a0ba9a..e7b8a687f5 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -59,8 +59,10 @@ export default React.createClass({
 
     // Don't let key down events get any further, so they only trigger this and nothing more
     _onKeyDown: function(e) {
-        e.stopPropagation();
-        e.preventDefault();
+        if (e.keyCode === KeyCode.ESCAPE) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
     },
     
     // Must be when the key is released (and not pressed) otherwise componentWillUnmount

From bd32df4ef6dbf66f1ba5d9b23117fefbe2132c72 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Sun, 7 May 2017 20:58:30 +0100
Subject: [PATCH 099/312] comment wording

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

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index e7b8a687f5..ac36dfd056 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -57,7 +57,7 @@ export default React.createClass({
         }
     },
 
-    // Don't let key down events get any further, so they only trigger this and nothing more
+    // Don't let esc keydown events get any further, so they only trigger this and nothing more
     _onKeyDown: function(e) {
         if (e.keyCode === KeyCode.ESCAPE) {
             e.stopPropagation();

From c841eb641b85995bddb235d3db2c779daffe97a1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 May 2017 11:26:25 +0100
Subject: [PATCH 100/312] Fix 'start chat' button

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

diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
index 02d5677a7c..747f75d1b3 100644
--- a/src/components/views/elements/StartChatButton.js
+++ b/src/components/views/elements/StartChatButton.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 const StartChatButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
-        <ActionButton action="start_chat"
+        <ActionButton action="view_create_chat"
             label="Start chat"
             iconPath="img/icons-people.svg"
             size={props.size}

From cafbe1458918d5970a14a933778f4765a519b902 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 May 2017 11:59:06 +0100
Subject: [PATCH 101/312] Fix keys for AddressSelector

Was using a property which just did not exist.
---
 src/components/views/elements/AddressSelector.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index 6bad15f7d0..5329994037 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -138,7 +139,7 @@ export default React.createClass({
                         onClick={this.onClick.bind(this, i)}
                         onMouseEnter={this.onMouseEnter.bind(this, i)}
                         onMouseLeave={this.onMouseLeave}
-                        key={this.props.addressList[i].userId}
+                        key={this.props.addressList[i].addressType + "/" + this.props.addressList[i].address}
                         ref={(ref) => { this.addressListElement = ref; }}
                     >
                         <AddressTile address={this.props.addressList[i]} justified={true} networkName="vector" networkUrl="img/search-icon-vector.svg" />

From 39323647d13532993872ed870e1f68760e73bf73 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 14:01:44 +0100
Subject: [PATCH 102/312] Don't show null URL previews

These are URLs that were spidered by the server without error but yielded an empty response from the server. There's nothing to display, so return an empty div.
---
 src/components/views/rooms/LinkPreviewWidget.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index ef8fb29cbc..35e6d28b1f 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -100,7 +100,9 @@ module.exports = React.createClass({
 
     render: function() {
         var p = this.state.preview;
-        if (!p) return <div/>;
+        if (!p || Object.keys(p).length === 0) {
+            return <div/>;
+        }
 
         // FIXME: do we want to factor out all image displaying between this and MImageBody - especially for lightboxing?
         var image = p["og:image"];

From d1f467ee914423e4ea640e8116cb8625c9ba70c8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 14:53:00 +0100
Subject: [PATCH 103/312] Remove auto-generated component-index

This will now be generated as part of the build process (`npm run build`) and whilst developing (`npm run start`).
---
 src/component-index.js | 265 -----------------------------------------
 1 file changed, 265 deletions(-)
 delete mode 100644 src/component-index.js

diff --git a/src/component-index.js b/src/component-index.js
deleted file mode 100644
index 090a27d5ed..0000000000
--- a/src/component-index.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-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.
-*/
-
-/*
- * THIS FILE IS AUTO-GENERATED
- * You can edit it you like, but your changes will be overwritten,
- * so you'd just be trying to swim upstream like a salmon.
- * You are not a salmon.
- *
- * To update it, run:
- *    ./reskindex.js -h header
- */
-
-module.exports.components = {};
-import structures$ContextualMenu from './components/structures/ContextualMenu';
-structures$ContextualMenu && (module.exports.components['structures.ContextualMenu'] = structures$ContextualMenu);
-import structures$CreateRoom from './components/structures/CreateRoom';
-structures$CreateRoom && (module.exports.components['structures.CreateRoom'] = structures$CreateRoom);
-import structures$FilePanel from './components/structures/FilePanel';
-structures$FilePanel && (module.exports.components['structures.FilePanel'] = structures$FilePanel);
-import structures$InteractiveAuth from './components/structures/InteractiveAuth';
-structures$InteractiveAuth && (module.exports.components['structures.InteractiveAuth'] = structures$InteractiveAuth);
-import structures$LoggedInView from './components/structures/LoggedInView';
-structures$LoggedInView && (module.exports.components['structures.LoggedInView'] = structures$LoggedInView);
-import structures$MatrixChat from './components/structures/MatrixChat';
-structures$MatrixChat && (module.exports.components['structures.MatrixChat'] = structures$MatrixChat);
-import structures$MessagePanel from './components/structures/MessagePanel';
-structures$MessagePanel && (module.exports.components['structures.MessagePanel'] = structures$MessagePanel);
-import structures$NotificationPanel from './components/structures/NotificationPanel';
-structures$NotificationPanel && (module.exports.components['structures.NotificationPanel'] = structures$NotificationPanel);
-import structures$RoomStatusBar from './components/structures/RoomStatusBar';
-structures$RoomStatusBar && (module.exports.components['structures.RoomStatusBar'] = structures$RoomStatusBar);
-import structures$RoomView from './components/structures/RoomView';
-structures$RoomView && (module.exports.components['structures.RoomView'] = structures$RoomView);
-import structures$ScrollPanel from './components/structures/ScrollPanel';
-structures$ScrollPanel && (module.exports.components['structures.ScrollPanel'] = structures$ScrollPanel);
-import structures$TimelinePanel from './components/structures/TimelinePanel';
-structures$TimelinePanel && (module.exports.components['structures.TimelinePanel'] = structures$TimelinePanel);
-import structures$UploadBar from './components/structures/UploadBar';
-structures$UploadBar && (module.exports.components['structures.UploadBar'] = structures$UploadBar);
-import structures$UserSettings from './components/structures/UserSettings';
-structures$UserSettings && (module.exports.components['structures.UserSettings'] = structures$UserSettings);
-import structures$login$ForgotPassword from './components/structures/login/ForgotPassword';
-structures$login$ForgotPassword && (module.exports.components['structures.login.ForgotPassword'] = structures$login$ForgotPassword);
-import structures$login$Login from './components/structures/login/Login';
-structures$login$Login && (module.exports.components['structures.login.Login'] = structures$login$Login);
-import structures$login$PostRegistration from './components/structures/login/PostRegistration';
-structures$login$PostRegistration && (module.exports.components['structures.login.PostRegistration'] = structures$login$PostRegistration);
-import structures$login$Registration from './components/structures/login/Registration';
-structures$login$Registration && (module.exports.components['structures.login.Registration'] = structures$login$Registration);
-import views$avatars$BaseAvatar from './components/views/avatars/BaseAvatar';
-views$avatars$BaseAvatar && (module.exports.components['views.avatars.BaseAvatar'] = views$avatars$BaseAvatar);
-import views$avatars$MemberAvatar from './components/views/avatars/MemberAvatar';
-views$avatars$MemberAvatar && (module.exports.components['views.avatars.MemberAvatar'] = views$avatars$MemberAvatar);
-import views$avatars$RoomAvatar from './components/views/avatars/RoomAvatar';
-views$avatars$RoomAvatar && (module.exports.components['views.avatars.RoomAvatar'] = views$avatars$RoomAvatar);
-import views$create_room$CreateRoomButton from './components/views/create_room/CreateRoomButton';
-views$create_room$CreateRoomButton && (module.exports.components['views.create_room.CreateRoomButton'] = views$create_room$CreateRoomButton);
-import views$create_room$Presets from './components/views/create_room/Presets';
-views$create_room$Presets && (module.exports.components['views.create_room.Presets'] = views$create_room$Presets);
-import views$create_room$RoomAlias from './components/views/create_room/RoomAlias';
-views$create_room$RoomAlias && (module.exports.components['views.create_room.RoomAlias'] = views$create_room$RoomAlias);
-import views$dialogs$BaseDialog from './components/views/dialogs/BaseDialog';
-views$dialogs$BaseDialog && (module.exports.components['views.dialogs.BaseDialog'] = views$dialogs$BaseDialog);
-import views$dialogs$ChatCreateOrReuseDialog from './components/views/dialogs/ChatCreateOrReuseDialog';
-views$dialogs$ChatCreateOrReuseDialog && (module.exports.components['views.dialogs.ChatCreateOrReuseDialog'] = views$dialogs$ChatCreateOrReuseDialog);
-import views$dialogs$ChatInviteDialog from './components/views/dialogs/ChatInviteDialog';
-views$dialogs$ChatInviteDialog && (module.exports.components['views.dialogs.ChatInviteDialog'] = views$dialogs$ChatInviteDialog);
-import views$dialogs$ConfirmRedactDialog from './components/views/dialogs/ConfirmRedactDialog';
-views$dialogs$ConfirmRedactDialog && (module.exports.components['views.dialogs.ConfirmRedactDialog'] = views$dialogs$ConfirmRedactDialog);
-import views$dialogs$ConfirmUserActionDialog from './components/views/dialogs/ConfirmUserActionDialog';
-views$dialogs$ConfirmUserActionDialog && (module.exports.components['views.dialogs.ConfirmUserActionDialog'] = views$dialogs$ConfirmUserActionDialog);
-import views$dialogs$DeactivateAccountDialog from './components/views/dialogs/DeactivateAccountDialog';
-views$dialogs$DeactivateAccountDialog && (module.exports.components['views.dialogs.DeactivateAccountDialog'] = views$dialogs$DeactivateAccountDialog);
-import views$dialogs$ErrorDialog from './components/views/dialogs/ErrorDialog';
-views$dialogs$ErrorDialog && (module.exports.components['views.dialogs.ErrorDialog'] = views$dialogs$ErrorDialog);
-import views$dialogs$InteractiveAuthDialog from './components/views/dialogs/InteractiveAuthDialog';
-views$dialogs$InteractiveAuthDialog && (module.exports.components['views.dialogs.InteractiveAuthDialog'] = views$dialogs$InteractiveAuthDialog);
-import views$dialogs$NeedToRegisterDialog from './components/views/dialogs/NeedToRegisterDialog';
-views$dialogs$NeedToRegisterDialog && (module.exports.components['views.dialogs.NeedToRegisterDialog'] = views$dialogs$NeedToRegisterDialog);
-import views$dialogs$QuestionDialog from './components/views/dialogs/QuestionDialog';
-views$dialogs$QuestionDialog && (module.exports.components['views.dialogs.QuestionDialog'] = views$dialogs$QuestionDialog);
-import views$dialogs$SessionRestoreErrorDialog from './components/views/dialogs/SessionRestoreErrorDialog';
-views$dialogs$SessionRestoreErrorDialog && (module.exports.components['views.dialogs.SessionRestoreErrorDialog'] = views$dialogs$SessionRestoreErrorDialog);
-import views$dialogs$SetDisplayNameDialog from './components/views/dialogs/SetDisplayNameDialog';
-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$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';
-views$elements$AccessibleButton && (module.exports.components['views.elements.AccessibleButton'] = views$elements$AccessibleButton);
-import views$elements$ActionButton from './components/views/elements/ActionButton';
-views$elements$ActionButton && (module.exports.components['views.elements.ActionButton'] = views$elements$ActionButton);
-import views$elements$AddressSelector from './components/views/elements/AddressSelector';
-views$elements$AddressSelector && (module.exports.components['views.elements.AddressSelector'] = views$elements$AddressSelector);
-import views$elements$AddressTile from './components/views/elements/AddressTile';
-views$elements$AddressTile && (module.exports.components['views.elements.AddressTile'] = views$elements$AddressTile);
-import views$elements$CreateRoomButton from './components/views/elements/CreateRoomButton';
-views$elements$CreateRoomButton && (module.exports.components['views.elements.CreateRoomButton'] = views$elements$CreateRoomButton);
-import views$elements$DeviceVerifyButtons from './components/views/elements/DeviceVerifyButtons';
-views$elements$DeviceVerifyButtons && (module.exports.components['views.elements.DeviceVerifyButtons'] = views$elements$DeviceVerifyButtons);
-import views$elements$DirectorySearchBox from './components/views/elements/DirectorySearchBox';
-views$elements$DirectorySearchBox && (module.exports.components['views.elements.DirectorySearchBox'] = views$elements$DirectorySearchBox);
-import views$elements$Dropdown from './components/views/elements/Dropdown';
-views$elements$Dropdown && (module.exports.components['views.elements.Dropdown'] = views$elements$Dropdown);
-import views$elements$EditableText from './components/views/elements/EditableText';
-views$elements$EditableText && (module.exports.components['views.elements.EditableText'] = views$elements$EditableText);
-import views$elements$EditableTextContainer from './components/views/elements/EditableTextContainer';
-views$elements$EditableTextContainer && (module.exports.components['views.elements.EditableTextContainer'] = views$elements$EditableTextContainer);
-import views$elements$EmojiText from './components/views/elements/EmojiText';
-views$elements$EmojiText && (module.exports.components['views.elements.EmojiText'] = views$elements$EmojiText);
-import views$elements$HomeButton from './components/views/elements/HomeButton';
-views$elements$HomeButton && (module.exports.components['views.elements.HomeButton'] = views$elements$HomeButton);
-import views$elements$MemberEventListSummary from './components/views/elements/MemberEventListSummary';
-views$elements$MemberEventListSummary && (module.exports.components['views.elements.MemberEventListSummary'] = views$elements$MemberEventListSummary);
-import views$elements$PowerSelector from './components/views/elements/PowerSelector';
-views$elements$PowerSelector && (module.exports.components['views.elements.PowerSelector'] = views$elements$PowerSelector);
-import views$elements$ProgressBar from './components/views/elements/ProgressBar';
-views$elements$ProgressBar && (module.exports.components['views.elements.ProgressBar'] = views$elements$ProgressBar);
-import views$elements$RoomDirectoryButton from './components/views/elements/RoomDirectoryButton';
-views$elements$RoomDirectoryButton && (module.exports.components['views.elements.RoomDirectoryButton'] = views$elements$RoomDirectoryButton);
-import views$elements$SettingsButton from './components/views/elements/SettingsButton';
-views$elements$SettingsButton && (module.exports.components['views.elements.SettingsButton'] = views$elements$SettingsButton);
-import views$elements$StartChatButton from './components/views/elements/StartChatButton';
-views$elements$StartChatButton && (module.exports.components['views.elements.StartChatButton'] = views$elements$StartChatButton);
-import views$elements$TintableSvg from './components/views/elements/TintableSvg';
-views$elements$TintableSvg && (module.exports.components['views.elements.TintableSvg'] = views$elements$TintableSvg);
-import views$elements$TruncatedList from './components/views/elements/TruncatedList';
-views$elements$TruncatedList && (module.exports.components['views.elements.TruncatedList'] = views$elements$TruncatedList);
-import views$elements$UserSelector from './components/views/elements/UserSelector';
-views$elements$UserSelector && (module.exports.components['views.elements.UserSelector'] = views$elements$UserSelector);
-import views$login$CaptchaForm from './components/views/login/CaptchaForm';
-views$login$CaptchaForm && (module.exports.components['views.login.CaptchaForm'] = views$login$CaptchaForm);
-import views$login$CasLogin from './components/views/login/CasLogin';
-views$login$CasLogin && (module.exports.components['views.login.CasLogin'] = views$login$CasLogin);
-import views$login$CountryDropdown from './components/views/login/CountryDropdown';
-views$login$CountryDropdown && (module.exports.components['views.login.CountryDropdown'] = views$login$CountryDropdown);
-import views$login$CustomServerDialog from './components/views/login/CustomServerDialog';
-views$login$CustomServerDialog && (module.exports.components['views.login.CustomServerDialog'] = views$login$CustomServerDialog);
-import views$login$InteractiveAuthEntryComponents from './components/views/login/InteractiveAuthEntryComponents';
-views$login$InteractiveAuthEntryComponents && (module.exports.components['views.login.InteractiveAuthEntryComponents'] = views$login$InteractiveAuthEntryComponents);
-import views$login$LoginFooter from './components/views/login/LoginFooter';
-views$login$LoginFooter && (module.exports.components['views.login.LoginFooter'] = views$login$LoginFooter);
-import views$login$LoginHeader from './components/views/login/LoginHeader';
-views$login$LoginHeader && (module.exports.components['views.login.LoginHeader'] = views$login$LoginHeader);
-import views$login$PasswordLogin from './components/views/login/PasswordLogin';
-views$login$PasswordLogin && (module.exports.components['views.login.PasswordLogin'] = views$login$PasswordLogin);
-import views$login$RegistrationForm from './components/views/login/RegistrationForm';
-views$login$RegistrationForm && (module.exports.components['views.login.RegistrationForm'] = views$login$RegistrationForm);
-import views$login$ServerConfig from './components/views/login/ServerConfig';
-views$login$ServerConfig && (module.exports.components['views.login.ServerConfig'] = views$login$ServerConfig);
-import views$messages$MAudioBody from './components/views/messages/MAudioBody';
-views$messages$MAudioBody && (module.exports.components['views.messages.MAudioBody'] = views$messages$MAudioBody);
-import views$messages$MFileBody from './components/views/messages/MFileBody';
-views$messages$MFileBody && (module.exports.components['views.messages.MFileBody'] = views$messages$MFileBody);
-import views$messages$MImageBody from './components/views/messages/MImageBody';
-views$messages$MImageBody && (module.exports.components['views.messages.MImageBody'] = views$messages$MImageBody);
-import views$messages$MVideoBody from './components/views/messages/MVideoBody';
-views$messages$MVideoBody && (module.exports.components['views.messages.MVideoBody'] = views$messages$MVideoBody);
-import views$messages$MessageEvent from './components/views/messages/MessageEvent';
-views$messages$MessageEvent && (module.exports.components['views.messages.MessageEvent'] = views$messages$MessageEvent);
-import views$messages$SenderProfile from './components/views/messages/SenderProfile';
-views$messages$SenderProfile && (module.exports.components['views.messages.SenderProfile'] = views$messages$SenderProfile);
-import views$messages$TextualBody from './components/views/messages/TextualBody';
-views$messages$TextualBody && (module.exports.components['views.messages.TextualBody'] = views$messages$TextualBody);
-import views$messages$TextualEvent from './components/views/messages/TextualEvent';
-views$messages$TextualEvent && (module.exports.components['views.messages.TextualEvent'] = views$messages$TextualEvent);
-import views$messages$UnknownBody from './components/views/messages/UnknownBody';
-views$messages$UnknownBody && (module.exports.components['views.messages.UnknownBody'] = views$messages$UnknownBody);
-import views$room_settings$AliasSettings from './components/views/room_settings/AliasSettings';
-views$room_settings$AliasSettings && (module.exports.components['views.room_settings.AliasSettings'] = views$room_settings$AliasSettings);
-import views$room_settings$ColorSettings from './components/views/room_settings/ColorSettings';
-views$room_settings$ColorSettings && (module.exports.components['views.room_settings.ColorSettings'] = views$room_settings$ColorSettings);
-import views$room_settings$UrlPreviewSettings from './components/views/room_settings/UrlPreviewSettings';
-views$room_settings$UrlPreviewSettings && (module.exports.components['views.room_settings.UrlPreviewSettings'] = views$room_settings$UrlPreviewSettings);
-import views$rooms$Autocomplete from './components/views/rooms/Autocomplete';
-views$rooms$Autocomplete && (module.exports.components['views.rooms.Autocomplete'] = views$rooms$Autocomplete);
-import views$rooms$AuxPanel from './components/views/rooms/AuxPanel';
-views$rooms$AuxPanel && (module.exports.components['views.rooms.AuxPanel'] = views$rooms$AuxPanel);
-import views$rooms$EntityTile from './components/views/rooms/EntityTile';
-views$rooms$EntityTile && (module.exports.components['views.rooms.EntityTile'] = views$rooms$EntityTile);
-import views$rooms$EventTile from './components/views/rooms/EventTile';
-views$rooms$EventTile && (module.exports.components['views.rooms.EventTile'] = views$rooms$EventTile);
-import views$rooms$LinkPreviewWidget from './components/views/rooms/LinkPreviewWidget';
-views$rooms$LinkPreviewWidget && (module.exports.components['views.rooms.LinkPreviewWidget'] = views$rooms$LinkPreviewWidget);
-import views$rooms$MemberDeviceInfo from './components/views/rooms/MemberDeviceInfo';
-views$rooms$MemberDeviceInfo && (module.exports.components['views.rooms.MemberDeviceInfo'] = views$rooms$MemberDeviceInfo);
-import views$rooms$MemberInfo from './components/views/rooms/MemberInfo';
-views$rooms$MemberInfo && (module.exports.components['views.rooms.MemberInfo'] = views$rooms$MemberInfo);
-import views$rooms$MemberList from './components/views/rooms/MemberList';
-views$rooms$MemberList && (module.exports.components['views.rooms.MemberList'] = views$rooms$MemberList);
-import views$rooms$MemberTile from './components/views/rooms/MemberTile';
-views$rooms$MemberTile && (module.exports.components['views.rooms.MemberTile'] = views$rooms$MemberTile);
-import views$rooms$MessageComposer from './components/views/rooms/MessageComposer';
-views$rooms$MessageComposer && (module.exports.components['views.rooms.MessageComposer'] = views$rooms$MessageComposer);
-import views$rooms$MessageComposerInput from './components/views/rooms/MessageComposerInput';
-views$rooms$MessageComposerInput && (module.exports.components['views.rooms.MessageComposerInput'] = views$rooms$MessageComposerInput);
-import views$rooms$MessageComposerInputOld from './components/views/rooms/MessageComposerInputOld';
-views$rooms$MessageComposerInputOld && (module.exports.components['views.rooms.MessageComposerInputOld'] = views$rooms$MessageComposerInputOld);
-import views$rooms$PresenceLabel from './components/views/rooms/PresenceLabel';
-views$rooms$PresenceLabel && (module.exports.components['views.rooms.PresenceLabel'] = views$rooms$PresenceLabel);
-import views$rooms$ReadReceiptMarker from './components/views/rooms/ReadReceiptMarker';
-views$rooms$ReadReceiptMarker && (module.exports.components['views.rooms.ReadReceiptMarker'] = views$rooms$ReadReceiptMarker);
-import views$rooms$RoomHeader from './components/views/rooms/RoomHeader';
-views$rooms$RoomHeader && (module.exports.components['views.rooms.RoomHeader'] = views$rooms$RoomHeader);
-import views$rooms$RoomList from './components/views/rooms/RoomList';
-views$rooms$RoomList && (module.exports.components['views.rooms.RoomList'] = views$rooms$RoomList);
-import views$rooms$RoomNameEditor from './components/views/rooms/RoomNameEditor';
-views$rooms$RoomNameEditor && (module.exports.components['views.rooms.RoomNameEditor'] = views$rooms$RoomNameEditor);
-import views$rooms$RoomPreviewBar from './components/views/rooms/RoomPreviewBar';
-views$rooms$RoomPreviewBar && (module.exports.components['views.rooms.RoomPreviewBar'] = views$rooms$RoomPreviewBar);
-import views$rooms$RoomSettings from './components/views/rooms/RoomSettings';
-views$rooms$RoomSettings && (module.exports.components['views.rooms.RoomSettings'] = views$rooms$RoomSettings);
-import views$rooms$RoomTile from './components/views/rooms/RoomTile';
-views$rooms$RoomTile && (module.exports.components['views.rooms.RoomTile'] = views$rooms$RoomTile);
-import views$rooms$RoomTopicEditor from './components/views/rooms/RoomTopicEditor';
-views$rooms$RoomTopicEditor && (module.exports.components['views.rooms.RoomTopicEditor'] = views$rooms$RoomTopicEditor);
-import views$rooms$SearchResultTile from './components/views/rooms/SearchResultTile';
-views$rooms$SearchResultTile && (module.exports.components['views.rooms.SearchResultTile'] = views$rooms$SearchResultTile);
-import views$rooms$SearchableEntityList from './components/views/rooms/SearchableEntityList';
-views$rooms$SearchableEntityList && (module.exports.components['views.rooms.SearchableEntityList'] = views$rooms$SearchableEntityList);
-import views$rooms$SimpleRoomHeader from './components/views/rooms/SimpleRoomHeader';
-views$rooms$SimpleRoomHeader && (module.exports.components['views.rooms.SimpleRoomHeader'] = views$rooms$SimpleRoomHeader);
-import views$rooms$TabCompleteBar from './components/views/rooms/TabCompleteBar';
-views$rooms$TabCompleteBar && (module.exports.components['views.rooms.TabCompleteBar'] = views$rooms$TabCompleteBar);
-import views$rooms$TopUnreadMessagesBar from './components/views/rooms/TopUnreadMessagesBar';
-views$rooms$TopUnreadMessagesBar && (module.exports.components['views.rooms.TopUnreadMessagesBar'] = views$rooms$TopUnreadMessagesBar);
-import views$rooms$UserTile from './components/views/rooms/UserTile';
-views$rooms$UserTile && (module.exports.components['views.rooms.UserTile'] = views$rooms$UserTile);
-import views$settings$AddPhoneNumber from './components/views/settings/AddPhoneNumber';
-views$settings$AddPhoneNumber && (module.exports.components['views.settings.AddPhoneNumber'] = views$settings$AddPhoneNumber);
-import views$settings$ChangeAvatar from './components/views/settings/ChangeAvatar';
-views$settings$ChangeAvatar && (module.exports.components['views.settings.ChangeAvatar'] = views$settings$ChangeAvatar);
-import views$settings$ChangeDisplayName from './components/views/settings/ChangeDisplayName';
-views$settings$ChangeDisplayName && (module.exports.components['views.settings.ChangeDisplayName'] = views$settings$ChangeDisplayName);
-import views$settings$ChangePassword from './components/views/settings/ChangePassword';
-views$settings$ChangePassword && (module.exports.components['views.settings.ChangePassword'] = views$settings$ChangePassword);
-import views$settings$DevicesPanel from './components/views/settings/DevicesPanel';
-views$settings$DevicesPanel && (module.exports.components['views.settings.DevicesPanel'] = views$settings$DevicesPanel);
-import views$settings$DevicesPanelEntry from './components/views/settings/DevicesPanelEntry';
-views$settings$DevicesPanelEntry && (module.exports.components['views.settings.DevicesPanelEntry'] = views$settings$DevicesPanelEntry);
-import views$settings$EnableNotificationsButton from './components/views/settings/EnableNotificationsButton';
-views$settings$EnableNotificationsButton && (module.exports.components['views.settings.EnableNotificationsButton'] = views$settings$EnableNotificationsButton);
-import views$voip$CallView from './components/views/voip/CallView';
-views$voip$CallView && (module.exports.components['views.voip.CallView'] = views$voip$CallView);
-import views$voip$IncomingCallBox from './components/views/voip/IncomingCallBox';
-views$voip$IncomingCallBox && (module.exports.components['views.voip.IncomingCallBox'] = views$voip$IncomingCallBox);
-import views$voip$VideoFeed from './components/views/voip/VideoFeed';
-views$voip$VideoFeed && (module.exports.components['views.voip.VideoFeed'] = views$voip$VideoFeed);
-import views$voip$VideoView from './components/views/voip/VideoView';
-views$voip$VideoView && (module.exports.components['views.voip.VideoView'] = views$voip$VideoView);

From ca7989a1fdd0d9b69f29bcad06ebf7580d68bd65 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 14:55:55 +0100
Subject: [PATCH 104/312] .gitignore auto-generated component-index

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5139d614ad..dcfe1c355d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ npm-debug.log
 
 # test reports created by karma
 /karma-reports
+
+# ignore auto-generated component index
+/src/component-index.js

From 1addc7e2c573394696a0a1e1cda675cb3a2c0b62 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 14:56:38 +0100
Subject: [PATCH 105/312] Update header copyright

---
 header | 1 +
 1 file changed, 1 insertion(+)

diff --git a/header b/header
index 060709b82e..beee1ebe89 100644
--- a/header
+++ b/header
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 2eaaa974516ce224602b0295f937549de1bb1b8e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 14:57:04 +0100
Subject: [PATCH 106/312] Give `reskindex.js` a watch mode (-w)

`scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur.

This depends on `chokidar`
---
 package.json         |  1 +
 scripts/reskindex.js | 92 +++++++++++++++++++++++++-------------------
 2 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 2001f0d4ad..b019c63da5 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,7 @@
     "blueimp-canvas-to-blob": "^3.5.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
+    "chokidar": "^1.6.1",
     "classnames": "^2.1.2",
     "commonmark": "^0.27.0",
     "draft-js": "^0.8.1",
diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index f9cbc2a711..e82104f35c 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -1,53 +1,67 @@
 #!/usr/bin/env node
-
 var fs = require('fs');
 var path = require('path');
 var glob = require('glob');
-
 var args = require('optimist').argv;
-
-var header = args.h || args.header;
-
-var componentsDir = path.join('src', 'components');
+var chokidar = require('chokidar');
 
 var componentIndex = path.join('src', 'component-index.js');
+var componentsDir = path.join('src', 'components');
 
-var packageJson = JSON.parse(fs.readFileSync('./package.json'));
+function reskindex() {
+    var header = args.h || args.header;
+    var packageJson = JSON.parse(fs.readFileSync('./package.json'));
 
-var strm = fs.createWriteStream(componentIndex);
+    var strm = fs.createWriteStream(componentIndex);
 
-if (header) {
-   strm.write(fs.readFileSync(header));
-   strm.write('\n');
+    if (header) {
+       strm.write(fs.readFileSync(header));
+       strm.write('\n');
+    }
+
+    strm.write("/*\n");
+    strm.write(" * THIS FILE IS AUTO-GENERATED\n");
+    strm.write(" * You can edit it you like, but your changes will be overwritten,\n");
+    strm.write(" * so you'd just be trying to swim upstream like a salmon.\n");
+    strm.write(" * You are not a salmon.\n");
+    strm.write(" */\n\n");
+
+    if (packageJson['matrix-react-parent']) {
+        strm.write(
+            "module.exports.components = require('"+
+            packageJson['matrix-react-parent']+
+            "/lib/component-index').components;\n\n"
+        );
+    } else {
+        strm.write("module.exports.components = {};\n");
+    }
+
+    var files = glob.sync('**/*.js', {cwd: componentsDir}).sort();
+    for (var i = 0; i < files.length; ++i) {
+        var file = files[i].replace('.js', '');
+
+        var moduleName = (file.replace(/\//g, '.'));
+        var importName = moduleName.replace(/\./g, "$");
+
+        strm.write("import " + importName + " from './components/" + file + "';\n");
+        strm.write(importName + " && (module.exports.components['"+moduleName+"'] = " + importName + ");");
+        strm.write('\n');
+        strm.uncork();
+    }
+
+    strm.end();
+    console.log('Reskindex: completed');
 }
 
-strm.write("/*\n");
-strm.write(" * THIS FILE IS AUTO-GENERATED\n");
-strm.write(" * You can edit it you like, but your changes will be overwritten,\n");
-strm.write(" * so you'd just be trying to swim upstream like a salmon.\n");
-strm.write(" * You are not a salmon.\n");
-strm.write(" *\n");
-strm.write(" * To update it, run:\n");
-strm.write(" *    ./reskindex.js -h header\n");
-strm.write(" */\n\n");
-
-if (packageJson['matrix-react-parent']) {
-    strm.write("module.exports.components = require('"+packageJson['matrix-react-parent']+"/lib/component-index').components;\n\n");
-} else {
-    strm.write("module.exports.components = {};\n");
+// -w indicates watch mode where any FS events will trigger reskindex
+if (!args.w) {
+    reskindex();
+    return;
 }
 
-var files = glob.sync('**/*.js', {cwd: componentsDir}).sort();
-for (var i = 0; i < files.length; ++i) {
-    var file = files[i].replace('.js', '');
-
-    var moduleName = (file.replace(/\//g, '.'));
-    var importName = moduleName.replace(/\./g, "$");
-
-    strm.write("import " + importName + " from './components/" + file + "';\n");
-    strm.write(importName + " && (module.exports.components['"+moduleName+"'] = " + importName + ");");
-    strm.write('\n');
-    strm.uncork();
-}
-
-strm.end();
+var watchDebouncer = null;
+chokidar.watch('./src').on('all', (event, path) => {
+    if (path === componentIndex) return;
+    if (watchDebouncer) clearTimeout(watchDebouncer);
+    watchDebouncer = setTimeout(reskindex, 1000);
+});

From 7d1940620db557203887b710292c23cfff2a910e Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 15:07:58 +0100
Subject: [PATCH 107/312] Add (watching) reskindex to `npm start`

also add reskindex in non-watching mode to `npm run build`
---
 package.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b019c63da5..28f77f9460 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,10 @@
   },
   "scripts": {
     "reskindex": "scripts/reskindex.js -h header",
-    "build": "babel src -d lib --source-maps",
-    "start": "babel src -w -d lib --source-maps",
+    "reskindex:watch": "scripts/reskindex.js -h header -w",
+    "build": "npm run reskindex && babel src -d lib --source-maps",
+    "build:watch": "babel src -w -d lib --source-maps",
+    "start": "parallelshell \"npm run build:watch\" \"npm run reskindex:watch\"",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib",
@@ -106,6 +108,7 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
     "mocha": "^2.4.5",
+    "parallelshell": "^1.2.0",
     "phantomjs-prebuilt": "^2.1.7",
     "react-addons-test-utils": "^15.4.0",
     "require-json": "0.0.1",

From 534f9277d436e66725a7f8875d88d78f7cf59f02 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 May 2017 15:37:40 +0100
Subject: [PATCH 108/312] Fix this/self fail in LeftPanel

---
 src/components/views/dialogs/ChatInviteDialog.js |  5 +++++
 src/components/views/rooms/RoomList.js           | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index 7ba503099a..b349b94e5d 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -191,6 +191,7 @@ module.exports = React.createClass({
         this.queryChangedDebouncer = setTimeout(() => {
             // Only do search if there is something to search
             if (query.length > 0 && query != '@') {
+                performance.mark('start');
                 // Weighted keys prefer to match userIds when first char is @
                 this._fuse.options.keys = [{
                     name: 'displayName',
@@ -199,6 +200,7 @@ module.exports = React.createClass({
                     name: 'userId',
                     weight: query[0] === '@' ? 0.9 : 0.1,
                 }];
+                performance.mark('middle');
                 queryList = this._fuse.search(query).map((user) => {
                     // Return objects, structure of which is defined
                     // by InviteAddressType
@@ -210,6 +212,9 @@ module.exports = React.createClass({
                         isKnown: true,
                     }
                 });
+                performance.mark('end');
+                performance.measure('setopts', 'start', 'middle');
+                performance.measure('search', 'middle', 'end');
 
                 // If the query is a valid address, add an entry for that
                 // This is important, otherwise there's no way to invite
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 8d396b5536..a595a91ba9 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -652,7 +652,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['m.favourite'] }
                              label="Favourites"
                              tagName="m.favourite"
-                             emptyContent={this._getEmptyContent('m.favourite')}
+                             emptyContent={self._getEmptyContent('m.favourite')}
                              editable={ true }
                              order="manual"
                              incomingCall={ self.state.incomingCall }
@@ -665,8 +665,8 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
                              label="People"
                              tagName="im.vector.fake.direct"
-                             emptyContent={this._getEmptyContent('im.vector.fake.direct')}
-                             headerItems={this._getHeaderItems('im.vector.fake.direct')}
+                             emptyContent={self._getEmptyContent('im.vector.fake.direct')}
+                             headerItems={self._getHeaderItems('im.vector.fake.direct')}
                              editable={ true }
                              order="recent"
                              incomingCall={ self.state.incomingCall }
@@ -681,8 +681,8 @@ module.exports = React.createClass({
                              label="Rooms"
                              tagName="im.vector.fake.recent"
                              editable={ true }
-                             emptyContent={this._getEmptyContent('im.vector.fake.recent')}
-                             headerItems={this._getHeaderItems('im.vector.fake.recent')}
+                             emptyContent={self._getEmptyContent('im.vector.fake.recent')}
+                             headerItems={self._getHeaderItems('im.vector.fake.recent')}
                              order="recent"
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
@@ -697,7 +697,7 @@ module.exports = React.createClass({
                              key={ tagName }
                              label={ tagName }
                              tagName={ tagName }
-                             emptyContent={this._getEmptyContent(tagName)}
+                             emptyContent={self._getEmptyContent(tagName)}
                              editable={ true }
                              order="manual"
                              incomingCall={ self.state.incomingCall }
@@ -713,7 +713,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['m.lowpriority'] }
                              label="Low priority"
                              tagName="m.lowpriority"
-                             emptyContent={this._getEmptyContent('m.lowpriority')}
+                             emptyContent={self._getEmptyContent('m.lowpriority')}
                              editable={ true }
                              order="recent"
                              incomingCall={ self.state.incomingCall }

From 9cae667c063e67b32e60b89e7256d714a056559b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 May 2017 16:03:52 +0100
Subject: [PATCH 109/312] Fix Create Room button

Opened the DM dialog rather than the new room dialog
---
 src/components/views/elements/CreateRoomButton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
index e7e526d36b..73c984a860 100644
--- a/src/components/views/elements/CreateRoomButton.js
+++ b/src/components/views/elements/CreateRoomButton.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 const CreateRoomButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
-        <ActionButton action="view_create_chat"
+        <ActionButton action="view_create_room"
             label="Create new room"
             iconPath="img/icons-create-room.svg"
             size={props.size}

From 574c836941ca05164817a5458b5b7bf14b918a1a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 16:24:13 +0100
Subject: [PATCH 110/312] Move chokidar to devDeps

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 28f77f9460..4b0e8de5cd 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
     "blueimp-canvas-to-blob": "^3.5.0",
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
-    "chokidar": "^1.6.1",
     "classnames": "^2.1.2",
     "commonmark": "^0.27.0",
     "draft-js": "^0.8.1",
@@ -92,6 +91,7 @@
     "babel-preset-es2016": "^6.11.3",
     "babel-preset-es2017": "^6.14.0",
     "babel-preset-react": "^6.11.1",
+    "chokidar": "^1.6.1",
     "eslint": "^3.13.1",
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.0.1",

From 9af9603373ea9a3459170fc02413ae74200a04da Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 8 May 2017 16:29:53 +0100
Subject: [PATCH 111/312] Only watch indexed files

---
 scripts/reskindex.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index e82104f35c..1db22f9e10 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -7,6 +7,7 @@ var chokidar = require('chokidar');
 
 var componentIndex = path.join('src', 'component-index.js');
 var componentsDir = path.join('src', 'components');
+var componentGlob = '**/*.js';
 
 function reskindex() {
     var header = args.h || args.header;
@@ -36,7 +37,7 @@ function reskindex() {
         strm.write("module.exports.components = {};\n");
     }
 
-    var files = glob.sync('**/*.js', {cwd: componentsDir}).sort();
+    var files = glob.sync(componentGlob, {cwd: componentsDir}).sort();
     for (var i = 0; i < files.length; ++i) {
         var file = files[i].replace('.js', '');
 
@@ -60,7 +61,7 @@ if (!args.w) {
 }
 
 var watchDebouncer = null;
-chokidar.watch('./src').on('all', (event, path) => {
+chokidar.watch(path.join(componentsDir, componentGlob)).on('all', (event, path) => {
     if (path === componentIndex) return;
     if (watchDebouncer) clearTimeout(watchDebouncer);
     watchDebouncer = setTimeout(reskindex, 1000);

From 805354bd2c3d2e6233c55833f561d489d8b40445 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 May 2017 16:39:11 +0100
Subject: [PATCH 112/312] Revert unintentional change

---
 src/components/views/dialogs/ChatInviteDialog.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index b349b94e5d..7ba503099a 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -191,7 +191,6 @@ module.exports = React.createClass({
         this.queryChangedDebouncer = setTimeout(() => {
             // Only do search if there is something to search
             if (query.length > 0 && query != '@') {
-                performance.mark('start');
                 // Weighted keys prefer to match userIds when first char is @
                 this._fuse.options.keys = [{
                     name: 'displayName',
@@ -200,7 +199,6 @@ module.exports = React.createClass({
                     name: 'userId',
                     weight: query[0] === '@' ? 0.9 : 0.1,
                 }];
-                performance.mark('middle');
                 queryList = this._fuse.search(query).map((user) => {
                     // Return objects, structure of which is defined
                     // by InviteAddressType
@@ -212,9 +210,6 @@ module.exports = React.createClass({
                         isKnown: true,
                     }
                 });
-                performance.mark('end');
-                performance.measure('setopts', 'start', 'middle');
-                performance.measure('search', 'middle', 'end');
 
                 // If the query is a valid address, add an entry for that
                 // This is important, otherwise there's no way to invite

From 85ed39b9d87214a069af6c6ab2b642b6ff8b3386 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 8 May 2017 16:49:40 +0100
Subject: [PATCH 113/312] Put room name in 'leave room' confirmation dialog

https://github.com/vector-im/riot-web/issues/3850
---
 src/components/structures/MatrixChat.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 9b8aa3426a..8865d77d51 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -392,9 +392,10 @@ module.exports = React.createClass({
                 this.notifyNewScreen('forgot_password');
                 break;
             case 'leave_room':
+                const roomToLeave = MatrixClientPeg.get().getRoom(payload.room_id);
                 Modal.createDialog(QuestionDialog, {
                     title: "Leave room",
-                    description: "Are you sure you want to leave the room?",
+                    description: <span>Are you sure you want to leave the room <i>{roomToLeave.name}</i>?</span>,
                     onFinished: (should_leave) => {
                         if (should_leave) {
                             const d = MatrixClientPeg.get().leave(payload.room_id);

From 488fa3745b567cdff57041b1f81352c484aef0ec Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 9 May 2017 10:03:40 +0100
Subject: [PATCH 114/312] Fix RM not updating if RR event unpaginated

If the RR event has been unpaginated, the logic in `sendReadReceipt` will now fallback on the event ID of the RM which in theory is always =< RR event ID stream-wise.
---
 src/components/structures/ScrollPanel.js   |  2 +-
 src/components/structures/TimelinePanel.js | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index a652bcc827..22eb2240ed 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -575,7 +575,7 @@ module.exports = React.createClass({
         var boundingRect = node.getBoundingClientRect();
         var scrollDelta = boundingRect.bottom + pixelOffset - wrapperRect.bottom;
 
-        debuglog("ScrollPanel: scrolling to token '" + scrollToken + "'+" +
+        console.log("ScrollPanel: scrolling to token '" + scrollToken + "'+" +
                  pixelOffset + " (delta: "+scrollDelta+")");
 
         if(scrollDelta != 0) {
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 7c89694a29..d85282b5dc 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -510,8 +510,10 @@ var TimelinePanel = React.createClass({
         var currentReadUpToEventId = this._getCurrentReadReceipt(true);
         var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
 
+        currentReadUpToEventIndex = currentReadUpToEventIndex ||
+            this._indexForEventId(this.state.readMarkerEventId);
         // We want to avoid sending out read receipts when we are looking at
-        // events in the past which are before the latest RR.
+        // events in the past which are before the latest RR/RM.
         //
         // For now, let's apply a heuristic: if (a) the event corresponding to
         // the latest RR (either from the server, or sent by ourselves) doesn't
@@ -523,6 +525,7 @@ var TimelinePanel = React.createClass({
         // RRs) - but that is a bit of a niche case. It will sort itself out when
         // the user eventually hits the live timeline.
         //
+        console.log(currentReadUpToEventId, currentReadUpToEventIndex, this._timelineWindow.canPaginate(EventTimeline.FORWARDS));
         if (currentReadUpToEventId && currentReadUpToEventIndex === null &&
                 this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
             return;
@@ -544,6 +547,11 @@ var TimelinePanel = React.createClass({
             this.last_rr_sent_event_id = lastReadEvent.getId();
             this.last_rm_sent_event_id = this.state.readMarkerEventId;
 
+            console.log('TimelinePanel: Sending Read Markers for ',
+                this.props.timelineSet.room.roomId,
+                'rm', this.state.readMarkerEventId,
+                'rr', lastReadEvent.getId(),
+            );
             MatrixClientPeg.get().setRoomReadMarkers(
                 this.props.timelineSet.room.roomId,
                 this.state.readMarkerEventId,

From ac25fd6d87214e962897667d7abdd8b766cef2b9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 9 May 2017 10:16:37 +0100
Subject: [PATCH 115/312] Remove log

---
 src/components/structures/TimelinePanel.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index d85282b5dc..ba233780ec 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -525,7 +525,6 @@ var TimelinePanel = React.createClass({
         // RRs) - but that is a bit of a niche case. It will sort itself out when
         // the user eventually hits the live timeline.
         //
-        console.log(currentReadUpToEventId, currentReadUpToEventIndex, this._timelineWindow.canPaginate(EventTimeline.FORWARDS));
         if (currentReadUpToEventId && currentReadUpToEventIndex === null &&
                 this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
             return;

From f02e659fb7502ebb524651494e9c9bd1098fcc9b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 9 May 2017 11:27:06 +0100
Subject: [PATCH 116/312] Consume key{up,down,pressed} events

so they don't trigger other things bubbling up
until Modal is closed
---
 src/components/views/dialogs/BaseDialog.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index ac36dfd056..02460148b3 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -57,28 +57,25 @@ export default React.createClass({
         }
     },
 
-    // Don't let esc keydown events get any further, so they only trigger this and nothing more
-    _onKeyDown: function(e) {
-        if (e.keyCode === KeyCode.ESCAPE) {
-            e.stopPropagation();
-            e.preventDefault();
-        }
+    // Don't let key{down,press} events escape the modal. Consume them all.
+    _eatKeyEvent: function(e) {
+        e.stopPropagation();
     },
     
     // Must be when the key is released (and not pressed) otherwise componentWillUnmount
     // will focus another element which will receive future key events
     _onKeyUp: function(e) {
         if (e.keyCode === KeyCode.ESCAPE) {
-            e.stopPropagation();
             e.preventDefault();
             this.props.onFinished();
         } else if (e.keyCode === KeyCode.ENTER) {
             if (this.props.onEnterPressed) {
-                e.stopPropagation();
                 e.preventDefault();
                 this.props.onEnterPressed(e);
             }
         }
+        // Consume all keyup events while Modal is open
+        e.stopPropagation();
     },
 
     _onCancelClick: function(e) {
@@ -89,7 +86,11 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div onKeyDown={this._onKeyDown} onKeyUp={this._onKeyUp} className={this.props.className}>
+            <div onKeyUp={this._onKeyUp}
+                 onKeyDown={this._eatKeyEvent}
+                 onKeyPress={this._eatKeyEvent}
+                 className={this.props.className}
+            >
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >

From fdf48def00d336dd55ee189d21ea854cc72fd1d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 9 May 2017 17:13:27 +0100
Subject: [PATCH 117/312] make reskindex windows friendly

makes #871 windows friendly
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 4b0e8de5cd..21add8ccb7 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,8 @@
     "reskindex": "scripts/reskindex.js"
   },
   "scripts": {
-    "reskindex": "scripts/reskindex.js -h header",
-    "reskindex:watch": "scripts/reskindex.js -h header -w",
+    "reskindex": "node scripts/reskindex.js -h header",
+    "reskindex:watch": "node scripts/reskindex.js -h header -w",
     "build": "npm run reskindex && babel src -d lib --source-maps",
     "build:watch": "babel src -w -d lib --source-maps",
     "start": "parallelshell \"npm run build:watch\" \"npm run reskindex:watch\"",

From ca79d9bb6eed092b7b6ca7c7f89ae345624f4047 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 9 May 2017 17:36:19 +0100
Subject: [PATCH 118/312] Separate predicates for RM/RR

Instead of modifying the condition for updating the RR, separate the RM and RR conditions and use an OR to decide when to set both.

Make some logs only log when DEBUG.
---
 src/components/structures/ScrollPanel.js   |  2 +-
 src/components/structures/TimelinePanel.js | 27 ++++++++++++----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 22eb2240ed..a652bcc827 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -575,7 +575,7 @@ module.exports = React.createClass({
         var boundingRect = node.getBoundingClientRect();
         var scrollDelta = boundingRect.bottom + pixelOffset - wrapperRect.bottom;
 
-        console.log("ScrollPanel: scrolling to token '" + scrollToken + "'+" +
+        debuglog("ScrollPanel: scrolling to token '" + scrollToken + "'+" +
                  pixelOffset + " (delta: "+scrollDelta+")");
 
         if(scrollDelta != 0) {
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index ba233780ec..973c619904 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -504,16 +504,15 @@ var TimelinePanel = React.createClass({
         // very possible have logged out within that timeframe, so check
         // we still have a client.
         const cli = MatrixClientPeg.get();
-        // if no client or client is guest don't send RR
+        // if no client or client is guest don't send RR or RM
         if (!cli || cli.isGuest()) return;
 
+        let shouldSendRR = true;
+
         var currentReadUpToEventId = this._getCurrentReadReceipt(true);
         var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
-
-        currentReadUpToEventIndex = currentReadUpToEventIndex ||
-            this._indexForEventId(this.state.readMarkerEventId);
         // We want to avoid sending out read receipts when we are looking at
-        // events in the past which are before the latest RR/RM.
+        // events in the past which are before the latest RR.
         //
         // For now, let's apply a heuristic: if (a) the event corresponding to
         // the latest RR (either from the server, or sent by ourselves) doesn't
@@ -527,26 +526,30 @@ var TimelinePanel = React.createClass({
         //
         if (currentReadUpToEventId && currentReadUpToEventIndex === null &&
                 this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
-            return;
+            shouldSendRR = false;
         }
 
         var lastReadEventIndex = this._getLastDisplayedEventIndex({
             ignoreOwn: true
         });
-        if (lastReadEventIndex === null) return;
+        if (lastReadEventIndex === null) {
+            shouldSendRR = false;
+        }
 
         var lastReadEvent = this.state.events[lastReadEventIndex];
+        shouldSendRR = shouldSendRR &&
+            (lastReadEventIndex > currentReadUpToEventIndex &&
+            this.last_rr_sent_event_id != lastReadEvent.getId());
+
+        const shouldSendRM = this.last_rm_sent_event_id != this.state.readMarkerEventId;
 
         // we also remember the last read receipt we sent to avoid spamming the
         // same one at the server repeatedly
-        if ((lastReadEventIndex > currentReadUpToEventIndex &&
-            this.last_rr_sent_event_id != lastReadEvent.getId()) ||
-                this.last_rm_sent_event_id != this.state.readMarkerEventId) {
-
+        if (shouldSendRR || shouldSendRM) {
             this.last_rr_sent_event_id = lastReadEvent.getId();
             this.last_rm_sent_event_id = this.state.readMarkerEventId;
 
-            console.log('TimelinePanel: Sending Read Markers for ',
+            debuglog('TimelinePanel: Sending Read Markers for ',
                 this.props.timelineSet.room.roomId,
                 'rm', this.state.readMarkerEventId,
                 'rr', lastReadEvent.getId(),

From 7f766d89c32feba745c3d3000c64e94be5431226 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 10 May 2017 14:42:06 +0100
Subject: [PATCH 119/312] Rename variables, more comments

---
 src/components/structures/TimelinePanel.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 973c619904..874c6b1ac0 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -507,7 +507,7 @@ var TimelinePanel = React.createClass({
         // if no client or client is guest don't send RR or RM
         if (!cli || cli.isGuest()) return;
 
-        let shouldSendRR = true;
+        let shouldSendReadReceipt = true;
 
         var currentReadUpToEventId = this._getCurrentReadReceipt(true);
         var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
@@ -526,26 +526,30 @@ var TimelinePanel = React.createClass({
         //
         if (currentReadUpToEventId && currentReadUpToEventIndex === null &&
                 this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
-            shouldSendRR = false;
+            shouldSendReadReceipt = false;
         }
 
         var lastReadEventIndex = this._getLastDisplayedEventIndex({
             ignoreOwn: true
         });
         if (lastReadEventIndex === null) {
-            shouldSendRR = false;
+            shouldSendReadReceipt = false;
         }
 
         var lastReadEvent = this.state.events[lastReadEventIndex];
-        shouldSendRR = shouldSendRR &&
-            (lastReadEventIndex > currentReadUpToEventIndex &&
-            this.last_rr_sent_event_id != lastReadEvent.getId());
+        shouldSendReadReceipt = shouldSendReadReceipt &&
+            // Only send a RR if the last read Event is ahead in the timeline relative to
+            // the current RR event.
+            lastReadEventIndex > currentReadUpToEventIndex &&
+            // Only send a RR if the last RR set != the one we would send
+            this.last_rr_sent_event_id != lastReadEvent.getId();
 
-        const shouldSendRM = this.last_rm_sent_event_id != this.state.readMarkerEventId;
+        // Only send a RM if the last RM sent != the one we would send
+        const shouldSendReadMarker = this.last_rm_sent_event_id != this.state.readMarkerEventId;
 
         // we also remember the last read receipt we sent to avoid spamming the
         // same one at the server repeatedly
-        if (shouldSendRR || shouldSendRM) {
+        if (shouldSendReadReceipt || shouldSendReadMarker) {
             this.last_rr_sent_event_id = lastReadEvent.getId();
             this.last_rm_sent_event_id = this.state.readMarkerEventId;
 

From 30e183a7f1e0c5378d837f3ab45dfc8abbe6ade0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 10 May 2017 14:48:01 +0100
Subject: [PATCH 120/312] Only send RR if we should

---
 src/components/structures/TimelinePanel.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 874c6b1ac0..26bf9dd400 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -550,23 +550,27 @@ var TimelinePanel = React.createClass({
         // we also remember the last read receipt we sent to avoid spamming the
         // same one at the server repeatedly
         if (shouldSendReadReceipt || shouldSendReadMarker) {
-            this.last_rr_sent_event_id = lastReadEvent.getId();
+            if (shouldSendReadReceipt) {
+                this.last_rr_sent_event_id = lastReadEvent.getId();
+            } else {
+                lastReadEvent = null;
+            }
             this.last_rm_sent_event_id = this.state.readMarkerEventId;
 
             debuglog('TimelinePanel: Sending Read Markers for ',
                 this.props.timelineSet.room.roomId,
                 'rm', this.state.readMarkerEventId,
-                'rr', lastReadEvent.getId(),
+                lastReadEvent ? 'rr ' + lastReadEvent.getId() : '',
             );
             MatrixClientPeg.get().setRoomReadMarkers(
                 this.props.timelineSet.room.roomId,
                 this.state.readMarkerEventId,
-                lastReadEvent
+                lastReadEvent, // Could be null, in which case no RR is sent
             ).catch((e) => {
                 // /read_markers API is not implemented on this HS, fallback to just RR
-                if (e.errcode === 'M_UNRECOGNIZED') {
+                if (e.errcode === 'M_UNRECOGNIZED' && lastReadEvent) {
                     return MatrixClientPeg.get().sendReadReceipt(
-                        lastReadEvent
+                        lastReadEvent,
                     ).catch(() => {
                         this.last_rr_sent_event_id = undefined;
                     });

From fe8ea4ffe7dcc5844c52a3baf96563838cac8a90 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 10 May 2017 14:51:47 +0100
Subject: [PATCH 121/312] Rename vars, linting

---
 src/components/structures/TimelinePanel.js | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 26bf9dd400..8a6c80980e 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -177,8 +177,8 @@ var TimelinePanel = React.createClass({
     componentWillMount: function() {
         debuglog("TimelinePanel: mounting");
 
-        this.last_rr_sent_event_id = undefined;
-        this.last_rm_sent_event_id = undefined;
+        this.lastRRSentSentId = undefined;
+        this.lastRMSentEventId = undefined;
 
         this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
@@ -509,8 +509,8 @@ var TimelinePanel = React.createClass({
 
         let shouldSendReadReceipt = true;
 
-        var currentReadUpToEventId = this._getCurrentReadReceipt(true);
-        var currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
+        const currentReadUpToEventId = this._getCurrentReadReceipt(true);
+        const currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
         // We want to avoid sending out read receipts when we are looking at
         // events in the past which are before the latest RR.
         //
@@ -529,33 +529,33 @@ var TimelinePanel = React.createClass({
             shouldSendReadReceipt = false;
         }
 
-        var lastReadEventIndex = this._getLastDisplayedEventIndex({
-            ignoreOwn: true
+        const lastReadEventIndex = this._getLastDisplayedEventIndex({
+            ignoreOwn: true,
         });
         if (lastReadEventIndex === null) {
             shouldSendReadReceipt = false;
         }
-
-        var lastReadEvent = this.state.events[lastReadEventIndex];
+        let lastReadEvent = this.state.events[lastReadEventIndex];
         shouldSendReadReceipt = shouldSendReadReceipt &&
             // Only send a RR if the last read Event is ahead in the timeline relative to
             // the current RR event.
             lastReadEventIndex > currentReadUpToEventIndex &&
             // Only send a RR if the last RR set != the one we would send
-            this.last_rr_sent_event_id != lastReadEvent.getId();
+            this.lastRRSentSentId != lastReadEvent.getId();
 
         // Only send a RM if the last RM sent != the one we would send
-        const shouldSendReadMarker = this.last_rm_sent_event_id != this.state.readMarkerEventId;
+        const shouldSendReadMarker =
+            this.lastRMSentEventId != this.state.readMarkerEventId;
 
         // we also remember the last read receipt we sent to avoid spamming the
         // same one at the server repeatedly
         if (shouldSendReadReceipt || shouldSendReadMarker) {
             if (shouldSendReadReceipt) {
-                this.last_rr_sent_event_id = lastReadEvent.getId();
+                this.lastRRSentSentId = lastReadEvent.getId();
             } else {
                 lastReadEvent = null;
             }
-            this.last_rm_sent_event_id = this.state.readMarkerEventId;
+            this.lastRMSentEventId = this.state.readMarkerEventId;
 
             debuglog('TimelinePanel: Sending Read Markers for ',
                 this.props.timelineSet.room.roomId,
@@ -572,12 +572,12 @@ var TimelinePanel = React.createClass({
                     return MatrixClientPeg.get().sendReadReceipt(
                         lastReadEvent,
                     ).catch(() => {
-                        this.last_rr_sent_event_id = undefined;
+                        this.lastRRSentSentId = undefined;
                     });
                 }
                 // it failed, so allow retries next time the user is active
-                this.last_rr_sent_event_id = undefined;
-                this.last_rm_sent_event_id = undefined;
+                this.lastRRSentSentId = undefined;
+                this.lastRMSentEventId = undefined;
             });
 
             // do a quick-reset of our unreadNotificationCount to avoid having

From 856ef58d4678e4b243f4df94bdc20bb3b6e70efb Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 10 May 2017 14:55:58 +0100
Subject: [PATCH 122/312] fix commen

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

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 8a6c80980e..08b94fbdbf 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -537,7 +537,7 @@ var TimelinePanel = React.createClass({
         }
         let lastReadEvent = this.state.events[lastReadEventIndex];
         shouldSendReadReceipt = shouldSendReadReceipt &&
-            // Only send a RR if the last read Event is ahead in the timeline relative to
+            // Only send a RR if the last read event is ahead in the timeline relative to
             // the current RR event.
             lastReadEventIndex > currentReadUpToEventIndex &&
             // Only send a RR if the last RR set != the one we would send

From 50092a0f1f432ad8b7aed33120765b264e32e7cb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 May 2017 15:16:49 +0100
Subject: [PATCH 123/312] fixes vector-im/riot-web#3881

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

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 2c29dd433c..798aacfa8e 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -926,7 +926,7 @@ module.exports = React.createClass({
                         <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">To redact messages, you must be a </span>
+                        <span className="mx_RoomSettings_powerLevelKey">To redact 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>
 

From 3815ad6cd031a9cd14081a18ba6c6c0448fcbc6c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 11 May 2017 09:20:34 +0100
Subject: [PATCH 124/312] Sent -> Event

---
 src/components/structures/TimelinePanel.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 08b94fbdbf..5a5abc6257 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -177,7 +177,7 @@ var TimelinePanel = React.createClass({
     componentWillMount: function() {
         debuglog("TimelinePanel: mounting");
 
-        this.lastRRSentSentId = undefined;
+        this.lastRRSentEventId = undefined;
         this.lastRMSentEventId = undefined;
 
         this.dispatcherRef = dis.register(this.onAction);
@@ -541,7 +541,7 @@ var TimelinePanel = React.createClass({
             // the current RR event.
             lastReadEventIndex > currentReadUpToEventIndex &&
             // Only send a RR if the last RR set != the one we would send
-            this.lastRRSentSentId != lastReadEvent.getId();
+            this.lastRRSentEventId != lastReadEvent.getId();
 
         // Only send a RM if the last RM sent != the one we would send
         const shouldSendReadMarker =
@@ -551,7 +551,7 @@ var TimelinePanel = React.createClass({
         // same one at the server repeatedly
         if (shouldSendReadReceipt || shouldSendReadMarker) {
             if (shouldSendReadReceipt) {
-                this.lastRRSentSentId = lastReadEvent.getId();
+                this.lastRRSentEventId = lastReadEvent.getId();
             } else {
                 lastReadEvent = null;
             }
@@ -572,11 +572,11 @@ var TimelinePanel = React.createClass({
                     return MatrixClientPeg.get().sendReadReceipt(
                         lastReadEvent,
                     ).catch(() => {
-                        this.lastRRSentSentId = undefined;
+                        this.lastRRSentEventId = undefined;
                     });
                 }
                 // it failed, so allow retries next time the user is active
-                this.lastRRSentSentId = undefined;
+                this.lastRRSentEventId = undefined;
                 this.lastRMSentEventId = undefined;
             });
 

From 852e1eb72016d71c22b817515547c1d448bdc67a Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 11 May 2017 09:31:59 +0100
Subject: [PATCH 125/312] Rename some variables

`ReadUpTo` -> `RR`
`ReadReceipt` -> `RR`
`ReadMarker` -> `RM`
---
 src/components/structures/TimelinePanel.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 5a5abc6257..de43bd1c19 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -507,10 +507,10 @@ var TimelinePanel = React.createClass({
         // if no client or client is guest don't send RR or RM
         if (!cli || cli.isGuest()) return;
 
-        let shouldSendReadReceipt = true;
+        let shouldSendRR = true;
 
-        const currentReadUpToEventId = this._getCurrentReadReceipt(true);
-        const currentReadUpToEventIndex = this._indexForEventId(currentReadUpToEventId);
+        const currentRREventId = this._getCurrentReadReceipt(true);
+        const currentRREventIndex = this._indexForEventId(currentRREventId);
         // We want to avoid sending out read receipts when we are looking at
         // events in the past which are before the latest RR.
         //
@@ -524,33 +524,33 @@ var TimelinePanel = React.createClass({
         // RRs) - but that is a bit of a niche case. It will sort itself out when
         // the user eventually hits the live timeline.
         //
-        if (currentReadUpToEventId && currentReadUpToEventIndex === null &&
+        if (currentRREventId && currentRREventIndex === null &&
                 this._timelineWindow.canPaginate(EventTimeline.FORWARDS)) {
-            shouldSendReadReceipt = false;
+            shouldSendRR = false;
         }
 
         const lastReadEventIndex = this._getLastDisplayedEventIndex({
             ignoreOwn: true,
         });
         if (lastReadEventIndex === null) {
-            shouldSendReadReceipt = false;
+            shouldSendRR = false;
         }
         let lastReadEvent = this.state.events[lastReadEventIndex];
-        shouldSendReadReceipt = shouldSendReadReceipt &&
+        shouldSendRR = shouldSendRR &&
             // Only send a RR if the last read event is ahead in the timeline relative to
             // the current RR event.
-            lastReadEventIndex > currentReadUpToEventIndex &&
+            lastReadEventIndex > currentRREventIndex &&
             // Only send a RR if the last RR set != the one we would send
             this.lastRRSentEventId != lastReadEvent.getId();
 
         // Only send a RM if the last RM sent != the one we would send
-        const shouldSendReadMarker =
+        const shouldSendRM =
             this.lastRMSentEventId != this.state.readMarkerEventId;
 
         // we also remember the last read receipt we sent to avoid spamming the
         // same one at the server repeatedly
-        if (shouldSendReadReceipt || shouldSendReadMarker) {
-            if (shouldSendReadReceipt) {
+        if (shouldSendRR || shouldSendRM) {
+            if (shouldSendRR) {
                 this.lastRRSentEventId = lastReadEvent.getId();
             } else {
                 lastReadEvent = null;

From f55b27f43281e860ca92b37635a8207907b9134d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 May 2017 17:32:23 +0100
Subject: [PATCH 126/312] looks like it is passed and accessed like a string so
 unless I'm going insane, it should be a string.

fixes
```
rageshake.js:61 Warning: Failed prop type: The prop `onClick` is marked as required in `AccessibleButton`, but its value is `undefined`.
    in AccessibleButton (created by RoomHeader)
    in RoomHeader (created by RoomView)
    in div (created by RoomView)
    in RoomView (created by LoggedInView)
    in main (created by LoggedInView)
    in div (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in MatrixChat
```

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

diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 43c3b05295..5b7ec9347b 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -47,7 +47,7 @@ module.exports = React.createClass({
         // The alias that was used to access this room, if appropriate
         // If given, this will be how the room is referred to (eg.
         // in error messages).
-        roomAlias: React.PropTypes.object,
+        roomAlias: React.PropTypes.string,
     },
 
     getDefaultProps: function() {

From 5e4467adced6ac7cd7eb8b20464efbeb0d8830db Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 May 2017 17:35:06 +0100
Subject: [PATCH 127/312] hide settings/search appropriately

pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE

if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js    |  1 +
 src/components/views/rooms/RoomHeader.js | 30 +++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1b3ed6e80d..af0c595ea9 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1772,6 +1772,7 @@ module.exports = React.createClass({
                     oobData={this.props.oobData}
                     editing={this.state.editingRoomSettings}
                     saving={this.state.uploadingRoomSettings}
+                    inRoom={myMember && myMember.membership === 'join'}
                     collapsedRhs={ this.props.collapsedRhs }
                     onSearchClick={this.onSearchClick}
                     onSettingsClick={this.onSettingsClick}
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 94f2691f2c..5a7da47cbf 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -39,6 +39,7 @@ module.exports = React.createClass({
         oobData: React.PropTypes.object,
         editing: React.PropTypes.bool,
         saving: React.PropTypes.bool,
+        inRoom: React.PropTypes.bool,
         collapsedRhs: React.PropTypes.bool,
         onSettingsClick: React.PropTypes.func,
         onSaveClick: React.PropTypes.func,
@@ -49,7 +50,7 @@ module.exports = React.createClass({
     getDefaultProps: function() {
         return {
             editing: false,
-            onSettingsClick: function() {},
+            inRoom: false,
             onSaveClick: function() {},
         };
     },
@@ -225,12 +226,17 @@ module.exports = React.createClass({
                 roomName = this.props.room.name;
             }
 
+            const innerName =
+                <EmojiText element="div"
+                           className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") }
+                           title={ roomName }>{roomName}</EmojiText>;
+
+            if (this.props.onSettingsClick) {
+                name = <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>{ innerName }{ searchStatus }</div>;
+            } else {
+                name = <div className="mx_RoomHeader_name">{ innerName }{ searchStatus }</div>;
+            }
 
-            name =
-                <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
-                    <EmojiText element="div" className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") } title={ roomName }>{roomName}</EmojiText>
-                    { searchStatus }
-                </div>;
         }
 
         if (can_set_room_topic) {
@@ -299,6 +305,14 @@ module.exports = React.createClass({
                 </AccessibleButton>;
         }
 
+        let search_button;
+        if (this.props.onSearchClick && this.props.inRoom) {
+            search_button =
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">
+                    <TintableSvg src="img/icons-search.svg" width="35" height="35"/>
+                </AccessibleButton>;
+        }
+
         var rightPanel_buttons;
         if (this.props.collapsedRhs) {
             rightPanel_buttons =
@@ -313,9 +327,7 @@ module.exports = React.createClass({
                 <div className="mx_RoomHeader_rightRow">
                     { settings_button }
                     { forget_button }
-                    <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">
-                        <TintableSvg src="img/icons-search.svg" width="35" height="35"/>
-                    </AccessibleButton>
+                    { search_button }
                     { rightPanel_buttons }
                 </div>;
         }

From 69d860e98207df27eaaefdb1a53f9e82918f94bc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 12 May 2017 21:06:36 +0100
Subject: [PATCH 128/312] revert name overengineering, undefined onClick should
 be fine on div

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

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 5a7da47cbf..c10228c334 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -226,17 +226,11 @@ module.exports = React.createClass({
                 roomName = this.props.room.name;
             }
 
-            const innerName =
-                <EmojiText element="div"
-                           className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") }
-                           title={ roomName }>{roomName}</EmojiText>;
-
-            if (this.props.onSettingsClick) {
-                name = <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>{ innerName }{ searchStatus }</div>;
-            } else {
-                name = <div className="mx_RoomHeader_name">{ innerName }{ searchStatus }</div>;
-            }
-
+            name =
+                <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
+                    <EmojiText element="div" className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") } title={ roomName }>{roomName}</EmojiText>
+                    { searchStatus }
+                </div>;
         }
 
         if (can_set_room_topic) {

From 822f2f10f28a724654d3cc574ecc4672d7f243fa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 12 May 2017 21:16:55 +0100
Subject: [PATCH 129/312] conform to Luke's comment
 https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726

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

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index c10228c334..e9bb10c60c 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -228,7 +228,7 @@ module.exports = React.createClass({
 
             name =
                 <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
-                    <EmojiText element="div" className={ "mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "") } title={ roomName }>{roomName}</EmojiText>
+                    <EmojiText element="div" className={"mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "")} title={roomName}>{ roomName }</EmojiText>
                     { searchStatus }
                 </div>;
         }

From 60b13d76a505fbc99940e72f425f21d7984bef1b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 12 May 2017 21:20:56 +0100
Subject: [PATCH 130/312] conform to Luke's other comment

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

diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index e9bb10c60c..4cf20454a0 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+var classNames = require('classnames');
 var sdk = require('../../../index');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var Modal = require("../../../Modal");
@@ -226,9 +227,10 @@ module.exports = React.createClass({
                 roomName = this.props.room.name;
             }
 
+            const emojiTextClasses = classNames('mx_RoomHeader_nametext', { mx_RoomHeader_settingsHint: settingsHint });
             name =
                 <div className="mx_RoomHeader_name" onClick={this.props.onSettingsClick}>
-                    <EmojiText element="div" className={"mx_RoomHeader_nametext " + (settingsHint ? "mx_RoomHeader_settingsHint" : "")} title={roomName}>{ roomName }</EmojiText>
+                    <EmojiText element="div" className={emojiTextClasses} title={roomName}>{ roomName }</EmojiText>
                     { searchStatus }
                 </div>;
         }

From 29568feb9519c2068e852037894451573aee645a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 12 May 2017 22:38:57 +0100
Subject: [PATCH 131/312] show error if we can't set a filter this way it still
 works for a room we've been in before

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

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index fc4cbd9423..778a0cd6f3 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -59,6 +59,8 @@ var FilePanel = React.createClass({
         var client = MatrixClientPeg.get();
         var room = client.getRoom(roomId);
 
+        this.noRoom = !room;
+
         if (room) {
             var filter = new Matrix.Filter(client.credentials.userId);
             filter.setDefinition(
@@ -82,13 +84,18 @@ var FilePanel = React.createClass({
                     console.error("Failed to get or create file panel filter", error);
                 }
             );
-        }
-        else {
+        } else {
             console.error("Failed to add filtered timelineSet for FilePanel as no room!");
         }
     },
 
     render: function() {
+        if (this.noRoom) {
+            return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
+                <div className="mx_RoomView_empty">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");

From 6ec799a028dfff7af27e471df9c13f438ae4e7d0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 13 May 2017 15:04:20 +0100
Subject: [PATCH 132/312] I broke UserSettings for webpack-dev-server where
 version file doesn't exist, version starts as null then gets set to undefined
 by the promise this wasn't handled and now undefined is understood to be
 unknown rather than null

also picked up on a small casing error
threePids vs threepids, most things using the latter apart from the init

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 46dce8bd2e..1740f066d6 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -36,7 +36,7 @@ const REACT_SDK_VERSION = 'dist' in packageJson ? packageJson.version : packageJ
 
 // Simple method to help prettify GH Release Tags and Commit Hashes.
 const semVerRegex = /^v?(\d+\.\d+\.\d+(?:-rc.+)?)(?:-(?:\d+-g)?([0-9a-fA-F]+))?(?:-dirty)?$/i;
-const gHVersionLabel = function(repo, token) {
+const gHVersionLabel = function(repo, token='') {
     const match = token.match(semVerRegex);
     let url;
     if (match && match[1]) { // basic semVer string possibly with commit hash
@@ -151,10 +151,10 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             avatarUrl: null,
-            threePids: [],
+            threepids: [],
             phase: "UserSettings.LOADING", // LOADING, DISPLAY
             email_add_pending: false,
-            vectorVersion: null,
+            vectorVersion: undefined,
             rejectingInvites: false,
         };
     },
@@ -1004,7 +1004,7 @@ module.exports = React.createClass({
                             ? gHVersionLabel('matrix-org/matrix-react-sdk', REACT_SDK_VERSION)
                             : REACT_SDK_VERSION
                         }<br/>
-                        riot-web version: {(this.state.vectorVersion !== null)
+                        riot-web version: {(this.state.vectorVersion !== undefined)
                             ? gHVersionLabel('vector-im/riot-web', this.state.vectorVersion)
                             : 'unknown'
                         }<br/>

From d7c88a9813087db5df9360eac1c9f57eafa67246 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 13 May 2017 15:20:31 +0100
Subject: [PATCH 133/312] only removed `/me `, remove anyway to fix
 vector-im/riot-web#3733

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

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 8efd2fa579..e2fcc19f67 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -542,9 +542,9 @@ export default class MessageComposerInput extends React.Component {
         let sendTextFn = this.client.sendTextMessage;
 
         if (contentText.startsWith('/me')) {
-            contentText = contentText.replace('/me ', '');
+            contentText = contentText.substring(4);
             // bit of a hack, but the alternative would be quite complicated
-            if (contentHTML) contentHTML = contentHTML.replace('/me ', '');
+            if (contentHTML) contentHTML = contentHTML.replace(/\/me ?/, '');
             sendHtmlFn = this.client.sendHtmlEmote;
             sendTextFn = this.client.sendEmoteMessage;
         }

From f3274426db369814b5c819aee6b46141fedb5584 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 00:25:12 +0100
Subject: [PATCH 134/312] revert f999aa9 and support full date formats when
 desired

---
 src/DateUtils.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 07bab4ae7b..c58c09d4de 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -19,13 +19,14 @@ limitations under the License.
 var days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
 
+function pad(n) {
+    return (n < 10 ? '0' : '') + n;
+}
+
 module.exports = {
     formatDate: function(date) {
         // date.toLocaleTimeString is completely system dependent.
         // just go 24h for now
-        function pad(n) {
-            return (n < 10 ? '0' : '') + n;
-        }
 
         var now = new Date();
         if (date.toDateString() === now.toDateString()) {
@@ -34,19 +35,20 @@ module.exports = {
         else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
             return days[date.getDay()] + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
         }
-        else /* if (now.getFullYear() === date.getFullYear()) */ {
+        else if (now.getFullYear() === date.getFullYear()) {
             return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
         }
-        /*
         else {
-            return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+            return this.formatFullDate(date);
         }
-        */
+    },
+
+    formatFullDate: function(date) {
+        return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
     },
 
     formatTime: function(date) {
-        //return pad(date.getHours()) + ':' + pad(date.getMinutes());
-        return ('00' + date.getHours()).slice(-2) + ':' + ('00' + date.getMinutes()).slice(-2);
+        return pad(date.getHours()) + ':' + pad(date.getMinutes());
     }
 };
 

From c0cead15465ee6c7bf0091d58b4c131491c240f1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 01:32:37 +0100
Subject: [PATCH 135/312] workaround for
 https://github.com/vector-im/riot-web/issues/3633.

unsure our vector url match could ever return undefined, but apparently it is...
---
 src/HtmlUtils.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index a31601790f..4acb314c2f 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -148,17 +148,18 @@ var sanitizeHtmlParams = {
                     attribs.href = m[1];
                     delete attribs.target;
                 }
-
-                m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
-                if (m) {
-                    var entity = m[1];
-                    if (entity[0] === '@') {
-                        attribs.href = '#/user/' + entity;
+                else {
+                    m = attribs.href.match(linkifyMatrix.MATRIXTO_URL_PATTERN);
+                    if (m) {
+                        var entity = m[1];
+                        if (entity[0] === '@') {
+                            attribs.href = '#/user/' + entity;
+                        }
+                        else if (entity[0] === '#' || entity[0] === '!') {
+                            attribs.href = '#/room/' + entity;
+                        }
+                        delete attribs.target;
                     }
-                    else if (entity[0] === '#' || entity[0] === '!') {
-                        attribs.href = '#/room/' + entity;
-                    }
-                    delete attribs.target;
                 }
             }
             attribs.rel = 'noopener'; // https://mathiasbynens.github.io/rel-noopener/

From c5f2b69e48de2606ba1d420ee40086fb4445f3d6 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 01:37:24 +0100
Subject: [PATCH 136/312] add alt attributes to e2e icons on msgs; fixes
 https://github.com/vector-im/riot-web/issues/3786

---
 src/components/views/rooms/EventTile.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index d1486d22c9..e2e203f680 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -492,22 +492,22 @@ module.exports = WithMatrixClient(React.createClass({
         var e2e;
         // cosmetic padlocks:
         if ((e2eEnabled && this.props.eventSendStatus) || this.props.mxEvent.getType() === 'm.room.encryption') {
-            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" />;
+            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12" />;
         }
         // real padlocks
         else if (this.props.mxEvent.isEncrypted() || (e2eEnabled && this.props.eventSendStatus)) {
             if (this.props.mxEvent.getContent().msgtype === 'm.bad.encrypted') {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Undecryptable" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
             }
             else if (this.state.verified == true || (e2eEnabled && this.props.eventSendStatus)) {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-verified.svg" width="10" height="12"/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon"  alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12"/>;
             }
             else {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by unverified device" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
             }
         }
         else if (e2eEnabled) {
-            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
+            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
         }
         const timestamp = this.props.mxEvent.getTs() ?
             <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;

From 48864b0880f5c98dc46b043902833b5295d19b78 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 01:39:57 +0100
Subject: [PATCH 137/312] fix visibility of topbar close on dark theme, fixing
 https://github.com/vector-im/riot-web/issues/3783

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

diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 72b489a406..74c689c395 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -38,7 +38,7 @@ module.exports = React.createClass({
                         title="Scroll to unread messages"/>
                     Jump to first unread message.
                 </div>
-                <img className="mx_TopUnreadMessagesBar_close"
+                <img className="mx_TopUnreadMessagesBar_close mx_filterFlipColor"
                     src="img/cancel.svg" width="18" height="18"
                     alt="Close" title="Close"
                     onClick={this.props.onCloseClick} />

From 82092dc2d81401b24af4dc60dd0b1bcec5f05a27 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 02:14:50 +0100
Subject: [PATCH 138/312] onClick MELS avatars = expand MELS; fixes
 https://github.com/vector-im/riot-web/issues/3899

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

diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index ae8678894d..dcf1810468 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -269,7 +269,7 @@ module.exports = React.createClass({
             );
         });
         return (
-            <span className="mx_MemberEventListSummary_avatars">
+            <span className="mx_MemberEventListSummary_avatars" onClick={ this._toggleSummary }>
                 {avatars}
             </span>
         );

From 5c0c49e1f60a45f0f866ab19474d94cb1a446b0d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 02:18:18 +0100
Subject: [PATCH 139/312] ignore voip answer/hangup in unread events - fixes
 https://github.com/vector-im/riot-web/issues/3827

---
 src/Unread.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Unread.js b/src/Unread.js
index d7490c8632..67166dc24f 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -25,7 +25,9 @@ module.exports = {
     eventTriggersUnreadCount: function(ev) {
         if (ev.sender && ev.sender.userId == MatrixClientPeg.get().credentials.userId) {
             return false;
-        } else if (ev.getType() == "m.room.member") {
+        } else if (ev.getType() == 'm.room.member') {
+            return false;
+        } else if (ev.getType() == 'm.call.answer' || ev.getType() == 'm.call.hangup') {
             return false;
         } else if (ev.getType == 'm.room.message' && ev.getContent().msgtype == 'm.notify') {
             return false;

From 6879f7ee6f8f2f1e943b1609dee12800b735d4e0 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 02:43:23 +0100
Subject: [PATCH 140/312] add presence to MemberInfo, fixes
 https://github.com/vector-im/riot-web/issues/3720

---
 src/components/views/rooms/MemberInfo.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 1a9a8d5e0f..839405c922 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -717,8 +717,16 @@ module.exports = WithMatrixClient(React.createClass({
 
         const memberName = this.props.member.name;
 
+        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;
+            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 EmojiText = sdk.getComponent('elements.EmojiText');
         return (
             <div className="mx_MemberInfo">
@@ -736,6 +744,11 @@ module.exports = WithMatrixClient(React.createClass({
                     <div className="mx_MemberInfo_profileField">
                         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 } />
+                    </div>
                 </div>
 
                 { adminTools }

From 486301cffb55aee0a7cfb3df1df3ff5a8ad3c228 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 02:55:07 +0100
Subject: [PATCH 141/312] remove dodgy heuristics for hiding dates on RRs and
 use DateUtils instead.

reverts https://github.com/matrix-org/matrix-react-sdk/pull/586/commits/5d99d68a64ec0c81b42c5a8e6959376dab798feb
fixes https://github.com/vector-im/riot-web/issues/3523
---
 src/components/views/rooms/EventTile.js         | 11 -----------
 src/components/views/rooms/ReadReceiptMarker.js | 17 ++++-------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e2e203f680..44c4051995 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -295,16 +295,6 @@ module.exports = WithMatrixClient(React.createClass({
         const receiptOffset = 15;
         let left = 0;
 
-        // It's possible that the receipt was sent several days AFTER the event.
-        // If it is, we want to display the complete date along with the HH:MM:SS,
-        // rather than just HH:MM:SS.
-        let dayAfterEvent = new Date(this.props.mxEvent.getTs());
-        dayAfterEvent.setDate(dayAfterEvent.getDate() + 1);
-        dayAfterEvent.setHours(0);
-        dayAfterEvent.setMinutes(0);
-        dayAfterEvent.setSeconds(0);
-        let dayAfterEventTime = dayAfterEvent.getTime();
-
         var receipts = this.props.readReceipts || [];
         for (var i = 0; i < receipts.length; ++i) {
             var receipt = receipts[i];
@@ -340,7 +330,6 @@ module.exports = WithMatrixClient(React.createClass({
                     suppressAnimation={this._suppressReadReceiptAnimation}
                     onClick={this.toggleAllReadAvatars}
                     timestamp={receipt.ts}
-                    showFullTimestamp={receipt.ts >= dayAfterEventTime}
                 />
             );
         }
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 230efbd1ea..0911d50c3e 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -24,6 +24,8 @@ var sdk = require('../../../index');
 var Velociraptor = require('../../../Velociraptor');
 require('../../../VelocityBounce');
 
+import DateUtils from '../../../DateUtils';
+
 var bounce = false;
 try {
     if (global.localStorage) {
@@ -63,9 +65,6 @@ module.exports = React.createClass({
 
         // Timestamp when the receipt was read
         timestamp: React.PropTypes.number,
-
-        // True to show the full date/time rather than just the time
-        showFullTimestamp: React.PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -170,16 +169,8 @@ module.exports = React.createClass({
 
         let title;
         if (this.props.timestamp) {
-            const prefix = "Seen by " + this.props.member.userId + " at ";
-            let ts = new Date(this.props.timestamp);
-            if (this.props.showFullTimestamp) {
-                // "15/12/2016, 7:05:45 PM (@alice:matrix.org)"
-                title = prefix + ts.toLocaleString();
-            }
-            else {
-                // "7:05:45 PM (@alice:matrix.org)"
-                title = prefix + ts.toLocaleTimeString();
-            }
+            title = "Seen by " + this.props.member.userId + " at " + 
+                    DateUtils.formatDate(new Date(this.props.timestamp));
         }
 
         return (

From 317e24852dc7eaed7cc2a9a055a1139bab934801 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 15 May 2017 03:03:17 +0100
Subject: [PATCH 142/312] explicitly label email & phone add sections; fixes
 https://github.com/vector-im/riot-web/issues/3531

---
 src/components/structures/UserSettings.js       | 1 +
 src/components/views/settings/AddPhoneNumber.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 1740f066d6..2c1f17ee3e 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -855,6 +855,7 @@ module.exports = React.createClass({
             addEmailSection = (
                 <div className="mx_UserSettings_profileTableRow" key="_newEmail">
                     <div className="mx_UserSettings_profileLabelCell">
+                        <label>Email</label>
                     </div>
                     <div className="mx_UserSettings_profileInputCell">
                         <EditableText
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 35dd5548d1..6df4d8e8cc 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -147,6 +147,7 @@ export default WithMatrixClient(React.createClass({
         return (
             <form className="mx_UserSettings_profileTableRow" onSubmit={this._onAddMsisdnSubmit}>
                 <div className="mx_UserSettings_profileLabelCell">
+                    <label>Phone</label>
                 </div>
                 <div className="mx_UserSettings_profileInputCell">
                     <div className="mx_UserSettings_phoneSection">

From 83cb1e6e29a639dc65e45254fdbd706d2d06c347 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 15 May 2017 10:15:35 +0100
Subject: [PATCH 143/312] tell guests they can't use filepanel until they
 register

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

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index 778a0cd6f3..e7438afc4d 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -90,7 +90,11 @@ var FilePanel = React.createClass({
     },
 
     render: function() {
-        if (this.noRoom) {
+        if (MatrixClientPeg.get().isGuest()) {
+            return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
+                <div className="mx_RoomView_empty">You must register to use this functionality</div>
+            </div>;
+        } else if (this.noRoom) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
                 <div className="mx_RoomView_empty">You must join the room to see its files</div>
             </div>;

From 15201d86aa3b5246242293f0fd4bd9346073aad0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 15 May 2017 10:16:47 +0100
Subject: [PATCH 144/312] Prevent reskindex -w from running when file names
 have not changed

---
 scripts/reskindex.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index 1db22f9e10..9516614fa5 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -8,8 +8,15 @@ var chokidar = require('chokidar');
 var componentIndex = path.join('src', 'component-index.js');
 var componentsDir = path.join('src', 'components');
 var componentGlob = '**/*.js';
+var prevFiles = [];
 
 function reskindex() {
+    var files = glob.sync(componentGlob, {cwd: componentsDir}).sort();
+    if (!filesHaveChanged(files, prevFiles)) {
+        return;
+    }
+    prevFiles = files;
+
     var header = args.h || args.header;
     var packageJson = JSON.parse(fs.readFileSync('./package.json'));
 
@@ -37,7 +44,6 @@ function reskindex() {
         strm.write("module.exports.components = {};\n");
     }
 
-    var files = glob.sync(componentGlob, {cwd: componentsDir}).sort();
     for (var i = 0; i < files.length; ++i) {
         var file = files[i].replace('.js', '');
 
@@ -54,6 +60,20 @@ function reskindex() {
     console.log('Reskindex: completed');
 }
 
+// Expects both arrays of file names to be sorted
+function filesHaveChanged(files, prevFiles) {
+    if (files.length !== prevFiles.length) {
+        return true;
+    }
+    // Check for name changes
+    for (var i = 0; i < files.length; i++) {
+        if (prevFiles[i] !== files[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
 // -w indicates watch mode where any FS events will trigger reskindex
 if (!args.w) {
     reskindex();

From 8715b5233c63f9bedfc92f81dea2e4c36d90f715 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 15 May 2017 10:31:17 +0100
Subject: [PATCH 145/312] link to #/register

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

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index e7438afc4d..d83b6b5564 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -92,7 +92,7 @@ var FilePanel = React.createClass({
     render: function() {
         if (MatrixClientPeg.get().isGuest()) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">
-                <div className="mx_RoomView_empty">You must register to use this functionality</div>
+                <div className="mx_RoomView_empty">You must <a href="#/register">register</a> to use this functionality</div>
             </div>;
         } else if (this.noRoom) {
             return <div className="mx_FilePanel mx_RoomView_messageListWrapper">

From 6bd7af29176d952f171591b1be147f4711802b69 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 14:00:09 +0100
Subject: [PATCH 146/312] Revert "Merge pull request #867 from
 matrix-org/t3chguy/BaseDialog-patch1"

This reverts commit 3549ff254325cdba689b425307218e678c89a2c8, reversing
changes made to 1db677141ea281ac2fba361006597768110f77a5.
---
 src/components/views/dialogs/BaseDialog.js | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 02460148b3..279dedbd43 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -57,25 +57,20 @@ export default React.createClass({
         }
     },
 
-    // Don't let key{down,press} events escape the modal. Consume them all.
-    _eatKeyEvent: function(e) {
-        e.stopPropagation();
-    },
-    
     // Must be when the key is released (and not pressed) otherwise componentWillUnmount
     // will focus another element which will receive future key events
     _onKeyUp: function(e) {
         if (e.keyCode === KeyCode.ESCAPE) {
+            e.stopPropagation();
             e.preventDefault();
             this.props.onFinished();
         } else if (e.keyCode === KeyCode.ENTER) {
             if (this.props.onEnterPressed) {
+                e.stopPropagation();
                 e.preventDefault();
                 this.props.onEnterPressed(e);
             }
         }
-        // Consume all keyup events while Modal is open
-        e.stopPropagation();
     },
 
     _onCancelClick: function(e) {
@@ -86,11 +81,7 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div onKeyUp={this._onKeyUp}
-                 onKeyDown={this._eatKeyEvent}
-                 onKeyPress={this._eatKeyEvent}
-                 className={this.props.className}
-            >
+            <div onKeyUp={this._onKeyUp} className={this.props.className}>
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >

From f8d1a6d24042925692827f6ee100416a34fa516f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 14:26:46 +0100
Subject: [PATCH 147/312] Revert "Fix 'start chat' button"

This reverts commit c841eb641b85995bddb235d3db2c779daffe97a1.
---
 src/components/views/elements/StartChatButton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
index 747f75d1b3..02d5677a7c 100644
--- a/src/components/views/elements/StartChatButton.js
+++ b/src/components/views/elements/StartChatButton.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 const StartChatButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
-        <ActionButton action="view_create_chat"
+        <ActionButton action="start_chat"
             label="Start chat"
             iconPath="img/icons-people.svg"
             size={props.size}

From d06bd3cf9dbe3faf6ef399130953f51a42260c4e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 14:30:02 +0100
Subject: [PATCH 148/312] Revert "Fix Create Room button"

This reverts commit 9cae667c063e67b32e60b89e7256d714a056559b.
---
 src/components/views/elements/CreateRoomButton.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
index 73c984a860..e7e526d36b 100644
--- a/src/components/views/elements/CreateRoomButton.js
+++ b/src/components/views/elements/CreateRoomButton.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 const CreateRoomButton = function(props) {
     const ActionButton = sdk.getComponent('elements.ActionButton');
     return (
-        <ActionButton action="view_create_room"
+        <ActionButton action="view_create_chat"
             label="Create new room"
             iconPath="img/icons-create-room.svg"
             size={props.size}

From 387529d130ca2e407433b12e227615d7d59bea05 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 14:49:55 +0100
Subject: [PATCH 149/312] Revert "Merge pull request #859 from
 matrix-org/dbkr/left_panel_for_newbies_2"

This reverts commit 3366d3bbae203ce28ff85f8d7b80a6e3077a02a6, reversing
changes made to ceb71a4ef65607cfcf5c50452839edb1aef40593.
---
 package.json                                  |   1 -
 src/components/views/elements/ActionButton.js |  80 ------------
 .../views/elements/CreateRoomButton.js        |  38 ------
 src/components/views/elements/HomeButton.js   |  38 ------
 .../views/elements/RoomDirectoryButton.js     |  38 ------
 .../views/elements/SettingsButton.js          |  38 ------
 .../views/elements/StartChatButton.js         |  38 ------
 src/components/views/rooms/RoomList.js        | 121 ++++--------------
 8 files changed, 24 insertions(+), 368 deletions(-)
 delete mode 100644 src/components/views/elements/ActionButton.js
 delete mode 100644 src/components/views/elements/CreateRoomButton.js
 delete mode 100644 src/components/views/elements/HomeButton.js
 delete mode 100644 src/components/views/elements/RoomDirectoryButton.js
 delete mode 100644 src/components/views/elements/SettingsButton.js
 delete mode 100644 src/components/views/elements/StartChatButton.js

diff --git a/package.json b/package.json
index 21add8ccb7..3e1fa2d8f3 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "lodash": "^4.13.1",
     "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
     "optimist": "^0.6.1",
-    "prop-types": "^15.5.8",
     "q": "^1.4.1",
     "react": "^15.4.0",
     "react-addons-css-transition-group": "15.3.2",
diff --git a/src/components/views/elements/ActionButton.js b/src/components/views/elements/ActionButton.js
deleted file mode 100644
index 267388daf6..0000000000
--- a/src/components/views/elements/ActionButton.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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 AccessibleButton from './AccessibleButton';
-import dis from '../../../dispatcher';
-import sdk from '../../../index';
-
-export default React.createClass({
-    displayName: 'RoleButton',
-
-    propTypes: {
-        size: PropTypes.string,
-        tooltip: PropTypes.bool,
-        action: PropTypes.string.isRequired,
-        label: PropTypes.string.isRequired,
-        iconPath: PropTypes.string.isRequired,
-    },
-
-    getDefaultProps: function() {
-        return {
-            size: "25",
-            tooltip: false,
-        };
-    },
-
-    getInitialState: function() {
-        return {
-            showTooltip: false,
-        };
-    },
-
-    _onClick: function(ev) {
-        ev.stopPropagation();
-        dis.dispatch({action: this.props.action});
-    },
-
-    _onMouseEnter: function() {
-        if (this.props.tooltip) this.setState({showTooltip: true});
-    },
-
-    _onMouseLeave: function() {
-        this.setState({showTooltip: false});
-    },
-
-    render: function() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
-        let tooltip;
-        if (this.state.showTooltip) {
-            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
-            tooltip = <RoomTooltip className="mx_RoleButton_tooltip" label={this.props.label} />;
-        }
-
-        return (
-            <AccessibleButton className="mx_RoleButton"
-                onClick={this._onClick}
-                onMouseEnter={this._onMouseEnter}
-                onMouseLeave={this._onMouseLeave}
-            >
-                <TintableSvg src={this.props.iconPath} width={this.props.size} height={this.props.size} />
-                {tooltip}
-            </AccessibleButton>
-        );
-    }
-});
diff --git a/src/components/views/elements/CreateRoomButton.js b/src/components/views/elements/CreateRoomButton.js
deleted file mode 100644
index e7e526d36b..0000000000
--- a/src/components/views/elements/CreateRoomButton.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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';
-import PropTypes from 'prop-types';
-
-const CreateRoomButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action="view_create_chat"
-            label="Create new room"
-            iconPath="img/icons-create-room.svg"
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-CreateRoomButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default CreateRoomButton;
diff --git a/src/components/views/elements/HomeButton.js b/src/components/views/elements/HomeButton.js
deleted file mode 100644
index 5c446f24c9..0000000000
--- a/src/components/views/elements/HomeButton.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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';
-import PropTypes from 'prop-types';
-
-const HomeButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action="view_home_page"
-            label="Welcome page"
-            iconPath="img/icons-home.svg"
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-HomeButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default HomeButton;
diff --git a/src/components/views/elements/RoomDirectoryButton.js b/src/components/views/elements/RoomDirectoryButton.js
deleted file mode 100644
index 5e68776a15..0000000000
--- a/src/components/views/elements/RoomDirectoryButton.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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';
-import PropTypes from 'prop-types';
-
-const RoomDirectoryButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action="view_room_directory"
-            label="Room directory"
-            iconPath="img/icons-directory.svg"
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-RoomDirectoryButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default RoomDirectoryButton;
diff --git a/src/components/views/elements/SettingsButton.js b/src/components/views/elements/SettingsButton.js
deleted file mode 100644
index c6438da277..0000000000
--- a/src/components/views/elements/SettingsButton.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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';
-import PropTypes from 'prop-types';
-
-const SettingsButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action="view_user_settings"
-            label="Settings"
-            iconPath="img/icons-settings.svg"
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-SettingsButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default SettingsButton;
diff --git a/src/components/views/elements/StartChatButton.js b/src/components/views/elements/StartChatButton.js
deleted file mode 100644
index 02d5677a7c..0000000000
--- a/src/components/views/elements/StartChatButton.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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';
-import PropTypes from 'prop-types';
-
-const StartChatButton = function(props) {
-    const ActionButton = sdk.getComponent('elements.ActionButton');
-    return (
-        <ActionButton action="start_chat"
-            label="Start chat"
-            iconPath="img/icons-people.svg"
-            size={props.size}
-            tooltip={props.tooltip}
-        />
-    );
-};
-
-StartChatButton.propTypes = {
-    size: PropTypes.string,
-    tooltip: PropTypes.bool,
-};
-
-export default StartChatButton;
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index a595a91ba9..49af1560f1 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -1,6 +1,5 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -29,16 +28,8 @@ var Rooms = require('../../../Rooms');
 import DMRoomMap from '../../../utils/DMRoomMap';
 var Receipt = require('../../../utils/Receipt');
 var constantTimeDispatcher = require('../../../ConstantTimeDispatcher');
-import AccessibleButton from '../elements/AccessibleButton';
 
-const HIDE_CONFERENCE_CHANS = true;
-
-const VERBS = {
-    'm.favourite': 'favourite',
-    'im.vector.fake.direct': 'tag direct chat',
-    'im.vector.fake.recent': 'restore',
-    'm.lowpriority': 'demote',
-};
+var HIDE_CONFERENCE_CHANS = true;
 
 module.exports = React.createClass({
     displayName: 'RoomList',
@@ -62,7 +53,6 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             isLoadingLeftRooms: false,
-            totalRoomCount: null,
             lists: {},
             incomingCall: null,
         };
@@ -83,7 +73,8 @@ module.exports = React.createClass({
         // lookup for which lists a given roomId is currently in.
         this.listsForRoomId = {};
 
-        this.refreshRoomList();
+        var s = this.getRoomLists();
+        this.setState(s);
 
         // order of the sublists
         //this.listOrder = [];
@@ -326,29 +317,21 @@ module.exports = React.createClass({
         // any changes to it incrementally, updating the appropriate sublists
         // as needed.
         // Alternatively we'd do something magical with Immutable.js or similar.
-        const lists = this.getRoomLists();
-        let totalRooms = 0;
-        for (const l of Object.values(lists)) {
-            totalRooms += l.length;
-        }
-        this.setState({
-            lists: this.getRoomLists(),
-            totalRoomCount: totalRooms,
-        });
-        
+        this.setState(this.getRoomLists());
+
         // this._lastRefreshRoomListTs = Date.now();
     },
 
     getRoomLists: function() {
         var self = this;
-        const lists = {};
+        var s = { lists: {} };
 
-        lists["im.vector.fake.invite"] = [];
-        lists["m.favourite"] = [];
-        lists["im.vector.fake.recent"] = [];
-        lists["im.vector.fake.direct"] = [];
-        lists["m.lowpriority"] = [];
-        lists["im.vector.fake.archived"] = [];
+        s.lists["im.vector.fake.invite"] = [];
+        s.lists["m.favourite"] = [];
+        s.lists["im.vector.fake.recent"] = [];
+        s.lists["im.vector.fake.direct"] = [];
+        s.lists["m.lowpriority"] = [];
+        s.lists["im.vector.fake.archived"] = [];
 
         this.listsForRoomId = {};
         var otherTagNames = {};
@@ -370,7 +353,7 @@ module.exports = React.createClass({
 
             if (me.membership == "invite") {
                 self.listsForRoomId[room.roomId].push("im.vector.fake.invite");
-                lists["im.vector.fake.invite"].push(room);
+                s.lists["im.vector.fake.invite"].push(room);
             }
             else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
                 // skip past this room & don't put it in any lists
@@ -383,8 +366,8 @@ module.exports = React.createClass({
                 if (tagNames.length) {
                     for (var i = 0; i < tagNames.length; i++) {
                         var tagName = tagNames[i];
-                        lists[tagName] = lists[tagName] || [];
-                        lists[tagName].push(room);
+                        s.lists[tagName] = s.lists[tagName] || [];
+                        s.lists[tagName].push(room);
                         self.listsForRoomId[room.roomId].push(tagName);
                         otherTagNames[tagName] = 1;
                     }
@@ -392,16 +375,16 @@ module.exports = React.createClass({
                 else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
                     // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
                     self.listsForRoomId[room.roomId].push("im.vector.fake.direct");
-                    lists["im.vector.fake.direct"].push(room);
+                    s.lists["im.vector.fake.direct"].push(room);
                 }
                 else {
                     self.listsForRoomId[room.roomId].push("im.vector.fake.recent");
-                    lists["im.vector.fake.recent"].push(room);
+                    s.lists["im.vector.fake.recent"].push(room);
                 }
             }
             else if (me.membership === "leave") {
                 self.listsForRoomId[room.roomId].push("im.vector.fake.archived");
-                lists["im.vector.fake.archived"].push(room);
+                s.lists["im.vector.fake.archived"].push(room);
             }
             else {
                 console.error("unrecognised membership: " + me.membership + " - this should never happen");
@@ -425,7 +408,7 @@ module.exports = React.createClass({
         ];
 */
 
-        return lists;
+        return s;
     },
 
     _getScrollNode: function() {
@@ -455,7 +438,6 @@ module.exports = React.createClass({
         var incomingCallBox = document.getElementById("incomingCallBox");
         if (incomingCallBox && incomingCallBox.parentElement) {
             var 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;
@@ -479,7 +461,6 @@ module.exports = React.createClass({
     // properly through React
     _initAndPositionStickyHeaders: function(initialise, scrollToPosition) {
         var 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;
@@ -577,58 +558,6 @@ module.exports = React.createClass({
         this.refs.gemscroll.forceUpdate();
     },
 
-    _getEmptyContent: function(section) {
-        const RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget');
-
-        if (this.props.collapsed) {
-            return <RoomDropTarget label="" />;
-        }
-
-        const StartChatButton = sdk.getComponent('elements.StartChatButton');
-        const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
-        const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
-        if (this.state.totalRoomCount === 0) {
-            const TintableSvg = sdk.getComponent('elements.TintableSvg');
-            switch (section) {
-                case 'im.vector.fake.direct':
-                    return <div className="mx_RoomList_emptySubListTip">
-                        Press
-                        <StartChatButton size="16" />
-                        to start a chat with someone
-                    </div>;
-                case 'im.vector.fake.recent':
-                    return <div className="mx_RoomList_emptySubListTip">
-                        You're not in any rooms yet! Press
-                        <CreateRoomButton size="16" />
-                        to make a room or
-                        <RoomDirectoryButton size="16" />
-                        to browse the directory
-                    </div>;
-            }
-        }
-
-        const labelText = 'Drop here to ' + (VERBS[section] || 'tag ' + section);
-
-        return <RoomDropTarget label={labelText} />;
-    },
-
-    _getHeaderItems: function(section) {
-        const StartChatButton = sdk.getComponent('elements.StartChatButton');
-        const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
-        const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
-        switch (section) {
-            case 'im.vector.fake.direct':
-                return <span className="mx_RoomList_headerButtons">
-                    <StartChatButton size="16" />
-                </span>;
-            case 'im.vector.fake.recent':
-                return <span className="mx_RoomList_headerButtons">
-                    <RoomDirectoryButton size="16" />
-                    <CreateRoomButton size="16" />
-                </span>;
-        }
-    },
-
     render: function() {
         var RoomSubList = sdk.getComponent('structures.RoomSubList');
         var self = this;
@@ -652,7 +581,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['m.favourite'] }
                              label="Favourites"
                              tagName="m.favourite"
-                             emptyContent={self._getEmptyContent('m.favourite')}
+                             verb="favourite"
                              editable={ true }
                              order="manual"
                              incomingCall={ self.state.incomingCall }
@@ -665,8 +594,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
                              label="People"
                              tagName="im.vector.fake.direct"
-                             emptyContent={self._getEmptyContent('im.vector.fake.direct')}
-                             headerItems={self._getHeaderItems('im.vector.fake.direct')}
+                             verb="tag direct chat"
                              editable={ true }
                              order="recent"
                              incomingCall={ self.state.incomingCall }
@@ -681,8 +609,7 @@ module.exports = React.createClass({
                              label="Rooms"
                              tagName="im.vector.fake.recent"
                              editable={ true }
-                             emptyContent={self._getEmptyContent('im.vector.fake.recent')}
-                             headerItems={self._getHeaderItems('im.vector.fake.recent')}
+                             verb="restore"
                              order="recent"
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
@@ -697,7 +624,7 @@ module.exports = React.createClass({
                              key={ tagName }
                              label={ tagName }
                              tagName={ tagName }
-                             emptyContent={self._getEmptyContent(tagName)}
+                             verb={ "tag as " + tagName }
                              editable={ true }
                              order="manual"
                              incomingCall={ self.state.incomingCall }
@@ -713,7 +640,7 @@ module.exports = React.createClass({
                 <RoomSubList list={ self.state.lists['m.lowpriority'] }
                              label="Low priority"
                              tagName="m.lowpriority"
-                             emptyContent={self._getEmptyContent('m.lowpriority')}
+                             verb="demote"
                              editable={ true }
                              order="recent"
                              incomingCall={ self.state.incomingCall }

From 19dcd83aeb834c1f67a852033c1ef76a6b2e60b5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 14:50:19 +0100
Subject: [PATCH 150/312] Revert "Merge pull request #841 from
 matrix-org/luke/fix-double-dialogs"

This reverts commit 1913a32fbd0c303080645f2661cacff25ccff232, reversing
changes made to 0c16298c452089188bcc156cf213358988ce7341.
---
 src/components/views/dialogs/BaseDialog.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 279dedbd43..d0f34c5fbd 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -57,9 +57,7 @@ export default React.createClass({
         }
     },
 
-    // Must be when the key is released (and not pressed) otherwise componentWillUnmount
-    // will focus another element which will receive future key events
-    _onKeyUp: function(e) {
+    _onKeyDown: function(e) {
         if (e.keyCode === KeyCode.ESCAPE) {
             e.stopPropagation();
             e.preventDefault();
@@ -81,7 +79,7 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div onKeyUp={this._onKeyUp} className={this.props.className}>
+            <div onKeyDown={this._onKeyDown} className={this.props.className}>
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >

From ff9c40472a5b1f52450347a890ea720c78e1aa39 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 14:50:29 +0100
Subject: [PATCH 151/312] Revert "Merge pull request #822 from
 t3chguy/BaseDialog_restore_focus"

This reverts commit 0ac836919d54cd04705002d8e53d3514dcce8dde, reversing
changes made to 7e07ffd55fe1475ce30e172fa5b0b37061e7375f.
---
 src/components/views/dialogs/BaseDialog.js | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index d0f34c5fbd..0b2ca5225d 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -47,16 +47,6 @@ export default React.createClass({
         children: React.PropTypes.node,
     },
 
-    componentWillMount: function() {
-        this.priorActiveElement = document.activeElement;
-    },
-
-    componentWillUnmount: function() {
-        if (this.priorActiveElement !== null) {
-            this.priorActiveElement.focus();
-        }
-    },
-
     _onKeyDown: function(e) {
         if (e.keyCode === KeyCode.ESCAPE) {
             e.stopPropagation();
@@ -77,7 +67,7 @@ export default React.createClass({
 
     render: function() {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
-
+                
         return (
             <div onKeyDown={this._onKeyDown} className={this.props.className}>
                 <AccessibleButton onClick={this._onCancelClick}

From 1aabaec1584a1bc0bda9f63ab542d2daf20c0109 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 15:35:22 +0100
Subject: [PATCH 152/312] Revert "comment out spammy CTD logging"

This reverts commit 19482d751d82c162321d99c5bf95ac8fe950768b.
---
 src/ConstantTimeDispatcher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ConstantTimeDispatcher.js b/src/ConstantTimeDispatcher.js
index 6c2c3266aa..265ee11fd4 100644
--- a/src/ConstantTimeDispatcher.js
+++ b/src/ConstantTimeDispatcher.js
@@ -47,7 +47,7 @@ class ConstantTimeDispatcher {
 
     dispatch(type, arg, params) {
         if (!this.listeners[type] || !this.listeners[type][arg]) {
-            //console.warn("No registered listeners for dispatch (type=" + type + ", arg=" + arg + ")");
+            console.warn("No registered listeners for dispatch (type=" + type + ", arg=" + arg + ")");
             return;
         }
         this.listeners[type][arg].forEach(listener=>{

From 714cd6a10fd49df86caa9df4406e7a31cc7bfea1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 16:00:34 +0100
Subject: [PATCH 153/312] Revert "recalculate roomlist when your invites
 change"

This reverts commit ec6a1c4c750f959017cdf823402a6c9d86b16fe2.
---
 src/components/views/rooms/RoomList.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 49af1560f1..101f0838a9 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -265,16 +265,9 @@ module.exports = React.createClass({
     },
 
     onRoomStateMember: function(ev, state, member) {
-        if (ev.getStateKey() === MatrixClientPeg.get().credentials.userId &&
-            ev.getPrevContent() && ev.getPrevContent().membership === "invite")
-        {
-            this._delayedRefreshRoomList();
-        }
-        else {
-            constantTimeDispatcher.dispatch(
-                "RoomTile.refresh", member.roomId, {}
-            );
-        }
+        constantTimeDispatcher.dispatch(
+            "RoomTile.refresh", member.roomId, {}
+        );
     },
 
     onRoomMemberName: function(ev, member) {

From b063c605a86bdd9f216506e09bd93f54e42a29df Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 16:01:14 +0100
Subject: [PATCH 154/312] Revert "fix stupid typos in RoomList's
 shouldComponentUpdate"

This reverts commit b0288ebd89841ad362a6804b41839ef9d3bdca7f.
---
 src/components/views/rooms/RoomList.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 101f0838a9..b99d26376f 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -44,9 +44,9 @@ module.exports = React.createClass({
     shouldComponentUpdate: function(nextProps, nextState) {
         if (nextProps.collapsed !== this.props.collapsed) return true;
         if (nextProps.searchFilter !== this.props.searchFilter) return true;
-        if (nextState.lists !== this.state.lists ||
-            nextState.isLoadingLeftRooms !== this.state.isLoadingLeftRooms ||
-            nextState.incomingCall !== this.state.incomingCall) return true;
+        if (nextState.lists !== this.props.lists ||
+            nextState.isLoadingLeftRooms !== this.isLoadingLeftRooms ||
+            nextState.incomingCall !== this.incomingCall) return true;
         return false;
     },
 

From 7a949b6a4591cdb7c5fe93b8aef610388ef8eba4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 16:01:32 +0100
Subject: [PATCH 155/312] Revert "oops, actually refresh roomlist when its
 state changes!"

This reverts commit 35a16edcccd07fdd4209783ce1efaee8115eb4b4.
---
 src/components/views/rooms/RoomList.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index b99d26376f..b4ab25a0f2 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -44,9 +44,6 @@ module.exports = React.createClass({
     shouldComponentUpdate: function(nextProps, nextState) {
         if (nextProps.collapsed !== this.props.collapsed) return true;
         if (nextProps.searchFilter !== this.props.searchFilter) return true;
-        if (nextState.lists !== this.props.lists ||
-            nextState.isLoadingLeftRooms !== this.isLoadingLeftRooms ||
-            nextState.incomingCall !== this.incomingCall) return true;
         return false;
     },
 

From eddc2af92d7a465f755c472f3ea3da3cca3a185f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 16:01:54 +0100
Subject: [PATCH 156/312] Revert "HOW DID THIS EVER WORK?"

This reverts commit 0d8d3c67106a3e84fd30de4016b9c852870f99b3.
---
 src/components/views/rooms/RoomList.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index b4ab25a0f2..b86d17d290 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -558,7 +558,6 @@ module.exports = React.createClass({
             <div className="mx_RoomList" onMouseOver={ this._onMouseOver }>
                 <RoomSubList list={ self.state.lists['im.vector.fake.invite'] }
                              label="Invites"
-                             tagName="im.vector.fake.invite"
                              editable={ false }
                              order="recent"
                              incomingCall={ self.state.incomingCall }
@@ -597,7 +596,6 @@ module.exports = React.createClass({
 
                 <RoomSubList list={ self.state.lists['im.vector.fake.recent'] }
                              label="Rooms"
-                             tagName="im.vector.fake.recent"
                              editable={ true }
                              verb="restore"
                              order="recent"
@@ -642,7 +640,6 @@ module.exports = React.createClass({
 
                 <RoomSubList list={ self.state.lists['im.vector.fake.archived'] }
                              label="Historical"
-                             tagName="im.vector.fake.archived"
                              editable={ false }
                              order="recent"
                              collapsed={ self.props.collapsed }

From 67c6a8b81d361af91c213a0682365842aa03f092 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 16:02:13 +0100
Subject: [PATCH 157/312] Revert "unbreak stack overflow which fires on tests
 due to mocked timers"

This reverts commit e69ea68133bb01dfd2093ffc5644edef24fbed70.
---
 src/components/views/rooms/RoomList.js | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index b86d17d290..d6e2ab633d 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -74,11 +74,7 @@ module.exports = React.createClass({
         this.setState(s);
 
         // order of the sublists
-        //this.listOrder = [];
-
-        // 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.listOrder = [];
     },
 
     componentDidMount: function() {
@@ -288,12 +284,10 @@ module.exports = React.createClass({
         // if the mouse has been moving over the RoomList in the last 500ms
         // then delay the refresh further to avoid bouncing around under the
         // cursor
-        if (Date.now() - this._lastMouseOverTs > 500 || this._delayedRefreshRoomListLoopCount > 60) {
+        if (Date.now() - this._lastMouseOverTs > 500) {
             this.refreshRoomList();
-            this._delayedRefreshRoomListLoopCount = 0;
         }
         else {
-            this._delayedRefreshRoomListLoopCount++;
             this._delayedRefreshRoomList();
         }
     }, 500),

From ebfafb363972e77ef02f0e518573bf68ebc0ed15 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 16:11:01 +0100
Subject: [PATCH 158/312] Revert "Merge pull request #807 from
 matrix-org/matthew/quick-search"

This reverts commit 0ad1d8caf3f83aca517d1afff492f1c3d01e9ad5, reversing
changes made to 1189368aab8cfb22c1895f8ce6c0d8a8fbe7ca0b.
---
 package.json                                  |   2 +-
 src/ConstantTimeDispatcher.js                 |  62 -----
 src/KeyCode.js                                |   1 -
 src/components/structures/TimelinePanel.js    |   1 -
 .../views/dialogs/QuestionDialog.js           |   8 +-
 src/components/views/rooms/RoomList.js        | 233 ++++++------------
 src/components/views/rooms/RoomTile.js        |  57 ++---
 7 files changed, 99 insertions(+), 265 deletions(-)
 delete mode 100644 src/ConstantTimeDispatcher.js

diff --git a/package.json b/package.json
index 3e1fa2d8f3..444d1c5369 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "react": "^15.4.0",
     "react-addons-css-transition-group": "15.3.2",
     "react-dom": "^15.4.0",
-    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#39d858c",
+    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "sanitize-html": "^1.11.1",
     "text-encoding-utf-8": "^1.0.1",
     "velocity-vector": "vector-im/velocity#059e3b2",
diff --git a/src/ConstantTimeDispatcher.js b/src/ConstantTimeDispatcher.js
deleted file mode 100644
index 265ee11fd4..0000000000
--- a/src/ConstantTimeDispatcher.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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.
-*/
-
-// singleton which dispatches invocations of a given type & argument
-// rather than just a type (as per EventEmitter and Flux's dispatcher etc)
-//
-// This means you can have a single point which listens for an EventEmitter event
-// and then dispatches out to one of thousands of RoomTiles (for instance) rather than
-// having each RoomTile register for the EventEmitter event and having to 
-// iterate over all of them.
-class ConstantTimeDispatcher {
-    constructor() {
-        // type -> arg -> [ listener(arg, params) ]
-        this.listeners = {};
-    }
-
-    register(type, arg, listener) {
-        if (!this.listeners[type]) this.listeners[type] = {};
-        if (!this.listeners[type][arg]) this.listeners[type][arg] = [];
-        this.listeners[type][arg].push(listener);
-    }
-
-    unregister(type, arg, listener) {
-        if (this.listeners[type] && this.listeners[type][arg]) {
-            var i = this.listeners[type][arg].indexOf(listener);
-            if (i > -1) {
-                this.listeners[type][arg].splice(i, 1);
-            }
-        }
-        else {
-            console.warn("Unregistering unrecognised listener (type=" + type + ", arg=" + arg + ")");
-        }
-    }
-
-    dispatch(type, arg, params) {
-        if (!this.listeners[type] || !this.listeners[type][arg]) {
-            console.warn("No registered listeners for dispatch (type=" + type + ", arg=" + arg + ")");
-            return;
-        }
-        this.listeners[type][arg].forEach(listener=>{
-            listener.call(arg, params);
-        });
-    }
-}
-
-if (!global.constantTimeDispatcher) {
-    global.constantTimeDispatcher = new ConstantTimeDispatcher();
-}
-module.exports = global.constantTimeDispatcher;
diff --git a/src/KeyCode.js b/src/KeyCode.js
index f164dbc15c..c9cac01239 100644
--- a/src/KeyCode.js
+++ b/src/KeyCode.js
@@ -32,5 +32,4 @@ module.exports = {
     DELETE: 46,
     KEY_D: 68,
     KEY_E: 69,
-    KEY_K: 75,
 };
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index de43bd1c19..8794713501 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -590,7 +590,6 @@ var TimelinePanel = React.createClass({
                 this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
                 dis.dispatch({
                     action: 'on_room_read',
-                    room: this.props.timelineSet.room,
                 });
             }
         }
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 8e20b0d2bc..6012541b94 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -47,12 +47,6 @@ export default React.createClass({
         this.props.onFinished(false);
     },
 
-    componentDidMount: function() {
-        if (this.props.focus) {
-            this.refs.button.focus();
-        }
-    },
-
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const cancelButton = this.props.hasCancelButton ? (
@@ -69,7 +63,7 @@ export default React.createClass({
                     {this.props.description}
                 </div>
                 <div className="mx_Dialog_buttons">
-                    <button ref="button" className="mx_Dialog_primary" onClick={this.onOk}>
+                    <button className="mx_Dialog_primary" onClick={this.onOk} autoFocus={this.props.focus}>
                         {this.props.button}
                     </button>
                     {this.props.extraButtons}
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index d6e2ab633d..611dd10780 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -21,13 +21,13 @@ 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');
 import DMRoomMap from '../../../utils/DMRoomMap';
 var Receipt = require('../../../utils/Receipt');
-var constantTimeDispatcher = require('../../../ConstantTimeDispatcher');
 
 var HIDE_CONFERENCE_CHANS = true;
 
@@ -37,16 +37,10 @@ module.exports = React.createClass({
     propTypes: {
         ConferenceHandler: React.PropTypes.any,
         collapsed: React.PropTypes.bool.isRequired,
-        selectedRoom: React.PropTypes.string,
+        currentRoom: React.PropTypes.string,
         searchFilter: React.PropTypes.string,
     },
 
-    shouldComponentUpdate: function(nextProps, nextState) {
-        if (nextProps.collapsed !== this.props.collapsed) return true;
-        if (nextProps.searchFilter !== this.props.searchFilter) return true;
-        return false;
-    },
-
     getInitialState: function() {
         return {
             isLoadingLeftRooms: false,
@@ -63,18 +57,12 @@ module.exports = React.createClass({
         cli.on("Room.name", this.onRoomName);
         cli.on("Room.tags", this.onRoomTags);
         cli.on("Room.receipt", this.onRoomReceipt);
-        cli.on("RoomState.members", this.onRoomStateMember);
+        cli.on("RoomState.events", this.onRoomStateEvents);
         cli.on("RoomMember.name", this.onRoomMemberName);
         cli.on("accountData", this.onAccountData);
 
-        // lookup for which lists a given roomId is currently in.
-        this.listsForRoomId = {};
-
         var s = this.getRoomLists();
         this.setState(s);
-
-        // order of the sublists
-        this.listOrder = [];
     },
 
     componentDidMount: function() {
@@ -83,22 +71,7 @@ module.exports = React.createClass({
         this._updateStickyHeaders(true);
     },
 
-    componentWillReceiveProps: function(nextProps) {
-        // short-circuit react when the room changes
-        // to avoid rerendering all the sublists everywhere
-        if (nextProps.selectedRoom !== this.props.selectedRoom) {
-            if (this.props.selectedRoom) {
-                constantTimeDispatcher.dispatch(
-                    "RoomTile.select", this.props.selectedRoom, {}
-                );
-            }
-            constantTimeDispatcher.dispatch(
-                "RoomTile.select", nextProps.selectedRoom, { selected: true }
-            );
-        }
-    },
-
-    componentDidUpdate: function(prevProps, prevState) {
+    componentDidUpdate: function() {
         // Reinitialise the stickyHeaders when the component is updated
         this._updateStickyHeaders(true);
         this._repositionIncomingCallBox(undefined, false);
@@ -124,24 +97,10 @@ module.exports = React.createClass({
                 }
                 break;
             case 'on_room_read':
-                // poke the right RoomTile to refresh, using the constantTimeDispatcher
-                // to avoid each and every RoomTile registering to the 'on_room_read' event
-                // XXX: if we like the constantTimeDispatcher we might want to dispatch
-                // directly from TimelinePanel rather than needlessly bouncing via here.
-                constantTimeDispatcher.dispatch(
-                    "RoomTile.refresh", payload.room.roomId, {}
-                );
-
-                // also have to poke the right list(s)
-                var lists = this.listsForRoomId[payload.room.roomId];
-                if (lists) {
-                    lists.forEach(list=>{
-                        constantTimeDispatcher.dispatch(
-                            "RoomSubList.refreshHeader", list, { room: payload.room }
-                        );
-                    });
-                }
-
+                // Force an update because the notif count state is too deep to cause
+                // an update. This forces the local echo of reading notifs to be
+                // reflected by the RoomTiles.
+                this.forceUpdate();
                 break;
         }
     },
@@ -155,7 +114,7 @@ module.exports = React.createClass({
             MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
             MatrixClientPeg.get().removeListener("Room.tags", this.onRoomTags);
             MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
-            MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
+            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
             MatrixClientPeg.get().removeListener("RoomMember.name", this.onRoomMemberName);
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
         }
@@ -164,14 +123,10 @@ module.exports = React.createClass({
     },
 
     onRoom: function(room) {
-        // XXX: this happens rarely; ideally we should only update the correct
-        // sublists when it does (e.g. via a constantTimeDispatch to the right sublist)
         this._delayedRefreshRoomList();
     },
 
     onDeleteRoom: function(roomId) {
-        // XXX: this happens rarely; ideally we should only update the correct
-        // sublists when it does (e.g. via a constantTimeDispatch to the right sublist)
         this._delayedRefreshRoomList();
     },
 
@@ -194,10 +149,6 @@ module.exports = React.createClass({
         }
     },
 
-    _onMouseOver: function(ev) {
-        this._lastMouseOverTs = Date.now();
-    },
-
     onSubListHeaderClick: function(isHidden, scrollToPosition) {
         // The scroll area has expanded or contracted, so re-calculate sticky headers positions
         this._updateStickyHeaders(true, scrollToPosition);
@@ -207,89 +158,41 @@ module.exports = React.createClass({
         if (toStartOfTimeline) return;
         if (!room) return;
         if (data.timeline.getTimelineSet() !== room.getUnfilteredTimelineSet()) return;
-
-        // rather than regenerate our full roomlists, which is very heavy, we poke the
-        // correct sublists to just re-sort themselves.  This isn't enormously reacty,
-        // but is much faster than the default react reconciler, or having to do voodoo
-        // with shouldComponentUpdate and a pleaseRefresh property or similar.
-        var lists = this.listsForRoomId[room.roomId];
-        if (lists) {
-            lists.forEach(list=>{
-                constantTimeDispatcher.dispatch("RoomSubList.sort", list, { room: room });
-            });
-        }
-
-        // we have to explicitly hit the roomtile which just changed
-        constantTimeDispatcher.dispatch(
-            "RoomTile.refresh", room.roomId, {}
-        );
+        this._delayedRefreshRoomList();
     },
 
     onRoomReceipt: function(receiptEvent, room) {
         // because if we read a notification, it will affect notification count
         // only bother updating if there's a receipt from us
         if (Receipt.findReadReceiptFromUserId(receiptEvent, MatrixClientPeg.get().credentials.userId)) {
-            var lists = this.listsForRoomId[room.roomId];
-            if (lists) {
-                lists.forEach(list=>{
-                    constantTimeDispatcher.dispatch(
-                        "RoomSubList.refreshHeader", list, { room: room }
-                    );
-                });
-            }
-
-            // we have to explicitly hit the roomtile which just changed
-            constantTimeDispatcher.dispatch(
-                "RoomTile.refresh", room.roomId, {}
-            );
+            this._delayedRefreshRoomList();
         }
     },
 
     onRoomName: function(room) {
-        constantTimeDispatcher.dispatch(
-            "RoomTile.refresh", room.roomId, {}
-        );
-    },
-
-    onRoomTags: function(event, room) {
-        // XXX: this happens rarely; ideally we should only update the correct
-        // sublists when it does (e.g. via a constantTimeDispatch to the right sublist)
         this._delayedRefreshRoomList();
     },
 
-    onRoomStateMember: function(ev, state, member) {
-        constantTimeDispatcher.dispatch(
-            "RoomTile.refresh", member.roomId, {}
-        );
+    onRoomTags: function(event, room) {
+        this._delayedRefreshRoomList();
+    },
+
+    onRoomStateEvents: function(ev, state) {
+        this._delayedRefreshRoomList();
     },
 
     onRoomMemberName: function(ev, member) {
-        constantTimeDispatcher.dispatch(
-            "RoomTile.refresh", member.roomId, {}
-        );
+        this._delayedRefreshRoomList();
     },
 
     onAccountData: function(ev) {
         if (ev.getType() == 'm.direct') {
-            // XXX: this happens rarely; ideally we should only update the correct
-            // sublists when it does (e.g. via a constantTimeDispatch to the right sublist)
-            this._delayedRefreshRoomList();
-        }
-        else if (ev.getType() == 'm.push_rules') {
             this._delayedRefreshRoomList();
         }
     },
 
     _delayedRefreshRoomList: new rate_limited_func(function() {
-        // if the mouse has been moving over the RoomList in the last 500ms
-        // then delay the refresh further to avoid bouncing around under the
-        // cursor
-        if (Date.now() - this._lastMouseOverTs > 500) {
-            this.refreshRoomList();
-        }
-        else {
-            this._delayedRefreshRoomList();
-        }
+        this.refreshRoomList();
     }, 500),
 
     refreshRoomList: function() {
@@ -297,10 +200,12 @@ module.exports = React.createClass({
         //     (!this._lastRefreshRoomListTs ? "-" : (Date.now() - this._lastRefreshRoomListTs))
         // );
 
-        // TODO: ideally we'd calculate this once at start, and then maintain
-        // any changes to it incrementally, updating the appropriate sublists
-        // as needed.
-        // Alternatively we'd do something magical with Immutable.js or similar.
+        // TODO: rather than bluntly regenerating and re-sorting everything
+        // every time we see any kind of room change from the JS SDK
+        // we could do incremental updates on our copy of the state
+        // based on the room which has actually changed.  This would stop
+        // us re-rendering all the sublists every time anything changes anywhere
+        // in the state of the client.
         this.setState(this.getRoomLists());
 
         // this._lastRefreshRoomListTs = Date.now();
@@ -317,9 +222,6 @@ module.exports = React.createClass({
         s.lists["m.lowpriority"] = [];
         s.lists["im.vector.fake.archived"] = [];
 
-        this.listsForRoomId = {};
-        var otherTagNames = {};
-
         const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
 
         MatrixClientPeg.get().getRooms().forEach(function(room) {
@@ -331,12 +233,7 @@ module.exports = React.createClass({
             //             ", target = " + me.events.member.getStateKey() +
             //             ", prevMembership = " + me.events.member.getPrevContent().membership);
 
-            if (!self.listsForRoomId[room.roomId]) {
-                self.listsForRoomId[room.roomId] = [];
-            }
-
             if (me.membership == "invite") {
-                self.listsForRoomId[room.roomId].push("im.vector.fake.invite");
                 s.lists["im.vector.fake.invite"].push(room);
             }
             else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
@@ -347,27 +244,23 @@ module.exports = React.createClass({
             {
                 // Used to split rooms via tags
                 var tagNames = Object.keys(room.tags);
+
                 if (tagNames.length) {
                     for (var i = 0; i < tagNames.length; i++) {
                         var tagName = tagNames[i];
                         s.lists[tagName] = s.lists[tagName] || [];
-                        s.lists[tagName].push(room);
-                        self.listsForRoomId[room.roomId].push(tagName);
-                        otherTagNames[tagName] = 1;
+                        s.lists[tagNames[i]].push(room);
                     }
                 }
                 else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
                     // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
-                    self.listsForRoomId[room.roomId].push("im.vector.fake.direct");
                     s.lists["im.vector.fake.direct"].push(room);
                 }
                 else {
-                    self.listsForRoomId[room.roomId].push("im.vector.fake.recent");
                     s.lists["im.vector.fake.recent"].push(room);
                 }
             }
             else if (me.membership === "leave") {
-                self.listsForRoomId[room.roomId].push("im.vector.fake.archived");
                 s.lists["im.vector.fake.archived"].push(room);
             }
             else {
@@ -375,22 +268,44 @@ module.exports = React.createClass({
             }
         });
 
-        // we actually apply the sorting to this when receiving the prop in RoomSubLists.
+        if (s.lists["im.vector.fake.direct"].length == 0 &&
+            MatrixClientPeg.get().getAccountData('m.direct') === undefined &&
+            !MatrixClientPeg.get().isGuest())
+        {
+            // scan through the 'recents' list for any rooms which look like DM rooms
+            // and make them DM rooms
+            const oldRecents = s.lists["im.vector.fake.recent"];
+            s.lists["im.vector.fake.recent"] = [];
 
-        // we'll need this when we get to iterating through lists programatically - e.g. ctrl-shift-up/down
-/*
-        this.listOrder = [
-            "im.vector.fake.invite",
-            "m.favourite",
-            "im.vector.fake.recent",
-            "im.vector.fake.direct",
-            Object.keys(otherTagNames).filter(tagName=>{
-                return (!tagName.match(/^m\.(favourite|lowpriority)$/));
-            }).sort(),
-            "m.lowpriority",
-            "im.vector.fake.archived"
-        ];
-*/
+            for (const room of oldRecents) {
+                const me = room.getMember(MatrixClientPeg.get().credentials.userId);
+
+                if (me && Rooms.looksLikeDirectMessageRoom(room, me)) {
+                    s.lists["im.vector.fake.direct"].push(room);
+                } else {
+                    s.lists["im.vector.fake.recent"].push(room);
+                }
+            }
+
+            // save these new guessed DM rooms into the account data
+            const newMDirectEvent = {};
+            for (const room of s.lists["im.vector.fake.direct"]) {
+                const me = room.getMember(MatrixClientPeg.get().credentials.userId);
+                const otherPerson = Rooms.getOnlyOtherMember(room, me);
+                if (!otherPerson) continue;
+
+                const roomList = newMDirectEvent[otherPerson.userId] || [];
+                roomList.push(room.roomId);
+                newMDirectEvent[otherPerson.userId] = roomList;
+            }
+
+            // if this fails, fine, we'll just do the same thing next time we get the room lists
+            MatrixClientPeg.get().setAccountData('m.direct', newMDirectEvent).done();
+        }
+
+        //console.log("calculated new roomLists; im.vector.fake.recent = " + s.lists["im.vector.fake.recent"]);
+
+        // we actually apply the sorting to this when receiving the prop in RoomSubLists.
 
         return s;
     },
@@ -548,15 +463,15 @@ module.exports = React.createClass({
 
         return (
             <GeminiScrollbar className="mx_RoomList_scrollbar"
-                 autoshow={true} onScroll={ self._whenScrolling } onResize={ self._whenScrolling } ref="gemscroll">
-            <div className="mx_RoomList" onMouseOver={ this._onMouseOver }>
+                 autoshow={true} onScroll={ self._whenScrolling } ref="gemscroll">
+            <div className="mx_RoomList">
                 <RoomSubList list={ self.state.lists['im.vector.fake.invite'] }
                              label="Invites"
                              editable={ false }
                              order="recent"
+                             selectedRoom={ self.props.selectedRoom }
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
-                             selectedRoom={ self.props.selectedRoom }
                              searchFilter={ self.props.searchFilter }
                              onHeaderClick={ self.onSubListHeaderClick }
                              onShowMoreRooms={ self.onShowMoreRooms } />
@@ -567,9 +482,9 @@ module.exports = React.createClass({
                              verb="favourite"
                              editable={ true }
                              order="manual"
+                             selectedRoom={ self.props.selectedRoom }
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
-                             selectedRoom={ self.props.selectedRoom }
                              searchFilter={ self.props.searchFilter }
                              onHeaderClick={ self.onSubListHeaderClick }
                              onShowMoreRooms={ self.onShowMoreRooms } />
@@ -580,9 +495,9 @@ module.exports = React.createClass({
                              verb="tag direct chat"
                              editable={ true }
                              order="recent"
+                             selectedRoom={ self.props.selectedRoom }
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
-                             selectedRoom={ self.props.selectedRoom }
                              alwaysShowHeader={ true }
                              searchFilter={ self.props.searchFilter }
                              onHeaderClick={ self.onSubListHeaderClick }
@@ -593,14 +508,14 @@ module.exports = React.createClass({
                              editable={ true }
                              verb="restore"
                              order="recent"
+                             selectedRoom={ self.props.selectedRoom }
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
-                             selectedRoom={ self.props.selectedRoom }
                              searchFilter={ self.props.searchFilter }
                              onHeaderClick={ self.onSubListHeaderClick }
                              onShowMoreRooms={ self.onShowMoreRooms } />
 
-                { Object.keys(self.state.lists).sort().map(function(tagName) {
+                { Object.keys(self.state.lists).map(function(tagName) {
                     if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
                         return <RoomSubList list={ self.state.lists[tagName] }
                              key={ tagName }
@@ -609,9 +524,9 @@ module.exports = React.createClass({
                              verb={ "tag as " + tagName }
                              editable={ true }
                              order="manual"
+                             selectedRoom={ self.props.selectedRoom }
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
-                             selectedRoom={ self.props.selectedRoom }
                              searchFilter={ self.props.searchFilter }
                              onHeaderClick={ self.onSubListHeaderClick }
                              onShowMoreRooms={ self.onShowMoreRooms } />;
@@ -625,9 +540,9 @@ module.exports = React.createClass({
                              verb="demote"
                              editable={ true }
                              order="recent"
+                             selectedRoom={ self.props.selectedRoom }
                              incomingCall={ self.state.incomingCall }
                              collapsed={ self.props.collapsed }
-                             selectedRoom={ self.props.selectedRoom }
                              searchFilter={ self.props.searchFilter }
                              onHeaderClick={ self.onSubListHeaderClick }
                              onShowMoreRooms={ self.onShowMoreRooms } />
@@ -636,8 +551,8 @@ module.exports = React.createClass({
                              label="Historical"
                              editable={ false }
                              order="recent"
-                             collapsed={ self.props.collapsed }
                              selectedRoom={ self.props.selectedRoom }
+                             collapsed={ self.props.collapsed }
                              alwaysShowHeader={ true }
                              startAsHidden={ true }
                              showSpinner={ self.state.isLoadingLeftRooms }
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 3b37d4608f..c123f31d19 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -27,8 +27,6 @@ var RoomNotifs = require('../../../RoomNotifs');
 var FormattingUtils = require('../../../utils/FormattingUtils');
 import AccessibleButton from '../elements/AccessibleButton';
 var UserSettingsStore = require('../../../UserSettingsStore');
-var constantTimeDispatcher = require('../../../ConstantTimeDispatcher');
-var Unread = require('../../../Unread');
 
 module.exports = React.createClass({
     displayName: 'RoomTile',
@@ -38,10 +36,12 @@ module.exports = React.createClass({
         connectDropTarget: React.PropTypes.func,
         onClick: React.PropTypes.func,
         isDragging: React.PropTypes.bool,
-        selectedRoom: React.PropTypes.string,
 
         room: React.PropTypes.object.isRequired,
         collapsed: React.PropTypes.bool.isRequired,
+        selected: React.PropTypes.bool.isRequired,
+        unread: React.PropTypes.bool.isRequired,
+        highlight: React.PropTypes.bool.isRequired,
         isInvite: React.PropTypes.bool.isRequired,
         incomingCall: React.PropTypes.object,
     },
@@ -54,11 +54,10 @@ 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 ? (this.props.selectedRoom === this.props.room.roomId) : false,
         });
     },
 
@@ -80,32 +79,23 @@ module.exports = React.createClass({
         }
     },
 
+    onAccountData: function(accountDataEvent) {
+        if (accountDataEvent.getType() == 'm.push_rules') {
+            this.setState({
+                notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
+            });
+        }
+    },
+
     componentWillMount: function() {
-        constantTimeDispatcher.register("RoomTile.refresh", this.props.room.roomId, this.onRefresh);
-        constantTimeDispatcher.register("RoomTile.select", this.props.room.roomId, this.onSelect);
-        this.onRefresh();
+        MatrixClientPeg.get().on("accountData", this.onAccountData);
     },
 
     componentWillUnmount: function() {
-        constantTimeDispatcher.unregister("RoomTile.refresh", this.props.room.roomId, this.onRefresh);
-        constantTimeDispatcher.unregister("RoomTile.select", this.props.room.roomId, this.onSelect);
-    },
-
-    componentWillReceiveProps: function(nextProps) {
-        this.onRefresh();
-    },
-
-    onRefresh: function(params) {
-        this.setState({
-            unread: Unread.doesRoomHaveUnreadMessages(this.props.room),
-            highlight: this.props.room.getUnreadNotificationCount('highlight') > 0 || this.props.isInvite,
-        });
-    },
-
-    onSelect: function(params) {
-        this.setState({
-            selected: params.selected,
-        });
+        var cli = MatrixClientPeg.get();
+        if (cli) {
+            MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
+        }
     },
 
     onClick: function(ev) {
@@ -179,13 +169,13 @@ module.exports = React.createClass({
         // var highlightCount = this.props.room.getUnreadNotificationCount("highlight");
 
         const notifBadges = notificationCount > 0 && this._shouldShowNotifBadge();
-        const mentionBadges = this.state.highlight && this._shouldShowMentionBadge();
+        const mentionBadges = this.props.highlight && this._shouldShowMentionBadge();
         const badges = notifBadges || mentionBadges;
 
         var classes = classNames({
             'mx_RoomTile': true,
-            'mx_RoomTile_selected': this.state.selected,
-            'mx_RoomTile_unread': this.state.unread,
+            'mx_RoomTile_selected': this.props.selected,
+            'mx_RoomTile_unread': this.props.unread,
             'mx_RoomTile_unreadNotify': notifBadges,
             'mx_RoomTile_highlight': mentionBadges,
             'mx_RoomTile_invited': (me && me.membership == 'invite'),
@@ -231,7 +221,7 @@ module.exports = React.createClass({
                 'mx_RoomTile_badgeShown': badges || this.state.badgeHover || this.state.menuDisplayed,
             });
 
-            if (this.state.selected) {
+            if (this.props.selected) {
                 let nameSelected = <EmojiText>{name}</EmojiText>;
 
                 label = <div title={ name } className={ nameClasses }>{ nameSelected }</div>;
@@ -265,8 +255,7 @@ module.exports = React.createClass({
 
         let ret = (
             <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}>
+            <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} />

From 75eea89c08354caf2f65e9bbeb60a572830c21c2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 May 2017 16:12:57 +0100
Subject: [PATCH 159/312] Revert "Merge pull request #765 from
 t3chguy/t3chguy/escape-closes-user-settings"

This reverts commit a29d8c2af200af9bd5f55da60a10d1fc9c473764, reversing
changes made to 1d836c7d02a6935313bfb05d94fc38ae05439480.
---
 src/components/structures/LoggedInView.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index c4eeb03d5f..25ca025a23 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -107,18 +107,6 @@ export default React.createClass({
         var handled = false;
 
         switch (ev.keyCode) {
-            case KeyCode.ESCAPE:
-
-                // Implemented this way so possible handling for other pages is neater
-                switch (this.props.page_type) {
-                    case PageTypes.UserSettings:
-                        this.props.onUserSettingsClose();
-                        handled = true;
-                        break;
-                }
-
-                break;
-
             case KeyCode.UP:
             case KeyCode.DOWN:
                 if (ev.altKey && !ev.shiftKey && !ev.ctrlKey && !ev.metaKey) {

From 8695397abbe00d8a3d938580539929ff5f889a0c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 17 May 2017 01:41:42 +0100
Subject: [PATCH 160/312] Support for pasting files into normal composer

We don't seem to be in any danger of getting a working RTE any time soon, so
implement file pasting in the normal composer too.
---
 src/components/views/rooms/MessageComposer.js | 10 +++++----
 .../views/rooms/MessageComposerInput.js       |  9 ++------
 .../views/rooms/MessageComposerInputOld.js    | 22 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 0ee3c2082d..830d3f38ff 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -33,6 +33,7 @@ export default class MessageComposer extends React.Component {
         this.onHangupClick = this.onHangupClick.bind(this);
         this.onUploadClick = this.onUploadClick.bind(this);
         this.onUploadFileSelected = this.onUploadFileSelected.bind(this);
+        this.uploadFiles = this.uploadFiles.bind(this);
         this.onVoiceCallClick = this.onVoiceCallClick.bind(this);
         this.onInputContentChanged = this.onInputContentChanged.bind(this);
         this.onUpArrow = this.onUpArrow.bind(this);
@@ -101,10 +102,11 @@ export default class MessageComposer extends React.Component {
         this.refs.uploadInput.click();
     }
 
-    onUploadFileSelected(files, isPasted) {
-        if (!isPasted)
-            files = files.target.files;
+    onUploadFileSelected(files) {
+        this.uploadFiles(files.target.files);
+    }
 
+    uploadFiles(files) {
         let QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         let TintableSvg = sdk.getComponent("elements.TintableSvg");
 
@@ -310,7 +312,7 @@ export default class MessageComposer extends React.Component {
                     tryComplete={this._tryComplete}
                     onUpArrow={this.onUpArrow}
                     onDownArrow={this.onDownArrow}
-                    onUploadFileSelected={this.onUploadFileSelected}
+                    onFilesPasted={this.uploadFiles}
                     tabComplete={this.props.tabComplete} // used for old messagecomposerinput/tabcomplete
                     onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e2fcc19f67..af361db235 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -84,7 +84,6 @@ export default class MessageComposerInput extends React.Component {
         this.onAction = this.onAction.bind(this);
         this.handleReturn = this.handleReturn.bind(this);
         this.handleKeyCommand = this.handleKeyCommand.bind(this);
-        this.handlePastedFiles = this.handlePastedFiles.bind(this);
         this.onEditorContentChanged = this.onEditorContentChanged.bind(this);
         this.setEditorState = this.setEditorState.bind(this);
         this.onUpArrow = this.onUpArrow.bind(this);
@@ -477,10 +476,6 @@ export default class MessageComposerInput extends React.Component {
         return false;
     }
 
-    handlePastedFiles(files) {
-        this.props.onUploadFileSelected(files, true);
-    }
-
     handleReturn(ev) {
         if (ev.shiftKey) {
             this.onEditorContentChanged(RichUtils.insertSoftNewline(this.state.editorState));
@@ -734,7 +729,7 @@ export default class MessageComposerInput extends React.Component {
                             keyBindingFn={MessageComposerInput.getKeyBinding}
                             handleKeyCommand={this.handleKeyCommand}
                             handleReturn={this.handleReturn}
-                            handlePastedFiles={this.handlePastedFiles}
+                            handlePastedFiles={this.props.onFilesPasted}
                             stripPastedStyles={!this.state.isRichtextEnabled}
                             onTab={this.onTab}
                             onUpArrow={this.onUpArrow}
@@ -764,7 +759,7 @@ MessageComposerInput.propTypes = {
 
     onDownArrow: React.PropTypes.func,
 
-    onUploadFileSelected: React.PropTypes.func,
+    onFilesPasted: React.PropTypes.func,
 
     // attempts to confirm currently selected completion, returns whether actually confirmed
     tryComplete: React.PropTypes.func,
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index 378644478c..adc6bc2c91 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -69,6 +69,9 @@ export default React.createClass({
 
         // The text to use a placeholder in the input box
         placeholder: React.PropTypes.string.isRequired,
+
+        // callback to handle files pasted into the composer
+        onFilesPasted: React.PropTypes.func,
     },
 
     componentWillMount: function() {
@@ -439,10 +442,27 @@ export default React.createClass({
         this.refs.textarea.focus();
     },
 
+    _onPaste: function(ev) {
+        const items = ev.clipboardData.items;
+        const files = [];
+        for (const item of items) {
+            if (item.kind === 'file') {
+                files.push(item.getAsFile());
+            }
+        }
+        if (files.length && this.props.onFilesPasted) {
+            this.props.onFilesPasted(files);
+            return true;
+        }
+        return false;
+    },
+
     render: function() {
         return (
             <div className="mx_MessageComposer_input" onClick={ this.onInputClick }>
-                <textarea autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder} />
+                <textarea autoFocus ref="textarea" rows="1" onKeyDown={this.onKeyDown} onKeyUp={this.onKeyUp} placeholder={this.props.placeholder}
+                    onPaste={this._onPaste}
+                />
             </div>
         );
     }

From c44d7b6c44bdb2e0a4e0243e0ca5ae307f14dc48 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 17 May 2017 13:04:06 +0100
Subject: [PATCH 161/312] Improve phone number country dropdown for
 registration and login

This implements https://github.com/vector-im/riot-web/issues/3895
---
 src/components/views/login/CountryDropdown.js | 21 +++++++++++--
 src/components/views/login/PasswordLogin.js   | 30 +++++++++---------
 .../views/login/RegistrationForm.js           | 31 +++++++++----------
 3 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 6323b3f558..097b5eb1ec 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -38,6 +38,7 @@ export default class CountryDropdown extends React.Component {
         super(props);
         this._onSearchChange = this._onSearchChange.bind(this);
         this._onOptionChange = this._onOptionChange.bind(this);
+        this._getShortOption = this._getShortOption.bind(this);
 
         this.state = {
             searchQuery: '',
@@ -73,6 +74,20 @@ export default class CountryDropdown extends React.Component {
         );
     }
 
+    _getShortOption(iso2) {
+        if (!this.props.isSmall) {
+            return undefined;
+        }
+        let countryPrefix;
+        if (this.props.showPrefix) {
+            countryPrefix = '+' + COUNTRIES_BY_ISO2[iso2].prefix;
+        }
+        return <span>
+            { this._flagImgForIso2(iso2) }
+            { countryPrefix }
+        </span>;
+    }
+
     render() {
         const Dropdown = sdk.getComponent('elements.Dropdown');
 
@@ -107,11 +122,9 @@ export default class CountryDropdown extends React.Component {
         // values between mounting and the initial value propgating
         const value = this.props.value || COUNTRIES[0].iso2;
 
-        const getShortOption = this.props.isSmall ? this._flagImgForIso2 : undefined;
-
         return <Dropdown className={this.props.className}
             onOptionChange={this._onOptionChange} onSearchChange={this._onSearchChange}
-            menuWidth={298} getShortOption={getShortOption}
+            menuWidth={298} getShortOption={this._getShortOption}
             value={value} searchEnabled={true}
         >
             {options}
@@ -122,6 +135,8 @@ export default class CountryDropdown extends React.Component {
 CountryDropdown.propTypes = {
     className: React.PropTypes.string,
     isSmall: React.PropTypes.bool,
+    // if isSmall, show +44 in the selected value
+    showPrefix: React.PropTypes.bool,
     onOptionChange: React.PropTypes.func.isRequired,
     value: React.PropTypes.string,
 };
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 349dd0d139..46c9598751 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -149,28 +149,26 @@ class PasswordLogin extends React.Component {
                 </div>;
             case PasswordLogin.LOGIN_FIELD_PHONE:
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
-                const prefix = this.state.phonePrefix;
                 return <div className="mx_Login_phoneSection">
                     <CountryDropdown
-                        className="mx_Login_phoneCountry"
+                        className="mx_Login_phoneCountry mx_Login_field_prefix"
                         ref="phone_country"
                         onOptionChange={this.onPhoneCountryChanged}
                         value={this.state.phoneCountry}
+                        isSmall={true}
+                        showPrefix={true}
+                    />
+                    <input
+                        className="mx_Login_phoneNumberField mx_Login_field mx_Login_field_has_prefix"
+                        ref="phoneNumber"
+                        key="phone_input"
+                        type="text"
+                        name="phoneNumber"
+                        onChange={this.onPhoneNumberChanged}
+                        placeholder="Mobile phone number"
+                        value={this.state.phoneNumber}
+                        autoFocus
                     />
-                    <div className="mx_Login_field_group">
-                        <div className="mx_Login_field_prefix">+{prefix}</div>
-                        <input
-                            className="mx_Login_phoneNumberField mx_Login_field mx_Login_field_has_prefix"
-                            ref="phoneNumber"
-                            key="phone_input"
-                            type="text"
-                            name="phoneNumber"
-                            onChange={this.onPhoneNumberChanged}
-                            placeholder="Mobile phone number"
-                            value={this.state.phoneNumber}
-                            autoFocus
-                        />
-                    </div>
                 </div>;
         }
     }
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index 2bc2b8946a..e55a224531 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -314,24 +314,23 @@ module.exports = React.createClass({
         const phoneSection = (
             <div className="mx_Login_phoneSection">
                 <CountryDropdown ref="phone_country" onOptionChange={this._onPhoneCountryChange}
-                    className="mx_Login_phoneCountry"
+                    className="mx_Login_phoneCountry mx_Login_field_prefix"
                     value={this.state.phoneCountry}
+                    isSmall={true}
+                    showPrefix={true}
+                />
+                <input type="text" ref="phoneNumber"
+                    placeholder="Mobile phone number (optional)"
+                    defaultValue={this.props.defaultPhoneNumber}
+                    className={this._classForField(
+                        FIELD_PHONE_NUMBER,
+                        'mx_Login_phoneNumberField',
+                        'mx_Login_field',
+                        'mx_Login_field_has_prefix'
+                    )}
+                    onBlur={function() {self.validateField(FIELD_PHONE_NUMBER);}}
+                    value={self.state.phoneNumber}
                 />
-                <div className="mx_Login_field_group">
-                    <div className="mx_Login_field_prefix">+{this.state.phonePrefix}</div>
-                    <input type="text" ref="phoneNumber"
-                        placeholder="Mobile phone number (optional)"
-                        defaultValue={this.props.defaultPhoneNumber}
-                        className={this._classForField(
-                            FIELD_PHONE_NUMBER,
-                            'mx_Login_phoneNumberField',
-                            'mx_Login_field',
-                            'mx_Login_field_has_prefix'
-                        )}
-                        onBlur={function() {self.validateField(FIELD_PHONE_NUMBER);}}
-                        value={self.state.phoneNumber}
-                    />
-                </div>
             </div>
         );
 

From e38437e6cea11177c65980570ca7b0f2c954aaec Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 12 May 2017 17:39:38 +0100
Subject: [PATCH 162/312] Invite the welcome user after registration if
 configured

This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
---
 src/components/structures/MatrixChat.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 8865d77d51..5b2c4f55ef 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -768,8 +768,12 @@ module.exports = React.createClass({
             this._teamToken = teamToken;
             dis.dispatch({action: 'view_home_page'});
         } else if (this._is_registered) {
+            if (this.props.config.welcomeUserId) {
+                createRoom({dmUserId: this.props.config.welcomeUserId});
+                return;
+            }
             // The user has just logged in after registering
-            dis.dispatch({action: 'view_user_settings'});
+            dis.dispatch({action: 'view_room_directory'});
         } else {
             this._showScreenAfterLogin();
         }

From c991b52d2cabc4ee0475613b973e83164e3d4601 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 18 May 2017 11:45:23 +0100
Subject: [PATCH 163/312] Swap to new flag files (which are stored as GB.png)

Requires https://github.com/vector-im/riot-web/pull/3953
---
 src/components/views/login/CountryDropdown.js | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 6323b3f558..9d5de8df9c 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -19,7 +19,6 @@ import React from 'react';
 import sdk from '../../../index';
 
 import { COUNTRIES } from '../../../phonenumber';
-import { charactersToImageNode } from '../../../HtmlUtils';
 
 const COUNTRIES_BY_ISO2 = new Object(null);
 for (const c of COUNTRIES) {
@@ -41,7 +40,7 @@ export default class CountryDropdown extends React.Component {
 
         this.state = {
             searchQuery: '',
-        }
+        };
     }
 
     componentWillMount() {
@@ -64,13 +63,7 @@ export default class CountryDropdown extends React.Component {
     }
 
     _flagImgForIso2(iso2) {
-        // Unicode Regional Indicator Symbol letter 'A'
-        const RIS_A = 0x1F1E6;
-        const ASCII_A = 65;
-        return charactersToImageNode(iso2, true,
-            RIS_A + (iso2.charCodeAt(0) - ASCII_A),
-            RIS_A + (iso2.charCodeAt(1) - ASCII_A),
-        );
+        return <img src={`flags/${iso2}.png`}/>;
     }
 
     render() {
@@ -115,7 +108,7 @@ export default class CountryDropdown extends React.Component {
             value={value} searchEnabled={true}
         >
             {options}
-        </Dropdown>
+        </Dropdown>;
     }
 }
 

From 2350277d2936160e42e991ece509c3da11f0302c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 18 May 2017 14:03:02 +0100
Subject: [PATCH 164/312] Add left_aligned class to CountryDropdown

This indiciates that the dd chevron should be on the left
---
 src/components/views/login/CountryDropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 83fe09f597..8f342203bf 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -115,7 +115,7 @@ export default class CountryDropdown extends React.Component {
         // values between mounting and the initial value propgating
         const value = this.props.value || COUNTRIES[0].iso2;
 
-        return <Dropdown className={this.props.className}
+        return <Dropdown className={this.props.className + " left_aligned"}
             onOptionChange={this._onOptionChange} onSearchChange={this._onSearchChange}
             menuWidth={298} getShortOption={this._getShortOption}
             value={value} searchEnabled={true}

From f99fa3ac1adf6be672515aa684c13ed2b3d9f01c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 18 May 2017 16:58:57 +0100
Subject: [PATCH 165/312] Fixed pressing space or clicking dd input closes dd

---
 src/components/views/elements/Dropdown.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index b4d2545e04..1b1e27cb65 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -152,10 +152,12 @@ export default class Dropdown extends React.Component {
     }
 
     _onInputClick(ev) {
-        this.setState({
-            expanded: !this.state.expanded,
-        });
-        ev.preventDefault();
+        if (!this.state.expanded) {
+            this.setState({
+                expanded: !this.state.expanded,
+            });
+            ev.preventDefault();
+        }
     }
 
     _onMenuOptionClick(dropdownKey) {

From a425909b76c771820529b85c98bb453c78bc81bc Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 18 May 2017 17:01:01 +0100
Subject: [PATCH 166/312] Get rid of react key warning when no results

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

diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 1b1e27cb65..718050c010 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -254,7 +254,7 @@ export default class Dropdown extends React.Component {
             );
         });
         if (options.length === 0) {
-            return [<div className="mx_Dropdown_option">
+            return [<div key="0" className="mx_Dropdown_option">
                 No results
             </div>];
         }

From 384f50609d92ed9e525f261ea6bf4a64d97b401c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 18 May 2017 17:01:40 +0100
Subject: [PATCH 167/312] Allow searching by partial prefix (/w or /wo '+')

---
 src/components/views/login/CountryDropdown.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 8f342203bf..8369912570 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -26,9 +26,14 @@ for (const c of COUNTRIES) {
 }
 
 function countryMatchesSearchQuery(query, country) {
+    // Remove '+' if present (when searching for a prefix)
+    if (query[0] === '+') {
+        query = query.slice(1);
+    }
+
     if (country.name.toUpperCase().indexOf(query.toUpperCase()) == 0) return true;
     if (country.iso2 == query.toUpperCase()) return true;
-    if (country.prefix == query) return true;
+    if (country.prefix.indexOf(query) !== -1) return true;
     return false;
 }
 

From ee64f4a8dd4aedf29d385eaac92b424ad6a03edc Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 18 May 2017 17:02:19 +0100
Subject: [PATCH 168/312] Add country prefix to country dd options

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

diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index 8369912570..7024db339c 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -112,7 +112,7 @@ export default class CountryDropdown extends React.Component {
         const options = displayedCountries.map((country) => {
             return <div key={country.iso2}>
                 {this._flagImgForIso2(country.iso2)}
-                {country.name}
+                {country.name} <span>(+{country.prefix})</span>
             </div>;
         });
 

From 32818aff4f888579cfc9b7cb6bea5fb55522e3e7 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 18 May 2017 17:08:26 +0100
Subject: [PATCH 169/312] Simplify expression

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

diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index 718050c010..82f8d753a9 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -154,7 +154,7 @@ export default class Dropdown extends React.Component {
     _onInputClick(ev) {
         if (!this.state.expanded) {
             this.setState({
-                expanded: !this.state.expanded,
+                expanded: true,
             });
             ev.preventDefault();
         }

From 01955146e99bcee254e8bc191a5755bea096b598 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 May 2017 17:33:32 +0100
Subject: [PATCH 170/312] Prevent an exception getting scroll node

Don't try to findDOMNode before we're mounted as it makes react
angry.
---
 src/components/views/rooms/RoomList.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 611dd10780..7a502f0461 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -50,6 +50,8 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
+        this.mounted = false;
+
         var cli = MatrixClientPeg.get();
         cli.on("Room", this.onRoom);
         cli.on("deleteRoom", this.onDeleteRoom);
@@ -69,9 +71,12 @@ module.exports = React.createClass({
         this.dispatcherRef = dis.register(this.onAction);
         // Initialise the stickyHeaders when the component is created
         this._updateStickyHeaders(true);
+
+        this.mounted = true;
     },
 
-    componentDidUpdate: function() {
+    componentDidUpdate: function(prevp, nextp) {
+        console.log(prevp, nextp);
         // Reinitialise the stickyHeaders when the component is updated
         this._updateStickyHeaders(true);
         this._repositionIncomingCallBox(undefined, false);
@@ -106,6 +111,8 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
+        this.mounted = false;
+
         dis.unregister(this.dispatcherRef);
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("Room", this.onRoom);
@@ -311,6 +318,7 @@ module.exports = React.createClass({
     },
 
     _getScrollNode: function() {
+        if (!this.mounted) return null;
         var panel = ReactDOM.findDOMNode(this);
         if (!panel) return null;
 
@@ -337,6 +345,7 @@ module.exports = React.createClass({
         var incomingCallBox = document.getElementById("incomingCallBox");
         if (incomingCallBox && incomingCallBox.parentElement) {
             var 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;
@@ -360,6 +369,7 @@ module.exports = React.createClass({
     // properly through React
     _initAndPositionStickyHeaders: function(initialise, scrollToPosition) {
         var 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;

From 8fe3fa917801a4e82eef0525e7c31f931c00ff92 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 May 2017 17:35:22 +0100
Subject: [PATCH 171/312] Remove debug logging

---
 src/components/views/rooms/RoomList.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 7a502f0461..9a06fb4efa 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -75,8 +75,7 @@ module.exports = React.createClass({
         this.mounted = true;
     },
 
-    componentDidUpdate: function(prevp, nextp) {
-        console.log(prevp, nextp);
+    componentDidUpdate: function() {
         // Reinitialise the stickyHeaders when the component is updated
         this._updateStickyHeaders(true);
         this._repositionIncomingCallBox(undefined, false);

From 3e7a31ac752d1a1e01e2850c04dd2d0e862dd008 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 18 May 2017 19:03:51 +0100
Subject: [PATCH 172/312] Revert "fix scroll behaviour on macs with no gemini"

This reverts commit 1347d9fa65f878cb65aaf0898536645e4a642429.
---
 src/components/views/rooms/RoomList.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 9a06fb4efa..760b0543c6 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -321,10 +321,11 @@ module.exports = React.createClass({
         var panel = ReactDOM.findDOMNode(this);
         if (!panel) return null;
 
-        // empirically, if we have gm-prevented for some reason, the scroll node
-        // is still the 3rd child (i.e. the view child).  This looks to be due
-        // to vdh's improved resize updater logic...?
-        return panel.children[2]; // XXX: Fragile!
+        if (panel.classList.contains('gm-prevented')) {
+            return panel;
+        } else {
+            return panel.children[2]; // XXX: Fragile!
+        }
     },
 
     _whenScrolling: function(e) {
@@ -372,7 +373,7 @@ module.exports = React.createClass({
         // 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;
-        // Use the offset of the top of the component from the window
+        // 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;
 

From 2ac3371ea4aec331898c459e33384187d725d285 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Thu, 18 May 2017 22:51:22 +0100
Subject: [PATCH 173/312] Don't suggest vars!!

---
 code_style.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/code_style.md b/code_style.md
index f0eca75ffc..29e54057f8 100644
--- a/code_style.md
+++ b/code_style.md
@@ -74,20 +74,20 @@ General Style
   treat yourself to another `var`:
 
   ```javascript
-  var key = "foo",
+  const key = "foo",
       comparator = function(x, y) {
           return x - y;
       }; // Bad
 
-  var key = "foo";
-  var comparator = function(x, y) {
+  const key = "foo";
+  const comparator = function(x, y) {
       return x - y;
   }; // Good
 
-  var x = 0, y = 0; // Fine
+  let x = 0, y = 0; // Fine
 
-  var x = 0;
-  var y = 0; // Also fine
+  let x = 0;
+  let y = 0; // Also fine
   ```
 - A single line `if` is fine, all others have braces. This prevents errors when adding to the code.:
 

From 73d68c551303e03404f4d300c62ddf820cd7f0ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Thu, 18 May 2017 23:03:34 +0100
Subject: [PATCH 174/312] no leading lines for else,finally,catch etc

---
 code_style.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/code_style.md b/code_style.md
index 29e54057f8..2cac303e54 100644
--- a/code_style.md
+++ b/code_style.md
@@ -69,6 +69,22 @@ General Style
       console.log("I am a fish"); // Bad
   }
   ```
+- No new line before else, catch, finally, etc:
+
+  ```javascript
+  if (x) {
+      console.log("I am a fish");
+  } else {
+      console.log("I am a chimp"); // Good
+  }
+
+  if (x) {
+      console.log("I am a fish");
+  }
+  else {
+      console.log("I am a chimp"); // Bad
+  }
+  ```
 - Declare one variable per var statement (consistent with Node). Unless they
   are simple and closely related. If you put the next declaration on a new line,
   treat yourself to another `var`:

From 0e7e4d8595f71edcd13064760dd810cba0085563 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 May 2017 00:20:32 +0100
Subject: [PATCH 175/312] replace weird sidebar snapping with better ui_opacity

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LoggedInView.js    | 14 ++++++-------
 src/components/structures/MatrixChat.js      | 21 ++++++++------------
 src/components/views/rooms/ForwardMessage.js |  7 +++----
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 4c012b42a8..6ac7fcb3c4 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -194,7 +194,7 @@ export default React.createClass({
                         ConferenceHandler={this.props.ConferenceHandler}
                         scrollStateMap={this._scrollStateMap}
                     />;
-                if (!this.props.collapse_rhs) right_panel = <RightPanel roomId={this.props.currentRoomId} opacity={this.props.sideOpacity} />;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel roomId={this.props.currentRoomId} opacity={this.props.rightOpacity} />;
                 break;
 
             case PageTypes.UserSettings:
@@ -206,7 +206,7 @@ export default React.createClass({
                     referralBaseUrl={this.props.config.referralBaseUrl}
                     teamToken={this.props.teamToken}
                 />;
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
                 break;
 
             case PageTypes.CreateRoom:
@@ -214,7 +214,7 @@ export default React.createClass({
                     onRoomCreated={this.props.onRoomCreated}
                     collapsedRhs={this.props.collapse_rhs}
                 />;
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
                 break;
 
             case PageTypes.RoomDirectory:
@@ -223,7 +223,7 @@ export default React.createClass({
                     collapsedRhs={this.props.collapse_rhs}
                     config={this.props.config.roomDirectory}
                 />;
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
                 break;
 
             case PageTypes.HomePage:
@@ -232,12 +232,12 @@ export default React.createClass({
                     teamServerUrl={this.props.config.teamServerConfig.teamServerURL}
                     teamToken={this.props.teamToken}
                 />
-                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.sideOpacity}/>
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>
                 break;
 
             case PageTypes.UserView:
                 page_element = null; // deliberately null for now
-                right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.sideOpacity} />;
+                right_panel = <RightPanel userId={this.props.viewUserId} opacity={this.props.rightOpacity} />;
                 break;
         }
 
@@ -266,7 +266,7 @@ export default React.createClass({
                     <LeftPanel
                         selectedRoom={this.props.currentRoomId}
                         collapsed={this.props.collapse_lhs || false}
-                        opacity={this.props.sideOpacity}
+                        opacity={this.props.leftOpacity}
                         teamToken={this.props.teamToken}
                     />
                     <main className='mx_MatrixChat_middlePanel'>
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 25ec644787..c78a395185 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -119,8 +119,9 @@ module.exports = React.createClass({
             collapse_rhs: false,
             ready: false,
             width: 10000,
-            sideOpacity: 1.0,
+            leftOpacity: 1.0,
             middleOpacity: 1.0,
+            rightOpacity: 1.0,
 
             version: null,
             newVersion: null,
@@ -547,29 +548,23 @@ module.exports = React.createClass({
                 });
                 break;
             case 'hide_right_panel':
-                this.was_rhs_collapsed = this.state.collapse_rhs;
                 this.setState({
                     collapse_rhs: true,
                 });
                 break;
             case 'show_right_panel':
-                this.was_rhs_collapsed = this.state.collapse_rhs;
                 this.setState({
                     collapse_rhs: false,
                 });
                 break;
-            // sets the panel to its state before last show/hide event
-            case 'restore_right_panel':
+            case 'ui_opacity': {
+                const sideDefault = payload.sideOpacity >= 0.0 ? payload.sideOpacity : 1.0;
                 this.setState({
-                    collapse_rhs: this.was_rhs_collapsed,
+                    leftOpacity: payload.leftOpacity >= 0.0 ? payload.leftOpacity : sideDefault,
+                    middleOpacity: payload.middleOpacity || 1.0,
+                    rightOpacity: payload.rightOpacity >= 0.0 ? payload.rightOpacity : sideDefault,
                 });
-                break;
-            case 'ui_opacity':
-                this.setState({
-                    sideOpacity: payload.sideOpacity,
-                    middleOpacity: payload.middleOpacity,
-                });
-                break;
+                break; }
             case 'set_theme':
                 this._onSetTheme(payload.value);
                 break;
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index e5be89b2e0..cd57bb1ba1 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -34,11 +34,11 @@ module.exports = React.createClass({
     componentWillMount: function() {
         this._unmounted = false;
 
-        dis.dispatch({action: 'hide_right_panel'});
         dis.dispatch({
             action: 'ui_opacity',
-            sideOpacity: 1.0,
-            middleOpacity: 0.3,
+            leftOpacity: 1.0,
+            rightOpacity: 0.3,
+            middleOpacity: 0.5,
         });
     },
 
@@ -50,7 +50,6 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         this._unmounted = true;
 
-        dis.dispatch({action: 'restore_right_panel'});
         dis.dispatch({
             action: 'ui_opacity',
             sideOpacity: 1.0,

From bf0fe637590897f1e43d39584cef4122a2cf8bf3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 May 2017 00:20:51 +0100
Subject: [PATCH 176/312] don't know why I'm even tracking mounted state. Never
 refd

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

diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index cd57bb1ba1..c3cec6fb36 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -32,8 +32,6 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
-        this._unmounted = false;
-
         dis.dispatch({
             action: 'ui_opacity',
             leftOpacity: 1.0,
@@ -48,8 +46,6 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
-        this._unmounted = true;
-
         dis.dispatch({
             action: 'ui_opacity',
             sideOpacity: 1.0,

From 475646a2a73296f25f118ac945b969fa34396df2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 May 2017 00:34:35 +0100
Subject: [PATCH 177/312] Change wording

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

diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index c3cec6fb36..e478630303 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -85,10 +85,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_ForwardMessage">
-
-                <h1>Select a room to send the message to</h1>
-                <h2>Use the left sidebar Room List to select forwarding target</h2>
-
+                <h1>Please select the destination room for this message</h1>
             </div>
         );
     },

From cc7edbf86d0154a7b4daa4a4c2bc27a7a8d3e77a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 May 2017 01:29:11 +0100
Subject: [PATCH 178/312] allow for sending arbitrary events, also override
 highlight with event currently being forwarded while forwardingEvent is set

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomView.js        | 15 +++++++--------
 src/components/views/rooms/ForwardMessage.js |  7 +++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 9a0534cac7..c7417eeafd 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -125,7 +125,7 @@ module.exports = React.createClass({
             roomId: null,
             roomLoading: true,
 
-            forwardingMessage: null,
+            forwardingEvent: null,
             editingRoomSettings: false,
             uploadingRoomSettings: false,
             numUnreadMessages: 0,
@@ -454,9 +454,9 @@ module.exports = React.createClass({
                 });
 
                 break;
-            case 'forward_message':
+            case 'forward_event':
                 this.setState({
-                    forwardingMessage: payload.content,
+                    forwardingEvent: payload.content,
                 });
                 break;
         }
@@ -1203,7 +1203,7 @@ module.exports = React.createClass({
         this.updateTint();
         this.setState({
             editingRoomSettings: false,
-            forwardingMessage: null,
+            forwardingEvent: null,
         });
         dis.dispatch({action: 'focus_composer'});
     },
@@ -1621,8 +1621,8 @@ module.exports = React.createClass({
         }
 
         let aux = null;
-        if (this.state.forwardingMessage !== null) {
-            aux = <ForwardMessage onCancelClick={this.onCancelClick} currentRoomId={this.state.room.roomId} content={this.state.forwardingMessage} />;
+        if (this.state.forwardingEvent !== null) {
+            aux = <ForwardMessage onCancelClick={this.onCancelClick} currentRoomId={this.state.room.roomId} mxEvent={this.state.forwardingEvent} />;
         } else if (this.state.editingRoomSettings) {
             aux = <RoomSettings ref="room_settings" onSaveClick={this.onSettingsSaveClick} onCancelClick={this.onCancelClick} room={this.state.room} />;
         } else if (this.state.uploadingRoomSettings) {
@@ -1742,14 +1742,13 @@ module.exports = React.createClass({
         }
 
         // console.log("ShowUrlPreview for %s is %s", this.state.room.roomId, this.state.showUrlPreview);
-
         var messagePanel = (
             <TimelinePanel ref={this._gatherTimelinePanelRef}
                 timelineSet={this.state.room.getUnfilteredTimelineSet()}
                 manageReadReceipts={!UserSettingsStore.getSyncedSetting('hideReadReceipts', false)}
                 manageReadMarkers={true}
                 hidden={hideMessagePanel}
-                highlightedEventId={this.props.highlightedEventId}
+                highlightedEventId={this.state.forwardingEvent ? this.state.forwardingEvent.getId() : this.props.highlightedEventId}
                 eventId={this.props.eventId}
                 eventPixelOffset={this.props.eventPixelOffset}
                 onScroll={ this.onMessageListScroll }
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index e478630303..0ebcdf1e4a 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -26,7 +26,9 @@ module.exports = React.createClass({
 
     propTypes: {
         currentRoomId: React.PropTypes.string.isRequired,
-        content: React.PropTypes.object.isRequired,
+
+        /* the MatrixEvent to be forwarded */
+        mxEvent: React.PropTypes.object.isRequired,
 
         onCancelClick: React.PropTypes.func.isRequired,
     },
@@ -57,8 +59,9 @@ module.exports = React.createClass({
 
     onAction: function(payload) {
         if (payload.action === 'view_room') {
+            const event = this.props.mxEvent;
             const Client = MatrixClientPeg.get();
-            Client.sendMessage(payload.room_id, this.props.content).done(() => {
+            Client.sendEvent(payload.room_id, event.getType(), event.getContent()).done(() => {
                 dis.dispatch({action: 'message_sent'});
             }, (err) => {
                 if (err.name === "UnknownDeviceError") {

From 2bec44a517ca9c04583f6c66eb54ceff6c127102 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Fri, 19 May 2017 10:03:51 +0100
Subject: [PATCH 179/312] Remove suffix and prefix from login input username

This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
---
 src/components/structures/login/Login.js    |  8 -----
 src/components/views/login/PasswordLogin.js | 37 ++++++---------------
 2 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index a3635177e2..63aeb35687 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -19,7 +19,6 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import url from 'url';
 import sdk from '../../../index';
 import Login from '../../../Login';
 
@@ -242,12 +241,6 @@ module.exports = React.createClass({
         switch (step) {
             case 'm.login.password':
                 const PasswordLogin = sdk.getComponent('login.PasswordLogin');
-                // HSs that are not matrix.org may not be configured to have their
-                // domain name === domain part.
-                let hsDomain = url.parse(this.state.enteredHomeserverUrl).hostname;
-                if (hsDomain !== 'matrix.org') {
-                    hsDomain = null;
-                }
                 return (
                     <PasswordLogin
                         onSubmit={this.onPasswordLogin}
@@ -259,7 +252,6 @@ module.exports = React.createClass({
                         onPhoneNumberChanged={this.onPhoneNumberChanged}
                         onForgotPasswordClick={this.props.onForgotPasswordClick}
                         loginIncorrect={this.state.loginIncorrect}
-                        hsDomain={hsDomain}
                     />
                 );
             case 'm.login.cas':
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 46c9598751..55817043ee 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -121,32 +121,16 @@ class PasswordLogin extends React.Component {
                     autoFocus
                 />;
             case PasswordLogin.LOGIN_FIELD_MXID:
-                const mxidInputClasses = classNames({
-                    "mx_Login_field": true,
-                    "mx_Login_username": true,
-                    "mx_Login_field_has_prefix": true,
-                    "mx_Login_field_has_suffix": Boolean(this.props.hsDomain),
-                });
-                let suffix = null;
-                if (this.props.hsDomain) {
-                    suffix = <div className="mx_Login_field_suffix">
-                        :{this.props.hsDomain}
-                    </div>;
-                }
-                return <div className="mx_Login_field_group">
-                    <div className="mx_Login_field_prefix">@</div>
-                    <input
-                        className={mxidInputClasses}
-                        key="username_input"
-                        type="text"
-                        name="username" // make it a little easier for browser's remember-password
-                        onChange={this.onUsernameChanged}
-                        placeholder="username"
-                        value={this.state.username}
-                        autoFocus
-                    />
-                    {suffix}
-                </div>;
+                return <input
+                    className="mx_Login_field mx_Login_username"
+                    key="username_input"
+                    type="text"
+                    name="username" // make it a little easier for browser's remember-password
+                    onChange={this.onUsernameChanged}
+                    placeholder="username"
+                    value={this.state.username}
+                    autoFocus
+                />;
             case PasswordLogin.LOGIN_FIELD_PHONE:
                 const CountryDropdown = sdk.getComponent('views.login.CountryDropdown');
                 return <div className="mx_Login_phoneSection">
@@ -237,7 +221,6 @@ PasswordLogin.propTypes = {
     onPhoneNumberChanged: React.PropTypes.func,
     onPasswordChanged: React.PropTypes.func,
     loginIncorrect: React.PropTypes.bool,
-    hsDomain: React.PropTypes.string,
 };
 
 module.exports = PasswordLogin;

From f615bc129f0416700faa9e3b7d956229448c8655 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 19 May 2017 10:37:33 +0100
Subject: [PATCH 180/312] Released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 444d1c5369..5b7f7c5f26 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-js-sdk": "0.7.8-rc.1",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^15.4.0",

From 4cfd04969ef628040bd98a7d1edca0c4a322ecc6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 19 May 2017 10:39:14 +0100
Subject: [PATCH 181/312] Prepare changelog for v0.8.9-rc.1

---
 CHANGELOG.md | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97dda666de..9db62ec629 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,147 @@
+Changes in [0.8.9-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.9-rc.1) (2017-05-19)
+=============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.8...v0.8.9-rc.1)
+
+ * Prevent an exception getting scroll node
+   [\#902](https://github.com/matrix-org/matrix-react-sdk/pull/902)
+ * Fix a few remaining snags with country dd
+   [\#901](https://github.com/matrix-org/matrix-react-sdk/pull/901)
+ * Add left_aligned class to CountryDropdown
+   [\#900](https://github.com/matrix-org/matrix-react-sdk/pull/900)
+ * Swap to new flag files (which are stored as GB.png)
+   [\#899](https://github.com/matrix-org/matrix-react-sdk/pull/899)
+ * Improve phone number country dropdown for registration and login (Act. 2,
+   Return of the Prefix)
+   [\#897](https://github.com/matrix-org/matrix-react-sdk/pull/897)
+ * Support for pasting files into normal composer
+   [\#892](https://github.com/matrix-org/matrix-react-sdk/pull/892)
+ * tell guests they can't use filepanel until they register
+   [\#887](https://github.com/matrix-org/matrix-react-sdk/pull/887)
+ * Prevent reskindex -w from running when file names have not changed
+   [\#888](https://github.com/matrix-org/matrix-react-sdk/pull/888)
+ * I broke UserSettings for webpack-dev-server
+   [\#884](https://github.com/matrix-org/matrix-react-sdk/pull/884)
+ * various fixes to RoomHeader
+   [\#880](https://github.com/matrix-org/matrix-react-sdk/pull/880)
+ * remove /me whether or not it has a space after it
+   [\#885](https://github.com/matrix-org/matrix-react-sdk/pull/885)
+ * show error if we can't set a filter because no room
+   [\#883](https://github.com/matrix-org/matrix-react-sdk/pull/883)
+ * Fix RM not updating if RR event unpaginated
+   [\#874](https://github.com/matrix-org/matrix-react-sdk/pull/874)
+ * change roomsettings wording
+   [\#878](https://github.com/matrix-org/matrix-react-sdk/pull/878)
+ * make reskindex windows friendly
+   [\#875](https://github.com/matrix-org/matrix-react-sdk/pull/875)
+ * Fixes 2 issues with Dialog closing
+   [\#867](https://github.com/matrix-org/matrix-react-sdk/pull/867)
+ * Automatic Reskindex
+   [\#871](https://github.com/matrix-org/matrix-react-sdk/pull/871)
+ * Put room name in 'leave room' confirmation dialog
+   [\#873](https://github.com/matrix-org/matrix-react-sdk/pull/873)
+ * Fix this/self fail in LeftPanel
+   [\#872](https://github.com/matrix-org/matrix-react-sdk/pull/872)
+ * Don't show null URL previews
+   [\#870](https://github.com/matrix-org/matrix-react-sdk/pull/870)
+ * Fix keys for AddressSelector
+   [\#869](https://github.com/matrix-org/matrix-react-sdk/pull/869)
+ * Make left panel better for new users (mk II)
+   [\#859](https://github.com/matrix-org/matrix-react-sdk/pull/859)
+ * Explicitly save composer content onUnload
+   [\#866](https://github.com/matrix-org/matrix-react-sdk/pull/866)
+ * Warn on unload
+   [\#851](https://github.com/matrix-org/matrix-react-sdk/pull/851)
+ * Log deviceid at login
+   [\#862](https://github.com/matrix-org/matrix-react-sdk/pull/862)
+ * Guests can't send RR so no point trying
+   [\#860](https://github.com/matrix-org/matrix-react-sdk/pull/860)
+ * Remove babelcheck
+   [\#861](https://github.com/matrix-org/matrix-react-sdk/pull/861)
+ * T3chguy/settings versions improvements
+   [\#857](https://github.com/matrix-org/matrix-react-sdk/pull/857)
+ * Change max-len 90->120
+   [\#852](https://github.com/matrix-org/matrix-react-sdk/pull/852)
+ * Remove DM-guessing code
+   [\#829](https://github.com/matrix-org/matrix-react-sdk/pull/829)
+ * Fix jumping to an unread event when in MELS
+   [\#855](https://github.com/matrix-org/matrix-react-sdk/pull/855)
+ * Validate phone number on login
+   [\#856](https://github.com/matrix-org/matrix-react-sdk/pull/856)
+ * Failed to enable HTML5 Notifications Error Dialogs
+   [\#827](https://github.com/matrix-org/matrix-react-sdk/pull/827)
+ * Pin filesize ver to fix break upstream
+   [\#854](https://github.com/matrix-org/matrix-react-sdk/pull/854)
+ * Improve RoomDirectory Look & Feel
+   [\#848](https://github.com/matrix-org/matrix-react-sdk/pull/848)
+ * Only show jumpToReadMarker bar when RM !== RR
+   [\#845](https://github.com/matrix-org/matrix-react-sdk/pull/845)
+ * Allow MELS to have its own RM
+   [\#846](https://github.com/matrix-org/matrix-react-sdk/pull/846)
+ * Use document.onkeydown instead of onkeypress
+   [\#844](https://github.com/matrix-org/matrix-react-sdk/pull/844)
+ * (Room)?Avatar: Request 96x96 avatars on high DPI screens
+   [\#808](https://github.com/matrix-org/matrix-react-sdk/pull/808)
+ * Add mx_EventTile_emote class
+   [\#842](https://github.com/matrix-org/matrix-react-sdk/pull/842)
+ * Fix dialog reappearing after hitting Enter
+   [\#841](https://github.com/matrix-org/matrix-react-sdk/pull/841)
+ * Fix spinner that shows until the first sync
+   [\#840](https://github.com/matrix-org/matrix-react-sdk/pull/840)
+ * Show spinner until first sync has completed
+   [\#839](https://github.com/matrix-org/matrix-react-sdk/pull/839)
+ * Style fixes for LoggedInView
+   [\#838](https://github.com/matrix-org/matrix-react-sdk/pull/838)
+ * Fix specifying custom server for registration
+   [\#834](https://github.com/matrix-org/matrix-react-sdk/pull/834)
+ * Improve country dropdown UX and expose +prefix
+   [\#833](https://github.com/matrix-org/matrix-react-sdk/pull/833)
+ * Fix user settings store
+   [\#836](https://github.com/matrix-org/matrix-react-sdk/pull/836)
+ * show the room name in the UDE Dialog
+   [\#832](https://github.com/matrix-org/matrix-react-sdk/pull/832)
+ * summarise profile changes in MELS
+   [\#826](https://github.com/matrix-org/matrix-react-sdk/pull/826)
+ * Transform h1 and h2 tags to h3 tags
+   [\#820](https://github.com/matrix-org/matrix-react-sdk/pull/820)
+ * limit our keyboard shortcut modifiers correctly
+   [\#825](https://github.com/matrix-org/matrix-react-sdk/pull/825)
+ * Specify cross platform regexes and add olm to noParse
+   [\#823](https://github.com/matrix-org/matrix-react-sdk/pull/823)
+ * Remember element that was in focus before rendering dialog
+   [\#822](https://github.com/matrix-org/matrix-react-sdk/pull/822)
+ * move user settings outward and use built in read receipts disabling
+   [\#824](https://github.com/matrix-org/matrix-react-sdk/pull/824)
+ * File Download Consistency
+   [\#802](https://github.com/matrix-org/matrix-react-sdk/pull/802)
+ * Show Access Token under Advanced in Settings
+   [\#806](https://github.com/matrix-org/matrix-react-sdk/pull/806)
+ * Link tags/commit hashes in the UserSettings version section
+   [\#810](https://github.com/matrix-org/matrix-react-sdk/pull/810)
+ * On return to RoomView from auxPanel, send focus back to Composer
+   [\#813](https://github.com/matrix-org/matrix-react-sdk/pull/813)
+ * Change presence status labels to 'for' instead of 'ago'
+   [\#817](https://github.com/matrix-org/matrix-react-sdk/pull/817)
+ * Disable Scalar Integrations if urls passed to it are falsey
+   [\#816](https://github.com/matrix-org/matrix-react-sdk/pull/816)
+ * Add option to hide other people's read receipts.
+   [\#818](https://github.com/matrix-org/matrix-react-sdk/pull/818)
+ * Add option to not send typing notifications
+   [\#819](https://github.com/matrix-org/matrix-react-sdk/pull/819)
+ * Sync RM across instances of Riot
+   [\#805](https://github.com/matrix-org/matrix-react-sdk/pull/805)
+ * First iteration on improving login UI
+   [\#811](https://github.com/matrix-org/matrix-react-sdk/pull/811)
+ * focus on composer after jumping to bottom
+   [\#809](https://github.com/matrix-org/matrix-react-sdk/pull/809)
+ * Improve RoomList performance via side-stepping React
+   [\#807](https://github.com/matrix-org/matrix-react-sdk/pull/807)
+ * Don't show link preview when link is inside of a quote
+   [\#762](https://github.com/matrix-org/matrix-react-sdk/pull/762)
+ * Escape closes UserSettings
+   [\#765](https://github.com/matrix-org/matrix-react-sdk/pull/765)
+ * Implement user power-level changes in timeline
+   [\#794](https://github.com/matrix-org/matrix-react-sdk/pull/794)
+
 Changes in [0.8.8](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.8) (2017-04-25)
 ===================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.8-rc.2...v0.8.8)

From 1addd6e304e7c954016346d52683569b237573c8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 19 May 2017 10:39:14 +0100
Subject: [PATCH 182/312] v0.8.9-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5b7f7c5f26..72ccaad9b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.8.8",
+  "version": "0.8.9-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 4df51a2b0b6137617d37d5c62a3ea833518299c3 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Fri, 19 May 2017 11:44:04 +0100
Subject: [PATCH 183/312] Reskindex to a temp file, to confuse the babel
 watcher less (#908)

I'm seeing a lot of instances where the babel watcher picks up a half-written src/component-index,
and generates an empty lib file - which it then doesn't update when src/component-index is updated.

Empirically, this seems to make it better.
---
 scripts/reskindex.js | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/scripts/reskindex.js b/scripts/reskindex.js
index 9516614fa5..833151a298 100755
--- a/scripts/reskindex.js
+++ b/scripts/reskindex.js
@@ -6,6 +6,7 @@ var args = require('optimist').argv;
 var chokidar = require('chokidar');
 
 var componentIndex = path.join('src', 'component-index.js');
+var componentIndexTmp = componentIndex+".tmp";
 var componentsDir = path.join('src', 'components');
 var componentGlob = '**/*.js';
 var prevFiles = [];
@@ -20,7 +21,7 @@ function reskindex() {
     var header = args.h || args.header;
     var packageJson = JSON.parse(fs.readFileSync('./package.json'));
 
-    var strm = fs.createWriteStream(componentIndex);
+    var strm = fs.createWriteStream(componentIndexTmp);
 
     if (header) {
        strm.write(fs.readFileSync(header));
@@ -35,13 +36,16 @@ function reskindex() {
     strm.write(" */\n\n");
 
     if (packageJson['matrix-react-parent']) {
+        const parentIndex = packageJson['matrix-react-parent'] +
+              '/lib/component-index';
         strm.write(
-            "module.exports.components = require('"+
-            packageJson['matrix-react-parent']+
-            "/lib/component-index').components;\n\n"
-        );
+`let components = require('${parentIndex}').components;
+if (!components) {
+    throw new Error("'${parentIndex}' didn't export components");
+}
+`);
     } else {
-        strm.write("module.exports.components = {};\n");
+        strm.write("let components = {};\n");
     }
 
     for (var i = 0; i < files.length; ++i) {
@@ -51,13 +55,20 @@ function reskindex() {
         var importName = moduleName.replace(/\./g, "$");
 
         strm.write("import " + importName + " from './components/" + file + "';\n");
-        strm.write(importName + " && (module.exports.components['"+moduleName+"'] = " + importName + ");");
+        strm.write(importName + " && (components['"+moduleName+"'] = " + importName + ");");
         strm.write('\n');
         strm.uncork();
     }
 
+    strm.write("export {components};\n");
     strm.end();
-    console.log('Reskindex: completed');
+    fs.rename(componentIndexTmp, componentIndex, function(err) {
+        if(err) {
+            console.error("Error moving new index into place: " + err);
+        } else {
+            console.log('Reskindex: completed');
+        }
+    });
 }
 
 // Expects both arrays of file names to be sorted

From c61294f71c36c27da37987019a30f08c8f92c5e2 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Fri, 19 May 2017 13:53:11 +0100
Subject: [PATCH 184/312] Delintify some of MatrixChat (#907)

... it annoyed me too much.
---
 src/components/structures/MatrixChat.js | 315 ++++++++++++------------
 1 file changed, 163 insertions(+), 152 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 5b2c4f55ef..54b8c8d1d8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -17,27 +17,24 @@ limitations under the License.
 
 import q from 'q';
 
-var React = require('react');
-var Matrix = require("matrix-js-sdk");
+import React from 'react';
+import Matrix from "matrix-js-sdk";
 
-var MatrixClientPeg = require("../../MatrixClientPeg");
-var PlatformPeg = require("../../PlatformPeg");
-var SdkConfig = require("../../SdkConfig");
-var ContextualMenu = require("./ContextualMenu");
-var RoomListSorter = require("../../RoomListSorter");
-var UserActivity = require("../../UserActivity");
-var Presence = require("../../Presence");
-var dis = require("../../dispatcher");
+import MatrixClientPeg from "../../MatrixClientPeg";
+import PlatformPeg from "../../PlatformPeg";
+import SdkConfig from "../../SdkConfig";
+import * as RoomListSorter from "../../RoomListSorter";
+import dis from "../../dispatcher";
 
-var Modal = require("../../Modal");
-var Tinter = require("../../Tinter");
-var sdk = require('../../index');
-var Rooms = require('../../Rooms');
-var linkifyMatrix = require("../../linkify-matrix");
-var Lifecycle = require('../../Lifecycle');
-var PageTypes = require('../../PageTypes');
+import Modal from "../../Modal";
+import Tinter from "../../Tinter";
+import sdk from '../../index';
+import * as Rooms from '../../Rooms';
+import linkifyMatrix from "../../linkify-matrix";
+import * as Lifecycle from '../../Lifecycle';
+import PageTypes from '../../PageTypes';
 
-var createRoom = require("../../createRoom");
+import createRoom from "../../createRoom";
 import * as UDEHandler from '../../UnknownDeviceErrorHandler';
 
 module.exports = React.createClass({
@@ -89,7 +86,7 @@ module.exports = React.createClass({
     },
 
     getInitialState: function() {
-        var s = {
+        const s = {
             loading: true,
             screen: undefined,
             screenAfterLogin: this.props.initialScreenAfterLogin,
@@ -156,11 +153,9 @@ module.exports = React.createClass({
             return this.state.register_hs_url;
         } else if (MatrixClientPeg.get()) {
             return MatrixClientPeg.get().getHomeserverUrl();
-        }
-        else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) {
+        } else if (window.localStorage && window.localStorage.getItem("mx_hs_url")) {
             return window.localStorage.getItem("mx_hs_url");
-        }
-        else {
+        } else {
             return this.getDefaultHsUrl();
         }
     },
@@ -178,11 +173,9 @@ module.exports = React.createClass({
             return this.state.register_is_url;
         } else if (MatrixClientPeg.get()) {
             return MatrixClientPeg.get().getIdentityServerUrl();
-        }
-        else if (window.localStorage && window.localStorage.getItem("mx_is_url")) {
+        } else if (window.localStorage && window.localStorage.getItem("mx_is_url")) {
             return window.localStorage.getItem("mx_is_url");
-        }
-        else {
+        } else {
             return this.getDefaultIsUrl();
         }
     },
@@ -324,28 +317,14 @@ module.exports = React.createClass({
     onAction: function(payload) {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        var roomIndexDelta = 1;
+        const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
 
-        var self = this;
         switch (payload.action) {
             case 'logout':
                 Lifecycle.logout();
                 break;
             case 'start_registration':
-                const params = payload.params || {};
-                this.setStateForNewScreen({
-                    screen: 'register',
-                    // these params may be undefined, but if they are,
-                    // unset them from our state: we don't want to
-                    // resume a previous registration session if the
-                    // user just clicked 'register'
-                    register_client_secret: params.client_secret,
-                    register_session_id: params.session_id,
-                    register_hs_url: params.hs_url,
-                    register_is_url: params.is_url,
-                    register_id_sid: params.sid,
-                });
-                this.notifyNewScreen('register');
+                this._startRegistration(payload.params || {});
                 break;
             case 'start_login':
                 if (MatrixClientPeg.get() &&
@@ -362,7 +341,7 @@ module.exports = React.createClass({
                 break;
             case 'start_post_registration':
                 this.setState({ // don't clobber loggedIn status
-                    screen: 'post_registration'
+                    screen: 'post_registration',
                 });
                 break;
             case 'start_upgrade_registration':
@@ -392,34 +371,7 @@ module.exports = React.createClass({
                 this.notifyNewScreen('forgot_password');
                 break;
             case 'leave_room':
-                const roomToLeave = MatrixClientPeg.get().getRoom(payload.room_id);
-                Modal.createDialog(QuestionDialog, {
-                    title: "Leave room",
-                    description: <span>Are you sure you want to leave the room <i>{roomToLeave.name}</i>?</span>,
-                    onFinished: (should_leave) => {
-                        if (should_leave) {
-                            const d = MatrixClientPeg.get().leave(payload.room_id);
-
-                            // FIXME: controller shouldn't be loading a view :(
-                            const Loader = sdk.getComponent("elements.Spinner");
-                            const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
-
-                            d.then(() => {
-                                modal.close();
-                                if (this.currentRoomId === payload.room_id) {
-                                    dis.dispatch({action: 'view_next_room'});
-                                }
-                            }, (err) => {
-                                modal.close();
-                                console.error("Failed to leave room " + payload.room_id + " " + err);
-                                Modal.createDialog(ErrorDialog, {
-                                    title: "Failed to leave room",
-                                    description: (err && err.message ? err.message : "Server may be unavailable, overloaded, or you hit a bug."),
-                                });
-                            });
-                        }
-                    }
-                });
+                this._leaveRoom(payload.room_id);
                 break;
             case 'reject_invite':
                 Modal.createDialog(QuestionDialog, {
@@ -440,11 +392,11 @@ module.exports = React.createClass({
                                 modal.close();
                                 Modal.createDialog(ErrorDialog, {
                                     title: "Failed to reject invitation",
-                                    description: err.toString()
+                                    description: err.toString(),
                                 });
                             });
                         }
-                    }
+                    },
                 });
                 break;
             case 'view_user':
@@ -469,30 +421,13 @@ module.exports = React.createClass({
                 this._viewRoom(payload);
                 break;
             case 'view_prev_room':
-                roomIndexDelta = -1;
+                this._viewNextRoom(-1);
+                break;
             case 'view_next_room':
-                var allRooms = RoomListSorter.mostRecentActivityFirst(
-                    MatrixClientPeg.get().getRooms()
-                );
-                var roomIndex = -1;
-                for (var i = 0; i < allRooms.length; ++i) {
-                    if (allRooms[i].roomId == this.state.currentRoomId) {
-                        roomIndex = i;
-                        break;
-                    }
-                }
-                roomIndex = (roomIndex + roomIndexDelta) % allRooms.length;
-                if (roomIndex < 0) roomIndex = allRooms.length - 1;
-                this._viewRoom({ room_id: allRooms[roomIndex].roomId });
+                this._viewNextRoom(1);
                 break;
             case 'view_indexed_room':
-                var allRooms = RoomListSorter.mostRecentActivityFirst(
-                    MatrixClientPeg.get().getRooms()
-                );
-                var roomIndex = payload.roomIndex;
-                if (allRooms[roomIndex]) {
-                    this._viewRoom({ room_id: allRooms[roomIndex].roomId });
-                }
+                this._viewIndexedRoom(payload.roomIndex);
                 break;
             case 'view_user_settings':
                 this._setPage(PageTypes.UserSettings);
@@ -501,19 +436,17 @@ module.exports = React.createClass({
             case 'view_create_room':
                 //this._setPage(PageTypes.CreateRoom);
                 //this.notifyNewScreen('new');
-
-                var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
                 Modal.createDialog(TextInputDialog, {
                     title: "Create Room",
                     description: "Room name (optional)",
                     button: "Create Room",
-                    onFinished: (should_create, name) => {
-                        if (should_create) {
+                    onFinished: (shouldCreate, name) => {
+                        if (shouldCreate) {
                             const createOpts = {};
                             if (name) createOpts.name = name;
                             createRoom({createOpts}).done();
                         }
-                    }
+                    },
                 });
                 break;
             case 'view_room_directory':
@@ -584,7 +517,7 @@ module.exports = React.createClass({
             case 'new_version':
                 this.onVersion(
                     payload.currentVersion, payload.newVersion,
-                    payload.releaseNotes
+                    payload.releaseNotes,
                 );
                 break;
         }
@@ -596,6 +529,47 @@ module.exports = React.createClass({
         });
     },
 
+    _startRegistration: function(params) {
+        this.setStateForNewScreen({
+            screen: 'register',
+            // these params may be undefined, but if they are,
+            // unset them from our state: we don't want to
+            // resume a previous registration session if the
+            // user just clicked 'register'
+            register_client_secret: params.client_secret,
+            register_session_id: params.session_id,
+            register_hs_url: params.hs_url,
+            register_is_url: params.is_url,
+            register_id_sid: params.sid,
+        });
+        this.notifyNewScreen('register');
+    },
+
+    _viewNextRoom: function(roomIndexDelta) {
+        const allRooms = RoomListSorter.mostRecentActivityFirst(
+            MatrixClientPeg.get().getRooms(),
+        );
+        let roomIndex = -1;
+        for (let i = 0; i < allRooms.length; ++i) {
+            if (allRooms[i].roomId == this.state.currentRoomId) {
+                roomIndex = i;
+                break;
+            }
+        }
+        roomIndex = (roomIndex + roomIndexDelta) % allRooms.length;
+        if (roomIndex < 0) roomIndex = allRooms.length - 1;
+        this._viewRoom({ room_id: allRooms[roomIndex].roomId });
+    },
+
+    _viewIndexedRoom: function(roomIndex) {
+        const allRooms = RoomListSorter.mostRecentActivityFirst(
+            MatrixClientPeg.get().getRooms(),
+        );
+        if (allRooms[roomIndex]) {
+            this._viewRoom({ room_id: allRooms[roomIndex].roomId });
+        }
+    },
+
     // switch view to the given room
     //
     // @param {Object} room_info Object containing data about the room to be joined
@@ -615,7 +589,7 @@ module.exports = React.createClass({
     _viewRoom: function(room_info) {
         this.focusComposer = true;
 
-        var newState = {
+        const newState = {
             initialEventId: room_info.event_id,
             highlightedEventId: room_info.event_id,
             initialEventPixelOffset: undefined,
@@ -635,7 +609,7 @@ module.exports = React.createClass({
         //
         // TODO: do this in RoomView rather than here
         if (!room_info.event_id && this.refs.loggedInView) {
-            var scrollState = this.refs.loggedInView.getScrollStateForRoom(room_info.room_id);
+            const scrollState = this.refs.loggedInView.getScrollStateForRoom(room_info.room_id);
             if (scrollState) {
                 newState.initialEventId = scrollState.focussedEvent;
                 newState.initialEventPixelOffset = scrollState.pixelOffset;
@@ -677,14 +651,14 @@ module.exports = React.createClass({
     },
 
     _createChat: function() {
-        var ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
+        const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
         Modal.createDialog(ChatInviteDialog, {
             title: "Start a new chat",
         });
     },
 
     _invite: function(roomId) {
-        var ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
+        const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
         Modal.createDialog(ChatInviteDialog, {
             title: "Invite new room members",
             button: "Send Invites",
@@ -693,6 +667,41 @@ module.exports = React.createClass({
         });
     },
 
+    _leaveRoom: function(roomId) {
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+
+        const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
+        Modal.createDialog(QuestionDialog, {
+            title: "Leave room",
+            description: <span>Are you sure you want to leave the room <i>{roomToLeave.name}</i>?</span>,
+            onFinished: (shouldLeave) => {
+                if (shouldLeave) {
+                    const d = MatrixClientPeg.get().leave(roomId);
+
+                    // FIXME: controller shouldn't be loading a view :(
+                    const Loader = sdk.getComponent("elements.Spinner");
+                    const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
+
+                    d.then(() => {
+                        modal.close();
+                        if (this.currentRoomId === roomId) {
+                            dis.dispatch({action: 'view_next_room'});
+                        }
+                    }, (err) => {
+                        modal.close();
+                        console.error("Failed to leave room " + roomId + " " + err);
+                        Modal.createDialog(ErrorDialog, {
+                            title: "Failed to leave room",
+                            description: (err && err.message ? err.message :
+                                "Server may be unavailable, overloaded, or you hit a bug."),
+                        });
+                    });
+                }
+            },
+        });
+    },
+
     /**
      * Called when the sessionloader has finished
      */
@@ -711,6 +720,8 @@ module.exports = React.createClass({
 
     /**
      * Called whenever someone changes the theme
+     *
+     * @param {string} theme new theme
      */
     _onSetTheme: function(theme) {
         if (!theme) {
@@ -719,12 +730,12 @@ module.exports = React.createClass({
 
         // look for the stylesheet elements.
         // styleElements is a map from style name to HTMLLinkElement.
-        var styleElements = Object.create(null);
-        var i, a;
-        for (i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
-            var href = a.getAttribute("href");
+        const styleElements = Object.create(null);
+        let a;
+        for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
+            const href = a.getAttribute("href");
             // shouldn't we be using the 'title' tag rather than the href?
-            var match = href.match(/^bundles\/.*\/theme-(.*)\.css$/);
+            const match = href.match(/^bundles\/.*\/theme-(.*)\.css$/);
             if (match) {
                 styleElements[match[1]] = a;
             }
@@ -747,14 +758,15 @@ module.exports = React.createClass({
             // abuse the tinter to change all the SVG's #fff to #2d2d2d
             // XXX: obviously this shouldn't be hardcoded here.
             Tinter.tintSvgWhite('#2d2d2d');
-        }
-        else {
+        } else {
             Tinter.tintSvgWhite('#ffffff');
         }
     },
 
     /**
      * Called when a new logged in session has started
+     *
+     * @param {string} teamToken
      */
     _onLoggedIn: function(teamToken) {
         this.setState({
@@ -785,7 +797,7 @@ module.exports = React.createClass({
         if (this.state.screenAfterLogin && this.state.screenAfterLogin.screen) {
             this.showScreen(
                 this.state.screenAfterLogin.screen,
-                this.state.screenAfterLogin.params
+                this.state.screenAfterLogin.params,
             );
             this.notifyNewScreen(this.state.screenAfterLogin.screen);
             this.setState({screenAfterLogin: null});
@@ -826,8 +838,8 @@ module.exports = React.createClass({
      * (useful for setting listeners)
      */
     _onWillStartClient() {
-        var self = this;
-        var cli = MatrixClientPeg.get();
+        const self = this;
+        const cli = MatrixClientPeg.get();
 
         // Allow the JS SDK to reap timeline events. This reduces the amount of
         // memory consumed as the JS SDK stores multiple distinct copies of room
@@ -868,17 +880,17 @@ module.exports = React.createClass({
         cli.on('Call.incoming', function(call) {
             dis.dispatch({
                 action: 'incoming_call',
-                call: call
+                call: call,
             });
         });
         cli.on('Session.logged_out', function(call) {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
                 title: "Signed Out",
-                description: "For security, this session has been signed out. Please sign in again."
+                description: "For security, this session has been signed out. Please sign in again.",
             });
             dis.dispatch({
-                action: 'logout'
+                action: 'logout',
             });
         });
         cli.on("accountData", function(ev) {
@@ -901,17 +913,17 @@ module.exports = React.createClass({
         if (screen == 'register') {
             dis.dispatch({
                 action: 'start_registration',
-                params: params
+                params: params,
             });
         } else if (screen == 'login') {
             dis.dispatch({
                 action: 'start_login',
-                params: params
+                params: params,
             });
         } else if (screen == 'forgot_password') {
             dis.dispatch({
                 action: 'start_password_recovery',
-                params: params
+                params: params,
             });
         } else if (screen == 'new') {
             dis.dispatch({
@@ -934,26 +946,26 @@ module.exports = React.createClass({
                 action: 'start_post_registration',
             });
         } else if (screen.indexOf('room/') == 0) {
-            var segments = screen.substring(5).split('/');
-            var roomString = segments[0];
-            var eventId = segments[1]; // undefined if no event id given
+            const segments = screen.substring(5).split('/');
+            const roomString = segments[0];
+            const eventId = segments[1]; // undefined if no event id given
 
             // FIXME: sort_out caseConsistency
-            var third_party_invite = {
+            const thirdPartyInvite = {
                 inviteSignUrl: params.signurl,
                 invitedEmail: params.email,
             };
-            var oob_data = {
+            const oobData = {
                 name: params.room_name,
                 avatarUrl: params.room_avatar_url,
                 inviterName: params.inviter_name,
             };
 
-            var payload = {
+            const payload = {
                 action: 'view_room',
                 event_id: eventId,
-                third_party_invite: third_party_invite,
-                oob_data: oob_data,
+                third_party_invite: thirdPartyInvite,
+                oob_data: oobData,
             };
             if (roomString[0] == '#') {
                 payload.room_alias = roomString;
@@ -967,19 +979,18 @@ module.exports = React.createClass({
                 dis.dispatch(payload);
             }
         } else if (screen.indexOf('user/') == 0) {
-            var userId = screen.substring(5);
+            const userId = screen.substring(5);
             this.setState({ viewUserId: userId });
             this._setPage(PageTypes.UserView);
             this.notifyNewScreen('user/' + userId);
-            var member = new Matrix.RoomMember(null, userId);
+            const member = new Matrix.RoomMember(null, userId);
             if (member) {
                 dis.dispatch({
                     action: 'view_user',
                     member: member,
                 });
             }
-        }
-        else {
+        } else {
             console.info("Ignoring showScreen for '%s'", screen);
         }
     },
@@ -998,7 +1009,7 @@ module.exports = React.createClass({
     onUserClick: function(event, userId) {
         event.preventDefault();
 
-        var member = new Matrix.RoomMember(null, userId);
+        const member = new Matrix.RoomMember(null, userId);
         if (!member) { return; }
         dis.dispatch({
             action: 'view_user',
@@ -1008,17 +1019,17 @@ module.exports = React.createClass({
 
     onLogoutClick: function(event) {
         dis.dispatch({
-            action: 'logout'
+            action: 'logout',
         });
         event.stopPropagation();
         event.preventDefault();
     },
 
     handleResize: function(e) {
-        var hideLhsThreshold = 1000;
-        var showLhsThreshold = 1000;
-        var hideRhsThreshold = 820;
-        var showRhsThreshold = 820;
+        const hideLhsThreshold = 1000;
+        const showLhsThreshold = 1000;
+        const hideRhsThreshold = 820;
+        const showRhsThreshold = 820;
 
         if (this.state.width > hideLhsThreshold && window.innerWidth <= hideLhsThreshold) {
             dis.dispatch({ action: 'hide_left_panel' });
@@ -1036,10 +1047,10 @@ module.exports = React.createClass({
         this.setState({width: window.innerWidth});
     },
 
-    onRoomCreated: function(room_id) {
+    onRoomCreated: function(roomId) {
         dis.dispatch({
             action: "view_room",
-            room_id: room_id,
+            room_id: roomId,
         });
     },
 
@@ -1073,7 +1084,7 @@ module.exports = React.createClass({
     onFinishPostRegistration: function() {
         // Don't confuse this with "PageType" which is the middle window to show
         this.setState({
-            screen: undefined
+            screen: undefined,
         });
         this.showScreen("settings");
     },
@@ -1088,10 +1099,10 @@ module.exports = React.createClass({
     },
 
     updateStatusIndicator: function(state, prevState) {
-        var notifCount = 0;
+        let notifCount = 0;
 
-        var rooms = MatrixClientPeg.get().getRooms();
-        for (var i = 0; i < rooms.length; ++i) {
+        const rooms = MatrixClientPeg.get().getRooms();
+        for (let i = 0; i < rooms.length; ++i) {
             if (rooms[i].hasMembershipState(MatrixClientPeg.get().credentials.userId, 'invite')) {
                 notifCount++;
             } else if (rooms[i].getUnreadNotificationCount()) {
@@ -1118,19 +1129,18 @@ module.exports = React.createClass({
                 action: 'view_room',
                 room_id: this.state.currentRoomId,
             });
-        }
-        else {
+        } else {
             dis.dispatch({
                 action: 'view_room_directory',
             });
         }
     },
 
-    onRoomIdResolved: function(room_id) {
+    onRoomIdResolved: function(roomId) {
         // It's the RoomView's resposibility to look up room aliases, but we need the
         // ID to pass into things like the Member List, so the Room View tells us when
         // its done that resolution so we can display things that take a room ID.
-        this.setState({currentRoomId: room_id});
+        this.setState({currentRoomId: roomId});
     },
 
     _makeRegistrationUrl: function(params) {
@@ -1153,8 +1163,9 @@ module.exports = React.createClass({
                 </div>
             );
         }
+
         // needs to be before normal PageTypes as you are logged in technically
-        else if (this.state.screen == 'post_registration') {
+        if (this.state.screen == 'post_registration') {
             const PostRegistration = sdk.getComponent('structures.login.PostRegistration');
             return (
                 <PostRegistration
@@ -1242,5 +1253,5 @@ module.exports = React.createClass({
                 />
             );
         }
-    }
+    },
 });

From e3dbf057fbf866c82c1fbdcc4db91ba07a450c73 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 17 May 2017 18:49:59 +0100
Subject: [PATCH 185/312] Fix 'missing page_type' error

LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
---
 src/components/structures/MatrixChat.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 54b8c8d1d8..0de38ab226 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1171,7 +1171,12 @@ module.exports = React.createClass({
                 <PostRegistration
                     onComplete={this.onFinishPostRegistration} />
             );
-        } else if (this.state.loggedIn && this.state.ready) {
+        }
+
+        // `ready` and `loggedIn` may be set before `page_type` (because the
+        // latter is set via the dispatcher). If we don't yet have a `page_type`,
+        // keep showing the spinner for now.
+        if (this.state.loggedIn && this.state.ready && this.state.page_type) {
             /* for now, we stuff the entirety of our props and state into the LoggedInView.
              * we should go through and figure out what we actually need to pass down, as well
              * as using something like redux to avoid having a billion bits of state kicking around.

From cc3673d2d2fd091a3cb88b3e74d2f5d08621efe5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 May 2017 17:39:21 +0100
Subject: [PATCH 186/312] Make the linked versions open a new tab, turt2live
 complained :P

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 2c1f17ee3e..ca475fbf0c 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -46,7 +46,7 @@ const gHVersionLabel = function(repo, token='') {
     } else {
         url = `https://github.com/${repo}/commit/${token.split('-')[0]}`;
     }
-    return <a href={url}>{token}</a>;
+    return <a target="_blank" href={url}>{token}</a>;
 };
 
 // Enumerate some simple 'flip a bit' UI settings (if any).

From 008cc95e9ca97199add9e9591a85012b3dbf8759 Mon Sep 17 00:00:00 2001
From: Maxwell Kepler <kierang@largepixelcollider.net>
Date: Thu, 18 May 2017 22:00:44 +0100
Subject: [PATCH 187/312] Add 12 hour support

---
 src/DateUtils.js                          | 34 +++++++++++++++--------
 src/components/structures/UserSettings.js |  2 +-
 src/components/views/rooms/EventTile.js   | 19 +++++++++----
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index c58c09d4de..f787fc0e20 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -16,27 +16,37 @@ limitations under the License.
 
 'use strict';
 
-var days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+import UserSettingsStore from './UserSettingsStore';
+const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+let time;
 
 function pad(n) {
     return (n < 10 ? '0' : '') + n;
 }
 
+function twentyfourhour(date) {
+  let hours = date.getHours();
+  let minutes = date.getMinutes();
+  let ampm = hours >= 12 ? 'PM' : 'AM';
+  hours = hours % 12;
+  hours = hours ? hours : 12;
+  minutes = minutes < 10 ? '0'+minutes : minutes;
+  var strTime = hours + ':' + minutes + ' ' + ampm;
+  return strTime;
+}
+
 module.exports = {
     formatDate: function(date) {
-        // date.toLocaleTimeString is completely system dependent.
-        // just go 24h for now
-
         var now = new Date();
         if (date.toDateString() === now.toDateString()) {
-            return pad(date.getHours()) + ':' + pad(date.getMinutes());
+            return this.formatTime(date);
         }
         else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
-            return days[date.getDay()] + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+            return days[date.getDay()] + " " + this.formatTime(date);
         }
         else if (now.getFullYear() === date.getFullYear()) {
-            return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+            return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + this.formatTime(date);
         }
         else {
             return this.formatFullDate(date);
@@ -44,11 +54,13 @@ module.exports = {
     },
 
     formatFullDate: function(date) {
-        return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+        return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + this.formatTime(date);
     },
 
     formatTime: function(date) {
+        if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
+          return twentyfourhour(date);
+        }
         return pad(date.getHours()) + ':' + pad(date.getMinutes());
-    }
+    },
 };
-
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 2c1f17ee3e..45774d7a6a 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -65,7 +65,6 @@ const SETTINGS_LABELS = [
         id: 'dontSendTypingNotifications',
         label: "Don't send typing notifications",
     },
-/*
     {
         id: 'alwaysShowTimestamps',
         label: 'Always show message timestamps',
@@ -74,6 +73,7 @@ const SETTINGS_LABELS = [
         id: 'showTwelveHourTimestamps',
         label: 'Show timestamps in 12 hour format (e.g. 2:30pm)',
     },
+/*
     {
         id: 'useCompactLayout',
         label: 'Use compact timeline layout',
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 44c4051995..6ec076ba95 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -16,6 +16,8 @@ limitations under the License.
 
 'use strict';
 
+import UserSettingsStore from '../../../UserSettingsStore';
+
 var React = require('react');
 var classNames = require("classnames");
 var Modal = require('../../../Modal');
@@ -479,24 +481,31 @@ module.exports = WithMatrixClient(React.createClass({
         );
 
         var e2e;
+        let e2e_style;
         // cosmetic padlocks:
+        if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
+            e2e_style = "mx_EventTile_e2eIcon mx_EventTile_e2eIcon_12hr";
+        }
+        else {
+            e2e_style = "mx_EventTile_e2eIcon";
+        }
         if ((e2eEnabled && this.props.eventSendStatus) || this.props.mxEvent.getType() === 'm.room.encryption') {
-            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12" />;
+            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className={e2e_style} alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12" />;
         }
         // real padlocks
         else if (this.props.mxEvent.isEncrypted() || (e2eEnabled && this.props.eventSendStatus)) {
             if (this.props.mxEvent.getContent().msgtype === 'm.bad.encrypted') {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Undecryptable" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
+                e2e = <img onClick={ this.onCryptoClicked } className={e2e_style} alt="Undecryptable" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
             }
             else if (this.state.verified == true || (e2eEnabled && this.props.eventSendStatus)) {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon"  alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12"/>;
+                e2e = <img onClick={ this.onCryptoClicked } className={e2e_style}  alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12"/>;
             }
             else {
-                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by unverified device" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
+                e2e = <img onClick={ this.onCryptoClicked } className={e2e_style} alt="Encrypted by unverified device" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
             }
         }
         else if (e2eEnabled) {
-            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
+            e2e = <img onClick={ this.onCryptoClicked } className={e2e_style} alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
         }
         const timestamp = this.props.mxEvent.getTs() ?
             <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;

From 5aa1bc418550fda7f4cbc96167151792d91b5633 Mon Sep 17 00:00:00 2001
From: Kieran Gould <kierang@largepixelcollider.net>
Date: Fri, 19 May 2017 21:31:24 +0100
Subject: [PATCH 188/312] Rename twentyFourHour Pad time

---
 src/DateUtils.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index f787fc0e20..d0222325b7 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -19,21 +19,18 @@ limitations under the License.
 import UserSettingsStore from './UserSettingsStore';
 const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-let time;
 
 function pad(n) {
     return (n < 10 ? '0' : '') + n;
 }
 
-function twentyfourhour(date) {
-  let hours = date.getHours();
-  let minutes = date.getMinutes();
-  let ampm = hours >= 12 ? 'PM' : 'AM';
-  hours = hours % 12;
-  hours = hours ? hours : 12;
-  minutes = minutes < 10 ? '0'+minutes : minutes;
-  var strTime = hours + ':' + minutes + ' ' + ampm;
-  return strTime;
+function twentyFourHour(date) {
+    let hours = date.getHours() % 12;
+    let minutes = pad(date.getMinutes());
+    const ampm = hours >= 12 ? 'PM' : 'AM';
+    hours = pad(hours ? hours : 12);
+    minutes = pad(minutes);
+    return hours + ':' + minutes + ' ' + ampm;
 }
 
 module.exports = {
@@ -59,7 +56,7 @@ module.exports = {
 
     formatTime: function(date) {
         if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
-          return twentyfourhour(date);
+          return twentyFourHour(date);
         }
         return pad(date.getHours()) + ':' + pad(date.getMinutes());
     },

From f9152b205cfcc299d0cf3f08b3ad4ca1a31d992b Mon Sep 17 00:00:00 2001
From: Kieran Gould <kierang@largepixelcollider.net>
Date: Fri, 19 May 2017 22:24:02 +0100
Subject: [PATCH 189/312] Add parameter `showTwelveHours` to formatTime

---
 src/DateUtils.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index d0222325b7..1f231088a1 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 'use strict';
 
-import UserSettingsStore from './UserSettingsStore';
 const days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
 const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
 
@@ -24,13 +23,13 @@ function pad(n) {
     return (n < 10 ? '0' : '') + n;
 }
 
-function twentyFourHour(date) {
+function twelveHourTime(date) {
     let hours = date.getHours() % 12;
     let minutes = pad(date.getMinutes());
     const ampm = hours >= 12 ? 'PM' : 'AM';
     hours = pad(hours ? hours : 12);
     minutes = pad(minutes);
-    return hours + ':' + minutes + ' ' + ampm;
+    return `${hours}:${minutes} ${ampm}`;
 }
 
 module.exports = {
@@ -54,9 +53,9 @@ module.exports = {
         return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + this.formatTime(date);
     },
 
-    formatTime: function(date) {
-        if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
-          return twentyFourHour(date);
+    formatTime: function(date, showTwelveHour=false) {
+        if (showTwelveHour) {
+          return twelveHourTime(date);
         }
         return pad(date.getHours()) + ':' + pad(date.getMinutes());
     },

From 6b32975e0c1ddf152053f1842642adf089406422 Mon Sep 17 00:00:00 2001
From: Kieran Gould <kierang@largepixelcollider.net>
Date: Fri, 19 May 2017 22:26:24 +0100
Subject: [PATCH 190/312] Add 12 hour class to mx_EventTile

---
 src/DateUtils.js                        |  7 ++----
 src/components/views/rooms/EventTile.js | 32 ++++++++++---------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 1f231088a1..d516cf07bf 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -25,10 +25,9 @@ function pad(n) {
 
 function twelveHourTime(date) {
     let hours = date.getHours() % 12;
-    let minutes = pad(date.getMinutes());
+    const minutes = pad(date.getMinutes());
     const ampm = hours >= 12 ? 'PM' : 'AM';
     hours = pad(hours ? hours : 12);
-    minutes = pad(minutes);
     return `${hours}:${minutes} ${ampm}`;
 }
 
@@ -44,9 +43,7 @@ module.exports = {
         else if (now.getFullYear() === date.getFullYear()) {
             return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + this.formatTime(date);
         }
-        else {
-            return this.formatFullDate(date);
-        }
+        return this.formatFullDate(date);
     },
 
     formatFullDate: function(date) {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 6ec076ba95..fd5fa81390 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -406,9 +406,12 @@ module.exports = WithMatrixClient(React.createClass({
         var isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
         const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted;
 
-        var classes = classNames({
+        const isTwelveHour = UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps');
+
+        const classes = classNames({
             mx_EventTile: true,
             mx_EventTile_info: isInfoMessage,
+            mx_EventTile_12hr: isTwelveHour,
             mx_EventTile_encrypting: this.props.eventSendStatus == 'encrypting',
             mx_EventTile_sending: isSending,
             mx_EventTile_notSent: this.props.eventSendStatus == 'not_sent',
@@ -476,43 +479,34 @@ module.exports = WithMatrixClient(React.createClass({
             }
         }
 
-        var editButton = (
+        const editButton = (
             <span className="mx_EventTile_editButton" title="Options" onClick={this.onEditClicked} />
         );
-
-        var e2e;
-        let e2e_style;
+        let e2e;
         // cosmetic padlocks:
-        if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
-            e2e_style = "mx_EventTile_e2eIcon mx_EventTile_e2eIcon_12hr";
-        }
-        else {
-            e2e_style = "mx_EventTile_e2eIcon";
-        }
         if ((e2eEnabled && this.props.eventSendStatus) || this.props.mxEvent.getType() === 'm.room.encryption') {
-            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className={e2e_style} alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12" />;
+            e2e = <img style={{ cursor: 'initial', marginLeft: '-1px' }} className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12" />;
         }
         // real padlocks
         else if (this.props.mxEvent.isEncrypted() || (e2eEnabled && this.props.eventSendStatus)) {
             if (this.props.mxEvent.getContent().msgtype === 'm.bad.encrypted') {
-                e2e = <img onClick={ this.onCryptoClicked } className={e2e_style} alt="Undecryptable" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Undecryptable" src="img/e2e-blocked.svg" width="12" height="12" style={{ marginLeft: "-1px" }} />;
             }
             else if (this.state.verified == true || (e2eEnabled && this.props.eventSendStatus)) {
-                e2e = <img onClick={ this.onCryptoClicked } className={e2e_style}  alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12"/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by verified device" src="img/e2e-verified.svg" width="10" height="12"/>;
             }
             else {
-                e2e = <img onClick={ this.onCryptoClicked } className={e2e_style} alt="Encrypted by unverified device" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
+                e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Encrypted by unverified device" src="img/e2e-warning.svg" width="15" height="12" style={{ marginLeft: "-2px" }}/>;
             }
         }
         else if (e2eEnabled) {
-            e2e = <img onClick={ this.onCryptoClicked } className={e2e_style} alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
+            e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
         }
         const timestamp = this.props.mxEvent.getTs() ?
-            <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;
+            <MessageTimestamp showTwelveHour={isTwelveHour} ts={this.props.mxEvent.getTs()} /> : null;
 
         if (this.props.tileShape === "notif") {
-            var room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());
-
+            const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());
             return (
                 <div className={classes}>
                     <div className="mx_EventTile_roomName">

From 47e5e8d678fd24e5ad5f9e9250db74368a28b6f7 Mon Sep 17 00:00:00 2001
From: Kieran Gould <kierang@largepixelcollider.net>
Date: Fri, 19 May 2017 22:45:56 +0100
Subject: [PATCH 191/312] Moved isTwelveHour alllll the way up to
 TimelinePanel.

---
 src/components/structures/MessagePanel.js  | 13 ++++++++-----
 src/components/structures/TimelinePanel.js |  8 ++++++--
 src/components/views/rooms/EventTile.js    | 10 +++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index d4bf147ad5..d98a464aef 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -84,6 +84,9 @@ module.exports = React.createClass({
 
         // shape parameter to be passed to EventTiles
         tileShape: React.PropTypes.string,
+
+        // show twelve hour timestamps
+        isTwelveHour: React.PropTypes.bool,
     },
 
     componentWillMount: function() {
@@ -230,8 +233,8 @@ module.exports = React.createClass({
     },
 
     _getEventTiles: function() {
-        var EventTile = sdk.getComponent('rooms.EventTile');
-        var DateSeparator = sdk.getComponent('messages.DateSeparator');
+        const EventTile = sdk.getComponent('rooms.EventTile');
+        const DateSeparator = sdk.getComponent('messages.DateSeparator');
         const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
 
         this.eventNodes = {};
@@ -413,8 +416,8 @@ module.exports = React.createClass({
     },
 
     _getTilesForEvent: function(prevEvent, mxEv, last) {
-        var EventTile = sdk.getComponent('rooms.EventTile');
-        var DateSeparator = sdk.getComponent('messages.DateSeparator');
+        const EventTile = sdk.getComponent('rooms.EventTile');
+        const DateSeparator = sdk.getComponent('messages.DateSeparator');
         var ret = [];
 
         // is this a continuation of the previous message?
@@ -468,7 +471,6 @@ module.exports = React.createClass({
         if (this.props.manageReadReceipts) {
             readReceipts = this._getReadReceiptsForEvent(mxEv);
         }
-
         ret.push(
                 <li key={eventId}
                         ref={this._collectEventNode.bind(this, eventId)}
@@ -482,6 +484,7 @@ module.exports = React.createClass({
                         checkUnmounting={this._isUnmounting}
                         eventSendStatus={mxEv.status}
                         tileShape={this.props.tileShape}
+                        isTwelveHour={this.props.isTwelveHour}
                         last={last} isSelectedEvent={highlight}/>
                 </li>
         );
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 8794713501..c629f51c31 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -29,6 +29,7 @@ var ObjectUtils = require('../../ObjectUtils');
 var Modal = require("../../Modal");
 var UserActivity = require("../../UserActivity");
 var KeyCode = require('../../KeyCode');
+import UserSettingsStore from '../../UserSettingsStore';
 
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 20;
@@ -122,7 +123,7 @@ var TimelinePanel = React.createClass({
         let initialReadMarker = null;
         if (this.props.manageReadMarkers) {
             const readmarker = this.props.timelineSet.room.getAccountData('m.fully_read');
-            if (readmarker){
+            if (readmarker) {
                 initialReadMarker = readmarker.getContent().event_id;
             } else {
                 initialReadMarker = this._getCurrentReadReceipt();
@@ -171,6 +172,9 @@ var TimelinePanel = React.createClass({
 
             // cache of matrixClient.getSyncState() (but from the 'sync' event)
             clientSyncState: MatrixClientPeg.get().getSyncState(),
+
+            // should the event tiles have twelve hour times
+            isTwelveHour: UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps'),
         };
     },
 
@@ -1106,7 +1110,6 @@ var TimelinePanel = React.createClass({
         const forwardPaginating = (
             this.state.forwardPaginating || this.state.clientSyncState == 'PREPARED'
         );
-
         return (
             <MessagePanel ref="messagePanel"
                     hidden={ this.props.hidden }
@@ -1125,6 +1128,7 @@ var TimelinePanel = React.createClass({
                     onFillRequest={ this.onMessageListFillRequest }
                     onUnfillRequest={ this.onMessageListUnfillRequest }
                     opacity={ this.props.opacity }
+                    isTwelveHour={ this.state.isTwelveHour }
                     className={ this.props.className }
                     tileShape={ this.props.tileShape }
             />
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index fd5fa81390..67a2f03590 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 'use strict';
 
-import UserSettingsStore from '../../../UserSettingsStore';
 
 var React = require('react');
 var classNames = require("classnames");
@@ -131,6 +130,9 @@ module.exports = WithMatrixClient(React.createClass({
          * for now.
          */
         tileShape: React.PropTypes.string,
+
+        // show twelve hour timestamps
+        isTwelveHour: React.PropTypes.bool,
     },
 
     getInitialState: function() {
@@ -406,12 +408,10 @@ module.exports = WithMatrixClient(React.createClass({
         var isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
         const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted;
 
-        const isTwelveHour = UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps');
-
         const classes = classNames({
             mx_EventTile: true,
             mx_EventTile_info: isInfoMessage,
-            mx_EventTile_12hr: isTwelveHour,
+            mx_EventTile_12hr: this.props.isTwelveHour,
             mx_EventTile_encrypting: this.props.eventSendStatus == 'encrypting',
             mx_EventTile_sending: isSending,
             mx_EventTile_notSent: this.props.eventSendStatus == 'not_sent',
@@ -503,7 +503,7 @@ module.exports = WithMatrixClient(React.createClass({
             e2e = <img onClick={ this.onCryptoClicked } className="mx_EventTile_e2eIcon" alt="Unencrypted message" src="img/e2e-unencrypted.svg" width="12" height="12"/>;
         }
         const timestamp = this.props.mxEvent.getTs() ?
-            <MessageTimestamp showTwelveHour={isTwelveHour} ts={this.props.mxEvent.getTs()} /> : null;
+            <MessageTimestamp showTwelveHour={this.props.isTwelveHour} ts={this.props.mxEvent.getTs()} /> : null;
 
         if (this.props.tileShape === "notif") {
             const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());

From 02a1c1868cf796f451c73e48970d628fa16b6ce7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 20 May 2017 00:07:55 +0100
Subject: [PATCH 192/312] autoFocus input box

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

diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
index 467878caad..eaa6ee34ba 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.js
@@ -93,7 +93,7 @@ export default class DirectorySearchBox extends React.Component {
                     className="mx_DirectorySearchBox_input"
                     ref={this._collectInput}
                     onChange={this._onChange} onKeyUp={this._onKeyUp}
-                    placeholder={this.props.placeholder}
+                    placeholder={this.props.placeholder} autoFocus
                 />
                 {join_button}
                 <span className="mx_DirectorySearchBox_clear_wrapper">

From 574b820d1194eef7c7291b82a93f67c7b4f3452a Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 17 May 2017 16:40:48 +0100
Subject: [PATCH 193/312] Factor out DeviceVerifyDialog

---
 .../views/dialogs/DeviceVerifyDialog.js       | 74 +++++++++++++++++++
 .../views/elements/DeviceVerifyButtons.js     | 40 +---------
 2 files changed, 78 insertions(+), 36 deletions(-)
 create mode 100644 src/components/views/dialogs/DeviceVerifyDialog.js

diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
new file mode 100644
index 0000000000..8446334afb
--- /dev/null
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -0,0 +1,74 @@
+/*
+Copyright 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations 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 MatrixClientPeg from '../../../MatrixClientPeg';
+import sdk from '../../../index';
+
+export default function DeviceVerifyDialog(props) {
+    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+
+    const body = (
+        <div>
+            <p>
+                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:
+            </p>
+            <div className="mx_UserSettings_cryptoSection">
+                <ul>
+                    <li><label>Device name:</label> <span>{ props.device.getDisplayName() }</span></li>
+                    <li><label>Device ID:</label> <span><code>{ props.device.deviceId}</code></span></li>
+                    <li><label>Device key:</label> <span><code><b>{ props.device.getFingerprint() }</b></code></span></li>
+                </ul>
+            </div>
+            <p>
+                If it matches, press the verify button below.
+                If it doesnt, then someone else is intercepting this device
+                and you probably want to press the blacklist button instead.
+            </p>
+            <p>
+                In future this verification process will be more sophisticated.
+            </p>
+        </div>
+    );
+
+    function onFinished(confirm) {
+        if (confirm) {
+            MatrixClientPeg.get().setDeviceVerified(
+                props.userId, props.device.deviceId, true,
+            );
+        }
+        props.onFinished(confirm);
+    }
+
+    return (
+        <QuestionDialog
+            title="Verify device"
+            description={body}
+            button="I verify that the keys match"
+            onFinished={onFinished}
+        />
+    );
+}
+
+DeviceVerifyDialog.propTypes = {
+    userId: React.PropTypes.string.isRequired,
+    device: React.PropTypes.object.isRequired,
+    onFinished: React.PropTypes.func.isRequired,
+};
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index fdd34e6ad2..28a36c429e 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -50,42 +50,10 @@ export default React.createClass({
     },
 
     onVerifyClick: function() {
-        var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-        Modal.createDialog(QuestionDialog, {
-            title: "Verify device",
-            description: (
-                <div>
-                    <p>
-                        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:
-                    </p>
-                    <div className="mx_UserSettings_cryptoSection">
-                        <ul>
-                            <li><label>Device name:</label> <span>{ this.state.device.getDisplayName() }</span></li>
-                            <li><label>Device ID:</label>   <span><code>{ this.state.device.deviceId}</code></span></li>
-                            <li><label>Device key:</label>  <span><code><b>{ this.state.device.getFingerprint() }</b></code></span></li>
-                        </ul>
-                    </div>
-                    <p>
-                        If it matches, press the verify button below.
-                        If it doesnt, then someone else is intercepting this device
-                        and you probably want to press the blacklist button instead.
-                    </p>
-                    <p>
-                        In future this verification process will be more sophisticated.
-                    </p>
-                </div>
-            ),
-            button: "I verify that the keys match",
-            onFinished: confirm=>{
-                if (confirm) {
-                    MatrixClientPeg.get().setDeviceVerified(
-                        this.props.userId, this.state.device.deviceId, true
-                    );
-                }
-            },
+        const DeviceVerifyDialog = sdk.getComponent('views.dialogs.DeviceVerifyDialog');
+        Modal.createDialog(DeviceVerifyDialog, {
+            userId: this.props.userId,
+            device: this.state.device,
         });
     },
 

From 3a0ee385b801b7ca6b82e68b7fd7880e886d638e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 May 2017 11:35:02 +0100
Subject: [PATCH 194/312] Released js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 72ccaad9b7..32be90e462 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.8-rc.1",
+    "matrix-js-sdk": "0.7.8",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^15.4.0",

From 545bcbdc7794d53bfdd0b06dd5ba1f1304f3e730 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 May 2017 11:36:55 +0100
Subject: [PATCH 195/312] Prepare changelog for v0.8.9

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9db62ec629..3b9ecdb325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.8.9](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.9) (2017-05-22)
+===================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.9-rc.1...v0.8.9)
+
+ * No changes
+
+
 Changes in [0.8.9-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.8.9-rc.1) (2017-05-19)
 =============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.8.8...v0.8.9-rc.1)

From eadd6192e819ee717e194e0f5adcc854e1dad78f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 May 2017 11:36:56 +0100
Subject: [PATCH 196/312] v0.8.9

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 32be90e462..059fdd390f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.8.9-rc.1",
+  "version": "0.8.9",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From fc08dc33c6ceec92b9fa861453877fbb7dd4cbc9 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 22 May 2017 12:01:09 +0100
Subject: [PATCH 197/312] Group e2e keys into blocks of 4 characters

Hopefully this will make them a bit easier to compare.
---
 src/components/structures/UserSettings.js          |  8 +++++++-
 src/components/views/dialogs/DeviceVerifyDialog.js |  4 +++-
 src/utils/FormattingUtils.js                       | 11 +++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 2c1f17ee3e..342e3983ec 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -29,6 +29,7 @@ const Email = require('../../email');
 const AddThreepid = require('../../AddThreepid');
 const SdkConfig = require('../../SdkConfig');
 import AccessibleButton from '../views/elements/AccessibleButton';
+import * as FormattingUtils from '../../utils/FormattingUtils';
 
 // if this looks like a release, use the 'version' from package.json; else use
 // the git sha. Prepend version with v, to look like riot-web version
@@ -603,7 +604,12 @@ module.exports = React.createClass({
     _renderCryptoInfo: function() {
         const client = MatrixClientPeg.get();
         const deviceId = client.deviceId;
-        const identityKey = client.getDeviceEd25519Key() || "<not supported>";
+        let identityKey = client.getDeviceEd25519Key();
+        if (!identityKey) {
+             identityKey = "<not supported>";
+        } else {
+            identityKey = FormattingUtils.formatCryptoKey(identityKey);
+        }
 
         let importExportButtons = null;
 
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index 8446334afb..f9feb718b0 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -18,10 +18,12 @@ limitations under the License.
 import React from 'react';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
+import * as FormattingUtils from '../../../utils/FormattingUtils';
 
 export default function DeviceVerifyDialog(props) {
     const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
+    const key = FormattingUtils.formatCryptoKey(props.device.getFingerprint());
     const body = (
         <div>
             <p>
@@ -34,7 +36,7 @@ export default function DeviceVerifyDialog(props) {
                 <ul>
                     <li><label>Device name:</label> <span>{ props.device.getDisplayName() }</span></li>
                     <li><label>Device ID:</label> <span><code>{ props.device.deviceId}</code></span></li>
-                    <li><label>Device key:</label> <span><code><b>{ props.device.getFingerprint() }</b></code></span></li>
+                    <li><label>Device key:</label> <span><code><b>{ key }</b></code></span></li>
                 </ul>
             </div>
             <p>
diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.js
index 414784d101..a27851951f 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.js
@@ -26,3 +26,14 @@ export function formatCount(count) {
    if (count < 100000000) return (count / 1000000).toFixed(0) + "M";
    return (count / 1000000000).toFixed(1) + "B"; // 10B is enough for anyone, right? :S
 }
+
+/**
+ * format a key into groups of 4 characters, for easier visual inspection
+ *
+ * @param {string} key key to format
+ *
+ * @return {string}
+ */
+export function formatCryptoKey(key) {
+    return key.match(/.{1,4}/g).join(" ");
+}

From 2c462bdfb4fac7ea4d48fea568e0fa4b4d04341d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 May 2017 16:27:41 +0100
Subject: [PATCH 198/312] Add right-branch logic to travis test script

---
 .travis-test-riot.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh
index c280044246..bab8242146 100755
--- a/.travis-test-riot.sh
+++ b/.travis-test-riot.sh
@@ -9,7 +9,10 @@ set -ev
 RIOT_WEB_DIR=riot-web
 REACT_SDK_DIR=`pwd`
 
-git clone --depth=1 --branch develop https://github.com/vector-im/riot-web.git \
+curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+echo "Determined branch to be $curbranch"
+
+git clone --depth=1 --branch "$curbranch" https://github.com/vector-im/riot-web.git \
     "$RIOT_WEB_DIR"
 
 cd "$RIOT_WEB_DIR"

From 77cd9d78db07a0030f00ff87b1bcc2536217df2a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 May 2017 16:34:15 +0100
Subject: [PATCH 199/312] Use develop if no matching branch found

---
 .travis-test-riot.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh
index bab8242146..ee0f45e1ec 100755
--- a/.travis-test-riot.sh
+++ b/.travis-test-riot.sh
@@ -12,9 +12,11 @@ REACT_SDK_DIR=`pwd`
 curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
 echo "Determined branch to be $curbranch"
 
-git clone --depth=1 --branch "$curbranch" https://github.com/vector-im/riot-web.git \
+git clone --depth=1 https://github.com/vector-im/riot-web.git \
     "$RIOT_WEB_DIR"
 
+git checkout "$curbranch" || git checkout develop
+
 cd "$RIOT_WEB_DIR"
 
 mkdir node_modules

From c5a873c316c0d6e5857db5513cd3ccb43d909bc9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 May 2017 16:41:43 +0100
Subject: [PATCH 200/312] Remove depth=1 otherwise we won't find the branch

---
 .travis-test-riot.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh
index ee0f45e1ec..c0cd911f08 100755
--- a/.travis-test-riot.sh
+++ b/.travis-test-riot.sh
@@ -12,7 +12,7 @@ REACT_SDK_DIR=`pwd`
 curbranch="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
 echo "Determined branch to be $curbranch"
 
-git clone --depth=1 https://github.com/vector-im/riot-web.git \
+git clone https://github.com/vector-im/riot-web.git \
     "$RIOT_WEB_DIR"
 
 git checkout "$curbranch" || git checkout develop

From 52d3dd4de90259cb1374e02b3c7dd7a0829ac390 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 22 May 2017 16:48:53 +0100
Subject: [PATCH 201/312] cd first so we checkout the right repo

---
 .travis-test-riot.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis-test-riot.sh b/.travis-test-riot.sh
index c0cd911f08..4296c72e6c 100755
--- a/.travis-test-riot.sh
+++ b/.travis-test-riot.sh
@@ -15,10 +15,10 @@ echo "Determined branch to be $curbranch"
 git clone https://github.com/vector-im/riot-web.git \
     "$RIOT_WEB_DIR"
 
-git checkout "$curbranch" || git checkout develop
-
 cd "$RIOT_WEB_DIR"
 
+git checkout "$curbranch" || git checkout develop
+
 mkdir node_modules
 npm install
 

From 024964acebd2d5c50890a15c596888750ec27534 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 May 2017 18:33:14 +0100
Subject: [PATCH 202/312] pass call state through, for things that don't have
 access to full API

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

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 5199ef0a67..6a30121992 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -179,7 +179,8 @@ function _setCallState(call, roomId, status) {
     }
     dis.dispatch({
         action: 'call_state',
-        room_id: roomId
+        room_id: roomId,
+        state: status,
     });
 }
 

From 26c8540d035017b55fcb31b1b90054f6a2077dab Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 23 May 2017 09:24:18 +0100
Subject: [PATCH 203/312] Add in a "verify" slash command to confirm signing
 keys (#912)

Allows users to send a text string via an alternative channel (like email
or SMS) which Riot can leverage to confirm that the signing keys match.

Effectively removes the tedium of checking keys until a better mechanism
is completed.

Signed-off-by: Kit Sczudlo <kit@kitscz.com>
---
 src/SlashCommands.js | 55 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 1ddcf4832d..ddba344e18 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -282,7 +282,60 @@ var commands = {
             }
         }
         return reject(this.getUsage());
-    })
+    }),
+
+    // Verify a user, device, and pubkey tuple
+    verify: new Command("verify", "<userId> <deviceId> <deviceSigningKey>", function(room_id, args) {
+        if (args) {
+            var matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
+            if (matches) {
+                const userId = matches[1];
+                const deviceId = matches[2];
+                const fingerprint = matches[3];
+
+                const device = MatrixClientPeg.get().getStoredDevice(userId, deviceId);
+                if (!device) {
+                    return reject(`Unknown (user, device) pair: (${userId}, ${deviceId})`);
+                }
+
+                if (device.isVerified()) {
+                    if (device.getFingerprint() === fingerprint) {
+                        return reject(`Device already verified!`);
+                    } else {
+                        return reject(`WARNING: Device already verified, but keys do NOT MATCH!`);
+                    }
+                }
+
+                if (device.getFingerprint() === fingerprint) {
+                    MatrixClientPeg.get().setDeviceVerified(
+                            userId, deviceId, true
+                    );
+
+                    // Tell the user we verified everything!
+                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                    Modal.createDialog(QuestionDialog, {
+                        title: "Verified key",
+                        description: (
+                            <div>
+                                <p>
+                                    The signing key you provided matches the signing key you received
+                                    from { userId }'s device { deviceId }. Device marked as verified.
+                                </p>
+                            </div>
+                        ),
+                        hasCancelButton: false,
+                    });
+
+                    return success();
+                } else {
+                    return reject(`WARNING: KEY VERIFICATION FAILED! The signing key for ${userId} and device
+                            ${deviceId} is "${device.getFingerprint()}" which does not match the provided key
+                            "${fingerprint}". This could mean your communications are being intercepted!`);
+                }
+            }
+        }
+        return reject(this.getUsage());
+    }),
 };
 
 // helpful aliases

From 5df4b9de16fd06aebf3ef89a83fd3fefeb3fca45 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 23 May 2017 09:44:11 +0100
Subject: [PATCH 204/312] Fix lint errors in SlashCommands

---
 src/SlashCommands.js | 192 ++++++++++++++++++++++---------------------
 1 file changed, 100 insertions(+), 92 deletions(-)

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index ddba344e18..bd68f1a6fe 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var MatrixClientPeg = require("./MatrixClientPeg");
-var dis = require("./dispatcher");
-var Tinter = require("./Tinter");
+import MatrixClientPeg from "./MatrixClientPeg";
+import dis from "./dispatcher";
+import Tinter from "./Tinter";
 import sdk from './index';
 import Modal from './Modal';
 
@@ -45,19 +45,25 @@ class Command {
     }
 }
 
-var reject = function(msg) {
+function reject(msg) {
     return {
-        error: msg
+        error: msg,
     };
-};
+}
 
-var success = function(promise) {
+function success(promise) {
     return {
-        promise: promise
+        promise: promise,
     };
-};
+}
 
-var commands = {
+/* Disable the "unexpected this" error for these commands - all of the run
+ * functions are called with `this` bound to the Command instance.
+ */
+
+/* eslint-disable babel/no-invalid-this */
+
+const commands = {
     ddg: new Command("ddg", "<query>", function(roomId, args) {
         const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
         // TODO Don't explain this away, actually show a search UI here.
@@ -69,30 +75,30 @@ var commands = {
     }),
 
     // Change your nickname
-    nick: new Command("nick", "<display_name>", function(room_id, args) {
+    nick: new Command("nick", "<display_name>", function(roomId, args) {
         if (args) {
             return success(
-                MatrixClientPeg.get().setDisplayName(args)
+                MatrixClientPeg.get().setDisplayName(args),
             );
         }
         return reject(this.getUsage());
     }),
 
     // Changes the colorscheme of your current room
-    tint: new Command("tint", "<color1> [<color2>]", function(room_id, args) {
+    tint: new Command("tint", "<color1> [<color2>]", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}))( +(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})))?$/);
+            const matches = args.match(/^(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6}))( +(#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})))?$/);
             if (matches) {
                 Tinter.tint(matches[1], matches[4]);
-                var colorScheme = {};
+                const colorScheme = {};
                 colorScheme.primary_color = matches[1];
                 if (matches[4]) {
                     colorScheme.secondary_color = matches[4];
                 }
                 return success(
                     MatrixClientPeg.get().setRoomAccountData(
-                        room_id, "org.matrix.room.color_scheme", colorScheme
-                    )
+                        roomId, "org.matrix.room.color_scheme", colorScheme,
+                    ),
                 );
             }
         }
@@ -100,22 +106,22 @@ var commands = {
     }),
 
     // Change the room topic
-    topic: new Command("topic", "<topic>", function(room_id, args) {
+    topic: new Command("topic", "<topic>", function(roomId, args) {
         if (args) {
             return success(
-                MatrixClientPeg.get().setRoomTopic(room_id, args)
+                MatrixClientPeg.get().setRoomTopic(roomId, args),
             );
         }
         return reject(this.getUsage());
     }),
 
     // Invite a user
-    invite: new Command("invite", "<userId>", function(room_id, args) {
+    invite: new Command("invite", "<userId>", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+)$/);
+            const matches = args.match(/^(\S+)$/);
             if (matches) {
                 return success(
-                    MatrixClientPeg.get().invite(room_id, matches[1])
+                    MatrixClientPeg.get().invite(roomId, matches[1]),
                 );
             }
         }
@@ -123,21 +129,21 @@ var commands = {
     }),
 
     // Join a room
-    join: new Command("join", "#alias:domain", function(room_id, args) {
+    join: new Command("join", "#alias:domain", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+)$/);
+            const matches = args.match(/^(\S+)$/);
             if (matches) {
-                var room_alias = matches[1];
-                if (room_alias[0] !== '#') {
+                let roomAlias = matches[1];
+                if (roomAlias[0] !== '#') {
                     return reject(this.getUsage());
                 }
-                if (!room_alias.match(/:/)) {
-                    room_alias += ':' + MatrixClientPeg.get().getDomain();
+                if (!roomAlias.match(/:/)) {
+                    roomAlias += ':' + MatrixClientPeg.get().getDomain();
                 }
 
                 dis.dispatch({
                     action: 'view_room',
-                    room_alias: room_alias,
+                    roomAlias: roomAlias,
                     auto_join: true,
                 });
 
@@ -147,29 +153,29 @@ var commands = {
         return reject(this.getUsage());
     }),
 
-    part: new Command("part", "[#alias:domain]", function(room_id, args) {
-        var targetRoomId;
+    part: new Command("part", "[#alias:domain]", function(roomId, args) {
+        let targetRoomId;
         if (args) {
-            var matches = args.match(/^(\S+)$/);
+            const matches = args.match(/^(\S+)$/);
             if (matches) {
-                var room_alias = matches[1];
-                if (room_alias[0] !== '#') {
+                let roomAlias = matches[1];
+                if (roomAlias[0] !== '#') {
                     return reject(this.getUsage());
                 }
-                if (!room_alias.match(/:/)) {
-                    room_alias += ':' + MatrixClientPeg.get().getDomain();
+                if (!roomAlias.match(/:/)) {
+                    roomAlias += ':' + MatrixClientPeg.get().getDomain();
                 }
 
                 // Try to find a room with this alias
-                var rooms = MatrixClientPeg.get().getRooms();
-                for (var i = 0; i < rooms.length; i++) {
-                    var aliasEvents = rooms[i].currentState.getStateEvents(
-                        "m.room.aliases"
+                const rooms = MatrixClientPeg.get().getRooms();
+                for (let i = 0; i < rooms.length; i++) {
+                    const aliasEvents = rooms[i].currentState.getStateEvents(
+                        "m.room.aliases",
                     );
-                    for (var j = 0; j < aliasEvents.length; j++) {
-                        var aliases = aliasEvents[j].getContent().aliases || [];
-                        for (var k = 0; k < aliases.length; k++) {
-                            if (aliases[k] === room_alias) {
+                    for (let j = 0; j < aliasEvents.length; j++) {
+                        const aliases = aliasEvents[j].getContent().aliases || [];
+                        for (let k = 0; k < aliases.length; k++) {
+                            if (aliases[k] === roomAlias) {
                                 targetRoomId = rooms[i].roomId;
                                 break;
                             }
@@ -178,27 +184,28 @@ var commands = {
                     }
                     if (targetRoomId) { break; }
                 }
-            }
-            if (!targetRoomId) {
-                return reject("Unrecognised room alias: " + room_alias);
+                if (!targetRoomId) {
+                    return reject("Unrecognised room alias: " + roomAlias);
+                }
             }
         }
-        if (!targetRoomId) targetRoomId = room_id;
+        if (!targetRoomId) targetRoomId = roomId;
         return success(
             MatrixClientPeg.get().leave(targetRoomId).then(
-            function() {
-                dis.dispatch({action: 'view_next_room'});
-            })
+                function() {
+                    dis.dispatch({action: 'view_next_room'});
+                },
+            ),
         );
     }),
 
     // Kick a user from the room with an optional reason
-    kick: new Command("kick", "<userId> [<reason>]", function(room_id, args) {
+    kick: new Command("kick", "<userId> [<reason>]", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+?)( +(.*))?$/);
+            const matches = args.match(/^(\S+?)( +(.*))?$/);
             if (matches) {
                 return success(
-                    MatrixClientPeg.get().kick(room_id, matches[1], matches[3])
+                    MatrixClientPeg.get().kick(roomId, matches[1], matches[3]),
                 );
             }
         }
@@ -206,12 +213,12 @@ var commands = {
     }),
 
     // Ban a user from the room with an optional reason
-    ban: new Command("ban", "<userId> [<reason>]", function(room_id, args) {
+    ban: new Command("ban", "<userId> [<reason>]", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+?)( +(.*))?$/);
+            const matches = args.match(/^(\S+?)( +(.*))?$/);
             if (matches) {
                 return success(
-                    MatrixClientPeg.get().ban(room_id, matches[1], matches[3])
+                    MatrixClientPeg.get().ban(roomId, matches[1], matches[3]),
                 );
             }
         }
@@ -219,13 +226,13 @@ var commands = {
     }),
 
     // Unban a user from the room
-    unban: new Command("unban", "<userId>", function(room_id, args) {
+    unban: new Command("unban", "<userId>", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+)$/);
+            const matches = args.match(/^(\S+)$/);
             if (matches) {
                 // Reset the user membership to "leave" to unban him
                 return success(
-                    MatrixClientPeg.get().unban(room_id, matches[1])
+                    MatrixClientPeg.get().unban(roomId, matches[1]),
                 );
             }
         }
@@ -233,27 +240,27 @@ var commands = {
     }),
 
     // Define the power level of a user
-    op: new Command("op", "<userId> [<power level>]", function(room_id, args) {
+    op: new Command("op", "<userId> [<power level>]", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+?)( +(\d+))?$/);
-            var powerLevel = 50; // default power level for op
+            const matches = args.match(/^(\S+?)( +(\d+))?$/);
+            let powerLevel = 50; // default power level for op
             if (matches) {
-                var user_id = matches[1];
+                const userId = matches[1];
                 if (matches.length === 4 && undefined !== matches[3]) {
                     powerLevel = parseInt(matches[3]);
                 }
-                if (powerLevel !== NaN) {
-                    var room = MatrixClientPeg.get().getRoom(room_id);
+                if (!isNaN(powerLevel)) {
+                    const room = MatrixClientPeg.get().getRoom(roomId);
                     if (!room) {
-                        return reject("Bad room ID: " + room_id);
+                        return reject("Bad room ID: " + roomId);
                     }
-                    var powerLevelEvent = room.currentState.getStateEvents(
-                        "m.room.power_levels", ""
+                    const powerLevelEvent = room.currentState.getStateEvents(
+                        "m.room.power_levels", "",
                     );
                     return success(
                         MatrixClientPeg.get().setPowerLevel(
-                            room_id, user_id, powerLevel, powerLevelEvent
-                        )
+                            roomId, userId, powerLevel, powerLevelEvent,
+                        ),
                     );
                 }
             }
@@ -262,22 +269,22 @@ var commands = {
     }),
 
     // Reset the power level of a user
-    deop: new Command("deop", "<userId>", function(room_id, args) {
+    deop: new Command("deop", "<userId>", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+)$/);
+            const matches = args.match(/^(\S+)$/);
             if (matches) {
-                var room = MatrixClientPeg.get().getRoom(room_id);
+                const room = MatrixClientPeg.get().getRoom(roomId);
                 if (!room) {
-                    return reject("Bad room ID: " + room_id);
+                    return reject("Bad room ID: " + roomId);
                 }
 
-                var powerLevelEvent = room.currentState.getStateEvents(
-                    "m.room.power_levels", ""
+                const powerLevelEvent = room.currentState.getStateEvents(
+                    "m.room.power_levels", "",
                 );
                 return success(
                     MatrixClientPeg.get().setPowerLevel(
-                        room_id, args, undefined, powerLevelEvent
-                    )
+                        roomId, args, undefined, powerLevelEvent,
+                    ),
                 );
             }
         }
@@ -285,9 +292,9 @@ var commands = {
     }),
 
     // Verify a user, device, and pubkey tuple
-    verify: new Command("verify", "<userId> <deviceId> <deviceSigningKey>", function(room_id, args) {
+    verify: new Command("verify", "<userId> <deviceId> <deviceSigningKey>", function(roomId, args) {
         if (args) {
-            var matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
+            const matches = args.match(/^(\S+) +(\S+) +(\S+)$/);
             if (matches) {
                 const userId = matches[1];
                 const deviceId = matches[2];
@@ -308,7 +315,7 @@ var commands = {
 
                 if (device.getFingerprint() === fingerprint) {
                     MatrixClientPeg.get().setDeviceVerified(
-                            userId, deviceId, true
+                        userId, deviceId, true,
                     );
 
                     // Tell the user we verified everything!
@@ -337,10 +344,12 @@ var commands = {
         return reject(this.getUsage());
     }),
 };
+/* eslint-enable babel/no-invalid-this */
+
 
 // helpful aliases
-var aliases = {
-    j: "join"
+const aliases = {
+    j: "join",
 };
 
 module.exports = {
@@ -357,13 +366,13 @@ module.exports = {
         // IRC-style commands
         input = input.replace(/\s+$/, "");
         if (input[0] === "/" && input[1] !== "/") {
-            var bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
-            var cmd, args;
+            const bits = input.match(/^(\S+?)( +((.|\n)*))?$/);
+            let cmd;
+            let args;
             if (bits) {
                 cmd = bits[1].substring(1).toLowerCase();
                 args = bits[3];
-            }
-            else {
+            } else {
                 cmd = input;
             }
             if (cmd === "me") return null;
@@ -372,8 +381,7 @@ module.exports = {
             }
             if (commands[cmd]) {
                 return commands[cmd].run(roomId, args);
-            }
-            else {
+            } else {
                 return reject("Unrecognised command: " + input);
             }
         }
@@ -382,12 +390,12 @@ module.exports = {
 
     getCommandList: function() {
         // Return all the commands plus /me and /markdown which aren't handled like normal commands
-        var cmds = Object.keys(commands).sort().map(function(cmdKey) {
+        const cmds = Object.keys(commands).sort().map(function(cmdKey) {
             return commands[cmdKey];
         });
         cmds.push(new Command("me", "<action>", function() {}));
         cmds.push(new Command("markdown", "<on|off>", function() {}));
 
         return cmds;
-    }
+    },
 };

From a10c2faac1769da708ab31b8f80a012499fba2d4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@googlemail.com>
Date: Tue, 23 May 2017 12:24:27 +0100
Subject: [PATCH 205/312] lets not open an attack vector :)

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 ca475fbf0c..2e163133fb 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -46,7 +46,7 @@ const gHVersionLabel = function(repo, token='') {
     } else {
         url = `https://github.com/${repo}/commit/${token.split('-')[0]}`;
     }
-    return <a target="_blank" href={url}>{token}</a>;
+    return <a target="_blank" rel="noopener" href={url}>{token}</a>;
 };
 
 // Enumerate some simple 'flip a bit' UI settings (if any).

From d419c42a4f32b993dcf3e2d5c674f83c41490a85 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 23 May 2017 15:16:31 +0100
Subject: [PATCH 206/312] Squash merge
 https://github.com/matrix-org/matrix-react-sdk/pull/801

---
 README.md                                     |   3 +-
 package.json                                  |   1 +
 src/AddThreepid.js                            |   7 +-
 src/CallHandler.js                            |  48 +-
 src/ContentMessages.js                        |  10 +-
 src/DateUtils.js                              |  49 +-
 src/Lifecycle.js                              |  11 +-
 src/Notifier.js                               |  10 +-
 src/PasswordReset.js                          |   7 +-
 src/Roles.js                                  |  17 +-
 src/ScalarMessaging.js                        |  33 +-
 src/SlashCommands.js                          |   8 +-
 src/TextForEvent.js                           |  95 ++-
 src/UserSettingsStore.js                      |   6 +-
 src/WhoIsTyping.js                            |  13 +-
 .../views/dialogs/EncryptedEventDialog.js     |  45 +-
 src/autocomplete/CommandProvider.js           |   6 +-
 src/autocomplete/EmojiProvider.js             |   3 +-
 src/autocomplete/RoomProvider.js              |   3 +-
 src/autocomplete/UserProvider.js              |   3 +-
 src/components/structures/CreateRoom.js       |  23 +-
 src/components/structures/FilePanel.js        |  14 +-
 src/components/structures/MatrixChat.js       |  38 +-
 .../structures/NotificationPanel.js           |   5 +-
 src/components/structures/RoomStatusBar.js    |  34 +-
 src/components/structures/RoomView.js         |  74 +-
 src/components/structures/TimelinePanel.js    |  13 +-
 src/components/structures/UserSettings.js     | 192 +++--
 .../structures/login/ForgotPassword.js        |  55 +-
 src/components/structures/login/Login.js      |  22 +-
 .../structures/login/PostRegistration.js      |  13 +-
 .../structures/login/Registration.js          |  25 +-
 .../views/dialogs/ChatInviteDialog.js         |   9 +-
 .../views/dialogs/ConfirmUserActionDialog.js  |   7 +-
 src/components/views/dialogs/ErrorDialog.js   |   3 -
 .../views/dialogs/InteractiveAuthDialog.js    |   6 -
 .../views/dialogs/NeedToRegisterDialog.js     |   7 -
 .../views/dialogs/QuestionDialog.js           |   1 -
 .../views/dialogs/TextInputDialog.js          |   4 +-
 .../views/elements/LanguageDropdown.js        | 140 ++++
 .../views/elements/MemberEventListSummary.js  | 164 +++-
 .../views/elements/PowerSelector.js           |  17 +-
 src/components/views/login/PasswordLogin.js   |  17 +-
 src/components/views/messages/MFileBody.js    |  17 +-
 .../views/room_settings/AliasSettings.js      |  27 +-
 src/components/views/rooms/EventTile.js       |   7 +-
 src/components/views/rooms/MemberInfo.js      |  62 +-
 src/components/views/rooms/MemberList.js      |   9 +-
 src/components/views/rooms/MessageComposer.js |  33 +-
 .../views/rooms/MessageComposerInput.js       |  13 +-
 .../views/rooms/MessageComposerInputOld.js    |  16 +-
 src/components/views/rooms/RoomHeader.js      |  18 +-
 src/components/views/rooms/RoomList.js        |  24 +-
 src/components/views/rooms/RoomPreviewBar.js  |  15 +-
 src/components/views/rooms/RoomSettings.js    | 112 +--
 .../views/rooms/SearchableEntityList.js       |   9 +-
 .../views/rooms/TopUnreadMessagesBar.js       |   6 +-
 .../views/settings/AddPhoneNumber.js          |  16 +-
 .../views/settings/ChangePassword.js          |  29 +-
 .../views/settings/DevicesPanelEntry.js       |   8 +-
 src/createRoom.js                             |  10 +-
 src/i18n/strings/basefile.json                |   1 +
 src/i18n/strings/da.json                      | 215 ++++++
 src/i18n/strings/de_DE.json                   | 702 +++++++++++++++++
 src/i18n/strings/en_EN.json                   | 656 ++++++++++++++++
 src/i18n/strings/fr.json                      | 170 +++++
 src/i18n/strings/ml.json                      |   2 +
 src/i18n/strings/pt.json                      | 503 +++++++++++++
 src/i18n/strings/pt_BR.json                   | 706 ++++++++++++++++++
 src/i18n/strings/ru.json                      | 476 ++++++++++++
 src/index.js                                  |   4 +-
 src/languageHandler.js                        | 166 ++++
 test/test-utils.js                            |   6 +
 73 files changed, 4660 insertions(+), 639 deletions(-)
 create mode 100644 src/components/views/elements/LanguageDropdown.js
 create mode 100644 src/i18n/strings/basefile.json
 create mode 100644 src/i18n/strings/da.json
 create mode 100644 src/i18n/strings/de_DE.json
 create mode 100644 src/i18n/strings/en_EN.json
 create mode 100644 src/i18n/strings/fr.json
 create mode 100644 src/i18n/strings/ml.json
 create mode 100644 src/i18n/strings/pt.json
 create mode 100644 src/i18n/strings/pt_BR.json
 create mode 100644 src/i18n/strings/ru.json
 create mode 100644 src/languageHandler.js

diff --git a/README.md b/README.md
index 3627225299..981a217c10 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Translationsstatus](https://translate.nordgedanken.de/widgets/riot-web/-/multi-auto.svg)](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
+
 matrix-react-sdk
 ================
 
@@ -190,4 +192,3 @@ Alternative instructions:
   * Create an index.html file pulling in your compiled javascript and the
     CSS bundle from the skin you use. For now, you'll also need to manually
     import CSS from any skins that your skin inherts from.
-
diff --git a/package.json b/package.json
index 059fdd390f..11106325f1 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "browser-request": "^0.3.3",
     "classnames": "^2.1.2",
     "commonmark": "^0.27.0",
+    "counterpart-riot": "^0.18.1",
     "draft-js": "^0.8.1",
     "draft-js-export-html": "^0.5.0",
     "draft-js-export-markdown": "^0.2.0",
diff --git a/src/AddThreepid.js b/src/AddThreepid.js
index c89de4f5fa..0503f4ff9d 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 var MatrixClientPeg = require("./MatrixClientPeg");
+import _t from 'counterpart-riot';
 
 /**
  * Allows a user to add a third party identifier to their Home Server and,
@@ -44,7 +45,7 @@ class AddThreepid {
             return res;
         }, function(err) {
             if (err.errcode == 'M_THREEPID_IN_USE') {
-                err.message = "This email address is already in use";
+                err.message = _t('This email address is already in use');
             } else if (err.httpStatus) {
                 err.message = err.message + ` (Status ${err.httpStatus})`;
             }
@@ -69,7 +70,7 @@ class AddThreepid {
             return res;
         }, function(err) {
             if (err.errcode == 'M_THREEPID_IN_USE') {
-                err.message = "This phone number is already in use";
+                err.message = _t('This phone number is already in use');
             } else if (err.httpStatus) {
                 err.message = err.message + ` (Status ${err.httpStatus})`;
             }
@@ -91,7 +92,7 @@ class AddThreepid {
             id_server: identityServerDomain
         }, this.bind).catch(function(err) {
             if (err.httpStatus === 401) {
-                err.message = "Failed to verify email address: make sure you clicked the link in the email";
+                err.message = _t('Failed to verify email address: make sure you clicked the link in the email');
             }
             else if (err.httpStatus) {
                 err.message += ` (Status ${err.httpStatus})`;
diff --git a/src/CallHandler.js b/src/CallHandler.js
index 5199ef0a67..f5283f6d49 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -55,6 +55,7 @@ var MatrixClientPeg = require('./MatrixClientPeg');
 var PlatformPeg = require("./PlatformPeg");
 var Modal = require('./Modal');
 var sdk = require('./index');
+import _t from 'counterpart-riot';
 var Matrix = require("matrix-js-sdk");
 var dis = require("./dispatcher");
 
@@ -142,8 +143,9 @@ function _setCallListeners(call) {
             play("busyAudio");
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Call Timeout",
-                description: "The remote side failed to pick up."
+                title: _t('Call Timeout'),
+                description: _t('The remote side failed to pick up') + '.',
+                button: _t("OK"),
             });
         }
         else if (oldState === "invite_sent") {
@@ -203,8 +205,9 @@ function _onAction(payload) {
                 console.log("Can't capture screen: " + screenCapErrorString);
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Unable to capture screen",
-                    description: screenCapErrorString
+                    title: _t('Unable to capture screen'),
+                    description: screenCapErrorString,
+                    button: _t("OK"),
                 });
                 return;
             }
@@ -223,8 +226,9 @@ function _onAction(payload) {
             if (module.exports.getAnyActiveCall()) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Existing Call",
-                    description: "You are already in a call."
+                    title: _t('Existing Call'),
+                    description: _t('You are already in a call') + '.',
+                    button: _t("OK"),
                 });
                 return; // don't allow >1 call to be placed.
             }
@@ -233,8 +237,9 @@ function _onAction(payload) {
             if (!MatrixClientPeg.get().supportsVoip()) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "VoIP is unsupported",
-                    description: "You cannot place VoIP calls in this browser."
+                    title: _t('VoIP is unsupported'),
+                    description: _t('You cannot place VoIP calls in this browser') + '.',
+                    button: _t("OK"),
                 });
                 return;
             }
@@ -249,7 +254,9 @@ function _onAction(payload) {
             if (members.length <= 1) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    description: "You cannot place a call with yourself."
+                    description: _t('You cannot place a call with yourself') + '.',
+                    title: _t("Error"),
+					button: _t("OK"),
                 });
                 return;
             }
@@ -275,14 +282,17 @@ function _onAction(payload) {
             if (!ConferenceHandler) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    description: "Conference calls are not supported in this client"
+                    description: _t('Conference calls are not supported in this client'),
+                    title: _t("Error"),
+					button: _t("OK"),
                 });
             }
             else if (!MatrixClientPeg.get().supportsVoip()) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "VoIP is unsupported",
-                    description: "You cannot place VoIP calls in this browser."
+                    title: _t('VoIP is unsupported'),
+                    description: _t('You cannot place VoIP calls in this browser') + '.',
+					button: _t("OK"),
                 });
             }
             else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
@@ -294,14 +304,17 @@ function _onAction(payload) {
                 // Therefore we disable conference calling in E2E rooms.
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    description: "Conference calls are not supported in encrypted rooms",
+                	title: _t("Error"),
+					button: _t("OK"),
+                    description: _t('Conference calls are not supported in encrypted rooms'),
                 });
             }
             else {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
-                    title: "Warning!",
-                    description: "Conference calling is in development and may not be reliable.",
+                    title: _t('Warning') + '!',
+                    description: _t('Conference calling is in development and may not be reliable') + '.',
+					button: _t("OK"),
                     onFinished: confirm=>{
                         if (confirm) {
                             ConferenceHandler.createNewMatrixCall(
@@ -312,8 +325,9 @@ function _onAction(payload) {
                                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                                 console.error("Conference call failed: " + err);
                                 Modal.createDialog(ErrorDialog, {
-                                    title: "Failed to set up conference call",
-                                    description: "Conference call failed. " + ((err && err.message) ? err.message : ""),
+                                    title: _t('Failed to set up conference call'),
+                                    description: _t('Conference call failed') + '. ' + ((err && err.message) ? err.message : ''),
+									button: _t("OK"),
                                 });
                             });
                         }
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 4ab982c98f..6e31a60556 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -21,6 +21,7 @@ var extend = require('./extend');
 var dis = require('./dispatcher');
 var MatrixClientPeg = require('./MatrixClientPeg');
 var sdk = require('./index');
+import _t from 'counterpart-riot';
 var Modal = require('./Modal');
 
 var encrypt = require("browser-encrypt-attachment");
@@ -347,14 +348,15 @@ class ContentMessages {
         }, function(err) {
             error = err;
             if (!upload.canceled) {
-                var desc = "The file '"+upload.fileName+"' failed to upload.";
+                var desc = _t('The file \'%(fileName)s\' failed to upload', {fileName: upload.fileName}) + '.';
                 if (err.http_status == 413) {
-                    desc = "The file '"+upload.fileName+"' exceeds this home server's size limit for uploads";
+                    desc = _t('The file \'%(fileName)s\' exceeds this home server\'s size limit for uploads', {fileName: upload.fileName});
                 }
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Upload Failed",
-                    description: desc
+                    title: _t('Upload Failed'),
+                    description: desc,
+                    button: _t("OK"),
                 });
             }
         }).finally(() => {
diff --git a/src/DateUtils.js b/src/DateUtils.js
index c58c09d4de..87b6fa690f 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -15,9 +15,36 @@ limitations under the License.
 */
 
 'use strict';
+import _t from 'counterpart-riot';
 
-var days = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-var months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+function getDaysArray() {
+    var days = [];
+    days.push(_t('Sun'));
+    days.push(_t('Mon'));
+    days.push(_t('Tue'));
+    days.push(_t('Wed'));
+    days.push(_t('Thu'));
+    days.push(_t('Fri'));
+    days.push(_t('Sat'));
+    return days;
+}
+
+function getMonthsArray() {
+    var months = [];
+    months.push(_t('Jan'));
+    months.push(_t('Feb'));
+    months.push(_t('Mar'));
+    months.push(_t('Apr'));
+    months.push(_t('May'));
+    months.push(_t('Jun'));
+    months.push(_t('Jul'));
+    months.push(_t('Aug'));
+    months.push(_t('Sep'));
+    months.push(_t('Oct'));
+    months.push(_t('Nov'));
+    months.push(_t('Dec'));
+    return months;
+}
 
 function pad(n) {
     return (n < 10 ? '0' : '') + n;
@@ -27,16 +54,22 @@ module.exports = {
     formatDate: function(date) {
         // date.toLocaleTimeString is completely system dependent.
         // just go 24h for now
+        const days = getDaysArray();
+        const months = getMonthsArray();
 
+        // TODO: use standard date localize function provided in counterpart
+        var hoursAndMinutes = pad(date.getHours()) + ':' + pad(date.getMinutes());
         var now = new Date();
         if (date.toDateString() === now.toDateString()) {
-            return pad(date.getHours()) + ':' + pad(date.getMinutes());
+            return hoursAndMinutes;
         }
         else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
-            return days[date.getDay()] + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+            // TODO: use standard date localize function provided in counterpart
+            return _t('%(weekDayName)s %(time)s', {weekDayName: days[date.getDay()], time: hoursAndMinutes});
         }
         else if (now.getFullYear() === date.getFullYear()) {
-            return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+            // TODO: use standard date localize function provided in counterpart
+            return _t('%(weekDayName)s, %(monthName)s %(day)s %(time)s', {weekDayName: days[date.getDay()], monthName: months[date.getMonth()], day: date.getDate(), time: hoursAndMinutes});
         }
         else {
             return this.formatFullDate(date);
@@ -44,11 +77,13 @@ module.exports = {
     },
 
     formatFullDate: function(date) {
-        return days[date.getDay()] + ", " + months[date.getMonth()] + " " + date.getDate() + " " + date.getFullYear() + " " + pad(date.getHours()) + ':' + pad(date.getMinutes());
+        const days = getDaysArray();
+        const months = getMonthsArray();
+        var hoursAndMinutes = pad(date.getHours()) + ':' + pad(date.getMinutes());
+        return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s', {weekDayName: days[date.getDay()], monthName: months[date.getMonth()], day: date.getDate(), fullYear: date.getFullYear(),time: hoursAndMinutes});
     },
 
     formatTime: function(date) {
         return pad(date.getHours()) + ':' + pad(date.getMinutes());
     }
 };
-
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index f34aeae0e5..56af920609 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -27,6 +27,7 @@ import DMRoomMap from './utils/DMRoomMap';
 import RtsClient from './RtsClient';
 import Modal from './Modal';
 import sdk from './index';
+import _t from 'counterpart-riot';
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
@@ -229,14 +230,16 @@ function _handleRestoreFailure(e) {
 
     let msg = e.message;
     if (msg == "OLM.BAD_LEGACY_ACCOUNT_PICKLE") {
-        msg = "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.";
+        msg = _t(
+            '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'
+        ) + '.';
 
         _clearLocalStorage();
 
         return q.reject(new Error(
-            "Unable to restore previous session: " + msg,
+            _t('Unable to restore previous session') + ': ' + msg,
         ));
     }
 
diff --git a/src/Notifier.js b/src/Notifier.js
index 6473ab4d9c..9d3e114b14 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -21,6 +21,7 @@ import TextForEvent from './TextForEvent';
 import Avatar from './Avatar';
 import dis from './dispatcher';
 import sdk from './index';
+import _t from 'counterpart-riot';
 import Modal from './Modal';
 
 /*
@@ -134,14 +135,13 @@ const Notifier = {
                 if (result !== 'granted') {
                     // The permission request was dismissed or denied
                     const description = result === 'denied'
-                        ? 'Riot does not have permission to send you notifications'
-                        + ' - please check your browser settings'
-                        : 'Riot was not given permission to send notifications'
-                        + ' - please try again';
+                        ? _t('Riot does not have permission to send you notifications - please check your browser settings')
+                        : _t('Riot was not given permission to send notifications - please try again');
                     const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
                     Modal.createDialog(ErrorDialog, {
-                        title: 'Unable to enable Notifications',
+                        title: _t('Unable to enable Notifications'),
                         description,
+                        button: _t("OK"),
                     });
                     return;
                 }
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index a03a565459..d5992e3e0a 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 var Matrix = require("matrix-js-sdk");
+import _t from 'counterpart-riot';
 
 /**
  * Allows a user to reset their password on a homeserver.
@@ -53,7 +54,7 @@ class PasswordReset {
             return res;
         }, function(err) {
             if (err.errcode == 'M_THREEPID_NOT_FOUND') {
-                 err.message = "This email address was not found";
+                 err.message = _t('This email address was not found');
             } else if (err.httpStatus) {
                 err.message = err.message + ` (Status ${err.httpStatus})`;
             }
@@ -78,10 +79,10 @@ class PasswordReset {
             }
         }, this.password).catch(function(err) {
             if (err.httpStatus === 401) {
-                err.message = "Failed to verify email address: make sure you clicked the link in the email";
+                err.message = _t('Failed to verify email address: make sure you clicked the link in the email');
             }
             else if (err.httpStatus === 404) {
-                err.message = "Your email address does not appear to be associated with a Matrix ID on this Homeserver.";
+                err.message = _t('Your email address does not appear to be associated with a Matrix ID on this Homeserver') + '.';
             }
             else if (err.httpStatus) {
                 err.message += ` (Status ${err.httpStatus})`;
diff --git a/src/Roles.js b/src/Roles.js
index cef8670aad..0c7463c48a 100644
--- a/src/Roles.js
+++ b/src/Roles.js
@@ -13,14 +13,19 @@ 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.
 */
-export const LEVEL_ROLE_MAP = {
-    undefined: 'Default',
-    0: 'User',
-    50: 'Moderator',
-    100: 'Admin',
-};
+import _t from 'counterpart-riot';
+
+export function levelRoleMap() {
+	const LEVEL_ROLE_MAP = {};
+	LEVEL_ROLE_MAP[undefined] = _t('Default');
+    LEVEL_ROLE_MAP[0] = _t('User');
+    LEVEL_ROLE_MAP[50] = _t('Moderator');
+    LEVEL_ROLE_MAP[100] = _t('Admin');
+    return LEVEL_ROLE_MAP;
+}
 
 export function textualPowerLevel(level, userDefault) {
+	const LEVEL_ROLE_MAP = this.levelRoleMap();
     if (LEVEL_ROLE_MAP[level]) {
         return LEVEL_ROLE_MAP[level] + (level !== undefined ? ` (${level})` : ` (${userDefault})`);
     } else {
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index dbb7e405df..abe39056e7 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -125,6 +125,7 @@ const SdkConfig = require('./SdkConfig');
 const MatrixClientPeg = require("./MatrixClientPeg");
 const MatrixEvent = require("matrix-js-sdk").MatrixEvent;
 const dis = require("./dispatcher");
+import _t from 'counterpart-riot';
 
 function sendResponse(event, res) {
     const data = JSON.parse(JSON.stringify(event.data));
@@ -150,7 +151,7 @@ function inviteUser(event, roomId, userId) {
     console.log(`Received request to invite ${userId} into room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, "You need to be logged in.");
+        sendError(event, _t('You need to be logged in') + '.');
         return;
     }
     const room = client.getRoom(roomId);
@@ -170,7 +171,7 @@ function inviteUser(event, roomId, userId) {
             success: true,
         });
     }, function(err) {
-        sendError(event, "You need to be able to invite users to do that.", err);
+        sendError(event, _t('You need to be able to invite users to do that') + '.', err);
     });
 }
 
@@ -181,7 +182,7 @@ function setPlumbingState(event, roomId, status) {
     console.log(`Received request to set plumbing state to status "${status}" in room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, "You need to be logged in.");
+        sendError(event, _t('You need to be logged in') + '.');
         return;
     }
     client.sendStateEvent(roomId, "m.room.plumbing", { status : status }).done(() => {
@@ -189,7 +190,7 @@ function setPlumbingState(event, roomId, status) {
             success: true,
         });
     }, (err) => {
-        sendError(event, err.message ? err.message : "Failed to send request.", err);
+        sendError(event, err.message ? err.message : _t('Failed to send request') + '.', err);
     });
 }
 
@@ -197,7 +198,7 @@ function setBotOptions(event, roomId, userId) {
     console.log(`Received request to set options for bot ${userId} in room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, "You need to be logged in.");
+        sendError(event, _t('You need to be logged in') + '.');
         return;
     }
     client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).done(() => {
@@ -205,20 +206,20 @@ function setBotOptions(event, roomId, userId) {
             success: true,
         });
     }, (err) => {
-        sendError(event, err.message ? err.message : "Failed to send request.", err);
+        sendError(event, err.message ? err.message : _t('Failed to send request') + '.', err);
     });
 }
 
 function setBotPower(event, roomId, userId, level) {
     if (!(Number.isInteger(level) && level >= 0)) {
-        sendError(event, "Power level must be positive integer.");
+        sendError(event, _t('Power level must be positive integer') + '.');
         return;
     }
 
     console.log(`Received request to set power level to ${level} for bot ${userId} in room ${roomId}.`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, "You need to be logged in.");
+        sendError(event, _t('You need to be logged in') + '.');
         return;
     }
 
@@ -235,7 +236,7 @@ function setBotPower(event, roomId, userId, level) {
                 success: true,
             });
         }, (err) => {
-            sendError(event, err.message ? err.message : "Failed to send request.", err);
+            sendError(event, err.message ? err.message : _t('Failed to send request') + '.', err);
         });
     });
 }
@@ -258,12 +259,12 @@ function botOptions(event, roomId, userId) {
 function returnStateEvent(event, roomId, eventType, stateKey) {
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, "You need to be logged in.");
+        sendError(event, _t('You need to be logged in') + '.');
         return;
     }
     const room = client.getRoom(roomId);
     if (!room) {
-        sendError(event, "This room is not recognised.");
+        sendError(event, _t('This room is not recognised') + '.');
         return;
     }
     const stateEvent = room.currentState.getStateEvents(eventType, stateKey);
@@ -313,13 +314,13 @@ const onMessage = function(event) {
     const roomId = event.data.room_id;
     const userId = event.data.user_id;
     if (!roomId) {
-        sendError(event, "Missing room_id in request");
+        sendError(event, _t('Missing room_id in request'));
         return;
     }
     let promise = Promise.resolve(currentRoomId);
     if (!currentRoomId) {
         if (!currentRoomAlias) {
-            sendError(event, "Must be viewing a room");
+            sendError(event, _t('Must be viewing a room'));
             return;
         }
         // no room ID but there is an alias, look it up.
@@ -331,7 +332,7 @@ const onMessage = function(event) {
 
     promise.then((viewingRoomId) => {
         if (roomId !== viewingRoomId) {
-            sendError(event, "Room " + roomId + " not visible");
+            sendError(event, _t('Room %(roomId)s not visible', {roomId: roomId}));
             return;
         }
 
@@ -345,7 +346,7 @@ const onMessage = function(event) {
         }
 
         if (!userId) {
-            sendError(event, "Missing user_id in request");
+            sendError(event, _t('Missing user_id in request'));
             return;
         }
         switch (event.data.action) {
@@ -370,7 +371,7 @@ const onMessage = function(event) {
         }
     }, (err) => {
         console.error(err);
-        sendError(event, "Failed to lookup current room.");
+        sendError(event, _t('Failed to lookup current room') + '.');
     });
 };
 
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index bd68f1a6fe..e2c69ad46a 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -18,6 +18,7 @@ import MatrixClientPeg from "./MatrixClientPeg";
 import dis from "./dispatcher";
 import Tinter from "./Tinter";
 import sdk from './index';
+import _t from 'counterpart-riot';
 import Modal from './Modal';
 
 
@@ -41,7 +42,7 @@ class Command {
     }
 
     getUsage() {
-        return "Usage: " + this.getCommandWithArgs();
+        return _t('Usage') + ': ' + this.getCommandWithArgs();
     }
 }
 
@@ -68,8 +69,9 @@ const commands = {
         const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
         // TODO Don't explain this away, actually show a search UI here.
         Modal.createDialog(ErrorDialog, {
-            title: "/ddg is not a command",
-            description: "To use it, just wait for autocomplete results to load and tab through them.",
+            title: _t('/ddg is not a command'),
+            description: _t('To use it, just wait for autocomplete results to load and tab through them') + '.',
+			button: _t("OK"),
         });
         return success();
     }),
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 3f200a089d..25af1e5b5d 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 var MatrixClientPeg = require("./MatrixClientPeg");
 var CallHandler = require("./CallHandler");
-
+import _t from 'counterpart-riot';
 import * as Roles from './Roles';
 
 function textForMemberEvent(ev) {
@@ -25,45 +25,42 @@ function textForMemberEvent(ev) {
     var targetName = ev.target ? ev.target.name : ev.getStateKey();
     var ConferenceHandler = CallHandler.getConferenceHandler();
     var reason = ev.getContent().reason ? (
-        " Reason: " + ev.getContent().reason
+        _t('Reason') + ': ' + ev.getContent().reason
     ) : "";
     switch (ev.getContent().membership) {
         case 'invite':
             var threePidContent = ev.getContent().third_party_invite;
             if (threePidContent) {
                 if (threePidContent.display_name) {
-                    return targetName + " accepted the invitation for " +
-                        threePidContent.display_name + ".";
+                    return _t('%(targetName)s accepted the invitation for %(displayName)s', {targetName: targetName, displayName: threePidContent.display_name}) + ".";
                 } else {
-                    return targetName + " accepted an invitation.";
+                    return _t('%(targetName)s accepted an invitation', {targetName: targetName}) + '.';
                 }
             }
             else {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return senderName + " requested a VoIP conference";
+                    return _t('%(senderName)s requested a VoIP conference', {senderName: senderName});
                 }
                 else {
-                    return senderName + " invited " + targetName + ".";
+                    return _t('%(senderName)s invited %(targetName)s', {senderName: senderName, targetName: targetName}) + '.';
                 }
             }
         case 'ban':
-            return senderName + " banned " + targetName + "." + reason;
+            return _t('%(senderName)s banned %(targetName)s', {senderName: senderName, targetName: targetName}) + '. ' + reason;
         case 'join':
             if (ev.getPrevContent() && ev.getPrevContent().membership == 'join') {
                 if (ev.getPrevContent().displayname && ev.getContent().displayname && ev.getPrevContent().displayname != ev.getContent().displayname) {
-                    return ev.getSender() + " changed their display name from " +
-                        ev.getPrevContent().displayname + " to " +
-                        ev.getContent().displayname;
+                    return _t('%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s', {senderName: ev.getSender(), oldDisplayName: ev.getPrevContent().displayname, displayName: ev.getContent().displayname});
                 } else if (!ev.getPrevContent().displayname && ev.getContent().displayname) {
-                    return ev.getSender() + " set their display name to " + ev.getContent().displayname;
+                    return _t('%(senderName)s set their display name to %(displayName)s', {senderName: ev.getSender(), displayName: ev.getContent().displayname});
                 } else if (ev.getPrevContent().displayname && !ev.getContent().displayname) {
-                    return ev.getSender() + " removed their display name (" + ev.getPrevContent().displayname + ")";
+                    return _t('%(senderName)s removed their display name (%(oldDisplayName)s)', {senderName: ev.getSender(), oldDisplayName: ev.getPrevContent().displayname});
                 } else if (ev.getPrevContent().avatar_url && !ev.getContent().avatar_url) {
-                    return senderName + " removed their profile picture";
+                    return _t('%(senderName)s removed their profile picture', {senderName: senderName});
                 } else if (ev.getPrevContent().avatar_url && ev.getContent().avatar_url && ev.getPrevContent().avatar_url != ev.getContent().avatar_url) {
-                    return senderName + " changed their profile picture";
+                    return _t('%(senderName)s changed their profile picture', {senderName: senderName});
                 } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
-                    return senderName + " set a profile picture";
+                    return _t('%(senderName)s set a profile picture', {senderName: senderName});
                 } else {
                     // suppress null rejoins
                     return '';
@@ -71,49 +68,48 @@ function textForMemberEvent(ev) {
             } else {
                 if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return "VoIP conference started";
+                    return _t('VoIP conference started');
                 }
                 else {
-                    return targetName + " joined the room.";
+                    return _t('%(targetName)s joined the room', {targetName: targetName}) + '.';
                 }
             }
         case 'leave':
             if (ev.getSender() === ev.getStateKey()) {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return "VoIP conference finished";
+                    return _t('VoIP conference finished');
                 }
                 else if (ev.getPrevContent().membership === "invite") {
-                    return targetName + " rejected the invitation.";
+                    return _t('%(targetName)s rejected the invitation', {targetName: targetName}) + '.';
                 }
                 else {
-                    return targetName + " left the room.";
+                    return _t('%(targetName)s left the room', {targetName: targetName}) + '.';
                 }
             }
             else if (ev.getPrevContent().membership === "ban") {
-                return senderName + " unbanned " + targetName + ".";
+                return _t('%(senderName)s unbanned %(targetName)s', {senderName: senderName, targetName: targetName}) + '.';
             }
             else if (ev.getPrevContent().membership === "join") {
-                return senderName + " kicked " + targetName + "." + reason;
+                return _t('%(senderName)s kicked %(targetName)s', {senderName: senderName, targetName: targetName}) + '. ' + reason;
             }
             else if (ev.getPrevContent().membership === "invite") {
-                return senderName + " withdrew " + targetName + "'s invitation." + reason;
+                return _t('%(senderName)s withdrew %(targetName)s\'s inivitation', {senderName: senderName, targetName: targetName}) + '. ' + reason;
             }
             else {
-                return targetName + " left the room.";
+                return _t('%(targetName)s left the room', {targetName: targetName}) + '.';
             }
     }
 }
 
 function textForTopicEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-
-    return senderDisplayName + ' changed the topic to "' + ev.getContent().topic + '"';
+    return _t('%(senderDisplayName)s changed the topic to "%(topic)s"', {senderDisplayName: senderDisplayName, topic: ev.getContent().topic});
 }
 
 function textForRoomNameEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
 
-    return senderDisplayName + ' changed the room name to "' + ev.getContent().name + '"';
+    return _t('%(senderDisplayName)s changed the room name to %(roomName)s', {senderDisplayName: senderDisplayName, roomName: ev.getContent().name});
 }
 
 function textForMessageEvent(ev) {
@@ -122,66 +118,65 @@ function textForMessageEvent(ev) {
     if (ev.getContent().msgtype === "m.emote") {
         message = "* " + senderDisplayName + " " + message;
     } else if (ev.getContent().msgtype === "m.image") {
-        message = senderDisplayName + " sent an image.";
+        message = _t('%(senderDisplayName)s sent an image', {senderDisplayName: senderDisplayName}) + '.';
     }
     return message;
 }
 
 function textForCallAnswerEvent(event) {
-    var senderName = event.sender ? event.sender.name : "Someone";
-    var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
-    return senderName + " answered the call." + supported;
+    var senderName = event.sender ? event.sender.name : _t('Someone');
+    var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
+    return _t('%(senderName)s answered the call', {senderName: senderName}) + '. ' + supported;
 }
 
 function textForCallHangupEvent(event) {
-    var senderName = event.sender ? event.sender.name : "Someone";
-    var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
-    return senderName + " ended the call." + supported;
+    var senderName = event.sender ? event.sender.name : _t('Someone');
+    var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
+    return _t('%(senderName)s ended the call', {senderName: senderName}) + '. ' + supported;
 }
 
 function textForCallInviteEvent(event) {
-    var senderName = event.sender ? event.sender.name : "Someone";
+    var senderName = event.sender ? event.sender.name : _t('Someone');
     // FIXME: Find a better way to determine this from the event?
     var type = "voice";
     if (event.getContent().offer && event.getContent().offer.sdp &&
             event.getContent().offer.sdp.indexOf('m=video') !== -1) {
         type = "video";
     }
-    var supported = MatrixClientPeg.get().supportsVoip() ? "" : " (not supported by this browser)";
-    return senderName + " placed a " + type + " call." + supported;
+    var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
+    return _t('%(senderName)s placed a %(callType)s call', {senderName: senderName, callType: type}) + '. ' + supported;
 }
 
 function textForThreePidInviteEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
-    return senderName + " sent an invitation to " + event.getContent().display_name +
-     " to join the room.";
+    return _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room', {senderName: senderName, targetDisplayName: event.getContent().display_name}) + ".";
 }
 
 function textForHistoryVisibilityEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
     var vis = event.getContent().history_visibility;
-    var text = senderName + " made future room history visible to ";
+    var text = _t('%(senderName)s made future room history visible to', {senderName: senderName}) + ' ';
     if (vis === "invited") {
-        text += "all room members, from the point they are invited.";
+        text += _t('all room members, from the point they are invited') + '.';
     }
     else if (vis === "joined") {
-        text += "all room members, from the point they joined.";
+        text += _t('all room members, from the point they joined') + '.';
     }
     else if (vis === "shared") {
-        text += "all room members.";
+        text += _t('all room members') + '.';
     }
     else if (vis === "world_readable") {
-        text += "anyone.";
+        text += _t('anyone') + '.';
     }
     else {
-        text += " unknown (" + vis + ")";
+        text += ' ' + _t('unknown') + ' (' + vis + ')';
     }
     return text;
 }
 
 function textForEncryptionEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
-    return senderName + " turned on end-to-end encryption (algorithm " + event.getContent().algorithm + ")";
+    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)', {senderName: senderName, algorithm: algorithm});
 }
 
 // Currently will only display a change if a user's power level is changed
@@ -211,16 +206,14 @@ function textForPowerEvent(event) {
         const to = event.getContent().users[userId];
         if (to !== from) {
             diff.push(
-                userId +
-                ' from ' + Roles.textualPowerLevel(from, userDefault) +
-                ' to ' + Roles.textualPowerLevel(to, userDefault)
+            	_t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {userId: userId, fromPowerLevel: Roles.textualPowerLevel(from, userDefault), toPowerLevel: Roles.textualPowerLevel(to, userDefault)})
             );
         }
     });
     if (!diff.length) {
         return '';
     }
-    return senderName + ' changed the power level of ' + diff.join(', ');
+    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s', {senderName: senderName, powerLevelDiffText: diff.join(", ")});
 }
 
 var handlers = {
diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index 9de291249f..fd5ccb0de3 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -23,10 +23,14 @@ import Notifier from './Notifier';
  * TODO: Make things use this. This is all WIP - see UserSettings.js for usage.
  */
 
+/*
+ * TODO: Find a way to translate the names of LABS_FEATURES. In other words, guarantee that languages were already loaded before building this array.
+ */
+
 module.exports = {
     LABS_FEATURES: [
         {
-            name: 'New Composer & Autocomplete',
+            name: "New Composer & Autocomplete",
             id: 'rich_text_editor',
             default: false,
         },
diff --git a/src/WhoIsTyping.js b/src/WhoIsTyping.js
index 4502b0ccd9..b2eef42f5a 100644
--- a/src/WhoIsTyping.js
+++ b/src/WhoIsTyping.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 var MatrixClientPeg = require("./MatrixClientPeg");
+import _t from 'counterpart-riot';
 
 module.exports = {
     usersTypingApartFromMe: function(room) {
@@ -56,18 +57,18 @@ module.exports = {
         if (whoIsTyping.length == 0) {
             return '';
         } else if (whoIsTyping.length == 1) {
-            return whoIsTyping[0].name + ' is typing';
+            return _t('%(displayName)s is typing', {displayName: whoIsTyping[0].name});
         }
         const names = whoIsTyping.map(function(m) {
             return m.name;
         });
-        if (othersCount) {
-            const other = ' other' + (othersCount > 1 ? 's' : '');
-            return names.slice(0, limit - 1).join(', ') + ' and ' +
-                othersCount + other + ' are typing';
+        if (othersCount==1) {
+            return _t('%(names)s and one other are typing', {names: names.slice(0, limit - 1).join(', ')});
+        } else if (othersCount>1) {
+        	return _t('%(names)s and %(count)s others are typing', {names: names.slice(0, limit - 1).join(', '), count: othersCount});
         } else {
             const lastPerson = names.pop();
-            return names.join(', ') + ' and ' + lastPerson + ' are typing';
+            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 ba706e0aa5..279f6bbda1 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 var React = require("react");
+import _t from 'counterpart-riot';
 var sdk = require('../../../index');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 
@@ -78,33 +79,33 @@ module.exports = React.createClass({
     _renderDeviceInfo: function() {
         var device = this.state.device;
         if (!device) {
-            return (<i>unknown device</i>);
+            return (<i>{ _t('unknown device') }</i>);
         }
 
-        var verificationStatus = (<b>NOT verified</b>);
+        var verificationStatus = (<b>{ _t('NOT verified') }</b>);
         if (device.isBlocked()) {
-            verificationStatus = (<b>Blacklisted</b>);
+            verificationStatus = (<b>{ _t('Blacklisted') }</b>);
         } else if (device.isVerified()) {
-            verificationStatus = "verified";
+            verificationStatus = _t('verified');
         }
 
         return (
             <table>
                 <tbody>
                     <tr>
-                        <td>Name</td>
+                        <td>{ _t('Name') }</td>
                         <td>{ device.getDisplayName() }</td>
                     </tr>
                     <tr>
-                        <td>Device ID</td>
+                        <td>{ _t('Device ID') }</td>
                         <td><code>{ device.deviceId }</code></td>
                     </tr>
                     <tr>
-                        <td>Verification</td>
+                        <td>{ _t('Verification') }</td>
                         <td>{ verificationStatus }</td>
                     </tr>
                     <tr>
-                        <td>Ed25519 fingerprint</td>
+                        <td>{ _t('Ed25519 fingerprint') }</td>
                         <td><code>{device.getFingerprint()}</code></td>
                     </tr>
                 </tbody>
@@ -119,32 +120,32 @@ module.exports = React.createClass({
             <table>
                 <tbody>
                     <tr>
-                        <td>User ID</td>
+                        <td>{ _t('User ID') }</td>
                         <td>{ event.getSender() }</td>
                     </tr>
                     <tr>
-                        <td>Curve25519 identity key</td>
-                        <td><code>{ event.getSenderKey() || <i>none</i> }</code></td>
+                        <td>{ _t('Curve25519 identity key') }</td>
+                        <td><code>{ event.getSenderKey() || <i>{ _t('none') }</i> }</code></td>
                     </tr>
                     <tr>
-                        <td>Claimed Ed25519 fingerprint key</td>
-                        <td><code>{ event.getKeysClaimed().ed25519 || <i>none</i> }</code></td>
+                        <td>{ _t('Claimed Ed25519 fingerprint key') }</td>
+                        <td><code>{ event.getKeysClaimed().ed25519 || <i>{ _t('none') }</i> }</code></td>
                     </tr>
                     <tr>
-                        <td>Algorithm</td>
-                        <td>{ event.getWireContent().algorithm || <i>unencrypted</i> }</td>
+                        <td>{ _t('Algorithm') }</td>
+                        <td>{ event.getWireContent().algorithm || <i>{ _t('unencrypted') }</i> }</td>
                     </tr>
                 {
                     event.getContent().msgtype === 'm.bad.encrypted' ? (
                     <tr>
-                        <td>Decryption error</td>
+                        <td>{ _t('Decryption error') }</td>
                         <td>{ event.getContent().body }</td>
                     </tr>
                     ) : null
                 }
                     <tr>
-                        <td>Session ID</td>
-                        <td><code>{ event.getWireContent().session_id || <i>none</i> }</code></td>
+                        <td>{ _t('Session ID') }</td>
+                        <td><code>{ event.getWireContent().session_id || <i>{ _t('none') }</i> }</code></td>
                     </tr>
                 </tbody>
             </table>
@@ -166,18 +167,18 @@ module.exports = React.createClass({
         return (
             <div className="mx_EncryptedEventDialog" onKeyDown={ this.onKeyDown }>
                 <div className="mx_Dialog_title">
-                    End-to-end encryption information
+                    { _t('End-to-end encryption information') }
                 </div>
                 <div className="mx_Dialog_content">
-                    <h4>Event information</h4>
+                    <h4>{ _t('Event information') }</h4>
                     {this._renderEventInfo()}
 
-                    <h4>Sender device information</h4>
+                    <h4>{ _t('Sender device information') }</h4>
                     {this._renderDeviceInfo()}
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button className="mx_Dialog_primary" onClick={ this.props.onFinished } autoFocus={ true }>
-                        OK
+                        { _t('OK') }
                     </button>
                     {buttons}
                 </div>
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 60171bc72f..d72c8d1c07 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -1,8 +1,10 @@
 import React from 'react';
+import _t from 'counterpart-riot';
 import AutocompleteProvider from './AutocompleteProvider';
 import Fuse from 'fuse.js';
 import {TextualCompletion} from './Components';
 
+// Warning: Since the description string will be translated in _t(result.description), all these strings below must be in i18n/strings/en_EN.json file
 const COMMANDS = [
     {
         command: '/me',
@@ -68,7 +70,7 @@ export default class CommandProvider extends AutocompleteProvider {
                     component: (<TextualCompletion
                         title={result.command}
                         subtitle={result.args}
-                        description={result.description}
+                        description={ t_(result.description) }
                         />),
                     range,
                 };
@@ -78,7 +80,7 @@ export default class CommandProvider extends AutocompleteProvider {
     }
 
     getName() {
-        return '*️⃣ Commands';
+        return '*️⃣ ' + _t('Commands');
     }
 
     static getInstance(): CommandProvider {
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index d488ac53ae..d0675e9ffc 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import _t from 'counterpart-riot';
 import AutocompleteProvider from './AutocompleteProvider';
 import {emojioneList, shortnameToImage, shortnameToUnicode} from 'emojione';
 import Fuse from 'fuse.js';
@@ -39,7 +40,7 @@ export default class EmojiProvider extends AutocompleteProvider {
     }
 
     getName() {
-        return '😃 Emoji';
+        return '😃 ' + _t('Emoji');
     }
 
     static getInstance() {
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 8d1e555e56..175aaf2691 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import _t from 'counterpart-riot';
 import AutocompleteProvider from './AutocompleteProvider';
 import MatrixClientPeg from '../MatrixClientPeg';
 import Fuse from 'fuse.js';
@@ -50,7 +51,7 @@ export default class RoomProvider extends AutocompleteProvider {
     }
 
     getName() {
-        return '💬 Rooms';
+        return '💬 ' + _t('Rooms');
     }
 
     static getInstance() {
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 4d40fbdf94..c2fccbc418 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import _t from 'counterpart-riot';
 import AutocompleteProvider from './AutocompleteProvider';
 import Q from 'q';
 import Fuse from 'fuse.js';
@@ -51,7 +52,7 @@ export default class UserProvider extends AutocompleteProvider {
     }
 
     getName() {
-        return '👥 Users';
+        return '👥 ' + _t('Users');
     }
 
     setUserList(users) {
diff --git a/src/components/structures/CreateRoom.js b/src/components/structures/CreateRoom.js
index 24ebfea07f..48ce4e274e 100644
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@@ -16,15 +16,16 @@ limitations under the License.
 
 'use strict';
 
-var React = require("react");
-var MatrixClientPeg = require("../../MatrixClientPeg");
-var PresetValues = {
+import React from 'react';
+import q from 'q';
+import _t from 'counterpart-riot';
+import sdk from '../../index';
+import MatrixClientPeg from '../../MatrixClientPeg';
+const PresetValues = {
     PrivateChat: "private_chat",
     PublicChat: "public_chat",
     Custom: "custom",
 };
-var q = require('q');
-var sdk = require('../../index');
 
 module.exports = React.createClass({
     displayName: 'CreateRoom',
@@ -231,7 +232,7 @@ module.exports = React.createClass({
             if (curr_phase == this.phases.ERROR) {
                 error_box = (
                     <div className="mx_Error">
-                        An error occured: {this.state.error_string}
+                        {_t('An error occured: %(error_string)s', {error_string: this.state.error_string})}
                     </div>
                 );
             }
@@ -248,27 +249,27 @@ module.exports = React.createClass({
             <div className="mx_CreateRoom">
                 <SimpleRoomHeader title="CreateRoom" collapsedRhs={ this.props.collapsedRhs }/>
                 <div className="mx_CreateRoom_body">
-                    <input type="text" ref="room_name" value={this.state.room_name} onChange={this.onNameChange} placeholder="Name"/> <br />
-                    <textarea className="mx_CreateRoom_description" ref="topic" value={this.state.topic} onChange={this.onTopicChange} placeholder="Topic"/> <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}/>
-                            Make this room private
+                            {_t('Make this room private')}
                         </label>
                     </div>
                     <div>
                         <label>
                             <input type="checkbox" ref="share_history" checked={this.state.share_history} onChange={this.onShareHistoryChanged}/>
-                            Share message history with new users
+                            {_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}/>
-                            Encrypt room
+                            {_t('Encrypt room')}
                         </label>
                     </div>
                     <div>
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index d83b6b5564..ea048df97e 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.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");
+import React from 'react';
+import ReactDOM from 'react-dom';
 
-var Matrix = require("matrix-js-sdk");
-var sdk = require('../../index');
-var MatrixClientPeg = require("../../MatrixClientPeg");
-var dis = require("../../dispatcher");
+import Matrix from 'matrix-js-sdk';
+import sdk from '../../index';
+import MatrixClientPeg from '../../MatrixClientPeg';
+import dis from '../../dispatcher';
 
 /*
  * Component which shows the filtered file using a TimelinePanel
@@ -116,7 +116,7 @@ var FilePanel = React.createClass({
                     showUrlPreview = { false }
                     tileShape="file_grid"
                     opacity={ this.props.opacity }
-                    empty="There are no visible files in this room"
+                    empty={_t('There are no visible files in this room')}
                 />
             );
         }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 0de38ab226..c8cb721041 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -36,6 +36,7 @@ import PageTypes from '../../PageTypes';
 
 import createRoom from "../../createRoom";
 import * as UDEHandler from '../../UnknownDeviceErrorHandler';
+import _t from 'counterpart-riot';
 
 module.exports = React.createClass({
     displayName: 'MatrixChat',
@@ -375,8 +376,9 @@ module.exports = React.createClass({
                 break;
             case 'reject_invite':
                 Modal.createDialog(QuestionDialog, {
-                    title: "Reject invitation",
-                    description: "Are you sure you want to reject the invitation?",
+                    title: _t('Reject invitation'),
+                    description: _t('Are you sure you want to reject the invitation?'),
+                    button: "OK",
                     onFinished: (confirm) => {
                         if (confirm) {
                             // FIXME: controller shouldn't be loading a view :(
@@ -391,8 +393,9 @@ module.exports = React.createClass({
                             }, (err) => {
                                 modal.close();
                                 Modal.createDialog(ErrorDialog, {
-                                    title: "Failed to reject invitation",
+                                    title:  _t('Failed to reject invitation'),
                                     description: err.toString(),
+                                    button: _t("OK"),
                                 });
                             });
                         }
@@ -437,11 +440,11 @@ module.exports = React.createClass({
                 //this._setPage(PageTypes.CreateRoom);
                 //this.notifyNewScreen('new');
                 Modal.createDialog(TextInputDialog, {
-                    title: "Create Room",
-                    description: "Room name (optional)",
-                    button: "Create Room",
-                    onFinished: (shouldCreate, name) => {
-                        if (shouldCreate) {
+                    title: _t('Create Room'),
+                    description: _t('Room name (optional)'),
+                    button: _t('Create Room'),
+                    onFinished: (should_create, name) => {
+                        if (should_create) {
                             const createOpts = {};
                             if (name) createOpts.name = name;
                             createRoom({createOpts}).done();
@@ -653,16 +656,20 @@ module.exports = React.createClass({
     _createChat: function() {
         const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
         Modal.createDialog(ChatInviteDialog, {
-            title: "Start a new chat",
+            title: _t('Start a chat'),
+            description: _t("Who would you like to communicate with?"),
+            placeholder: _t("Email, name or matrix ID"),
+            button: _t("Start Chat")
         });
     },
 
     _invite: function(roomId) {
         const ChatInviteDialog = sdk.getComponent("dialogs.ChatInviteDialog");
         Modal.createDialog(ChatInviteDialog, {
-            title: "Invite new room members",
-            button: "Send Invites",
-            description: "Who would you like to add to this room?",
+            title: _t('Invite new room members'),
+            description: _t('Who would you like to add to this room?'),
+            button: _t('Send Invites'),
+            placeholder: _t("Email, name or matrix ID"),
             roomId: roomId,
         });
     },
@@ -886,8 +893,9 @@ module.exports = React.createClass({
         cli.on('Session.logged_out', function(call) {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Signed Out",
-                description: "For security, this session has been signed out. Please sign in again.",
+                title: _t('Signed Out'),
+                description: _t('For security, this session has been signed out. Please sign in again.'),
+                button: _t("OK"),
             });
             dis.dispatch({
                 action: 'logout',
@@ -1199,7 +1207,7 @@ module.exports = React.createClass({
                 <div className="mx_MatrixChat_splash">
                     <Spinner />
                     <a href="#" className="mx_MatrixChat_splashButtons" onClick={ this.onLogoutClick }>
-                    Logout
+                    { _t('Logout') }
                     </a>
                 </div>
             );
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index 16f9723c76..214bb79862 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 var React = require('react');
 var ReactDOM = require("react-dom");
-
+import _t from 'counterpart-riot';
 var Matrix = require("matrix-js-sdk");
 var sdk = require('../../index');
 var MatrixClientPeg = require("../../MatrixClientPeg");
@@ -37,7 +37,6 @@ var NotificationPanel = React.createClass({
         var Loader = sdk.getComponent("elements.Spinner");
 
         var timelineSet = MatrixClientPeg.get().getNotifTimelineSet();
-
         if (timelineSet) {
             return (
                 <TimelinePanel key={"NotificationPanel_" + this.props.roomId}
@@ -48,7 +47,7 @@ var NotificationPanel = React.createClass({
                     showUrlPreview = { false }
                     opacity={ this.props.opacity }
                     tileShape="notif"
-                    empty="You have no visible notifications"
+                    empty={ _t('You have no visible notifications') }
                 />
             );
         }
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 0389b606aa..8e1fe971a4 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -14,12 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var React = require('react');
-var sdk = require('../../index');
-var dis = require("../../dispatcher");
-var WhoIsTyping = require("../../WhoIsTyping");
-var MatrixClientPeg = require("../../MatrixClientPeg");
-const MemberAvatar = require("../views/avatars/MemberAvatar");
+import React from 'react';
+import _t from 'counterpart-riot';
+import sdk from '../../index';
+import dis from '../../dispatcher';
+import WhoIsTyping from '../../WhoIsTyping';
+import MatrixClientPeg from '../../MatrixClientPeg';
+import MemberAvatar from '../views/avatars/MemberAvatar';
 
 const HIDE_DEBOUNCE_MS = 10000;
 const STATUS_BAR_HIDDEN = 0;
@@ -175,8 +176,8 @@ module.exports = React.createClass({
                 <div className="mx_RoomStatusBar_scrollDownIndicator"
                         onClick={ this.props.onScrollToBottomClick }>
                     <img src="img/scrolldown.svg" width="24" height="24"
-                        alt="Scroll to bottom of page"
-                        title="Scroll to bottom of page"/>
+                        alt={ _t("Scroll to bottom of page") }
+                        title={ _t("Scroll to bottom of page") }/>
                 </div>
             );
         }
@@ -250,10 +251,10 @@ module.exports = React.createClass({
                 <div className="mx_RoomStatusBar_connectionLostBar">
                     <img src="img/warning.svg" width="24" height="23" title="/!\ " alt="/!\ "/>
                     <div className="mx_RoomStatusBar_connectionLostBar_title">
-                        Connectivity to the server has been lost.
+                        {_t('Connectivity to the server has been lost.')}
                     </div>
                     <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                        Sent messages will be stored until your connection has returned.
+                        {_t('Sent messages will be stored until your connection has returned.')}
                     </div>
                 </div>
             );
@@ -266,7 +267,7 @@ module.exports = React.createClass({
                         <TabCompleteBar tabComplete={this.props.tabComplete} />
                         <div className="mx_RoomStatusBar_tabCompleteEol" title="->|">
                             <TintableSvg src="img/eol.svg" width="22" height="16"/>
-                            Auto-complete
+                            {_t('Auto-complete')}
                         </div>
                     </div>
                 </div>
@@ -283,13 +284,12 @@ module.exports = React.createClass({
                     <div className="mx_RoomStatusBar_connectionLostBar_desc">
                         <a className="mx_RoomStatusBar_resend_link"
                           onClick={ this.props.onResendAllClick }>
-                            Resend all
-                        </a> or <a
+                            {_t('Resend all')}
+                        </a> {_t('or')} <a
                           className="mx_RoomStatusBar_resend_link"
                           onClick={ this.props.onCancelAllClick }>
-                            cancel all
-                        </a> now. You can also select individual messages to
-                        resend or cancel.
+                            {_t('cancel all')}
+                        </a> {_t('now. You can also select individual messages to resend or cancel.')}
                     </div>
                 </div>
             );
@@ -324,7 +324,7 @@ module.exports = React.createClass({
         if (this.props.hasActiveCall) {
             return (
                 <div className="mx_RoomStatusBar_callBar">
-                    <b>Active call</b>
+                    <b>{_t('Active call')}</b>
                 </div>
             );
         }
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index af0c595ea9..2b7e7acc3d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -25,6 +25,7 @@ var ReactDOM = require("react-dom");
 var q = require("q");
 var classNames = require("classnames");
 var Matrix = require("matrix-js-sdk");
+import _t from 'counterpart-riot';
 
 var UserSettingsStore = require('../../UserSettingsStore');
 var MatrixClientPeg = require("../../MatrixClientPeg");
@@ -296,7 +297,7 @@ module.exports = React.createClass({
 
     componentWillReceiveProps: function(newProps) {
         if (newProps.roomAddress != this.props.roomAddress) {
-            throw new Error("changing room on a RoomView is not supported");
+            throw new Error(_t("changing room on a RoomView is not supported"));
         }
 
         if (newProps.eventId != this.props.eventId) {
@@ -370,10 +371,10 @@ module.exports = React.createClass({
     onPageUnload(event) {
         if (ContentMessages.getCurrentUploads().length > 0) {
             return event.returnValue =
-                'You seem to be uploading files, are you sure you want to quit?';
+                _t("You seem to be uploading files, are you sure you want to quit?");
         } else if (this._getCallForRoom() && this.state.callState !== 'ended') {
             return event.returnValue =
-                'You seem to be in a call, are you sure you want to quit?';
+                _t("You seem to be in a call, are you sure you want to quit?");
         }
     },
 
@@ -530,16 +531,17 @@ module.exports = React.createClass({
         if (!userHasUsedEncryption) {
             const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
             Modal.createDialog(QuestionDialog, {
-                title: "Warning!",
+                title: _t("Warning") + "!",
                 hasCancelButton: false,
                 description: (
                     <div>
-                        <p>End-to-end encryption is in beta and may not be reliable.</p>
-                        <p>You should <b>not</b> yet trust it to secure data.</p>
-                        <p>Devices will <b>not</b> yet be able to decrypt history from before they joined the room.</p>
-                        <p>Encrypted messages will not be visible on clients that do not yet implement encryption.</p>
+                        <p>{ _t("End-to-end encryption is in beta and may not be reliable") }.</p>
+                        <p>{ _t("You should <b>not</b> yet trust it to secure data") }.</p>
+                        <p>{ _t("Devices will <b>not</b> yet be able to decrypt history from before they joined the room") }.</p>
+                        <p>{ _t("Encrypted messages will not be visible on clients that do not yet implement encryption") }.</p>
                     </div>
                 ),
+                button: "OK",
             });
         }
         if (localStorage) {
@@ -708,10 +710,10 @@ module.exports = React.createClass({
         if (!unsentMessages.length) return "";
         for (const event of unsentMessages) {
             if (!event.error || event.error.name !== "UnknownDeviceError") {
-                return "Some of your messages have not been sent.";
+                return _t("Some of your messages have not been sent") + ".";
             }
         }
-        return "Message not sent due to unknown devices being present";
+        return _t("Message not sent due to unknown devices being present");
     },
 
     _getUnsentMessages: function(room) {
@@ -871,15 +873,16 @@ module.exports = React.createClass({
             ) {
                 var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                 Modal.createDialog(NeedToRegisterDialog, {
-                    title: "Failed to join the room",
-                    description: "This room is private or inaccessible to guests. You may be able to join if you register."
+                    title: _t("Failed to join the room"),
+                    description: _t("This room is private or inaccessible to guests. You may be able to join if you register") + "."
                 });
             } else {
                 var msg = error.message ? error.message : JSON.stringify(error);
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Failed to join room",
-                    description: msg
+                    title: _t("Failed to join room"),
+                    description: msg,
+                    button: _t("OK"),
                 });
             }
         }).done();
@@ -939,8 +942,8 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get().isGuest()) {
             var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
-                title: "Please Register",
-                description: "Guest users can't upload files. Please register to upload."
+                title: _t("Please Register"),
+                description: _t("Guest users can't upload files. Please register to upload") + "."
             });
             return;
         }
@@ -959,8 +962,9 @@ module.exports = React.createClass({
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to upload file " + file + " " + error);
             Modal.createDialog(ErrorDialog, {
-                title: "Failed to upload file",
-                description: ((error && error.message) ? error.message : "Server may be unavailable, overloaded, or the file too big"),
+                title: _t('Failed to upload file'),
+                description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or the file too big")),
+                button: _t("OK"),
             });
         });
     },
@@ -1046,8 +1050,9 @@ module.exports = React.createClass({
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Search failed: " + error);
             Modal.createDialog(ErrorDialog, {
-                title: "Search failed",
-                description: ((error && error.message) ? error.message : "Server may be unavailable, overloaded, or search timed out :("),
+                title: _t("Search failed"),
+                description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or search timed out :(")),
+                button: _t("OK"),
             });
         }).finally(function() {
             self.setState({
@@ -1082,12 +1087,12 @@ module.exports = React.createClass({
         if (!this.state.searchResults.next_batch) {
             if (this.state.searchResults.results.length == 0) {
                 ret.push(<li key="search-top-marker">
-                         <h2 className="mx_RoomView_topMarker">No results</h2>
+                         <h2 className="mx_RoomView_topMarker">{ _t("No results") }</h2>
                          </li>
                         );
             } else {
                 ret.push(<li key="search-top-marker">
-                         <h2 className="mx_RoomView_topMarker">No more results</h2>
+                         <h2 className="mx_RoomView_topMarker">{ _t("No more results") }</h2>
                          </li>
                         );
             }
@@ -1124,10 +1129,10 @@ module.exports = React.createClass({
                     // 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 : "Unknown room "+roomId;
+                    var roomName = room ? room.name : _t("Unknown room %(roomId)s", { roomId: roomId });
 
                     ret.push(<li key={mxEv.getId() + "-room"}>
-                                 <h1>Room: { roomName }</h1>
+                                 <h1>{ _t("Room") }: { roomName }</h1>
                              </li>);
                     lastRoomId = roomId;
                 }
@@ -1173,8 +1178,9 @@ module.exports = React.createClass({
                 });
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Failed to save settings",
+                    title: _t("Failed to save settings"),
                     description: fails.map(function(result) { return result.reason; }).join("\n"),
+                    button: _t("OK"),
                 });
                 // still editing room settings
             }
@@ -1209,11 +1215,12 @@ 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 || "unknown error code";
+            var errCode = err.errcode || _t("unknown error code");
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Error",
-                description: `Failed to forget room (${errCode})`
+                title: _t("Error"),
+                description: _t("Failed to forget room %(errCode)s", { errCode: errCode }),
+                button: _t("OK"),
             });
         });
     },
@@ -1234,8 +1241,9 @@ module.exports = React.createClass({
             var msg = error.message ? error.message : JSON.stringify(error);
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Failed to reject invite",
-                description: msg
+                title: _t("Failed to reject invite"),
+                description: msg,
+                button: _t("OK"),
             });
 
             self.setState({
@@ -1681,7 +1689,7 @@ module.exports = React.createClass({
 
             if (call.type === "video") {
                 zoomButton = (
-                    <div className="mx_RoomView_voipButton" onClick={this.onFullscreenClick} title="Fill screen">
+                    <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>
                 );
@@ -1689,14 +1697,14 @@ module.exports = React.createClass({
                 videoMuteButton =
                     <div className="mx_RoomView_voipButton" onClick={this.onMuteVideoClick}>
                         <TintableSvg src={call.isLocalVideoMuted() ? "img/video-unmute.svg" : "img/video-mute.svg"}
-                             alt={call.isLocalVideoMuted() ? "Click to unmute video" : "Click to mute video"}
+                             alt={call.isLocalVideoMuted() ? _t("Click to unmute video") : _t("Click to mute video")}
                              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() ? "Click to unmute audio" : "Click to mute audio"}
+                         alt={call.isMicrophoneMuted() ? _t("Click to unmute audio") : _t("Click to mute audio")}
                          width="21" height="26"/>
                 </div>;
 
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 8794713501..8b180077e0 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -23,6 +23,7 @@ var Matrix = require("matrix-js-sdk");
 var EventTimeline = Matrix.EventTimeline;
 
 var sdk = require('../../index');
+import _t from 'counterpart-riot';
 var MatrixClientPeg = require("../../MatrixClientPeg");
 var dis = require("../../dispatcher");
 var ObjectUtils = require('../../ObjectUtils');
@@ -907,15 +908,13 @@ var TimelinePanel = React.createClass({
                     });
                 };
             }
-            var message = "Tried to load a specific point in this room's timeline, but ";
-            if (error.errcode == 'M_FORBIDDEN') {
-                message += "you do not have permission to view the message in question.";
-            } else {
-                message += "was unable to find it.";
-            }
+            var 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.createDialog(ErrorDialog, {
-                title: "Failed to load timeline position",
+                title: _t("Failed to load timeline position"),
                 description: message,
+                button: _t("OK"),
                 onFinished: onFinished,
             });
         };
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 2d76047d33..ff3d2e774c 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -29,6 +29,8 @@ const Email = require('../../email');
 const AddThreepid = require('../../AddThreepid');
 const SdkConfig = require('../../SdkConfig');
 import AccessibleButton from '../views/elements/AccessibleButton';
+import _t from 'counterpart-riot';
+const languageHandler = require('../../languageHandler');
 import * as FormattingUtils from '../../utils/FormattingUtils';
 
 // if this looks like a release, use the 'version' from package.json; else use
@@ -53,6 +55,8 @@ const gHVersionLabel = function(repo, token='') {
 // Enumerate some simple 'flip a bit' UI settings (if any).
 // 'id' gives the key name in the im.vector.web.settings account data event
 // 'label' is how we describe it in the UI.
+// Warning: Each "label" string below must be added to i18n/strings/en_EN.json, 
+// since they will be translated when rendered.
 const SETTINGS_LABELS = [
     {
         id: 'autoplayGifsAndVideos',
@@ -86,6 +90,8 @@ const SETTINGS_LABELS = [
 */
 ];
 
+// Warning: Each "label" string below must be added to i18n/strings/en_EN.json, 
+// since they will be translated when rendered.
 const CRYPTO_SETTINGS_LABELS = [
     {
         id: 'blacklistUnverifiedDevices',
@@ -119,7 +125,6 @@ const THEMES = [
     },
 ];
 
-
 module.exports = React.createClass({
     displayName: 'UserSettings',
 
@@ -197,6 +202,16 @@ module.exports = React.createClass({
         this._syncedSettings = syncedSettings;
 
         this._localSettings = UserSettingsStore.getLocalSettings();
+        if (!this._localSettings.hasOwnProperty('language')) {
+            const language = languageHandler.normalizeLanguageKey(languageHandler.getLanguageFromBrowser());
+            this.setState({
+                Language: language
+            });
+        } else {
+            this.setState({
+                Language: this._localSettings.language
+            });
+        }
     },
 
     componentDidMount: function() {
@@ -232,8 +247,9 @@ module.exports = React.createClass({
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to load user settings: " + error);
             Modal.createDialog(ErrorDialog, {
-                title: "Can't load user settings",
-                description: ((error && error.message) ? error.message : "Server may be unavailable or overloaded"),
+                title: _t("Can't load user settings"),
+                description: ((error && error.message) ? error.message : _t("Server may be unavailable or overloaded")),
+                button: _t("OK"),
             });
         });
     },
@@ -248,8 +264,8 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get().isGuest()) {
             const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
-                title: "Please Register",
-                description: "Guests can't set avatars. Please register.",
+                title: _t("Please Register"),
+                description: _t("Guests can't set avatars. Please register") + ".",
             });
             return;
         }
@@ -274,8 +290,9 @@ module.exports = React.createClass({
             console.error("Failed to set avatar: " + err);
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Failed to set avatar",
-                description: ((err && err.message) ? err.message : "Operation failed"),
+                title: _t("Failed to set avatar"),
+                description: ((err && err.message) ? err.message : _t("Operation failed")),
+                button: _t("OK")
             });
         });
     },
@@ -283,19 +300,16 @@ module.exports = React.createClass({
     onLogoutClicked: function(ev) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
-            title: "Sign out?",
+            title: _t("Sign out") + "?",
             description:
                 <div>
-                    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.
+             { _t("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") }.
                 </div>,
-            button: "Sign out",
+            button: _t("Sign out"),
             extraButtons: [
                 <button key="export" className="mx_Dialog_primary"
                         onClick={this._onExportE2eKeysClicked}>
-                    Export E2E room keys
+                   { _t("Export E2E room keys") }
                 </button>,
             ],
             onFinished: (confirmed) => {
@@ -312,25 +326,25 @@ module.exports = React.createClass({
     onPasswordChangeError: function(err) {
         let errMsg = err.error || "";
         if (err.httpStatus === 403) {
-            errMsg = "Failed to change password. Is your password correct?";
+            errMsg = _t("Failed to change password. Is your password correct?");
         } else if (err.httpStatus) {
             errMsg += ` (HTTP status ${err.httpStatus})`;
         }
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         console.error("Failed to change password: " + errMsg);
         Modal.createDialog(ErrorDialog, {
-            title: "Error",
+            title: _t("Error"),
             description: errMsg,
+            button: _t("OK"),
         });
     },
 
     onPasswordChanged: function() {
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createDialog(ErrorDialog, {
-            title: "Success",
-            description: `Your password was successfully changed. You will not
-                          receive push notifications on other devices until you
-                          log back in to them.`,
+            title: _t("Success"),
+            description: _t("Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them") + ".",
+            button: _t("OK"),
         });
     },
 
@@ -356,8 +370,9 @@ module.exports = React.createClass({
         const emailAddress = this.refs.add_email_input.value;
         if (!Email.looksValid(emailAddress)) {
             Modal.createDialog(ErrorDialog, {
-                title: "Invalid Email Address",
-                description: "This doesn't appear to be a valid email address",
+                title: _t("Invalid Email Address"),
+                description: _t("This doesn't appear to be a valid email address"),
+                button: _t("OK"),
             });
             return;
         }
@@ -366,17 +381,18 @@ module.exports = React.createClass({
         // same here.
         this._addThreepid.addEmailAddress(emailAddress, true).done(() => {
             Modal.createDialog(QuestionDialog, {
-                title: "Verification Pending",
-                description: "Please check your email and click on the link it contains. Once this is done, click continue.",
-                button: 'Continue',
+                title: _t("Verification Pending"),
+                description: _t("Please check your email and click on the link it contains. Once this is done, click continue."),
+                button: _t('Continue'),
                 onFinished: this.onEmailDialogFinished,
             });
         }, (err) => {
             this.setState({email_add_pending: false});
             console.error("Unable to add email address " + emailAddress + " " + err);
             Modal.createDialog(ErrorDialog, {
-                title: "Unable to add email address",
-                description: ((err && err.message) ? err.message : "Operation failed"),
+                title: _t("Unable to add email address"),
+                description: ((err && err.message) ? err.message : _t("Operation failed")),
+                button: _t("OK"),
             });
         });
         ReactDOM.findDOMNode(this.refs.add_email_input).blur();
@@ -386,9 +402,9 @@ module.exports = React.createClass({
     onRemoveThreepidClicked: function(threepid) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
-            title: "Remove Contact Information?",
-            description: "Remove " + threepid.address + "?",
-            button: 'Remove',
+            title: _t("Remove Contact Information?"),
+            description: _t("Remove ") + threepid.address + "?",
+            button: _t('Remove'),
             onFinished: (submit) => {
                 if (submit) {
                     this.setState({
@@ -400,8 +416,9 @@ module.exports = React.createClass({
                         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         console.error("Unable to remove contact information: " + err);
                         Modal.createDialog(ErrorDialog, {
-                            title: "Unable to remove contact information",
-                            description: ((err && err.message) ? err.message : "Operation failed"),
+                            title: _t("Unable to remove contact information"),
+                            description: ((err && err.message) ? err.message : _t("Operation failed")),
+                            button: _t("OK"),
                         });
                     }).done();
                 }
@@ -427,22 +444,23 @@ module.exports = React.createClass({
             this.setState({email_add_pending: false});
         }, (err) => {
             this.setState({email_add_pending: false});
-            if (err.errcode === 'M_THREEPID_AUTH_FAILED') {
+            if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
                 const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                let message = "Unable to verify email address. ";
-                message += "Please check your email and click on the link it contains. Once this is done, click continue.";
+                let message = _t("Unable to verify email address. ");
+                message += _t("Please check your email and click on the link it contains. Once this is done, click continue.");
                 Modal.createDialog(QuestionDialog, {
-                    title: "Verification Pending",
+                    title: _t("Verification Pending"),
                     description: message,
-                    button: 'Continue',
+                    button: _t('Continue'),
                     onFinished: this.onEmailDialogFinished,
                 });
             } else {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Unable to verify email address: " + err);
                 Modal.createDialog(ErrorDialog, {
-                    title: "Unable to verify email address",
-                    description: ((err && err.message) ? err.message : "Operation failed"),
+                    title: _t("Unable to verify email address"),
+                    description: ((err && err.message) ? err.message : _t("Operation failed")),
+                    button: _t("OK"),
                 });
             }
         });
@@ -532,20 +550,37 @@ module.exports = React.createClass({
             <div>
                 <h3>Referral</h3>
                 <div className="mx_UserSettings_section">
-                    Refer a friend to Riot: <a href={href}>{href}</a>
+                    {_t("Refer a friend to Riot: ")} <a href={href}>{href}</a>
                 </div>
             </div>
         );
     },
 
+    onLanguageChange: function(l) {
+      UserSettingsStore.setLocalSetting('language', l);
+      this.setState({
+        Language: l,
+      });
+      PlatformPeg.get().reload();
+    },
+
+    _renderLanguageSetting: function () {
+      const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
+      return <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
+                        className="mx_UserSettings_Language"
+                        value={this.state.Language} />;
+    },
+
     _renderUserInterfaceSettings: function() {
         return (
             <div>
-                <h3>User Interface</h3>
+                <h3>{ _t("User Interface") }</h3>
                 <div className="mx_UserSettings_section">
                     { this._renderUrlPreviewSelector() }
                     { SETTINGS_LABELS.map( this._renderSyncedSetting ) }
                     { THEMES.map( this._renderThemeSelector ) }
+                    { this._renderLanguageSetting() }
+
                 </div>
             </div>
         );
@@ -559,7 +594,7 @@ module.exports = React.createClass({
                    onChange={ (e) => UserSettingsStore.setUrlPreviewsDisabled(e.target.checked) }
             />
             <label htmlFor="urlPreviewsDisabled">
-                Disable inline URL previews by default
+                { _t("Disable inline URL previews by default") }
             </label>
         </div>;
     },
@@ -572,7 +607,7 @@ module.exports = React.createClass({
                    onChange={ (e) => UserSettingsStore.setSyncedSetting(setting.id, e.target.checked) }
             />
             <label htmlFor={ setting.id }>
-                { setting.label }
+                { _t(setting.label) }
             </label>
         </div>;
     },
@@ -606,7 +641,7 @@ module.exports = React.createClass({
         const deviceId = client.deviceId;
         let identityKey = client.getDeviceEd25519Key();
         if (!identityKey) {
-             identityKey = "<not supported>";
+             identityKey = _t("<not supported>");
         } else {
             identityKey = FormattingUtils.formatCryptoKey(identityKey);
         }
@@ -618,18 +653,18 @@ module.exports = React.createClass({
                 <div className="mx_UserSettings_importExportButtons">
                     <AccessibleButton className="mx_UserSettings_button"
                             onClick={this._onExportE2eKeysClicked}>
-                        Export E2E room keys
+                        { _t("Export E2E room keys") }
                     </AccessibleButton>
                     <AccessibleButton className="mx_UserSettings_button"
                             onClick={this._onImportE2eKeysClicked}>
-                        Import E2E room keys
+                        { _t("Import E2E room keys") }
                     </AccessibleButton>
                 </div>
             );
         }
         return (
             <div>
-                <h3>Cryptography</h3>
+                <h3>{ _t("Cryptography") }</h3>
                 <div className="mx_UserSettings_section mx_UserSettings_cryptoSection">
                     <ul>
                         <li><label>Device ID:</label>             <span><code>{deviceId}</code></span></li>
@@ -660,7 +695,7 @@ module.exports = React.createClass({
                     }
             />
             <label htmlFor={ setting.id }>
-                { setting.label }
+                { _t(setting.label) }
             </label>
         </div>;
     },
@@ -681,9 +716,9 @@ module.exports = React.createClass({
         }
         return (
             <div>
-                <h3>Bug Report</h3>
+                <h3>{ _t("Bug Report") }</h3>
                 <div className="mx_UserSettings_section">
-                    <p>Found a bug?</p>
+                    <p>{ _t("Found a bug?") }</p>
                     <button className="mx_UserSettings_button danger"
                         onClick={this._onBugReportClicked}>Report it
                     </button>
@@ -708,8 +743,8 @@ module.exports = React.createClass({
                             e.target.checked = false;
                             const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                             Modal.createDialog(NeedToRegisterDialog, {
-                                title: "Please Register",
-                                description: "Guests can't use labs features. Please register.",
+                                title: _t("Please Register"),
+                                description: _t("Guests can't use labs features. Please register") + ".",
                             });
                             return;
                         }
@@ -722,9 +757,9 @@ module.exports = React.createClass({
         ));
         return (
             <div>
-                <h3>Labs</h3>
+                <h3>{ _t("Labs") }</h3>
                 <div className="mx_UserSettings_section">
-                    <p>These are experimental features that may break in unexpected ways. Use with caution.</p>
+                    <p>{ _t("These are experimental features that may break in unexpected ways") }. { _t("Use with caution") }.</p>
                     {features}
                 </div>
             </div>
@@ -736,10 +771,10 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get().isGuest()) return null;
 
         return <div>
-            <h3>Deactivate Account</h3>
+            <h3>{ _t("Deactivate Account") }</h3>
                 <div className="mx_UserSettings_section">
                     <AccessibleButton className="mx_UserSettings_button danger"
-                        onClick={this._onDeactivateAccountClicked}>Deactivate my account
+                        onClick={this._onDeactivateAccountClicked}> { _t("Deactivate my account") }
                     </AccessibleButton>
                 </div>
         </div>;
@@ -747,11 +782,11 @@ module.exports = React.createClass({
 
     _renderClearCache: function() {
         return <div>
-            <h3>Clear Cache</h3>
+            <h3>{ _t("Clear Cache") }</h3>
                 <div className="mx_UserSettings_section">
                     <AccessibleButton className="mx_UserSettings_button danger"
                         onClick={this._onClearCacheClicked}>
-                        Clear Cache and Reload
+                        { _t("Clear Cache and Reload") }
                     </AccessibleButton>
                 </div>
         </div>;
@@ -780,7 +815,7 @@ module.exports = React.createClass({
         }
 
         return <div>
-            <h3>Bulk Options</h3>
+            <h3>{ _t("Bulk Options") }</h3>
                 <div className="mx_UserSettings_section">
                     {reject}
                 </div>
@@ -800,7 +835,7 @@ module.exports = React.createClass({
     },
 
     nameForMedium: function(medium) {
-        if (medium === 'msisdn') return 'Phone';
+        if (medium === 'msisdn') return _t('Phone');
         return medium[0].toUpperCase() + medium.slice(1);
     },
 
@@ -849,7 +884,7 @@ module.exports = React.createClass({
                         />
                     </div>
                     <div className="mx_UserSettings_threepidButton mx_filterFlipColor">
-                        <img src="img/cancel-small.svg" width="14" height="14" alt="Remove" onClick={this.onRemoveThreepidClicked.bind(this, val)} />
+                        <img src="img/cancel-small.svg" width="14" height="14" alt={ _t("Remove") } onClick={this.onRemoveThreepidClicked.bind(this, val)} />
                     </div>
                 </div>
             );
@@ -868,7 +903,7 @@ module.exports = React.createClass({
                             ref="add_email_input"
                             className="mx_UserSettings_editable"
                             placeholderClassName="mx_UserSettings_threepidPlaceholder"
-                            placeholder={ "Add email address" }
+                            placeholder={ _t("Add email address") }
                             blurToCancel={ false }
                             onValueChanged={ this._onAddEmailEditFinished } />
                     </div>
@@ -890,7 +925,7 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get().isGuest()) {
             accountJsx = (
                 <div className="mx_UserSettings_button" onClick={this.onUpgradeClicked}>
-                    Create an account
+                    { _t("Create an account") }
                 </div>
             );
         } else {
@@ -908,7 +943,7 @@ module.exports = React.createClass({
         let notificationArea;
         if (!MatrixClientPeg.get().isGuest() && this.state.threepids !== undefined) {
             notificationArea = (<div>
-                <h3>Notifications</h3>
+                <h3>{ _t("Notifications") }</h3>
 
                 <div className="mx_UserSettings_section">
                     <Notifications threepids={this.state.threepids} brand={this.props.brand} />
@@ -927,7 +962,7 @@ module.exports = React.createClass({
         return (
             <div className="mx_UserSettings">
                 <SimpleRoomHeader
-                    title="Settings"
+                    title={ _t("Settings") }
                     collapsedRhs={ this.props.collapsedRhs }
                     onCancelClick={ this.props.onClose }
                 />
@@ -935,13 +970,13 @@ module.exports = React.createClass({
                 <GeminiScrollbar className="mx_UserSettings_body"
                                  autoshow={true}>
 
-                <h3>Profile</h3>
+                <h3>{ _t("Profile") }</h3>
 
                 <div className="mx_UserSettings_section">
                     <div className="mx_UserSettings_profileTable">
                         <div className="mx_UserSettings_profileTableRow">
                             <div className="mx_UserSettings_profileLabelCell">
-                                <label htmlFor="displayName">Display name</label>
+                                <label htmlFor="displayName">{ _t('Display name') }</label>
                             </div>
                             <div className="mx_UserSettings_profileInputCell">
                                 <ChangeDisplayName />
@@ -958,7 +993,7 @@ module.exports = React.createClass({
                         <div className="mx_UserSettings_avatarPicker_edit">
                             <label htmlFor="avatarInput" ref="file_label">
                                 <img src="img/camera.svg" className="mx_filterFlipColor"
-                                    alt="Upload avatar" title="Upload avatar"
+                                    alt={ _t("Upload avatar") } title={ _t("Upload avatar") }
                                     width="17" height="15" />
                             </label>
                             <input id="avatarInput" type="file" onChange={this.onAvatarSelected}/>
@@ -966,12 +1001,12 @@ module.exports = React.createClass({
                     </div>
                 </div>
 
-                <h3>Account</h3>
+                <h3>{ _t("Account") }</h3>
 
-                <div className="mx_UserSettings_section">
+                <div className="mx_UserSettings_section cadcampoHide">
 
                     <AccessibleButton className="mx_UserSettings_logout mx_UserSettings_button" onClick={this.onLogoutClicked}>
-                        Sign out
+                        { _t("Sign out") }
                     </AccessibleButton>
 
                     {accountJsx}
@@ -988,23 +1023,20 @@ module.exports = React.createClass({
                 {this._renderBulkOptions()}
                 {this._renderBugReport()}
 
-                <h3>Advanced</h3>
+                <h3>{ _t("Advanced") }</h3>
 
                 <div className="mx_UserSettings_section">
                     <div className="mx_UserSettings_advanced">
-                        Logged in as {this._me}
+                        { _t("Logged in as") } {this._me}
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        Access Token: <span className="mx_UserSettings_advanced_spoiler"
-                                            onClick={this._showSpoiler}
-                                            data-spoiler={ MatrixClientPeg.get().getAccessToken() }
-                        >&lt;click to reveal&gt;</span>
+                        Access Token: <span className="mx_UserSettings_advanced_spoiler" onClick={this._showSpoiler} data-spoiler={ MatrixClientPeg.get().getAccessToken() }>&lt;{ _t("click to reveal") }&gt;</span>
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        Homeserver is { MatrixClientPeg.get().getHomeserverUrl() }
+                        { _t("Homeserver is") } { MatrixClientPeg.get().getHomeserverUrl() }
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        Identity Server is { MatrixClientPeg.get().getIdentityServerUrl() }
+                        { _t("Identity Server is") } { MatrixClientPeg.get().getIdentityServerUrl() }
                     </div>
                     <div className="mx_UserSettings_advanced">
                         matrix-react-sdk version: {(REACT_SDK_VERSION !== '<local>')
@@ -1015,7 +1047,7 @@ module.exports = React.createClass({
                             ? gHVersionLabel('vector-im/riot-web', this.state.vectorVersion)
                             : 'unknown'
                         }<br/>
-                        olm version: {olmVersionString}<br/>
+                        { _t("olm version: ") } {olmVersionString}<br/>
                     </div>
                 </div>
 
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index d75c7b7584..6a250eb531 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+import _t from 'counterpart-riot';
 var sdk = require('../../../index');
 var Modal = require("../../../Modal");
 var MatrixClientPeg = require('../../../MatrixClientPeg');
@@ -54,7 +55,7 @@ module.exports = React.createClass({
                 progress: "sent_email"
             });
         }, (err) => {
-            this.showErrorDialog("Failed to send email: " + err.message);
+            this.showErrorDialog(_t('Failed to send email') + ": " + err.message);
             this.setState({
                 progress: null
             });
@@ -78,30 +79,35 @@ module.exports = React.createClass({
         ev.preventDefault();
 
         if (!this.state.email) {
-            this.showErrorDialog("The email address linked to your account must be entered.");
+            this.showErrorDialog(_t('The email address linked to your account must be entered.'));
         }
         else if (!this.state.password || !this.state.password2) {
-            this.showErrorDialog("A new password must be entered.");
+            this.showErrorDialog(_t('A new password must be entered') + ".");
         }
         else if (this.state.password !== this.state.password2) {
-            this.showErrorDialog("New passwords must match each other.");
+            this.showErrorDialog(_t('New passwords must match each other.'));
         }
         else {
             var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
             Modal.createDialog(QuestionDialog, {
-                title: "Warning",
+                title: _t('Warning'),
                 description:
                     <div>
-                        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 <a href="https://github.com/vector-im/riot-web/issues/2671">will be improved</a>.
+                        { _t(
+                            '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 ' +
+                            '<a href="https://github.com/vector-im/riot-web/issues/2671">' +
+                            'will be improved</a>'
+                        ) }.
                     </div>,
-                button: "Continue",
+                button: _t('Continue'),
                 extraButtons: [
                     <button className="mx_Dialog_primary"
                             onClick={this._onExportE2eKeysClicked}>
-                        Export E2E room keys
+                        { _t('Export E2E room keys') }
                     </button>
                 ],
                 onFinished: (confirmed) => {
@@ -150,7 +156,8 @@ module.exports = React.createClass({
         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
         Modal.createDialog(ErrorDialog, {
             title: title,
-            description: body
+            description: body,
+            button: _t("OK"),
         });
     },
 
@@ -168,22 +175,20 @@ module.exports = React.createClass({
         else if (this.state.progress === "sent_email") {
             resetPasswordJsx = (
                 <div>
-                    An email has been sent to {this.state.email}. Once you&#39;ve followed
-                    the link it contains, click below.
+                    { _t('An email has been sent to') } {this.state.email}. { _t('Once you&#39;ve followed the link it contains, click below') }.
                     <br />
                     <input className="mx_Login_submit" type="button" onClick={this.onVerify}
-                        value="I have verified my email address" />
+                        value={ _t('I have verified my email address') } />
                 </div>
             );
         }
         else if (this.state.progress === "complete") {
             resetPasswordJsx = (
                 <div>
-                    <p>Your password has been reset.</p>
-                    <p>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>
+                    <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="Return to login screen" />
+                        value={ _t('Return to login screen') } />
                 </div>
             );
         }
@@ -191,7 +196,7 @@ module.exports = React.createClass({
             resetPasswordJsx = (
             <div>
                 <div className="mx_Login_prompt">
-                    To reset your password, enter the email address linked to your account:
+                    { _t('To reset your password, enter the email address linked to your account') }:
                 </div>
                 <div>
                     <form onSubmit={this.onSubmitForm}>
@@ -199,21 +204,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="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="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="Confirm your new password" />
+                            placeholder={ _t('Confirm your new password') } />
                         <br />
-                        <input className="mx_Login_submit" type="submit" value="Send Reset Email" />
+                        <input className="mx_Login_submit" type="submit" value={ _t('Send Reset Email') } />
                     </form>
                     <ServerConfig ref="serverConfig"
                         withToggleButton={true}
@@ -230,7 +235,7 @@ module.exports = React.createClass({
                         Return to login
                     </a>
                     <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
-                        Create a new account
+                        { _t('Create an account') }
                     </a>
                     <LoginFooter />
                 </div>
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index a3635177e2..17d9833340 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -18,6 +18,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import _t from 'counterpart-riot';
 import ReactDOM from 'react-dom';
 import url from 'url';
 import sdk from '../../../index';
@@ -222,15 +223,17 @@ module.exports = React.createClass({
                 (this.state.enteredHomeserverUrl.startsWith("http:") ||
                  !this.state.enteredHomeserverUrl.startsWith("http")))
             {
+                const urlStart = <a href='https://www.google.com/search?&q=enable%20unsafe%20scripts'>;
+                const urlEnd = </a>;
                 errorText = <span>
-                    Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar.
-                    Either use HTTPS or <a href='https://www.google.com/search?&q=enable%20unsafe%20scripts'>enable unsafe scripts</a>
+                    { _t('Can\'t connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s', {urlStart: urlStart, urlEnd: urlEnd})}
                 </span>;
             }
             else {
+                const urlStart = <a href={this.state.enteredHomeserverUrl}>;
+                const urlEnd = </a>;
                 errorText = <span>
-                    Can't connect to homeserver - please check your connectivity and ensure
-                    your <a href={ this.state.enteredHomeserverUrl }>homeserver's SSL certificate</a> is trusted.
+                    { _t('Can\'t connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver\'s SSL certificate %(urlEnd)s is trusted', {urlStart: urlStart, urlEnd: urlEnd})}
                 </span>;
             }
         }
@@ -273,8 +276,7 @@ module.exports = React.createClass({
                 }
                 return (
                     <div>
-                    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>
                 );
         }
@@ -291,7 +293,7 @@ module.exports = React.createClass({
         if (this.props.enableGuest) {
             loginAsGuestJsx =
                 <a className="mx_Login_create" onClick={this._onLoginAsGuestClick} href="#">
-                    Login as guest
+                    { _t('Login as guest')}
                 </a>;
         }
 
@@ -299,7 +301,7 @@ module.exports = React.createClass({
         if (this.props.onCancelClick) {
             returnToAppJsx =
                 <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
-                    Return to app
+                    { _t('Return to app')}
                 </a>;
         }
 
@@ -308,7 +310,7 @@ module.exports = React.createClass({
                 <div className="mx_Login_box">
                     <LoginHeader />
                     <div>
-                        <h2>Sign in
+                        <h2>{ _t('Sign in')}
                             { loader }
                         </h2>
                         { this.componentForStep(this.state.currentFlow) }
@@ -324,7 +326,7 @@ module.exports = React.createClass({
                                 { this.state.errorText }
                         </div>
                         <a className="mx_Login_create" onClick={this.props.onRegisterClick} href="#">
-                            Create a new account
+                            { _t('Create an account')}
                         </a>
                         { loginAsGuestJsx }
                         { returnToAppJsx }
diff --git a/src/components/structures/login/PostRegistration.js b/src/components/structures/login/PostRegistration.js
index c95f94cf4f..c3425cf68b 100644
--- a/src/components/structures/login/PostRegistration.js
+++ b/src/components/structures/login/PostRegistration.js
@@ -16,9 +16,10 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var sdk = require('../../../index');
-var MatrixClientPeg = require('../../../MatrixClientPeg');
+import React from 'react';
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import _t from 'counterpart-riot';
 
 module.exports = React.createClass({
     displayName: 'PostRegistration',
@@ -64,12 +65,12 @@ module.exports = React.createClass({
                 <div className="mx_Login_box">
                     <LoginHeader />
                     <div className="mx_Login_profile">
-                        Set a display name:
+                        { _t('Set a display name:') }
                         <ChangeDisplayName />
-                        Upload an avatar:
+                        { _t('Upload an avatar:') }
                         <ChangeAvatar
                             initialAvatarUrl={this.state.avatarUrl} />
-                        <button onClick={this.props.onComplete}>Continue</button>
+                        <button onClick={this.props.onComplete}>{ _t('Continue') }</button>
                         {this.state.errorString}
                     </div>
                 </div>
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 5501a39b58..b78f0ec80a 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -27,6 +27,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import RegistrationForm from '../../views/login/RegistrationForm';
 import CaptchaForm from '../../views/login/CaptchaForm';
 import RtsClient from '../../../RtsClient';
+import _t from 'counterpart-riot';
 
 const MIN_PASSWORD_LENGTH = 6;
 
@@ -162,7 +163,7 @@ module.exports = React.createClass({
                     msisdn_available |= flow.stages.indexOf('m.login.msisdn') > -1;
                 }
                 if (!msisdn_available) {
-                    msg = "This server does not support authentication with a phone number";
+                    msg = _t('This server does not support authentication with a phone number.');
                 }
             }
             this.setState({
@@ -260,29 +261,29 @@ module.exports = React.createClass({
         var errMsg;
         switch (errCode) {
             case "RegistrationForm.ERR_PASSWORD_MISSING":
-                errMsg = "Missing password.";
+                errMsg = _t('Missing password.');
                 break;
             case "RegistrationForm.ERR_PASSWORD_MISMATCH":
-                errMsg = "Passwords don't match.";
+                errMsg = _t('Passwords don\'t match.');
                 break;
             case "RegistrationForm.ERR_PASSWORD_LENGTH":
-                errMsg = `Password too short (min ${MIN_PASSWORD_LENGTH}).`;
+                errMsg = _t('Password too short (min %(MIN_PASSWORD_LENGTH)s).', {MIN_PASSWORD_LENGTH: $MIN_PASSWORD_LENGTH})
                 break;
             case "RegistrationForm.ERR_EMAIL_INVALID":
-                errMsg = "This doesn't look like a valid email address";
+                errMsg = _t('This doesn\'t look like a valid email address.');
                 break;
             case "RegistrationForm.ERR_PHONE_NUMBER_INVALID":
-                errMsg = "This doesn't look like a valid phone number";
+                errMsg = _t('This doesn\'t look like a valid phone number.');
                 break;
             case "RegistrationForm.ERR_USERNAME_INVALID":
-                errMsg = "User names may only contain letters, numbers, dots, hyphens and underscores.";
+                errMsg = _t('User names may only contain letters, numbers, dots, hyphens and underscores.');
                 break;
             case "RegistrationForm.ERR_USERNAME_BLANK":
-                errMsg = "You need to enter a user name";
+                errMsg = _t('You need to enter a user name.');
                 break;
             default:
                 console.error("Unknown error code: %s", errCode);
-                errMsg = "An unknown error occurred.";
+                errMsg = _t('An unknown error occurred.');
                 break;
         }
         this.setState({
@@ -400,7 +401,7 @@ module.exports = React.createClass({
         if (this.props.onCancelClick) {
             returnToAppJsx = (
                 <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
-                    Return to app
+                    {_t('Return to app')}
                 </a>
             );
         }
@@ -413,10 +414,10 @@ module.exports = React.createClass({
                             this.state.teamSelected.domain + "/icon.png" :
                             null}
                     />
-                    <h2>Create an account</h2>
+                    <h2>{_t('Create an account')}</h2>
                     {registerBody}
                     <a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
-                        I already have an account
+                        {_t('I already have an account')}
                     </a>
                     {returnToAppJsx}
                     <LoginFooter />
diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index 7ba503099a..032a705a0e 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import classNames from 'classnames';
+import _t from 'counterpart-riot';
 import sdk from '../../../index';
 import { getAddressType, inviteMultipleToRoom } from '../../../Invite';
 import createRoom from '../../../createRoom';
@@ -48,11 +49,7 @@ module.exports = React.createClass({
 
     getDefaultProps: function() {
         return {
-            title: "Start a chat",
-            description: "Who would you like to communicate with?",
             value: "",
-            placeholder: "Email, name or matrix ID",
-            button: "Start Chat",
             focus: true
         };
     },
@@ -310,6 +307,7 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite",
                     description: ((err && err.message) ? err.message : "Operation failed"),
+                    button: _t("OK"),
                 });
                 return null;
             })
@@ -323,6 +321,7 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite user",
                     description: ((err && err.message) ? err.message : "Operation failed"),
+                    button: _t("OK"),
                 });
                 return null;
             })
@@ -344,6 +343,7 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite",
                     description: ((err && err.message) ? err.message : "Operation failed"),
+                    button: _t("OK"),
                 });
                 return null;
             })
@@ -403,6 +403,7 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: "Failed to invite the following users to the " + room.name + " room:",
                 description: errorList.join(", "),
+                button: _t("OK"),
             });
         }
         return addrs;
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 6cfaac65d4..aded0dabb9 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 import classnames from 'classnames';
 
 /*
@@ -69,7 +70,7 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
 
-        const title = this.props.action + " this person?";
+        const title = _t("%(actionVerb)s this person?", { actionVerb: this.props.action});
         const confirmButtonClass = classnames({
             'mx_Dialog_primary': true,
             'danger': this.props.danger,
@@ -82,7 +83,7 @@ export default React.createClass({
                     <form onSubmit={this.onOk}>
                         <input className="mx_ConfirmUserActionDialog_reasonField"
                             ref={this._collectReasonField}
-                            placeholder="Reason"
+                            placeholder={ _t("Reason") }
                             autoFocus={true}
                         />
                     </form>
@@ -111,7 +112,7 @@ export default React.createClass({
                     </button>
 
                     <button onClick={this.onCancel}>
-                        Cancel
+                        { _t("Cancel") }
                     </button>
                 </div>
             </BaseDialog>
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index ef6fdbbead..fb7286e304 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -43,9 +43,6 @@ export default React.createClass({
 
     getDefaultProps: function() {
         return {
-            title: "Error",
-            description: "An error has occurred.",
-            button: "OK",
             focus: true,
         };
     },
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index 145b4b6453..f0eeead29a 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -46,12 +46,6 @@ export default React.createClass({
         title: React.PropTypes.string,
     },
 
-    getDefaultProps: function() {
-        return {
-            title: "Authentication",
-        };
-    },
-
     getInitialState: function() {
         return {
             authError: null,
diff --git a/src/components/views/dialogs/NeedToRegisterDialog.js b/src/components/views/dialogs/NeedToRegisterDialog.js
index f4df5913d5..875af6a7fd 100644
--- a/src/components/views/dialogs/NeedToRegisterDialog.js
+++ b/src/components/views/dialogs/NeedToRegisterDialog.js
@@ -38,13 +38,6 @@ module.exports = React.createClass({
         onFinished: React.PropTypes.func.isRequired,
     },
 
-    getDefaultProps: function() {
-        return {
-            title: "Registration required",
-            description: "A registered account is required for this action",
-        };
-    },
-
     onRegisterClicked: function() {
         dis.dispatch({
             action: "start_upgrade_registration",
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 6012541b94..e3d38922ee 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -33,7 +33,6 @@ export default React.createClass({
             title: "",
             description: "",
             extraButtons: null,
-            button: "OK",
             focus: true,
             hasCancelButton: true,
         };
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 6e40efffd8..080e6ac1b6 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 
 export default React.createClass({
     displayName: 'TextInputDialog',
@@ -36,7 +37,6 @@ export default React.createClass({
             title: "",
             value: "",
             description: "",
-            button: "OK",
             focus: true,
         };
     },
@@ -73,7 +73,7 @@ export default React.createClass({
                 </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/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
new file mode 100644
index 0000000000..0da05ff07e
--- /dev/null
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -0,0 +1,140 @@
+/*
+Copyright 2017 Marcel Radzio (MTRNord)
+
+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';
+import UserSettingsStore from '../../../UserSettingsStore';
+const _localSettings = UserSettingsStore.getLocalSettings();
+import _t from 'counterpart-riot';
+const languageHandler = require('../../../languageHandler');
+var SdkConfig = require("../../../SdkConfig");
+
+let LANGUAGES = [];
+
+const LANGUAGES_BY_VALUE = new Object(null);
+
+function languageMatchesSearchQuery(query, language) {
+    if (language.label.toUpperCase().indexOf(query.toUpperCase()) == 0) return true;
+    if (language.value.toUpperCase() == query.toUpperCase()) return true;
+    return false;
+}
+
+export default class LanguageDropdown extends React.Component {
+    constructor(props) {
+        super(props);
+        this._onSearchChange = this._onSearchChange.bind(this);
+
+        this.state = {
+            searchQuery: '',
+        }
+    }
+
+    componentWillMount() {
+
+    	const languageKeys = SdkConfig.get().languages;
+
+		// Build const LANGUAGES in a way that counterpart allows translation inside object:
+    	languageKeys.forEach(function(languageKey) {
+    		var l = {};
+    		l.id = "language";
+    		l.label = _t(languageKey);
+    		l.value = languageKey;
+    		LANGUAGES.push(l);
+    	});
+
+      LANGUAGES = LANGUAGES.sort(function(a, b){
+                          if(a.label < b.label) return -1;
+                          if(a.label > b.label) return 1;
+                          return 0;
+                      })
+
+    	for (const l of LANGUAGES) {
+    		LANGUAGES_BY_VALUE[l.value] = l;
+	    }
+
+
+        if (!this.props.value) {
+            // If no value is given, we start with the first
+            // country selected, but our parent component
+            // doesn't know this, therefore we do this.
+            if (_localSettings.hasOwnProperty('language')) {
+              this.props.onOptionChange(_localSettings.language);
+            }else {
+              const language = languageHandler.normalizeLanguageKey(languageHandler.getLanguageFromBrowser());
+              this.props.onOptionChange(language);
+            }
+        }
+    }
+
+    _onSearchChange(search) {
+        this.setState({
+            searchQuery: search,
+        });
+    }
+
+    render() {
+        const Dropdown = sdk.getComponent('elements.Dropdown');
+
+        let displayedLanguages;
+        if (this.state.searchQuery) {
+            displayedLanguages = LANGUAGES.filter(
+                languageMatchesSearchQuery.bind(this, this.state.searchQuery),
+            );
+            if (
+                this.state.searchQuery.length == 2 &&
+                LANGUAGES_BY_VALUE[this.state.searchQuery.toUpperCase()]
+            ) {
+                const matched = LANGUAGES_BY_VALUE[this.state.searchQuery.toUpperCase()];
+                displayedLanguages = displayedLanguages.filter((l) => {
+                    return l.id != matched.id;
+                });
+                displayedLanguages.unshift(matched);
+            }
+        } else {
+            displayedLanguages = LANGUAGES;
+        }
+
+        const options = displayedLanguages.map((language) => {
+            return <div key={language.value}>
+                {language.label}
+            </div>;
+        });
+
+        // default value here too, otherwise we need to handle null / undefined
+        // values between mounting and the initial value propgating
+        let value = null;
+        if (_localSettings.hasOwnProperty('language')) {
+          value = this.props.value || _localSettings.language;
+        } else {
+          const language = navigator.language || navigator.userLanguage;
+          value = this.props.value || language;
+        }
+
+        return <Dropdown className={this.props.className}
+            onOptionChange={this.props.onOptionChange} onSearchChange={this._onSearchChange}
+            value={value}
+        >
+            {options}
+        </Dropdown>
+    }
+}
+
+LanguageDropdown.propTypes = {
+    className: React.PropTypes.string,
+    onOptionChange: React.PropTypes.func.isRequired,
+    value: React.PropTypes.string,
+};
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index dcf1810468..747e5019a8 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 import React from 'react';
 const MemberAvatar = require('../avatars/MemberAvatar.js');
+import _t from 'counterpart-riot';
 
 module.exports = React.createClass({
     displayName: 'MemberEventListSummary',
@@ -203,30 +204,146 @@ module.exports = React.createClass({
      * @param {boolean} plural whether there were multiple users undergoing the same
      * transition.
      * @param {number} repeats the number of times the transition was repeated in a row.
-     * @returns {string} the written English equivalent of the transition.
+     * @returns {string} the written Human Readable equivalent of the transition.
      */
     _getDescriptionForTransition(t, plural, repeats) {
-        const beConjugated = plural ? "were" : "was";
-        const invitation = "their invitation" + (plural || (repeats > 1) ? "s" : "");
-
+        // The empty interpolations 'severalUsers' and 'oneUser'
+        // are there only to show translators to non-English languages
+        // that the verb is conjugated to plural or singular Subject.
         let res = null;
-        const map = {
-            "joined": "joined",
-            "left": "left",
-            "joined_and_left": "joined and left",
-            "left_and_joined": "left and rejoined",
-            "invite_reject": "rejected " + invitation,
-            "invite_withdrawal": "had " + invitation + " withdrawn",
-            "invited": beConjugated + " invited",
-            "banned": beConjugated + " banned",
-            "unbanned": beConjugated + " unbanned",
-            "kicked": beConjugated + " kicked",
-            "changed_name": "changed name",
-            "changed_avatar": "changed avatar",
-        };
+        switch(t) {
+            case "joined":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s joined %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s joined %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s joined", { severalUsers: "" })
+                        : _t("%(oneUser)s joined", { oneUser: "" });
+                }
 
-        if (Object.keys(map).includes(t)) {
-            res = map[t] + (repeats > 1 ? " " + repeats + " times" : "" );
+            break;
+            case "left":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s left %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s left %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s left", { severalUsers: "" })
+                        : _t("%(oneUser)s left", { oneUser: "" });
+                }            break;
+            case "joined_and_left":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s joined and left %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s joined and left %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s joined and left", { severalUsers: "" })
+                        : _t("%(oneUser)s joined and left", { oneUser: "" });
+                }
+            break;
+            case "left_and_joined":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s left and rejoined %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s left and rejoined %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s left and rejoined", { severalUsers: "" })
+                        : _t("%(oneUser)s left and rejoined", { oneUser: "" });
+                }            break;
+            break;
+            case "invite_reject":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s rejected their invitations %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s rejected his/her invitation %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s rejected their invitations", { severalUsers: "" })
+                        : _t("%(oneUser)s rejected his/her invitation", { oneUser: "" });
+                }
+            break;
+            case "invite_withdrawal":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s had their invitations withdrawn %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s had his/her invitation withdrawn %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s had their invitations withdrawn", { severalUsers: "" })
+                        : _t("%(oneUser)s had his/her invitation withdrawn", { oneUser: "" });
+                }
+            break;
+            case "invited":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("were invited %(repeats)s times", { repeats: repeats })
+                        : _t("was invited %(repeats)s times", { repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("were invited")
+                        : _t("was invited");
+                }
+            break;
+            case "banned":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("were banned %(repeats)s times", { repeats: repeats })
+                        : _t("was banned %(repeats)s times", { repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("were banned")
+                        : _t("was banned");
+                }
+            break;
+            case "unbanned":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("were unbanned %(repeats)s times", { repeats: repeats })
+                        : _t("was unbanned %(repeats)s times", { repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("were unbanned")
+                        : _t("was unbanned");
+                }
+            break;
+            case "kicked":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("were kicked %(repeats)s times", { repeats: repeats })
+                        : _t("was kicked %(repeats)s times", { repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("were kicked")
+                        : _t("was kicked");
+                }
+            break;
+            case "changed_name":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s changed their name %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s changed his/her name %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s changed their name", { severalUsers: "" })
+                        : _t("%(oneUser)s changed his/her name", { oneUser: "" });
+                }
+            break;
+            case "changed_avatar":
+                if (repeats > 1) {
+                    res = (plural)
+                        ? _t("%(severalUsers)s changed their avatar %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)s changed his/her avatar %(repeats)s times", { oneUser: "", repeats: repeats });
+                } else {
+                    res = (plural)
+                        ? _t("%(severalUsers)s changed their avatar", { severalUsers: "" })
+                        : _t("%(oneUser)s changed his/her avatar", { oneUser: "" });
+                }
+            break;
         }
 
         return res;
@@ -254,11 +371,12 @@ module.exports = React.createClass({
             return items[0];
         } else if (remaining) {
             items = items.slice(0, itemLimit);
-            const other = " other" + (remaining > 1 ? "s" : "");
-            return items.join(', ') + ' and ' + remaining + other;
+            return (remaining > 1) 
+                ? _t("%(items)s and %(remaining)s others", { items: items.join(', '), remaining: remaining } )
+                : _t("%(items)s and one other", { items: items.join(', ') });
         } else {
             const lastItem = items.pop();
-            return items.join(', ') + ' and ' + lastItem;
+            return _t("%(items)s and %(lastItem)s", { items: items.join(', '), lastItem: lastItem });
         }
     },
 
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index 5eec464ead..f12ef3ac9d 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -19,10 +19,8 @@ limitations under the License.
 import React from 'react';
 import * as Roles from '../../../Roles';
 
+var LEVEL_ROLE_MAP = {};
 var reverseRoles = {};
-Object.keys(Roles.LEVEL_ROLE_MAP).forEach(function(key) {
-    reverseRoles[Roles.LEVEL_ROLE_MAP[key]] = key;
-});
 
 module.exports = React.createClass({
     displayName: 'PowerSelector',
@@ -44,9 +42,16 @@ module.exports = React.createClass({
 
     getInitialState: function() {
         return {
-            custom: (Roles.LEVEL_ROLE_MAP[this.props.value] === undefined),
+            custom: (LEVEL_ROLE_MAP[this.props.value] === undefined),
         };
     },
+    
+    componentWillMount: function() {
+    	LEVEL_ROLE_MAP = Roles.levelRoleMap();
+    	Object.keys(LEVEL_ROLE_MAP).forEach(function(key) {
+			reverseRoles[LEVEL_ROLE_MAP[key]] = key;
+		});
+    },
 
     onSelectChange: function(event) {
         this.setState({ custom: event.target.value === "Custom" });
@@ -94,7 +99,7 @@ module.exports = React.createClass({
             selectValue = "Custom";
         }
         else {
-            selectValue = Roles.LEVEL_ROLE_MAP[this.props.value] || "Custom";
+            selectValue = LEVEL_ROLE_MAP[this.props.value] || "Custom";
         }
         var select;
         if (this.props.disabled) {
@@ -105,7 +110,7 @@ module.exports = React.createClass({
             const levels = [0, 50, 100];
             let options = levels.map((level) => {
                 return {
-                    value: Roles.LEVEL_ROLE_MAP[level],
+                    value: LEVEL_ROLE_MAP[level],
                     // 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),
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 46c9598751..6530df83e4 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -19,6 +19,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 import {field_input_incorrect} from '../../../UiEffects';
 
 
@@ -141,7 +142,7 @@ class PasswordLogin extends React.Component {
                         type="text"
                         name="username" // make it a little easier for browser's remember-password
                         onChange={this.onUsernameChanged}
-                        placeholder="username"
+                        placeholder={_t('username')}
                         value={this.state.username}
                         autoFocus
                     />
@@ -179,7 +180,7 @@ class PasswordLogin extends React.Component {
         if (this.props.onForgotPasswordClick) {
             forgotPasswordJsx = (
                 <a className="mx_Login_forgot" onClick={this.props.onForgotPasswordClick} href="#">
-                    Forgot your password?
+                    { _t('Forgot your password?') }
                 </a>
             );
         }
@@ -197,24 +198,24 @@ class PasswordLogin extends React.Component {
             <div>
                 <form onSubmit={this.onSubmitForm}>
                 <div className="mx_Login_type_container">
-                    <label className="mx_Login_type_label">I want to sign in with my</label>
+                    <label className="mx_Login_type_label">{ _t('I want to sign in with') }</label>
                     <Dropdown
                         className="mx_Login_type_dropdown"
                         value={this.state.loginType}
                         onOptionChange={this.onLoginTypeChange}>
-                            <span key={PasswordLogin.LOGIN_FIELD_MXID}>Matrix ID</span>
-                            <span key={PasswordLogin.LOGIN_FIELD_EMAIL}>Email Address</span>
-                            <span key={PasswordLogin.LOGIN_FIELD_PHONE}>Phone</span>
+                            <span key={PasswordLogin.LOGIN_FIELD_MXID}>{ _t('my Matrix ID') }</span>
+                            <span key={PasswordLogin.LOGIN_FIELD_EMAIL}>{ _t('Email Address') }</span>
+                            <span key={PasswordLogin.LOGIN_FIELD_PHONE}>{ _t('Phone') }</span>
                     </Dropdown>
                 </div>
                 {loginField}
                 <input className={pwFieldClass} ref={(e) => {this._passwordField = e;}} type="password"
                     name="password"
                     value={this.state.password} onChange={this.onPasswordChanged}
-                    placeholder="Password" />
+                    placeholder={ _t('Password') } />
                 <br />
                 {forgotPasswordJsx}
-                <input className="mx_Login_submit" type="submit" value="Sign in" />
+                <input className="mx_Login_submit" type="submit" value={ _t('Sign in') } />
                 </form>
             </div>
         );
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 029a8a9fe4..d7609eae15 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -20,6 +20,7 @@ import React from 'react';
 import filesize from 'filesize';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 import {decryptFile} from '../../../utils/DecryptFile';
 import Tinter from '../../../Tinter';
 import request from 'browser-request';
@@ -202,7 +203,7 @@ module.exports = React.createClass({
      * @return {string} the human readable link text for the attachment.
      */
     presentableTextForFile: function(content) {
-        var linkText = 'Attachment';
+        var linkText = _t("Attachment");
         if (content.body && content.body.length > 0) {
             // The content body should be the name of the file including a
             // file extension.
@@ -261,7 +262,7 @@ module.exports = React.createClass({
         const content = this.props.mxEvent.getContent();
         const text = this.presentableTextForFile(content);
         const isEncrypted = content.file !== undefined;
-        const fileName = content.body && content.body.length > 0 ? content.body : "Attachment";
+        const fileName = content.body && content.body.length > 0 ? content.body : _t("Attachment");
         const contentUrl = this._getContentUrl();
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
 
@@ -283,7 +284,9 @@ module.exports = React.createClass({
                     }).catch((err) => {
                         console.warn("Unable to decrypt attachment: ", err);
                         Modal.createDialog(ErrorDialog, {
-                            description: "Error decrypting attachment"
+                        	title: _t("Error"),
+                            description: _t("Error decrypting attachment"),
+                            button: _t("OK"),
                         });
                     }).finally(() => {
                         decrypting = false;
@@ -295,7 +298,7 @@ module.exports = React.createClass({
                     <span className="mx_MFileBody" ref="body">
                         <div className="mx_MImageBody_download">
                             <a href="javascript:void(0)" onClick={decrypt}>
-                                Decrypt {text}
+                                { _t("Decrypt %(text)s", { text: text }) }
                             </a>
                         </div>
                     </span>
@@ -314,7 +317,7 @@ module.exports = React.createClass({
                     // We can't provide a Content-Disposition header like we would for HTTP.
                     download: fileName,
                     target: "_blank",
-                    textContent: "Download " + text,
+                    textContent: _t("Download %(text)s", { text: text }),
                 }, "*");
             };
 
@@ -362,7 +365,7 @@ module.exports = React.createClass({
                         <div className="mx_MImageBody_download">
                             <a href={contentUrl} download={fileName} target="_blank" rel="noopener">
                                 <img src={tintedDownloadImageURL} width="12" height="14" ref="downloadImage"/>
-                                Download {text}
+                                { _t("Download %(text)s", { text: text }) }
                             </a>
                         </div>
                     </span>
@@ -371,7 +374,7 @@ module.exports = React.createClass({
         } else {
             var extra = text ? (': ' + text) : '';
             return <span className="mx_MFileBody">
-                Invalid file{extra}
+                { _t("Invalid file%(extra)s", { extra: extra }) }
             </span>;
         }
     },
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 6543f2a17d..a6a9302190 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -19,6 +19,7 @@ var React = require('react');
 var ObjectUtils = require("../../../ObjectUtils");
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var sdk = require("../../../index");
+import _t from 'counterpart-riot';
 var Modal = require("../../../Modal");
 
 module.exports = React.createClass({
@@ -154,8 +155,9 @@ module.exports = React.createClass({
         else {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Invalid alias format",
-                description: "'" + alias + "' is not a valid format for an alias",
+                title: _t('Invalid alias format'),
+                description: _t('"%(alias)s" is not a valid format for an alias', { alias: alias }),
+                button: _t('OK'),
             });
         }
     },
@@ -170,8 +172,9 @@ module.exports = React.createClass({
         else {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Invalid address format",
-                description: "'" + alias + "' is not a valid format for an address",
+                title: _t('Invalid address format'),
+                description: _t('"%(alias)s" is not a valid format for an address', { alias: alias }),
+                button: _t('OK'),
             });
         }
     },
@@ -203,7 +206,7 @@ module.exports = React.createClass({
         if (this.props.canSetCanonicalAlias) {
             canonical_alias_section = (
                 <select onChange={this.onCanonicalAliasChange} defaultValue={ this.state.canonicalAlias }>
-                    <option value="" key="unset">not specified</option>
+                    <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) {
@@ -220,7 +223,7 @@ module.exports = React.createClass({
         }
         else {
             canonical_alias_section = (
-                <b>{ this.state.canonicalAlias || "not set" }</b>
+                <b>{ this.state.canonicalAlias || _t('not set') }</b>
             );
         }
 
@@ -254,13 +257,13 @@ module.exports = React.createClass({
             <div>
                 <h3>Addresses</h3>
                 <div className="mx_RoomSettings_aliasLabel">
-                    The main address for this room is: { canonical_alias_section }
+                    { _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)
-                      ? "Local addresses for this room:"
-                      : "This room has no local addresses" }
+                      ? _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) => {
@@ -268,7 +271,7 @@ module.exports = React.createClass({
                         if (this.props.canSetAliases) {
                             deleteButton = (
                                 <img src="img/cancel-small.svg" width="14" height="14"
-                                    alt="Delete" onClick={ self.onAliasDeleted.bind(self, localDomain, i) } />
+                                    alt={ _t('Delete') } onClick={ self.onAliasDeleted.bind(self, localDomain, i) } />
                             );
                         }
                         return (
@@ -276,7 +279,7 @@ module.exports = React.createClass({
                                 <EditableText
                                     className="mx_RoomSettings_alias mx_RoomSettings_editable"
                                     placeholderClassName="mx_RoomSettings_aliasPlaceholder"
-                                    placeholder={ "New address (e.g. #foo:" + localDomain + ")" }
+                                    placeholder={ _t('New address (e.g. #foo:%(localDomain)s)', { localDomain: localDomain}) }
                                     blurToCancel={ false }
                                     onValueChanged={ self.onAliasChanged.bind(self, localDomain, i) }
                                     editable={ self.props.canSetAliases }
@@ -294,7 +297,7 @@ module.exports = React.createClass({
                                 ref="add_alias"
                                 className="mx_RoomSettings_alias mx_RoomSettings_editable"
                                 placeholderClassName="mx_RoomSettings_aliasPlaceholder"
-                                placeholder={ "New address (e.g. #foo:" + localDomain + ")" }
+                                placeholder={ _t('New address (e.g. #foo:%(localDomain)s)', { localDomain: localDomain}) }
                                 blurToCancel={ false }
                                 onValueChanged={ self.onAliasAdded } />
                             <div className="mx_RoomSettings_addAlias mx_filterFlipColor">
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 44c4051995..3e2c3f5de0 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -18,6 +18,7 @@ limitations under the License.
 
 var React = require('react');
 var classNames = require("classnames");
+import _t from 'counterpart-riot';
 var Modal = require('../../../Modal');
 
 var sdk = require('../../../index');
@@ -464,9 +465,9 @@ module.exports = WithMatrixClient(React.createClass({
         if (needsSenderProfile) {
             let aux = null;
             if (!this.props.tileShape) {
-                if (msgtype === 'm.image') aux = "sent an image";
-                else if (msgtype === 'm.video') aux = "sent a video";
-                else if (msgtype === 'm.file') aux = "uploaded a file";
+                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} aux={aux} />;
             }
             else {
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 839405c922..fed307c216 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -31,6 +31,7 @@ import classNames from 'classnames';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 import createRoom from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import Unread from '../../../Unread';
@@ -219,7 +220,7 @@ module.exports = WithMatrixClient(React.createClass({
 
     onKick: function() {
         const membership = this.props.member.membership;
-        const kickLabel = membership === "invite" ? "Disinvite" : "Kick";
+        const kickLabel = membership === "invite" ? _t("Disinvite") : _t("Kick");
         const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
         Modal.createDialog(ConfirmUserActionDialog, {
             member: this.props.member,
@@ -241,8 +242,9 @@ module.exports = WithMatrixClient(React.createClass({
                         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         console.error("Kick error: " + err);
                         Modal.createDialog(ErrorDialog, {
-                            title: "Failed to kick",
+                            title: _t("Failed to kick"),
                             description: ((err && err.message) ? err.message : "Operation failed"),
+                            button: _t("OK"),
                         });
                     }
                 ).finally(()=>{
@@ -256,7 +258,7 @@ module.exports = WithMatrixClient(React.createClass({
         const ConfirmUserActionDialog = sdk.getComponent("dialogs.ConfirmUserActionDialog");
         Modal.createDialog(ConfirmUserActionDialog, {
             member: this.props.member,
-            action: this.props.member.membership == 'ban' ? 'Unban' : 'Ban',
+            action: this.props.member.membership == 'ban' ? _t("Unban") : _t("Ban"),
             askReason: this.props.member.membership != 'ban',
             danger: this.props.member.membership != 'ban',
             onFinished: (proceed, reason) => {
@@ -283,8 +285,9 @@ module.exports = WithMatrixClient(React.createClass({
                         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         console.error("Ban error: " + err);
                         Modal.createDialog(ErrorDialog, {
-                            title: "Error",
-                            description: "Failed to ban user",
+                            title: _t("Error"),
+                            description: _t("Failed to ban user"),
+                            button: _t("OK"),
                         });
                     }
                 ).finally(()=>{
@@ -333,8 +336,9 @@ module.exports = WithMatrixClient(React.createClass({
                 }, function(err) {
                     console.error("Mute error: " + err);
                     Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "Failed to mute user",
+                        title: _t("Error"),
+                        description: _t("Failed to mute user"),
+                        button: _t("OK"),
                     });
                 }
             ).finally(()=>{
@@ -376,14 +380,15 @@ module.exports = WithMatrixClient(React.createClass({
                 if (err.errcode == 'M_GUEST_ACCESS_FORBIDDEN') {
                     var NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                     Modal.createDialog(NeedToRegisterDialog, {
-                        title: "Please Register",
-                        description: "This action cannot be performed by a guest user. Please register to be able to do this."
+                        title: _t("Please Register"),
+                        description: _t("This action cannot be performed by a guest user. Please register to be able to do this") + ".",
                     });
                 } else {
                     console.error("Toggle moderator error:" + err);
                     Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "Failed to toggle moderator status",
+                        title: _t("Error"),
+                        description: _t("Failed to toggle moderator status"),
+                        button: _t("OK"),
                     });
                 }
             }
@@ -403,8 +408,9 @@ module.exports = WithMatrixClient(React.createClass({
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Failed to change power level " + err);
                 Modal.createDialog(ErrorDialog, {
-                    title: "Error",
-                    description: "Failed to change power level",
+                    title: _t("Error"),
+                    description: _t("Failed to change power level"),
+                    button: _t("OK"),
                 });
             }
         ).finally(()=>{
@@ -432,13 +438,13 @@ module.exports = WithMatrixClient(React.createClass({
             if (parseInt(myPower) === parseInt(powerLevel)) {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
-                    title: "Warning",
+                    title: _t("Warning"),
                     description:
                         <div>
-                            You will not be able to undo this change as you are promoting the user to have the same power level as yourself.<br/>
-                            Are you sure?
+                            { _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: "Continue",
+                    button: _t("Continue"),
                     onFinished: function(confirmed) {
                         if (confirmed) {
                             self._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
@@ -581,9 +587,9 @@ module.exports = WithMatrixClient(React.createClass({
             // still loading
             devComponents = <Spinner />;
         } else if (devices === null) {
-            devComponents = "Unable to load device list";
+            devComponents = _t("Unable to load device list");
         } else if (devices.length === 0) {
-            devComponents = "No devices with registered encryption keys";
+            devComponents = _t("No devices with registered encryption keys");
         } else {
             devComponents = [];
             for (var i = 0; i < devices.length; i++) {
@@ -595,7 +601,7 @@ module.exports = WithMatrixClient(React.createClass({
 
         return (
             <div>
-                <h3>Devices</h3>
+                <h3>{ _t("Devices") }</h3>
                 <div className="mx_MemberInfo_devices">
                     {devComponents}
                 </div>
@@ -644,11 +650,11 @@ module.exports = WithMatrixClient(React.createClass({
                 <div className="mx_RoomTile_avatar">
                     <img src="img/create-big.svg" width="26" height="26" />
                 </div>
-                <div className={labelClasses}><i>Start new chat</i></div>
+                <div className={labelClasses}><i>{ _t("Start a chat") }</i></div>
             </AccessibleButton>;
 
             startChat = <div>
-                <h3>Direct chats</h3>
+                <h3>{ _t("Direct chats") }</h3>
                 {tiles}
                 {startNewChat}
             </div>;
@@ -661,7 +667,7 @@ module.exports = WithMatrixClient(React.createClass({
 
         if (this.state.can.kick) {
             const membership = this.props.member.membership;
-            const kickLabel = membership === "invite" ? "Disinvite" : "Kick";
+            const kickLabel = membership === "invite" ? _t("Disinvite") : _t("Kick");
             kickButton = (
                 <AccessibleButton className="mx_MemberInfo_field"
                         onClick={this.onKick}>
@@ -670,9 +676,9 @@ module.exports = WithMatrixClient(React.createClass({
             );
         }
         if (this.state.can.ban) {
-            let label = 'Ban';
+            let label = _t("Ban");
             if (this.props.member.membership == 'ban') {
-                label = 'Unban';
+                label = _t("Unban");
             }
             banButton = (
                 <AccessibleButton className="mx_MemberInfo_field"
@@ -682,7 +688,7 @@ module.exports = WithMatrixClient(React.createClass({
             );
         }
         if (this.state.can.mute) {
-            const muteLabel = this.state.muted ? "Unmute" : "Mute";
+            const muteLabel = this.state.muted ? _t("Unmute") : _t("Mute");
             muteButton = (
                 <AccessibleButton className="mx_MemberInfo_field"
                         onClick={this.onMuteToggle}>
@@ -691,7 +697,7 @@ module.exports = WithMatrixClient(React.createClass({
             );
         }
         if (this.state.can.toggleMod) {
-            var giveOpLabel = this.state.isTargetMod ? "Revoke Moderator" : "Make Moderator";
+            var giveOpLabel = this.state.isTargetMod ? _t("Revoke Moderator") : _t("Make Moderator");
             giveModButton = <AccessibleButton className="mx_MemberInfo_field" onClick={this.onModToggle}>
                 {giveOpLabel}
             </AccessibleButton>;
@@ -742,7 +748,7 @@ module.exports = WithMatrixClient(React.createClass({
                         { this.props.member.userId }
                     </div>
                     <div className="mx_MemberInfo_profileField">
-                        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 }
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index bd386ed1bb..6fe1ad1b79 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 var React = require('react');
+import _t from 'counterpart-riot';
 var classNames = require('classnames');
 var Matrix = require("matrix-js-sdk");
 var q = require('q');
@@ -207,7 +208,9 @@ module.exports = React.createClass({
         // For now we'll pretend this is any entity. It should probably be a separate tile.
         var EntityTile = sdk.getComponent("rooms.EntityTile");
         var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") + "...";
+        var text = (overflowCount > 1)
+        	? _t("and %(overflowCount)s others...", { overflowCount: overflowCount })
+        	: _t("and one other...");
         return (
             <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
                 <BaseAvatar url="img/ellipsis.svg" name="..." width={36} height={36} />
@@ -363,8 +366,8 @@ module.exports = React.createClass({
         var inputBox = (
             <form autoComplete="off">
                 <input className="mx_MemberList_query" id="mx_MemberList_query" type="text"
-                    onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
-                    placeholder="Filter room members" />
+                        onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
+                        placeholder={ _t('Filter room members') } />
             </form>
         );
 
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 830d3f38ff..a9b65d4611 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 var React = require('react');
-
+import _t from 'counterpart-riot';
 var CallHandler = require('../../../CallHandler');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var Modal = require('../../../Modal');
@@ -93,8 +93,8 @@ export default class MessageComposer extends React.Component {
         if (MatrixClientPeg.get().isGuest()) {
             let NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
-                title: "Please Register",
-                description: "Guest users can't upload files. Please register to upload.",
+                title: _t('Please Register'),
+                description: _t('Guest users can\'t upload files. Please register to upload') + '.',
             });
             return;
         }
@@ -118,15 +118,16 @@ export default class MessageComposer extends React.Component {
         }
 
         Modal.createDialog(QuestionDialog, {
-            title: "Upload Files",
+            title: _t('Upload Files'),
             description: (
                 <div>
-                    <p>Are you sure you want upload the following files?</p>
+                    <p>{ _t('Are you sure you want upload the following files?') }</p>
                     <ul style={{listStyle: 'none', textAlign: 'left'}}>
                         {fileList}
                     </ul>
                 </div>
             ),
+            button: _t("OK"),
             onFinished: (shouldUpload) => {
                 if(shouldUpload) {
                     // MessageComposer shouldn't have to rely on its parent passing in a callback to upload a file
@@ -240,11 +241,11 @@ export default class MessageComposer extends React.Component {
         if (roomIsEncrypted) {
             // FIXME: show a /!\ if there are untrusted devices in the room...
             e2eImg = 'img/e2e-verified.svg';
-            e2eTitle = 'Encrypted room';
+            e2eTitle = _t('Encrypted room');
             e2eClass = 'mx_MessageComposer_e2eIcon';
         } else {
             e2eImg = 'img/e2e-unencrypted.svg';
-            e2eTitle = 'Unencrypted room';
+            e2eTitle = _t('Unencrypted room');
             e2eClass = 'mx_MessageComposer_e2eIcon mx_filterFlipColor';
         }
 
@@ -257,16 +258,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="Hangup" title="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="Voice call">
+                <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="Video call">
+                <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>;
         }
@@ -280,7 +281,7 @@ export default class MessageComposer extends React.Component {
             // complex because of conference calls.
             var uploadButton = (
                 <div key="controls_upload" className="mx_MessageComposer_upload"
-                        onClick={this.onUploadClick} title="Upload file">
+                        onClick={this.onUploadClick} title={ _t('Upload file') }>
                     <TintableSvg src="img/icons-upload.svg" width="35" height="35"/>
                     <input ref="uploadInput" type="file"
                         style={uploadInputStyle}
@@ -300,7 +301,7 @@ export default class MessageComposer extends React.Component {
             );
 
             const placeholderText = roomIsEncrypted ?
-                "Send an encrypted message…" : "Send a message (unencrypted)…";
+                _t('Send an encrypted message') + '…' : _t('Send a message (unencrypted)') + '…';
 
             controls.push(
                 <MessageComposerInput
@@ -325,7 +326,7 @@ export default class MessageComposer extends React.Component {
         } else {
             controls.push(
                 <div key="controls_error" className="mx_MessageComposer_noperm_error">
-                    You do not have permission to post to this room
+                    { _t('You do not have permission to post to this room') }
                 </div>
             );
         }
@@ -354,7 +355,7 @@ export default class MessageComposer extends React.Component {
                     mx_filterFlipColor: true,
                 });
                 return <img className={className}
-                            title={name}
+                            title={ _t(name) }
                             onMouseDown={disabled ? null : onFormatButtonClicked}
                             key={name}
                             src={`img/button-text-${name}${suffix}.svg`}
@@ -374,11 +375,11 @@ export default class MessageComposer extends React.Component {
                         <div className="mx_MessageComposer_formatbar" style={this.state.showFormatting ? {} : {display: 'none'}}>
                             {formatButtons}
                             <div style={{flex: 1}}></div>
-                            <img title={`Turn Markdown ${this.state.inputState.isRichtextEnabled ? 'on' : '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="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 af361db235..adb2a4c6aa 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -30,6 +30,7 @@ import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
 import SlashCommands from '../../../SlashCommands';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 
 import dis from '../../../dispatcher';
 import KeyCode from '../../../KeyCode';
@@ -504,8 +505,9 @@ export default class MessageComposerInput extends React.Component {
                     console.error("Command failure: %s", err);
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createDialog(ErrorDialog, {
-                        title: "Server error",
-                        description: ((err && err.message) ? err.message : "Server unavailable, overloaded, or something else went wrong."),
+                        title: _t("Server error"),
+                        description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."),
+                        button: _t("OK"),
                     });
                 });
             }
@@ -513,8 +515,9 @@ export default class MessageComposerInput extends React.Component {
                 console.error(cmd.error);
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Command error",
-                    description: cmd.error
+                    title: _t("Command error"),
+                    description: cmd.error,
+                    button: _t("OK"),
                 });
             }
             return true;
@@ -719,7 +722,7 @@ export default class MessageComposerInput extends React.Component {
                 <div className={className}>
                     <img className="mx_MessageComposer_input_markdownIndicator mx_filterFlipColor"
                          onMouseDown={this.onMarkdownToggleClicked}
-                         title={`Markdown is ${this.state.isRichtextEnabled ? 'disabled' : 'enabled'}`}
+                         title={ this.state.isRichtextEnabled ? _t("Markdown is disabled") : _t("Markdown is enabled")}
                          src={`img/button-md-${!this.state.isRichtextEnabled}.png`} />
                     <Editor ref="editor"
                             placeholder={this.props.placeholder}
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index adc6bc2c91..2bbb1cbb87 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -20,6 +20,7 @@ var SlashCommands = require("../../../SlashCommands");
 var Modal = require("../../../Modal");
 var MemberEntry = require("../../../TabCompleteEntries").MemberEntry;
 var sdk = require('../../../index');
+import _t from 'counterpart-riot';
 import UserSettingsStore from "../../../UserSettingsStore";
 
 var dis = require("../../../dispatcher");
@@ -294,8 +295,9 @@ export default React.createClass({
             else {
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Unknown command",
-                    description: "Usage: /markdown on|off"
+                    title: _t("Unknown command"),
+                    description: _t("Usage") + ": /markdown on|off",
+                    button: _t("OK"),
                 });
             }
             return;
@@ -314,8 +316,9 @@ export default React.createClass({
                     console.error("Command failure: %s", err);
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     Modal.createDialog(ErrorDialog, {
-                        title: "Server error",
-                        description: ((err && err.message) ? err.message : "Server unavailable, overloaded, or something else went wrong."),
+                        title: _t("Server error"),
+                        description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."),
+                        button: _t("OK"),
                     });
                 });
             }
@@ -323,8 +326,9 @@ export default React.createClass({
                 console.error(cmd.error);
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: "Command error",
-                    description: cmd.error
+                    title: _t("Command error"),
+                    description: cmd.error,
+                    button: _t("OK"),
                 });
             }
             return;
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 4cf20454a0..f9779d088e 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -19,6 +19,7 @@ limitations under the License.
 var React = require('react');
 var classNames = require('classnames');
 var sdk = require('../../../index');
+import _t from 'counterpart-riot';
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var Modal = require("../../../Modal");
 var dis = require("../../../dispatcher");
@@ -119,8 +120,9 @@ module.exports = React.createClass({
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to set avatar: " + errMsg);
             Modal.createDialog(ErrorDialog, {
-                title: "Error",
-                description: "Failed to set avatar.",
+                title: _t("Error"),
+                description: _t("Failed to set avatar") + ".",
+                button: _t("OK"),
             });
         }).done();
     },
@@ -205,7 +207,7 @@ module.exports = React.createClass({
             // don't display the search count until the search completes and
             // gives us a valid (possibly zero) searchCount.
             if (this.props.searchInfo && this.props.searchInfo.searchCount !== undefined && this.props.searchInfo.searchCount !== null) {
-                searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;(~{ this.props.searchInfo.searchCount } results)</div>;
+                searchStatus = <div className="mx_RoomHeader_searchStatus">&nbsp;{ _t("(~%(searchCount)s results)", { searchCount: this.props.searchInfo.searchCount }) }</div>;
             }
 
             // XXX: this is a bit inefficient - we could just compare room.name for 'Empty room'...
@@ -220,7 +222,7 @@ module.exports = React.createClass({
                 }
             }
 
-            var roomName = 'Join Room';
+            var roomName = _t("Join Room");
             if (this.props.oobData && this.props.oobData.name) {
                 roomName = this.props.oobData.name;
             } else if (this.props.room) {
@@ -261,7 +263,7 @@ module.exports = React.createClass({
                     <div className="mx_RoomHeader_avatarPicker_edit">
                         <label htmlFor="avatarInput" ref="file_label">
                             <img src="img/camera.svg"
-                                alt="Upload avatar" title="Upload avatar"
+                                alt={ _t("Upload avatar") } title={ _t("Upload avatar") }
                                 width="17" height="15" />
                         </label>
                         <input id="avatarInput" type="file" onChange={ this.onAvatarSelected }/>
@@ -296,7 +298,7 @@ module.exports = React.createClass({
         var forget_button;
         if (this.props.onForgetClick) {
             forget_button =
-                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onForgetClick} title="Forget room">
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onForgetClick} title={ _t("Forget room") }>
                     <TintableSvg src="img/leave.svg" width="26" height="20"/>
                 </AccessibleButton>;
         }
@@ -304,7 +306,7 @@ module.exports = React.createClass({
         let search_button;
         if (this.props.onSearchClick && this.props.inRoom) {
             search_button =
-                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title="Search">
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.props.onSearchClick} title={ _t("Search") }>
                     <TintableSvg src="img/icons-search.svg" width="35" height="35"/>
                 </AccessibleButton>;
         }
@@ -312,7 +314,7 @@ module.exports = React.createClass({
         var rightPanel_buttons;
         if (this.props.collapsedRhs) {
             rightPanel_buttons =
-                <AccessibleButton className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title="Show panel">
+                <AccessibleButton className="mx_RoomHeader_button" onClick={this.onShowRhsClick} title={ _t('Show panel') }>
                     <TintableSvg src="img/maximise.svg" width="10" height="16"/>
                 </AccessibleButton>;
         }
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 760b0543c6..b463928482 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 var React = require("react");
 var ReactDOM = require("react-dom");
+import _t from 'counterpart-riot';
 var GeminiScrollbar = require('react-gemini-scrollbar');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var CallHandler = require('../../../CallHandler');
@@ -470,13 +471,12 @@ module.exports = React.createClass({
     render: function() {
         var RoomSubList = sdk.getComponent('structures.RoomSubList');
         var self = this;
-
         return (
             <GeminiScrollbar className="mx_RoomList_scrollbar"
                  autoshow={true} onScroll={ self._whenScrolling } ref="gemscroll">
             <div className="mx_RoomList">
                 <RoomSubList list={ self.state.lists['im.vector.fake.invite'] }
-                             label="Invites"
+                             label={ _t('Invites') }
                              editable={ false }
                              order="recent"
                              selectedRoom={ self.props.selectedRoom }
@@ -487,9 +487,9 @@ module.exports = React.createClass({
                              onShowMoreRooms={ self.onShowMoreRooms } />
 
                 <RoomSubList list={ self.state.lists['m.favourite'] }
-                             label="Favourites"
+                             label={ _t('Favourites') }
                              tagName="m.favourite"
-                             verb="favourite"
+                             verb={ _t('to favourite') }
                              editable={ true }
                              order="manual"
                              selectedRoom={ self.props.selectedRoom }
@@ -500,9 +500,9 @@ module.exports = React.createClass({
                              onShowMoreRooms={ self.onShowMoreRooms } />
 
                 <RoomSubList list={ self.state.lists['im.vector.fake.direct'] }
-                             label="People"
+                             label={ _t('People') }
                              tagName="im.vector.fake.direct"
-                             verb="tag direct chat"
+                             verb={ _t('to tag direct chat') }
                              editable={ true }
                              order="recent"
                              selectedRoom={ self.props.selectedRoom }
@@ -514,9 +514,9 @@ module.exports = React.createClass({
                              onShowMoreRooms={ self.onShowMoreRooms } />
 
                 <RoomSubList list={ self.state.lists['im.vector.fake.recent'] }
-                             label="Rooms"
+                             label={ _t('Rooms') }
                              editable={ true }
-                             verb="restore"
+                             verb={ _t('to restore') }
                              order="recent"
                              selectedRoom={ self.props.selectedRoom }
                              incomingCall={ self.state.incomingCall }
@@ -531,7 +531,7 @@ module.exports = React.createClass({
                              key={ tagName }
                              label={ tagName }
                              tagName={ tagName }
-                             verb={ "tag as " + tagName }
+                             verb={ _t('to tag as %(tagName)s', {tagName: tagName}) }
                              editable={ true }
                              order="manual"
                              selectedRoom={ self.props.selectedRoom }
@@ -545,9 +545,9 @@ module.exports = React.createClass({
                 }) }
 
                 <RoomSubList list={ self.state.lists['m.lowpriority'] }
-                             label="Low priority"
+                             label={ _t('Low priority') }
                              tagName="m.lowpriority"
-                             verb="demote"
+                             verb={ _t('to demote') }
                              editable={ true }
                              order="recent"
                              selectedRoom={ self.props.selectedRoom }
@@ -558,7 +558,7 @@ module.exports = React.createClass({
                              onShowMoreRooms={ self.onShowMoreRooms } />
 
                 <RoomSubList list={ self.state.lists['im.vector.fake.archived'] }
-                             label="Historical"
+                             label={ _t('Historical') }
                              editable={ false }
                              order="recent"
                              selectedRoom={ self.props.selectedRoom }
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 5b7ec9347b..54857845ce 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -21,6 +21,8 @@ var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 
+import _t from 'counterpart-riot';
+
 module.exports = React.createClass({
     displayName: 'RoomPreviewBar',
 
@@ -84,7 +86,7 @@ module.exports = React.createClass({
     _roomNameElement: function(fallback) {
         fallback = fallback || 'a room';
         const name = this.props.room ? this.props.room.name : (this.props.room_alias || "");
-        return name ? <b>{ name }</b> : fallback;
+        return name ? { name } : fallback;
     },
 
     render: function() {
@@ -128,13 +130,14 @@ module.exports = React.createClass({
                         </div>;
                 }
             }
+            // TODO: find a way to respect HTML in counterpart!
             joinBlock = (
                 <div>
                     <div className="mx_RoomPreviewBar_invite_text">
-                        You have been invited to join this room by <b>{ this.props.inviterName }</b>
+                        { _t('You have been invited to join this room by %(inviterName)s', {inviterName: this.props.inviterName}) }
                     </div>
                     <div className="mx_RoomPreviewBar_join_text">
-                        Would you like to <a onClick={ this.props.onJoinClick }>accept</a> or <a onClick={ this.props.onRejectClick }>decline</a> this invitation?
+                        { _t('Would you like to') } <a onClick={ this.props.onJoinClick }>{ _t('accept') }</a> { _t('or') } <a onClick={ this.props.onRejectClick }>{ _t('decline') }</a> { _t('this invitation?') }
                     </div>
                     {emailMatchBlock}
                 </div>
@@ -186,8 +189,8 @@ module.exports = React.createClass({
             joinBlock = (
                 <div>
                     <div className="mx_RoomPreviewBar_join_text">
-                        You are trying to access { name }.<br/>
-                        <a onClick={ this.props.onJoinClick }><b>Click here</b></a> to join the discussion!
+                        { _t('You are trying to access %(roomName)s', {roomName: name}) }.<br/>
+                        <a onClick={ this.props.onJoinClick }><b>{ _t('Click here') }</b></a> { _t('to join the discussion') }!
                     </div>
                 </div>
             );
@@ -196,7 +199,7 @@ module.exports = React.createClass({
         if (this.props.canPreview) {
             previewBlock = (
                 <div className="mx_RoomPreviewBar_preview_text">
-                    This is a preview of this room. Room interactions have been disabled.
+                    { _t('This is a preview of this room. Room interactions have been disabled') }.
                 </div>
             );
         }
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 798aacfa8e..02efd439a4 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 import q from 'q';
 import React from 'react';
+import _t from 'counterpart-riot';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import SdkConfig from '../../../SdkConfig';
 import sdk from '../../../index';
@@ -56,8 +57,9 @@ const BannedUser = React.createClass({
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to unban: " + err);
                     Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "Failed to unban",
+                        title: _t('Error'),
+                        description: _t('Failed to unban'),
+                        button: _t("OK"),
                     });
                 }).done();
             },
@@ -70,7 +72,7 @@ const BannedUser = React.createClass({
                 <AccessibleButton className="mx_RoomSettings_unbanButton"
                     onClick={this._onUnbanClick}
                 >
-                    Unban
+                    { _t('Unban') }
                 </AccessibleButton>
                 {this.props.member.userId}
             </li>
@@ -400,13 +402,13 @@ module.exports = React.createClass({
         var value = ev.target.value;
 
         Modal.createDialog(QuestionDialog, {
-            title: "Privacy warning",
+            title: _t('Privacy warning'),
             description:
                 <div>
-                    Changes to who can read history will only apply to future messages in this room.<br/>
-                    The visibility of existing history will be unchanged.
+                    { _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: "Continue",
+            button: _t('Continue'),
             onFinished: function(confirmed) {
                 if (confirmed) {
                     self.setState({
@@ -523,11 +525,12 @@ 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 || "unknown error code";
+            var errCode = err.errcode || _t('unknown error code');
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: "Error",
-                description: `Failed to forget room (${errCode})`
+                title: _t('Error'),
+                description: _t("Failed to forget room %(errCode)s", { errCode: errCode }),
+                button: _t("OK"),
             });
         });
     },
@@ -537,16 +540,17 @@ module.exports = React.createClass({
 
         var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
-            title: "Warning!",
+            title: _t('Warning') + '!',
             description: (
                 <div>
-                    <p>End-to-end encryption is in beta and may not be reliable.</p>
-                    <p>You should <b>not</b> yet trust it to secure data.</p>
-                    <p>Devices will <b>not</b> yet be able to decrypt history from before they joined the room.</p>
-                    <p>Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now).</p>
-                    <p>Encrypted messages will not be visible on clients that do not yet implement encryption.</p>
+                    <p>{ _t('End-to-end encryption is in beta and may not be reliable') }.</p>
+                    <p>{ _t('You should <b>not</b> yet trust it to secure data') }.</p>
+                    <p>{ _t('Devices will <b>not</b> yet be able to decrypt history from before they joined the room') }.</p>
+                    <p>{ _t('Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)') }.</p>
+                    <p>{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.</p>
                 </div>
             ),
+            button: "OK",
             onFinished: confirm=>{
                 if (!confirm) {
                     this.refs.encrypt.checked = false;
@@ -572,7 +576,7 @@ module.exports = React.createClass({
                 <input type="checkbox" ref="blacklistUnverified"
                        defaultChecked={ isGlobalBlacklistUnverified || isRoomBlacklistUnverified }
                        disabled={ isGlobalBlacklistUnverified || (this.refs.encrypt && !this.refs.encrypt.checked) }/>
-                Never send encrypted messages to unverified devices in this room from this device.
+                { _t('Never send encrypted messages to unverified devices in this room from this device') }.
             </label>;
 
         if (!isEncrypted &&
@@ -582,7 +586,7 @@ module.exports = React.createClass({
                     <label>
                         <input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/>
                         <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" />
-                        Enable encryption (warning: cannot be disabled again!)
+                        { _t('Enable encryption') } { _t('(warning: cannot be disabled again!)') }
                     </label>
                     { settings }
                 </div>
@@ -596,7 +600,7 @@ module.exports = React.createClass({
                       ? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" />
                       : <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" />
                     }
-                    Encryption is { isEncrypted ? "" : "not " } enabled in this room.
+                    { isEncrypted ? "Encryption is enabled in this room" : "Encryption is not enabled in this room" }.
                     </label>
                     { settings }
                 </div>
@@ -647,12 +651,12 @@ module.exports = React.createClass({
         if (Object.keys(user_levels).length) {
             userLevelsSection =
                 <div>
-                    <h3>Privileged Users</h3>
+                    <h3>{ _t('Privileged Users') }</h3>
                     <ul className="mx_RoomSettings_userLevels">
                         {Object.keys(user_levels).map(function(user, i) {
                             return (
                                 <li className="mx_RoomSettings_userLevel" key={user}>
-                                    { user } is a <PowerSelector value={ user_levels[user] } disabled={true}/>
+                                    { user } { _t('is a') } <PowerSelector value={ user_levels[user] } disabled={true}/>
                                 </li>
                             );
                         })}
@@ -660,7 +664,7 @@ module.exports = React.createClass({
                 </div>;
         }
         else {
-            userLevelsSection = <div>No users have specific privileges in this room.</div>;
+            userLevelsSection = <div>{ _t('No users have specific privileges in this room') }.</div>;
         }
 
         var banned = this.props.room.getMembersWithMembership("ban");
@@ -668,7 +672,7 @@ module.exports = React.createClass({
         if (banned.length) {
             bannedUsersSection =
                 <div>
-                    <h3>Banned users</h3>
+                    <h3>{ _t('Banned users') }</h3>
                     <ul className="mx_RoomSettings_banned">
                         {banned.map(function(member) {
                             return (
@@ -683,7 +687,7 @@ module.exports = React.createClass({
         if (this._yankValueFromEvent("m.room.create", "m.federate") === false) {
              unfederatableSection = (
                 <div className="mx_RoomSettings_powerLevel">
-                Ths room is not accessible by remote Matrix servers.
+                { _t('This room is not accessible by remote Matrix servers') }.
                 </div>
             );
         }
@@ -694,14 +698,14 @@ module.exports = React.createClass({
             if (myMember.membership === "join") {
                 leaveButton = (
                     <AccessibleButton className="mx_RoomSettings_leaveButton" onClick={ this.onLeaveClick }>
-                        Leave room
+                        { _t('Leave room') }
                     </AccessibleButton>
                 );
             }
             else if (myMember.membership === "leave") {
                 leaveButton = (
                     <AccessibleButton className="mx_RoomSettings_leaveButton" onClick={ this.onForgetClick }>
-                        Forget room
+                        { _t('Forget room') }
                     </AccessibleButton>
                 );
             }
@@ -711,8 +715,8 @@ module.exports = React.createClass({
         // TODO: support editing custom user_levels
 
         var tags = [
-            { name: "m.favourite", label: "Favourite", ref: "tag_favourite" },
-            { name: "m.lowpriority", label: "Low priority", ref: "tag_lowpriority" },
+            { name: "m.favourite", label: _t('Favourite'), ref: "tag_favourite" },
+            { name: "m.lowpriority", label: _t('Low priority'), ref: "tag_lowpriority" },
         ];
 
         Object.keys(this.state.tags).sort().forEach(function(tagName) {
@@ -753,7 +757,7 @@ module.exports = React.createClass({
         if (this.state.join_rule === "public" && aliasCount == 0) {
             addressWarning =
                 <div className="mx_RoomSettings_warning">
-                    To link to a room it must have <a href="#addresses">an address</a>.
+                		{ _t('To link to a room it must have') } <a href="#addresses"> { _t('an address') }</a>.
                 </div>;
         }
 
@@ -761,10 +765,10 @@ module.exports = React.createClass({
         if (this.state.join_rule !== "public" && this.state.guest_access === "forbidden") {
             inviteGuestWarning =
                 <div className="mx_RoomSettings_warning">
-                    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();
-                    }}>Click here to fix</a>.
+                    }}>{ _t('Click here to fix') }</a>.
                 </div>;
         }
 
@@ -776,7 +780,7 @@ module.exports = React.createClass({
                 console.error(this.state.scalar_error);
                 integrationsError = (
                     <span className="mx_RoomSettings_integrationsButton_errorPopup">
-                        Could not connect to the integration server
+                        { _t('Could not connect to the integration server') }
                     </span>
                 );
             }
@@ -784,7 +788,7 @@ module.exports = React.createClass({
             if (this.scalarClient.hasCredentials()) {
                 integrationsButton = (
                     <div className="mx_RoomSettings_integrationsButton" onClick={ this.onManageIntegrations }>
-                        Manage Integrations
+                        { _t('Manage Integrations') }
                     </div>
                 );
             } else if (this.state.scalar_error) {
@@ -797,7 +801,7 @@ module.exports = React.createClass({
             } else {
                 integrationsButton = (
                     <div className="mx_RoomSettings_integrationsButton" style={{opacity: 0.5}}>
-                        Manage Integrations
+                        { _t('Manage Integrations') }
                     </div>
                 );
             }
@@ -813,28 +817,28 @@ module.exports = React.createClass({
 
                 <div className="mx_RoomSettings_toggles">
                     <div className="mx_RoomSettings_settings">
-                        <h3>Who can access this room?</h3>
+                        <h3>{ _t('Who can access this room?') }</h3>
                         { inviteGuestWarning }
                         <label>
                             <input type="radio" name="roomVis" value="invite_only"
                                 disabled={ !this.mayChangeRoomAccess() }
                                 onChange={this._onRoomAccessRadioToggle}
                                 checked={this.state.join_rule !== "public"}/>
-                            Only people who have been invited
+                            { _t('Only people who have been invited') }
                         </label>
                         <label>
                             <input type="radio" name="roomVis" value="public_no_guests"
                                 disabled={ !this.mayChangeRoomAccess() }
                                 onChange={this._onRoomAccessRadioToggle}
                                 checked={this.state.join_rule === "public" && this.state.guest_access !== "can_join"}/>
-                            Anyone who knows the room's link, apart from guests
+                            { _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() }
                                 onChange={this._onRoomAccessRadioToggle}
                                 checked={this.state.join_rule === "public" && this.state.guest_access === "can_join"}/>
-                            Anyone who knows the room's link, including guests
+                            { _t('Anyone who knows the room\'s link, including guests') }
                         </label>
                         { addressWarning }
                         <br/>
@@ -847,7 +851,7 @@ module.exports = React.createClass({
                         </label>
                     </div>
                     <div className="mx_RoomSettings_settings">
-                        <h3>Who can read history?</h3>
+                        <h3>{ _t('Who can read history?') }</h3>
                         <label>
                             <input type="radio" name="historyVis" value="world_readable"
                                     disabled={ !roomState.mayClientSendStateEvent("m.room.history_visibility", cli) }
@@ -860,28 +864,28 @@ module.exports = React.createClass({
                                     disabled={ !roomState.mayClientSendStateEvent("m.room.history_visibility", cli) }
                                     checked={historyVisibility === "shared"}
                                     onChange={this._onHistoryRadioToggle} />
-                            Members only (since the point in time of selecting this option)
+                            { _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) }
                                     checked={historyVisibility === "invited"}
                                     onChange={this._onHistoryRadioToggle} />
-                            Members only (since they were invited)
+                            { _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) }
                                     checked={historyVisibility === "joined"}
                                     onChange={this._onHistoryRadioToggle} />
-                            Members only (since they joined)
+                            { _t('Members only') } ({ _t('since they joined') })
                         </label>
                     </div>
                 </div>
 
 
                 <div>
-                    <h3>Room Colour</h3>
+                    <h3>{ _t('Room Colour') }</h3>
                     <ColorSettings ref="color_settings" room={this.props.room} />
                 </div>
 
@@ -899,41 +903,41 @@ module.exports = React.createClass({
 
                 <UrlPreviewSettings ref="url_preview_settings" room={this.props.room} />
 
-                <h3>Permissions</h3>
+                <h3>{ _t('Permissions') }</h3>
                 <div className="mx_RoomSettings_powerLevels mx_RoomSettings_settings">
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">The default role for new room members is </span>
+                        <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}/>
                     </div>
                     <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">To send messages, you must be a </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To send messages') }, { _t('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">To invite users into the room, you must be a </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To invite users into the room') }, { _t('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">To configure the room, you must be a </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To configure the room') }, { _t('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">To kick users, you must be a </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To kick users') }, { _t('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">To ban users, you must be a </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To ban users') }, { _t('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">To redact other users' messages, you must be a </span>
+                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To redact other users\' messages') }, { _t('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">To send events of type <code>{ event_type }</code>, you must be a </span>
+                                <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}/>
                             </div>
                         );
@@ -946,9 +950,9 @@ module.exports = React.createClass({
 
                 { bannedUsersSection }
 
-                <h3>Advanced</h3>
+                <h3>{ _t('Advanced') }</h3>
                 <div className="mx_RoomSettings_settings">
-                    This room's internal ID is <code>{ this.props.room.roomId }</code>
+                    { _t('This room\'s internal ID is') } <code>{ this.props.room.roomId }</code>
                 </div>
             </div>
         );
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 50169edad5..1c3ddea705 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -17,6 +17,7 @@ var React = require('react');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var Modal = require("../../../Modal");
 var sdk = require("../../../index");
+import _t from 'counterpart-riot';
 var GeminiScrollbar = require('react-gemini-scrollbar');
 
 // A list capable of displaying entities which conform to the SearchableEntity
@@ -25,7 +26,6 @@ var SearchableEntityList = React.createClass({
     displayName: 'SearchableEntityList',
 
     propTypes: {
-        searchPlaceholderText: React.PropTypes.string,
         emptyQueryShowsAll: React.PropTypes.bool,
         showInputBox: React.PropTypes.bool,
         onQueryChanged: React.PropTypes.func, // fn(inputText)
@@ -37,7 +37,6 @@ var SearchableEntityList = React.createClass({
     getDefaultProps: function() {
         return {
             showInputBox: true,
-            searchPlaceholderText: "Search",
             entities: [],
             emptyQueryShowsAll: false,
             onSubmit: function() {},
@@ -118,7 +117,9 @@ var SearchableEntityList = React.createClass({
     _createOverflowEntity: function(overflowCount, totalCount) {
         var EntityTile = sdk.getComponent("rooms.EntityTile");
         var BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
-        var text = "and " + overflowCount + " other" + (overflowCount > 1 ? "s" : "") + "...";
+        var text = (overflowCount > 1)
+        	? _t("and %(overflowCount)s others...", { overflowCount: overflowCount })
+        	: _t("and one other...");
         return (
             <EntityTile className="mx_EntityTile_ellipsis" avatarJsx={
                 <BaseAvatar url="img/ellipsis.svg" name="..." width={36} height={36} />
@@ -137,7 +138,7 @@ var SearchableEntityList = React.createClass({
                         onChange={this.onQueryChanged} value={this.state.query}
                         onFocus= {() => { this.setState({ focused: true }); }}
                         onBlur= {() => { this.setState({ focused: false }); }}
-                        placeholder={this.props.searchPlaceholderText} />
+                        placeholder={ _t("Search") } />
                 </form>
             );
         }
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 74c689c395..0d68b0dc0d 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -18,6 +18,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
+import _t from 'counterpart-riot';
 var sdk = require('../../../index');
 
 module.exports = React.createClass({
@@ -34,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="Scroll to unread messages"
-                        title="Scroll to unread messages"/>
+                        alt={ _t('Scroll to unread messages') }
+                        title={ _t('Scroll to unread messages') }/>
                     Jump to first unread message.
                 </div>
                 <img className="mx_TopUnreadMessagesBar_close mx_filterFlipColor"
@@ -46,4 +47,3 @@ module.exports = React.createClass({
         );
     },
 });
-
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 6df4d8e8cc..bdb67bc5ff 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -15,13 +15,13 @@ limitations under the License.
 */
 
 import React from 'react';
+import _t from 'counterpart-riot';
 
 import sdk from '../../../index';
 import AddThreepid from '../../../AddThreepid';
 import WithMatrixClient from '../../../wrappers/WithMatrixClient';
 import Modal from '../../../Modal';
 
-
 export default WithMatrixClient(React.createClass({
     displayName: 'AddPhoneNumber',
 
@@ -83,8 +83,9 @@ export default WithMatrixClient(React.createClass({
             console.error("Unable to add phone number: " + err);
             let msg = err.message;
             Modal.createDialog(ErrorDialog, {
-                title: "Error",
+                title: _t("Error"),
                 description: msg,
+                button: _t("OK"),
             });
         }).finally(() => {
             if (this._unmounted) return;
@@ -98,20 +99,19 @@ export default WithMatrixClient(React.createClass({
         if (this._unmounted) return;
         const TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
         let msgElements = [
-            <div key="_static" >A text message has been sent to +{msisdn}.
-            Please enter the verification code it contains</div>
+            <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 = "Incorrect verification code";
+                msg = _t("Incorrect verification code");
             }
             msgElements.push(<div key="_error" className="error">{msg}</div>);
         }
         Modal.createDialog(TextInputDialog, {
-            title: "Enter Code",
+            title: _t("Enter Code"),
             description: <div>{msgElements}</div>,
-            button: "Submit",
+            button: _t("Submit"),
             onFinished: (should_verify, token) => {
                 if (!should_verify) {
                     this._addThreepid = null;
@@ -159,7 +159,7 @@ export default WithMatrixClient(React.createClass({
                         <input type="text"
                             ref={this._collectAddMsisdnInput}
                             className="mx_UserSettings_phoneNumberField"
-                            placeholder="Add phone number"
+                            placeholder={ _t('Add phone number') }
                             value={this.state.phoneNumber}
                             onChange={this._onPhoneNumberChange}
                         />
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 20ce45e5dd..71356fc5f6 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -21,6 +21,7 @@ var MatrixClientPeg = require("../../../MatrixClientPeg");
 var Modal = require("../../../Modal");
 var sdk = require("../../../index");
 import AccessibleButton from '../elements/AccessibleButton';
+import _t from 'counterpart-riot';
 
 module.exports = React.createClass({
     displayName: 'ChangePassword',
@@ -47,11 +48,11 @@ module.exports = React.createClass({
             onCheckPassword: function(oldPass, newPass, confirmPass) {
                 if (newPass !== confirmPass) {
                     return {
-                        error: "New passwords don't match."
+                        error: _t("New passwords don't match") + "."
                     };
                 } else if (!newPass || newPass.length === 0) {
                     return {
-                        error: "Passwords can't be empty"
+                        error: _t("Passwords can't be empty")
                     };
                 }
             }
@@ -69,19 +70,21 @@ module.exports = React.createClass({
 
         var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
-            title: "Warning",
+            title: _t("Warning"),
             description:
                 <div>
-                    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 <a href="https://github.com/vector-im/riot-web/issues/2671">will be improved</a>.
+                    { _t(
+                        '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. '
+                    ) } (<a href="https://github.com/vector-im/riot-web/issues/2671">https://github.com/vector-im/riot-web/issues/2671</a>)
                 </div>,
-            button: "Continue",
+            button: _t("Continue"),
             extraButtons: [
                 <button className="mx_Dialog_primary"
                         onClick={this._onExportE2eKeysClicked}>
-                    Export E2E room keys
+                    { _t('Export E2E room keys') }
                 </button>
             ],
             onFinished: (confirmed) => {
@@ -150,7 +153,7 @@ module.exports = React.createClass({
                     <div className={this.props.className}>
                         <div className={rowClassName}>
                             <div className={rowLabelClassName}>
-                                <label htmlFor="passwordold">Current password</label>
+                                <label htmlFor="passwordold">{ _t('Current password') }</label>
                             </div>
                             <div className={rowInputClassName}>
                                 <input id="passwordold" type="password" ref="old_input" />
@@ -158,7 +161,7 @@ module.exports = React.createClass({
                         </div>
                         <div className={rowClassName}>
                             <div className={rowLabelClassName}>
-                                <label htmlFor="password1">New password</label>
+                                <label htmlFor="password1">{ _t('New password') }</label>
                             </div>
                             <div className={rowInputClassName}>
                                 <input id="password1" type="password" ref="new_input" />
@@ -166,7 +169,7 @@ module.exports = React.createClass({
                         </div>
                         <div className={rowClassName}>
                             <div className={rowLabelClassName}>
-                                <label htmlFor="password2">Confirm password</label>
+                                <label htmlFor="password2">{ _t('Confirm password') }</label>
                             </div>
                             <div className={rowInputClassName}>
                                 <input id="password2" type="password" ref="confirm_input" />
@@ -174,7 +177,7 @@ module.exports = React.createClass({
                         </div>
                         <AccessibleButton className={buttonClassName}
                                 onClick={this.onClickChange}>
-                            Change Password
+                            { _t('Change Password') }
                         </AccessibleButton>
                     </div>
                 );
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index 51f3a83010..c076c5f670 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 
 import sdk from '../../../index';
+import _t from 'counterpart-riot';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import DateUtils from '../../../DateUtils';
@@ -48,7 +49,7 @@ export default class DevicesPanelEntry extends React.Component {
             display_name: value,
         }).catch((e) => {
             console.error("Error setting device display name", e);
-            throw new Error("Failed to set display name");
+            throw new Error(_t("Failed to set display name"));
         });
     }
 
@@ -71,6 +72,7 @@ export default class DevicesPanelEntry extends React.Component {
             var InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
 
             Modal.createDialog(InteractiveAuthDialog, {
+            	title: _t("Authentication"),
                 matrixClient: MatrixClientPeg.get(),
                 authData: error.data,
                 makeRequest: this._makeDeleteRequest,
@@ -84,7 +86,7 @@ export default class DevicesPanelEntry extends React.Component {
             if (this._unmounted) { return; }
             this.setState({
                 deleting: false,
-                deleteError: "Failed to delete device",
+                deleteError: _t("Failed to delete device"),
             });
         }).done();
     }
@@ -132,7 +134,7 @@ export default class DevicesPanelEntry extends React.Component {
             deleteButton = (
                 <div className="mx_textButton"
                   onClick={this._onDeleteClick}>
-                    Delete
+                    { _t("Delete") }
                 </div>
             );
         }
diff --git a/src/createRoom.js b/src/createRoom.js
index 674fe23d28..78e7485237 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -17,6 +17,7 @@ limitations under the License.
 var MatrixClientPeg = require('./MatrixClientPeg');
 var Modal = require('./Modal');
 var sdk = require('./index');
+import _t from 'counterpart-riot';
 var dis = require("./dispatcher");
 var Rooms = require("./Rooms");
 
@@ -43,8 +44,8 @@ function createRoom(opts) {
     if (client.isGuest()) {
         setTimeout(()=>{
             Modal.createDialog(NeedToRegisterDialog, {
-                title: "Please Register",
-                description: "Guest users can't create new rooms. Please register to create room and start a chat."
+                title: _t('Please Register'),
+                description: _t('Guest users can\'t create new rooms. Please register to create room and start a chat') + '.'
             });
         }, 0);
         return q(null);
@@ -104,8 +105,9 @@ function createRoom(opts) {
     }, function(err) {
         console.error("Failed to create room " + roomId + " " + err);
         Modal.createDialog(ErrorDialog, {
-            title: "Failure to create room",
-            description: "Server may be unavailable, overloaded, or you hit a bug.",
+            title: _t("Failure to create room"),
+            description: _t("Server may be unavailable, overloaded, or you hit a bug") + ".",
+            button: _t("OK"),
         });
         return null;
     });
diff --git a/src/i18n/strings/basefile.json b/src/i18n/strings/basefile.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/basefile.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
new file mode 100644
index 0000000000..26889c3bb6
--- /dev/null
+++ b/src/i18n/strings/da.json
@@ -0,0 +1,215 @@
+{
+    "Filter room members": "Filter medlemmer",
+    "You have no visible notifications": "Du har ingen synlige meddelelser",
+    "Invites": "Invitationer",
+    "Favourites": "Favoritter",
+    "People": "Personilg chat",
+    "Rooms": "Rum",
+    "Low priority": "Lav prioritet",
+    "Historical": "Historisk",
+    "New passwords must match each other.": "Nye adgangskoder skal matche hinanden.",
+    "A new password must be entered.": "Der skal indtastes en ny adgangskode.",
+    "The email address linked to your account must be entered.": "Den emailadresse, der tilhører til din adgang, skal indtastes.",
+    "Failed to send email: ": "Kunne ikke sende e-mail: ",
+    "unknown device": "ukendt enhed",
+    "NOT verified": "IKKE verificeret",
+    "Blacklisted": "blokeret",
+    "verified": "verificeret",
+    "Name": "Navn",
+    "Device ID": "Enheds-ID",
+    "Verification": "Verifikation",
+    "Ed25519 fingerprint": "Ed25519 fingerprint",
+    "User ID": "Bruger ID",
+    "Curve25519 identity key": "Curve25519 identitetsnøgle",
+    "Claimed Ed25519 fingerprint key": "Påstået Ed25519 fingeraftryk nøgle",
+    "none": "ingen",
+    "Algorithm": "Algoritme",
+    "unencrypted": "ukrypteret",
+    "Decryption error": "Dekrypteringsfejl",
+    "Session ID": "Sessions ID",
+    "End-to-end encryption information": "End-to-end krypterings oplysninger",
+    "Event information": "Hændelses information",
+    "Sender device information": "Afsende enheds-oplysning",
+    "Displays action": "Viser handling",
+    "Bans user with given id": "Forbyder bruger med givet id",
+    "Deops user with given id": "Fjerner OP af bruger med givet id",
+    "Invites user with given id to current room": "Inviterer bruger med givet id til nuværende rum",
+    "Joins room with given alias": "Kommer ind i rum med givet alias",
+    "Kicks user with given id": "Smid bruger med givet id ud",
+    "Changes your display nickname": "Ændrer dit visningsnavn",
+    "Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater",
+    "Commands": "kommandoer",
+    "Emoji": "Emoji",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar.": "Kan ikke oprette forbindelse til hjemmeserver via HTTP, når en HTTPS-URL er i din browserbjælke.",
+    "Sorry, this homeserver is using a login which is not recognised ": "Beklager, denne homeerver bruger et login, der ikke kan genkendes ",
+    "Login as guest": "Log ind som gæst",
+    "Return to app": "Tilbage til app",
+    "Sign in": "Log ind",
+    "Create a new account": "Oprette en ny bruger",
+    "Send an encrypted message": "Send en krypteret meddelelse",
+    "Send a message (unencrypted)": "Send en meddelelse (ukrypteret)",
+    "Warning": "Advarsel",
+    "accept": "acceptere",
+    "accepted an invitation": "Godkendt en invitation",
+    "accepted the invitation for": "Accepteret invitationen til",
+    "Account": "Konto",
+    "Add email address": "Tilføj e-mail-adresse",
+    "Add phone number": "Tilføj telefonnummer",
+    "Admin": "Administrator",
+    "Advanced": "Avanceret",
+    "all room members": "Alle rum medlemmer",
+    "all room members, from the point they are invited": "Alle rum medlemmer, siden invitations-tidspunkt",
+    "all room members, from the point they joined": "Alle rum medlemmer, siden de deltog",
+    "an address": "en adresse",
+    "and": "og",
+    "An email has been sent to": "En e-mail blev sendt til",
+    "answered the call.": "svarede på kaldet",
+    "anyone.": "alle",
+    "Anyone who knows the room's link, apart from guests": "Alle der kender link til rummet, bortset fra gæster",
+    "Anyone who knows the room's link, including guests": "Alle der kender link til rummet, inklusiv gæster",
+    "Are you sure you want to leave the room?": "Er du sikker på du vil forlade rummet?",
+    "Are you sure you want to reject the invitation?": "Er du sikker på du vil afvise invitationen?",
+    "Are you sure you want upload the following files?": "Er du sikker på du vil sende de følgende filer?",
+    "banned": "bortvist",
+    "Banned users": "Bortviste brugere",
+    "Bug Report": "Fejlrapport",
+    "Bulk Options": "Masseindstillinger",
+    "Can't connect to homeserver - please check your connectivity and ensure your": "Kan ikke oprette forbindelse til homeserver - Kontroller din forbindelse og sørg for din ",
+    "Can't load user settings": "Kan ikke indlæse brugerindstillinger",
+    "changed avatar": "Ændret avatar",
+    "changed name": "Ændret navn",
+    "changed their display name from": "Ændret deres visningsnavn fra",
+    "changed their profile picture": "Ændret deres profilbillede",
+    "changed the power level of": "Ændret effektniveauet på",
+    "changed the room name to": "Ændrede rumnavnet til",
+    "changed the topic to": "Ændret emnet til",
+    "Changes to who can read history will only apply to future messages in this room": "Ændringer til hvem der kan læse historie gælder kun for fremtidige meddelelser i dette rum",
+    "Clear Cache and Reload": "Ryd cache og genindlæs",
+    "Clear Cache": "Ryd cache",
+    "Click here": "Klik her",
+    "Click here to fix": "Klik her for at rette",
+    "*️⃣ Commands": "kommandoer",
+    "Confirm your new password": "Bekræft din nye adgangskode",
+    "Continue": "fortsætte",
+    "Could not connect to the integration server": "Kunne ikke oprette forbindelse til integrationsserveren",
+    "Create an account": "Opret en brugerkonto",
+    "Create Room": "Opret rum",
+    "Cryptography": "Kryptografi",
+    "Deactivate Account": "Deaktiver brugerkonto",
+    "Deactivate my account": "Deaktiver min brugerkonto",
+    "decline": "nedgang",
+    "Default": "Standard",
+    "demote": "degradere",
+    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Enhederne vil <b>ikke</b> være i stand til at dekryptere historikken fra, før de kom til rummet",
+    "Direct Chat": "Personligt Chat",
+    "Disable inline URL previews by default": "Deaktiver forrige weblinks forhåndsvisninger som standard",
+    "Display name": "Visningsnavn",
+    "Email Address": "Email adresse",
+    "Email, name or matrix ID": "E-mail, navn eller matrix-id",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Krypterede meddelelser vil ikke være synlige på klienter, der endnu ikke implementerer kryptering",
+    "Encrypted room": "Krypteret rummet",
+    "Encryption is enabled in this room": "Kryptering er aktiveret i dette rum",
+    "Encryption is not enabled in this room": "Kryptering er ikke aktiveret i dette rum",
+    "ended the call.": "Afsluttede opkaldet.",
+    "End-to-end encryption is in beta and may not be reliable": "End-to-end kryptering er i beta og kan ikke være pålidelig",
+    "Error": "Fejl",
+    "Export E2E room keys": "Eksporter E2E rum nøgler",
+    "Failed to change password. Is your password correct?": "Kunne ikke ændre adgangskode. Er din adgangskode korrekt?",
+    "Failed to forget room": "Kunne ikke glemme rummet",
+    "Failed to leave room": "Kunne ikke forlade rum",
+    "Failed to reject invitation": "Kunne ikke afvise invitationen",
+    "Failed to send email": "Kunne ikke sende e-mail",
+    "Failed to set avatar.": "Kunne ikke angive avatar.",
+    "Failed to unban": "Var ikke i stand til at ophæve forbuddet",
+    "Favourite": "Favorit",
+    "Notifications": "Meddelser",
+    "Please Register": "Vær venlig at registrere",
+    "Remove": "Fjerne",
+    "Settings": "Indstillinger",
+    "unknown error code": "Ukendt fejlkode",
+    "en": "Engelsk",
+    "pt-br": "Brasiliansk Portugisisk",
+    "de": "Tysk",
+    "da": "Dansk",
+    "ru": "Russisk",
+    "%(targetName)s accepted an invitation": "%(targetName)s accepterede en invitation",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepteret invitationen til %(displayName)s",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s og %(lastPerson)s er ved at skrive",
+    "%(names)s and one other are typing": "%(names)s og den anden skriver",
+    "%(names)s and %(count)s others are typing": "%(names)s og %(count)s andre skriver",
+    "%(senderName)s answered the call": "%(senderName)s besvarede opkaldet",
+    "af": "Afrikaans",
+    "ar-eg": "Arabisk (Egypten)",
+    "ar-ma": "Arabisk (Marokko)",
+    "ar-sa": "Arabisk (Saudiarabien",
+    "ar-sy": "Arabisk (Syrien)",
+    "be": "Hviderussisk",
+    "bg": "Bulgarisk",
+    "ca": "Katalansk",
+    "cs": "Tjekkisk",
+    "de-at": "Tysk (Østrig)",
+    "de-ch": "Tysk (Schweitz)",
+    "el": "Græsk",
+    "en-au": "Engelsk (Australien)",
+    "en-ca": "Engelsk (Canada)",
+    "en-ie": "Engelsk (Irland)",
+    "en-nz": "Engelsk (New Zealand)",
+    "en-us": "Engelsk (USA)",
+    "en-za": "Engelsk (Sydafrika)",
+    "es-ar": "Spansk (Argentina)",
+    "es-bo": "Spansk (Bolivia)",
+    "es-cl": "Spansk (Chile)",
+    "es-ec": "Spansk (Ecuador)",
+    "es-hn": "Spansk (Honduras)",
+    "es-mx": "Spansk (Mexico)",
+    "es-ni": "Spansk (Nicaragua)",
+    "es-py": "Spansk (Paraguay)",
+    "es": "Spansk (Spanien)",
+    "es-uy": "Spansk (Uruguay)",
+    "es-ve": "Spansk (Venezuela)",
+    "et": "Estonsk",
+    "fa": "Farsi",
+    "fi": "Finsk",
+    "fr-be": "Fransk (Belgien)",
+    "fr-ca": "Fransk (Canada)",
+    "fr-ch": "Fransk (Schweitz)",
+    "fr": "French",
+    "ga": "Irsk",
+    "he": "Hebræisk",
+    "hi": "Hindi",
+    "hr": "Kroatisk",
+    "hu": "Ungarsk",
+    "id": "Indonesisk",
+    "is": "Islandsk",
+    "it": "Italian",
+    "ja": "Japansk",
+    "ji": "Yiddish",
+    "lt": "Littauisk",
+    "lv": "Lettisk",
+    "ms": "Malaysisk",
+    "mt": "Maltesisk",
+    "nl": "Dutch",
+    "no": "Norsk",
+    "pl": "Polsk",
+    "pt": "Portuguese",
+    "ro": "Rumænsk",
+    "sb": "Sorbisk",
+    "sk": "Slovakisk",
+    "sl": "Slovensk",
+    "sq": "Albansk",
+    "sr": "Serbisk (Latin)",
+    "sv": "Svensk",
+    "th": "Thai",
+    "tn": "Tswana",
+    "tr": "Tyrkisk",
+    "ts": "Tonga",
+    "uk": "Ukrainsk",
+    "ur": "Urdu",
+    "ve": "Venda",
+    "vi": "Vietnamesisk",
+    "xh": "Xhosa",
+    "zh-cn": "Kinesisk (Folkerepublikken Kina)",
+    "zh-sg": "Kinesisk (Singapore)",
+    "zh-tw": "Kinesisk (Taiwan)",
+    "zu": "Zulu"
+}
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
new file mode 100644
index 0000000000..1c6b3eb5f3
--- /dev/null
+++ b/src/i18n/strings/de_DE.json
@@ -0,0 +1,702 @@
+{
+    "Filter room members": "Raum Benutzer filtern",
+    "You have no visible notifications": "Du hast keine sichtbaren Benachrichtigungen",
+    "Invites": "Einladungen",
+    "Favourites": "Favoriten",
+    "People": "Direkt-Chats",
+    "Rooms": "Räume",
+    "Low priority": "Niedrige Priorität",
+    "Historical": "Historisch",
+    "New passwords must match each other.": "Die neuen Passwörter müssen identisch sein.",
+    "A new password must be entered.": "Es muss ein neues Passwort eingegeben werden.",
+    "The email address linked to your account must be entered.": "Es muss die Email-Adresse eingeben werden, welche zum Account gehört.",
+    "Failed to send email: ": "Email konnte nicht versendet werden: ",
+    "unknown device": "Unbekanntes Gerät",
+    "NOT verified": "NICHT verifiziert",
+    "Blacklisted": "Blockiert",
+    "verified": "verifiziert",
+    "Name": "Name",
+    "Device ID": "Geräte ID",
+    "Verification": "Verifizierung",
+    "Ed25519 fingerprint": "Ed25519 Fingerprint",
+    "User ID": "Benutzer ID",
+    "Curve25519 identity key": "Curve25519 Identity Schlüssel",
+    "Claimed Ed25519 fingerprint key": "Geforderter Ed25519 Fingerprint Schlüssel",
+    "none": "keiner",
+    "Algorithm": "Algorithmus",
+    "unencrypted": "unverschlüsselt",
+    "Decryption error": "Entschlüsselungs Fehler",
+    "Session ID": "Sitzungs-ID",
+    "End-to-end encryption information": "Ende-zu-Ende Verschlüsselungs Informationen",
+    "Event information": "Ereignis Informationen",
+    "Sender device information": "Absender Geräte Informationen",
+    "Displays action": "Zeigt Aktionen an",
+    "Bans user with given id": "Sperrt Benutzer mit der angegebenen ID",
+    "Deops user with given id": "Entfernt OP beim Benutzer mit der angegebenen ID",
+    "Invites user with given id to current room": "Lädt Benutzer mit der angegebenen ID in den aktuellen Raum ein",
+    "Joins room with given alias": "Betrete Raum mit angegebenen Alias",
+    "Kicks user with given id": "Kickt Benutzer mit angegebener ID",
+    "Changes your display nickname": "Ändert deinen angezeigten Nicknamen",
+    "Searches DuckDuckGo for results": "Suche in DuckDuckGo nach Ergebnissen",
+    "Commands": "Kommandos",
+    "Emoji": "Smileys",
+    "Sorry, this homeserver is using a login which is not recognised ": "Entschuldigung, dieser homeserver nutzt eine Anmeldetechnik die nicht bekannt ist ",
+    "Login as guest": "Anmelden als Gast",
+    "Return to app": "Zurück zur Anwendung",
+    "Sign in": "Anmelden",
+    "Create a new account": "Erstelle einen neuen Benutzer",
+    "Send an encrypted message": "Sende eine verschlüsselte Nachricht",
+    "Send a message (unencrypted)": "Sende eine Nachricht (unverschlüsselt)",
+    "Warning": "Warnung",
+    "Direct Chat": "Privater Chat",
+    "Error": "Fehler",
+    "accept": "akzeptiere",
+    "accepted an invitation": "Einladung akzeptieren",
+    "accepted the invitation for": "Akzeptierte die Einladung für",
+    "Add email address": "Füge E-Mail-Adresse hinzu",
+    "Advanced": "Erweitert",
+    "all room members, from the point they joined": "Alle Raum-Mitglieder - seitdem sie beigetreten sind",
+    "and": "und",
+    "An email has been sent to": "Eine E-Mail wurde gesendet an",
+    "anyone.": "Jeder",
+    "Anyone who knows the room's link, apart from guests": "Jeder der den Raum-Link kennt - abgesehen von Gästen",
+    "Anyone who knows the room's link, including guests": "Jeder der den Raum-Link kennt - auch Gäste",
+    "Are you sure you want to leave the room?": "Bist du sicher, dass du den Raum verlassen willst?",
+    "Are you sure you want to reject the invitation?": "Bist du sicher, dass die die Einladung ablehnen willst?",
+    "Are you sure you want upload the following files?": "Bist du sicher, dass du die folgenden Dateien hochladen willst?",
+    "banned": "gebannt",
+    "Banned users": "Gebannte Nutzer",
+    "Bug Report": "Fehlerbericht",
+    "changed avatar": "änderte Avatar",
+    "changed their display name from": "änderte seinen Anzeigenamen von",
+    "changed their profile picture": "änderte sein Profilbild",
+    "changed the room name to": "änderte den Raumnamen zu",
+    "changed the topic to": "änderte das Thema zu",
+    "Changes to who can read history will only apply to future messages in this room": "Änderungen bzgl. wer die Historie lesen kann betrifft nur zukünftige Nachrichten in diesem Raum",
+    "Clear Cache and Reload": "Leere Cache und lade neu",
+    "Click here": "Klicke hier",
+    "Confirm your new password": "Bestätige dein neues Passwort",
+    "Continue": "Fortfahren",
+    "Create an account": "Erstelle einen Account",
+    "Create Room": "Erstelle Raum",
+    "Cryptography": "Kryptografie",
+    "Deactivate Account": "Deaktiviere Account",
+    "Deactivate my account": "Deaktiviere meinen Account",
+    "decline": "Ablehnen",
+    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Geräte werden <b>nicht</b> in der Lage sein, die Historie vor dem Beitritt in den Raum zu entschlüsseln",
+    "Display name": "Anzeigename",
+    "Email Address": "E-Mail-Adresse",
+    "Email, name or matrix ID": "E-Mail, Name oder Matrix-ID",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Verschlüsselte Nachrichten werden an Clients nicht sichtbar sein, die Verschlüsselung noch nicht implementiert haben",
+    "Encrypted room": "Verschlüsselter Raum",
+    "Encryption is enabled in this room": "Verschlüsselung ist in diesem Raum aktiviert",
+    "Encryption is not enabled in this room": "Verschlüsselung ist in diesem Raum nicht aktiviert",
+    "ended the call.": "beendete den Anruf.",
+    "End-to-end encryption is in beta and may not be reliable": "Ende-zu-Ende-Verschlüsselung ist im Beta-Status und ist evtl. nicht zuverlässig",
+    "Failed to send email": "Fehler beim Senden der E-Mail",
+    "Account": "Konto",
+    "Add phone number": "Füge Telefonnummer hinzu",
+    "an address": "an Adresse",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du wirst keine Benachrichtigungen an anderen Geräten empfangen bis du dich dort erneut anmeldest",
+    "all room members": "Alle Raum-Mitglieder",
+    "all room members, from the point they are invited": "Alle Raum-Mitglieder - seitdem sie eingeladen wurden",
+    "answered the call.": "beantwortete den Anruf.",
+    "Can't load user settings": "Kann Nutzereinstellungen nicht laden",
+    "changed name": "änderte Namen",
+    "changed the power level of": "änderte Berechtigungslevel von",
+    "Clear Cache": "Leere Cache",
+    "Click here to fix": "Klicke hier zum reparieren",
+    "*️⃣ Commands": "*️⃣ Befehle",
+    "Default": "Standard",
+    "demote": "Zum zurückstufen",
+    "Export E2E room keys": "Exportiere E2E-Raum-Schlüssel",
+    "Failed to change password. Is your password correct?": "Passwort-Änderung schlug fehl. Ist dein Passwort korrekt?",
+    "Failed to forget room": "Vergessen des Raums schlug fehl",
+    "Failed to leave room": "Fehler beim Verlassen des Raums",
+    "Failed to reject invitation": "Fehler beim Abweisen der Einladung",
+    "Failed to set avatar.": "Fehler beim Setzen des Avatars.",
+    "Failed to unban": "Entbannen fehlgeschlagen",
+    "Failed to upload file": "Dateiupload fehlgeschlagen",
+    "Favourite": "Favorit",
+    "favourite": "Favoriten",
+    "Forget room": "Raum vergessen",
+    "Forgot your password?": "Passwort vergessen?",
+    "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.": "Aus Sicherheitsgründen werden beim Ausloggen alle Ende-zu-Ende-Verschlüsselungsschlüssel von diesem Browser gelöscht. Wenn du in späteren Riot-Sitzungen die Konversationshistorie entschlüsseln möchtest, exportiere bitte deine Schlüssel zur sicheren Verwahrung.",
+    "For security, this session has been signed out. Please sign in again": "Zur Sicherheit wurde diese Sitzung abgemeldet. Bitte melde dich erneut an",
+    "Found a bug?": "Fehler gefunden?",
+    "Guests cannot join this room even if explicitly invited": "Gäste können diesem Raum nicht beitreten auch wenn sie explizit eingeladen werden",
+    "Guests can't set avatars. Please register.": "Gäste können keine Avatare setzen. Bitte registriere dich.",
+    "Guest users can't upload files. Please register to upload.": "Gäste können keine Dateien hochladen. Bitte registrieren um hochzuladen.",
+    "had": "hatte",
+    "Hangup": "Auflegen",
+    "Homeserver is": "Der Homeserver ist",
+    "Identity Server is": "Der Identitätsserver ist",
+    "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
+    "Import E2E room keys": "Importe E2E-Raum-Schlüssel",
+    "Invalid Email Address": "Ungültige E-Mail-Adresse",
+    "invited": "eingeladen",
+    "Invite new room members": "Lade neue Raum-Mitglieder ein",
+    "is a": "ist ein",
+    "is trusted": "wird vertraut",
+    "I want to sign in with": "Ich möchte mich anmelden mit",
+    "joined and left": "trat bei und ging",
+    "joined": "trat bei",
+    "joined the room": "trat dem Raum bei",
+    "Leave room": "Verlasse Raum",
+    "left and rejoined": "ging(en) und trat(en) erneut bei",
+    "left": "ging",
+    "left the room": "verließ den Raum",
+    "Logged in as": "Angemeldet als",
+    "Logout": "Abmelden",
+    "made future room history visible to": "mache kommende Raum-Historie sichtbar für",
+    "Manage Integrations": "Verwalte Integrationen",
+    "Members only": "Nur Mitglieder",
+    "Mobile phone number": "Mobile Telefonnummer",
+    "Moderator": "Moderator",
+    "my Matrix ID": "Meine 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",
+    "Notifications": "Benachrichtigungen",
+    " (not supported by this browser)": " (von diesem Browser nicht unterstützt)",
+    "<not supported>": "<nicht unterstützt>",
+    "No users have specific privileges in this room": "Keine Nutzer haben in diesem Raum besondere Berechtigungen",
+    "olm version": "OLM-Version",
+    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Sobald Verschlüsselung für einen Raum aktiviert wird, kann diese (aktuell noch) <b>nicht</b> wieder deaktiviert werden",
+    "Only people who have been invited": "Nur Personen die eingeladen wurden",
+    "or": "oder",
+    "other": "weiteres",
+    "others": "andere",
+    "Password": "Passwort",
+    "Permissions": "Berechtigungen",
+    "Phone": "Telefon",
+    "placed a": "plazierte einen",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Bitte prüfen sie ihre E-Mails und klicken sie auf den enthaltenden Link. Anschließend klicke auf \"Fortsetzen\".",
+    "Please Register": "Bitte registrieren",
+    "Privacy warning": "Datenschutzwarnung",
+    "Privileged Users": "Privilegierte Nutzer",
+    "Profile": "Profil",
+    "Refer a friend to Riot": "Lade eine(n) Freund(in) zu Riot ein",
+    "rejected": "abgeleht",
+    "Once you&#39;ve followed the link it contains, click below": "Nachdem du dem Link gefolgt bist, klicke unten",
+    "rejected the invitation.": "lehnte die Einladung ab.",
+    "Reject invitation": "Einladung ablehnen",
+    "Remove Contact Information?": "Lösche Kontakt-Informationen?",
+    "removed their display name": "löschte den eigenen Anzeigenamen",
+    "Remove": "Entferne",
+    "requested a VoIP conference": "hat eine VoIP-Konferenz angefordert",
+    "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "Eine Passwortänderung sorgt aktuell dafür, dass alle Ende-zu-Ende-Schlüssel von allen Geräten zurückgesetzt werden. Dadurch wird die verschlüsselte Chat-Historie unlesbar, es sei denn Sie exportieren vorher Ihre Raum-Schlüssel und importieren sie nachher wieder. In Zukunft wird dies <a href='https://github.com/vector-im/riot-web/issues/2671'>verbessert</a>",
+    "restore": "Zum zurücksetzen",
+    "Return to login screen": "Zur Anmeldung zurückkehren",
+    "Room Colour": "Raumfarbe",
+    "Room name (optional)": "Raumname (optional)",
+    "Scroll to unread messages": "Scrolle zu ungelesenen Nachrichten",
+    "Send Invites": "Sende Einladungen",
+    "Send Reset Email": "Sende Rücksetz-E-mail",
+    "sent an image": "sandte ein Bild",
+    "sent an invitation to": "sandte eine Einladung an",
+    "sent a video": "sandte ein Video",
+    "Server may be unavailable or overloaded": "Server könnte nicht verfügbar oder überlastet sein",
+    "set a profile picture": "setzte ein Profilbild",
+    "set their display name to": "setzte den Anzeigenamen auf",
+    "Settings": "Einstellungen",
+    "Signed Out": "Abgemeldet",
+    "Sign out": "Abmelden",
+    "since the point in time of selecting this option": "seitdem diese Option gewählt wird",
+    "since they joined": "seitdem sie beitraten",
+    "since they were invited": "seitdem sie eingeladen wurden",
+    "Someone": "Jemand",
+    "Start a chat": "Starte einen Chat",
+    "Start Chat": "Starte Chat",
+    "Success": "Erfolg",
+    "tag direct chat": "Zum kennzeichnen als direkten Chat",
+    "The default role for new room members is": "Die Standard-Rolle for neue Raum-Mitglieder ist",
+    "their invitations": "ihre Einladungen",
+    "their invitation": "ihre Einladung",
+    "These are experimental features that may break in unexpected ways. Use with caution": "Dies sind experimentelle Funktionen die in unerwarteter Weise Fehler verursachen können. Mit Vorsicht benutzen",
+    "The visibility of existing history will be unchanged": "Die Sichtbarkeit der existenten Historie bleibt unverändert",
+    "This doesn't appear to be a valid email address": "Die scheint keine valide E-Mail-Adresse zu sein",
+    "this invitation?": "diese Einladung?",
+    "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": "Dieser Raum ist über entfernte Matrix-Server nicht zugreifbar",
+    "This room's internal ID is": "Die interne ID dieses Raumes ist",
+    "To ban users": "Zum Nutzer bannen",
+    "To configure the room": "Zum Raum konfigurieren",
+    "To invite users into the room": "Zum Nutzer in den Raum einladen",
+    "to join the discussion": "Zum mitdiskutieren",
+    "To kick users": "Zum Nutzer kicken",
+    "Admin": "Administrator",
+    "Server may be unavailable, overloaded, or you hit a bug": "Server könnte nicht verfügbar oder überlastet sein oder du bist auf einen Fehler gestoßen",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar": "Verbindung zum Homeserver ist über HTTP nicht möglich, wenn HTTPS in deiner Browserleiste steht",
+    "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
+    "Disable inline URL previews by default": "Deaktiviere URL-Vorschau im Chat standardmäßig",
+    "Guests can't use labs features. Please register.": "Gäste können keine Labor-Funktionen nutzen. Bitte registrieren.",
+    "Labs": "Labor",
+    "Show panel": "Zeige Panel",
+    "To redact messages": "Zum Nachrichten verbergen",
+    "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, gebe deine E-Mail-Adresse, die mit deinem Account verbunden ist, ein",
+    "To send messages": "Zum Nachrichten senden",
+    "turned on end-to-end encryption (algorithm": "aktivierte Ende-zu-Ende-Verschlüsselung (Algorithmus",
+    "Unable to add email address": "Unfähig die E-Mail-Adresse hinzuzufügen",
+    "Unable to remove contact information": "Unfähig die Kontakt-Informationen zu löschen",
+    "Unable to verify email address": "Unfähig die E-Mail-Adresse zu verifizieren",
+    "Unban": "Entbannen",
+    "Unencrypted room": "Unverschlüsselter Raum",
+    "unknown error code": "Unbekannter Fehlercode",
+    "unknown": "unbekannt",
+    "Upload avatar": "Avatar hochladen",
+    "uploaded a file": "lud eine Datei hoch",
+    "Upload Files": "Dateien hochladen",
+    "Upload file": "Datei hochladen",
+    "User Interface": "Nutzerschnittstelle",
+    "username": "Nutzername",
+    "Users": "Nutzer",
+    "User": "Nutzer",
+    "Verification Pending": "Verifizierung ausstehend",
+    "Video call": "Videoanruf",
+    "Voice call": "Sprachanruf",
+    "VoIP conference finished": "VoIP-Konferenz beendet",
+    "VoIP conference started": "VoIP-Konferenz gestartet",
+    "(warning: cannot be disabled again!)": "(Warnung: Kann nicht wieder deaktiviert werden!)",
+    "was banned": "wurde gebannt",
+    "was invited": "wurde eingeladen",
+    "was kicked": "wurde gekickt",
+    "was unbanned": "wurde entbannt",
+    "was": "wurde",
+    "Who can access this room?": "Wer hat Zugang zu diesem Raum?",
+    "Who can read history?": "Wer kann die Historie lesen?",
+    "Who would you like to add to this room?": "Wen möchtest du zu diesem Raum hinzufügen?",
+    "Who would you like to communicate with?": "Mit wem möchtest du kommunizieren?",
+    "Would you like to": "Möchtest du",
+    "You are trying to access": "Du möchtest Zugang zu %(sth)s bekommen",
+    "You do not have permission to post to this room": "Du hast keine Berechtigung an diesen Raum etwas zu senden",
+    "You have been invited to join this room by %(inviterName)s": "Du wurdest in diesen Raum eingeladen von %(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": "Du wurdest von allen Geräten ausgeloggt und wirst keine Push-Benachrichtigungen mehr bekommen. Um Benachrichtigungen zu reaktivieren melde dich auf jedem Gerät neu an",
+    "you must be a": "nötige Rolle",
+    "Your password has been reset": "Dein Passwort wurde zurückgesetzt",
+    "You should <b>not</b> yet trust it to secure data": "Du solltest <b>nicht</b> darauf vertrauen um deine Daten abzusichern",
+    "removed their profile picture": "löschte das eigene Profilbild",
+    "times": "mal",
+    "Bulk Options": "Bulk-Optionen",
+    "Call Timeout": "Anruf-Timeout",
+    "Conference call failed": "Konferenzgespräch fehlgeschlagen",
+    "Conference calling is in development and may not be reliable": "Konferenzgespräche sind in Entwicklung und evtl. nicht zuverlässig",
+    "Conference calls are not supported in encrypted rooms": "Konferenzgespräche sind in verschlüsselten Räumen nicht unterstützt",
+    "Conference calls are not supported in this client": "Konferenzgespräche sind in diesem Client nicht unterstützt",
+    "Existing Call": "Existierender Anruf",
+    "Failed to set up conference call": "Aufbau des Konferenzgesprächs fehlgeschlagen",
+    "Failed to verify email address: make sure you clicked the link in the email": "Verifizierung der E-Mail-Adresse fehlgeschlagen: Stelle sicher, dass du den Link in der E-Mail anklicktest",
+    "Failure to create room": "Raumerstellung fehlgeschlagen",
+    "Guest users can't create new rooms. Please register to create room and start a chat": "Gäste können keine neuen Räume erstellen. Bitte registrieren um einen Raum zu erstellen und einen Chat zu starten",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot hat keine Berechtigung Benachrichtigungen zu senden - bitte prüfe deine Browser-Einstellungen",
+    "Riot was not given permission to send notifications - please try again": "Riot hat das Recht nicht bekommen Benachrichtigungen zu senden. Bitte erneut probieren",
+    "This email address is already in use": "Diese E-Mail-Adresse wird bereits verwendet",
+    "This email address was not found": "Diese E-Mail-Adresse wurde nicht gefunden",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Die Datei '%(fileName)s' überschreitet das Größen-Limit für Uploads auf diesem Homeserver",
+    "The file '%(fileName)s' failed to upload": "Das Hochladen der Datei '%(fileName)s' schlug fehl",
+    "The remote side failed to pick up": "Die Gegenstelle konnte nicht abheben",
+    "This phone number is already in use": "Diese Telefonnummer wird bereits verwendet",
+    "Unable to restore previous session": "Frühere Sitzung nicht wiederherstellbar",
+    "Unable to capture screen": "Unfähig den Bildschirm aufzunehmen",
+    "Unable to enable Notifications": "Unfähig Benachrichtigungen zu aktivieren",
+    "Upload Failed": "Upload fehlgeschlagen",
+    "VoIP is unsupported": "VoIP ist nicht unterstützt",
+    "You are already in a call": "Du bist bereits bei einem Anruf",
+    "You cannot place a call with yourself": "Du kannst keinen Anruf mit dir selbst starten",
+    "You cannot place VoIP calls in this browser": "Du kannst kein VoIP-Gespräch in diesem Browser starten",
+    "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": "Du musst dich erneut anmelden um Ende-zu-Ende-Verschlüsselungscodes für dieses Gerät zu generieren und den öffentl. Schlüssel an deinen Homeserver zu senden. Dies muss einmal gemacht werden. Entschuldige die Unannehmlichkeit",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Homeserver verknüpft zu sein",
+    "Sun": "So",
+    "Mon": "Mo",
+    "Tue": "Di",
+    "Wed": "Mi",
+    "Thu": "Do",
+    "Fri": "Fr",
+    "Sat": "Sa",
+    "Jan": "Jan",
+    "Feb": "Feb",
+    "Mar": "März",
+    "Apr": "April",
+    "May": "Mai",
+    "Jun": "Juni",
+    "Jul": "Juli",
+    "Aug": "Aug",
+    "Sep": "Sep",
+    "Oct": "Okt",
+    "Nov": "Nov",
+    "Dec": "Dez",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "Set a display name:": "Setze einen Anzeigenamen:",
+    "Upload an avatar:": "Lade einen Avatar hoch:",
+    "This server does not support authentication with a phone number.": "Dieser Server unterstützt keine Authentifizierung mittels Telefonnummer.",
+    "Missing password.": "Fehlendes Passwort.",
+    "Passwords don't match.": "Passwörter passen nicht zusammen.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Passwort zu kurz (min. %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Dies sieht nicht nach einer validen E-Mail-Adresse aus.",
+    "This doesn't look like a valid phone number.": "Dies sieht nicht nach einer validen Telefonnummer aus.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Benutzernamen sollen nur Buchstaben, Nummern, Binde- und Unterstriche enthalten.",
+    "An unknown error occurred.": "Ein unbekannter Fehler trat auf.",
+    "I already have an account": "Ich habe bereits einen Account",
+    "An error occured: %(error_string)s": "Ein Fehler trat auf: %(error_string)s",
+    "Topic": "Thema",
+    "Make this room private": "Mache diesen Raum privat",
+    "Share message history with new users": "Teile Nachrichtenhistorie mit neuen Nutzern",
+    "Encrypt room": "Entschlüssele Raum",
+    "To send events of type": "Zum Senden von Ereignissen mit Typ",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
+    "%(targetName)s accepted an invitation": "%(targetName)s akzeptierte eine Einladung",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s akzeptierte eine Einladung für %(displayName)s",
+    "%(names)s and one other are typing": "%(names)s und eine weitere Person tippen",
+    "%(names)s and %(count)s others are typing": "%(names)s und %(count)s weitere Personen tippen",
+    "%(senderName)s answered the call": "%(senderName)s beantwortete den Anruf",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s bannte %(targetName)s",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s änderte den Anzeigenamen von %(oldDisplayName)s zu %(displayName)s",
+    "%(senderName)s changed their profile picture": "%(senderName)s änderte das Profilbild",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s",
+    "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s",
+    "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s änderte das Thema zu %(topic)s",
+    "/ddg is not a command": "/ddg ist kein Kommando",
+    "%(senderName)s ended the call": "%(senderName)s beendete den Anruf",
+    "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
+    "Failed to send request": "Anfrage zu senden schlug fehl",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s lud %(targetName)s ein",
+    "%(displayName)s is typing": "%(displayName)s tippt",
+    "%(targetName)s joined the room": "%(targetName)s trat dem Raum bei",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s kickte %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s verließ den Raum",
+    "%(senderName)s made future room history visible to": "%(senderName)s machte die zukünftige Raumhistorie sichtbar für",
+    "Missing room_id in request": "Fehlende room_id in Anfrage",
+    "Missing user_id in request": "Fehlende user_id in Anfrage",
+    "Must be viewing a room": "Muss einen Raum ansehen",
+    "New Composer & Autocomplete": "Neuer Eingabeverarbeiter & Autovervollständigung",
+    "(not supported by this browser)": "(nicht von diesem Browser unterstützt)",
+    "%(senderName)s placed a %(callType)s call": "%(senderName)s startete einen %(callType)s-Anruf",
+    "Power level must be positive integer": "Berechtigungslevel muss eine positive Zahl sein",
+    "Reason": "Grund",
+    "%(targetName)s rejected the invitation": "%(targetName)s lehnte die Einladung ab",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s löschte den Anzeigenamen (%(oldDisplayName)s)",
+    "%(senderName)s removed their profile picture": "%(senderName)s löschte das Profilbild",
+    "%(senderName)s requested a VoIP conference": "%(senderName)s fragte nach einer VoIP-Konferenz",
+    "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
+    "%(senderDisplayName)s sent an image": "%(senderDisplayName)s hat ein Bild gesendet",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s sandte eine Einladung an %(targetDisplayName)s um diesem Raum beizutreten",
+    "%(senderName)s set a profile picture": "%(senderName)s setzte ein Profilbild",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s setzte den Anzeigenamen zu %(displayName)s",
+    "This room is not recognised": "Dieser Raum wurde nicht erkannt",
+    "These are experimental features that may break in unexpected ways": "Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können",
+    "To use it, just wait for autocomplete results to load and tab through them": "Um dies zu nutzen, warte auf die Autovervollständigungsergebnisse und benutze die TAB Taste",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s schaltete Ende-zu-Ende-Verschlüsselung ein (Algorithmus: %(algorithm)s)",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s zog Bann für %(targetName)s zurück",
+    "Usage": "Verwendung",
+    "Use with caution": "Mit Vorsicht benutzen",
+    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s zog die Einladung für %(targetName)s zurück",
+    "You need to be able to invite users to do that": "Du musst in der Lage sein Nutzer einzuladen um dies zu tun",
+    "You need to be logged in": "Du musst angemeldet sein",
+    "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
+    "Error changing language": "Fehler beim Ändern der Sprache",
+    "Riot was unable to find the correct Data for the selected Language.": "Riot war nicht in der Lage die korrekten Daten für die ausgewählte Sprache zu finden.",
+    "Connectivity to the server has been lost.": "Verbindung zum Server untergebrochen.",
+    "Sent messages will be stored until your connection has returned.": "Gesendete Nachrichten werden gespeichert bis die Verbindung wiederhergestellt wurde.",
+    "Auto-complete": "Autovervollständigung",
+    "Resend all": "Alles erneut senden",
+    "cancel all": "alles abbrechen",
+    "now. You can also select individual messages to resend or cancel.": "jetzt. Du kannst auch einzelne Nachrichten zum erneuten Senden oder Abbrechen auswählen.",
+    "Active call": "Aktiver Anruf",
+    "withdrawn": "zurückgezogen",
+    "To link to a room it must have": "Um einen Raum zu verlinken, benötigt er",
+    "were": "wurden",
+    "en": "Englisch",
+    "pt-br": "Portugisisch (Brasilien)",
+    "de": "Deutsch",
+    "da": "Dänisch",
+    "ru": "Russisch",
+    "Drop here %(toAction)s": "Hierher ziehen:  %(toAction)s",
+    "Drop here to tag %(section)s": "Hierher ziehen:  %(section)s taggen",
+    "Press": "Drücke",
+    "tag as %(tagName)s": "als %(tagName)s taggen",
+    "to browse the directory": "um das Verzeichnis anzusehen",
+    "to demote": "um die Priorität herabzusetzen",
+    "to favourite": "zum Favorisieren",
+    "to make a room or": "um einen Raum zu erstellen, oder",
+    "to restore": "zum wiederherstellen",
+    "to start a chat with someone": "um einen Chat mit jemandem zu starten",
+    "to tag direct chat": "als direkten Chat markieren",
+    "You're not in any rooms yet! Press": "Du bist noch keinem Raum beigetreten! Drücke",
+    "click to reveal": "Klicke zum anzeigen",
+    "To redact other users' messages": "Um Nachrichten anderer zu verbergen",
+    "You are trying to access %(roomName)s": "Du versuchst auf %(roomName)s zuzugreifen",
+    "af": "Afrikaans",
+    "ar-ae": "Arabisch (U.A.E.)",
+    "ar-bh": "Arabisch (Bahrain)",
+    "ar-dz": "Arabisch (Algeria)",
+    "ar-eg": "Arabisch (Ägypten)",
+    "ar-iq": "Arabisch (Irak)",
+    "ar-jo": "Arabisch (Jordanien)",
+    "ar-kw": "Arabisch (Kuwait)",
+    "ar-lb": "Arabisch (Libanon)",
+    "ar-ly": "Arabisch (Lybien)",
+    "ar-ma": "Arabisch (Marokko)",
+    "ar-om": "Arabisch (Oman)",
+    "ar-qa": "Arabisch (Qatar)",
+    "ar-sa": "Arabisch (Saudi Arabien)",
+    "ar-sy": "Arabisch (Syrien)",
+    "ar-tn": "Arabisch (Tunisien)",
+    "ar-ye": "Arabisch (Yemen)",
+    "be": "Weißrussisch",
+    "bg": "Bulgarisch",
+    "cs": "Tschechisch",
+    "de-at": "Deutsch (Österreich)",
+    "de-ch": "Deutsch (Schweiz)",
+    "de-li": "Deutsch (Liechtenstein)",
+    "de-lu": "Deutsch (Luxemburg)",
+    "el": "Griechisch",
+    "en-au": "Englisch (Australien)",
+    "en-bz": "Englisch (Belize)",
+    "en-ca": "Englisch (Kanada)",
+    "en-gb": "Englisch (Vereintes Königreich)",
+    "en-ie": "Englisch (Irland)",
+    "en-jm": "Englisch (Jamaika)",
+    "en-nz": "Englisch (Neuseeland)",
+    "en-tt": "Englisch (Trinidad)",
+    "en-us": "Englisch (Vereinigte Staaten)",
+    "en-za": "Englisch (Süd-Afrika)",
+    "es-ar": "Spanisch (Argentinien)",
+    "es-bo": "Spanisch (Bolivien)",
+    "es-cl": "Spanisch (Chile)",
+    "es-co": "Spanisch (Kolombien)",
+    "es-cr": "Spanisch (Costa Rica)",
+    "es-do": "Spanisch (Dominikanische Republik)",
+    "es-ec": "Spanisch (Ecuador)",
+    "es-gt": "Spanisch (Guatemala)",
+    "es-hn": "Spanisch (Honduras)",
+    "es-mx": "Spanisch (Mexico)",
+    "es-ni": "Spanisch (Nicaragua)",
+    "es-pa": "Spanisch (Panama)",
+    "es-pe": "Spanisch (Peru)",
+    "es-pr": "Spanisch (Puerto Rico)",
+    "es-py": "Spanisch (Paraguay)",
+    "es": "Spanisch (Spanien)",
+    "es-sv": "Spanisch (El Salvador)",
+    "es-uy": "Spanisch (Uruguay)",
+    "es-ve": "Spanisch (Venezuela)",
+    "et": "Estländisch",
+    "eu": "Baskisch (Baskenland)",
+    "fa": "Persisch (Farsi)",
+    "fr-be": "Französisch (Belgien)",
+    "fr-ca": "Französisch (Kanada)",
+    "fr-ch": "Französisch (Schweiz)",
+    "fr": "Französisch",
+    "fr-lu": "Französisch (Luxemburg)",
+    "gd": "Gälisch (Schottland)",
+    "he": "Hebräisch",
+    "hr": "Kroatisch",
+    "hu": "Ungarisch",
+    "id": "Indonesisch",
+    "is": "Isländisch",
+    "it-ch": "Italienisch (Schweiz)",
+    "it": "Italienisch",
+    "ja": "Japanisch",
+    "ji": "Jiddisch",
+    "ko": "Koreanisch (Johab)",
+    "lt": "Litauisch",
+    "lv": "lettisch",
+    "mk": "Mazedonisch (FYROM)",
+    "ms": "Malaysisch",
+    "mt": "Maltesisch",
+    "nl-be": "Niederländisch (Belgien)",
+    "nl": "Niederländisch",
+    "no": "Norwegisch",
+    "pl": "Polnisch",
+    "pt": "Portugiesisch",
+    "rm": "Rätoromanisch",
+    "ro-mo": "Rumänisch (Republik von Moldavien)",
+    "ro": "Romanian",
+    "ru-mo": "Russisch",
+    "sb": "Sorbian",
+    "sk": "Slowakisch",
+    "sl": "Slowenisch",
+    "sq": "Albanisch",
+    "sr": "Serbisch (lateinisch)",
+    "sv-fi": "Schwedisch (Finnland)",
+    "sv": "Schwedisch",
+    "sx": "Sutu",
+    "sz": "Samisch (Lappish)",
+    "th": "Thailändisch",
+    "tn": "Setswana",
+    "tr": "Türkisch",
+    "ts": "Tsonga",
+    "uk": "Ukrainisch",
+    "ur": "Urdu",
+    "ve": "Tshivenda",
+    "vi": "Vietnamesisch",
+    "zh-cn": "Chinesisch (PRC)",
+    "zh-hk": "Chinesisch (Hong Kong SAR)",
+    "zh-sg": "Chinesisch (Singapur)",
+    "zh-tw": "Chinesisch (Taiwan)",
+    "zu": "Zulu",
+    "ca": "katalanisch",
+    "fi": "Finnish",
+    "fo": "Färöisch",
+    "ga": "Irisch",
+    "hi": "Hindi",
+    "xh": "Xhosa",
+    "Monday": "Montag",
+    "Tuesday": "Dienstag",
+    "Wednesday": "Mittwoch",
+    "Thursday": "Donnerstag",
+    "Friday": "Freitag",
+    "Saturday": "Samstag",
+    "Sunday": "Sonntag",
+    "Failed to forget room %(errCode)s": "Das Entfernen des Raums %(errCode)s aus deiner Liste ist fehlgeschlagen",
+    "Failed to join the room": "Fehler beim Betreten des Raumes",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Eine Textnachricht wurde an +%(msisdn)s gesendet. Bitte gebe den Verifikationscode ein, den er beinhaltet",
+    "and %(overflowCount)s others...": "und %(overflowCount)s weitere...",
+    "and one other...": "und ein(e) weitere(r)...",
+    "Are you sure?": "Bist du sicher?",
+    "Attachment": "Anhang",
+    "Ban": "Banne",
+    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Kann nicht zum Heimserver verbinden - bitte checke eine Verbindung und stelle sicher, dass dem %(urlStart)s SSL-Zertifikat deines Heimservers  %(urlEnd)s vertraut wird",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Kann nicht zum Heimserver via HTTP verbinden, wenn eine HTTPS-Url in deiner Adresszeile steht. Nutzer HTTPS oder %(urlStart)s aktiviere unsichere Skripte %(urlEnd)s",
+    "changing room on a RoomView is not supported": "Das Ändern eines Raumes in einer RaumAnsicht wird nicht unterstützt",
+    "Click to mute audio": "Klicke um den Ton stumm zu stellen",
+    "Click to mute video": "Klicke um das Video stumm zu stellen",
+    "Command error": "Befehlsfehler",
+    "Decrypt %(text)s": "Entschlüssele %(text)s",
+    "Delete": "Lösche",
+    "Devices": "Geräte",
+    "Direct chats": "Direkte Chats",
+    "Disinvite": "Ausladen",
+    "Download %(text)s": "%(text)s herunterladen",
+    "Enter Code": "Code eingeben",
+    "Failed to ban user": "Bannen des Nutzers fehlgeschlagen",
+    "Failed to change power level": "Ändern des Berechtigungslevels fehlgeschlagen",
+    "Failed to delete device": "Löschen des Geräts fehlgeschlagen",
+    "Failed to join room": "Raumbeitritt fehlgeschlagen",
+    "Failed to kick": "Kicken fehlgeschlagen",
+    "Failed to mute user": "Nutzer lautlos zu stellen fehlgeschlagen",
+    "Failed to reject invite": "Einladung abzulehnen fehlgeschlagen",
+    "Failed to save settings": "Einstellungen speichern fehlgeschlagen",
+    "Failed to set display name": "Anzeigenamen zu ändern fehlgeschlagen",
+    "Fill screen": "Fülle Bildschirm",
+    "Guest users can't upload files. Please register to upload": "Gäste können Dateien nicht hochlagen. Bitte registrieren um hochzuladen",
+    "Hide Text Formatting Toolbar": "Verberge Text-Formatierungs-Toolbar",
+    "Incorrect verification code": "Verifikationscode inkorrekt",
+    "Invalid alias format": "Ungültiges Alias-Format",
+    "Invalid address format": "Ungültiges Adressformat",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' ist kein valides Adressformat",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' hat kein valides Aliasformat",
+    "Join Room": "Raum beitreten",
+    "Kick": "Kicke",
+    "Level": "Level",
+    "Local addresses for this room:": "Lokale Adressen dieses Raumes:",
+    "Markdown is disabled": "Markdown ist deaktiviert",
+    "Markdown is enabled": "Markdown ist aktiviert",
+    "Message not sent due to unknown devices being present": "Nachrichten wurden nicht gesendet, da unbekannte Geräte anwesend sind",
+    "New address (e.g. #foo:%(localDomain)s)": "Neue Adresse (z.B. #foo:%(localDomain)s)",
+    "not set": "nicht gesetzt",
+    "not specified": "nicht spezifiziert",
+    "No devices with registered encryption keys": "Keine Geräte mit registrierten Verschlüsselungsschlüsseln",
+    "No more results": "Keine weiteren Ergebnisse",
+    "No results": "Keine Ergebnisse",
+    "OK": "OK",
+    "Revoke Moderator": "Moderator zurückziehen",
+    "Search": "Suche",
+    "Search failed": "Suche fehlgeschlagen",
+    "Server error": "Serverfehler",
+    "Server may be unavailable, overloaded, or search timed out :(": "Server ist entweder nicht verfügbar, überlastet oder die Suchezeit ist abgelaufen :(",
+    "Server may be unavailable, overloaded, or the file too big": "Server ist entweder nicht verfügbar, überlastet oder die Datei ist zu groß",
+    "Server unavailable, overloaded, or something else went wrong": "Server ist entweder nicht verfügbar, überlastet oder etwas anderes schlug fehl",
+    "Some of your messages have not been sent": "Einige deiner Nachrichten wurden noch nicht gesendet",
+    "Submit": "Absenden",
+    "The main address for this room is: %(canonical_alias_section)s": "Die Hauptadresse für diesen Raum ist: %(canonical_alias_section)s",
+    "This action cannot be performed by a guest user. Please register to be able to do this": "Diese Aktion kann nicht von einem Gast ausgeführt werden. Bitte registriere dich um dies zu tun",
+    "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?",
+    "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
+    "This room is private or inaccessible to guests. You may be able to join if you register": "Dieser Raum ist privat oder für Gäste nicht zugreifbar. Du kannst evtl. zugreifen, wenn du dich registrierst",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber du hast keine Berechtigung die angeforderte Nachricht anzuzeigen",
+    "Tried to load a specific point in this room's timeline, but was unable to find it": "Versuchte einen spezifischen Punkt in der Raum-Chronik zu laden, aber er konnte nicht gefunden werden",
+    "Turn Markdown off": "Markdown abschalten",
+    "Turn Markdown on": "Markdown einschalten",
+    "Unable to load device list": "Laden der Geräteliste nicht möglich",
+    "Unknown command": "Unbekannter Befehl",
+    "Unknown room %(roomId)s": "Unbekannter Raum %(roomId)s",
+    "Usage: /markdown on|off": "Verwendung: /markdown on|off",
+    "You seem to be in a call, are you sure you want to quit?": "Du scheinst in einem Anruf zu sein. Bist du sicher schließen zu wollen?",
+    "You seem to be uploading files, are you sure you want to quit?": "Du scheinst Dateien hochzuladen. Bist du sicher schließen zu wollen?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "Du wirst nicht in der Lage sein, diese Änderung zu ändern da den Nutzer auf dasselbe Berechtigungslevel wie du hebst",
+    "Make Moderator": "Mache zum Moderator",
+    "Room": "Raum",
+    "(~%(searchCount)s results)": "(~%(searchCount)s Ergebnisse)",
+    "Cancel": "Abbrechen",
+    "bold": "fett",
+    "italic": "kursiv",
+    "strike": "durchstreichen",
+    "underline": "unterstreichen",
+    "code": "Code",
+    "quote": "Zitat",
+    "bullet": "Aufzählung",
+    "Click to unmute video": "Klicke um Video zu reaktivieren",
+    "Click to unmute audio": "Klicke um Ton zu reaktivieren",
+    "Failed to load timeline position": "Laden der Position im Zeitstrahl fehlgeschlagen",
+    "Failed to toggle moderator status": "Umschalten des Moderatorstatus fehlgeschlagen",
+    "Enable encryption": "Verschlüsselung aktivieren",
+    "The main address for this room is": "Die Hauptadresse für diesen Raum ist",
+    "Autoplay GIFs and videos": "Automatisch GIF's und Videos abspielen",
+    "Don't send typing notifications": "Nicht senden, wenn ich tippe",
+    "Hide read receipts": "Verberge Lesebestätigungen",
+    "Never send encrypted messages to unverified devices in this room": "In diesem Raum keine verschlüsselten Nachrichten an unverifizierte Geräte senden",
+    "numbullet": "Nummerierung",
+    "%(items)s and %(remaining)s others": "%(items)s und %(remaining)s weitere",
+    "%(items)s and one other": "%(items)s und ein(e) weitere(r)",
+    "%(items)s and %(lastItem)s": "%(items)s und %(lastItem)s",
+    "%(severalUsers)s joined %(repeats)s times": "%(severalUsers)s trat(en) %(repeats)s mal bei",
+    "%(oneUser)s joined %(repeats)s times": "%(oneUser)s trat %(repeats)s mal bei",
+    "%(severalUsers)s joined": "%(severalUsers)s traten bei",
+    "%(oneUser)s joined": "%(oneUser)s trat bei",
+    "%(severalUsers)s left %(repeats)s times": "%(severalUsers)s gingen %(repeats)s mal",
+    "%(oneUser)s left %(repeats)s times": "%(oneUser)s ging %(repeats)s mal",
+    "%(severalUsers)s left": "%(severalUsers)s gingen",
+    "%(oneUser)s left": "%(oneUser)s ging",
+    "%(severalUsers)s joined and left %(repeats)s times": "%(severalUsers)s traten bei und gingen %(repeats)s mal",
+    "%(oneUser)s joined and left %(repeats)s times": "%(oneUser)s trat bei und ging %(repeats)s mal",
+    "%(severalUsers)s joined and left": "%(severalUsers)s traten bei und gingen",
+    "%(oneUser)s joined and left": "%(oneUser)s trat bei und ging",
+    "%(severalUsers)s left and rejoined %(repeats)s times": "%(severalUsers)s gingen und traten erneut bei - %(repeats)s mal",
+    "%(oneUser)s left and rejoined %(repeats)s times": "%(oneUser)s ging und trat erneut bei - %(repeats)s mal",
+    "%(severalUsers)s left and rejoined": "%(severalUsers)s gingen und traten erneut bei",
+    "%(oneUser)s left left and rejoined": "%(oneUser)s ging und trat erneut bei",
+    "%(severalUsers)s rejected their invitations %(repeats)s times": "%(severalUsers)s lehnten %(repeats)s mal ihre Einladung ab",
+    "%(oneUser)s rejected his/her invitation %(repeats)s times": "%(oneUser)s lehnte seine/ihre Einladung %(repeats)s mal ab",
+    "%(severalUsers)s rejected their invitations": "%(severalUsers)s lehnten ihre Einladung ab",
+    "%(oneUser)s rejected his/her invitation": "%(oneUser)s lehnte seine/ihre Einladung ab",
+    "%(severalUsers)s had their invitations withdrawn %(repeats)s times": "%(severalUsers)s zogen ihre Einladungen %(repeats)s mal zurück",
+    "%(oneUser)s had his/her invitation withdrawn %(repeats)s times": "%(oneUser)s zog seine/ihre Einladung %(repeats)s mal zurück",
+    "%(severalUsers)s had their invitations withdrawn": "%(severalUsers)s zogen ihre Einladungen zurück",
+    "%(oneUser)s had his/her invitation withdrawn": "%(oneUser)s zog seine/ihre Einladung zurück",
+    "were invited %(repeats)s times": "wurden %(repeats)s mal eingeladen",
+    "was invited %(repeats)s times": "wurde %(repeats)s mal eingeladen",
+    "were invited": "wurden eingeladen",
+    "were banned %(repeats)s times": "wurden %(repeats)s mal gebannt",
+    "was banned %(repeats)s times": "wurde %(repeats)s mal gebannt",
+    "were banned": "wurden gebannt",
+    "were unbanned %(repeats)s times": "wurden %(repeats)s mal entbannt",
+    "was unbanned %(repeats)s times": "wurde %(repeats)s mal entbannt",
+    "were unbanned": "wurden entbannt",
+    "were kicked %(repeats)s times": "wurden %(repeats)s mal gekickt",
+    "was kicked %(repeats)s times": "wurde %(repeats)s mal gekickt",
+    "were kicked": "wurden gekickt",
+    "%(severalUsers)s changed their name %(repeats)s times": "%(severalUsers)s änderten %(repeats)s mal ihre Namen",
+    "%(oneUser)s changed his/her name %(repeats)s times": "%(oneUser)s änderte %(repeats)s mal seinen/ihren Namen",
+    "%(severalUsers)s changed their name": "%(severalUsers)s änderten ihre Namen",
+    "%(oneUser)s changed his/her name": "%(oneUser)s änderte seinen/ihren Namen",
+    "%(severalUsers)s changed their avatar %(repeats)s times": "%(severalUsers)s änderten %(repeats)s mal ihren Avatar",
+    "%(oneUser)s changed his/her avatar %(repeats)s times": "%(oneUser)s änderte %(repeats)s mal seinen/ihren Avatar",
+    "%(severalUsers)s changed their avatar": "%(severalUsers)s änderten ihre Avatare",
+    "%(oneUser)s changed his/her avatar": "%(severalUsers)s änderte seinen/ihren Avatar",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
+    "%(oneUser)s left and rejoined": "%(oneUser)s ging und trat erneut bei"
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
new file mode 100644
index 0000000000..175dbe3c47
--- /dev/null
+++ b/src/i18n/strings/en_EN.json
@@ -0,0 +1,656 @@
+{
+  "af":"Afrikaans",
+  "ar-ae":"Arabic (U.A.E.)",
+  "ar-bh":"Arabic (Bahrain)",
+  "ar-dz":"Arabic (Algeria)",
+  "ar-eg":"Arabic (Egypt)",
+  "ar-iq":"Arabic (Iraq)",
+  "ar-jo":"Arabic (Jordan)",
+  "ar-kw":"Arabic (Kuwait)",
+  "ar-lb":"Arabic (Lebanon)",
+  "ar-ly":"Arabic (Libya)",
+  "ar-ma":"Arabic (Morocco)",
+  "ar-om":"Arabic (Oman)",
+  "ar-qa":"Arabic (Qatar)",
+  "ar-sa":"Arabic (Saudi Arabia)",
+  "ar-sy":"Arabic (Syria)",
+  "ar-tn":"Arabic (Tunisia)",
+  "ar-ye":"Arabic (Yemen)",
+  "be":"Belarusian",
+  "bg":"Bulgarian",
+  "ca":"Catalan",
+  "cs":"Czech",
+  "da":"Danish",
+  "de-at":"German (Austria)",
+  "de-ch":"German (Switzerland)",
+  "de":"German",
+  "de-li":"German (Liechtenstein)",
+  "de-lu":"German (Luxembourg)",
+  "el":"Greek",
+  "en-au":"English (Australia)",
+  "en-bz":"English (Belize)",
+  "en-ca":"English (Canada)",
+  "en":"English",
+  "en-gb":"English (United Kingdom)",
+  "en-ie":"English (Ireland)",
+  "en-jm":"English (Jamaica)",
+  "en-nz":"English (New Zealand)",
+  "en-tt":"English (Trinidad)",
+  "en-us":"English (United States)",
+  "en-za":"English (South Africa)",
+  "es-ar":"Spanish (Argentina)",
+  "es-bo":"Spanish (Bolivia)",
+  "es-cl":"Spanish (Chile)",
+  "es-co":"Spanish (Colombia)",
+  "es-cr":"Spanish (Costa Rica)",
+  "es-do":"Spanish (Dominican Republic)",
+  "es-ec":"Spanish (Ecuador)",
+  "es-gt":"Spanish (Guatemala)",
+  "es-hn":"Spanish (Honduras)",
+  "es-mx":"Spanish (Mexico)",
+  "es-ni":"Spanish (Nicaragua)",
+  "es-pa":"Spanish (Panama)",
+  "es-pe":"Spanish (Peru)",
+  "es-pr":"Spanish (Puerto Rico)",
+  "es-py":"Spanish (Paraguay)",
+  "es":"Spanish (Spain)",
+  "es-sv":"Spanish (El Salvador)",
+  "es-uy":"Spanish (Uruguay)",
+  "es-ve":"Spanish (Venezuela)",
+  "et":"Estonian",
+  "eu":"Basque (Basque)",
+  "fa":"Farsi",
+  "fi":"Finnish",
+  "fo":"Faeroese",
+  "fr-be":"French (Belgium)",
+  "fr-ca":"French (Canada)",
+  "fr-ch":"French (Switzerland)",
+  "fr":"French",
+  "fr-lu":"French (Luxembourg)",
+  "ga":"Irish",
+  "gd":"Gaelic (Scotland)",
+  "he":"Hebrew",
+  "hi":"Hindi",
+  "hr":"Croatian",
+  "hu":"Hungarian",
+  "id":"Indonesian",
+  "is":"Icelandic",
+  "it-ch":"Italian (Switzerland)",
+  "it":"Italian",
+  "ja":"Japanese",
+  "ji":"Yiddish",
+  "ko":"Korean",
+  "ko":"Korean (Johab)",
+  "lt":"Lithuanian",
+  "lv":"Latvian",
+  "mk":"Macedonian (FYROM)",
+  "ms":"Malaysian",
+  "mt":"Maltese",
+  "nl-be":"Dutch (Belgium)",
+  "nl":"Dutch",
+  "no":"Norwegian",
+  "pl":"Polish",
+  "pt-br":"Brazilian Portuguese",
+  "pt":"Portuguese",
+  "rm":"Rhaeto-Romanic",
+  "ro-mo":"Romanian (Republic of Moldova)",
+  "ro":"Romanian",
+  "ru-mo":"Russian (Republic of Moldova)",
+  "ru":"Russian",
+  "sb":"Sorbian",
+  "sk":"Slovak",
+  "sl":"Slovenian",
+  "sq":"Albanian",
+  "sr":"Serbian (Cyrillic)",
+  "sr":"Serbian (Latin)",
+  "sv-fi":"Swedish (Finland)",
+  "sv":"Swedish",
+  "sx":"Sutu",
+  "sz":"Sami (Lappish)",
+  "th":"Thai",
+  "tn":"Tswana",
+  "tr":"Turkish",
+  "ts":"Tsonga",
+  "uk":"Ukrainian",
+  "ur":"Urdu",
+  "ve":"Venda",
+  "vi":"Vietnamese",
+  "xh":"Xhosa",
+  "zh-cn":"Chinese (PRC)",
+  "zh-hk":"Chinese (Hong Kong SAR)",
+  "zh-sg":"Chinese (Singapore)",
+  "zh-tw":"Chinese (Taiwan)",
+  "zu":"Zulu",
+  "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
+  "accept": "accept",
+  "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation",
+  "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepted the invitation for %(displayName)s",
+  "Account": "Account",
+  "Add email address": "Add email address",
+  "Add phone number": "Add phone number",
+  "Admin": "Admin",
+  "Advanced": "Advanced",
+  "Algorithm": "Algorithm",
+  "all room members": "all room members",
+  "all room members, from the point they are invited": "all room members, from the point they are invited",
+  "all room members, from the point they joined": "all room members, from the point they joined",
+  "an address": "an address",
+  "and": "and",
+  "%(items)s and %(remaining)s others": "%(items)s and %(remaining)s others",
+  "%(items)s and one other": "%(items)s and one other",
+  "%(items)s and %(lastItem)s": "%(items)s and %(lastItem)s",
+  "and %(overflowCount)s others...": "and %(overflowCount)s others...",
+  "and one other...": "and one other...",
+  "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
+  "%(names)s and one other are typing": "%(names)s and one other are typing",
+  "%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
+  "An email has been sent to": "An email has been sent to",
+  "A new password must be entered.": "A new password must be entered.",
+  "%(senderName)s answered the call": "%(senderName)s answered the call",
+  "anyone.": "anyone",
+  "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
+  "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
+  "Are you sure?": "Are you sure?",
+  "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
+  "Are you sure you want upload the following files?": "Are you sure you want upload the following files?",
+  "Attachment": "Attachment",
+  "Autoplay GIFs and videos": "Autoplay GIFs and videos",
+  "%(senderName)s banned %(targetName)s": "%(senderName)s banned %(targetName)s",
+  "Ban": "Ban",
+  "Banned users": "Banned users",
+  "Bans user with given id": "Bans user with given id",
+  "Blacklisted": "Blacklisted",
+  "Bug Report": "Bug Report",
+  "Bulk Options": "Bulk Options",
+  "Call Timeout": "Call Timeout",
+  "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted",
+  "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s",
+  "Can't load user settings": "Can't load user settings",
+  "Change Password": "Change Password",
+  "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s",
+  "%(senderName)s changed their profile picture": "%(senderName)s changed their profile picture",
+  "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s changed the power level of %(powerLevelDiffText)s",
+  "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s changed the room name to %(roomName)s",
+  "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s changed the topic to \"%(topic)s\"",
+  "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
+  "Changes your display nickname": "Changes your display nickname",
+  "changing room on a RoomView is not supported": "changing room on a RoomView is not supported",
+  "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
+  "Clear Cache and Reload": "Clear Cache and Reload",
+  "Clear Cache": "Clear Cache",
+  "Click here": "Click here",
+  "Click here to fix": "Click here to fix",
+  "Click to mute audio": "Click to mute audio",
+  "Click to mute video": "Click to mute video",
+  "click to reveal": "click to reveal",
+  "Click to unmute video": "Click to unmute video",
+  "Click to unmute audio": "Click to unmute audio",
+  "Command error": "Command error",
+  "Commands": "Commands",
+  "Conference call failed": "Conference call failed",
+  "Conference calling is in development and may not be reliable": "Conference calling is in development and may not be reliable",
+  "Conference calls are not supported in encrypted rooms": "Conference calls are not supported in encrypted rooms",
+  "Conference calls are not supported in this client": "Conference calls are not supported in this client",
+  "Confirm password": "Confirm password",
+  "Confirm your new password": "Confirm your new password",
+  "Continue": "Continue",
+  "Could not connect to the integration server": "Could not connect to the integration server",
+  "Create an account": "Create an account",
+  "Create Room": "Create Room",
+  "Cryptography": "Cryptography",
+  "Current password": "Current password",
+  "Curve25519 identity key": "Curve25519 identity key",
+  "/ddg is not a command": "/ddg is not a command",
+  "Deactivate Account": "Deactivate Account",
+  "Deactivate my account": "Deactivate my account",
+  "decline": "decline",
+  "Decrypt %(text)s": "Decrypt %(text)s",
+  "Decryption error": "Decryption error",
+  "Delete": "Delete",
+  "demote": "demote",
+  "Deops user with given id": "Deops user with given id",
+  "Device ID": "Device ID",
+  "Devices": "Devices",
+  "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Devices will <b>not</b> yet be able to decrypt history from before they joined the room",
+  "Direct Chat": "Direct Chat",
+  "Direct chats": "Direct chats",
+  "Disable inline URL previews by default": "Disable inline URL previews by default",
+  "Disinvite": "Disinvite",
+  "Display name": "Display name",
+  "Displays action": "Displays action",
+  "Don't send typing notifications": "Don't send typing notifications",
+  "Download %(text)s": "Download %(text)s",
+  "Drop here %(toAction)s": "Drop here %(toAction)s",
+  "Drop here to tag %(section)s": "Drop here to tag %(section)s",
+  "Ed25519 fingerprint": "Ed25519 fingerprint",
+  "Email Address": "Email Address",
+  "Email, name or matrix ID": "Email, name or matrix ID",
+  "Emoji": "Emoji",
+  "Enable encryption": "Enable encryption",
+  "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
+  "Encrypted room": "Encrypted room",
+  "%(senderName)s ended the call": "%(senderName)s ended the call",
+  "End-to-end encryption information": "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",
+  "Enter Code": "Enter Code",
+  "Error": "Error",
+  "Event information": "Event information",
+  "Existing Call": "Existing Call",
+  "Export E2E room keys": "Export E2E room keys",
+  "Failed to ban user": "Failed to ban user",
+  "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
+  "Failed to change power level": "Failed to change power level",
+  "Failed to delete device": "Failed to delete device",
+  "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
+  "Failed to join room": "Failed to join room",
+  "Failed to join the room": "Failed to join the room",
+  "Failed to kick": "Failed to kick",
+  "Failed to leave room": "Failed to leave room",
+  "Failed to load timeline position": "Failed to load timeline position",
+  "Failed to lookup current room": "Failed to lookup current room",
+  "Failed to mute user": "Failed to mute user",
+  "Failed to reject invite": "Failed to reject invite",
+  "Failed to reject invitation": "Failed to reject invitation",
+  "Failed to save settings": "Failed to save settings",
+  "Failed to send email": "Failed to send email",
+  "Failed to send request": "Failed to send request",
+  "Failed to set display name": "Failed to set display name",
+  "Failed to set up conference call": "Failed to set up conference call",
+  "Failed to toggle moderator status": "Failed to toggle moderator status",
+  "Failed to unban": "Failed to unban",
+  "Failed to upload file": "Failed to upload file",
+  "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": "Failure to create room",
+  "Favourite": "Favourite",
+  "favourite": "favourite",
+  "Favourites": "Favourites",
+  "Fill screen": "Fill screen",
+  "Filter room members": "Filter room members",
+  "Forget room": "Forget room",
+  "Forgot your password?": "Forgot your password?",
+  "For security, this session has been signed out. Please sign in again": "For security, this session has been signed out. Please sign in again",
+  "Found a bug?": "Found a bug?",
+  "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+  "Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat",
+  "Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload",
+  "had": "had",
+  "Hangup": "Hangup",
+  "Hide read receipts": "Hide read receipts",
+  "Hide Text Formatting Toolbar": "Hide Text Formatting Toolbar",
+  "Historical": "Historical",
+  "Homeserver is": "Homeserver is",
+  "Identity Server is": "Identity Server is",
+  "I have verified my email address": "I have verified my email address",
+  "Import E2E room keys": "Import E2E room keys",
+  "Incorrect verification code": "Incorrect verification code",
+  "Invalid alias format": "Invalid alias format",
+  "Invalid address format": "Invalid address format",
+  "Invalid Email Address": "Invalid Email Address",
+  "%(senderName)s invited %(targetName)s": "%(senderName)s invited %(targetName)s",
+  "Invite new room members": "Invite new room members",
+  "Invites": "Invites",
+  "Invites user with given id to current room": "Invites user with given id to current room",
+  "is a": "is a",
+  "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+  "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+  "%(displayName)s is typing": "%(displayName)s is typing",
+  "I want to sign in with": "I want to sign in with",
+  "Join Room": "Join Room",
+  "joined and left": "joined and left",
+  "joined": "joined",
+  "%(targetName)s joined the room": "%(targetName)s joined the room",
+  "Joins room with given alias": "Joins room with given alias",
+  "%(senderName)s kicked %(targetName)s": "%(senderName)s kicked %(targetName)s",
+  "Kick": "Kick",
+  "Kicks user with given id": "Kicks user with given id",
+  "Labs": "Labs",
+  "Leave room": "Leave room",
+  "left and rejoined": "left and rejoined",
+  "left": "left",
+  "%(targetName)s left the room": "%(targetName)s left the room",
+  "Level": "Level",
+  "Local addresses for this room:": "Local addresses for this room:",
+  "Logged in as": "Logged in as",
+  "Login as guest": "Login as guest",
+  "Logout": "Logout",
+  "Low priority": "Low priority",
+  "%(senderName)s made future room history visible to": "%(senderName)s made future room history visible to",
+  "Manage Integrations": "Manage Integrations",
+  "Markdown is disabled": "Markdown is disabled",
+  "Markdown is enabled": "Markdown is enabled",
+  "Members only": "Members only",
+  "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",
+  "Missing user_id in request": "Missing user_id in request",
+  "Mobile phone number": "Mobile phone number",
+  "Moderator": "Moderator",
+  "Must be viewing a room": "Must be viewing a room",
+  "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",
+  "Never send encrypted messages to unverified devices in this room from this device": "Never send encrypted messages to unverified devices in this room from this device",
+  "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+  "New Composer & Autocomplete": "New Composer & Autocomplete",
+  "New password": "New password",
+  "New passwords don't match": "New passwords don't match",
+  "New passwords must match each other.": "New passwords must match each other.",
+  "none": "none",
+  "not set": "not set",
+  "not specified": "not specified",
+  "Notifications": "Notifications",
+  "(not supported by this browser)": "(not supported by this browser)",
+  "<not supported>": "<not supported>",
+  "NOT verified": "NOT verified",
+  "No devices with registered encryption keys": "No devices with registered encryption keys",
+  "No more results": "No more results",
+  "No results": "No results",
+  "No users have specific privileges in this room": "No users have specific privileges in this room",
+  "OK": "OK",
+  "olm version": "olm version",
+  "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)",
+  "Once you&#39;ve followed the link it contains, click below": "Once you&#39;ve followed the link it contains, click below",
+  "Only people who have been invited": "Only people who have been invited",
+  "or": "or",
+  "Password": "Password",
+  "Passwords can't be empty": "Passwords can't be empty",
+  "People": "People",
+  "Permissions": "Permissions",
+  "Phone": "Phone",
+  "%(senderName)s placed a %(callType)s call": "%(senderName)s placed a %(callType)s call",
+  "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
+  "Please Register": "Please Register",
+  "Power level must be positive integer": "Power level must be positive integer",
+  "Press": "Press",
+  "Privacy warning": "Privacy warning",
+  "Privileged Users": "Privileged Users",
+  "Profile": "Profile",
+  "Reason": "Reason",
+  "Revoke Moderator": "Revoke Moderator",
+  "Refer a friend to Riot": "Refer a friend to Riot",
+  "rejected": "rejected",
+  "%(targetName)s rejected the invitation": "%(targetName)s rejected the invitation",
+  "Reject invitation": "Reject invitation",
+  "Remove Contact Information?": "Remove Contact Information?",
+  "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removed their display name (%(oldDisplayName)s)",
+  "%(senderName)s removed their profile picture": "%(senderName)s removed their profile picture",
+  "Remove": "Remove",
+  "%(senderName)s requested a VoIP conference": "%(senderName)s requested a VoIP conference",
+  "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>",
+  "restore": "restore",
+  "Return to app": "Return to app",
+  "Return to login screen": "Return to login screen",
+  "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
+  "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
+  "Room %(roomId)s not visible": "Room %(roomId)s not visible",
+  "Room Colour": "Room Colour",
+  "Room name (optional)": "Room name (optional)",
+  "Rooms": "Rooms",
+  "Scroll to bottom of page": "Scroll to bottom of page",
+  "Scroll to unread messages": "Scroll to unread messages",
+  "Search": "Search",
+  "Search failed": "Search failed",
+  "Searches DuckDuckGo for results": "Searches DuckDuckGo for results",
+  "Send a message (unencrypted)": "Send a message (unencrypted)",
+  "Send an encrypted message": "Send an encrypted message",
+  "Sender device information": "Sender device information",
+  "Send Invites": "Send Invites",
+  "Send Reset Email": "Send Reset Email",
+  "%(senderDisplayName)s sent an image": "%(senderDisplayName)s sent an image",
+  "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room",
+  "sent a video": "sent a video",
+  "Server error": "Server error",
+  "Server may be unavailable or overloaded": "Server may be unavailable or overloaded",
+  "Server may be unavailable, overloaded, or search timed out :(": "Server may be unavailable, overloaded, or search timed out :(",
+  "Server may be unavailable, overloaded, or the file too big": "Server may be unavailable, overloaded, or the file too big",
+  "Server may be unavailable, overloaded, or you hit a bug": "Server may be unavailable, overloaded, or you hit a bug",
+  "Server unavailable, overloaded, or something else went wrong": "Server unavailable, overloaded, or something else went wrong",
+  "Session ID": "Session ID",
+  "%(senderName)s set a profile picture": "%(senderName)s set a profile picture",
+  "%(senderName)s set their display name to %(displayName)s": "%(senderName)s set their display name to %(displayName)s",
+  "Settings": "Settings",
+  "Show panel": "Show panel",
+  "Signed Out": "Signed Out",
+  "Sign in": "Sign in",
+  "Sign out": "Sign out",
+  "since the point in time of selecting this option": "since the point in time of selecting this option",
+  "since they joined": "since they joined",
+  "since they were invited": "since they were invited",
+  "Some of your messages have not been sent": "Some of your messages have not been sent",
+  "Someone": "Someone",
+  "Sorry, this homeserver is using a login which is not recognised ": "Sorry, this homeserver is using a login which is not recognised ",
+  "Start a chat": "Start a chat",
+  "Start Chat": "Start Chat",
+  "Submit": "Submit",
+  "Success": "Success",
+  "tag as %(tagName)s": "tag as %(tagName)s",
+  "tag direct chat": "tag direct chat",
+  "The default role for new room members is": "The default role for new room members is",
+  "The main address for this room 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 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 is already in use",
+  "This email address was not found": "This email address was not found",
+  "%(actionVerb)s this person?": "%(actionVerb)s this person?",
+  "The email address linked to your account must be entered.": "The email address linked to your account must be entered.",
+  "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads",
+  "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
+  "The remote side failed to pick up": "The remote side failed to pick up",
+  "This room has no local addresses": "This room has no local addresses",
+  "This room is not recognised": "This room is not recognised",
+  "This room is private or inaccessible to guests. You may be able to join if you register": "This room is private or inaccessible to guests. You may be able to join if you register",
+  "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
+  "The visibility of existing history will be unchanged": "The visibility of existing history will be unchanged",
+  "This doesn't appear to be a valid email address": "This doesn't appear to be a valid email address",
+  "this invitation?": "this invitation?",
+  "This is a preview of this room. Room interactions have been disabled": "This is a preview of this room. Room interactions have been disabled",
+  "This phone number is already in use": "This phone number is already in use",
+  "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 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 redact other users' messages": "To redact 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 as %(tagName)s": "to tag as %(tagName)s",
+  "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",
+  "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 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": "Tried to load a specific point in this room's timeline, but was unable to find it",
+  "Turn Markdown off": "Turn Markdown off",
+  "Turn Markdown on": "Turn Markdown on",
+  "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)",
+  "Unable to add email address": "Unable to add email address",
+  "Unable to remove contact information": "Unable to remove contact information",
+  "Unable to restore previous session": "Unable to restore previous session",
+  "Unable to verify email address": "Unable to verify email address",
+  "Unban": "Unban",
+  "%(senderName)s unbanned %(targetName)s": "%(senderName)s unbanned %(targetName)s",
+  "Unable to capture screen": "Unable to capture screen",
+  "Unable to enable Notifications": "Unable to enable Notifications",
+  "Unable to load device list": "Unable to load device list",
+  "Unencrypted room": "Unencrypted room",
+  "unencrypted": "unencrypted",
+  "Unknown command": "Unknown command",
+  "unknown device": "unknown device",
+  "unknown error code": "unknown error code",
+  "Unknown room %(roomId)s": "Unknown room %(roomId)s",
+  "unknown": "unknown",
+  "uploaded a file": "uploaded a file",
+  "Upload avatar": "Upload avatar",
+  "Upload Failed": "Upload Failed",
+  "Upload Files": "Upload Files",
+  "Upload file": "Upload file",
+  "Usage": "Usage",
+  "Use with caution": "Use with caution",
+  "User ID": "User ID",
+  "User Interface": "User Interface",
+  "username": "username",
+  "Users": "Users",
+  "User": "User",
+  "Verification Pending": "Verification Pending",
+  "Verification": "Verification",
+  "verified": "verified",
+  "Video call": "Video call",
+  "Voice call": "Voice call",
+  "VoIP conference finished": "VoIP conference finished",
+  "VoIP conference started": "VoIP conference started",
+  "VoIP is unsupported": "VoIP is unsupported",
+  "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
+  "Warning": "Warning",
+  "Who can access this room?": "Who can access this room?",
+  "Who can read history?": "Who can read history?",
+  "Who would you like to add to this room?": "Who would you like to add to this room?",
+  "Who would you like to communicate with?": "Who would you like to communicate with?",
+  "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s withdrew %(targetName)s's inivitation",
+  "Would you like to": "Would you like to",
+  "You are already in a call": "You are already in a call",
+  "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
+  "You are trying to access %(roomName)s": "You are trying to access %(roomName)s",
+  "You cannot place a call with yourself": "You cannot place a call with yourself",
+  "You cannot place VoIP calls in this browser": "You cannot place VoIP calls in this browser",
+  "You do not have permission to post to this room": "You do not have permission to post to this room",
+  "You have been invited to join this room by %(inviterName)s": "You have been invited to join this room by %(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": "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",
+  "You have no visible notifications": "You have no visible notifications",
+  "you must be a": "you must be a",
+  "You need to be able to invite users to do that": "You need to be able to invite users to do that",
+  "You need to be logged in": "You need to be logged in",
+  "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": "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",
+  "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Your email address does not appear to be associated with a Matrix ID on this Homeserver",
+  "Your password has been reset": "Your password has been reset",
+  "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
+  "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
+  "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
+  "You should <b>not</b> yet trust it to secure data": "You should <b>not</b> yet trust it to secure data",
+  "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself",
+  "Sun": "Sun",
+  "Mon": "Mon",
+  "Tue": "Tue",
+  "Wed": "Wed",
+  "Thu": "Thu",
+  "Fri": "Fri",
+  "Sat": "Sat",
+  "Jan": "Jan",
+  "Feb": "Feb",
+  "Mar": "Mar",
+  "Apr": "Apr",
+  "May": "May",
+  "Jun": "Jun",
+  "Jul": "Jul",
+  "Aug": "Aug",
+  "Sep": "Sep",
+  "Oct": "Oct",
+  "Nov": "Nov",
+  "Dec": "Dec",
+  "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+  "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+  "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+  "Set a display name:": "Set a display name:",
+  "Upload an avatar:": "Upload an avatar:",
+  "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
+  "Missing password.": "Missing password.",
+  "Passwords don't match.": "Passwords don't match.",
+  "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Password too short (min %(MIN_PASSWORD_LENGTH)s).",
+  "This doesn't look like a valid email address.": "This doesn't look like a valid email address.",
+  "This doesn't look like a valid phone number.": "This doesn't look like a valid phone number.",
+  "User names may only contain letters, numbers, dots, hyphens and underscores.": "User names may only contain letters, numbers, dots, hyphens and underscores.",
+  "An unknown error occurred.": "An unknown error occurred.",
+  "I already have an account": "I already have an account",
+  "An error occured: %(error_string)s": "An error occured: %(error_string)s",
+  "Topic": "Topic",
+  "Make Moderator": "Make Moderator",
+  "Make this room private": "Make this room private",
+  "Share message history with new users": "Share message history with new users",
+  "Encrypt room": "Encrypt room",
+  "There are no visible files in this room": "There are no visible files in this room",
+  "Error changing language": "Error changing language",
+  "Room": "Room",
+  "Room name (optional)": "Room name (optional)",
+  "Who would you like to add to this room?": "Who would you like to add to this room?",
+  "Riot was unable to find the correct Data for the selected Language.": "Riot was unable to find the correct Data for the selected Language.",
+  "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.",
+  "Auto-complete": "Auto-complete",
+  "Resend all": "Resend all",
+  "(~%(searchCount)s results)": "(~%(searchCount)s results)",
+  "Cancel": "Cancel",
+  "cancel all": "cancel all",
+  "or": "or",
+  "now. You can also select individual messages to resend or cancel.": "now. You can also select individual messages to resend or cancel.",
+  "Active call": "Active call",
+  "Monday": "Monday",
+  "Tuesday": "Tuesday",
+  "Wednesday": "Wednesday",
+  "Thursday": "Thursday",
+  "Friday": "Friday",
+  "Saturday": "Saturday",
+  "Sunday": "Sunday",
+  "bold": "bold",
+  "italic": "italic",
+  "strike": "strike",
+  "underline": "underline",
+  "code":"code",
+  "quote":"quote",
+  "bullet":"bullet",
+  "numbullet":"numbullet",
+  "%(severalUsers)s joined %(repeats)s times": "%(severalUsers)s joined %(repeats)s times",
+  "%(oneUser)s joined %(repeats)s times": "%(oneUser)s joined %(repeats)s times",
+  "%(severalUsers)s joined": "%(severalUsers)s joined",
+  "%(oneUser)s joined": "%(oneUser)s joined",
+  "%(severalUsers)s left %(repeats)s times": "%(severalUsers)s left %(repeats)s times",
+  "%(oneUser)s left %(repeats)s times": "%(oneUser)s left %(repeats)s times",
+  "%(severalUsers)s left": "%(severalUsers)s left",
+  "%(oneUser)s left": "%(oneUser)s left",
+  "%(severalUsers)s joined and left %(repeats)s times": "%(severalUsers)s joined and left %(repeats)s times",
+  "%(oneUser)s joined and left %(repeats)s times": "%(oneUser)s joined and left %(repeats)s times",
+  "%(severalUsers)s joined and left": "%(severalUsers)s joined and left",
+  "%(oneUser)s joined and left": "%(oneUser)s joined and left",
+  "%(severalUsers)s left and rejoined %(repeats)s times": "%(severalUsers)s left and rejoined %(repeats)s times",
+  "%(oneUser)s left and rejoined %(repeats)s times": "%(oneUser)s left and rejoined %(repeats)s times",
+  "%(severalUsers)s left and rejoined": "%(severalUsers)s left and rejoined",
+  "%(oneUser)s left and rejoined": "%(oneUser)s left and rejoined",
+  "%(severalUsers)s rejected their invitations %(repeats)s times": "%(severalUsers)s rejected their invitations %(repeats)s times",
+  "%(oneUser)s rejected his/her invitation %(repeats)s times": "%(oneUser)s rejected his/her invitation %(repeats)s times",
+  "%(severalUsers)s rejected their invitations": "%(severalUsers)s rejected their invitations",
+  "%(oneUser)s rejected his/her invitation": "%(oneUser)s rejected his/her invitation",
+  "%(severalUsers)s had their invitations withdrawn %(repeats)s times": "%(severalUsers)s had their invitations withdrawn %(repeats)s times",
+  "%(oneUser)s had his/her invitation withdrawn %(repeats)s times": "%(oneUser)s had his/her invitation withdrawn %(repeats)s times",
+  "%(severalUsers)s had their invitations withdrawn": "%(severalUsers)s had their invitations withdrawn",
+  "%(oneUser)s had his/her invitation withdrawn": "%(oneUser)s had his/her invitation withdrawn",
+  "were invited %(repeats)s times": "were invited %(repeats)s times",
+  "was invited %(repeats)s times": "was invited %(repeats)s times",
+  "were invited": "were invited",
+  "was invited": "was invited",
+  "were banned %(repeats)s times": "were banned %(repeats)s times",
+  "was banned %(repeats)s times": "was banned %(repeats)s times",
+  "were banned": "were banned",
+  "was banned": "was banned",
+  "were unbanned %(repeats)s times": "were unbanned %(repeats)s times",
+  "was unbanned %(repeats)s times": "was unbanned %(repeats)s times",
+  "were unbanned": "were unbanned",
+  "was unbanned": "was unbanned",
+  "were kicked %(repeats)s times": "were kicked %(repeats)s times",
+  "was kicked %(repeats)s times": "was kicked %(repeats)s times",
+  "were kicked": "were kicked",
+  "was kicked": "was kicked",
+  "%(severalUsers)s changed their name %(repeats)s times": "%(severalUsers)s changed their name %(repeats)s times",
+  "%(oneUser)s changed his/her name %(repeats)s times": "%(oneUser)s changed his/her name %(repeats)s times",
+  "%(severalUsers)s changed their name": "%(severalUsers)s changed their name",
+  "%(oneUser)s changed his/her name": "%(oneUser)s changed his/her name",
+  "%(severalUsers)s changed their avatar %(repeats)s times": "%(severalUsers)s changed their avatar %(repeats)s times",
+  "%(oneUser)s changed his/her avatar %(repeats)s times": "%(oneUser)s changed his/her avatar %(repeats)s times",
+  "%(severalUsers)s changed their avatar": "%(severalUsers)s changed their avatar",
+  "%(oneUser)s changed his/her avatar": "%(oneUser)s changed his/her avatar"
+}
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
new file mode 100644
index 0000000000..e393d27bda
--- /dev/null
+++ b/src/i18n/strings/fr.json
@@ -0,0 +1,170 @@
+{
+    "af": "Afrikaans",
+    "ar-ae": "Arabic (U.A.E.)",
+    "ar-bh": "Arabic (Bahrain)",
+    "ar-dz": "Arabic (Algeria)",
+    "ar-eg": "Arabic (Egypt)",
+    "ar-iq": "Arabic (Iraq)",
+    "ar-jo": "Arabic (Jordan)",
+    "ar-kw": "Arabic (Kuwait)",
+    "ar-lb": "Arabic (Lebanon)",
+    "ar-ly": "Arabic (Libya)",
+    "ar-ma": "Arabic (Morocco)",
+    "ar-om": "Arabic (Oman)",
+    "ar-qa": "Arabic (Qatar)",
+    "ar-sa": "Arabic (Saudi Arabia)",
+    "ar-sy": "Arabic (Syria)",
+    "ar-tn": "Arabic (Tunisia)",
+    "ar-ye": "Arabic (Yemen)",
+    "be": "Belarusian",
+    "bg": "Bulgarian",
+    "ca": "Catalan",
+    "cs": "Czech",
+    "da": "Danish",
+    "de-at": "German (Austria)",
+    "de-ch": "German (Switzerland)",
+    "de": "German",
+    "de-li": "German (Liechtenstein)",
+    "de-lu": "German (Luxembourg)",
+    "el": "Greek",
+    "en-au": "English (Australia)",
+    "en-bz": "English (Belize)",
+    "en-ca": "English (Canada)",
+    "en": "English",
+    "en-gb": "English (United Kingdom)",
+    "en-ie": "English (Ireland)",
+    "en-jm": "English (Jamaica)",
+    "en-nz": "English (New Zealand)",
+    "en-tt": "English (Trinidad)",
+    "en-us": "English (United States)",
+    "en-za": "English (South Africa)",
+    "es-ar": "Spanish (Argentina)",
+    "es-bo": "Spanish (Bolivia)",
+    "es-cl": "Spanish (Chile)",
+    "es-co": "Spanish (Colombia)",
+    "es-cr": "Spanish (Costa Rica)",
+    "es-do": "Spanish (Dominican Republic)",
+    "es-ec": "Spanish (Ecuador)",
+    "es-gt": "Spanish (Guatemala)",
+    "es-hn": "Spanish (Honduras)",
+    "es-mx": "Spanish (Mexico)",
+    "es-ni": "Spanish (Nicaragua)",
+    "es-pa": "Spanish (Panama)",
+    "es-pe": "Spanish (Peru)",
+    "es-pr": "Spanish (Puerto Rico)",
+    "es-py": "Spanish (Paraguay)",
+    "es": "Spanish (Spain)",
+    "es-sv": "Spanish (El Salvador)",
+    "es-uy": "Spanish (Uruguay)",
+    "es-ve": "Spanish (Venezuela)",
+    "et": "Estonian",
+    "eu": "Basque (Basque)",
+    "fa": "Farsi",
+    "fi": "Finnish",
+    "fo": "Faeroese",
+    "fr-be": "French (Belgium)",
+    "fr-ca": "French (Canada)",
+    "fr-ch": "French (Switzerland)",
+    "fr": "French",
+    "fr-lu": "French (Luxembourg)",
+    "ga": "Irish",
+    "gd": "Gaelic (Scotland)",
+    "he": "Hebrew",
+    "hi": "Hindi",
+    "hr": "Croatian",
+    "hu": "Hungarian",
+    "id": "Indonesian",
+    "is": "Icelandic",
+    "it-ch": "Italian (Switzerland)",
+    "it": "Italian",
+    "ja": "Japanese",
+    "ji": "Yiddish",
+    "ko": "Korean (Johab)",
+    "lt": "Lithuanian",
+    "lv": "Latvian",
+    "mk": "Macedonian (FYROM)",
+    "ms": "Malaysian",
+    "mt": "Maltese",
+    "nl-be": "Dutch (Belgium)",
+    "nl": "Dutch",
+    "no": "Norwegian",
+    "pl": "Polish",
+    "pt-br": "Brazilian Portuguese",
+    "pt": "Portuguese",
+    "rm": "Rhaeto-Romanic",
+    "ro-mo": "Romanian (Republic of Moldova)",
+    "ro": "Romanian",
+    "ru-mo": "Russian (Republic of Moldova)",
+    "ru": "Russian",
+    "sb": "Sorbian",
+    "sk": "Slovak",
+    "sl": "Slovenian",
+    "sq": "Albanian",
+    "sr": "Serbian (Latin)",
+    "sv-fi": "Swedish (Finland)",
+    "sv": "Swedish",
+    "sx": "Sutu",
+    "sz": "Sami (Lappish)",
+    "th": "Thai",
+    "tn": "Tswana",
+    "tr": "Turkish",
+    "ts": "Tsonga",
+    "uk": "Ukrainian",
+    "ur": "Urdu",
+    "ve": "Venda",
+    "vi": "Vietnamese",
+    "xh": "Xhosa",
+    "zh-cn": "Chinese (PRC)",
+    "zh-hk": "Chinese (Hong Kong SAR)",
+    "zh-sg": "Chinese (Singapore)",
+    "zh-tw": "Chinese (Taiwan)",
+    "zu": "Zulu",
+    "anyone.": "anyone",
+    "Direct Chat": "Chat direct",
+    "Direct chats": "Direct chats",
+    "Disable inline URL previews by default": "Disable inline URL previews by default",
+    "Disinvite": "Disinvite",
+    "Display name": "Display name",
+    "Displays action": "Displays action",
+    "Don't send typing notifications": "Don't send typing notifications",
+    "Download %(text)s": "Download %(text)s",
+    "Drop here %(toAction)s": "Drop here %(toAction)s",
+    "Drop here to tag %(section)s": "Drop here to tag %(section)s",
+    "Ed25519 fingerprint": "Ed25519 fingerprint",
+    "Email Address": "Email Address",
+    "Email, name or matrix ID": "Email, name or matrix ID",
+    "Emoji": "Emoji",
+    "Enable encryption": "Enable encryption",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
+    "Encrypted room": "Encrypted room",
+    "%(senderName)s ended the call": "%(senderName)s ended the call",
+    "End-to-end encryption information": "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",
+    "Enter Code": "Enter Code",
+    "Error": "Erreur",
+    "Event information": "Event information",
+    "Existing Call": "Existing Call",
+    "Export E2E room keys": "Export E2E room keys",
+    "Failed to ban user": "Failed to ban user",
+    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
+    "Failed to change power level": "Failed to change power level",
+    "Failed to delete device": "Failed to delete device",
+    "Failed to forget room %(errCode)s": "Echec lors de l'oublie du salon %(errCode)s",
+    "Please Register": "Veuillez vous enregistrer",
+    "Remove": "Supprimer",
+    "was banned": "banned",
+    "was invited": "invited",
+    "was kicked": "kicked",
+    "was unbanned": "unbanned",
+    "Monday": "Lundi",
+    "Tuesday": "Mardi",
+    "Wednesday": "Mercredi",
+    "Thursday": "Jeudi",
+    "Friday": "Vendredi",
+    "Saturday": "Samedi",
+    "Sunday": "Dimanche",
+    "bold": "gras",
+    "italic": "italique",
+    "strike": "barré",
+    "underline": "souligné"
+}
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
new file mode 100644
index 0000000000..2c63c08510
--- /dev/null
+++ b/src/i18n/strings/ml.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
new file mode 100644
index 0000000000..60ab244401
--- /dev/null
+++ b/src/i18n/strings/pt.json
@@ -0,0 +1,503 @@
+{
+    "accept": "aceitar",
+    "accepted an invitation": "aceitou um convite",
+    "accepted the invitation for": "aceitou o convite para",
+    "Account": "Conta",
+    "Add email address": "Adicionar endereço de email",
+    "Add phone number": "Adicionar número de telefone",
+    "Admin": "Administrador/a",
+    "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",
+    "all room members, from the point they joined.": "todos os membros da sala, a partir de quando entraram",
+    "all room members": "todos os membros da sala",
+    "an address": "um endereço",
+    "and": "e",
+    "An email has been sent to": "Um email foi enviado para",
+    "A new password must be entered.": "Uma nova senha precisa ser informada.",
+    "answered the call.": "respondeu à chamada.",
+    "anyone": "qualquer um",
+    "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
+    "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 upload the following files?": "Você tem certeza que deseja enviar os seguintes arquivos?",
+    "banned": "baniu",
+    "Banned users": "Usuárias/os banidas/os",
+    "Bans user with given id": "Banir usuários com o identificador informado",
+    "Blacklisted": "Bloqueado",
+    "Bug Report": "Repotar problemas de funcionamento",
+    "Bulk Options": "Opcões de Batelada",
+    "Can't load user settings": "Não é possível carregar configurações de usuário",
+    "changed avatar": "mudou sua imagem de perfil (avatar)",
+    "changed name": "mudou seu nome",
+    "changed their display name from": "mudou seu nome para",
+    "changed their profile picture": "alterou sua foto de perfil",
+    "changed the power level of": "mudou o nível de permissões de",
+    "changed the room name to": "mudou o nome da sala para",
+    "changed the topic to": "mudou o tópico para",
+    "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
+    "Changes your display nickname": "Troca o seu apelido",
+    "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
+    "Clear Cache and Reload": "Limpar Memória Cache e Recarregar",
+    "Clear Cache": "Limpar Memória Cache",
+    "Click here": "Clique aqui",
+    "Click here to fix": "Clique aqui para resolver isso",
+    "Commands": "Comandos",
+    "Confirm your new password": "Confirme a nova senha",
+    "Continue": "Continuar",
+    "Could not connect to the integration server": "Não foi possível conectar ao servidor de integrações",
+    "Create an account": "Criar uma conta",
+    "Create a new account": "Criar uma conta",
+    "Create Room": "Criar Sala",
+    "Cryptography": "Criptografia",
+    "Curve25519 identity key": "Chave de Indetificação Curve25519",
+    "Deactivate Account": "Desativar conta",
+    "Deactivate my account": "Desativar minha conta",
+    "decline": "rejeitar",
+    "Decryption error": "Erro de descriptografia",
+    "Default": "Padrão",
+    "demote": "reduzir prioridade",
+    "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
+    "Device ID": "Identificador do dispositivo",
+    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Os dispositivos <b>não</b> serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala",
+    "Direct Chat": "Conversa pessoal",
+    "Disable inline URL previews by default": "Desabilitar visualizações prévias por padrão",
+    "Display name": "Nome",
+    "Displays action": "Visualizar atividades",
+    "Ed25519 fingerprint": "Impressão Digital Ed25519",
+    "Email Address": "endereço de email",
+    "Email, name or matrix ID": "Email, nome ou ID matrix",
+    "Emoji": "Emoji",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Mensagens criptografadas não serão visíveis em clientes que ainda não implementaram criptografia",
+    "Encrypted room": "Sala criptografada",
+    "Encryption is enabled in this room": "Criptografia está habilitada nesta sala",
+    "Encryption is not enabled in this room": "Criptografia não está habilitada nesta sala",
+    "ended the call.": "chamada encerrada.",
+    "End-to-end encryption information": "Informação criptografada ponta-a-ponta",
+    "End-to-end encryption is in beta and may not be reliable": "A criptografia ponta a ponta está em estágio beta e não deve ser totalmente confiável",
+    "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 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",
+    "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",
+    "favourite": "favoritar",
+    "Favourite": "Favorito",
+    "Favourites": "Favoritos",
+    "Filter room members": "Filtrar membros de sala",
+    "Forget room": "Esquecer sala",
+    "Forgot your password?": "Esqueceu sua senha?",
+    "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.": "Por segurança, deslogar irá remover qualquer chave de criptografia ponta-a-ponta deste navegador. Caso deseje descriptografar o histórico das suas conversas E2E em sessões Riot futuras, por favor exporte as chaves da sala para sua garantia.",
+    "For security, this session has been signed out. Please sign in again": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente",
+    "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
+    "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
+    "Guests can't set avatars. Please register": "Convidados não podem definir uma foto do perfil. Por favor, registre-se",
+    "Guests can't use labs features. Please register": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre",
+    "Guest users can't upload files. Please register to upload": "Usuários não podem fazer envio de arquivos. Por favor se cadastre para enviar arquivos",
+    "had": "teve",
+    "Hangup": "Desligar",
+    "Historical": "Histórico",
+    "Homeserver is": "Servidor padrão é",
+    "Identity Server is": "O servidor de identificação é",
+    "I have verified my email address": "Eu verifiquei o meu endereço de email",
+    "Import E2E room keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
+    "Invalid Email Address": "Endereço de email inválido",
+    "invited": "convidou",
+    "Invite new room members": "Convidar novo membros para sala",
+    "Invites": "Convidar",
+    "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
+    "is a": "é um(a)",
+    "I want to sign in with": "Quero entrar",
+    "joined and left": "entrou e saiu",
+    "joined": "entrou",
+    "joined the room": "entrou na sala",
+    "Joins room with given alias": "Entra na sala com o nome informado",
+    "Kicks user with given id": "Remove usuário com o identificador informado",
+    "Labs": "Laboratório",
+    "Leave room": "Sair da sala",
+    "left and rejoined": "saiu e entrou novamente",
+    "left": "saiu",
+    "left the room": "saiu da sala",
+    "Logged in as": "Logado como",
+    "Login as guest": "Entrar como visitante",
+    "Logout": "Sair",
+    "Low priority": "Baixa prioridade",
+    "made future room history visible to": "deixou o histórico futuro da sala visível para",
+    "Manage Integrations": "Gerenciar integrações",
+    "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",
+    "New password": "Nova senha",
+    "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
+    "none": "nenhum",
+    "Notifications": "Notificações",
+    " (not supported by this browser)": "não suportado por este navegador",
+    "<not supported>": "<não suportado>",
+    "NOT verified": "NÃO verificado",
+    "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
+    "olm version: ": "Versão do olm: ",
+    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela <b>não poderá</b> ser desativada novamente (ainda)",
+    "Once you&#39;ve followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
+    "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
+    "or": "ou",
+    "other": "outro",
+    "others": "outros",
+    "Password": "Senha",
+    "People": "Pessoas",
+    "Permissions": "Permissões",
+    "Phone": "Telefone",
+    "placed a": "iniciou uma",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor verifique seu email e clique no link enviado. Quando finalizar este processo, clique para continuar.",
+    "Please Register": "Por favor, cadastre-se",
+    "Privacy warning": "Alerta sobre privacidade",
+    "Privileged Users": "Usuárias/os privilegiadas/os",
+    "Profile": "Perfil",
+    "Refer a friend to Riot: ": "Indicar um amigo para participar",
+    "rejected": "recusou",
+    "rejected the invitation.": "rejeitou o convite.",
+    "Reject invitation": "Rejeitar convite",
+    "Remove Contact Information?": "Remover informação de contato?",
+    "removed their display name": "removeu seu nome",
+    "removed their profile picture": "removeu sua foto de perfil",
+    "Remove": "Remover",
+    "requested a VoIP conference": "requisitou uma conferência VoIP",
+    "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso <a href='https://github.com/vector-im/riot-web/issues/2671'>será melhorado</a>",
+    "restore": "restaurar",
+    "Return to app": "Retornar ao aplicativo",
+    "Return to login screen": "Retornar à tela de login",
+    "Room Colour": "Cores da sala",
+    "Room name (optional)": "Título da Sala (opcional)",
+    "Rooms": "Salas",
+    "Scroll to unread messages": "Rolar para baixo para ver as mensagens não lidas",
+    "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
+    "Send a message (unencrypted)": "Enviar uma mensagem",
+    "Send an encrypted message": "Enviar uma mensagem criptografada",
+    "Sender device information": "Informação do dispositivo emissor",
+    "Send Invites": "Enviar convites",
+    "Send Reset Email": "Enviar email para redefinição de senha",
+    "sent an image": "enviou uma imagem",
+    "sent an invitation to": "enviou um convite para",
+    "sent a video": "enviou um vídeo",
+    "Server may be unavailable or overloaded": "Servidor pode estar indisponível ou sobrecarregado",
+    "Server may be unavailable, overloaded, or you hit a bug": "Servidor pode estar indisponível, sobrecarregado ou aconteceu um erro de execução",
+    "Session ID": "Identificador de sessão",
+    "set a profile picture": "colocou uma foto de perfil",
+    "set their display name to": "configurou seu nome para",
+    "Settings": "Configurações",
+    "Show panel": "Mostrar painel",
+    "Signed Out": "Deslogar",
+    "Sign in": "Entrar",
+    "Sign out": "Sair",
+    "since the point in time of selecting this option": "a partir do momento em que você selecionar esta opção",
+    "since they joined": "desde que entraram na sala",
+    "since they were invited": "desde que foram convidadas/os",
+    "Someone": "Alguém",
+    "Sorry, this homeserver is using a login which is not recognised ": "Desculpe, o servidor padrão está usando um login de acesso que não é válido ",
+    "Start a chat": "Começar uma conversa",
+    "Start Chat": "Começar conversa",
+    "Success": "Sucesso",
+    "tag as": "etiquetar como",
+    "tag direct chat": "definir como conversa pessoal",
+    "The default role for new room members is": "O papel padrão para novas/os integrantes da sala é",
+    "The email address linked to your account must be entered.": "O endereço de email relacionado a sua conta precisa ser informado.",
+    "their invitations": "seus convites",
+    "their invitation": "seu convite",
+    "These are experimental features that may break in unexpected ways. Use with caution": "Estes são recursos experimentais que podem não funcionar corretamente. Use com cuidado.",
+    "The visibility of existing history will be unchanged": "A visibilidade do histórico atual não será alterada",
+    "This doesn't appear to be a valid email address": "Este não aparenta ser um endereço de email válido",
+    "this invitation?": "este convite?",
+    "This is a preview of this room. Room interactions have been disabled": "Esta é uma pré visualização desta sala. As interações com a sala estão desabilitadas",
+    "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",
+    "Unable to verify email address": "Não foi possível verificar o endereço de email",
+    "Unban": "Desfazer banimento",
+    "Unencrypted room": "Sala não criptografada",
+    "unencrypted": "não criptografado",
+    "unknown device": "dispositivo desconhecido",
+    "unknown error code": "código de erro desconhecido",
+    "unknown": "desconhecido",
+    "Upload avatar": "Enviar icone de perfil de usuário",
+    "uploaded a file": "enviou um arquivo",
+    "Upload Files": "Enviar arquivos",
+    "Upload file": "Enviar arquivo",
+    "User ID": "Identificador de Usuário",
+    "User Interface": "Interface de usuário",
+    "username": "Nome de usuária/o",
+    "Users": "Usuários",
+    "User": "Usuária/o",
+    "Verification Pending": "Verificação pendente",
+    "Verification": "Verificação",
+    "verified": "verificado",
+    "Video call": "Chamada de vídeo",
+    "Voice call": "Chamada de voz",
+    "VoIP conference finished": "Conferência VoIP encerrada",
+    "VoIP conference started": "Conferência VoIP iniciada",
+    "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)",
+    "Warning": "Atenção",
+    "was banned": "banida/o",
+    "was invited": "convidada/o",
+    "was kicked": "retirada/o da sala",
+    "was unbanned": "des-banida/o",
+    "was": "foi",
+    "were": "foram",
+    "Who can access this room?": "Quem pode acessar esta sala?",
+    "Who can read history?": "Quem pode ler o histórico da sala?",
+    "Who would you like to add to this room?": "Quem Você gostaria que fosse adicionado a esta sala?",
+    "Who would you like to communicate with?": "Com quem você gostaria de se comunicar?",
+    "withdrawn": "retirado",
+    "Would you like to": "Você gostaria de",
+    "You are trying to access": "Você está tentando acessar a sala",
+    "You do not have permission to post to this room": "Você não tem permissão de postar nesta sala",
+    "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": "Você foi desconectada/o de todos os dispositivos e portanto não receberá mais notificações no seu celular ou no computador. Para reativar as notificações, entre novamente em cada um dos dispositivos que costuma usar",
+    "You have no visible notifications": "Voce não possui notificações visíveis",
+    "you must be a": "você precisa ser",
+    "Your password has been reset": "Sua senha foi redefinida",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles",
+    "You should <b>not</b> yet trust it to secure data": "Você <b>não</b> deve confiar nela ainda para preservar seus dados",
+    "Sun": "Dom",
+    "Mon": "Seg",
+    "Tue": "Ter",
+    "Wed": "Qua",
+    "Thu": "Qui",
+    "Fri": "Sex",
+    "Sat": "Sáb",
+    "Jan": "Jan",
+    "Feb": "Fev",
+    "Mar": "Mar",
+    "Apr": "Abr",
+    "May": "Mai",
+    "Jun": "Jun",
+    "Jul": "Jul",
+    "Aug": "Ago",
+    "Sep": "Set",
+    "Oct": "Out",
+    "Nov": "Nov",
+    "Dec": "Dez",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
+    "en": "Inglês",
+    "pt-br": "Português do Brasil",
+    "de": "Alemão",
+    "da": "Dinamarquês",
+    "ru": "Russo",
+    "%(targetName)s accepted an invitation": "%(targetName)s aceitou um convite",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s aceitou o convite para %(displayName)s",
+    "all room members, from the point they are invited": "todas/os as/os integrantes da sala, a partir do momento em que foram convidadas/os",
+    "all room members, from the point they joined": "todas/os as/os integrantes da sala, a partir do momento em que entraram na sala",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
+    "%(names)s and one other are typing": "%(names)s e uma outra pessoa estão escrevendo",
+    "%(names)s and %(count)s others are typing": "%(names)s e %(count)s outras pessoas estão escrevendo",
+    "%(senderName)s answered the call": "%(senderName)s atendeu à chamada",
+    "anyone.": "qualquer pessoa",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
+    "Call Timeout": "Tempo esgotado. Chamada encerrada",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s",
+    "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
+    "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
+    "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s alterou o tópico para %(topic)s",
+    "click to reveal": "clique para ver",
+    "Conference call failed": "Chamada de conferência falhou",
+    "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
+    "Conference calls are not supported in encrypted rooms": "Chamadas de conferência não são possíveis em salas criptografadas",
+    "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
+    "/ddg is not a command": "/ddg não é um comando",
+    "Drop here %(toAction)s": "Arraste aqui %(toAction)s",
+    "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
+    "%(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 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",
+    "Failure to create room": "Não foi possível criar a sala",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
+    "Guest users can't create new rooms. Please register to create room and start a chat": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s convidou %(targetName)s",
+    "%(displayName)s is typing": "%(displayName)s está escrevendo",
+    "%(targetName)s joined the room": "%(targetName)s entrou na sala",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
+    "%(targetName)s left the room": "%(targetName)s saiu da sala",
+    "%(senderName)s made future room history visible to": "%(senderName)s deixou o histórico futuro da sala visível para",
+    "Missing room_id in request": "Faltou o id da sala na requisição",
+    "Missing user_id in request": "Faltou o id de usuário na requisição",
+    "Must be viewing a room": "Tem que estar visualizando uma sala",
+    "New Composer & Autocomplete": "Nova ferramenta de formatação de mensagens e autocompletar",
+    "(not supported by this browser)": "(não é compatível com este navegador)",
+    "olm version": "versão olm",
+    "%(senderName)s placed a %(callType)s call": "%(senderName)s fez uma chamada de %(callType)s",
+    "Power level must be positive integer": "O nível de permissões tem que ser um número inteiro e positivo",
+    "Press": "Aperte",
+    "Reason": "Razão",
+    "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
+    "%(targetName)s rejected the invitation": "%(targetName)s recusou o convite",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s)",
+    "%(senderName)s removed their profile picture": "%(senderName)s removeu sua imagem de perfil",
+    "%(senderName)s requested a VoIP conference": "%(senderName)s está solicitando uma conferência de voz",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
+    "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
+    "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
+    "%(senderDisplayName)s sent an image": "%(senderDisplayName)s enviou uma imagem",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala",
+    "%(senderName)s set a profile picture": "%(senderName)s definiu uma imagem de perfil",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s definiu seu nome público para %(displayName)s",
+    "tag as %(tagName)s": "marcar como %(tagName)s",
+    "This email address is already in use": "Este endereço de email já está sendo usado",
+    "This email address was not found": "Este endereço de email não foi encontrado",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
+    "The file '%(fileName)s' failed to upload": "Não foi possível enviar o arquivo '%(fileName)s",
+    "The remote side failed to pick up": "Houve alguma falha que não permitiu a outra pessoa atender à chamada",
+    "This room is not recognised": "Esta sala não é reconhecida",
+    "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
+    "This phone number is already in use": "Este número de telefone já está sendo usado",
+    "to browse the directory": "para navegar na lista pública de salas",
+    "to demote": "para reduzir prioridade",
+    "to favourite": "para favoritar",
+    "to make a room or": "para criar uma sala ou",
+    "To redact 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",
+    "To use it, just wait for autocomplete results to load and tab through them": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s)",
+    "Unable to restore previous session": "Não foi possível restaurar a sessão anterior",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s desfez o banimento de %(targetName)s",
+    "Unable to capture screen": "Não foi possível capturar a imagem da tela",
+    "Unable to enable Notifications": "Não foi possível ativar as notificações",
+    "Upload Failed": "O envio falhou",
+    "Usage": "Uso",
+    "Use with caution": "Use com cautela",
+    "VoIP is unsupported": "Chamada de voz não permitida",
+    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s desfez o convite a %(targetName)s's",
+    "You are already in a call": "Você já está em  uma chamada",
+    "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
+    "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
+    "You cannot place a call with yourself": "Você não pode iniciar uma chamada",
+    "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
+    "You need to be able to invite users to do that": "Para fazer isso, você tem que ter permissão para convidar outras pessoas",
+    "You need to be logged in": "Você tem que estar logado",
+    "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": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
+    "Set a display name:": "Defina um nome público para você:",
+    "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
+    "This server does not support authentication with a phone number.": "Este servidor não permite a autenticação através de números de telefone.",
+    "Missing password.": "Faltou a senha.",
+    "Passwords don't match.": "As senhas não conferem.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "A senha é muito curta (o mínimo é de %(MIN_PASSWORD_LENGTH)s caracteres).",
+    "This doesn't look like a valid email address.": "Este endereço de email não parece ser válido.",
+    "This doesn't look like a valid phone number.": "Este número de telefone não parece ser válido.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Nomes de usuária/o podem conter apenas letras, números, pontos, hífens e linha inferior (_).",
+    "An unknown error occurred.": "Um erro desconhecido ocorreu.",
+    "I already have an account": "Eu já tenho uma conta",
+    "An error occured: %(error_string)s": "Um erro ocorreu: %(error_string)s",
+    "Topic": "Tópico",
+    "Make this room private": "Tornar esta sala privada",
+    "Share message history with new users": "Compartilhar histórico de mensagens com novas/os usuárias/os",
+    "Encrypt room": "Criptografar esta sala",
+    "There are no visible files in this room": "Não há arquivos públicos nesta sala",
+    "Error changing language": "Erro ao mudar de idioma",
+    "Riot was unable to find the correct Data for the selected Language.": "Não foi possível encontrar os dados para o idioma selecionado.",
+    "Connectivity to the server has been lost.": "A conexão com o servidor foi perdida. Verifique sua conexão de internet.",
+    "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
+    "Auto-complete": "Autocompletar",
+    "Resend all": "Reenviar todas as mensagens",
+    "cancel all": "cancelar todas",
+    "now. You can also select individual messages to resend or cancel.": "agora. Você também pode escolher mensagens individuais e definir se vai reenviar ou cancelar o envio.",
+    "Active call": "Chamada ativa",
+    "af": "Afrikaans",
+    "ar-ae": "Árabe (U.A.E.)",
+    "ar-bh": "Árabe (Bahrain)",
+    "ar-dz": "Árabe (Algéria)",
+    "ar-eg": "Árabe (Egipto)",
+    "ar-tn": "Árabe (Tunisia)",
+    "be": "Bielorusso",
+    "bg": "Búlgaro",
+    "ca": "Catalão",
+    "cs": "Checo",
+    "de-at": "Alemao (Austria)",
+    "el": "Grego",
+    "en-au": "Inglês (Austrália)",
+    "en-ca": "Inglês (Canadá)",
+    "en-ie": "Inglês (Irlanda)",
+    "en-nz": "Inglês (Nova Zelândia)",
+    "en-us": "Inglês (Estados Unidos)",
+    "es-ar": "Espanhol (Argentina)",
+    "es-mx": "Espanhol (Mexico)",
+    "es-py": "Espanhol (Paraguai)",
+    "es": "Espanhol (Espanha)",
+    "et": "Estoniano",
+    "fa": "Farsi",
+    "fi": "Finlandês",
+    "fr-be": "Francês (Bélgica)",
+    "fr-ca": "Francês (Canadá)",
+    "fr-ch": "Francês (Suíça)",
+    "fr": "Francês",
+    "ga": "Irlandês",
+    "he": "Hebreu",
+    "hi": "Hindi",
+    "hr": "Croata",
+    "hu": "Húngaro",
+    "id": "Indonésio",
+    "is": "Islandês",
+    "it": "Italiano",
+    "ja": "Japonês",
+    "ji": "iídiche",
+    "lt": "Lituano",
+    "lv": "Letão",
+    "mt": "Maltês",
+    "nl-be": "Holandês (Bélgica)",
+    "nl": "Holandês",
+    "no": "Norueguês",
+    "pl": "Polaco",
+    "pt": "Português",
+    "ro": "Romeno",
+    "sk": "Eslovaco",
+    "sl": "Esloveno",
+    "sq": "Albanês",
+    "sr": "Sérvio (Latim)",
+    "sv": "Sueco",
+    "th": "Tailandês",
+    "tn": "tswana",
+    "tr": "Turco",
+    "ts": "tsonga",
+    "uk": "Ucraniano",
+    "ur": "urdu",
+    "ve": "venda",
+    "vi": "Vietnamita",
+    "xh": "xosa",
+    "zu": "zulu",
+    "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s",
+    "Failed to join the room": "Falha ao entrar na sala",
+    "Sunday": "Domingo",
+    "Monday": "Segunda",
+    "Tuesday": "Terça",
+    "Wednesday": "Quarta",
+    "Thursday": "Quinta",
+    "Friday": "Sexta",
+    "Saturday": "Sábado"
+}
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
new file mode 100644
index 0000000000..3bd74ce14f
--- /dev/null
+++ b/src/i18n/strings/pt_BR.json
@@ -0,0 +1,706 @@
+{
+    "accept": "aceitar",
+    "accepted an invitation": "aceitou um convite",
+    "accepted the invitation for": "aceitou o convite para",
+    "Account": "Conta",
+    "Add email address": "Adicionar endereço de email",
+    "Add phone number": "Adicionar número de telefone",
+    "Admin": "Administrador/a",
+    "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",
+    "all room members, from the point they joined.": "todos os membros da sala, a partir de quando entraram",
+    "all room members": "todas as pessoas da sala",
+    "an address": "um endereço",
+    "and": "e",
+    "An email has been sent to": "Um email foi enviado para",
+    "New passwords don't match": "As novas senhas não conferem",
+    "A new password must be entered.": "Uma nova senha precisa ser informada.",
+    "answered the call.": "respondeu à chamada.",
+    "anyone": "qualquer um",
+    "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
+    "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 upload the following files?": "Você tem certeza que deseja enviar os seguintes arquivos?",
+    "banned": "baniu",
+    "Banned users": "Usuárias/os banidas/os",
+    "Bans user with given id": "Banir usuários com o identificador informado",
+    "Blacklisted": "Bloqueado",
+    "Bug Report": "Repotar problemas de funcionamento",
+    "Bulk Options": "Opcões de Batelada",
+    "Can't load user settings": "Não é possível carregar configurações de usuário",
+    "changed avatar": "mudou sua imagem de perfil (avatar)",
+    "changed name": "mudou seu nome",
+    "changed their display name from": "mudou seu nome para",
+    "changed their profile picture": "alterou sua foto de perfil",
+    "changed the power level of": "mudou o nível de permissões de",
+    "changed the room name to": "mudou o nome da sala para",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\"",
+    "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
+    "Changes your display nickname": "Troca o seu apelido",
+    "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
+    "Clear Cache and Reload": "Limpar Memória Cache e Recarregar",
+    "Clear Cache": "Limpar Memória Cache",
+    "Click here": "Clique aqui",
+    "Click here to fix": "Clique aqui para resolver isso",
+    "Commands": "Comandos",
+    "Confirm password": "Confirme a nova senha",
+    "Confirm your new password": "Confirme a nova senha",
+    "Continue": "Continuar",
+    "Could not connect to the integration server": "Não foi possível conectar ao servidor de integrações",
+    "Create an account": "Criar uma conta",
+    "Create a new account": "Criar uma conta",
+    "Create Room": "Criar Sala",
+    "Cryptography": "Criptografia",
+    "Current password": "Senha atual",
+    "Curve25519 identity key": "Chave de Indetificação Curve25519",
+    "Deactivate Account": "Desativar conta",
+    "Deactivate my account": "Desativar minha conta",
+    "decline": "rejeitar",
+    "Decryption error": "Erro de descriptografia",
+    "Default": "Padrão",
+    "demote": "reduzir prioridade",
+    "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
+    "Device ID": "Identificador do dispositivo",
+    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Os dispositivos <b>não</b> serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala",
+    "Direct Chat": "Conversa pessoal",
+    "Disable inline URL previews by default": "Desabilitar visualizações prévias por padrão",
+    "Display name": "Nome",
+    "Displays action": "Visualizar atividades",
+    "Ed25519 fingerprint": "Impressão Digital Ed25519",
+    "Email Address": "endereço de email",
+    "Email, name or matrix ID": "Email, nome ou ID matrix",
+    "Emoji": "Emoji",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Mensagens criptografadas não serão visíveis em clientes que ainda não implementaram criptografia",
+    "Encrypted room": "Sala criptografada",
+    "Encryption is enabled in this room": "Criptografia está habilitada nesta sala",
+    "Encryption is not enabled in this room": "Criptografia não está habilitada nesta sala",
+    "ended the call.": "chamada encerrada.",
+    "End-to-end encryption information": "Informação criptografada ponta-a-ponta",
+    "End-to-end encryption is in beta and may not be reliable": "A criptografia ponta a ponta está em estágio beta e não deve ser totalmente confiável",
+    "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 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",
+    "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",
+    "favourite": "favoritar",
+    "Favourite": "Favorito",
+    "Favourites": "Favoritos",
+    "Filter room members": "Filtrar integrantes da sala",
+    "Forget room": "Esquecer sala",
+    "Forgot your password?": "Esqueceu sua senha?",
+    "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.": "Por segurança, deslogar irá remover qualquer chave de criptografia ponta-a-ponta deste navegador. Caso deseje descriptografar o histórico das suas conversas E2E em sessões Riot futuras, por favor exporte as chaves da sala para sua garantia.",
+    "For security, this session has been signed out. Please sign in again": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente",
+    "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
+    "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
+    "Guests can't set avatars. Please register": "Convidados não podem definir uma foto do perfil. Por favor, registre-se",
+    "Guests can't use labs features. Please register": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre",
+    "Guest users can't upload files. Please register to upload": "Usuários não podem fazer envio de arquivos. Por favor se cadastre para enviar arquivos",
+    "had": "teve",
+    "Hangup": "Desligar",
+    "Historical": "Histórico",
+    "Homeserver is": "Servidor padrão é",
+    "Identity Server is": "O servidor de identificação é",
+    "I have verified my email address": "Eu verifiquei o meu endereço de email",
+    "Import E2E room keys": "Importar chave de criptografia ponta-a-ponta (E2E) da sala",
+    "Invalid Email Address": "Endereço de email inválido",
+    "invited": "convidou",
+    "Invite new room members": "Convidar novas pessoas para ingressar na sala",
+    "Invites": "Convidar",
+    "Invites user with given id to current room": "Convidar usuários com um dado identificador para esta sala",
+    "is a": "é um(a)",
+    "I want to sign in with": "Quero entrar",
+    "joined and left": "entrou e saiu",
+    "joined": "entrou",
+    "joined the room": "entrou na sala",
+    "Joins room with given alias": "Entra na sala com o nome informado",
+    "Kicks user with given id": "Remove usuário com o identificador informado",
+    "Labs": "Laboratório",
+    "Leave room": "Sair da sala",
+    "left and rejoined": "saiu e entrou novamente",
+    "left": "saiu",
+    "left the room": "saiu da sala",
+    "Logged in as": "Logado como",
+    "Login as guest": "Entrar como visitante",
+    "Logout": "Sair",
+    "Low priority": "Baixa prioridade",
+    "made future room history visible to": "deixou o histórico futuro da sala visível para",
+    "Manage Integrations": "Gerenciar integrações",
+    "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",
+    "New password": "Nova senha",
+    "New passwords must match each other.": "As novas senhas informadas precisam ser idênticas.",
+    "none": "nenhum",
+    "Notifications": "Notificações",
+    " (not supported by this browser)": "não suportado por este navegador",
+    "<not supported>": "<não suportado>",
+    "NOT verified": "NÃO verificado",
+    "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
+    "olm version: ": "Versão do olm: ",
+    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela <b>não poderá</b> ser desativada novamente (ainda)",
+    "Once you&#39;ve followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
+    "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
+    "or": "ou",
+    "other": "outro",
+    "others": "outros",
+    "Password": "Senha",
+    "Passwords can't be empty": "As senhas não podem estar em branco",
+    "People": "Pessoas",
+    "Permissions": "Permissões",
+    "Phone": "Telefone",
+    "placed a": "iniciou uma",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor verifique seu email e clique no link enviado. Quando finalizar este processo, clique para continuar.",
+    "Please Register": "Por favor, cadastre-se",
+    "Privacy warning": "Alerta sobre privacidade",
+    "Privileged Users": "Usuárias/os privilegiadas/os",
+    "Profile": "Perfil",
+    "Refer a friend to Riot: ": "Indicar um amigo para participar",
+    "rejected": "recusou",
+    "rejected the invitation.": "rejeitou o convite.",
+    "Reject invitation": "Rejeitar convite",
+    "Remove Contact Information?": "Remover informação de contato?",
+    "removed their display name": "removeu seu nome",
+    "removed their profile picture": "removeu sua foto de perfil",
+    "Remove": "Remover",
+    "requested a VoIP conference": "requisitou uma conferência VoIP",
+    "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso <a href='https://github.com/vector-im/riot-web/issues/2671'>será melhorado</a>",
+    "restore": "restaurar",
+    "Return to app": "Retornar ao aplicativo",
+    "Return to login screen": "Retornar à tela de login",
+    "Room Colour": "Cores da sala",
+    "Room name (optional)": "Título da Sala (opcional)",
+    "Rooms": "Salas",
+    "Scroll to bottom of page": "Ir para o fim da página",
+    "Scroll to unread messages": "Rolar para baixo para ver as mensagens não lidas",
+    "Searches DuckDuckGo for results": "Buscar por resultados no buscador DuckDuckGo",
+    "Send a message (unencrypted)": "Enviar uma mensagem",
+    "Send an encrypted message": "Enviar uma mensagem criptografada",
+    "Sender device information": "Informação do dispositivo emissor",
+    "Send Invites": "Enviar convites",
+    "Send Reset Email": "Enviar email para redefinição de senha",
+    "sent an image": "enviou uma imagem",
+    "sent an invitation to": "enviou um convite para",
+    "sent a video": "enviou um vídeo",
+    "Server may be unavailable or overloaded": "Servidor pode estar indisponível ou sobrecarregado",
+    "Server may be unavailable, overloaded, or you hit a bug": "Servidor pode estar indisponível, sobrecarregado ou aconteceu um erro de execução",
+    "Session ID": "Identificador de sessão",
+    "set a profile picture": "colocou uma foto de perfil",
+    "set their display name to": "configurou seu nome para",
+    "Settings": "Configurações",
+    "Show panel": "Mostrar painel",
+    "Signed Out": "Deslogar",
+    "Sign in": "Entrar",
+    "Sign out": "Sair",
+    "since the point in time of selecting this option": "a partir do momento em que você selecionar esta opção",
+    "since they joined": "desde que entraram na sala",
+    "since they were invited": "desde que foram convidadas/os",
+    "Someone": "Alguém",
+    "Sorry, this homeserver is using a login which is not recognised ": "Desculpe, o servidor padrão está usando um login de acesso que não é válido ",
+    "Start a chat": "Começar uma conversa",
+    "Start Chat": "Começar conversa",
+    "Success": "Sucesso",
+    "tag as": "etiquetar como",
+    "tag direct chat": "definir como conversa pessoal",
+    "The default role for new room members is": "O papel padrão para novas/os integrantes da sala é",
+    "The email address linked to your account must be entered.": "O endereço de email relacionado a sua conta precisa ser informado.",
+    "their invitations": "seus convites",
+    "their invitation": "seu convite",
+    "These are experimental features that may break in unexpected ways. Use with caution": "Estes são recursos experimentais que podem não funcionar corretamente. Use com cuidado.",
+    "The visibility of existing history will be unchanged": "A visibilidade do histórico atual não será alterada",
+    "This doesn't appear to be a valid email address": "Este não aparenta ser um endereço de email válido",
+    "this invitation?": "este convite?",
+    "This is a preview of this room. Room interactions have been disabled": "Esta é uma pré visualização desta sala. As interações com a sala estão desabilitadas",
+    "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",
+    "Unable to verify email address": "Não foi possível verificar o endereço de email",
+    "Unban": "Desfazer banimento",
+    "Unencrypted room": "Sala não criptografada",
+    "unencrypted": "não criptografado",
+    "unknown device": "dispositivo desconhecido",
+    "unknown error code": "código de erro desconhecido",
+    "unknown": "desconhecido",
+    "Upload avatar": "Enviar icone de perfil de usuário",
+    "uploaded a file": "enviou um arquivo",
+    "Upload Files": "Enviar arquivos",
+    "Upload file": "Enviar arquivo",
+    "User ID": "Identificador de Usuário",
+    "User Interface": "Interface de usuário",
+    "username": "Nome de usuária/o",
+    "Users": "Usuários",
+    "User": "Usuária/o",
+    "Verification Pending": "Verificação pendente",
+    "Verification": "Verificação",
+    "verified": "verificado",
+    "Video call": "Chamada de vídeo",
+    "Voice call": "Chamada de voz",
+    "VoIP conference finished": "Conferência VoIP encerrada",
+    "VoIP conference started": "Conferência VoIP iniciada",
+    "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)",
+    "Warning": "Atenção",
+    "was banned": "banida/o",
+    "was invited": "convidada/o",
+    "was kicked": "retirada/o da sala",
+    "was unbanned": "des-banida/o",
+    "was": "foi",
+    "were": "foram",
+    "Who can access this room?": "Quem pode acessar esta sala?",
+    "Who can read history?": "Quem pode ler o histórico da sala?",
+    "Who would you like to add to this room?": "Quais pessoas você gostaria de adicionar a esta sala?",
+    "Who would you like to communicate with?": "Com quem você gostaria de se comunicar?",
+    "withdrawn": "retirado",
+    "Would you like to": "Você gostaria de",
+    "You are trying to access": "Você está tentando acessar a sala",
+    "You do not have permission to post to this room": "Você não tem permissão de postar nesta sala",
+    "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": "Você foi desconectada/o de todos os dispositivos e portanto não receberá mais notificações no seu celular ou no computador. Para reativar as notificações, entre novamente em cada um dos dispositivos que costuma usar",
+    "You have no visible notifications": "Voce não possui notificações visíveis",
+    "you must be a": "você precisa ser",
+    "Your password has been reset": "Sua senha foi redefinida",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles",
+    "You should <b>not</b> yet trust it to secure data": "Você <b>não</b> deve confiar nela ainda para preservar seus dados",
+    "Sun": "Dom",
+    "Mon": "Seg",
+    "Tue": "Ter",
+    "Wed": "Qua",
+    "Thu": "Qui",
+    "Fri": "Sex",
+    "Sat": "Sáb",
+    "Jan": "Jan",
+    "Feb": "Fev",
+    "Mar": "Mar",
+    "Apr": "Abr",
+    "May": "Mai",
+    "Jun": "Jun",
+    "Jul": "Jul",
+    "Aug": "Ago",
+    "Sep": "Set",
+    "Oct": "Out",
+    "Nov": "Nov",
+    "Dec": "Dez",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s às %(time)s",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s às %(time)s",
+    "en": "Inglês",
+    "pt-br": "Português do Brasil",
+    "de": "Alemão",
+    "da": "Dinamarquês",
+    "ru": "Russo",
+    "%(targetName)s accepted an invitation": "%(targetName)s aceitou um convite",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s aceitou o convite para %(displayName)s",
+    "all room members, from the point they are invited": "todas/os as/os integrantes da sala, a partir do momento em que foram convidadas/os",
+    "all room members, from the point they joined": "todas/os as/os integrantes da sala, a partir do momento em que entraram na sala",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
+    "%(names)s and one other are typing": "%(names)s e uma outra pessoa estão escrevendo",
+    "%(names)s and %(count)s others are typing": "%(names)s e %(count)s outras pessoas estão escrevendo",
+    "%(senderName)s answered the call": "%(senderName)s atendeu à chamada",
+    "anyone.": "qualquer pessoa",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
+    "Call Timeout": "Tempo esgotado. Chamada encerrada",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s",
+    "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
+    "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
+    "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s alterou o tópico para %(topic)s",
+    "click to reveal": "clique para ver",
+    "Conference call failed": "Chamada de conferência falhou",
+    "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
+    "Conference calls are not supported in encrypted rooms": "Chamadas de conferência não são possíveis em salas criptografadas",
+    "Conference calls are not supported in this client": "Chamadas de conferência não são possíveis neste navegador",
+    "/ddg is not a command": "/ddg não é um comando",
+    "Drop here %(toAction)s": "Arraste aqui %(toAction)s",
+    "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
+    "%(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 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",
+    "Failure to create room": "Não foi possível criar a sala",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
+    "Guest users can't create new rooms. Please register to create room and start a chat": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s convidou %(targetName)s",
+    "%(displayName)s is typing": "%(displayName)s está escrevendo",
+    "%(targetName)s joined the room": "%(targetName)s entrou na sala",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
+    "%(targetName)s left the room": "%(targetName)s saiu da sala",
+    "%(senderName)s made future room history visible to": "%(senderName)s deixou o histórico futuro da sala visível para",
+    "Missing room_id in request": "Faltou o id da sala na requisição",
+    "Missing user_id in request": "Faltou o id de usuário na requisição",
+    "Must be viewing a room": "Tem que estar visualizando uma sala",
+    "New Composer & Autocomplete": "Nova ferramenta de formatação de mensagens e autocompletar",
+    "(not supported by this browser)": "(não é compatível com este navegador)",
+    "olm version": "versão olm",
+    "%(senderName)s placed a %(callType)s call": "%(senderName)s fez uma chamada de %(callType)s",
+    "Power level must be positive integer": "O nível de permissões tem que ser um número inteiro e positivo",
+    "Press": "Aperte",
+    "Reason": "Razão",
+    "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
+    "%(targetName)s rejected the invitation": "%(targetName)s recusou o convite",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s)",
+    "%(senderName)s removed their profile picture": "%(senderName)s removeu sua imagem de perfil",
+    "%(senderName)s requested a VoIP conference": "%(senderName)s está solicitando uma conferência de voz",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
+    "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
+    "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
+    "%(senderDisplayName)s sent an image": "%(senderDisplayName)s enviou uma imagem",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala",
+    "%(senderName)s set a profile picture": "%(senderName)s definiu uma imagem de perfil",
+    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s definiu seu nome público para %(displayName)s",
+    "tag as %(tagName)s": "marcar como %(tagName)s",
+    "This email address is already in use": "Este endereço de email já está sendo usado",
+    "This email address was not found": "Este endereço de email não foi encontrado",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
+    "The file '%(fileName)s' failed to upload": "Não foi possível enviar o arquivo '%(fileName)s",
+    "The remote side failed to pick up": "Houve alguma falha que não permitiu a outra pessoa atender à chamada",
+    "This room is not recognised": "Esta sala não é reconhecida",
+    "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
+    "This phone number is already in use": "Este número de telefone já está sendo usado",
+    "to browse the directory": "para navegar na lista pública de salas",
+    "to demote": "para reduzir prioridade",
+    "to favourite": "para favoritar",
+    "to make a room or": "para criar uma sala ou",
+    "To redact 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 as %(tagName)s": "para marcar como %(tagName)s",
+    "to tag direct chat": "para marcar a conversa como pessoal",
+    "To use it, just wait for autocomplete results to load and tab through them": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s)",
+    "Unable to restore previous session": "Não foi possível restaurar a sessão anterior",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s desfez o banimento de %(targetName)s",
+    "Unable to capture screen": "Não foi possível capturar a imagem da tela",
+    "Unable to enable Notifications": "Não foi possível ativar as notificações",
+    "Upload Failed": "O envio falhou",
+    "Usage": "Uso",
+    "Use with caution": "Use com cautela",
+    "VoIP is unsupported": "Chamada de voz não permitida",
+    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s desfez o convite a %(targetName)s",
+    "You are already in a call": "Você já está em  uma chamada",
+    "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
+    "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
+    "You cannot place a call with yourself": "Você não pode iniciar uma chamada",
+    "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
+    "You need to be able to invite users to do that": "Para fazer isso, você tem que ter permissão para convidar outras pessoas",
+    "You need to be logged in": "Você tem que estar logado",
+    "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": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
+    "Set a display name:": "Defina um nome público para você:",
+    "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
+    "This server does not support authentication with a phone number.": "Este servidor não permite a autenticação através de números de telefone.",
+    "Missing password.": "Faltou a senha.",
+    "Passwords don't match.": "As senhas não conferem.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "A senha é muito curta (o mínimo é de %(MIN_PASSWORD_LENGTH)s caracteres).",
+    "This doesn't look like a valid email address.": "Este endereço de email não parece ser válido.",
+    "This doesn't look like a valid phone number.": "Este número de telefone não parece ser válido.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Nomes de usuária/o podem conter apenas letras, números, pontos, hífens e linha inferior (_).",
+    "An unknown error occurred.": "Um erro desconhecido ocorreu.",
+    "I already have an account": "Eu já tenho uma conta",
+    "An error occured: %(error_string)s": "Um erro ocorreu: %(error_string)s",
+    "Topic": "Tópico",
+    "Make this room private": "Tornar esta sala privada",
+    "Share message history with new users": "Compartilhar histórico de mensagens com novas/os usuárias/os",
+    "Encrypt room": "Criptografar esta sala",
+    "There are no visible files in this room": "Não há arquivos públicos nesta sala",
+    "Error changing language": "Erro ao mudar de idioma",
+    "Riot was unable to find the correct Data for the selected Language.": "Não foi possível encontrar os dados para o idioma selecionado.",
+    "Connectivity to the server has been lost.": "A conexão com o servidor foi perdida. Verifique sua conexão de internet.",
+    "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
+    "Auto-complete": "Autocompletar",
+    "Resend all": "Reenviar todas as mensagens",
+    "cancel all": "cancelar todas",
+    "now. You can also select individual messages to resend or cancel.": "agora. Você também pode escolher mensagens individuais e definir se vai reenviar ou cancelar o envio.",
+    "Active call": "Chamada ativa",
+    "af": "Afrikaans",
+    "ar-ae": "Árabe (U.A.E.)",
+    "ar-bh": "Árabe (Bahrain)",
+    "ar-dz": "Árabe (Algéria)",
+    "Sunday": "Domingo",
+    "Monday": "Segunda",
+    "ar-eg": "Árabe (Egito)",
+    "ar-tn": "Árabe (Tunisia)",
+    "be": "Bielorusso",
+    "bg": "Búlgaro",
+    "ca": "Catalão",
+    "cs": "Tcheco",
+    "el": "Grego",
+    "en-au": "Inglês (Austrália)",
+    "en-ca": "Inglês (Canadá)",
+    "en-gb": "Inglês (Reino Unido)",
+    "en-ie": "Inglês (Irlanda)",
+    "en-nz": "Inglês (Nova Zelândia)",
+    "en-us": "Inglês (Estados Unidos)",
+    "es-ar": "Espanhol (Argentina)",
+    "es-py": "Espanhol (Paraguai)",
+    "es": "Espanhol (Espanha)",
+    "et": "Estônia",
+    "fa": "Farsi",
+    "fi": "Finlandês",
+    "fr-be": "Francês (Bélgica)",
+    "fr-ca": "Francês (Canadá)",
+    "fr-ch": "Francês (Suíça)",
+    "fr": "Francês",
+    "ga": "Irlandês",
+    "he": "Hebreu",
+    "hi": "Hindu",
+    "hr": "Croácia",
+    "hu": "Hungria",
+    "id": "Indonésio",
+    "is": "Islandês",
+    "it": "Italiano",
+    "ja": "Japonês",
+    "ji": "Ídiche",
+    "lt": "Lituânia",
+    "lv": "Letão",
+    "ms": "Malaio",
+    "mt": "Maltês",
+    "nl-be": "Holandês (Bélgica)",
+    "nl": "Holandês",
+    "no": "Norueguês",
+    "pl": "Polonês",
+    "pt": "Português (Portugal)",
+    "rm": "Romanche",
+    "ro": "Romeno",
+    "sk": "Eslovaco",
+    "sl": "Esloveno",
+    "sq": "Albanês",
+    "sr": "Sérvio (latino)",
+    "sv": "Suécia",
+    "th": "Tailandês",
+    "tn": "Tsuana",
+    "tr": "Turquia",
+    "ts": "Tsonga",
+    "uk": "Ucraniano",
+    "ur": "Urdu",
+    "vi": "Vietnamita",
+    "xh": "Xhosa",
+    "zu": "Zulu",
+    "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
+    "Failed to join the room": "Falhou ao entrar na sala",
+    "Tuesday": "Terça",
+    "Wednesday": "Quarta",
+    "Thursday": "Quinta",
+    "Friday": "Sexta",
+    "Saturday": "Sábado",
+    "ar-iq": "Árabe (Iraque)",
+    "ar-jo": "Árabe (Jordânia)",
+    "ar-kw": "Árabe (Kuwait)",
+    "ar-lb": "Árabe (Líbano)",
+    "ar-ly": "Árabe (Líbia)",
+    "ar-ma": "Árabe (Marrocos)",
+    "ar-om": "Árabe (Omã)",
+    "ar-qa": "Árabe (Catar)",
+    "ar-sa": "Árabe (Arábia Saudita)",
+    "ar-sy": "Árabe (Síria)",
+    "ar-ye": "Árabe (Iémen)",
+    "de-at": "Alemão (Austria)",
+    "de-ch": "Alemão (Suíça)",
+    "de-li": "Alemão (Liechtenstein)",
+    "de-lu": "Alemão (Luxemburgo)",
+    "en-bz": "Inglês (Belize)",
+    "en-jm": "Inglês (Jamaica)",
+    "en-tt": "English (Trindade)",
+    "en-za": "English (África do Sul)",
+    "es-bo": "Espanhol (Bolívia)",
+    "es-cl": "Espanhol (Chile)",
+    "es-co": "Espanhol (Colômbia)",
+    "es-cr": "Espanhol (Costa Rica)",
+    "es-do": "Espanhol (República Dominicana)",
+    "es-ec": "Espanhol (Equador)",
+    "es-gt": "Espanhol (Guatemala)",
+    "es-hn": "Espanhol (Honduras)",
+    "es-mx": "Espanhol (México)",
+    "es-ni": "Espanhol (Nicarágua)",
+    "es-pa": "Espanhol (Panamá)",
+    "%(oneUser)s changed his/her avatar": "%(oneUser)s alterou sua imagem pública",
+    "es-pe": "Espanhol (Peru)",
+    "es-pr": "Espanhol (Porto Rico)",
+    "es-sv": "Espanhol (El Salvador)",
+    "es-uy": "Espanhol (Uruguai)",
+    "es-ve": "Espanhol (Venezuela)",
+    "eu": "Basco (Basco)",
+    "fr-lu": "Francês (Luxemburgo)",
+    "gd": "Galês (Escócia)",
+    "it-ch": "Italiano (Suíça)",
+    "ko": "Coreano (Johab)",
+    "mk": "Macedônio (República da Macedônia)",
+    "ro-mo": "Romano (Moldávia)",
+    "ru-mo": "Russo (Moldávia)",
+    "sb": "Sorábio",
+    "sv-fi": "Sueco (Finlândia)",
+    "zh-cn": "Chinês (República Popular da China)",
+    "zh-hk": "Chinês (Hong Kong SAR)",
+    "zh-sg": "Chinês (Singapura)",
+    "zh-tw": "Chinês (Taiwan)",
+    "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",
+    "%(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",
+    "and %(overflowCount)s others...": "e %(overflowCount)s outros...",
+    "and one other...": "e um outro...",
+    "Are you sure?": "Você tem certeza?",
+    "Attachment": "Anexo",
+    "Autoplay GIFs and videos": "Reproduzir automaticamente GIFs e videos",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s de %(monthName)s de %(fullYear)s às %(time)s",
+    "fo": "Feroês",
+    "sx": "Sutu",
+    "sz": "Sami (Lappish)",
+    "ve": "Venda",
+    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Não consigo conectar ao servidor padrão - favor checar sua conexão à internet e verificar se o certificado SSL do seu %(urlStart)s servidor padrão %(urlEnd)s é confiável",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Não consigo conectar ao servidor padrão através de HTTP quando uma URL HTTPS está na barra de endereços do seu navegador. Use HTTPS ou então %(urlStart)s habilite scripts não seguros no seu navegador %(urlEnd)s",
+    "Change Password": "Alterar senha",
+    "changing room on a RoomView is not supported": "mudar a sala em uma 'RoomView' não é permitido",
+    "Click to mute audio": "Clique para colocar o áudio no mudo",
+    "Click to mute video": "Clique para desabilitar imagens de vídeo",
+    "Click to unmute video": "Clique para voltar a mostrar imagens de vídeo",
+    "Click to unmute audio": "Clique para retirar áudio do mudo",
+    "Command error": "Erro de comando",
+    "Decrypt %(text)s": "Descriptografar %(text)s",
+    "Delete": "Apagar",
+    "Devices": "Dispositivos",
+    "Direct chats": "Conversas pessoais",
+    "Disinvite": "Desconvidar",
+    "Don't send typing notifications": "Não enviar notificação de estar digitando",
+    "Download %(text)s": "Baixar %(text)s",
+    "Enable encryption": "Habilitar criptografia",
+    "Enter Code": "Entre com o código",
+    "Failed to ban user": "Não foi possível banir o/a usuário/a",
+    "Failed to change power level": "Não foi possível mudar o nível de permissões",
+    "Failed to delete device": "Não foi possível remover o dispositivo",
+    "Failed to join room": "Não foi possível ingressar na sala",
+    "Failed to kick": "Não foi possível remover usuária/o",
+    "Failed to load timeline position": "Não foi possível carregar a posição na linha do tempo",
+    "Failed to mute user": "Não foi possível remover notificações da/do usuária/o",
+    "Failed to reject invite": "Não foi possível rejeitar o convite",
+    "Failed to save settings": "Não foi possível salvar as configurações",
+    "Failed to set display name": "Houve falha ao definir o nome público",
+    "Failed to toggle moderator status": "Houve falha ao alterar o status de moderador/a",
+    "Fill screen": "Tela cheia",
+    "Hide read receipts": "Ocultar recebimentos de leitura",
+    "Hide Text Formatting Toolbar": "Ocultar a barra de formatação de texto",
+    "Incorrect verification code": "Código de verificação incorreto",
+    "Invalid alias format": "Formato de alias é inválido",
+    "Invalid address format": "Formato de endereço é inválido",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' não é um formato válido para um endereço",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' não é um formato válido para um alias",
+    "Join Room": "Ingressar na sala",
+    "Kick": "Remover",
+    "Level": "Nível",
+    "Local addresses for this room:": "Endereço local desta sala:",
+    "Markdown is disabled": "A formatação 'Markdown' está desabilitada",
+    "Markdown is enabled": "A formatação 'Markdown' está habilitada",
+    "Message not sent due to unknown devices being present": "A mensagem não foi enviada por causa da presença de dispositivos desconhecidos",
+    "Never send encrypted messages to unverified devices in this room": "Nunca envie mensagens criptografadas para dispositivos não verificados nesta sala",
+    "New address (e.g. #foo:%(localDomain)s)": "Novo endereço (p.ex: #algo:%(localDomain)s)",
+    "not set": "não definido",
+    "not specified": "não especificado",
+    "No devices with registered encryption keys": "Não há dispositivos com chaves de criptografia registradas",
+    "No more results": "Não há mais resultados",
+    "No results": "Sem resultados",
+    "OK": "OK",
+    "Revoke Moderator": "Retirar status de moderador",
+    "Search": "Localizar",
+    "Search failed": "Busca falhou",
+    "Server error": "Erro no servidor",
+    "Server may be unavailable, overloaded, or search timed out :(": "O servidor pode estar indisponível, sobrecarregado, ou a busca ultrapassou o tempo limite :(",
+    "Server may be unavailable, overloaded, or the file too big": "O servidor pode estar indisponível, sobrecarregado, ou o arquivo é muito grande",
+    "Server unavailable, overloaded, or something else went wrong": "O servidor pode estar indisponível, sobrecarregado, ou alguma outra coisa não funcionou",
+    "Some of your messages have not been sent": "Algumas das suas mensagens não foram enviadas",
+    "Submit": "Enviar",
+    "The main address for this room is": "O endereço principal desta sala é",
+    "This action cannot be performed by a guest user. Please register to be able to do this": "Esta ação não pode ser realizada por um/a usuário/a visitante. Por favor, registre-se para poder fazer isso",
+    "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?",
+    "This room has no local addresses": "Esta sala não tem endereços locais",
+    "This room is private or inaccessible to guests. You may be able to join if you register": "Esta sala é privada ou inacessível para visitantes. Você poderá ingressar nela se registrar-se",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question": "Tentei carregar um ponto específico na linha do tempo desta sala, mas parece que você não tem permissões para ver a mensagem em questão",
+    "Tried to load a specific point in this room's timeline, but was unable to find it": "Tentei carregar um ponto específico na linha do tempo desta sala, mas não o encontrei",
+    "Turn Markdown off": "Desabilitar a formatação 'Markdown'",
+    "Turn Markdown on": "Habilitar a marcação 'Markdown'",
+    "Unable to load device list": "Não foi possível carregar a lista de dispositivos",
+    "Unknown command": "Comando desconhecido",
+    "Unknown room %(roomId)s": "A sala %(roomId)s é desconhecida",
+    "You have been invited to join this room by %(inviterName)s": "Você foi convidada/o por %(inviterName)s a ingressar nesta sala",
+    "You seem to be in a call, are you sure you want to quit?": "Parece que você está em uma chamada. Tem certeza que quer sair?",
+    "You seem to be uploading files, are you sure you want to quit?": "Parece que você está enviando arquivos. Tem certeza que quer sair?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "Você não poderá desfazer esta mudança, pois estará dando a este(a) usuário(a) o mesmo nível de permissões que você",
+    "Make Moderator": "Tornar moderador(a)",
+    "Room": "Sala",
+    "(~%(searchCount)s results)": "(±%(searchCount)s resultados)",
+    "Cancel": "Cancelar",
+    "bold": "negrito",
+    "italic": "itálico",
+    "strike": "tachado",
+    "underline": "sublinhado",
+    "code": "código de programação",
+    "quote": "citação",
+    "bullet": "marcador de lista",
+    "numbullet": "marcador de numeração",
+    "%(severalUsers)s joined %(repeats)s times": "%(severalUsers)s ingressaram %(repeats)s vezes",
+    "%(oneUser)s joined %(repeats)s times": "%(oneUser)s ingressou %(repeats)s vezes",
+    "%(severalUsers)s joined": "%(severalUsers)s ingressaram",
+    "%(oneUser)s joined": "%(oneUser)s ingressou",
+    "%(severalUsers)s left %(repeats)s times": "%(severalUsers)s saíram %(repeats)s vezes",
+    "%(oneUser)s left %(repeats)s times": "%(oneUser)s saiu %(repeats)s vezes",
+    "%(severalUsers)s left": "%(severalUsers)s saíram",
+    "%(oneUser)s left": "%(oneUser)s saiu",
+    "%(severalUsers)s joined and left %(repeats)s times": "%(severalUsers)s ingressaram e saíram %(repeats)s vezes",
+    "%(oneUser)s joined and left %(repeats)s times": "%(oneUser)s ingressou e saiu %(repeats)s vezes",
+    "%(severalUsers)s joined and left": "%(severalUsers)s ingressaram e saíram",
+    "%(oneUser)s joined and left": "%(oneUser)s ingressou e saiu",
+    "%(severalUsers)s left and rejoined %(repeats)s times": "%(severalUsers)s saíram e entraram novamente %(repeats)s vezes",
+    "%(oneUser)s left and rejoined %(repeats)s times": "%(oneUser)s saiu e entrou novamente %(repeats)s vezes",
+    "%(severalUsers)s left and rejoined": "%(severalUsers)s saíram e entraram novamente",
+    "%(oneUser)s left and rejoined": "%(oneUser)s saiu e entrou novamente",
+    "%(severalUsers)s rejected their invitations %(repeats)s times": "%(severalUsers)s rejeitaram seus convites %(repeats)s vezes",
+    "%(oneUser)s rejected his/her invitation %(repeats)s times": "%(oneUser)s rejeitou seu convite %(repeats)s vezes",
+    "%(severalUsers)s rejected their invitations": "%(severalUsers)s rejeitaram seus convites",
+    "%(oneUser)s rejected his/her invitation": "%(oneUser)s rejeitou seu convite",
+    "%(severalUsers)s had their invitations withdrawn %(repeats)s times": "%(severalUsers)s tiveram seus convites desfeitos %(repeats)s vezes",
+    "%(oneUser)s had his/her invitation withdrawn %(repeats)s times": "%(oneUser)s teve seu convite desfeito %(repeats)s vezes",
+    "%(severalUsers)s had their invitations withdrawn": "%(severalUsers)s tiveram seus convites desfeitos",
+    "%(oneUser)s had his/her invitation withdrawn": "%(oneUser)s teve seu convite desfeito",
+    "were invited %(repeats)s times": "foram convidadas(os) %(repeats)s vezes",
+    "was invited %(repeats)s times": "foi convidada(o) %(repeats)s vezes",
+    "were invited": "foram convidadas(os)",
+    "were banned %(repeats)s times": "foram banidas(os) %(repeats)s vezes",
+    "was banned %(repeats)s times": "foi banida(o) %(repeats)s vezes",
+    "were banned": "foram banidas(os)",
+    "were unbanned %(repeats)s times": "tiveram banimento desfeito %(repeats)s vezes",
+    "was unbanned %(repeats)s times": "teve banimento desfeito %(repeats)s vezes",
+    "were unbanned": "tiveram banimento desfeito",
+    "were kicked %(repeats)s times": "foram expulsas(os) %(repeats)s vezes",
+    "was kicked %(repeats)s times": "foi expulsa(o) %(repeats)s vezes",
+    "were kicked": "foram expulsas(os)",
+    "%(severalUsers)s changed their name %(repeats)s times": "%(severalUsers)s alteraram seu nome %(repeats)s vezes",
+    "%(oneUser)s changed his/her name %(repeats)s times": "%(oneUser)s alterou seu nome %(repeats)s vezes",
+    "%(severalUsers)s changed their name": "%(severalUsers)s alteraram seus nomes",
+    "%(oneUser)s changed his/her name": "%(oneUser)s alterou seu nome",
+    "%(severalUsers)s changed their avatar %(repeats)s times": "%(severalUsers)s alteraram sua imagem pública %(repeats)s vezes",
+    "%(oneUser)s changed his/her avatar %(repeats)s times": "%(oneUser)s alterou sua imagem pública %(repeats)s vezes",
+    "%(severalUsers)s changed their avatar": "%(severalUsers)s alteraram sua imagem pública",
+    "Ban": "Banir"
+}
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
new file mode 100644
index 0000000000..001a5aca6a
--- /dev/null
+++ b/src/i18n/strings/ru.json
@@ -0,0 +1,476 @@
+{
+    "accept": "принимать",
+    "accepted an invitation": "принял приглашение",
+    "accepted the invitation for": "принял приглашение на",
+    "Account": "Аккаунт",
+    "Add email address": "Добавить email адрес",
+    "Add phone number": "Добавить телефонный номер",
+    "Admin": "Admin",
+    "Advanced": "Расширенный",
+    "Algorithm": "Алгоритм",
+    "all room members": "все участники комнаты",
+    "all room members, from the point they are invited": "все участники комнаты, с момента приглашения",
+    "all room members, from the point they joined": "все участники комнаты, с момента вступления",
+    "an address": "адрес",
+    "and": "и",
+    "An email has been sent to": "Email был отправлен",
+    "A new password must be entered.": "Введите новый пароль.",
+    "answered the call.": "принятый звонок.",
+    "anyone.": "кто угодно",
+    "Anyone who knows the room's link, apart from guests": "Любой, кто знает ссылку на комнату, кроме гостей",
+    "Anyone who knows the room's link, including guests": "Любой, кто знает ссылку комнаты, включая гостей",
+    "Are you sure you want to reject the invitation?": "Вы уверены что вы хотите отклонить приглашение?",
+    "Are you sure you want upload the following files?": "Вы уверены что вы хотите закачать следующий файл?",
+    "banned": "banned",
+    "Banned users": "Запрещенный пользователь",
+    "Bans user with given id": "Запретить пользователя с определенным id",
+    "Blacklisted": "В черный список",
+    "Bug Report": "Отчет ошибок",
+    "Bulk Options": "Объемные параметры",
+    "Can't load user settings": "Не может загрузить настройки пользователя",
+    "changed avatar": "изменен аватар",
+    "changed name": "измененное имя",
+    "changed their display name from": "changed their display name from",
+    "changed their profile picture": "changed their profile picture",
+    "changed the power level of": "changed the power level of",
+    "changed the room name to": "changed the room name to",
+    "changed the topic to": "changed the topic to",
+    "Changes to who can read history will only apply to future messages in this room": "Изменения того, кто может прочитать историю, будут только относиться к будущим сообщениям в этой комнате",
+    "Changes your display nickname": "Изменяет Ваш псевдоним",
+    "Claimed Ed25519 fingerprint key": "Требуемый Ed25519 ключ цифрового отпечатка",
+    "Clear Cache and Reload": "Очистите кэш и перезагрузку",
+    "Clear Cache": "Очистите кэш",
+    "Click here": "Нажать здесь",
+    "Click here to fix": "Нажать здесь для фиксации",
+    "Commands": "Команды",
+    "Confirm your new password": "Подтвердите ваш новый пароль",
+    "Continue": "Продолжить",
+    "Could not connect to the integration server": "Не может подключится к серверу интеграции",
+    "Create an account": "Создайте учётную запись",
+    "Create Room": "Создайте Комнату",
+    "Cryptography": "Криптография",
+    "Curve25519 identity key": "Curve25519 идентификационный ключ",
+    "Deactivate Account": "Деактивировать Учётную запись",
+    "Deactivate my account": "Деактивировать мою учётную запись",
+    "decline": "отказаться",
+    "Decryption error": "Ошибка дешифрования",
+    "Default": "Default",
+    "demote": "понижать",
+    "Deops user with given id": "Deops пользователь с данным id",
+    "Device ID": "Устройство ID",
+    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Устройство еще <b> не </b> будет в состоянии дешифровать историю, до присоединения к комнате",
+    "Direct Chat": "Персональное сообщение",
+    "Disable inline URL previews by default": "Отключить встроенные предварительные просмотры URL по умолчанию",
+    "Display name": "Отображаемое имя",
+    "Displays action": "Отображение действий",
+    "Ed25519 fingerprint": "Ed25519 fingerprint",
+    "Email Address": "Email адрес",
+    "Email, name or matrix ID": "Email, имя или matrix ID",
+    "Emoji": "Смайлы",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Зашифрованные сообщения не будут видимы в клиентах, которые еще не подключили шифрование",
+    "Encrypted room": "Зашифрованная комната",
+    "ended the call.": "ended the call.",
+    "End-to-end encryption information": "Информация сквозного шифрования (e2e)",
+    "End-to-end encryption is in beta and may not be reliable": "Сквозное шифрование (e2e) в бета-версии и не может быть надежным",
+    "Error": "Ошибка",
+    "Event information": "Event information",
+    "Export E2E room keys": "Экспорт E2E ключей комнаты",
+    "Failed to change password. Is your password correct?": "Не удалось изменить пароль.  Ваш пароль правильный?",
+    "Failed to forget room": "Не удалось забыть комнату",
+    "Failed to leave room": "Не удалось выйти из комнаты",
+    "Failed to reject invitation": "Не удалось отклонить приглашение",
+    "Failed to send email": "Не удалось отослать email",
+    "Failed to unban": "Не удалось отменить запрет",
+    "Failed to upload file": "Не удалось закачать файл",
+    "Favourite": "Фаворит",
+    "favourite": "фаворит",
+    "Favourites": "Фавориты",
+    "Filter room members": "Фильтр участников комнаты",
+    "Forget room": "Забыть комнату",
+    "Forgot your password?": "Вы забыли пароль?",
+    "For security, this session has been signed out. Please sign in again": "Для обеспечения безопасности, эта сессия была подписана. Войдите в систему еще раз.",
+    "Found a bug?": "Обнаружили ошибку?",
+    "had": "имеет",
+    "Hangup": "Отключение",
+    "Historical": "Исторический",
+    "Homeserver is": "Домашний сервер является",
+    "Identity Server is": "Регистрационный Сервер является",
+    "I have verified my email address": "Я проверил мой адрес электронной почты",
+    "Import E2E room keys": "Импортировать E2E ключ комнаты",
+    "Invalid Email Address": "Недействительный адрес электронной почты",
+    "invited": "invited",
+    "Invite new room members": "Прегласить новых учасников комнаты",
+    "Invites": "Приглашать",
+    "Invites user with given id to current room": "Пригласить пользователя с данным id в текущую комнату",
+    "is a": "является",
+    "I want to sign in with": "Я хочу регистрироваться с",
+    "joined and left": "присоединенный и оставленный",
+    "joined": "присоединенный",
+    "joined the room": "joined the room",
+    "Joins room with given alias": "Присоединяется к комнате с данным псевдонимом",
+    "Kicks user with given id": "Кик пользователя с заданным id",
+    "Labs": "Лаборатория",
+    "Leave room": "Уйти из комнаты",
+    "left and rejoined": "Покинуть и переподключится",
+    "left": "покинуть",
+    "left the room": "left the room",
+    "Logged in as": "Зарегистрированный как",
+    "Login as guest": "Вход в систему как гость",
+    "Logout": "Выход из системы",
+    "Low priority": "Низкий приоритет",
+    "made future room history visible to": "made future room history visible to",
+    "Manage Integrations": "Управление интеграций",
+    "Members only": "Только участники",
+    "Mobile phone number": "Номер мобильного телефона",
+    "Moderator": "Ведущий",
+    "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 this device": "Никогда не отправляйте зашифрованные сообщения в непроверенные устройства в этой комнате из этого устройства",
+    "New password": "Новый пароль",
+    "New passwords must match each other.": "Новые пароли должны соответствовать друг другу.",
+    "none": "никто",
+    "Notifications": "Уведомления",
+    " (not supported by this browser)": " (not supported by this browser)",
+    "<not supported>": "<не поддерживаемый>",
+    "NOT verified": "НЕ проверенный",
+    "No users have specific privileges in this room": "Ни у каких пользователей нет специальных полномочий в этой комнате",
+    "olm version": "olm версия",
+    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Как только шифрование включено для комнаты, оно <b> не может </b> быть выключено снова (на данный момент)",
+    "or": "или",
+    "other": "другой",
+    "others": "другие",
+    "Password": "Пароль",
+    "People": "Люди",
+    "Permissions": "Разрешение",
+    "Phone": "Телефон",
+    "placed a": "placed a",
+    "Please Register": "Пожалуйста зарегистрируйтесь",
+    "rejected the invitation.": "rejected the invitation.",
+    "removed their display name": "removed their display name",
+    "removed their profile picture": "removed their profile picture",
+    "Remove": "Удалить",
+    "requested a VoIP conference": "requested a VoIP conference",
+    "Return to login screen": "Return to login screen",
+    "Send Reset Email": "Send Reset Email",
+    "sent an image": "sent an image",
+    "sent an invitation to": "sent an invitation to",
+    "set a profile picture": "set a profile picture",
+    "set their display name to": "set their display name to",
+    "Settings": "Настройки",
+    "Start a chat": "Start a chat",
+    "Start Chat": "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": "Невозможно добавить email адрес",
+    "Unable to remove contact information": "Невозможно удалить контактную информацию",
+    "Unable to verify email address": "Невозможно проверить адрес электронной почты",
+    "Unban": "Отменить запрет",
+    "Unencrypted room": "Незашифрованная комната",
+    "unencrypted": "незашифрованно",
+    "unknown device": "неизвесное устройство",
+    "unknown error code": "неизвестная ошибка",
+    "unknown": "неизвестно",
+    "Upload avatar": "Загрузить аватар",
+    "uploaded a file": "загруженный файл",
+    "Upload Files": "Загрузка файлов",
+    "Upload file": "Загрузка файла",
+    "User ID": "ID пользователя",
+    "User Interface": "Пользовательский интерфейс",
+    "username": "Имя пользователя",
+    "Users": "Пользователи",
+    "User": "Пользователь",
+    "Verification Pending": "Ожидание проверки",
+    "Verification": "Проверка",
+    "verified": "проверенный",
+    "Video call": "Видио вызов",
+    "Voice call": "Голосовой вызов",
+    "VoIP conference finished": "VoIP конференция закончилась",
+    "VoIP conference started": "VoIP Конференция стартовала",
+    "(warning: cannot be disabled again!)": "(предупреждение: не может быть снова отключен!)",
+    "Warning": "Предупреждение",
+    "was banned": "запрещен",
+    "was invited": "приглашенный",
+    "was kicked": "выброшен",
+    "was unbanned": "незапрещенный",
+    "was": "был",
+    "were": "быть",
+    "Who can access this room?": "Кто может получить доступ к этой комнате?",
+    "Who can read history?": "Кто может читать историю?",
+    "Who would you like to add to this room?": "Кого хотели бы Вы добавлять к этой комнате?",
+    "Who would you like to communicate with?": "С кем хотели бы Вы связываться?",
+    "withdrawn": "уходить",
+    "Would you like to": "Хотели бы Вы",
+    "You do not have permission to post to this room": "У Вас нет разрешения писать в эту комнату",
+    "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": "Вы вышли из всех устройств и не будет больше получать push-уведомления. Чтобы повторно включить уведомления, войдите в систему еще раз для каждого устройства",
+    "You have no visible notifications": "У Вас нет видимых уведомлений",
+    "you must be a": "Вы должны быть",
+    "Your password has been reset": "Ваш пароль был изменен",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ваш пароль был успешно изменен. Вы не будете получать Push-уведомления о других устройствах, пока не войдете обратно на них",
+    "You should <b>not</b> yet trust it to secure data": "Вы еще не должны доверять этому защиту данных",
+    "en": "Английский",
+    "pt-br": "Португальский Бразилия",
+    "de": "Немецкий",
+    "da": "Датский",
+    "ru": "Русский",
+    "%(targetName)s accepted an invitation": "%(targetName)s принятое приглашение",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s принятое приглашение от %(displayName)s",
+    "Resend all": "Переслать снова всем",
+    "cancel all": "отменить всем",
+    "Active call": "Активный звонок",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s печатает",
+    "%(names)s and one other are typing": "%(names)s и другой печатают",
+    "%(names)s and %(count)s others are typing": "%(names)s и %(count)s другие печатают",
+    "%(senderName)s answered the call": "%(senderName)s ответил на звонок",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s запрещенный %(targetName)s",
+    "Call Timeout": "Время ожидания вызова",
+    "%(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 changed the topic to %(topic)s": "%(senderDisplayName)s измененная тема на %(topic)s",
+    "Conference call failed": "Конференц-вызов прервался",
+    "Conference calling is in development and may not be reliable": "Конференц-вызов находится в процессе и может не быть надежным",
+    "Conference calls are not supported in encrypted rooms": "Конференц-вызовы не поддерживаются в зашифрованных комнатах",
+    "Conference calls are not supported in this client": "Конференц-вызовы не поддерживаются в этом клиенте",
+    "/ddg is not a command": "/ddg не команда",
+    "Drop here %(toAction)s": "Вставить здесь %(toAction)s",
+    "Drop here to tag %(section)s": "Вставить здесь для тега %(section)s",
+    "%(senderName)s ended the call": "%(senderName)s прекратил звонок",
+    "Existing Call": "Существующий вызов",
+    "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": "Не удалось подтвердить 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": "Гостевые пользователи не могут создавать новые комнаты. Зарегистрируйтесь для создания комнаты и чата",
+    "click to reveal": "нажать для открытия",
+    "%(senderName)s invited %(targetName)s": "%(senderName)s приглашает %(targetName)s",
+    "%(displayName)s is typing": "%(displayName)s вводит текст",
+    "%(targetName)s joined the room": "%(targetName)s  присоединенный к комнате",
+    "%(senderName)s kicked %(targetName)s": "%(senderName)s выкинул %(targetName)s",
+    "%(targetName)s left the room": "%(targetName)s покинул комнату",
+    "%(senderName)s made future room history visible to": "%(senderName)s  история сделаной будущей комнаты, видимая для",
+    "Missing room_id in request": "Отсутствует room_id в запросе",
+    "Missing user_id in request": "Отсутствует user_id в запросе",
+    "Must be viewing a room": "Комната должна быть посищена",
+    "New Composer & Autocomplete": "Новые Компонист & Автозаполнение",
+    "(not supported by this browser)": "(не поддерживаемый этим браузером)",
+    "af": "Африкаанс",
+    "ar-ae": "Арабский  (О.А.Е)",
+    "ar-bh": "Арабский (Бахрейн)",
+    "ar-dz": "Арабский (Алжыр)",
+    "ar-eg": "Арабский (Египет)",
+    "ar-iq": "Арабский (Ирак)",
+    "ar-jo": "Арабский (Иордания)",
+    "ar-kw": "Арабский (Кувейт)",
+    "ar-lb": "Арабский (Ливан)",
+    "ar-ly": "Арабский (Ливия)",
+    "ar-ma": "Арабский (Марокко)",
+    "ar-om": "Арабский (Оман)",
+    "ar-qa": "Арабский (Катар)",
+    "ar-sa": "Арабский (Саудовская Аравия)",
+    "ar-sy": "Арабский (Сирия)",
+    "ar-tn": "Арабский (Тунис)",
+    "ar-ye": "Арабский (Йемен)",
+    "be": "Беларуский",
+    "bg": "Болгарский",
+    "ca": "Каталанский",
+    "cs": "Чешский",
+    "de-at": "Немецкий (Австрия)",
+    "de-ch": "Немецкий (Швейцария)",
+    "de-li": "Немецкий (Лихтенштейн)",
+    "de-lu": "Немецкий (Люксембург)",
+    "el": "Гречиский",
+    "en-au": "Английский (Австралия)",
+    "en-bz": "Английский (Белиз)",
+    "en-ca": "Английский (Канада)",
+    "en-gb": "Английский  (UK)",
+    "en-ie": "Английский (Ирландия)",
+    "en-jm": "Английский (Ямайка)",
+    "en-nz": "Английский (Новая Зеландия)",
+    "en-tt": "Английский (Тринидад)",
+    "en-us": "Английский (US)",
+    "en-za": "Английский (Южная Африка)",
+    "es-ar": "Испанский (Аргентина)",
+    "es-bo": "Испанский (Боливия)",
+    "es-cl": "Испанский (Чили)",
+    "es-co": "Испанский (Колумбия)",
+    "es-cr": "Испанский (Коста Рика)",
+    "es-do": "Испанский (Дом. Республика)",
+    "es-ec": "Испанский (Еквадор)",
+    "es-gt": "Испанский (Гватемала)",
+    "es-hn": "Испанский (Гондурас)",
+    "es-mx": "Испанский (Мексика)",
+    "es-ni": "Испанский (Никарагуа)",
+    "es-pa": "Испанский (Панама)",
+    "et": "Эстонский",
+    "fi": "Финский",
+    "fr": "Французкий",
+    "hr": "Хорватский",
+    "it": "Итальянский",
+    "ja": "Японский",
+    "pl": "Польский",
+    "pt": "Португальский",
+    "ru-mo": "Русский (Молдавская Республика)",
+    "ro": "Румынский",
+    "uk": "Украинский",
+    "now. You can also select individual messages to resend or cancel.": "теперь. Вы можете также выбрать отдельные сообщения, чтобы снова послать или отменить.",
+    "Auto-complete": "Автозаполнение",
+    "Error changing language": "Ошибка изменения языка",
+    "Riot was unable to find the correct Data for the selected Language.": "Riot был неспособен найти правельные данные для выбранного языка.",
+    "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.": "Это не похоже на допустимый телефонный номер.",
+    "Missing password.": "Пароль отсутствует.",
+    "Set a display name:": "Настроить отображаемое имя:",
+    "Passwords don't match.": "Пароли не совпадают.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Пароль слишком короткий (min %(MIN_PASSWORD_LENGTH)s).",
+    "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.": "Произошла неизвестная ошибка.",
+    "I already have an account": "У меня уже есть учетная запись",
+    "An error occured: %(error_string)s": "Произошла ошибка: %(error_string)s",
+    "Topic": "Тема",
+    "Make this room private": "Сделать эту комнату частной",
+    "Share message history with new users": "Поделись историей сообщений с новыми учасниками",
+    "Encrypt room": "Зашифровать комнату",
+    "es-pe": "Испанский (Перу)",
+    "hu": "Венгерский",
+    "nl": "Датский",
+    "no": "Норвежский",
+    "sv": "Шведский",
+    "th": "Тайландский",
+    "vi": "Ветнамский",
+    "Monday": "Понедельник",
+    "Tuesday": "Вторник",
+    "Wednesday": "Среда",
+    "Thursday": "Четверг",
+    "Friday": "Пятница",
+    "Saturday": "Субота",
+    "Sunday": "Воскресенье",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "Upload an avatar:": "Загрузить аватар",
+    "You need to be logged in": "Вы должны быть зарегистрированы",
+    "You need to be able to invite users to do that": "Вам необходимо пригласить пользователей чтобы сделать это",
+    "You cannot place VoIP calls in this browser": "Вы не можете сделать вызовы VoIP с этим браузером",
+    "You are already in a call": "Вы уже находитесь в разговоре",
+    "You're not in any rooms yet! Press": "Вы еще не находитесь ни в каких комнатах! Нажать",
+    "You are trying to access %(roomName)s": "Вы пытаетесь получить доступ %(roomName)s",
+    "You cannot place a call with yourself": "Вы не можете позвонить самим себе",
+    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s анулировал %(targetName)s's преглашение",
+    "Sep": "Сен.",
+    "Jan": "Янв.",
+    "Feb": "Фев.",
+    "Mar": "Мар.",
+    "Apr": "Апр.",
+    "May": "Май",
+    "Jun": "Июн.",
+    "Jul": "Июл.",
+    "Aug": "Авг.",
+    "Oct": "Окт.",
+    "Nov": "Ноя.",
+    "Dec": "Дек.",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "Mon": "Пн",
+    "Sun": "Вс",
+    "Tue": "Вт",
+    "Wed": "Ср",
+    "Thu": "Чт",
+    "Fri": "Пя",
+    "Sat": "Сб",
+    "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": "Вам необходимо снова войти в генерировать сквозное шифрование (е2е) ключей для этого устройства и предоставить публичный ключ Вашему домашнему серверу. Это после выключения; приносим извинения за причиненные неудобства",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Ваш адрес электронной почты, кажется, не связан с Matrix ID на этом Homeserver",
+    "to start a chat with someone": "Начать чат с кем-то",
+    "to tag direct chat": "Пометить прямой чат",
+    "To use it, just wait for autocomplete results to load and tab through them": "Для его использования, просто подождите результатов автозаполнения для загрузки на вкладке и через них",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s включил сквозное шифрование (algorithm %(algorithm)s)",
+    "Unable to restore previous session": "Невозможно востановить предыдущий сеанс",
+    "%(senderName)s unbanned %(targetName)s": "%(senderName)s запрет отменен %(targetName)s",
+    "Unable to capture screen": "Невозможно записать снимок экрана",
+    "Unable to enable Notifications": "Невозможно включить уведомления",
+    "Upload Failed": "Неудавшаяся загрузка",
+    "Usage": "Использование",
+    "Use with caution": "Используйте с осторожностью",
+    "VoIP is unsupported": "VoIP не поддерживается",
+    "es-pr": "Испанский (Пуэрто-Рико)",
+    "es-py": "Испанский язык (Парагвай)",
+    "es": "Испанский (Испания)",
+    "es-sv": "Испанский (Сальвадор)",
+    "es-uy": "Испанский (Уругвай)",
+    "es-ve": "Испанский (Венесуэла)",
+    "fa": "Фарси",
+    "fo": "Фарезский",
+    "fr-be": "Французский (Бельгия)",
+    "fr-ca": "Французский (Канада)",
+    "fr-ch": "Французский (Швейцария)",
+    "ga": "Ирландский",
+    "he": "Иврит",
+    "hi": "Хинди",
+    "id": "Индонезийский",
+    "is": "Исландский",
+    "ji": "Идиш",
+    "lt": "Литовкий",
+    "lv": "Латвийский",
+    "ms": "Малайцы",
+    "mt": "Мальтийский",
+    "nl-be": "Голландский (Бельгия)",
+    "rm": "Ретороманский",
+    "sb": "Вендский",
+    "sk": "Словацкий",
+    "sl": "Словенский",
+    "sq": "Албанский",
+    "sr": "Сербский (Латиница)",
+    "sv-fi": "Шведский (Финляндия)",
+    "sz": "Саами (лопарский)",
+    "tn": "Тсвана",
+    "tr": "Турецкий",
+    "ts": "Тсонга",
+    "ur": "Урду",
+    "ve": "Венда",
+    "xh": "Коса",
+    "zh-cn": "Китайский (PRC)",
+    "zh-sg": "Китайский (Сингапур)",
+    "zh-tw": "Китайский (Тайвань)",
+    "zu": "Зулусский",
+    "eu": "Баскский",
+    "fr-lu": "Французский (Люксембург)",
+    "gd": "Гэльский (Шотландия)",
+    "it-ch": "Итальянский (Швейцария)",
+    "ko": "Корейский (Johab)",
+    "mk": "Македонский (FYROM)",
+    "ro-mo": "Румынский (Республика Молдова)",
+    "sx": "Суту",
+    "zh-hk": "Китайский (Гонконг)",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "На +%(msisdn)s было отправлено текстовое сообщение. Пожалуйста, введите проверочный код из него",
+    "and %(overflowCount)s others...": "и %(overflowCounts)s других...",
+    "Are you sure?": "Вы уверены?",
+    "Autoplay GIFs and videos": "Проигрывать GIF и видео автоматически",
+    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Невозможно соединиться с домашним сервером - проверьте своё соединение и убедитесь, что %(urlStart)s SSL-сертификат вашего домашнего сервера %(urlEnd)s включён в доверяемые",
+    "changing room on a RoomView is not supported": "изменение комнаты в RoomView не поддерживается",
+    "Click to mute audio": "Выключить звук",
+    "Click to mute video": "Выключить звук у видео",
+    "Click to unmute video": "Включить звук у видео",
+    "Click to unmute audio": "Включить звук",
+    "Decrypt %(text)s": "Расшифровать %(text)s",
+    "Delete": "Удалить",
+    "Devices": "Устройства",
+    "Direct chats": "Личные чаты",
+    "Disinvite": "Отозвать приглашение",
+    "Don't send typing notifications": "Не оповещать, когда я печатаю",
+    "Download %(text)s": "Загрузить %(text)s",
+    "Enable encryption": "Включить шифрование",
+    "Enter Code": "Ввести код",
+    "Failed to ban user": "Не удалось забанить пользователя",
+    "Failed to change power level": "Не удалось изменить уровень привилегий",
+    "Failed to delete device": "Не удалось удалить устройство",
+    "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
+    "Failed to join room": "Не удалось присоединиться к комнате",
+    "Failed to join the room": "Не удалось присоединиться к комнате"
+}
diff --git a/src/index.js b/src/index.js
index b6d8c0b5f4..03b854a112 100644
--- a/src/index.js
+++ b/src/index.js
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-var Skinner = require('./Skinner');
+import Skinner from './Skinner';
+import request from 'browser-request';
+import UserSettingsStore from './UserSettingsStore';
 
 module.exports.loadSkin = function(skinObject) {
     Skinner.load(skinObject);
diff --git a/src/languageHandler.js b/src/languageHandler.js
new file mode 100644
index 0000000000..e22e93d664
--- /dev/null
+++ b/src/languageHandler.js
@@ -0,0 +1,166 @@
+/*
+Copyright 2017 MTRNord and Cooperative EITA
+
+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 request from 'browser-request';
+// Workaround for broken export
+import * as counterpart from 'counterpart-riot';
+import UserSettingsStore from './UserSettingsStore';
+var q = require('q');
+
+const i18nFolder = 'i18n/';
+
+module.exports.setLanguage = function(languages, extCounterpart=null) {
+    if (!languages || !Array.isArray(languages)) {
+    const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser());
+    console.log("no language found. Got from browser: " + JSON.stringify(languages));
+    }
+
+    request(i18nFolder + 'languages.json', function(err, response, body) {
+        function getLanguage(langPath, langCode, callback) {
+            let response_return = {};
+            let resp_raw = {};
+            request(
+                { method: "GET", url: langPath },
+                (err, response, body) => {
+                    if (err || response.status < 200 || response.status >= 300) {
+                        if (response) {
+                            if (response.status == 404 || (response.status == 0 && body == '')) {
+                                resp_raw = {};
+                            }
+                        }
+                        const resp = {err: err, response: resp_raw};
+                        err = resp['err'];
+                        const response_cb = resp['response'];
+                        callback(err, response_cb, langCode);
+                        return;
+                    }
+
+                    response_return = JSON.parse(body);
+                    callback(null, response_return, langCode);
+                    return;
+                }
+            );
+            return;
+        }
+
+        function registerTranslations(err, langJson, langCode){
+            if (err !== null) {
+                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                Modal.createDialog(ErrorDialog, {
+                    title: counterpart.translate('Error changing language'),
+                    description: counterpart.translate('Riot was unable to find the correct Data for the selected Language.'),
+                    button: counterpart.translate("OK"),
+                });
+                return;
+            } else {
+                if (extCounterpart) {
+                    extCounterpart.registerTranslations(langCode, langJson);
+                }
+                counterpart.registerTranslations(langCode, langJson);
+            }
+        }
+
+        let languageFiles = {};
+        if(err){
+            console.error(err);
+            return;
+        } else {
+            if (body) {
+                languageFiles = JSON.parse(body);
+            } else {
+                languageFiles = JSON.parse('{"en": "en_EN.json"}');
+            }
+        }
+
+
+        const isValidFirstLanguage = (languageFiles.hasOwnProperty(languages[0]));
+        var validLanguageKey = "";
+        if ((isValidFirstLanguage) || (languages.length==2 && languageFiles.hasOwnProperty(languages[1]))) {
+            validLanguageKey = (isValidFirstLanguage) ? languages[0] : languages[1];
+            getLanguage(i18nFolder + languageFiles[validLanguageKey], validLanguageKey, registerTranslations);
+            if (extCounterpart) {
+                extCounterpart.setLocale(validLanguageKey);
+            }
+            counterpart.setLocale(validLanguageKey);
+            UserSettingsStore.setLocalSetting('language', validLanguageKey);
+            console.log("set language to "+validLanguageKey);
+        } else {
+            console.log("didnt find any language file");
+        }
+
+        //Set 'en' as fallback language:
+        if (validLanguageKey!="en") {
+            getLanguage(i18nFolder + languageFiles['en'], 'en', registerTranslations);
+        }
+        if (extCounterpart) {
+            extCounterpart.setFallbackLocale('en');
+        }
+        counterpart.setFallbackLocale('en');
+    });
+};
+
+module.exports.getAllLanguageKeysFromJson = function() {
+    let deferred = q.defer();
+
+    request(
+        { method: "GET", url: i18nFolder + 'languages.json' },
+        (err, response, body) => {
+            if (err || response.status < 200 || response.status >= 300) {
+                if (response) {
+                    if (response.status == 404 || (response.status == 0 && body == '')) {
+                        deferred.resolve({});
+                    }
+                }
+                deferred.reject({err: err, response: response});
+                return;
+            }
+            var languages = JSON.parse(body);
+            // If no language is found, fallback to 'en':
+            if (!languages) {
+                languages = [{"en": "en_EN.json"}];
+            }
+            const languageKeys = Object.keys(languages);
+            deferred.resolve(languageKeys);
+        }
+    );
+    return deferred.promise;
+}
+
+module.exports.getLanguageFromBrowser = function() {
+    return navigator.languages[0] || navigator.language || navigator.userLanguage;
+};
+
+module.exports.getNormalizedLanguageKeys = function(language) {
+    if (!language) {
+        return;
+    }
+    const languageKeys = [];
+    const normalizedLanguage = this.normalizeLanguageKey(language);
+    const languageParts = normalizedLanguage.split('-');
+    if (languageParts.length==2 && languageParts[0]==languageParts[1]) {
+        languageKeys.push(languageParts[0]);
+    } else {
+        languageKeys.push(normalizedLanguage);
+        if (languageParts.length==2) {
+            languageKeys.push(languageParts[0]);
+        }
+    }
+    return languageKeys;
+};
+
+module.exports.normalizeLanguageKey = function(language) {
+    return language.toLowerCase().replace("_","-");
+};
diff --git a/test/test-utils.js b/test/test-utils.js
index 5209465362..40be715abd 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -3,6 +3,8 @@
 import sinon from 'sinon';
 import q from 'q';
 import ReactTestUtils from 'react-addons-test-utils';
+import * as counterpart from 'counterpart-riot';
+var languageHandler = require("../src/languageHandler");
 
 import peg from '../src/MatrixClientPeg.js';
 import jssdk from 'matrix-js-sdk';
@@ -65,6 +67,10 @@ export function beforeEach(context) {
 
     console.log(desc);
     console.log(new Array(1 + desc.length).join("="));
+
+    const languages = languageHandler.getNormalizedLanguageKeys('en');
+    languageHandler.setLanguage(languages, counterpart);
+
 };
 
 

From dd1c50ce80452ed7b445c888817d67b2e14262fc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 23 May 2017 14:29:21 +0100
Subject: [PATCH 207/312] README formatting

Move translation status to its own heading
---
 README.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 981a217c10..56965c5f86 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-[![Translationsstatus](https://translate.nordgedanken.de/widgets/riot-web/-/multi-auto.svg)](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
-
 matrix-react-sdk
 ================
 
@@ -26,6 +24,11 @@ In the interim, `vector-im/riot-web` and `matrix-org/matrix-react-sdk` should
 be considered as a single project (for instance, matrix-react-sdk bugs
 are currently filed against vector-im/riot-web rather than this project).
 
+Translation Status
+==================
+[![translationsstatus](https://translate.nordgedanken.de/widgets/riot-web/-/multi-auto.svg)](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
+
+
 Developer Guide
 ===============
 

From 9bce417400d1647405068e48f9c79fd01cb79a5b Mon Sep 17 00:00:00 2001
From: MTRNord <mtrnord1@gmail.com>
Date: Tue, 23 May 2017 19:00:30 +0200
Subject: [PATCH 208/312] fix algorithm ReferenceError

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

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 25af1e5b5d..36a6eff45f 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -176,7 +176,7 @@ function textForHistoryVisibilityEvent(event) {
 
 function textForEncryptionEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)', {senderName: senderName, algorithm: algorithm});
+    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)', {senderName: senderName, algorithm: event.getContent().algorithm});
 }
 
 // Currently will only display a change if a user's power level is changed

From cc0924f1c7afbe7713efe6829c7e9da5005f41fd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 23 May 2017 18:16:02 +0100
Subject: [PATCH 209/312] Fix imports

---
 src/components/views/elements/LanguageDropdown.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 0da05ff07e..4feec57df8 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -18,10 +18,9 @@ import React from 'react';
 
 import sdk from '../../../index';
 import UserSettingsStore from '../../../UserSettingsStore';
-const _localSettings = UserSettingsStore.getLocalSettings();
 import _t from 'counterpart-riot';
-const languageHandler = require('../../../languageHandler');
-var SdkConfig = require("../../../SdkConfig");
+import languageHandler from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 
 let LANGUAGES = [];
 
@@ -44,7 +43,6 @@ export default class LanguageDropdown extends React.Component {
     }
 
     componentWillMount() {
-
     	const languageKeys = SdkConfig.get().languages;
 
 		// Build const LANGUAGES in a way that counterpart allows translation inside object:
@@ -71,6 +69,7 @@ export default class LanguageDropdown extends React.Component {
             // If no value is given, we start with the first
             // country selected, but our parent component
             // doesn't know this, therefore we do this.
+            const _localSettings = UserSettingsStore.getLocalSettings();
             if (_localSettings.hasOwnProperty('language')) {
               this.props.onOptionChange(_localSettings.language);
             }else {
@@ -117,6 +116,7 @@ export default class LanguageDropdown extends React.Component {
         // default value here too, otherwise we need to handle null / undefined
         // values between mounting and the initial value propgating
         let value = null;
+        const _localSettings = UserSettingsStore.getLocalSettings();
         if (_localSettings.hasOwnProperty('language')) {
           value = this.props.value || _localSettings.language;
         } else {

From f412552c2c8326edaa6d107c7e3c3d68b8fbe022 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 23 May 2017 18:32:45 +0100
Subject: [PATCH 210/312] Fix imports/exports

---
 src/components/structures/UserSettings.js         |  2 +-
 src/components/views/elements/LanguageDropdown.js |  2 +-
 src/languageHandler.js                            | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index ff3d2e774c..12bd9fc0d6 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -30,7 +30,7 @@ const AddThreepid = require('../../AddThreepid');
 const SdkConfig = require('../../SdkConfig');
 import AccessibleButton from '../views/elements/AccessibleButton';
 import _t from 'counterpart-riot';
-const languageHandler = require('../../languageHandler');
+import * as languageHandler from('../../languageHandler');
 import * as FormattingUtils from '../../utils/FormattingUtils';
 
 // if this looks like a release, use the 'version' from package.json; else use
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 4feec57df8..27ce8efaab 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -19,7 +19,7 @@ import React from 'react';
 import sdk from '../../../index';
 import UserSettingsStore from '../../../UserSettingsStore';
 import _t from 'counterpart-riot';
-import languageHandler from '../../../languageHandler';
+import * as languageHandler from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 
 let LANGUAGES = [];
diff --git a/src/languageHandler.js b/src/languageHandler.js
index e22e93d664..92e3ccefb6 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -18,11 +18,11 @@ import request from 'browser-request';
 // Workaround for broken export
 import * as counterpart from 'counterpart-riot';
 import UserSettingsStore from './UserSettingsStore';
-var q = require('q');
+import q from 'q';
 
 const i18nFolder = 'i18n/';
 
-module.exports.setLanguage = function(languages, extCounterpart=null) {
+export function setLanguage(languages, extCounterpart=null) {
     if (!languages || !Array.isArray(languages)) {
     const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser());
     console.log("no language found. Got from browser: " + JSON.stringify(languages));
@@ -112,7 +112,7 @@ module.exports.setLanguage = function(languages, extCounterpart=null) {
     });
 };
 
-module.exports.getAllLanguageKeysFromJson = function() {
+export function getAllLanguageKeysFromJson() {
     let deferred = q.defer();
 
     request(
@@ -139,11 +139,11 @@ module.exports.getAllLanguageKeysFromJson = function() {
     return deferred.promise;
 }
 
-module.exports.getLanguageFromBrowser = function() {
+export function getLanguageFromBrowser() {
     return navigator.languages[0] || navigator.language || navigator.userLanguage;
 };
 
-module.exports.getNormalizedLanguageKeys = function(language) {
+export function getNormalizedLanguageKeys(language) {
     if (!language) {
         return;
     }
@@ -161,6 +161,6 @@ module.exports.getNormalizedLanguageKeys = function(language) {
     return languageKeys;
 };
 
-module.exports.normalizeLanguageKey = function(language) {
+export function normalizeLanguageKey(language) {
     return language.toLowerCase().replace("_","-");
 };

From a95f3252b8fb4c1658095620050ffd78fd43c630 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 May 2017 10:48:10 +0100
Subject: [PATCH 211/312] s/tabs/spaces/

---
 .../views/elements/LanguageDropdown.js        | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 27ce8efaab..9524b3ff27 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -43,16 +43,16 @@ export default class LanguageDropdown extends React.Component {
     }
 
     componentWillMount() {
-    	const languageKeys = SdkConfig.get().languages;
+        const languageKeys = SdkConfig.get().languages;
 
-		// Build const LANGUAGES in a way that counterpart allows translation inside object:
-    	languageKeys.forEach(function(languageKey) {
-    		var l = {};
-    		l.id = "language";
-    		l.label = _t(languageKey);
-    		l.value = languageKey;
-    		LANGUAGES.push(l);
-    	});
+        // Build const LANGUAGES in a way that counterpart allows translation inside object:
+        languageKeys.forEach(function(languageKey) {
+            var l = {};
+            l.id = "language";
+            l.label = _t(languageKey);
+            l.value = languageKey;
+            LANGUAGES.push(l);
+        });
 
       LANGUAGES = LANGUAGES.sort(function(a, b){
                           if(a.label < b.label) return -1;
@@ -60,9 +60,9 @@ export default class LanguageDropdown extends React.Component {
                           return 0;
                       })
 
-    	for (const l of LANGUAGES) {
-    		LANGUAGES_BY_VALUE[l.value] = l;
-	    }
+        for (const l of LANGUAGES) {
+            LANGUAGES_BY_VALUE[l.value] = l;
+        }
 
 
         if (!this.props.value) {

From c2df23395daa3fee284b05f10c6c698eb19c0824 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 May 2017 11:25:06 +0100
Subject: [PATCH 212/312] Fix up language dropdown

 * Read languages from the available ones rather than the config
 * Make the search work (add searchEnabled=true)
 * Move variables to the class since they were populated there
---
 .../views/elements/LanguageDropdown.js        | 69 ++++++++-----------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 9524b3ff27..764657830c 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -20,11 +20,6 @@ import sdk from '../../../index';
 import UserSettingsStore from '../../../UserSettingsStore';
 import _t from 'counterpart-riot';
 import * as languageHandler from '../../../languageHandler';
-import SdkConfig from '../../../SdkConfig';
-
-let LANGUAGES = [];
-
-const LANGUAGES_BY_VALUE = new Object(null);
 
 function languageMatchesSearchQuery(query, language) {
     if (language.label.toUpperCase().indexOf(query.toUpperCase()) == 0) return true;
@@ -39,31 +34,28 @@ export default class LanguageDropdown extends React.Component {
 
         this.state = {
             searchQuery: '',
+            langs: null,
         }
     }
 
     componentWillMount() {
-        const languageKeys = SdkConfig.get().languages;
-
-        // Build const LANGUAGES in a way that counterpart allows translation inside object:
-        languageKeys.forEach(function(languageKey) {
-            var l = {};
-            l.id = "language";
-            l.label = _t(languageKey);
-            l.value = languageKey;
-            LANGUAGES.push(l);
-        });
-
-      LANGUAGES = LANGUAGES.sort(function(a, b){
-                          if(a.label < b.label) return -1;
-                          if(a.label > b.label) return 1;
-                          return 0;
-                      })
-
-        for (const l of LANGUAGES) {
-            LANGUAGES_BY_VALUE[l.value] = l;
-        }
-
+        languageHandler.getAllLanguageKeysFromJson().then((langKeys) => {
+            const langs = [];
+            langKeys.forEach((languageKey) => {
+                langs.push({
+                    value: languageKey,
+                    label: _t(languageKey)
+                });
+            });
+            langs.sort(function(a, b){
+                if(a.label < b.label) return -1;
+                if(a.label > b.label) return 1;
+                return 0;
+            });
+            this.setState({langs});
+        }).catch(() => {
+            this.setState({langs: ['en']});
+        }).done();
 
         if (!this.props.value) {
             // If no value is given, we start with the first
@@ -86,25 +78,20 @@ export default class LanguageDropdown extends React.Component {
     }
 
     render() {
+        if (this.state.langs === null) {
+            const Spinner = sdk.getComponent('elements.Spinner');
+            return <Spinner />;
+        }
+
         const Dropdown = sdk.getComponent('elements.Dropdown');
 
         let displayedLanguages;
         if (this.state.searchQuery) {
-            displayedLanguages = LANGUAGES.filter(
-                languageMatchesSearchQuery.bind(this, this.state.searchQuery),
-            );
-            if (
-                this.state.searchQuery.length == 2 &&
-                LANGUAGES_BY_VALUE[this.state.searchQuery.toUpperCase()]
-            ) {
-                const matched = LANGUAGES_BY_VALUE[this.state.searchQuery.toUpperCase()];
-                displayedLanguages = displayedLanguages.filter((l) => {
-                    return l.id != matched.id;
-                });
-                displayedLanguages.unshift(matched);
-            }
+            displayedLanguages = this.state.langs.filter((lang) => {
+                return languageMatchesSearchQuery(this.state.searchQuery, lang);
+            });
         } else {
-            displayedLanguages = LANGUAGES;
+            displayedLanguages = this.state.langs;
         }
 
         const options = displayedLanguages.map((language) => {
@@ -126,7 +113,7 @@ export default class LanguageDropdown extends React.Component {
 
         return <Dropdown className={this.props.className}
             onOptionChange={this.props.onOptionChange} onSearchChange={this._onSearchChange}
-            value={value}
+            searchEnabled={true} value={value}
         >
             {options}
         </Dropdown>

From aef068b00e38d94472573514b166659d2674aacd Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 May 2017 14:28:30 +0100
Subject: [PATCH 213/312] Indenting

---
 src/components/structures/UserSettings.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 12bd9fc0d6..1772108e03 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -557,18 +557,18 @@ module.exports = React.createClass({
     },
 
     onLanguageChange: function(l) {
-      UserSettingsStore.setLocalSetting('language', l);
-      this.setState({
-        Language: l,
-      });
-      PlatformPeg.get().reload();
+        UserSettingsStore.setLocalSetting('language', l);
+        this.setState({
+          Language: l,
+        });
+        PlatformPeg.get().reload();
     },
 
     _renderLanguageSetting: function () {
-      const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
-      return <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
-                        className="mx_UserSettings_Language"
-                        value={this.state.Language} />;
+        const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
+        return <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
+                          className="mx_UserSettings_Language"
+                          value={this.state.Language} />;
     },
 
     _renderUserInterfaceSettings: function() {

From b677a2002f67f385a024a6281bae60f7bc095d09 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 24 May 2017 14:36:14 +0100
Subject: [PATCH 214/312] Minimal UI fixes

Add a label. Make css selector match style. Also fix import.
---
 src/components/structures/UserSettings.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 1772108e03..e0302931f5 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -30,7 +30,7 @@ const AddThreepid = require('../../AddThreepid');
 const SdkConfig = require('../../SdkConfig');
 import AccessibleButton from '../views/elements/AccessibleButton';
 import _t from 'counterpart-riot';
-import * as languageHandler from('../../languageHandler');
+import * as languageHandler from '../../languageHandler';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 
 // if this looks like a release, use the 'version' from package.json; else use
@@ -566,9 +566,13 @@ module.exports = React.createClass({
 
     _renderLanguageSetting: function () {
         const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
-        return <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
-                          className="mx_UserSettings_Language"
-                          value={this.state.Language} />;
+        return <div>
+            <label htmlFor="languageSelector">Interface Language</label>
+            <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
+                          className="mx_UserSettings_language"
+                          value={this.state.Language}
+            />
+        </div>;
     },
 
     _renderUserInterfaceSettings: function() {

From ec146c7f450c8d1a589a36f94ac5221137067379 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 11:24:17 +0100
Subject: [PATCH 215/312] Switch to stock counterpart

We no longer need the custom counterpart. The things that were
changed in it and reasosn we no lomger need them are:

 1. set separator - this can be done with standard counterpart
 2. ES6 port: this was done to allow importing as _t, but is
    unnecessary with the _t wrapper function in react-sdk
    (although also seems to work fine with
    `import _t from 'counterpart';`)
 3. Fallback to key name: unnecessary with
    `setMissingEntryGenerator` in 0.18, but we've changed to just
    using a fallback locale anyway since No code missing en
    translations should ever make it to the devbelop branch.
 4. Logging on missing translations. Unnecessary with
    `onTranslationNotFound`, but now not used anyway because we
    let missing translations show up in the UI as
    'missing translation'

Bulk changes to imports coming in separate commit for easy reading.
---
 package.json           |  2 +-
 src/languageHandler.js | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 11106325f1..b94c8d66eb 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "browser-request": "^0.3.3",
     "classnames": "^2.1.2",
     "commonmark": "^0.27.0",
-    "counterpart-riot": "^0.18.1",
+    "counterpart": "^0.18.0",
     "draft-js": "^0.8.1",
     "draft-js-export-html": "^0.5.0",
     "draft-js-export-markdown": "^0.2.0",
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 92e3ccefb6..25c380a53c 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 MTRNord and Cooperative EITA
+Copyright 2017 Vector Creations Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -15,13 +16,27 @@ limitations under the License.
 */
 
 import request from 'browser-request';
-// Workaround for broken export
-import * as counterpart from 'counterpart-riot';
-import UserSettingsStore from './UserSettingsStore';
+import counterpart from 'counterpart';
 import q from 'q';
 
+import UserSettingsStore from './UserSettingsStore';
+
 const i18nFolder = 'i18n/';
 
+// We use english strings as keys, some of which contain full stops
+counterpart.setSeparator('|');
+// Fall back to English
+counterpart.setFallbackLocale('en');
+
+// 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
+// just import counterpart and use it directly, we end up using a different
+// instance.
+export function _t(...args) {
+    return counterpart.translate(...args);
+}
+
 export function setLanguage(languages, extCounterpart=null) {
     if (!languages || !Array.isArray(languages)) {
     const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser());

From 5c359e63ab6f08daad9c0e1252327859ca53b710 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 11:39:08 +0100
Subject: [PATCH 216/312] Bulk change counterpart imports

to use languageHandler wrapper func
---
 src/AddThreepid.js                                         | 2 +-
 src/CallHandler.js                                         | 2 +-
 src/ContentMessages.js                                     | 2 +-
 src/DateUtils.js                                           | 2 +-
 src/Lifecycle.js                                           | 2 +-
 src/Notifier.js                                            | 2 +-
 src/PasswordReset.js                                       | 2 +-
 src/Roles.js                                               | 2 +-
 src/ScalarMessaging.js                                     | 2 +-
 src/SlashCommands.js                                       | 2 +-
 src/TextForEvent.js                                        | 2 +-
 src/WhoIsTyping.js                                         | 2 +-
 src/async-components/views/dialogs/EncryptedEventDialog.js | 2 +-
 src/autocomplete/CommandProvider.js                        | 2 +-
 src/autocomplete/EmojiProvider.js                          | 2 +-
 src/autocomplete/RoomProvider.js                           | 2 +-
 src/autocomplete/UserProvider.js                           | 2 +-
 src/components/structures/CreateRoom.js                    | 2 +-
 src/components/structures/MatrixChat.js                    | 2 +-
 src/components/structures/NotificationPanel.js             | 2 +-
 src/components/structures/RoomStatusBar.js                 | 2 +-
 src/components/structures/RoomView.js                      | 2 +-
 src/components/structures/TimelinePanel.js                 | 2 +-
 src/components/structures/UserSettings.js                  | 2 +-
 src/components/structures/login/ForgotPassword.js          | 2 +-
 src/components/structures/login/Login.js                   | 2 +-
 src/components/structures/login/PostRegistration.js        | 2 +-
 src/components/structures/login/Registration.js            | 2 +-
 src/components/views/dialogs/ChatInviteDialog.js           | 2 +-
 src/components/views/dialogs/ConfirmUserActionDialog.js    | 2 +-
 src/components/views/dialogs/TextInputDialog.js            | 2 +-
 src/components/views/elements/LanguageDropdown.js          | 2 +-
 src/components/views/elements/MemberEventListSummary.js    | 2 +-
 src/components/views/login/PasswordLogin.js                | 2 +-
 src/components/views/messages/MFileBody.js                 | 2 +-
 src/components/views/room_settings/AliasSettings.js        | 2 +-
 src/components/views/rooms/EventTile.js                    | 2 +-
 src/components/views/rooms/MemberInfo.js                   | 2 +-
 src/components/views/rooms/MemberList.js                   | 2 +-
 src/components/views/rooms/MessageComposer.js              | 2 +-
 src/components/views/rooms/MessageComposerInput.js         | 2 +-
 src/components/views/rooms/MessageComposerInputOld.js      | 2 +-
 src/components/views/rooms/RoomHeader.js                   | 2 +-
 src/components/views/rooms/RoomList.js                     | 2 +-
 src/components/views/rooms/RoomPreviewBar.js               | 2 +-
 src/components/views/rooms/RoomSettings.js                 | 2 +-
 src/components/views/rooms/SearchableEntityList.js         | 2 +-
 src/components/views/rooms/TopUnreadMessagesBar.js         | 2 +-
 src/components/views/settings/AddPhoneNumber.js            | 2 +-
 src/components/views/settings/ChangePassword.js            | 2 +-
 src/components/views/settings/DevicesPanelEntry.js         | 2 +-
 src/createRoom.js                                          | 2 +-
 52 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/AddThreepid.js b/src/AddThreepid.js
index 0503f4ff9d..8be7a19b13 100644
--- a/src/AddThreepid.js
+++ b/src/AddThreepid.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 var MatrixClientPeg = require("./MatrixClientPeg");
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 
 /**
  * Allows a user to add a third party identifier to their Home Server and,
diff --git a/src/CallHandler.js b/src/CallHandler.js
index f5283f6d49..a557c735a2 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -55,7 +55,7 @@ var MatrixClientPeg = require('./MatrixClientPeg');
 var PlatformPeg = require("./PlatformPeg");
 var Modal = require('./Modal');
 var sdk = require('./index');
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 var Matrix = require("matrix-js-sdk");
 var dis = require("./dispatcher");
 
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 6e31a60556..d4f8cae276 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -21,7 +21,7 @@ var extend = require('./extend');
 var dis = require('./dispatcher');
 var MatrixClientPeg = require('./MatrixClientPeg');
 var sdk = require('./index');
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 var Modal = require('./Modal');
 
 var encrypt = require("browser-encrypt-attachment");
diff --git a/src/DateUtils.js b/src/DateUtils.js
index 87b6fa690f..be5f432d06 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 'use strict';
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 
 function getDaysArray() {
     var days = [];
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 56af920609..0e3e52fe40 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -27,7 +27,7 @@ import DMRoomMap from './utils/DMRoomMap';
 import RtsClient from './RtsClient';
 import Modal from './Modal';
 import sdk from './index';
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 
 /**
  * Called at startup, to attempt to build a logged-in Matrix session. It tries
diff --git a/src/Notifier.js b/src/Notifier.js
index 9d3e114b14..8ab28e667e 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -21,7 +21,7 @@ import TextForEvent from './TextForEvent';
 import Avatar from './Avatar';
 import dis from './dispatcher';
 import sdk from './index';
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 import Modal from './Modal';
 
 /*
diff --git a/src/PasswordReset.js b/src/PasswordReset.js
index d5992e3e0a..668b8f67da 100644
--- a/src/PasswordReset.js
+++ b/src/PasswordReset.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 var Matrix = require("matrix-js-sdk");
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 
 /**
  * Allows a user to reset their password on a homeserver.
diff --git a/src/Roles.js b/src/Roles.js
index 0c7463c48a..5af8be76df 100644
--- a/src/Roles.js
+++ b/src/Roles.js
@@ -13,7 +13,7 @@ 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 _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 
 export function levelRoleMap() {
 	const LEVEL_ROLE_MAP = {};
diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index abe39056e7..b120125e0e 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -125,7 +125,7 @@ const SdkConfig = require('./SdkConfig');
 const MatrixClientPeg = require("./MatrixClientPeg");
 const MatrixEvent = require("matrix-js-sdk").MatrixEvent;
 const dis = require("./dispatcher");
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 
 function sendResponse(event, res) {
     const data = JSON.parse(JSON.stringify(event.data));
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index e2c69ad46a..645ca6e8fe 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -18,7 +18,7 @@ import MatrixClientPeg from "./MatrixClientPeg";
 import dis from "./dispatcher";
 import Tinter from "./Tinter";
 import sdk from './index';
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 import Modal from './Modal';
 
 
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 36a6eff45f..24d79ac3ce 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 var MatrixClientPeg = require("./MatrixClientPeg");
 var CallHandler = require("./CallHandler");
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 import * as Roles from './Roles';
 
 function textForMemberEvent(ev) {
diff --git a/src/WhoIsTyping.js b/src/WhoIsTyping.js
index b2eef42f5a..f3d89f0ff2 100644
--- a/src/WhoIsTyping.js
+++ b/src/WhoIsTyping.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 var MatrixClientPeg = require("./MatrixClientPeg");
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 
 module.exports = {
     usersTypingApartFromMe: function(room) {
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index 279f6bbda1..3a6ca4e6b7 100644
--- a/src/async-components/views/dialogs/EncryptedEventDialog.js
+++ b/src/async-components/views/dialogs/EncryptedEventDialog.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 var React = require("react");
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var sdk = require('../../../index');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 
diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index d72c8d1c07..34d0110131 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import Fuse from 'fuse.js';
 import {TextualCompletion} from './Components';
diff --git a/src/autocomplete/EmojiProvider.js b/src/autocomplete/EmojiProvider.js
index d0675e9ffc..7b9e8fb669 100644
--- a/src/autocomplete/EmojiProvider.js
+++ b/src/autocomplete/EmojiProvider.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import {emojioneList, shortnameToImage, shortnameToUnicode} from 'emojione';
 import Fuse from 'fuse.js';
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 175aaf2691..4a2dd09eb5 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import MatrixClientPeg from '../MatrixClientPeg';
 import Fuse from 'fuse.js';
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index c2fccbc418..281b6fd40d 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
 import Q from 'q';
 import Fuse from 'fuse.js';
diff --git a/src/components/structures/CreateRoom.js b/src/components/structures/CreateRoom.js
index 48ce4e274e..8b3d035dc1 100644
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 import React from 'react';
 import q from 'q';
-import _t from 'counterpart-riot';
+import { _t } from '../../languageHandler';
 import sdk from '../../index';
 import MatrixClientPeg from '../../MatrixClientPeg';
 const PresetValues = {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index c8cb721041..a00d9c22ce 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -36,7 +36,7 @@ import PageTypes from '../../PageTypes';
 
 import createRoom from "../../createRoom";
 import * as UDEHandler from '../../UnknownDeviceErrorHandler';
-import _t from 'counterpart-riot';
+import { _t } from '../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'MatrixChat',
diff --git a/src/components/structures/NotificationPanel.js b/src/components/structures/NotificationPanel.js
index 214bb79862..21eccbdff6 100644
--- a/src/components/structures/NotificationPanel.js
+++ b/src/components/structures/NotificationPanel.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 var React = require('react');
 var ReactDOM = require("react-dom");
-import _t from 'counterpart-riot';
+import { _t } from '../../languageHandler';
 var Matrix = require("matrix-js-sdk");
 var sdk = require('../../index');
 var MatrixClientPeg = require("../../MatrixClientPeg");
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 8e1fe971a4..5a9592243a 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../../languageHandler';
 import sdk from '../../index';
 import dis from '../../dispatcher';
 import WhoIsTyping from '../../WhoIsTyping';
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 2b7e7acc3d..f0b6160012 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -25,7 +25,7 @@ var ReactDOM = require("react-dom");
 var q = require("q");
 var classNames = require("classnames");
 var Matrix = require("matrix-js-sdk");
-import _t from 'counterpart-riot';
+import { _t } from '../../languageHandler';
 
 var UserSettingsStore = require('../../UserSettingsStore');
 var MatrixClientPeg = require("../../MatrixClientPeg");
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 8b180077e0..5719964df5 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -23,7 +23,7 @@ var Matrix = require("matrix-js-sdk");
 var EventTimeline = Matrix.EventTimeline;
 
 var sdk = require('../../index');
-import _t from 'counterpart-riot';
+import { _t } from '../../languageHandler';
 var MatrixClientPeg = require("../../MatrixClientPeg");
 var dis = require("../../dispatcher");
 var ObjectUtils = require('../../ObjectUtils');
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index e0302931f5..a39c06f907 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -29,7 +29,7 @@ const Email = require('../../email');
 const AddThreepid = require('../../AddThreepid');
 const SdkConfig = require('../../SdkConfig');
 import AccessibleButton from '../views/elements/AccessibleButton';
-import _t from 'counterpart-riot';
+import { _t } from '../../languageHandler';
 import * as languageHandler from '../../languageHandler';
 import * as FormattingUtils from '../../utils/FormattingUtils';
 
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index 6a250eb531..5438b123c3 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -17,7 +17,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var sdk = require('../../../index');
 var Modal = require("../../../Modal");
 var MatrixClientPeg = require('../../../MatrixClientPeg');
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 17d9833340..78f515804a 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -18,7 +18,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import ReactDOM from 'react-dom';
 import url from 'url';
 import sdk from '../../../index';
diff --git a/src/components/structures/login/PostRegistration.js b/src/components/structures/login/PostRegistration.js
index c3425cf68b..86ff519783 100644
--- a/src/components/structures/login/PostRegistration.js
+++ b/src/components/structures/login/PostRegistration.js
@@ -19,7 +19,7 @@ limitations under the License.
 import React from 'react';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'PostRegistration',
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index b78f0ec80a..6dfd700d13 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -27,7 +27,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import RegistrationForm from '../../views/login/RegistrationForm';
 import CaptchaForm from '../../views/login/CaptchaForm';
 import RtsClient from '../../../RtsClient';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 const MIN_PASSWORD_LENGTH = 6;
 
diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index 032a705a0e..81d032683e 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import classNames from 'classnames';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import { getAddressType, inviteMultipleToRoom } from '../../../Invite';
 import createRoom from '../../../createRoom';
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index aded0dabb9..b10df3ccef 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import classnames from 'classnames';
 
 /*
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 080e6ac1b6..673be42030 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 export default React.createClass({
     displayName: 'TextInputDialog',
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 764657830c..39458b506c 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -18,7 +18,7 @@ import React from 'react';
 
 import sdk from '../../../index';
 import UserSettingsStore from '../../../UserSettingsStore';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import * as languageHandler from '../../../languageHandler';
 
 function languageMatchesSearchQuery(query, language) {
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index 747e5019a8..2999af42d6 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 import React from 'react';
 const MemberAvatar = require('../avatars/MemberAvatar.js');
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'MemberEventListSummary',
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 6530df83e4..7360b343e5 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -19,7 +19,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
 import sdk from '../../../index';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import {field_input_incorrect} from '../../../UiEffects';
 
 
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index d7609eae15..83b5793c9a 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -20,7 +20,7 @@ import React from 'react';
 import filesize from 'filesize';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import {decryptFile} from '../../../utils/DecryptFile';
 import Tinter from '../../../Tinter';
 import request from 'browser-request';
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index a6a9302190..d8766c637d 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -19,7 +19,7 @@ var React = require('react');
 var ObjectUtils = require("../../../ObjectUtils");
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var sdk = require("../../../index");
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var Modal = require("../../../Modal");
 
 module.exports = React.createClass({
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 3e2c3f5de0..6760a3e894 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -18,7 +18,7 @@ limitations under the License.
 
 var React = require('react');
 var classNames = require("classnames");
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var Modal = require('../../../Modal');
 
 var sdk = require('../../../index');
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index fed307c216..e76d5387d6 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -31,7 +31,7 @@ import classNames from 'classnames';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import createRoom from '../../../createRoom';
 import DMRoomMap from '../../../utils/DMRoomMap';
 import Unread from '../../../Unread';
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 6fe1ad1b79..20a0851bd4 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 var React = require('react');
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var classNames = require('classnames');
 var Matrix = require("matrix-js-sdk");
 var q = require('q');
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index a9b65d4611..488d3cc287 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 var React = require('react');
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var CallHandler = require('../../../CallHandler');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var Modal = require('../../../Modal');
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index adb2a4c6aa..c52f9724b0 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -30,7 +30,7 @@ import type {MatrixClient} from 'matrix-js-sdk/lib/matrix';
 import SlashCommands from '../../../SlashCommands';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 import dis from '../../../dispatcher';
 import KeyCode from '../../../KeyCode';
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index 2bbb1cbb87..9b4efa272c 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -20,7 +20,7 @@ var SlashCommands = require("../../../SlashCommands");
 var Modal = require("../../../Modal");
 var MemberEntry = require("../../../TabCompleteEntries").MemberEntry;
 var sdk = require('../../../index');
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import UserSettingsStore from "../../../UserSettingsStore";
 
 var dis = require("../../../dispatcher");
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index f9779d088e..38bd63e019 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -19,7 +19,7 @@ limitations under the License.
 var React = require('react');
 var classNames = require('classnames');
 var sdk = require('../../../index');
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 var Modal = require("../../../Modal");
 var dis = require("../../../dispatcher");
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index b463928482..f02f70b88b 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -17,7 +17,7 @@ limitations under the License.
 'use strict';
 var React = require("react");
 var ReactDOM = require("react-dom");
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var GeminiScrollbar = require('react-gemini-scrollbar');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var CallHandler = require('../../../CallHandler');
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 54857845ce..2cf9ade847 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -21,7 +21,7 @@ var React = require('react');
 var sdk = require('../../../index');
 var MatrixClientPeg = require('../../../MatrixClientPeg');
 
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'RoomPreviewBar',
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 02efd439a4..df70513b7a 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -17,7 +17,7 @@ limitations under the License.
 
 import q from 'q';
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import SdkConfig from '../../../SdkConfig';
 import sdk from '../../../index';
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index 1c3ddea705..4412fc539f 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -17,7 +17,7 @@ var React = require('react');
 var MatrixClientPeg = require("../../../MatrixClientPeg");
 var Modal = require("../../../Modal");
 var sdk = require("../../../index");
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var GeminiScrollbar = require('react-gemini-scrollbar');
 
 // A list capable of displaying entities which conform to the SearchableEntity
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 0d68b0dc0d..6cb6475a8f 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -18,7 +18,7 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 var sdk = require('../../../index');
 
 module.exports = React.createClass({
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index bdb67bc5ff..697a539bcd 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 import sdk from '../../../index';
 import AddThreepid from '../../../AddThreepid';
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 71356fc5f6..e0fe6ce56a 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -21,7 +21,7 @@ var MatrixClientPeg = require("../../../MatrixClientPeg");
 var Modal = require("../../../Modal");
 var sdk = require("../../../index");
 import AccessibleButton from '../elements/AccessibleButton';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'ChangePassword',
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index c076c5f670..f295a7c2d5 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 
 import sdk from '../../../index';
-import _t from 'counterpart-riot';
+import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import DateUtils from '../../../DateUtils';
diff --git a/src/createRoom.js b/src/createRoom.js
index 78e7485237..fe148f0408 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -17,7 +17,7 @@ limitations under the License.
 var MatrixClientPeg = require('./MatrixClientPeg');
 var Modal = require('./Modal');
 var sdk = require('./index');
-import _t from 'counterpart-riot';
+import { _t } from './languageHandler';
 var dis = require("./dispatcher");
 var Rooms = require("./Rooms");
 

From 107024efa8da99fd08267fb65758ad0d4c8d2b50 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 11:42:19 +0100
Subject: [PATCH 217/312] Unnecessary whitespace

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 56965c5f86..0f5ef73365 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ Translation Status
 ==================
 [![translationsstatus](https://translate.nordgedanken.de/widgets/riot-web/-/multi-auto.svg)](https://translate.nordgedanken.de/engage/riot-web/?utm_source=widget)
 
-
 Developer Guide
 ===============
 

From c7776915f7801ba6cd9d53cf882f4bb0aa3a9281 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 11:45:36 +0100
Subject: [PATCH 218/312] Kill off more tabs

---
 src/CallHandler.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index a557c735a2..5edeba7625 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -256,7 +256,7 @@ function _onAction(payload) {
                 Modal.createDialog(ErrorDialog, {
                     description: _t('You cannot place a call with yourself') + '.',
                     title: _t("Error"),
-					button: _t("OK"),
+                    button: _t("OK"),
                 });
                 return;
             }
@@ -284,7 +284,7 @@ function _onAction(payload) {
                 Modal.createDialog(ErrorDialog, {
                     description: _t('Conference calls are not supported in this client'),
                     title: _t("Error"),
-					button: _t("OK"),
+                    button: _t("OK"),
                 });
             }
             else if (!MatrixClientPeg.get().supportsVoip()) {
@@ -292,7 +292,7 @@ function _onAction(payload) {
                 Modal.createDialog(ErrorDialog, {
                     title: _t('VoIP is unsupported'),
                     description: _t('You cannot place VoIP calls in this browser') + '.',
-					button: _t("OK"),
+                    button: _t("OK"),
                 });
             }
             else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
@@ -304,8 +304,8 @@ function _onAction(payload) {
                 // Therefore we disable conference calling in E2E rooms.
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                	title: _t("Error"),
-					button: _t("OK"),
+                    title: _t("Error"),
+                    button: _t("OK"),
                     description: _t('Conference calls are not supported in encrypted rooms'),
                 });
             }
@@ -314,7 +314,7 @@ function _onAction(payload) {
                 Modal.createDialog(QuestionDialog, {
                     title: _t('Warning') + '!',
                     description: _t('Conference calling is in development and may not be reliable') + '.',
-					button: _t("OK"),
+                    button: _t("OK"),
                     onFinished: confirm=>{
                         if (confirm) {
                             ConferenceHandler.createNewMatrixCall(
@@ -327,7 +327,7 @@ function _onAction(payload) {
                                 Modal.createDialog(ErrorDialog, {
                                     title: _t('Failed to set up conference call'),
                                     description: _t('Conference call failed') + '. ' + ((err && err.message) ? err.message : ''),
-									button: _t("OK"),
+                                    button: _t("OK"),
                                 });
                             });
                         }

From 9fa6e8b1e23ca6cb60812a23b521c7d4629fe68a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 12:02:05 +0100
Subject: [PATCH 219/312] Add us to copyright

As I've now added code to this file
---
 src/components/views/elements/LanguageDropdown.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 39458b506c..25a920d2e0 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Marcel Radzio (MTRNord)
+Copyright 2017 Vector Creations Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 913723b76bef38f8c91e57bb4aa49ba4f2bda57c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 12:08:14 +0100
Subject: [PATCH 220/312] Remove extCounterpart now we only use one instance

---
 src/languageHandler.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 25c380a53c..5e7c7869b4 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -37,7 +37,7 @@ export function _t(...args) {
     return counterpart.translate(...args);
 }
 
-export function setLanguage(languages, extCounterpart=null) {
+export function setLanguage(languages) {
     if (!languages || !Array.isArray(languages)) {
     const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser());
     console.log("no language found. Got from browser: " + JSON.stringify(languages));
@@ -81,9 +81,6 @@ export function setLanguage(languages, extCounterpart=null) {
                 });
                 return;
             } else {
-                if (extCounterpart) {
-                    extCounterpart.registerTranslations(langCode, langJson);
-                }
                 counterpart.registerTranslations(langCode, langJson);
             }
         }
@@ -106,9 +103,6 @@ export function setLanguage(languages, extCounterpart=null) {
         if ((isValidFirstLanguage) || (languages.length==2 && languageFiles.hasOwnProperty(languages[1]))) {
             validLanguageKey = (isValidFirstLanguage) ? languages[0] : languages[1];
             getLanguage(i18nFolder + languageFiles[validLanguageKey], validLanguageKey, registerTranslations);
-            if (extCounterpart) {
-                extCounterpart.setLocale(validLanguageKey);
-            }
             counterpart.setLocale(validLanguageKey);
             UserSettingsStore.setLocalSetting('language', validLanguageKey);
             console.log("set language to "+validLanguageKey);
@@ -120,9 +114,6 @@ export function setLanguage(languages, extCounterpart=null) {
         if (validLanguageKey!="en") {
             getLanguage(i18nFolder + languageFiles['en'], 'en', registerTranslations);
         }
-        if (extCounterpart) {
-            extCounterpart.setFallbackLocale('en');
-        }
         counterpart.setFallbackLocale('en');
     });
 };

From db45e9953649eef76de62caedce2060d8cd2bd4e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 12:09:48 +0100
Subject: [PATCH 221/312] Remove defaulting here

We already do it in the place this function gets called
---
 src/languageHandler.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 5e7c7869b4..ae34e9c764 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -38,11 +38,6 @@ export function _t(...args) {
 }
 
 export function setLanguage(languages) {
-    if (!languages || !Array.isArray(languages)) {
-    const languages = this.getNormalizedLanguageKeys(this.getLanguageFromBrowser());
-    console.log("no language found. Got from browser: " + JSON.stringify(languages));
-    }
-
     request(i18nFolder + 'languages.json', function(err, response, body) {
         function getLanguage(langPath, langCode, callback) {
             let response_return = {};

From 39dbc4c6e1cc16bb0978930a5382e59d8b141b03 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 16:45:32 +0100
Subject: [PATCH 222/312] Lots of changes to languageHandler

 * Replace callbacks with promises
 * Move plain functions to top level
 * De-duplicate bits that fetched languages.json
 * Take full language preference list from the browser if we
   can get it, rather than just the first.
---
 src/languageHandler.js | 176 +++++++++++++++++++----------------------
 1 file changed, 80 insertions(+), 96 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index ae34e9c764..4b49c95fc9 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -37,131 +37,115 @@ export function _t(...args) {
     return counterpart.translate(...args);
 }
 
-export function setLanguage(languages) {
-    request(i18nFolder + 'languages.json', function(err, response, body) {
-        function getLanguage(langPath, langCode, callback) {
-            let response_return = {};
-            let resp_raw = {};
-            request(
-                { method: "GET", url: langPath },
-                (err, response, body) => {
-                    if (err || response.status < 200 || response.status >= 300) {
-                        if (response) {
-                            if (response.status == 404 || (response.status == 0 && body == '')) {
-                                resp_raw = {};
-                            }
-                        }
-                        const resp = {err: err, response: resp_raw};
-                        err = resp['err'];
-                        const response_cb = resp['response'];
-                        callback(err, response_cb, langCode);
-                        return;
-                    }
+export function setLanguage(preferredLangs) {
+    if (!Array.isArray(preferredLangs)) {
+        preferredLangs = [preferredLangs];
+    }
 
-                    response_return = JSON.parse(body);
-                    callback(null, response_return, langCode);
-                    return;
-                }
-            );
-            return;
-        }
+    let langToUse;
+    let availLangs;
+    return getLangsJson().then((result) => {
+        availLangs = result;
 
-        function registerTranslations(err, langJson, langCode){
-            if (err !== null) {
-                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createDialog(ErrorDialog, {
-                    title: counterpart.translate('Error changing language'),
-                    description: counterpart.translate('Riot was unable to find the correct Data for the selected Language.'),
-                    button: counterpart.translate("OK"),
-                });
-                return;
-            } else {
-                counterpart.registerTranslations(langCode, langJson);
+        for (let i = 0; i < preferredLangs.length; ++i) {
+            if (availLangs.hasOwnProperty(preferredLangs[i])) {
+                langToUse = preferredLangs[i];
             }
         }
-
-        let languageFiles = {};
-        if(err){
-            console.error(err);
-            return;
-        } else {
-            if (body) {
-                languageFiles = JSON.parse(body);
-            } else {
-                languageFiles = JSON.parse('{"en": "en_EN.json"}');
-            }
+        if (!langToUse) {
+            throw new Error("Unable to find an appropriate language");
         }
 
+        return getLanguage(i18nFolder + availLangs[langToUse]);
+    }).then((langData) => {
+        counterpart.registerTranslations(langToUse, langData);
+        counterpart.setLocale(langToUse);
+        UserSettingsStore.setLocalSetting('language', langToUse);
+        console.log("set language to " + langToUse);
 
-        const isValidFirstLanguage = (languageFiles.hasOwnProperty(languages[0]));
-        var validLanguageKey = "";
-        if ((isValidFirstLanguage) || (languages.length==2 && languageFiles.hasOwnProperty(languages[1]))) {
-            validLanguageKey = (isValidFirstLanguage) ? languages[0] : languages[1];
-            getLanguage(i18nFolder + languageFiles[validLanguageKey], validLanguageKey, registerTranslations);
-            counterpart.setLocale(validLanguageKey);
-            UserSettingsStore.setLocalSetting('language', validLanguageKey);
-            console.log("set language to "+validLanguageKey);
-        } else {
-            console.log("didnt find any language file");
+        // Set 'en' as fallback language:
+        if (langToUse != "en") {
+            return getLanguage(i18nFolder + availLangs['en']);
         }
-
-        //Set 'en' as fallback language:
-        if (validLanguageKey!="en") {
-            getLanguage(i18nFolder + languageFiles['en'], 'en', registerTranslations);
-        }
-        counterpart.setFallbackLocale('en');
+    }).then((langData) => {
+        if (langData) counterpart.registerTranslations('en', langData);
     });
 };
 
 export function getAllLanguageKeysFromJson() {
-    let deferred = q.defer();
-
-    request(
-        { method: "GET", url: i18nFolder + 'languages.json' },
-        (err, response, body) => {
-            if (err || response.status < 200 || response.status >= 300) {
-                if (response) {
-                    if (response.status == 404 || (response.status == 0 && body == '')) {
-                        deferred.resolve({});
-                    }
-                }
-                deferred.reject({err: err, response: response});
-                return;
-            }
-            var languages = JSON.parse(body);
-            // If no language is found, fallback to 'en':
-            if (!languages) {
-                languages = [{"en": "en_EN.json"}];
-            }
-            const languageKeys = Object.keys(languages);
-            deferred.resolve(languageKeys);
-        }
-    );
-    return deferred.promise;
+    return getLangsJson().then((langs) => {
+        return Object.keys(langs);
+    });
 }
 
-export function getLanguageFromBrowser() {
-    return navigator.languages[0] || navigator.language || navigator.userLanguage;
+export function getLanguagesFromBrowser() {
+    if (navigator.languages) return navigator.languages;
+    if (navigator.language) return [navigator.language]
+    return [navigator.userLanguage];
 };
 
+/**
+ * Turns a language string, normalises it,
+ * (see normalizeLanguageKey) into an array of language strings
+ * with fallback to generic languages
+ * (eg. 'pt-BR' => ['pt-br', 'pt'])
+ *
+ * @param {string} language The input language string
+ * @return {string[]} List of normalised languages
+ */
 export function getNormalizedLanguageKeys(language) {
-    if (!language) {
-        return;
-    }
     const languageKeys = [];
     const normalizedLanguage = this.normalizeLanguageKey(language);
     const languageParts = normalizedLanguage.split('-');
-    if (languageParts.length==2 && languageParts[0]==languageParts[1]) {
+    if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
         languageKeys.push(languageParts[0]);
     } else {
         languageKeys.push(normalizedLanguage);
-        if (languageParts.length==2) {
+        if (languageParts.length == 2) {
             languageKeys.push(languageParts[0]);
         }
     }
     return languageKeys;
 };
 
+/**
+ * Returns a language string with underscores replaced with
+ * hyphens, and lowercased.
+ */
 export function normalizeLanguageKey(language) {
     return language.toLowerCase().replace("_","-");
 };
+
+function getLangsJson() {
+    const deferred = q.defer();
+
+    request(
+        { method: "GET", url: i18nFolder + 'languages.json' },
+        (err, response, body) => {
+            if (err || response.status < 200 || response.status >= 300) {
+                deferred.reject({err: err, response: response});
+                return;
+            }
+            deferred.resolve(JSON.parse(body));
+        }
+    );
+    return deferred.promise;
+}
+
+function getLanguage(langPath) {
+    const deferred = q.defer();
+
+    let response_return = {};
+    request(
+        { method: "GET", url: langPath },
+        (err, response, body) => {
+            if (err || response.status < 200 || response.status >= 300) {
+                deferred.reject({err: err, response: response});
+                return;
+            }
+
+            deferred.resolve(JSON.parse(body));
+        }
+    );
+    return deferred.promise;
+}

From 3a379d09de62bf3282d693dfd73fe612499b5179 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 16:52:15 +0100
Subject: [PATCH 223/312] Update translations

Actually translate the language dropdown label & add the string.
Remove some unused ones.
---
 src/components/structures/UserSettings.js | 2 +-
 src/i18n/strings/en_EN.json               | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index a39c06f907..279920eeb7 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -567,7 +567,7 @@ module.exports = React.createClass({
     _renderLanguageSetting: function () {
         const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
         return <div>
-            <label htmlFor="languageSelector">Interface Language</label>
+            <label htmlFor="languageSelector">{_t('Interface Language')}</label>
             <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
                           className="mx_UserSettings_language"
                           value={this.state.Language}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 175dbe3c47..fcbd3d737f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -283,6 +283,7 @@
   "I have verified my email address": "I have verified my email address",
   "Import E2E room keys": "Import E2E room keys",
   "Incorrect verification code": "Incorrect verification code",
+  "Interface language": "Interface language",
   "Invalid alias format": "Invalid alias format",
   "Invalid address format": "Invalid address format",
   "Invalid Email Address": "Invalid Email Address",
@@ -575,11 +576,9 @@
   "Share message history with new users": "Share message history with new users",
   "Encrypt room": "Encrypt room",
   "There are no visible files in this room": "There are no visible files in this room",
-  "Error changing language": "Error changing language",
   "Room": "Room",
   "Room name (optional)": "Room name (optional)",
   "Who would you like to add to this room?": "Who would you like to add to this room?",
-  "Riot was unable to find the correct Data for the selected Language.": "Riot was unable to find the correct Data for the selected Language.",
   "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.",
   "Auto-complete": "Auto-complete",

From feef7d49e95d7819265c77c945b0efc6d9a53ac0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 16:55:24 +0100
Subject: [PATCH 224/312] More tabs

---
 src/Roles.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Roles.js b/src/Roles.js
index 5af8be76df..cdfc156423 100644
--- a/src/Roles.js
+++ b/src/Roles.js
@@ -16,8 +16,8 @@ limitations under the License.
 import { _t } from './languageHandler';
 
 export function levelRoleMap() {
-	const LEVEL_ROLE_MAP = {};
-	LEVEL_ROLE_MAP[undefined] = _t('Default');
+    const LEVEL_ROLE_MAP = {};
+    LEVEL_ROLE_MAP[undefined] = _t('Default');
     LEVEL_ROLE_MAP[0] = _t('User');
     LEVEL_ROLE_MAP[50] = _t('Moderator');
     LEVEL_ROLE_MAP[100] = _t('Admin');
@@ -25,7 +25,7 @@ export function levelRoleMap() {
 }
 
 export function textualPowerLevel(level, userDefault) {
-	const LEVEL_ROLE_MAP = this.levelRoleMap();
+    const LEVEL_ROLE_MAP = this.levelRoleMap();
     if (LEVEL_ROLE_MAP[level]) {
         return LEVEL_ROLE_MAP[level] + (level !== undefined ? ` (${level})` : ` (${userDefault})`);
     } else {

From 85756c78b475c9af29d8a36e4c4d5804b8e17798 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 17:17:37 +0100
Subject: [PATCH 225/312] Change to object literal

---
 src/Roles.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Roles.js b/src/Roles.js
index cdfc156423..8c1f711bbe 100644
--- a/src/Roles.js
+++ b/src/Roles.js
@@ -16,12 +16,12 @@ limitations under the License.
 import { _t } from './languageHandler';
 
 export function levelRoleMap() {
-    const LEVEL_ROLE_MAP = {};
-    LEVEL_ROLE_MAP[undefined] = _t('Default');
-    LEVEL_ROLE_MAP[0] = _t('User');
-    LEVEL_ROLE_MAP[50] = _t('Moderator');
-    LEVEL_ROLE_MAP[100] = _t('Admin');
-    return LEVEL_ROLE_MAP;
+    return {
+        undefined: _t('Default'),
+        0: _t('User'),
+        50:  _t('Moderator'),
+        100: _t('Admin'),
+    };
 }
 
 export function textualPowerLevel(level, userDefault) {

From 6d67655f6648627f78709520017a98646ebd6fd2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 17:22:04 +0100
Subject: [PATCH 226/312] Add german for Change password

---
 src/i18n/strings/de_DE.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1c6b3eb5f3..bf55379d6d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -37,6 +37,7 @@
     "Joins room with given alias": "Betrete Raum mit angegebenen Alias",
     "Kicks user with given id": "Kickt Benutzer mit angegebener ID",
     "Changes your display nickname": "Ändert deinen angezeigten Nicknamen",
+    "Change Password": "Passwort ändern",
     "Searches DuckDuckGo for results": "Suche in DuckDuckGo nach Ergebnissen",
     "Commands": "Kommandos",
     "Emoji": "Smileys",

From 9112fc231af6cf9d7bb913b321bacf70fda87e5a Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 17:35:18 +0100
Subject: [PATCH 227/312] More translation string fixups

---
 src/components/structures/UserSettings.js | 12 ++++++------
 src/i18n/strings/en_EN.json               | 10 +++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 279920eeb7..b669898cd7 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -724,7 +724,7 @@ module.exports = React.createClass({
                 <div className="mx_UserSettings_section">
                     <p>{ _t("Found a bug?") }</p>
                     <button className="mx_UserSettings_button danger"
-                        onClick={this._onBugReportClicked}>Report it
+                        onClick={this._onBugReportClicked}>{_t('Report it')}
                     </button>
                 </div>
             </div>
@@ -1031,10 +1031,10 @@ module.exports = React.createClass({
 
                 <div className="mx_UserSettings_section">
                     <div className="mx_UserSettings_advanced">
-                        { _t("Logged in as") } {this._me}
+                        { _t("Logged in as:") } {this._me}
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        Access Token: <span className="mx_UserSettings_advanced_spoiler" onClick={this._showSpoiler} data-spoiler={ MatrixClientPeg.get().getAccessToken() }>&lt;{ _t("click to reveal") }&gt;</span>
+                        {_t('Access Token:')} <span className="mx_UserSettings_advanced_spoiler" onClick={this._showSpoiler} data-spoiler={ MatrixClientPeg.get().getAccessToken() }>&lt;{ _t("click to reveal") }&gt;</span>
                     </div>
                     <div className="mx_UserSettings_advanced">
                         { _t("Homeserver is") } { MatrixClientPeg.get().getHomeserverUrl() }
@@ -1043,15 +1043,15 @@ module.exports = React.createClass({
                         { _t("Identity Server is") } { MatrixClientPeg.get().getIdentityServerUrl() }
                     </div>
                     <div className="mx_UserSettings_advanced">
-                        matrix-react-sdk version: {(REACT_SDK_VERSION !== '<local>')
+                        {_t('matrix-react-sdk version:')} {(REACT_SDK_VERSION !== '<local>')
                             ? gHVersionLabel('matrix-org/matrix-react-sdk', REACT_SDK_VERSION)
                             : REACT_SDK_VERSION
                         }<br/>
-                        riot-web version: {(this.state.vectorVersion !== undefined)
+                        {_t('riot-web version:')} {(this.state.vectorVersion !== undefined)
                             ? gHVersionLabel('vector-im/riot-web', this.state.vectorVersion)
                             : 'unknown'
                         }<br/>
-                        { _t("olm version: ") } {olmVersionString}<br/>
+                        { _t("olm version:") } {olmVersionString}<br/>
                     </div>
                 </div>
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index fcbd3d737f..e8fffbe80d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -126,6 +126,7 @@
   "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation",
   "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepted the invitation for %(displayName)s",
   "Account": "Account",
+  "Access Token:": "Access Token:",
   "Add email address": "Add email address",
   "Add phone number": "Add phone number",
   "Admin": "Admin",
@@ -283,7 +284,7 @@
   "I have verified my email address": "I have verified my email address",
   "Import E2E room keys": "Import E2E room keys",
   "Incorrect verification code": "Incorrect verification code",
-  "Interface language": "Interface language",
+  "Interface Language": "Interface Language",
   "Invalid alias format": "Invalid alias format",
   "Invalid address format": "Invalid address format",
   "Invalid Email Address": "Invalid Email Address",
@@ -311,7 +312,7 @@
   "%(targetName)s left the room": "%(targetName)s left the room",
   "Level": "Level",
   "Local addresses for this room:": "Local addresses for this room:",
-  "Logged in as": "Logged in as",
+  "Logged in as:": "Logged in as:",
   "Login as guest": "Login as guest",
   "Logout": "Logout",
   "Low priority": "Low priority",
@@ -319,6 +320,7 @@
   "Manage Integrations": "Manage Integrations",
   "Markdown is disabled": "Markdown is disabled",
   "Markdown is enabled": "Markdown is enabled",
+  "matrix-react-sdk version:": "matrix-react-sdk version:",
   "Members only": "Members only",
   "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",
@@ -348,7 +350,7 @@
   "No results": "No results",
   "No users have specific privileges in this room": "No users have specific privileges in this room",
   "OK": "OK",
-  "olm version": "olm version",
+  "olm version:": "olm version:",
   "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)",
   "Once you&#39;ve followed the link it contains, click below": "Once you&#39;ve followed the link it contains, click below",
   "Only people who have been invited": "Only people who have been invited",
@@ -377,12 +379,14 @@
   "%(senderName)s removed their profile picture": "%(senderName)s removed their profile picture",
   "Remove": "Remove",
   "%(senderName)s requested a VoIP conference": "%(senderName)s requested a VoIP conference",
+  "Report it": "Report it",
   "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>",
   "restore": "restore",
   "Return to app": "Return to app",
   "Return to login screen": "Return to login screen",
   "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings",
   "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again",
+  "riot-web version:": "riot-web version:",
   "Room %(roomId)s not visible": "Room %(roomId)s not visible",
   "Room Colour": "Room Colour",
   "Room name (optional)": "Room name (optional)",

From 443ab1add73390176478fc7ecd1a334aa157e833 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 18:20:48 +0100
Subject: [PATCH 228/312] Put back default strings on dialogs

But make them work by calling _t in render rather than
getDefaultProps().

Also sort out some 'Warning!' strings
---
 src/CallHandler.js                                | 15 +--------------
 src/ContentMessages.js                            |  1 -
 src/SlashCommands.js                              |  1 -
 src/components/structures/MatrixChat.js           |  3 ---
 src/components/structures/RoomView.js             |  9 +--------
 src/components/structures/TimelinePanel.js        |  1 -
 src/components/structures/UserSettings.js         |  8 --------
 src/components/structures/login/ForgotPassword.js |  3 +--
 src/components/views/dialogs/ChatInviteDialog.js  |  4 ----
 src/components/views/dialogs/ErrorDialog.js       | 10 +++++++---
 .../views/dialogs/InteractiveAuthDialog.js        |  3 ++-
 .../views/dialogs/NeedToRegisterDialog.js         |  5 +++--
 src/components/views/dialogs/QuestionDialog.js    |  3 ++-
 src/components/views/login/RegistrationForm.js    |  2 +-
 .../views/room_settings/AliasSettings.js          |  2 --
 src/components/views/rooms/MemberInfo.js          |  7 +------
 src/components/views/rooms/MessageComposer.js     |  1 -
 .../views/rooms/MessageComposerInput.js           |  2 --
 .../views/rooms/MessageComposerInputOld.js        |  3 ---
 src/components/views/rooms/RoomHeader.js          |  1 -
 src/components/views/rooms/RoomSettings.js        |  5 +----
 src/components/views/settings/AddPhoneNumber.js   |  1 -
 src/components/views/settings/ChangePassword.js   |  2 +-
 src/createRoom.js                                 |  1 -
 src/i18n/strings/da.json                          |  2 +-
 src/i18n/strings/de_DE.json                       |  2 +-
 src/i18n/strings/en_EN.json                       |  6 +++++-
 src/i18n/strings/pt.json                          |  2 +-
 src/i18n/strings/pt_BR.json                       |  2 +-
 src/i18n/strings/ru.json                          |  2 +-
 30 files changed, 31 insertions(+), 78 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 5edeba7625..c36ca382f2 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -145,7 +145,6 @@ function _setCallListeners(call) {
             Modal.createDialog(ErrorDialog, {
                 title: _t('Call Timeout'),
                 description: _t('The remote side failed to pick up') + '.',
-                button: _t("OK"),
             });
         }
         else if (oldState === "invite_sent") {
@@ -207,7 +206,6 @@ function _onAction(payload) {
                 Modal.createDialog(ErrorDialog, {
                     title: _t('Unable to capture screen'),
                     description: screenCapErrorString,
-                    button: _t("OK"),
                 });
                 return;
             }
@@ -228,7 +226,6 @@ function _onAction(payload) {
                 Modal.createDialog(ErrorDialog, {
                     title: _t('Existing Call'),
                     description: _t('You are already in a call') + '.',
-                    button: _t("OK"),
                 });
                 return; // don't allow >1 call to be placed.
             }
@@ -239,7 +236,6 @@ function _onAction(payload) {
                 Modal.createDialog(ErrorDialog, {
                     title: _t('VoIP is unsupported'),
                     description: _t('You cannot place VoIP calls in this browser') + '.',
-                    button: _t("OK"),
                 });
                 return;
             }
@@ -255,8 +251,6 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     description: _t('You cannot place a call with yourself') + '.',
-                    title: _t("Error"),
-                    button: _t("OK"),
                 });
                 return;
             }
@@ -283,8 +277,6 @@ function _onAction(payload) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
                     description: _t('Conference calls are not supported in this client'),
-                    title: _t("Error"),
-                    button: _t("OK"),
                 });
             }
             else if (!MatrixClientPeg.get().supportsVoip()) {
@@ -292,7 +284,6 @@ function _onAction(payload) {
                 Modal.createDialog(ErrorDialog, {
                     title: _t('VoIP is unsupported'),
                     description: _t('You cannot place VoIP calls in this browser') + '.',
-                    button: _t("OK"),
                 });
             }
             else if (MatrixClientPeg.get().isRoomEncrypted(payload.room_id)) {
@@ -304,17 +295,14 @@ function _onAction(payload) {
                 // Therefore we disable conference calling in E2E rooms.
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 Modal.createDialog(ErrorDialog, {
-                    title: _t("Error"),
-                    button: _t("OK"),
                     description: _t('Conference calls are not supported in encrypted rooms'),
                 });
             }
             else {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
-                    title: _t('Warning') + '!',
+                    title: _t('Warning!'),
                     description: _t('Conference calling is in development and may not be reliable') + '.',
-                    button: _t("OK"),
                     onFinished: confirm=>{
                         if (confirm) {
                             ConferenceHandler.createNewMatrixCall(
@@ -327,7 +315,6 @@ function _onAction(payload) {
                                 Modal.createDialog(ErrorDialog, {
                                     title: _t('Failed to set up conference call'),
                                     description: _t('Conference call failed') + '. ' + ((err && err.message) ? err.message : ''),
-                                    button: _t("OK"),
                                 });
                             });
                         }
diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index d4f8cae276..315c312b9f 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -356,7 +356,6 @@ class ContentMessages {
                 Modal.createDialog(ErrorDialog, {
                     title: _t('Upload Failed'),
                     description: desc,
-                    button: _t("OK"),
                 });
             }
         }).finally(() => {
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 645ca6e8fe..366604eaee 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -71,7 +71,6 @@ const commands = {
         Modal.createDialog(ErrorDialog, {
             title: _t('/ddg is not a command'),
             description: _t('To use it, just wait for autocomplete results to load and tab through them') + '.',
-			button: _t("OK"),
         });
         return success();
     }),
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a00d9c22ce..2ba1506551 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -378,7 +378,6 @@ module.exports = React.createClass({
                 Modal.createDialog(QuestionDialog, {
                     title: _t('Reject invitation'),
                     description: _t('Are you sure you want to reject the invitation?'),
-                    button: "OK",
                     onFinished: (confirm) => {
                         if (confirm) {
                             // FIXME: controller shouldn't be loading a view :(
@@ -395,7 +394,6 @@ module.exports = React.createClass({
                                 Modal.createDialog(ErrorDialog, {
                                     title:  _t('Failed to reject invitation'),
                                     description: err.toString(),
-                                    button: _t("OK"),
                                 });
                             });
                         }
@@ -895,7 +893,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t('Signed Out'),
                 description: _t('For security, this session has been signed out. Please sign in again.'),
-                button: _t("OK"),
             });
             dis.dispatch({
                 action: 'logout',
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f0b6160012..badc7cd01d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -531,7 +531,7 @@ module.exports = React.createClass({
         if (!userHasUsedEncryption) {
             const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
             Modal.createDialog(QuestionDialog, {
-                title: _t("Warning") + "!",
+                title: _t("Warning!"),
                 hasCancelButton: false,
                 description: (
                     <div>
@@ -541,7 +541,6 @@ module.exports = React.createClass({
                         <p>{ _t("Encrypted messages will not be visible on clients that do not yet implement encryption") }.</p>
                     </div>
                 ),
-                button: "OK",
             });
         }
         if (localStorage) {
@@ -882,7 +881,6 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Failed to join room"),
                     description: msg,
-                    button: _t("OK"),
                 });
             }
         }).done();
@@ -964,7 +962,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t('Failed to upload file'),
                 description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or the file too big")),
-                button: _t("OK"),
             });
         });
     },
@@ -1052,7 +1049,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Search failed"),
                 description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or search timed out :(")),
-                button: _t("OK"),
             });
         }).finally(function() {
             self.setState({
@@ -1180,7 +1176,6 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Failed to save settings"),
                     description: fails.map(function(result) { return result.reason; }).join("\n"),
-                    button: _t("OK"),
                 });
                 // still editing room settings
             }
@@ -1220,7 +1215,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Error"),
                 description: _t("Failed to forget room %(errCode)s", { errCode: errCode }),
-                button: _t("OK"),
             });
         });
     },
@@ -1243,7 +1237,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Failed to reject invite"),
                 description: msg,
-                button: _t("OK"),
             });
 
             self.setState({
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 5719964df5..60c8c25114 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -914,7 +914,6 @@ var TimelinePanel = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Failed to load timeline position"),
                 description: message,
-                button: _t("OK"),
                 onFinished: onFinished,
             });
         };
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b669898cd7..b2bf693cfe 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -249,7 +249,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Can't load user settings"),
                 description: ((error && error.message) ? error.message : _t("Server may be unavailable or overloaded")),
-                button: _t("OK"),
             });
         });
     },
@@ -292,7 +291,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Failed to set avatar"),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
-                button: _t("OK")
             });
         });
     },
@@ -335,7 +333,6 @@ module.exports = React.createClass({
         Modal.createDialog(ErrorDialog, {
             title: _t("Error"),
             description: errMsg,
-            button: _t("OK"),
         });
     },
 
@@ -344,7 +341,6 @@ module.exports = React.createClass({
         Modal.createDialog(ErrorDialog, {
             title: _t("Success"),
             description: _t("Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them") + ".",
-            button: _t("OK"),
         });
     },
 
@@ -372,7 +368,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Invalid Email Address"),
                 description: _t("This doesn't appear to be a valid email address"),
-                button: _t("OK"),
             });
             return;
         }
@@ -392,7 +387,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Unable to add email address"),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
-                button: _t("OK"),
             });
         });
         ReactDOM.findDOMNode(this.refs.add_email_input).blur();
@@ -418,7 +412,6 @@ module.exports = React.createClass({
                         Modal.createDialog(ErrorDialog, {
                             title: _t("Unable to remove contact information"),
                             description: ((err && err.message) ? err.message : _t("Operation failed")),
-                            button: _t("OK"),
                         });
                     }).done();
                 }
@@ -460,7 +453,6 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Unable to verify email address"),
                     description: ((err && err.message) ? err.message : _t("Operation failed")),
-                    button: _t("OK"),
                 });
             }
         });
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index 5438b123c3..c7dc35c1a8 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -90,7 +90,7 @@ module.exports = React.createClass({
         else {
             var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
             Modal.createDialog(QuestionDialog, {
-                title: _t('Warning'),
+                title: _t('Warning!'),
                 description:
                     <div>
                         { _t(
@@ -157,7 +157,6 @@ module.exports = React.createClass({
         Modal.createDialog(ErrorDialog, {
             title: title,
             description: body,
-            button: _t("OK"),
         });
     },
 
diff --git a/src/components/views/dialogs/ChatInviteDialog.js b/src/components/views/dialogs/ChatInviteDialog.js
index 81d032683e..ca0f10bc6b 100644
--- a/src/components/views/dialogs/ChatInviteDialog.js
+++ b/src/components/views/dialogs/ChatInviteDialog.js
@@ -307,7 +307,6 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite",
                     description: ((err && err.message) ? err.message : "Operation failed"),
-                    button: _t("OK"),
                 });
                 return null;
             })
@@ -321,7 +320,6 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite user",
                     description: ((err && err.message) ? err.message : "Operation failed"),
-                    button: _t("OK"),
                 });
                 return null;
             })
@@ -343,7 +341,6 @@ module.exports = React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: "Failed to invite",
                     description: ((err && err.message) ? err.message : "Operation failed"),
-                    button: _t("OK"),
                 });
                 return null;
             })
@@ -403,7 +400,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: "Failed to invite the following users to the " + room.name + " room:",
                 description: errorList.join(", "),
-                button: _t("OK"),
             });
         }
         return addrs;
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index fb7286e304..bf48d1757b 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -27,6 +27,7 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 
 export default React.createClass({
     displayName: 'ErrorDialog',
@@ -44,6 +45,9 @@ export default React.createClass({
     getDefaultProps: function() {
         return {
             focus: true,
+            title: null,
+            description: null,
+            button: null,
         };
     },
 
@@ -57,13 +61,13 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
-                    title={this.props.title}>
+                    title={this.props.title || _t('Error')}>
                 <div className="mx_Dialog_content">
-                    {this.props.description}
+                    {this.props.description || _t('An error has occurred.')}
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button ref="button" className="mx_Dialog_primary" onClick={this.props.onFinished}>
-                        {this.props.button}
+                        {this.props.button || _t('OK')}
                     </button>
                 </div>
             </BaseDialog>
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index f0eeead29a..51561270c4 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -20,6 +20,7 @@ import Matrix from 'matrix-js-sdk';
 import React from 'react';
 
 import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 
 import AccessibleButton from '../elements/AccessibleButton';
 
@@ -99,7 +100,7 @@ export default React.createClass({
         return (
             <BaseDialog className="mx_InteractiveAuthDialog"
                 onFinished={this.props.onFinished}
-                title={this.state.authError ? 'Error' : this.props.title}
+                title={this.state.authError ? 'Error' : (this.props.title || _t('Authentication'))}
             >
                 {content}
             </BaseDialog>
diff --git a/src/components/views/dialogs/NeedToRegisterDialog.js b/src/components/views/dialogs/NeedToRegisterDialog.js
index 875af6a7fd..4a07a65529 100644
--- a/src/components/views/dialogs/NeedToRegisterDialog.js
+++ b/src/components/views/dialogs/NeedToRegisterDialog.js
@@ -26,6 +26,7 @@ limitations under the License.
 import React from 'react';
 import dis from '../../../dispatcher';
 import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'NeedToRegisterDialog',
@@ -52,10 +53,10 @@ module.exports = React.createClass({
         return (
             <BaseDialog className="mx_NeedToRegisterDialog"
                 onFinished={this.props.onFinished}
-                title={this.props.title}
+                title={this.props.title || _t('Registration required')}
             >
                 <div className="mx_Dialog_content">
-                    {this.props.description}
+                    {this.props.description || _t('A registered account is required for this action')}
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button className="mx_Dialog_primary" onClick={this.props.onFinished} autoFocus={true}>
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index e3d38922ee..bd7046232b 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.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: 'QuestionDialog',
@@ -63,7 +64,7 @@ export default React.createClass({
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button className="mx_Dialog_primary" onClick={this.onOk} autoFocus={this.props.focus}>
-                        {this.props.button}
+                        {this.props.button || _t('OK')}
                     </button>
                     {this.props.extraButtons}
                     {cancelButton}
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index e55a224531..7ca5de72cd 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -100,7 +100,7 @@ module.exports = React.createClass({
             if (this.refs.email.value == '') {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
-                    title: "Warning",
+                    title: "Warning!",
                     description:
                         <div>
                             If you don't specify an email address, you won't be able to reset your password.<br/>
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index d8766c637d..b5ef1d8309 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -157,7 +157,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t('Invalid alias format'),
                 description: _t('"%(alias)s" is not a valid format for an alias', { alias: alias }),
-                button: _t('OK'),
             });
         }
     },
@@ -174,7 +173,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t('Invalid address format'),
                 description: _t('"%(alias)s" is not a valid format for an address', { alias: alias }),
-                button: _t('OK'),
             });
         }
     },
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index e76d5387d6..86d39f91ec 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -244,7 +244,6 @@ module.exports = WithMatrixClient(React.createClass({
                         Modal.createDialog(ErrorDialog, {
                             title: _t("Failed to kick"),
                             description: ((err && err.message) ? err.message : "Operation failed"),
-                            button: _t("OK"),
                         });
                     }
                 ).finally(()=>{
@@ -287,7 +286,6 @@ module.exports = WithMatrixClient(React.createClass({
                         Modal.createDialog(ErrorDialog, {
                             title: _t("Error"),
                             description: _t("Failed to ban user"),
-                            button: _t("OK"),
                         });
                     }
                 ).finally(()=>{
@@ -338,7 +336,6 @@ module.exports = WithMatrixClient(React.createClass({
                     Modal.createDialog(ErrorDialog, {
                         title: _t("Error"),
                         description: _t("Failed to mute user"),
-                        button: _t("OK"),
                     });
                 }
             ).finally(()=>{
@@ -388,7 +385,6 @@ module.exports = WithMatrixClient(React.createClass({
                     Modal.createDialog(ErrorDialog, {
                         title: _t("Error"),
                         description: _t("Failed to toggle moderator status"),
-                        button: _t("OK"),
                     });
                 }
             }
@@ -410,7 +406,6 @@ module.exports = WithMatrixClient(React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Error"),
                     description: _t("Failed to change power level"),
-                    button: _t("OK"),
                 });
             }
         ).finally(()=>{
@@ -438,7 +433,7 @@ module.exports = WithMatrixClient(React.createClass({
             if (parseInt(myPower) === parseInt(powerLevel)) {
                 var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createDialog(QuestionDialog, {
-                    title: _t("Warning"),
+                    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/>
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 488d3cc287..99b16413b5 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -127,7 +127,6 @@ export default class MessageComposer extends React.Component {
                     </ul>
                 </div>
             ),
-            button: _t("OK"),
             onFinished: (shouldUpload) => {
                 if(shouldUpload) {
                     // MessageComposer shouldn't have to rely on its parent passing in a callback to upload a file
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index c52f9724b0..a79f71c92d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -507,7 +507,6 @@ export default class MessageComposerInput extends React.Component {
                     Modal.createDialog(ErrorDialog, {
                         title: _t("Server error"),
                         description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."),
-                        button: _t("OK"),
                     });
                 });
             }
@@ -517,7 +516,6 @@ export default class MessageComposerInput extends React.Component {
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Command error"),
                     description: cmd.error,
-                    button: _t("OK"),
                 });
             }
             return true;
diff --git a/src/components/views/rooms/MessageComposerInputOld.js b/src/components/views/rooms/MessageComposerInputOld.js
index 9b4efa272c..b664ef4bd3 100644
--- a/src/components/views/rooms/MessageComposerInputOld.js
+++ b/src/components/views/rooms/MessageComposerInputOld.js
@@ -297,7 +297,6 @@ export default React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Unknown command"),
                     description: _t("Usage") + ": /markdown on|off",
-                    button: _t("OK"),
                 });
             }
             return;
@@ -318,7 +317,6 @@ export default React.createClass({
                     Modal.createDialog(ErrorDialog, {
                         title: _t("Server error"),
                         description: ((err && err.message) ? err.message : _t("Server unavailable, overloaded, or something else went wrong") + "."),
-                        button: _t("OK"),
                     });
                 });
             }
@@ -328,7 +326,6 @@ export default React.createClass({
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Command error"),
                     description: cmd.error,
-                    button: _t("OK"),
                 });
             }
             return;
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index 38bd63e019..c5e3a56922 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -122,7 +122,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Error"),
                 description: _t("Failed to set avatar") + ".",
-                button: _t("OK"),
             });
         }).done();
     },
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index df70513b7a..bff668ac85 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -59,7 +59,6 @@ const BannedUser = React.createClass({
                     Modal.createDialog(ErrorDialog, {
                         title: _t('Error'),
                         description: _t('Failed to unban'),
-                        button: _t("OK"),
                     });
                 }).done();
             },
@@ -530,7 +529,6 @@ module.exports = React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t('Error'),
                 description: _t("Failed to forget room %(errCode)s", { errCode: errCode }),
-                button: _t("OK"),
             });
         });
     },
@@ -540,7 +538,7 @@ module.exports = React.createClass({
 
         var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
-            title: _t('Warning') + '!',
+            title: _t('Warning!'),
             description: (
                 <div>
                     <p>{ _t('End-to-end encryption is in beta and may not be reliable') }.</p>
@@ -550,7 +548,6 @@ module.exports = React.createClass({
                     <p>{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.</p>
                 </div>
             ),
-            button: "OK",
             onFinished: confirm=>{
                 if (!confirm) {
                     this.refs.encrypt.checked = false;
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 697a539bcd..1fdd06cf00 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -85,7 +85,6 @@ export default WithMatrixClient(React.createClass({
             Modal.createDialog(ErrorDialog, {
                 title: _t("Error"),
                 description: msg,
-                button: _t("OK"),
             });
         }).finally(() => {
             if (this._unmounted) return;
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index e0fe6ce56a..33091f9c71 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -70,7 +70,7 @@ module.exports = React.createClass({
 
         var QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
-            title: _t("Warning"),
+            title: _t("Warning!"),
             description:
                 <div>
                     { _t(
diff --git a/src/createRoom.js b/src/createRoom.js
index fe148f0408..0a21f68208 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -107,7 +107,6 @@ function createRoom(opts) {
         Modal.createDialog(ErrorDialog, {
             title: _t("Failure to create room"),
             description: _t("Server may be unavailable, overloaded, or you hit a bug") + ".",
-            button: _t("OK"),
         });
         return null;
     });
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 26889c3bb6..2b30593a4c 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -48,7 +48,7 @@
     "Create a new account": "Oprette en ny bruger",
     "Send an encrypted message": "Send en krypteret meddelelse",
     "Send a message (unencrypted)": "Send en meddelelse (ukrypteret)",
-    "Warning": "Advarsel",
+    "Warning!": "Advarsel!",
     "accept": "acceptere",
     "accepted an invitation": "Godkendt en invitation",
     "accepted the invitation for": "Accepteret invitationen til",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index bf55379d6d..421a8e1f41 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -48,7 +48,7 @@
     "Create a new account": "Erstelle einen neuen Benutzer",
     "Send an encrypted message": "Sende eine verschlüsselte Nachricht",
     "Send a message (unencrypted)": "Sende eine Nachricht (unverschlüsselt)",
-    "Warning": "Warnung",
+    "Warning!": "Warnung!",
     "Direct Chat": "Privater Chat",
     "Error": "Fehler",
     "accept": "akzeptiere",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e8fffbe80d..8f0a8018b0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -121,6 +121,7 @@
   "zh-sg":"Chinese (Singapore)",
   "zh-tw":"Chinese (Taiwan)",
   "zu":"Zulu",
+  "A registered account is required for this action": "A registered account is required for this action",
   "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
   "accept": "accept",
   "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation",
@@ -132,6 +133,7 @@
   "Admin": "Admin",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
+  "Authentication": "Authentication",
   "all room members": "all room members",
   "all room members, from the point they are invited": "all room members, from the point they are invited",
   "all room members, from the point they joined": "all room members, from the point they joined",
@@ -149,6 +151,7 @@
   "A new password must be entered.": "A new password must be entered.",
   "%(senderName)s answered the call": "%(senderName)s answered the call",
   "anyone.": "anyone",
+  "An error has occurred.": "An error has occurred.",
   "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
   "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
   "Are you sure?": "Are you sure?",
@@ -371,6 +374,7 @@
   "Reason": "Reason",
   "Revoke Moderator": "Revoke Moderator",
   "Refer a friend to Riot": "Refer a friend to Riot",
+  "Registration required": "Registration required",
   "rejected": "rejected",
   "%(targetName)s rejected the invitation": "%(targetName)s rejected the invitation",
   "Reject invitation": "Reject invitation",
@@ -513,7 +517,7 @@
   "VoIP conference started": "VoIP conference started",
   "VoIP is unsupported": "VoIP is unsupported",
   "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
-  "Warning": "Warning",
+  "Warning!": "Warning!",
   "Who can access this room?": "Who can access this room?",
   "Who can read history?": "Who can read history?",
   "Who would you like to add to this room?": "Who would you like to add to this room?",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 60ab244401..e19d261997 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -257,7 +257,7 @@
     "VoIP conference finished": "Conferência VoIP encerrada",
     "VoIP conference started": "Conferência VoIP iniciada",
     "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)",
-    "Warning": "Atenção",
+    "Warning!": "Atenção!",
     "was banned": "banida/o",
     "was invited": "convidada/o",
     "was kicked": "retirada/o da sala",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 3bd74ce14f..47d9271232 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -262,7 +262,7 @@
     "VoIP conference finished": "Conferência VoIP encerrada",
     "VoIP conference started": "Conferência VoIP iniciada",
     "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)",
-    "Warning": "Atenção",
+    "Warning": "Atenção!",
     "was banned": "banida/o",
     "was invited": "convidada/o",
     "was kicked": "retirada/o da sala",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 001a5aca6a..6bd3773861 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -191,7 +191,7 @@
     "VoIP conference finished": "VoIP конференция закончилась",
     "VoIP conference started": "VoIP Конференция стартовала",
     "(warning: cannot be disabled again!)": "(предупреждение: не может быть снова отключен!)",
-    "Warning": "Предупреждение",
+    "Warning!": "Предупреждение!",
     "was banned": "запрещен",
     "was invited": "приглашенный",
     "was kicked": "выброшен",

From 6c41be3c140673e4f59243fa4f20455860c6f3e7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 18:23:15 +0100
Subject: [PATCH 229/312] Missed OKs

---
 src/Notifier.js                            | 1 -
 src/components/views/messages/MFileBody.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Notifier.js b/src/Notifier.js
index 8ab28e667e..eeedbcf365 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -141,7 +141,6 @@ const Notifier = {
                     Modal.createDialog(ErrorDialog, {
                         title: _t('Unable to enable Notifications'),
                         description,
-                        button: _t("OK"),
                     });
                     return;
                 }
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 83b5793c9a..1bb9464999 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -286,7 +286,6 @@ module.exports = React.createClass({
                         Modal.createDialog(ErrorDialog, {
                         	title: _t("Error"),
                             description: _t("Error decrypting attachment"),
-                            button: _t("OK"),
                         });
                     }).finally(() => {
                         decrypting = false;

From c3c291644965203e08b6887fb054ff1bb6919e4d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 18:26:42 +0100
Subject: [PATCH 230/312] Use array literals

---
 src/DateUtils.js | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index be5f432d06..46dda6aeb4 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,32 +19,32 @@ limitations under the License.
 import { _t } from './languageHandler';
 
 function getDaysArray() {
-    var days = [];
-    days.push(_t('Sun'));
-    days.push(_t('Mon'));
-    days.push(_t('Tue'));
-    days.push(_t('Wed'));
-    days.push(_t('Thu'));
-    days.push(_t('Fri'));
-    days.push(_t('Sat'));
-    return days;
+    return [
+        _t('Sun'),
+        _t('Mon'),
+        _t('Tue'),
+        _t('Wed'),
+        _t('Thu'),
+        _t('Fri'),
+        _t('Sat'),
+    ];
 }
 
 function getMonthsArray() {
-    var months = [];
-    months.push(_t('Jan'));
-    months.push(_t('Feb'));
-    months.push(_t('Mar'));
-    months.push(_t('Apr'));
-    months.push(_t('May'));
-    months.push(_t('Jun'));
-    months.push(_t('Jul'));
-    months.push(_t('Aug'));
-    months.push(_t('Sep'));
-    months.push(_t('Oct'));
-    months.push(_t('Nov'));
-    months.push(_t('Dec'));
-    return months;
+    return [
+        _t('Jan'),
+        _t('Feb'),
+        _t('Mar'),
+        _t('Apr'),
+        _t('May'),
+        _t('Jun'),
+        _t('Jul'),
+        _t('Aug'),
+        _t('Sep'),
+        _t('Oct'),
+        _t('Nov'),
+        _t('Dec'),
+    ];
 }
 
 function pad(n) {

From 43d8ccf1287f0efa6bf80d7e8a2f05a5f78ad357 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 19:21:18 +0100
Subject: [PATCH 231/312] Hopefully sort out strings with appended '.'s

---
 src/ScalarMessaging.js      | 22 ++++++++++----------
 src/SlashCommands.js        |  2 +-
 src/TextForEvent.js         | 39 +++++++++++++++++++++++-------------
 src/i18n/strings/da.json    |  4 ++--
 src/i18n/strings/de_DE.json | 40 ++++++++++++++++++-------------------
 src/i18n/strings/en_EN.json | 40 ++++++++++++++++++-------------------
 src/i18n/strings/fr.json    |  2 +-
 src/i18n/strings/pt.json    | 38 +++++++++++++++++------------------
 src/i18n/strings/pt_BR.json | 40 ++++++++++++++++++-------------------
 src/i18n/strings/ru.json    | 26 ++++++++++++------------
 10 files changed, 132 insertions(+), 121 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index b120125e0e..8c591f7cb2 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -151,7 +151,7 @@ function inviteUser(event, roomId, userId) {
     console.log(`Received request to invite ${userId} into room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, _t('You need to be logged in') + '.');
+        sendError(event, _t('You need to be logged in.'));
         return;
     }
     const room = client.getRoom(roomId);
@@ -171,7 +171,7 @@ function inviteUser(event, roomId, userId) {
             success: true,
         });
     }, function(err) {
-        sendError(event, _t('You need to be able to invite users to do that') + '.', err);
+        sendError(event, _t('You need to be able to invite users to do that.'), err);
     });
 }
 
@@ -182,7 +182,7 @@ function setPlumbingState(event, roomId, status) {
     console.log(`Received request to set plumbing state to status "${status}" in room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, _t('You need to be logged in') + '.');
+        sendError(event, _t('You need to be logged in.'));
         return;
     }
     client.sendStateEvent(roomId, "m.room.plumbing", { status : status }).done(() => {
@@ -190,7 +190,7 @@ function setPlumbingState(event, roomId, status) {
             success: true,
         });
     }, (err) => {
-        sendError(event, err.message ? err.message : _t('Failed to send request') + '.', err);
+        sendError(event, err.message ? err.message : _t('Failed to send request.'), err);
     });
 }
 
@@ -198,7 +198,7 @@ function setBotOptions(event, roomId, userId) {
     console.log(`Received request to set options for bot ${userId} in room ${roomId}`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, _t('You need to be logged in') + '.');
+        sendError(event, _t('You need to be logged in.'));
         return;
     }
     client.sendStateEvent(roomId, "m.room.bot.options", event.data.content, "_" + userId).done(() => {
@@ -206,20 +206,20 @@ function setBotOptions(event, roomId, userId) {
             success: true,
         });
     }, (err) => {
-        sendError(event, err.message ? err.message : _t('Failed to send request') + '.', err);
+        sendError(event, err.message ? err.message : _t('Failed to send request.'), err);
     });
 }
 
 function setBotPower(event, roomId, userId, level) {
     if (!(Number.isInteger(level) && level >= 0)) {
-        sendError(event, _t('Power level must be positive integer') + '.');
+        sendError(event, _t('Power level must be positive integer.'));
         return;
     }
 
     console.log(`Received request to set power level to ${level} for bot ${userId} in room ${roomId}.`);
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, _t('You need to be logged in') + '.');
+        sendError(event, _t('You need to be logged in.'));
         return;
     }
 
@@ -236,7 +236,7 @@ function setBotPower(event, roomId, userId, level) {
                 success: true,
             });
         }, (err) => {
-            sendError(event, err.message ? err.message : _t('Failed to send request') + '.', err);
+            sendError(event, err.message ? err.message : _t('Failed to send request.'), err);
         });
     });
 }
@@ -259,12 +259,12 @@ function botOptions(event, roomId, userId) {
 function returnStateEvent(event, roomId, eventType, stateKey) {
     const client = MatrixClientPeg.get();
     if (!client) {
-        sendError(event, _t('You need to be logged in') + '.');
+        sendError(event, _t('You need to be logged in.'));
         return;
     }
     const room = client.getRoom(roomId);
     if (!room) {
-        sendError(event, _t('This room is not recognised') + '.');
+        sendError(event, _t('This room is not recognised.'));
         return;
     }
     const stateEvent = room.currentState.getStateEvents(eventType, stateKey);
diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 366604eaee..d2c0eda3ff 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -70,7 +70,7 @@ const commands = {
         // TODO Don't explain this away, actually show a search UI here.
         Modal.createDialog(ErrorDialog, {
             title: _t('/ddg is not a command'),
-            description: _t('To use it, just wait for autocomplete results to load and tab through them') + '.',
+            description: _t('To use it, just wait for autocomplete results to load and tab through them.'),
         });
         return success();
     }),
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 24d79ac3ce..d5a54927a0 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -32,9 +32,9 @@ function textForMemberEvent(ev) {
             var threePidContent = ev.getContent().third_party_invite;
             if (threePidContent) {
                 if (threePidContent.display_name) {
-                    return _t('%(targetName)s accepted the invitation for %(displayName)s', {targetName: targetName, displayName: threePidContent.display_name}) + ".";
+                    return _t('%(targetName)s accepted the invitation for %(displayName)s.', {targetName: targetName, displayName: threePidContent.display_name});
                 } else {
-                    return _t('%(targetName)s accepted an invitation', {targetName: targetName}) + '.';
+                    return _t('%(targetName)s accepted an invitation.', {targetName: targetName});
                 }
             }
             else {
@@ -42,11 +42,14 @@ function textForMemberEvent(ev) {
                     return _t('%(senderName)s requested a VoIP conference', {senderName: senderName});
                 }
                 else {
-                    return _t('%(senderName)s invited %(targetName)s', {senderName: senderName, targetName: targetName}) + '.';
+                    return _t('%(senderName)s invited %(targetName)s.', {senderName: senderName, targetName: targetName});
                 }
             }
         case 'ban':
-            return _t('%(senderName)s banned %(targetName)s', {senderName: senderName, targetName: targetName}) + '. ' + reason;
+            return _t(
+                '%(senderName)s banned %(targetName)s. %(reason)s.',
+                {senderName: senderName, targetName: targetName, reason: reason}
+            );
         case 'join':
             if (ev.getPrevContent() && ev.getPrevContent().membership == 'join') {
                 if (ev.getPrevContent().displayname && ev.getContent().displayname && ev.getPrevContent().displayname != ev.getContent().displayname) {
@@ -71,7 +74,7 @@ function textForMemberEvent(ev) {
                     return _t('VoIP conference started');
                 }
                 else {
-                    return _t('%(targetName)s joined the room', {targetName: targetName}) + '.';
+                    return _t('%(targetName)s joined the room.', {targetName: targetName});
                 }
             }
         case 'leave':
@@ -80,23 +83,29 @@ function textForMemberEvent(ev) {
                     return _t('VoIP conference finished');
                 }
                 else if (ev.getPrevContent().membership === "invite") {
-                    return _t('%(targetName)s rejected the invitation', {targetName: targetName}) + '.';
+                    return _t('%(targetName)s rejected the invitation.', {targetName: targetName});
                 }
                 else {
-                    return _t('%(targetName)s left the room', {targetName: targetName}) + '.';
+                    return _t('%(targetName)s left the room.', {targetName: targetName});
                 }
             }
             else if (ev.getPrevContent().membership === "ban") {
-                return _t('%(senderName)s unbanned %(targetName)s', {senderName: senderName, targetName: targetName}) + '.';
+                return _t('%(senderName)s unbanned %(targetName)s.', {senderName: senderName, targetName: targetName}) + '.';
             }
             else if (ev.getPrevContent().membership === "join") {
-                return _t('%(senderName)s kicked %(targetName)s', {senderName: senderName, targetName: targetName}) + '. ' + reason;
+                return _t(
+                    '%(senderName)s kicked %(targetName)s. %(reason)s',
+                    {senderName: senderName, targetName: targetName, reason}
+                );
             }
             else if (ev.getPrevContent().membership === "invite") {
-                return _t('%(senderName)s withdrew %(targetName)s\'s inivitation', {senderName: senderName, targetName: targetName}) + '. ' + reason;
+                return _t(
+                    '%(senderName)s withdrew %(targetName)s\'s inivitation. %(reason)s',
+                    {senderName: senderName, targetName: targetName, reason: reason}
+                );
             }
             else {
-                return _t('%(targetName)s left the room', {targetName: targetName}) + '.';
+                return _t('%(targetName)s left the room.', {targetName: targetName});
             }
     }
 }
@@ -118,7 +127,7 @@ function textForMessageEvent(ev) {
     if (ev.getContent().msgtype === "m.emote") {
         message = "* " + senderDisplayName + " " + message;
     } else if (ev.getContent().msgtype === "m.image") {
-        message = _t('%(senderDisplayName)s sent an image', {senderDisplayName: senderDisplayName}) + '.';
+        message = _t('%(senderDisplayName)s sent an image.', {senderDisplayName: senderDisplayName});
     }
     return message;
 }
@@ -144,17 +153,18 @@ function textForCallInviteEvent(event) {
         type = "video";
     }
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('%(senderName)s placed a %(callType)s call', {senderName: senderName, callType: type}) + '. ' + supported;
+    return _t('%(senderName)s placed a %(callType)s call.', {senderName: senderName, callType: type}) + '. ' + supported;
 }
 
 function textForThreePidInviteEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room', {senderName: senderName, targetDisplayName: event.getContent().display_name}) + ".";
+    return _t('%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.', {senderName: senderName, targetDisplayName: event.getContent().display_name});
 }
 
 function textForHistoryVisibilityEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
     var vis = event.getContent().history_visibility;
+    // XXX: This i18n just isn't going to work for languages with different sentence structure.
     var text = _t('%(senderName)s made future room history visible to', {senderName: senderName}) + ' ';
     if (vis === "invited") {
         text += _t('all room members, from the point they are invited') + '.';
@@ -199,6 +209,7 @@ function textForPowerEvent(event) {
         }
     );
     let diff = [];
+    // XXX: This is also surely broken for i18n
     users.forEach((userId) => {
         // Previous power level
         const from = event.getPrevContent().users[userId];
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 2b30593a4c..13491eb0b9 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -133,11 +133,11 @@
     "da": "Dansk",
     "ru": "Russisk",
     "%(targetName)s accepted an invitation": "%(targetName)s accepterede en invitation",
-    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepteret invitationen til %(displayName)s",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepteret invitationen til %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s og %(lastPerson)s er ved at skrive",
     "%(names)s and one other are typing": "%(names)s og den anden skriver",
     "%(names)s and %(count)s others are typing": "%(names)s og %(count)s andre skriver",
-    "%(senderName)s answered the call": "%(senderName)s besvarede opkaldet",
+    "%(senderName)s answered the call.": "%(senderName)s besvarede opkaldet.",
     "af": "Afrikaans",
     "ar-eg": "Arabisk (Egypten)",
     "ar-ma": "Arabisk (Marokko)",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 421a8e1f41..90395a08c0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -349,54 +349,54 @@
     "To send events of type": "Zum Senden von Ereignissen mit Typ",
     "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
     "%(targetName)s accepted an invitation": "%(targetName)s akzeptierte eine Einladung",
-    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s akzeptierte eine Einladung für %(displayName)s",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akzeptierte eine Einladung für %(displayName)s.",
     "%(names)s and one other are typing": "%(names)s und eine weitere Person tippen",
     "%(names)s and %(count)s others are typing": "%(names)s und %(count)s weitere Personen tippen",
-    "%(senderName)s answered the call": "%(senderName)s beantwortete den Anruf",
-    "%(senderName)s banned %(targetName)s": "%(senderName)s bannte %(targetName)s",
+    "%(senderName)s answered the call.": "%(senderName)s beantwortete den Anruf.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannte %(targetName)s.",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s änderte den Anzeigenamen von %(oldDisplayName)s zu %(displayName)s",
     "%(senderName)s changed their profile picture": "%(senderName)s änderte das Profilbild",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s",
     "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s",
     "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s änderte das Thema zu %(topic)s",
     "/ddg is not a command": "/ddg ist kein Kommando",
-    "%(senderName)s ended the call": "%(senderName)s beendete den Anruf",
+    "%(senderName)s ended the call.": "%(senderName)s beendete den Anruf.",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
-    "Failed to send request": "Anfrage zu senden schlug fehl",
+    "Failed to send request.": "Anfrage zu senden schlug fehl.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
-    "%(senderName)s invited %(targetName)s": "%(senderName)s lud %(targetName)s ein",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s lud %(targetName)s ein.",
     "%(displayName)s is typing": "%(displayName)s tippt",
-    "%(targetName)s joined the room": "%(targetName)s trat dem Raum bei",
-    "%(senderName)s kicked %(targetName)s": "%(senderName)s kickte %(targetName)s",
-    "%(targetName)s left the room": "%(targetName)s verließ den Raum",
+    "%(targetName)s joined the room.": "%(targetName)s trat dem Raum bei.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickte %(targetName)s.",
+    "%(targetName)s left the room.": "%(targetName)s verließ den Raum.",
     "%(senderName)s made future room history visible to": "%(senderName)s machte die zukünftige Raumhistorie sichtbar für",
     "Missing room_id in request": "Fehlende room_id in Anfrage",
     "Missing user_id in request": "Fehlende user_id in Anfrage",
     "Must be viewing a room": "Muss einen Raum ansehen",
     "New Composer & Autocomplete": "Neuer Eingabeverarbeiter & Autovervollständigung",
     "(not supported by this browser)": "(nicht von diesem Browser unterstützt)",
-    "%(senderName)s placed a %(callType)s call": "%(senderName)s startete einen %(callType)s-Anruf",
-    "Power level must be positive integer": "Berechtigungslevel muss eine positive Zahl sein",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startete einen %(callType)s-Anruf.",
+    "Power level must be positive integer.": "Berechtigungslevel muss eine positive Zahl sein.",
     "Reason": "Grund",
-    "%(targetName)s rejected the invitation": "%(targetName)s lehnte die Einladung ab",
+    "%(targetName)s rejected the invitation.": "%(targetName)s lehnte die Einladung ab.",
     "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s löschte den Anzeigenamen (%(oldDisplayName)s)",
     "%(senderName)s removed their profile picture": "%(senderName)s löschte das Profilbild",
     "%(senderName)s requested a VoIP conference": "%(senderName)s fragte nach einer VoIP-Konferenz",
     "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
-    "%(senderDisplayName)s sent an image": "%(senderDisplayName)s hat ein Bild gesendet",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s sandte eine Einladung an %(targetDisplayName)s um diesem Raum beizutreten",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sandte eine Einladung an %(targetDisplayName)s um diesem Raum beizutreten.",
     "%(senderName)s set a profile picture": "%(senderName)s setzte ein Profilbild",
     "%(senderName)s set their display name to %(displayName)s": "%(senderName)s setzte den Anzeigenamen zu %(displayName)s",
-    "This room is not recognised": "Dieser Raum wurde nicht erkannt",
+    "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
     "These are experimental features that may break in unexpected ways": "Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können",
-    "To use it, just wait for autocomplete results to load and tab through them": "Um dies zu nutzen, warte auf die Autovervollständigungsergebnisse und benutze die TAB Taste",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Um dies zu nutzen, warte auf die Autovervollständigungsergebnisse und benutze die TAB Taste.",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s schaltete Ende-zu-Ende-Verschlüsselung ein (Algorithmus: %(algorithm)s)",
-    "%(senderName)s unbanned %(targetName)s": "%(senderName)s zog Bann für %(targetName)s zurück",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s zog Bann für %(targetName)s zurück.",
     "Usage": "Verwendung",
     "Use with caution": "Mit Vorsicht benutzen",
-    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s zog die Einladung für %(targetName)s zurück",
-    "You need to be able to invite users to do that": "Du musst in der Lage sein Nutzer einzuladen um dies zu tun",
-    "You need to be logged in": "Du musst angemeldet sein",
+    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s zog die Einladung für %(targetName)s zurück.",
+    "You need to be able to invite users to do that.": "Du musst in der Lage sein Nutzer einzuladen um dies zu tun.",
+    "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
     "Error changing language": "Fehler beim Ändern der Sprache",
     "Riot was unable to find the correct Data for the selected Language.": "Riot war nicht in der Lage die korrekten Daten für die ausgewählte Sprache zu finden.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8f0a8018b0..9c69233692 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -125,7 +125,7 @@
   "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
   "accept": "accept",
   "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation",
-  "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s accepted the invitation for %(displayName)s",
+  "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
   "Account": "Account",
   "Access Token:": "Access Token:",
   "Add email address": "Add email address",
@@ -149,7 +149,7 @@
   "%(names)s and %(count)s others are typing": "%(names)s and %(count)s others are typing",
   "An email has been sent to": "An email has been sent to",
   "A new password must be entered.": "A new password must be entered.",
-  "%(senderName)s answered the call": "%(senderName)s answered the call",
+  "%(senderName)s answered the call.": "%(senderName)s answered the call.",
   "anyone.": "anyone",
   "An error has occurred.": "An error has occurred.",
   "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -159,7 +159,7 @@
   "Are you sure you want upload the following files?": "Are you sure you want upload the following files?",
   "Attachment": "Attachment",
   "Autoplay GIFs and videos": "Autoplay GIFs and videos",
-  "%(senderName)s banned %(targetName)s": "%(senderName)s banned %(targetName)s",
+  "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)s.",
   "Ban": "Ban",
   "Banned users": "Banned users",
   "Bans user with given id": "Bans user with given id",
@@ -233,7 +233,7 @@
   "Enable encryption": "Enable encryption",
   "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
   "Encrypted room": "Encrypted room",
-  "%(senderName)s ended the call": "%(senderName)s ended the call",
+  "%(senderName)s ended the call.": "%(senderName)s ended the call.",
   "End-to-end encryption information": "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",
   "Enter Code": "Enter Code",
@@ -257,7 +257,7 @@
   "Failed to reject invitation": "Failed to reject invitation",
   "Failed to save settings": "Failed to save settings",
   "Failed to send email": "Failed to send email",
-  "Failed to send request": "Failed to send request",
+  "Failed to send request.": "Failed to send request.",
   "Failed to set display name": "Failed to set display name",
   "Failed to set up conference call": "Failed to set up conference call",
   "Failed to toggle moderator status": "Failed to toggle moderator status",
@@ -291,7 +291,7 @@
   "Invalid alias format": "Invalid alias format",
   "Invalid address format": "Invalid address format",
   "Invalid Email Address": "Invalid Email Address",
-  "%(senderName)s invited %(targetName)s": "%(senderName)s invited %(targetName)s",
+  "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
   "Invite new room members": "Invite new room members",
   "Invites": "Invites",
   "Invites user with given id to current room": "Invites user with given id to current room",
@@ -303,16 +303,16 @@
   "Join Room": "Join Room",
   "joined and left": "joined and left",
   "joined": "joined",
-  "%(targetName)s joined the room": "%(targetName)s joined the room",
+  "%(targetName)s joined the room.": "%(targetName)s joined the room.",
   "Joins room with given alias": "Joins room with given alias",
-  "%(senderName)s kicked %(targetName)s": "%(senderName)s kicked %(targetName)s",
+  "%(senderName)s kicked %(targetName)s.": "%(senderName)s kicked %(targetName)s.",
   "Kick": "Kick",
   "Kicks user with given id": "Kicks user with given id",
   "Labs": "Labs",
   "Leave room": "Leave room",
   "left and rejoined": "left and rejoined",
   "left": "left",
-  "%(targetName)s left the room": "%(targetName)s left the room",
+  "%(targetName)s left the room.": "%(targetName)s left the room.",
   "Level": "Level",
   "Local addresses for this room:": "Local addresses for this room:",
   "Logged in as:": "Logged in as:",
@@ -363,10 +363,10 @@
   "People": "People",
   "Permissions": "Permissions",
   "Phone": "Phone",
-  "%(senderName)s placed a %(callType)s call": "%(senderName)s placed a %(callType)s call",
+  "%(senderName)s placed a %(callType)s call.": "%(senderName)s placed a %(callType)s call.",
   "Please check your email and click on the link it contains. Once this is done, click continue.": "Please check your email and click on the link it contains. Once this is done, click continue.",
   "Please Register": "Please Register",
-  "Power level must be positive integer": "Power level must be positive integer",
+  "Power level must be positive integer.": "Power level must be positive integer.",
   "Press": "Press",
   "Privacy warning": "Privacy warning",
   "Privileged Users": "Privileged Users",
@@ -376,7 +376,7 @@
   "Refer a friend to Riot": "Refer a friend to Riot",
   "Registration required": "Registration required",
   "rejected": "rejected",
-  "%(targetName)s rejected the invitation": "%(targetName)s rejected the invitation",
+  "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
   "Reject invitation": "Reject invitation",
   "Remove Contact Information?": "Remove Contact Information?",
   "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removed their display name (%(oldDisplayName)s)",
@@ -405,8 +405,8 @@
   "Sender device information": "Sender device information",
   "Send Invites": "Send Invites",
   "Send Reset Email": "Send Reset Email",
-  "%(senderDisplayName)s sent an image": "%(senderDisplayName)s sent an image",
-  "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room",
+  "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
+  "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
   "sent a video": "sent a video",
   "Server error": "Server error",
   "Server may be unavailable or overloaded": "Server may be unavailable or overloaded",
@@ -445,7 +445,7 @@
   "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
   "The remote side failed to pick up": "The remote side failed to pick up",
   "This room has no local addresses": "This room has no local addresses",
-  "This room is not recognised": "This room is not recognised",
+  "This room is not recognised.": "This room is not recognised.",
   "This room is private or inaccessible to guests. You may be able to join if you register": "This room is private or inaccessible to guests. You may be able to join if you register",
   "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
   "The visibility of existing history will be unchanged": "The visibility of existing history will be unchanged",
@@ -474,7 +474,7 @@
   "to start a chat with someone": "to start a chat with someone",
   "to tag as %(tagName)s": "to tag as %(tagName)s",
   "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",
+  "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.",
   "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 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": "Tried to load a specific point in this room's timeline, but was unable to find it",
   "Turn Markdown off": "Turn Markdown off",
@@ -485,7 +485,7 @@
   "Unable to restore previous session": "Unable to restore previous session",
   "Unable to verify email address": "Unable to verify email address",
   "Unban": "Unban",
-  "%(senderName)s unbanned %(targetName)s": "%(senderName)s unbanned %(targetName)s",
+  "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
   "Unable to capture screen": "Unable to capture screen",
   "Unable to enable Notifications": "Unable to enable Notifications",
   "Unable to load device list": "Unable to load device list",
@@ -522,7 +522,7 @@
   "Who can read history?": "Who can read history?",
   "Who would you like to add to this room?": "Who would you like to add to this room?",
   "Who would you like to communicate with?": "Who would you like to communicate with?",
-  "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s withdrew %(targetName)s's inivitation",
+  "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s withdrew %(targetName)s's inivitation.",
   "Would you like to": "Would you like to",
   "You are already in a call": "You are already in a call",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
@@ -534,8 +534,8 @@
   "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": "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",
   "You have no visible notifications": "You have no visible notifications",
   "you must be a": "you must be a",
-  "You need to be able to invite users to do that": "You need to be able to invite users to do that",
-  "You need to be logged in": "You need to be logged in",
+  "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
+  "You need to be logged in.": "You need to be logged in.",
   "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": "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",
   "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Your email address does not appear to be associated with a Matrix ID on this Homeserver",
   "Your password has been reset": "Your password has been reset",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e393d27bda..eba5b5a0fc 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -137,7 +137,7 @@
     "Enable encryption": "Enable encryption",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
     "Encrypted room": "Encrypted room",
-    "%(senderName)s ended the call": "%(senderName)s ended the call",
+    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
     "End-to-end encryption information": "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",
     "Enter Code": "Enter Code",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index e19d261997..d166b3a273 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -304,16 +304,16 @@
     "de": "Alemão",
     "da": "Dinamarquês",
     "ru": "Russo",
-    "%(targetName)s accepted an invitation": "%(targetName)s aceitou um convite",
-    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s aceitou o convite para %(displayName)s",
+    "%(targetName)s accepted an invitation": "%(targetName)s aceitou um convite.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "all room members, from the point they are invited": "todas/os as/os integrantes da sala, a partir do momento em que foram convidadas/os",
     "all room members, from the point they joined": "todas/os as/os integrantes da sala, a partir do momento em que entraram na sala",
     "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
     "%(names)s and one other are typing": "%(names)s e uma outra pessoa estão escrevendo",
     "%(names)s and %(count)s others are typing": "%(names)s e %(count)s outras pessoas estão escrevendo",
-    "%(senderName)s answered the call": "%(senderName)s atendeu à chamada",
+    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
     "anyone.": "qualquer pessoa",
-    "%(senderName)s banned %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s",
     "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
@@ -332,16 +332,16 @@
     "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 request": "Não foi possível mandar requisição",
+    "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",
     "Failure to create room": "Não foi possível criar a sala",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
     "Guest users can't create new rooms. Please register to create room and start a chat": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa",
-    "%(senderName)s invited %(targetName)s": "%(senderName)s convidou %(targetName)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
-    "%(targetName)s joined the room": "%(targetName)s entrou na sala",
-    "%(senderName)s kicked %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
+    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "%(targetName)s left the room": "%(targetName)s saiu da sala",
     "%(senderName)s made future room history visible to": "%(senderName)s deixou o histórico futuro da sala visível para",
     "Missing room_id in request": "Faltou o id da sala na requisição",
@@ -350,20 +350,20 @@
     "New Composer & Autocomplete": "Nova ferramenta de formatação de mensagens e autocompletar",
     "(not supported by this browser)": "(não é compatível com este navegador)",
     "olm version": "versão olm",
-    "%(senderName)s placed a %(callType)s call": "%(senderName)s fez uma chamada de %(callType)s",
-    "Power level must be positive integer": "O nível de permissões tem que ser um número inteiro e positivo",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
+    "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
     "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
-    "%(targetName)s rejected the invitation": "%(targetName)s recusou o convite",
+    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s)",
     "%(senderName)s removed their profile picture": "%(senderName)s removeu sua imagem de perfil",
     "%(senderName)s requested a VoIP conference": "%(senderName)s está solicitando uma conferência de voz",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
-    "%(senderDisplayName)s sent an image": "%(senderDisplayName)s enviou uma imagem",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
     "%(senderName)s set a profile picture": "%(senderName)s definiu uma imagem de perfil",
     "%(senderName)s set their display name to %(displayName)s": "%(senderName)s definiu seu nome público para %(displayName)s",
     "tag as %(tagName)s": "marcar como %(tagName)s",
@@ -372,7 +372,7 @@
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
     "The file '%(fileName)s' failed to upload": "Não foi possível enviar o arquivo '%(fileName)s",
     "The remote side failed to pick up": "Houve alguma falha que não permitiu a outra pessoa atender à chamada",
-    "This room is not recognised": "Esta sala não é reconhecida",
+    "This room is not recognised.": "Esta sala não é reconhecida.",
     "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "to browse the directory": "para navegar na lista pública de salas",
@@ -383,24 +383,24 @@
     "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",
-    "To use it, just wait for autocomplete results to load and tab through them": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s)",
     "Unable to restore previous session": "Não foi possível restaurar a sessão anterior",
-    "%(senderName)s unbanned %(targetName)s": "%(senderName)s desfez o banimento de %(targetName)s",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
-    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s desfez o convite a %(targetName)s's",
+    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s desfez o convite a %(targetName)s's.",
     "You are already in a call": "Você já está em  uma chamada",
     "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
     "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
     "You cannot place a call with yourself": "Você não pode iniciar uma chamada",
     "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
-    "You need to be able to invite users to do that": "Para fazer isso, você tem que ter permissão para convidar outras pessoas",
-    "You need to be logged in": "Você tem que estar logado",
+    "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
+    "You need to be logged in.": "Você tem que estar logado.",
     "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": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
     "Set a display name:": "Defina um nome público para você:",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 47d9271232..5194f4cc6c 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -310,15 +310,15 @@
     "da": "Dinamarquês",
     "ru": "Russo",
     "%(targetName)s accepted an invitation": "%(targetName)s aceitou um convite",
-    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s aceitou o convite para %(displayName)s",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "all room members, from the point they are invited": "todas/os as/os integrantes da sala, a partir do momento em que foram convidadas/os",
     "all room members, from the point they joined": "todas/os as/os integrantes da sala, a partir do momento em que entraram na sala",
     "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s estão escrevendo",
     "%(names)s and one other are typing": "%(names)s e uma outra pessoa estão escrevendo",
     "%(names)s and %(count)s others are typing": "%(names)s e %(count)s outras pessoas estão escrevendo",
-    "%(senderName)s answered the call": "%(senderName)s atendeu à chamada",
+    "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
     "anyone.": "qualquer pessoa",
-    "%(senderName)s banned %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s",
     "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
@@ -333,21 +333,21 @@
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here %(toAction)s": "Arraste aqui %(toAction)s",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
-    "%(senderName)s ended the call": "%(senderName)s finalizou a chamada",
+    "%(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 request": "Não foi possível mandar requisição",
+    "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",
     "Failure to create room": "Não foi possível criar a sala",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s para %(toPowerLevel)s",
     "Guest users can't create new rooms. Please register to create room and start a chat": "Visitantes não podem criar novas salas. Por favor, registre-se para criar uma sala e iniciar uma conversa",
-    "%(senderName)s invited %(targetName)s": "%(senderName)s convidou %(targetName)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
-    "%(targetName)s joined the room": "%(targetName)s entrou na sala",
-    "%(senderName)s kicked %(targetName)s": "%(senderName)s removeu %(targetName)s da sala",
-    "%(targetName)s left the room": "%(targetName)s saiu da sala",
+    "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
+    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
     "%(senderName)s made future room history visible to": "%(senderName)s deixou o histórico futuro da sala visível para",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
@@ -355,20 +355,20 @@
     "New Composer & Autocomplete": "Nova ferramenta de formatação de mensagens e autocompletar",
     "(not supported by this browser)": "(não é compatível com este navegador)",
     "olm version": "versão olm",
-    "%(senderName)s placed a %(callType)s call": "%(senderName)s fez uma chamada de %(callType)s",
-    "Power level must be positive integer": "O nível de permissões tem que ser um número inteiro e positivo",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s fez uma chamada de %(callType)s.",
+    "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
     "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
-    "%(targetName)s rejected the invitation": "%(targetName)s recusou o convite",
+    "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s)",
     "%(senderName)s removed their profile picture": "%(senderName)s removeu sua imagem de perfil",
     "%(senderName)s requested a VoIP conference": "%(senderName)s está solicitando uma conferência de voz",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
-    "%(senderDisplayName)s sent an image": "%(senderDisplayName)s enviou uma imagem",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
     "%(senderName)s set a profile picture": "%(senderName)s definiu uma imagem de perfil",
     "%(senderName)s set their display name to %(displayName)s": "%(senderName)s definiu seu nome público para %(displayName)s",
     "tag as %(tagName)s": "marcar como %(tagName)s",
@@ -377,7 +377,7 @@
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O arquivo '%(fileName)s' ultrapassa o limite de tamanho que nosso servidor permite enviar",
     "The file '%(fileName)s' failed to upload": "Não foi possível enviar o arquivo '%(fileName)s",
     "The remote side failed to pick up": "Houve alguma falha que não permitiu a outra pessoa atender à chamada",
-    "This room is not recognised": "Esta sala não é reconhecida",
+    "This room is not recognised.": "Esta sala não é reconhecida.",
     "These are experimental features that may break in unexpected ways": "Estas são funcionalidades experimentais que podem apresentar falhas",
     "This phone number is already in use": "Este número de telefone já está sendo usado",
     "to browse the directory": "para navegar na lista pública de salas",
@@ -389,24 +389,24 @@
     "to start a chat with someone": "para iniciar uma conversa com alguém",
     "to tag as %(tagName)s": "para marcar como %(tagName)s",
     "to tag direct chat": "para marcar a conversa como pessoal",
-    "To use it, just wait for autocomplete results to load and tab through them": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s)",
     "Unable to restore previous session": "Não foi possível restaurar a sessão anterior",
-    "%(senderName)s unbanned %(targetName)s": "%(senderName)s desfez o banimento de %(targetName)s",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
     "Unable to enable Notifications": "Não foi possível ativar as notificações",
     "Upload Failed": "O envio falhou",
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
-    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s desfez o convite a %(targetName)s",
+    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s desfez o convite a %(targetName)s.",
     "You are already in a call": "Você já está em  uma chamada",
     "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
     "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
     "You cannot place a call with yourself": "Você não pode iniciar uma chamada",
     "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
-    "You need to be able to invite users to do that": "Para fazer isso, você tem que ter permissão para convidar outras pessoas",
-    "You need to be logged in": "Você tem que estar logado",
+    "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
+    "You need to be logged in.": "Você tem que estar logado.",
     "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": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
     "Set a display name:": "Defina um nome público para você:",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 6bd3773861..ea23d16d04 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -217,15 +217,15 @@
     "da": "Датский",
     "ru": "Русский",
     "%(targetName)s accepted an invitation": "%(targetName)s принятое приглашение",
-    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s принятое приглашение от %(displayName)s",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принятое приглашение от %(displayName)s.",
     "Resend all": "Переслать снова всем",
     "cancel all": "отменить всем",
     "Active call": "Активный звонок",
     "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s печатает",
     "%(names)s and one other are typing": "%(names)s и другой печатают",
     "%(names)s and %(count)s others are typing": "%(names)s и %(count)s другие печатают",
-    "%(senderName)s answered the call": "%(senderName)s ответил на звонок",
-    "%(senderName)s banned %(targetName)s": "%(senderName)s запрещенный %(targetName)s",
+    "%(senderName)s answered the call.": "%(senderName)s ответил на звонок.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s запрещенный %(targetName)s.",
     "Call Timeout": "Время ожидания вызова",
     "%(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 измененное ихнее фото профиля",
@@ -239,21 +239,21 @@
     "/ddg is not a command": "/ddg не команда",
     "Drop here %(toAction)s": "Вставить здесь %(toAction)s",
     "Drop here to tag %(section)s": "Вставить здесь для тега %(section)s",
-    "%(senderName)s ended the call": "%(senderName)s прекратил звонок",
+    "%(senderName)s ended the call.": "%(senderName)s прекратил звонок.",
     "Existing Call": "Существующий вызов",
     "Failed to lookup current room": "Не удалось выполнить поиск текущий комнаты",
-    "Failed to send request": "Не удалось выслать запрос",
+    "Failed to send request.": "Не удалось выслать запрос.",
     "Failed to set up conference call": "Не удалось установить конференц-вызов",
     "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": "Гостевые пользователи не могут создавать новые комнаты. Зарегистрируйтесь для создания комнаты и чата",
     "click to reveal": "нажать для открытия",
-    "%(senderName)s invited %(targetName)s": "%(senderName)s приглашает %(targetName)s",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s вводит текст",
     "%(targetName)s joined the room": "%(targetName)s  присоединенный к комнате",
-    "%(senderName)s kicked %(targetName)s": "%(senderName)s выкинул %(targetName)s",
-    "%(targetName)s left the room": "%(targetName)s покинул комнату",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s выкинул %(targetName)s.",
+    "%(targetName)s left the room.": "%(targetName)s покинул комнату.",
     "%(senderName)s made future room history visible to": "%(senderName)s  история сделаной будущей комнаты, видимая для",
     "Missing room_id in request": "Отсутствует room_id в запросе",
     "Missing user_id in request": "Отсутствует user_id в запросе",
@@ -357,14 +357,14 @@
     "Sunday": "Воскресенье",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Upload an avatar:": "Загрузить аватар",
-    "You need to be logged in": "Вы должны быть зарегистрированы",
-    "You need to be able to invite users to do that": "Вам необходимо пригласить пользователей чтобы сделать это",
+    "You need to be logged in.": "Вы должны быть зарегистрированы",
+    "You need to be able to invite users to do that.": "Вам необходимо пригласить пользователей чтобы сделать это.",
     "You cannot place VoIP calls in this browser": "Вы не можете сделать вызовы VoIP с этим браузером",
     "You are already in a call": "Вы уже находитесь в разговоре",
     "You're not in any rooms yet! Press": "Вы еще не находитесь ни в каких комнатах! Нажать",
     "You are trying to access %(roomName)s": "Вы пытаетесь получить доступ %(roomName)s",
     "You cannot place a call with yourself": "Вы не можете позвонить самим себе",
-    "%(senderName)s withdrew %(targetName)s's inivitation": "%(senderName)s анулировал %(targetName)s's преглашение",
+    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s анулировал %(targetName)s's преглашение.",
     "Sep": "Сен.",
     "Jan": "Янв.",
     "Feb": "Фев.",
@@ -389,10 +389,10 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Ваш адрес электронной почты, кажется, не связан с Matrix ID на этом Homeserver",
     "to start a chat with someone": "Начать чат с кем-то",
     "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.": "Для его использования, просто подождите результатов автозаполнения для загрузки на вкладке и через них.",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s включил сквозное шифрование (algorithm %(algorithm)s)",
     "Unable to restore previous session": "Невозможно востановить предыдущий сеанс",
-    "%(senderName)s unbanned %(targetName)s": "%(senderName)s запрет отменен %(targetName)s",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s запрет отменен %(targetName)s.",
     "Unable to capture screen": "Невозможно записать снимок экрана",
     "Unable to enable Notifications": "Невозможно включить уведомления",
     "Upload Failed": "Неудавшаяся загрузка",

From dac6a3360b38da1269b833689015114849551fb2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 19:25:06 +0100
Subject: [PATCH 232/312] Oops, don't change these reason strings.

---
 src/TextForEvent.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index d5a54927a0..88872807e3 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -94,15 +94,15 @@ function textForMemberEvent(ev) {
             }
             else if (ev.getPrevContent().membership === "join") {
                 return _t(
-                    '%(senderName)s kicked %(targetName)s. %(reason)s',
-                    {senderName: senderName, targetName: targetName, reason}
-                );
+                    '%(senderName)s kicked %(targetName)s.',
+                    {senderName: senderName, targetName: targetName}
+                ) + '. ' + reason;
             }
             else if (ev.getPrevContent().membership === "invite") {
                 return _t(
-                    '%(senderName)s withdrew %(targetName)s\'s inivitation. %(reason)s',
-                    {senderName: senderName, targetName: targetName, reason: reason}
-                );
+                    '%(senderName)s withdrew %(targetName)s\'s inivitation.',
+                    {senderName: senderName, targetName: targetName}
+                ) + '. ' + reason;
             }
             else {
                 return _t('%(targetName)s left the room.', {targetName: targetName});

From be4944a4b68a58e2976cef472a1b9f3e04239de9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 19:43:34 +0100
Subject: [PATCH 233/312] Hopefully get translations with '.'s sorted

attempt 2
---
 src/TextForEvent.js         | 18 +++++++++---------
 src/i18n/strings/de_DE.json |  2 +-
 src/i18n/strings/en_EN.json |  2 +-
 src/i18n/strings/fr.json    |  2 +-
 src/i18n/strings/pt_BR.json |  2 +-
 src/i18n/strings/ru.json    |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 88872807e3..2d53c5db9f 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -47,9 +47,9 @@ function textForMemberEvent(ev) {
             }
         case 'ban':
             return _t(
-                '%(senderName)s banned %(targetName)s. %(reason)s.',
-                {senderName: senderName, targetName: targetName, reason: reason}
-            );
+                '%(senderName)s banned %(targetName)s.',
+                {senderName: senderName, targetName: targetName}
+            ) + ' ' + reason;
         case 'join':
             if (ev.getPrevContent() && ev.getPrevContent().membership == 'join') {
                 if (ev.getPrevContent().displayname && ev.getContent().displayname && ev.getPrevContent().displayname != ev.getContent().displayname) {
@@ -90,19 +90,19 @@ function textForMemberEvent(ev) {
                 }
             }
             else if (ev.getPrevContent().membership === "ban") {
-                return _t('%(senderName)s unbanned %(targetName)s.', {senderName: senderName, targetName: targetName}) + '.';
+                return _t('%(senderName)s unbanned %(targetName)s.', {senderName: senderName, targetName: targetName});
             }
             else if (ev.getPrevContent().membership === "join") {
                 return _t(
                     '%(senderName)s kicked %(targetName)s.',
                     {senderName: senderName, targetName: targetName}
-                ) + '. ' + reason;
+                ) + ' ' + reason;
             }
             else if (ev.getPrevContent().membership === "invite") {
                 return _t(
                     '%(senderName)s withdrew %(targetName)s\'s inivitation.',
                     {senderName: senderName, targetName: targetName}
-                ) + '. ' + reason;
+                ) + ' ' + reason;
             }
             else {
                 return _t('%(targetName)s left the room.', {targetName: targetName});
@@ -135,13 +135,13 @@ function textForMessageEvent(ev) {
 function textForCallAnswerEvent(event) {
     var senderName = event.sender ? event.sender.name : _t('Someone');
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('%(senderName)s answered the call', {senderName: senderName}) + '. ' + supported;
+    return _t('%(senderName)s answered the call', {senderName: senderName}) + ' ' + supported;
 }
 
 function textForCallHangupEvent(event) {
     var senderName = event.sender ? event.sender.name : _t('Someone');
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('%(senderName)s ended the call', {senderName: senderName}) + '. ' + supported;
+    return _t('%(senderName)s ended the call', {senderName: senderName}) + ' ' + supported;
 }
 
 function textForCallInviteEvent(event) {
@@ -153,7 +153,7 @@ function textForCallInviteEvent(event) {
         type = "video";
     }
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('%(senderName)s placed a %(callType)s call.', {senderName: senderName, callType: type}) + '. ' + supported;
+    return _t('%(senderName)s placed a %(callType)s call.', {senderName: senderName, callType: type}) + ' ' + supported;
 }
 
 function textForThreePidInviteEvent(event) {
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 90395a08c0..dc1cc1dbb6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -360,7 +360,7 @@
     "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s",
     "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s änderte das Thema zu %(topic)s",
     "/ddg is not a command": "/ddg ist kein Kommando",
-    "%(senderName)s ended the call.": "%(senderName)s beendete den Anruf.",
+    "%(senderName)s ended the call": "%(senderName)s beendete den Anruf",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
     "Failed to send request.": "Anfrage zu senden schlug fehl.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9c69233692..13a65e6a9c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -233,7 +233,7 @@
   "Enable encryption": "Enable encryption",
   "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
   "Encrypted room": "Encrypted room",
-  "%(senderName)s ended the call.": "%(senderName)s ended the call.",
+  "%(senderName)s ended the call": "%(senderName)s ended the call",
   "End-to-end encryption information": "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",
   "Enter Code": "Enter Code",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index eba5b5a0fc..e393d27bda 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -137,7 +137,7 @@
     "Enable encryption": "Enable encryption",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
     "Encrypted room": "Encrypted room",
-    "%(senderName)s ended the call.": "%(senderName)s ended the call.",
+    "%(senderName)s ended the call": "%(senderName)s ended the call",
     "End-to-end encryption information": "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",
     "Enter Code": "Enter Code",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 5194f4cc6c..2aaca8b9d7 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -333,7 +333,7 @@
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here %(toAction)s": "Arraste aqui %(toAction)s",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
-    "%(senderName)s ended the call.": "%(senderName)s finalizou a chamada.",
+    "%(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",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ea23d16d04..c211bace3b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -239,7 +239,7 @@
     "/ddg is not a command": "/ddg не команда",
     "Drop here %(toAction)s": "Вставить здесь %(toAction)s",
     "Drop here to tag %(section)s": "Вставить здесь для тега %(section)s",
-    "%(senderName)s ended the call.": "%(senderName)s прекратил звонок.",
+    "%(senderName)s ended the call": "%(senderName)s прекратил звонок",
     "Existing Call": "Существующий вызов",
     "Failed to lookup current room": "Не удалось выполнить поиск текущий комнаты",
     "Failed to send request.": "Не удалось выслать запрос.",

From e7fbf889fae4daf89b75fc67af0e7435f0a35ed3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 19:53:27 +0100
Subject: [PATCH 234/312] Make current language more accurate

Make it reflect reality if it's been taken from the browser langs
by just getting what was saet in counterpart rather than the saved
setting.

Also fix style.
---
 src/components/structures/UserSettings.js | 18 ++++++------------
 src/languageHandler.js                    |  4 ++++
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b2bf693cfe..c9a9c58939 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -202,16 +202,10 @@ module.exports = React.createClass({
         this._syncedSettings = syncedSettings;
 
         this._localSettings = UserSettingsStore.getLocalSettings();
-        if (!this._localSettings.hasOwnProperty('language')) {
-            const language = languageHandler.normalizeLanguageKey(languageHandler.getLanguageFromBrowser());
-            this.setState({
-                Language: language
-            });
-        } else {
-            this.setState({
-                Language: this._localSettings.language
-            });
-        }
+
+        this.setState({
+            language: languageHandler.getCurrentLanguage(),
+        });
     },
 
     componentDidMount: function() {
@@ -551,7 +545,7 @@ module.exports = React.createClass({
     onLanguageChange: function(l) {
         UserSettingsStore.setLocalSetting('language', l);
         this.setState({
-          Language: l,
+            language: l,
         });
         PlatformPeg.get().reload();
     },
@@ -562,7 +556,7 @@ module.exports = React.createClass({
             <label htmlFor="languageSelector">{_t('Interface Language')}</label>
             <LanguageDropdown ref="language" onOptionChange={this.onLanguageChange}
                           className="mx_UserSettings_language"
-                          value={this.state.Language}
+                          value={this.state.language}
             />
         </div>;
     },
diff --git a/src/languageHandler.js b/src/languageHandler.js
index 4b49c95fc9..6734c99582 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -116,6 +116,10 @@ export function normalizeLanguageKey(language) {
     return language.toLowerCase().replace("_","-");
 };
 
+export function getCurrentLanguage() {
+    return counterpart.getLocale();
+}
+
 function getLangsJson() {
     const deferred = q.defer();
 

From ab92cc2254f0fb9c45f959cc9ff7c9b5e0c00831 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 19:55:54 +0100
Subject: [PATCH 235/312] Question marks do not internationalise

---
 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 c9a9c58939..f441525f96 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -292,7 +292,7 @@ module.exports = React.createClass({
     onLogoutClicked: function(ev) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
-            title: _t("Sign out") + "?",
+            title: _t("Sign out"),
             description:
                 <div>
              { _t("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") }.

From 2d6bf5fa910011405d4bc0b7dc316b866a6c88ba Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 20:04:28 +0100
Subject: [PATCH 236/312] Remove messages with HTML formatting

The translations strings are not HTML and it gets escaped.
---
 src/components/structures/RoomView.js      | 4 ++--
 src/components/views/rooms/RoomSettings.js | 6 +++---
 src/i18n/strings/da.json                   | 2 +-
 src/i18n/strings/de_DE.json                | 8 ++++----
 src/i18n/strings/en_EN.json                | 8 ++++----
 src/i18n/strings/pt.json                   | 8 ++++----
 src/i18n/strings/pt_BR.json                | 8 ++++----
 src/i18n/strings/ru.json                   | 6 +++---
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index badc7cd01d..4b3b09f1fa 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -536,8 +536,8 @@ module.exports = React.createClass({
                 description: (
                     <div>
                         <p>{ _t("End-to-end encryption is in beta and may not be reliable") }.</p>
-                        <p>{ _t("You should <b>not</b> yet trust it to secure data") }.</p>
-                        <p>{ _t("Devices will <b>not</b> yet be able to decrypt history from before they joined the room") }.</p>
+                        <p>{ _t("You should not yet trust it to secure data") }.</p>
+                        <p>{ _t("Devices will not yet be able to decrypt history from before they joined the room") }.</p>
                         <p>{ _t("Encrypted messages will not be visible on clients that do not yet implement encryption") }.</p>
                     </div>
                 ),
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index bff668ac85..e50bcdde46 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -542,9 +542,9 @@ module.exports = React.createClass({
             description: (
                 <div>
                     <p>{ _t('End-to-end encryption is in beta and may not be reliable') }.</p>
-                    <p>{ _t('You should <b>not</b> yet trust it to secure data') }.</p>
-                    <p>{ _t('Devices will <b>not</b> yet be able to decrypt history from before they joined the room') }.</p>
-                    <p>{ _t('Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)') }.</p>
+                    <p>{ _t('You should not yet trust it to secure data') }.</p>
+                    <p>{ _t('Devices will not yet be able to decrypt history from before they joined the room') }.</p>
+                    <p>{ _t('Once encryption is enabled for a room it cannot be turned off again (for now)') }.</p>
                     <p>{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.</p>
                 </div>
             ),
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 13491eb0b9..72e0ae60c2 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -100,7 +100,7 @@
     "decline": "nedgang",
     "Default": "Standard",
     "demote": "degradere",
-    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Enhederne vil <b>ikke</b> være i stand til at dekryptere historikken fra, før de kom til rummet",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Enhederne vil ikke være i stand til at dekryptere historikken fra, før de kom til rummet",
     "Direct Chat": "Personligt Chat",
     "Disable inline URL previews by default": "Deaktiver forrige weblinks forhåndsvisninger som standard",
     "Display name": "Visningsnavn",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index dc1cc1dbb6..ffe46f5723 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -84,7 +84,7 @@
     "Deactivate Account": "Deaktiviere Account",
     "Deactivate my account": "Deaktiviere meinen Account",
     "decline": "Ablehnen",
-    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Geräte werden <b>nicht</b> in der Lage sein, die Historie vor dem Beitritt in den Raum zu entschlüsseln",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Geräte werden nicht in der Lage sein, die Historie vor dem Beitritt in den Raum zu entschlüsseln",
     "Display name": "Anzeigename",
     "Email Address": "E-Mail-Adresse",
     "Email, name or matrix ID": "E-Mail, Name oder Matrix-ID",
@@ -163,7 +163,7 @@
     "<not supported>": "<nicht unterstützt>",
     "No users have specific privileges in this room": "Keine Nutzer haben in diesem Raum besondere Berechtigungen",
     "olm version": "OLM-Version",
-    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Sobald Verschlüsselung für einen Raum aktiviert wird, kann diese (aktuell noch) <b>nicht</b> wieder deaktiviert werden",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Sobald Verschlüsselung für einen Raum aktiviert wird, kann diese (aktuell noch) nicht wieder deaktiviert werden",
     "Only people who have been invited": "Nur Personen die eingeladen wurden",
     "or": "oder",
     "other": "weiteres",
@@ -186,7 +186,7 @@
     "removed their display name": "löschte den eigenen Anzeigenamen",
     "Remove": "Entferne",
     "requested a VoIP conference": "hat eine VoIP-Konferenz angefordert",
-    "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "Eine Passwortänderung sorgt aktuell dafür, dass alle Ende-zu-Ende-Schlüssel von allen Geräten zurückgesetzt werden. Dadurch wird die verschlüsselte Chat-Historie unlesbar, es sei denn Sie exportieren vorher Ihre Raum-Schlüssel und importieren sie nachher wieder. In Zukunft wird dies <a href='https://github.com/vector-im/riot-web/issues/2671'>verbessert</a>",
+    "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": "Eine Passwortänderung sorgt aktuell dafür, dass alle Ende-zu-Ende-Schlüssel von allen Geräten zurückgesetzt werden. Dadurch wird die verschlüsselte Chat-Historie unlesbar, es sei denn Sie exportieren vorher Ihre Raum-Schlüssel und importieren sie nachher wieder. In Zukunft wird dies verbessert",
     "restore": "Zum zurücksetzen",
     "Return to login screen": "Zur Anmeldung zurückkehren",
     "Room Colour": "Raumfarbe",
@@ -277,7 +277,7 @@
     "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": "Du wurdest von allen Geräten ausgeloggt und wirst keine Push-Benachrichtigungen mehr bekommen. Um Benachrichtigungen zu reaktivieren melde dich auf jedem Gerät neu an",
     "you must be a": "nötige Rolle",
     "Your password has been reset": "Dein Passwort wurde zurückgesetzt",
-    "You should <b>not</b> yet trust it to secure data": "Du solltest <b>nicht</b> darauf vertrauen um deine Daten abzusichern",
+    "You should not yet trust it to secure data": "Du solltest nicht darauf vertrauen um deine Daten abzusichern",
     "removed their profile picture": "löschte das eigene Profilbild",
     "times": "mal",
     "Bulk Options": "Bulk-Optionen",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 13a65e6a9c..9afe796086 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -215,7 +215,7 @@
   "Deops user with given id": "Deops user with given id",
   "Device ID": "Device ID",
   "Devices": "Devices",
-  "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Devices will <b>not</b> yet be able to decrypt history from before they joined the room",
+  "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",
   "Direct Chat": "Direct Chat",
   "Direct chats": "Direct chats",
   "Disable inline URL previews by default": "Disable inline URL previews by default",
@@ -354,7 +354,7 @@
   "No users have specific privileges in this room": "No users have specific privileges in this room",
   "OK": "OK",
   "olm version:": "olm version:",
-  "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)",
+  "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
   "Once you&#39;ve followed the link it contains, click below": "Once you&#39;ve followed the link it contains, click below",
   "Only people who have been invited": "Only people who have been invited",
   "or": "or",
@@ -384,7 +384,7 @@
   "Remove": "Remove",
   "%(senderName)s requested a VoIP conference": "%(senderName)s requested a VoIP conference",
   "Report it": "Report it",
-  "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>",
+  "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": "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",
   "restore": "restore",
   "Return to app": "Return to app",
   "Return to login screen": "Return to login screen",
@@ -542,7 +542,7 @@
   "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
   "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?",
   "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?",
-  "You should <b>not</b> yet trust it to secure data": "You should <b>not</b> yet trust it to secure data",
+  "You should not yet trust it to secure data": "You should not yet trust it to secure data",
   "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself",
   "Sun": "Sun",
   "Mon": "Mon",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index d166b3a273..f14f2b31f4 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -60,7 +60,7 @@
     "demote": "reduzir prioridade",
     "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
     "Device ID": "Identificador do dispositivo",
-    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Os dispositivos <b>não</b> serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos não serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala",
     "Direct Chat": "Conversa pessoal",
     "Disable inline URL previews by default": "Desabilitar visualizações prévias por padrão",
     "Display name": "Nome",
@@ -146,7 +146,7 @@
     "NOT verified": "NÃO verificado",
     "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
     "olm version: ": "Versão do olm: ",
-    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela <b>não poderá</b> ser desativada novamente (ainda)",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)",
     "Once you&#39;ve followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "or": "ou",
@@ -171,7 +171,7 @@
     "removed their profile picture": "removeu sua foto de perfil",
     "Remove": "Remover",
     "requested a VoIP conference": "requisitou uma conferência VoIP",
-    "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso <a href='https://github.com/vector-im/riot-web/issues/2671'>será melhorado</a>",
+    "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": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado",
     "restore": "restaurar",
     "Return to app": "Retornar ao aplicativo",
     "Return to login screen": "Retornar à tela de login",
@@ -277,7 +277,7 @@
     "you must be a": "você precisa ser",
     "Your password has been reset": "Sua senha foi redefinida",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles",
-    "You should <b>not</b> yet trust it to secure data": "Você <b>não</b> deve confiar nela ainda para preservar seus dados",
+    "You should not yet trust it to secure data": "Você não deve confiar nela ainda para preservar seus dados",
     "Sun": "Dom",
     "Mon": "Seg",
     "Tue": "Ter",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 2aaca8b9d7..1aebaab694 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -63,7 +63,7 @@
     "demote": "reduzir prioridade",
     "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
     "Device ID": "Identificador do dispositivo",
-    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Os dispositivos <b>não</b> serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos não serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala",
     "Direct Chat": "Conversa pessoal",
     "Disable inline URL previews by default": "Desabilitar visualizações prévias por padrão",
     "Display name": "Nome",
@@ -149,7 +149,7 @@
     "NOT verified": "NÃO verificado",
     "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
     "olm version: ": "Versão do olm: ",
-    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela <b>não poderá</b> ser desativada novamente (ainda)",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)",
     "Once you&#39;ve followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "or": "ou",
@@ -175,7 +175,7 @@
     "removed their profile picture": "removeu sua foto de perfil",
     "Remove": "Remover",
     "requested a VoIP conference": "requisitou uma conferência VoIP",
-    "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 <a href='https://github.com/vector-im/riot-web/issues/2671'>will be improved</a>": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso <a href='https://github.com/vector-im/riot-web/issues/2671'>será melhorado</a>",
+    "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": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado",
     "restore": "restaurar",
     "Return to app": "Retornar ao aplicativo",
     "Return to login screen": "Retornar à tela de login",
@@ -282,7 +282,7 @@
     "you must be a": "você precisa ser",
     "Your password has been reset": "Sua senha foi redefinida",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles",
-    "You should <b>not</b> yet trust it to secure data": "Você <b>não</b> deve confiar nela ainda para preservar seus dados",
+    "You should not yet trust it to secure data": "Você não deve confiar nela ainda para preservar seus dados",
     "Sun": "Dom",
     "Mon": "Seg",
     "Tue": "Ter",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index c211bace3b..2455317292 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -58,7 +58,7 @@
     "demote": "понижать",
     "Deops user with given id": "Deops пользователь с данным id",
     "Device ID": "Устройство ID",
-    "Devices will <b>not</b> yet be able to decrypt history from before they joined the room": "Устройство еще <b> не </b> будет в состоянии дешифровать историю, до присоединения к комнате",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Устройство еще не будет в состоянии дешифровать историю, до присоединения к комнате",
     "Direct Chat": "Персональное сообщение",
     "Disable inline URL previews by default": "Отключить встроенные предварительные просмотры URL по умолчанию",
     "Display name": "Отображаемое имя",
@@ -136,7 +136,7 @@
     "NOT verified": "НЕ проверенный",
     "No users have specific privileges in this room": "Ни у каких пользователей нет специальных полномочий в этой комнате",
     "olm version": "olm версия",
-    "Once encryption is enabled for a room it <b>cannot</b> be turned off again (for now)": "Как только шифрование включено для комнаты, оно <b> не может </b> быть выключено снова (на данный момент)",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Как только шифрование включено для комнаты, оно не может быть выключено снова (на данный момент)",
     "or": "или",
     "other": "другой",
     "others": "другие",
@@ -210,7 +210,7 @@
     "you must be a": "Вы должны быть",
     "Your password has been reset": "Ваш пароль был изменен",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ваш пароль был успешно изменен. Вы не будете получать Push-уведомления о других устройствах, пока не войдете обратно на них",
-    "You should <b>not</b> yet trust it to secure data": "Вы еще не должны доверять этому защиту данных",
+    "You should not yet trust it to secure data": "Вы еще не должны доверять этому защиту данных",
     "en": "Английский",
     "pt-br": "Португальский Бразилия",
     "de": "Немецкий",

From ba8e37a84ef52c6d6173d655df20f6eaba0baf26 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 25 May 2017 23:13:49 +0100
Subject: [PATCH 237/312] Don't include src in the test resolve root

Don't include src in resolve root for the karma test, as otherwise
modules from react sdk get pulled in instead of npm libraries like
'extend' which breaks everything in really subtle ways.
---
 karma.conf.js                                               | 1 -
 test/components/views/dialogs/InteractiveAuthDialog-test.js | 2 +-
 test/components/views/rooms/MessageComposerInput-test.js    | 2 +-
 test/utils/MegolmExportEncryption-test.js                   | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 3495a981be..13e88350c1 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -166,7 +166,6 @@ module.exports = function (config) {
                     'sinon': 'sinon/pkg/sinon.js',
                 },
                 root: [
-                    path.resolve('./src'),
                     path.resolve('./test'),
                 ],
             },
diff --git a/test/components/views/dialogs/InteractiveAuthDialog-test.js b/test/components/views/dialogs/InteractiveAuthDialog-test.js
index b8a8e49769..c8f16225de 100644
--- a/test/components/views/dialogs/InteractiveAuthDialog-test.js
+++ b/test/components/views/dialogs/InteractiveAuthDialog-test.js
@@ -22,7 +22,7 @@ import ReactTestUtils from 'react-addons-test-utils';
 import sinon from 'sinon';
 
 import sdk from 'matrix-react-sdk';
-import MatrixClientPeg from 'MatrixClientPeg';
+import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 
 import * as test_utils from '../../../test-utils';
 
diff --git a/test/components/views/rooms/MessageComposerInput-test.js b/test/components/views/rooms/MessageComposerInput-test.js
index ca2bbba2eb..67e788e2eb 100644
--- a/test/components/views/rooms/MessageComposerInput-test.js
+++ b/test/components/views/rooms/MessageComposerInput-test.js
@@ -8,7 +8,7 @@ import * as testUtils from '../../../test-utils';
 import sdk from 'matrix-react-sdk';
 import UserSettingsStore from '../../../../src/UserSettingsStore';
 const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
-import MatrixClientPeg from 'MatrixClientPeg';
+import MatrixClientPeg from '../../../../src/MatrixClientPeg';
 
 function addTextToDraft(text) {
     const components = document.getElementsByClassName('public-DraftEditor-content');
diff --git a/test/utils/MegolmExportEncryption-test.js b/test/utils/MegolmExportEncryption-test.js
index 0c49fd48d1..1c90c7a030 100644
--- a/test/utils/MegolmExportEncryption-test.js
+++ b/test/utils/MegolmExportEncryption-test.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 "use strict";
 
-import * as MegolmExportEncryption from 'utils/MegolmExportEncryption';
+import * as MegolmExportEncryption from '../../src/utils/MegolmExportEncryption';
 
 import * as testUtils from '../test-utils';
 import expect from 'expect';

From e44f3cc7096a8370a3dff464e14c8f9cf26df65e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 11:58:45 +0100
Subject: [PATCH 238/312] Fix tests

 * Serve translation files from the karma server
 * Port UserSettingsStore to ES6 exports because the test runner
   gets confused by ES6 importing a commonjs module
 * Remove extra spaces in translations strings for MELS
 * Fix 'his/her' back to be 'their'
 * Change test to expect singular 'invitation' for a single person
   (there may be multiple invitations, but IMO this should be
   'rejected n invitations' and we can play with the wording later,
   I don't think the singular is any worse than the plural).
 * set language in the MELS tests (and wait for it to complete)
 * Don't bother setting lang in other tests for now
---
 karma.conf.js                                 |  9 ++-
 src/UserSettingsStore.js                      |  3 +-
 .../views/elements/MemberEventListSummary.js  | 64 +++++++++---------
 src/i18n/strings/de_DE.json                   | 66 +++++++++----------
 src/i18n/strings/en_EN.json                   | 64 +++++++++---------
 src/i18n/strings/pt_BR.json                   | 64 +++++++++---------
 .../elements/MemberEventListSummary-test.js   | 13 ++--
 test/test-utils.js                            |  6 --
 8 files changed, 146 insertions(+), 143 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 13e88350c1..4ad72b4927 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -55,11 +55,18 @@ module.exports = function (config) {
             // some images to reduce noise from the tests
             {pattern: 'test/img/*', watched: false, included: false,
              served: true, nocache: false},
+            // translation files
+            {pattern: 'src/i18n/strings/*', watcheed: false, included: false, served: true},
+            {pattern: 'test/i18n/*', watched: false, included: false, served: true},
         ],
 
-        // redirect img links to the karma server
         proxies: {
+            // redirect img links to the karma server
             "/img/": "/base/test/img/",
+            // special languages.json file for the tests
+            "/i18n/languages.json": "/base/test/i18n/languages.json",
+            // and redirect i18n requests
+            "/i18n/": "/base/src/i18n/strings/",
         },
 
         // list of files to exclude
diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index fd5ccb0de3..5b96692dc9 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
 import q from 'q';
 import MatrixClientPeg from './MatrixClientPeg';
 import Notifier from './Notifier';
@@ -27,7 +26,7 @@ import Notifier from './Notifier';
  * TODO: Find a way to translate the names of LABS_FEATURES. In other words, guarantee that languages were already loaded before building this array.
  */
 
-module.exports = {
+export default {
     LABS_FEATURES: [
         {
             name: "New Composer & Autocomplete",
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index 2999af42d6..fdfd46e9e5 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -215,67 +215,67 @@ module.exports = React.createClass({
             case "joined":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s joined %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s joined %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)sjoined %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)sjoined %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s joined", { severalUsers: "" })
-                        : _t("%(oneUser)s joined", { oneUser: "" });
+                        ? _t("%(severalUsers)sjoined", { severalUsers: "" })
+                        : _t("%(oneUser)sjoined", { oneUser: "" });
                 }
 
             break;
             case "left":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s left %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s left %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)sleft %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)sleft %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s left", { severalUsers: "" })
-                        : _t("%(oneUser)s left", { oneUser: "" });
+                        ? _t("%(severalUsers)sleft", { severalUsers: "" })
+                        : _t("%(oneUser)sleft", { oneUser: "" });
                 }            break;
             case "joined_and_left":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s joined and left %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s joined and left %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)sjoined and left %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)sjoined and left %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s joined and left", { severalUsers: "" })
-                        : _t("%(oneUser)s joined and left", { oneUser: "" });
+                        ? _t("%(severalUsers)sjoined and left", { severalUsers: "" })
+                        : _t("%(oneUser)sjoined and left", { oneUser: "" });
                 }
             break;
             case "left_and_joined":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s left and rejoined %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s left and rejoined %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)sleft and rejoined %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)sleft and rejoined %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s left and rejoined", { severalUsers: "" })
-                        : _t("%(oneUser)s left and rejoined", { oneUser: "" });
+                        ? _t("%(severalUsers)sleft and rejoined", { severalUsers: "" })
+                        : _t("%(oneUser)sleft and rejoined", { oneUser: "" });
                 }            break;
             break;
             case "invite_reject":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s rejected their invitations %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s rejected his/her invitation %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)srejected their invitations %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)srejected their invitation %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s rejected their invitations", { severalUsers: "" })
-                        : _t("%(oneUser)s rejected his/her invitation", { oneUser: "" });
+                        ? _t("%(severalUsers)srejected their invitations", { severalUsers: "" })
+                        : _t("%(oneUser)srejected their invitation", { oneUser: "" });
                 }
             break;
             case "invite_withdrawal":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s had their invitations withdrawn %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s had his/her invitation withdrawn %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)shad their invitations withdrawn %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)shad their invitation withdrawn %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s had their invitations withdrawn", { severalUsers: "" })
-                        : _t("%(oneUser)s had his/her invitation withdrawn", { oneUser: "" });
+                        ? _t("%(severalUsers)shad their invitations withdrawn", { severalUsers: "" })
+                        : _t("%(oneUser)shad their invitation withdrawn", { oneUser: "" });
                 }
             break;
             case "invited":
@@ -325,23 +325,23 @@ module.exports = React.createClass({
             case "changed_name":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s changed their name %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s changed his/her name %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)schanged their name %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)schanged their name %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s changed their name", { severalUsers: "" })
-                        : _t("%(oneUser)s changed his/her name", { oneUser: "" });
+                        ? _t("%(severalUsers)schanged their name", { severalUsers: "" })
+                        : _t("%(oneUser)schanged their name", { oneUser: "" });
                 }
             break;
             case "changed_avatar":
                 if (repeats > 1) {
                     res = (plural)
-                        ? _t("%(severalUsers)s changed their avatar %(repeats)s times", { severalUsers: "", repeats: repeats })
-                        : _t("%(oneUser)s changed his/her avatar %(repeats)s times", { oneUser: "", repeats: repeats });
+                        ? _t("%(severalUsers)schanged their avatar %(repeats)s times", { severalUsers: "", repeats: repeats })
+                        : _t("%(oneUser)schanged their avatar %(repeats)s times", { oneUser: "", repeats: repeats });
                 } else {
                     res = (plural)
-                        ? _t("%(severalUsers)s changed their avatar", { severalUsers: "" })
-                        : _t("%(oneUser)s changed his/her avatar", { oneUser: "" });
+                        ? _t("%(severalUsers)schanged their avatar", { severalUsers: "" })
+                        : _t("%(oneUser)schanged their avatar", { oneUser: "" });
                 }
             break;
         }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ffe46f5723..c161dd3ed4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -654,30 +654,30 @@
     "%(items)s and %(remaining)s others": "%(items)s und %(remaining)s weitere",
     "%(items)s and one other": "%(items)s und ein(e) weitere(r)",
     "%(items)s and %(lastItem)s": "%(items)s und %(lastItem)s",
-    "%(severalUsers)s joined %(repeats)s times": "%(severalUsers)s trat(en) %(repeats)s mal bei",
-    "%(oneUser)s joined %(repeats)s times": "%(oneUser)s trat %(repeats)s mal bei",
-    "%(severalUsers)s joined": "%(severalUsers)s traten bei",
-    "%(oneUser)s joined": "%(oneUser)s trat bei",
-    "%(severalUsers)s left %(repeats)s times": "%(severalUsers)s gingen %(repeats)s mal",
-    "%(oneUser)s left %(repeats)s times": "%(oneUser)s ging %(repeats)s mal",
-    "%(severalUsers)s left": "%(severalUsers)s gingen",
-    "%(oneUser)s left": "%(oneUser)s ging",
-    "%(severalUsers)s joined and left %(repeats)s times": "%(severalUsers)s traten bei und gingen %(repeats)s mal",
-    "%(oneUser)s joined and left %(repeats)s times": "%(oneUser)s trat bei und ging %(repeats)s mal",
-    "%(severalUsers)s joined and left": "%(severalUsers)s traten bei und gingen",
-    "%(oneUser)s joined and left": "%(oneUser)s trat bei und ging",
-    "%(severalUsers)s left and rejoined %(repeats)s times": "%(severalUsers)s gingen und traten erneut bei - %(repeats)s mal",
-    "%(oneUser)s left and rejoined %(repeats)s times": "%(oneUser)s ging und trat erneut bei - %(repeats)s mal",
-    "%(severalUsers)s left and rejoined": "%(severalUsers)s gingen und traten erneut bei",
-    "%(oneUser)s left left and rejoined": "%(oneUser)s ging und trat erneut bei",
-    "%(severalUsers)s rejected their invitations %(repeats)s times": "%(severalUsers)s lehnten %(repeats)s mal ihre Einladung ab",
-    "%(oneUser)s rejected his/her invitation %(repeats)s times": "%(oneUser)s lehnte seine/ihre Einladung %(repeats)s mal ab",
-    "%(severalUsers)s rejected their invitations": "%(severalUsers)s lehnten ihre Einladung ab",
-    "%(oneUser)s rejected his/her invitation": "%(oneUser)s lehnte seine/ihre Einladung ab",
-    "%(severalUsers)s had their invitations withdrawn %(repeats)s times": "%(severalUsers)s zogen ihre Einladungen %(repeats)s mal zurück",
-    "%(oneUser)s had his/her invitation withdrawn %(repeats)s times": "%(oneUser)s zog seine/ihre Einladung %(repeats)s mal zurück",
-    "%(severalUsers)s had their invitations withdrawn": "%(severalUsers)s zogen ihre Einladungen zurück",
-    "%(oneUser)s had his/her invitation withdrawn": "%(oneUser)s zog seine/ihre Einladung zurück",
+    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)strat(en) %(repeats)s mal bei",
+    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)strat %(repeats)s mal bei",
+    "%(severalUsers)sjoined": "%(severalUsers)straten bei",
+    "%(oneUser)sjoined": "%(oneUser)strat bei",
+    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sgingen %(repeats)s mal",
+    "%(oneUser)sleft %(repeats)s times": "%(oneUser)sging %(repeats)s mal",
+    "%(severalUsers)sleft": "%(severalUsers)sgingen",
+    "%(oneUser)sleft": "%(oneUser)sging",
+    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)straten bei und gingen %(repeats)s mal",
+    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)strat bei und ging %(repeats)s mal",
+    "%(severalUsers)sjoined and left": "%(severalUsers)straten bei und gingen",
+    "%(oneUser)sjoined and left": "%(oneUser)strat bei und ging",
+    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)sgingen und traten erneut bei - %(repeats)s mal",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sging und trat erneut bei - %(repeats)s mal",
+    "%(severalUsers)sleft and rejoined": "%(severalUsers)sgingen und traten erneut bei",
+    "%(oneUser)sleft left and rejoined": "%(oneUser)sging und trat erneut bei",
+    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)slehnten %(repeats)s mal ihre Einladung ab",
+    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)slehnte seine/ihre Einladung %(repeats)s mal ab",
+    "%(severalUsers)srejected their invitations": "%(severalUsers)slehnten ihre Einladung ab",
+    "%(oneUser)srejected their invitation": "%(oneUser)slehnte seine/ihre Einladung ab",
+    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)szogen ihre Einladungen %(repeats)s mal zurück",
+    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)szog seine/ihre Einladung %(repeats)s mal zurück",
+    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)szogen ihre Einladungen zurück",
+    "%(oneUser)shad their invitation withdrawn": "%(oneUser)szog seine/ihre Einladung zurück",
     "were invited %(repeats)s times": "wurden %(repeats)s mal eingeladen",
     "was invited %(repeats)s times": "wurde %(repeats)s mal eingeladen",
     "were invited": "wurden eingeladen",
@@ -690,14 +690,14 @@
     "were kicked %(repeats)s times": "wurden %(repeats)s mal gekickt",
     "was kicked %(repeats)s times": "wurde %(repeats)s mal gekickt",
     "were kicked": "wurden gekickt",
-    "%(severalUsers)s changed their name %(repeats)s times": "%(severalUsers)s änderten %(repeats)s mal ihre Namen",
-    "%(oneUser)s changed his/her name %(repeats)s times": "%(oneUser)s änderte %(repeats)s mal seinen/ihren Namen",
-    "%(severalUsers)s changed their name": "%(severalUsers)s änderten ihre Namen",
-    "%(oneUser)s changed his/her name": "%(oneUser)s änderte seinen/ihren Namen",
-    "%(severalUsers)s changed their avatar %(repeats)s times": "%(severalUsers)s änderten %(repeats)s mal ihren Avatar",
-    "%(oneUser)s changed his/her avatar %(repeats)s times": "%(oneUser)s änderte %(repeats)s mal seinen/ihren Avatar",
-    "%(severalUsers)s changed their avatar": "%(severalUsers)s änderten ihre Avatare",
-    "%(oneUser)s changed his/her avatar": "%(severalUsers)s änderte seinen/ihren Avatar",
+    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)sänderten %(repeats)s mal ihre Namen",
+    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)sänderte %(repeats)s mal seinen/ihren Namen",
+    "%(severalUsers)schanged their name": "%(severalUsers)sänderten ihre Namen",
+    "%(oneUser)schanged their name": "%(oneUser)sänderte seinen/ihren Namen",
+    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)sänderten %(repeats)s mal ihren Avatar",
+    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sänderte %(repeats)s mal seinen/ihren Avatar",
+    "%(severalUsers)schanged their avatar": "%(severalUsers)sänderten ihre Avatare",
+    "%(oneUser)schanged their avatar": "%(severalUsers)sänderte seinen/ihren Avatar",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
-    "%(oneUser)s left and rejoined": "%(oneUser)s ging und trat erneut bei"
+    "%(oneUser)sleft and rejoined": "%(oneUser)sging und trat erneut bei"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 9afe796086..2a934d5f2f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -612,30 +612,30 @@
   "quote":"quote",
   "bullet":"bullet",
   "numbullet":"numbullet",
-  "%(severalUsers)s joined %(repeats)s times": "%(severalUsers)s joined %(repeats)s times",
-  "%(oneUser)s joined %(repeats)s times": "%(oneUser)s joined %(repeats)s times",
-  "%(severalUsers)s joined": "%(severalUsers)s joined",
-  "%(oneUser)s joined": "%(oneUser)s joined",
-  "%(severalUsers)s left %(repeats)s times": "%(severalUsers)s left %(repeats)s times",
-  "%(oneUser)s left %(repeats)s times": "%(oneUser)s left %(repeats)s times",
-  "%(severalUsers)s left": "%(severalUsers)s left",
-  "%(oneUser)s left": "%(oneUser)s left",
-  "%(severalUsers)s joined and left %(repeats)s times": "%(severalUsers)s joined and left %(repeats)s times",
-  "%(oneUser)s joined and left %(repeats)s times": "%(oneUser)s joined and left %(repeats)s times",
-  "%(severalUsers)s joined and left": "%(severalUsers)s joined and left",
-  "%(oneUser)s joined and left": "%(oneUser)s joined and left",
-  "%(severalUsers)s left and rejoined %(repeats)s times": "%(severalUsers)s left and rejoined %(repeats)s times",
-  "%(oneUser)s left and rejoined %(repeats)s times": "%(oneUser)s left and rejoined %(repeats)s times",
-  "%(severalUsers)s left and rejoined": "%(severalUsers)s left and rejoined",
-  "%(oneUser)s left and rejoined": "%(oneUser)s left and rejoined",
-  "%(severalUsers)s rejected their invitations %(repeats)s times": "%(severalUsers)s rejected their invitations %(repeats)s times",
-  "%(oneUser)s rejected his/her invitation %(repeats)s times": "%(oneUser)s rejected his/her invitation %(repeats)s times",
-  "%(severalUsers)s rejected their invitations": "%(severalUsers)s rejected their invitations",
-  "%(oneUser)s rejected his/her invitation": "%(oneUser)s rejected his/her invitation",
-  "%(severalUsers)s had their invitations withdrawn %(repeats)s times": "%(severalUsers)s had their invitations withdrawn %(repeats)s times",
-  "%(oneUser)s had his/her invitation withdrawn %(repeats)s times": "%(oneUser)s had his/her invitation withdrawn %(repeats)s times",
-  "%(severalUsers)s had their invitations withdrawn": "%(severalUsers)s had their invitations withdrawn",
-  "%(oneUser)s had his/her invitation withdrawn": "%(oneUser)s had his/her invitation withdrawn",
+  "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sjoined %(repeats)s times",
+  "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sjoined %(repeats)s times",
+  "%(severalUsers)sjoined": "%(severalUsers)sjoined",
+  "%(oneUser)sjoined": "%(oneUser)sjoined",
+  "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sleft %(repeats)s times",
+  "%(oneUser)sleft %(repeats)s times": "%(oneUser)sleft %(repeats)s times",
+  "%(severalUsers)sleft": "%(severalUsers)sleft",
+  "%(oneUser)sleft": "%(oneUser)sleft",
+  "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)sjoined and left %(repeats)s times",
+  "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sjoined and left %(repeats)s times",
+  "%(severalUsers)sjoined and left": "%(severalUsers)sjoined and left",
+  "%(oneUser)sjoined and left": "%(oneUser)sjoined and left",
+  "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)sleft and rejoined %(repeats)s times",
+  "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sleft and rejoined %(repeats)s times",
+  "%(severalUsers)sleft and rejoined": "%(severalUsers)sleft and rejoined",
+  "%(oneUser)sleft and rejoined": "%(oneUser)sleft and rejoined",
+  "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)srejected their invitations %(repeats)s times",
+  "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)srejected their invitation %(repeats)s times",
+  "%(severalUsers)srejected their invitations": "%(severalUsers)srejected their invitations",
+  "%(oneUser)srejected their invitation": "%(oneUser)srejected their invitation",
+  "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)shad their invitations withdrawn %(repeats)s times",
+  "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)shad their invitation withdrawn %(repeats)s times",
+  "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)shad their invitations withdrawn",
+  "%(oneUser)shad their invitation withdrawn": "%(oneUser)shad their invitation withdrawn",
   "were invited %(repeats)s times": "were invited %(repeats)s times",
   "was invited %(repeats)s times": "was invited %(repeats)s times",
   "were invited": "were invited",
@@ -652,12 +652,12 @@
   "was kicked %(repeats)s times": "was kicked %(repeats)s times",
   "were kicked": "were kicked",
   "was kicked": "was kicked",
-  "%(severalUsers)s changed their name %(repeats)s times": "%(severalUsers)s changed their name %(repeats)s times",
-  "%(oneUser)s changed his/her name %(repeats)s times": "%(oneUser)s changed his/her name %(repeats)s times",
-  "%(severalUsers)s changed their name": "%(severalUsers)s changed their name",
-  "%(oneUser)s changed his/her name": "%(oneUser)s changed his/her name",
-  "%(severalUsers)s changed their avatar %(repeats)s times": "%(severalUsers)s changed their avatar %(repeats)s times",
-  "%(oneUser)s changed his/her avatar %(repeats)s times": "%(oneUser)s changed his/her avatar %(repeats)s times",
-  "%(severalUsers)s changed their avatar": "%(severalUsers)s changed their avatar",
-  "%(oneUser)s changed his/her avatar": "%(oneUser)s changed his/her avatar"
+  "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)schanged their name %(repeats)s times",
+  "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)schanged their name %(repeats)s times",
+  "%(severalUsers)schanged their name": "%(severalUsers)schanged their name",
+  "%(oneUser)schanged their name": "%(oneUser)schanged their name",
+  "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)schanged their avatar %(repeats)s times",
+  "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)schanged their avatar %(repeats)s times",
+  "%(severalUsers)schanged their avatar": "%(severalUsers)schanged their avatar",
+  "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 1aebaab694..87570228df 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -536,7 +536,7 @@
     "es-mx": "Espanhol (México)",
     "es-ni": "Espanhol (Nicarágua)",
     "es-pa": "Espanhol (Panamá)",
-    "%(oneUser)s changed his/her avatar": "%(oneUser)s alterou sua imagem pública",
+    "%(oneUser)schanged their avatar": "%(oneUser)salterou sua imagem pública",
     "es-pe": "Espanhol (Peru)",
     "es-pr": "Espanhol (Porto Rico)",
     "es-sv": "Espanhol (El Salvador)",
@@ -659,30 +659,30 @@
     "quote": "citação",
     "bullet": "marcador de lista",
     "numbullet": "marcador de numeração",
-    "%(severalUsers)s joined %(repeats)s times": "%(severalUsers)s ingressaram %(repeats)s vezes",
-    "%(oneUser)s joined %(repeats)s times": "%(oneUser)s ingressou %(repeats)s vezes",
-    "%(severalUsers)s joined": "%(severalUsers)s ingressaram",
-    "%(oneUser)s joined": "%(oneUser)s ingressou",
-    "%(severalUsers)s left %(repeats)s times": "%(severalUsers)s saíram %(repeats)s vezes",
-    "%(oneUser)s left %(repeats)s times": "%(oneUser)s saiu %(repeats)s vezes",
-    "%(severalUsers)s left": "%(severalUsers)s saíram",
-    "%(oneUser)s left": "%(oneUser)s saiu",
-    "%(severalUsers)s joined and left %(repeats)s times": "%(severalUsers)s ingressaram e saíram %(repeats)s vezes",
-    "%(oneUser)s joined and left %(repeats)s times": "%(oneUser)s ingressou e saiu %(repeats)s vezes",
-    "%(severalUsers)s joined and left": "%(severalUsers)s ingressaram e saíram",
-    "%(oneUser)s joined and left": "%(oneUser)s ingressou e saiu",
-    "%(severalUsers)s left and rejoined %(repeats)s times": "%(severalUsers)s saíram e entraram novamente %(repeats)s vezes",
-    "%(oneUser)s left and rejoined %(repeats)s times": "%(oneUser)s saiu e entrou novamente %(repeats)s vezes",
-    "%(severalUsers)s left and rejoined": "%(severalUsers)s saíram e entraram novamente",
-    "%(oneUser)s left and rejoined": "%(oneUser)s saiu e entrou novamente",
-    "%(severalUsers)s rejected their invitations %(repeats)s times": "%(severalUsers)s rejeitaram seus convites %(repeats)s vezes",
-    "%(oneUser)s rejected his/her invitation %(repeats)s times": "%(oneUser)s rejeitou seu convite %(repeats)s vezes",
-    "%(severalUsers)s rejected their invitations": "%(severalUsers)s rejeitaram seus convites",
-    "%(oneUser)s rejected his/her invitation": "%(oneUser)s rejeitou seu convite",
-    "%(severalUsers)s had their invitations withdrawn %(repeats)s times": "%(severalUsers)s tiveram seus convites desfeitos %(repeats)s vezes",
-    "%(oneUser)s had his/her invitation withdrawn %(repeats)s times": "%(oneUser)s teve seu convite desfeito %(repeats)s vezes",
-    "%(severalUsers)s had their invitations withdrawn": "%(severalUsers)s tiveram seus convites desfeitos",
-    "%(oneUser)s had his/her invitation withdrawn": "%(oneUser)s teve seu convite desfeito",
+    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)singressaram %(repeats)s vezes",
+    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)singressou %(repeats)s vezes",
+    "%(severalUsers)sjoined": "%(severalUsers)singressaram",
+    "%(oneUser)sjoined": "%(oneUser)singressou",
+    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)ssaíram %(repeats)s vezes",
+    "%(oneUser)sleft %(repeats)s times": "%(oneUser)ssaiu %(repeats)s vezes",
+    "%(severalUsers)sleft": "%(severalUsers)ssaíram",
+    "%(oneUser)sleft": "%(oneUser)ssaiu",
+    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)singressaram e saíram %(repeats)s vezes",
+    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)singressou e saiu %(repeats)s vezes",
+    "%(severalUsers)sjoined and left": "%(severalUsers)singressaram e saíram",
+    "%(oneUser)sjoined and left": "%(oneUser)singressou e saiu",
+    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)ssaíram e entraram novamente %(repeats)s vezes",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)ssaiu e entrou novamente %(repeats)s vezes",
+    "%(severalUsers)sleft and rejoined": "%(severalUsers)ssaíram e entraram novamente",
+    "%(oneUser)sleft and rejoined": "%(oneUser)ssaiu e entrou novamente",
+    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)srejeitaram seus convites %(repeats)s vezes",
+    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)srejeitou seu convite %(repeats)s vezes",
+    "%(severalUsers)srejected their invitations": "%(severalUsers)srejeitaram seus convites",
+    "%(oneUser)srejected their invitation": "%(oneUser)srejeitou seu convite",
+    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)stiveram seus convites desfeitos %(repeats)s vezes",
+    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)steve seu convite desfeito %(repeats)s vezes",
+    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)stiveram seus convites desfeitos",
+    "%(oneUser)shad their invitation withdrawn": "%(oneUser)steve seu convite desfeito",
     "were invited %(repeats)s times": "foram convidadas(os) %(repeats)s vezes",
     "was invited %(repeats)s times": "foi convidada(o) %(repeats)s vezes",
     "were invited": "foram convidadas(os)",
@@ -695,12 +695,12 @@
     "were kicked %(repeats)s times": "foram expulsas(os) %(repeats)s vezes",
     "was kicked %(repeats)s times": "foi expulsa(o) %(repeats)s vezes",
     "were kicked": "foram expulsas(os)",
-    "%(severalUsers)s changed their name %(repeats)s times": "%(severalUsers)s alteraram seu nome %(repeats)s vezes",
-    "%(oneUser)s changed his/her name %(repeats)s times": "%(oneUser)s alterou seu nome %(repeats)s vezes",
-    "%(severalUsers)s changed their name": "%(severalUsers)s alteraram seus nomes",
-    "%(oneUser)s changed his/her name": "%(oneUser)s alterou seu nome",
-    "%(severalUsers)s changed their avatar %(repeats)s times": "%(severalUsers)s alteraram sua imagem pública %(repeats)s vezes",
-    "%(oneUser)s changed his/her avatar %(repeats)s times": "%(oneUser)s alterou sua imagem pública %(repeats)s vezes",
-    "%(severalUsers)s changed their avatar": "%(severalUsers)s alteraram sua imagem pública",
+    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)salteraram seu nome %(repeats)s vezes",
+    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)salterou seu nome %(repeats)s vezes",
+    "%(severalUsers)schanged their name": "%(severalUsers)salteraram seus nomes",
+    "%(oneUser)schanged their name": "%(oneUser)salterou seu nome",
+    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)salteraram sua imagem pública %(repeats)s vezes",
+    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)salterou sua imagem pública %(repeats)s vezes",
+    "%(severalUsers)schanged their avatar": "%(severalUsers)salteraram sua imagem pública",
     "Ban": "Banir"
 }
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index d01d705040..96fb4cc2e5 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -4,6 +4,7 @@ const ReactDOM = require("react-dom");
 const ReactTestUtils = require('react-addons-test-utils');
 const sdk = require('matrix-react-sdk');
 const MemberEventListSummary = sdk.getComponent('views.elements.MemberEventListSummary');
+import * as languageHandler from '../../../../src/languageHandler';
 
 const testUtils = require('../../../test-utils');
 describe('MemberEventListSummary', function() {
@@ -82,9 +83,11 @@ describe('MemberEventListSummary', function() {
         return eventsForUsers;
     };
 
-    beforeEach(function() {
+    beforeEach(function(done) {
         testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
+        
+        languageHandler.setLanguage('en').done(done);
     });
 
     afterEach(function() {
@@ -356,7 +359,7 @@ describe('MemberEventListSummary', function() {
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1 and 1 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"
         );
     });
 
@@ -559,7 +562,7 @@ describe('MemberEventListSummary', function() {
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1 and 1 other rejected their invitations and " +
+            "user_1 and one other rejected their invitations and " +
             "had their invitations withdrawn"
         );
     });
@@ -595,7 +598,7 @@ describe('MemberEventListSummary', function() {
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1 rejected their invitations 2 times"
+            "user_1 rejected their invitation 2 times"
         );
     });
 
@@ -650,7 +653,7 @@ describe('MemberEventListSummary', function() {
         const summaryText = summary.innerText;
 
         expect(summaryText).toBe(
-            "user_1, user_2 and 1 other joined"
+            "user_1, user_2 and one other joined"
         );
     });
 
diff --git a/test/test-utils.js b/test/test-utils.js
index 40be715abd..5209465362 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -3,8 +3,6 @@
 import sinon from 'sinon';
 import q from 'q';
 import ReactTestUtils from 'react-addons-test-utils';
-import * as counterpart from 'counterpart-riot';
-var languageHandler = require("../src/languageHandler");
 
 import peg from '../src/MatrixClientPeg.js';
 import jssdk from 'matrix-js-sdk';
@@ -67,10 +65,6 @@ export function beforeEach(context) {
 
     console.log(desc);
     console.log(new Array(1 + desc.length).join("="));
-
-    const languages = languageHandler.getNormalizedLanguageKeys('en');
-    languageHandler.setLanguage(languages, counterpart);
-
 };
 
 

From 0de0b8954d9eb44f2cfc812ba6dbff56d85b2ef7 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 12:03:36 +0100
Subject: [PATCH 239/312] Trailing whitespace

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

diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index 96fb4cc2e5..a93e38b50c 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -86,7 +86,7 @@ describe('MemberEventListSummary', function() {
     beforeEach(function(done) {
         testUtils.beforeEach(this);
         sandbox = testUtils.stubClient();
-        
+
         languageHandler.setLanguage('en').done(done);
     });
 

From bb344740dda0a15f7cf1565f13bfec94a8ce4cd4 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 13:09:29 +0100
Subject: [PATCH 240/312] Add test languages file

---
 test/i18n/languages.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 test/i18n/languages.json

diff --git a/test/i18n/languages.json b/test/i18n/languages.json
new file mode 100644
index 0000000000..bdb46584b9
--- /dev/null
+++ b/test/i18n/languages.json
@@ -0,0 +1,3 @@
+{
+    "en": "en_EN.json"
+}

From e3e848d09e368a0ec35eae84bcd374fac8314919 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 13:19:46 +0100
Subject: [PATCH 241/312] Fix missing full stop on translation key

---
 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 f441525f96..fe896c8a1d 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -295,7 +295,7 @@ module.exports = React.createClass({
             title: _t("Sign out"),
             description:
                 <div>
-             { _t("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") }.
+             { _t("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.") }.
                 </div>,
             button: _t("Sign out"),
             extraButtons: [

From 0f8e560247834f978afa7706ca9b231962786280 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 15:29:11 +0100
Subject: [PATCH 242/312] Add function to display i18n keys in UI

Avoids having to load translations in riot-web tests
---
 src/languageHandler.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 6734c99582..cddc70da56 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -37,6 +37,13 @@ export function _t(...args) {
     return counterpart.translate(...args);
 }
 
+// Allow overriding the text displayed when no translation exists
+// Currently only use din unit tests to avoid having to load
+// the translations in riot-web
+export function setMissingEntryGenerator(f) {
+    counterpart.setMissingEntryGenerator(f);
+}
+
 export function setLanguage(preferredLangs) {
     if (!Array.isArray(preferredLangs)) {
         preferredLangs = [preferredLangs];

From 84cef00f1f4efe29c7686a1e08662374a4d68bbe Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 17:16:23 +0100
Subject: [PATCH 243/312] Mismatched oneUser / severalUsers

---
 src/i18n/strings/de_DE.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c161dd3ed4..f09ff9f99b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -697,7 +697,7 @@
     "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)sänderten %(repeats)s mal ihren Avatar",
     "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sänderte %(repeats)s mal seinen/ihren Avatar",
     "%(severalUsers)schanged their avatar": "%(severalUsers)sänderten ihre Avatare",
-    "%(oneUser)schanged their avatar": "%(severalUsers)sänderte seinen/ihren Avatar",
+    "%(oneUser)schanged their avatar": "%(oneUser)sänderte seinen/ihren Avatar",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
     "%(oneUser)sleft and rejoined": "%(oneUser)sging und trat erneut bei"
 }

From 40680d55e09980af4b783780bba153ab8ecdfd20 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 17:55:48 +0100
Subject: [PATCH 244/312] Fix merge fail

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

diff --git a/src/DateUtils.js b/src/DateUtils.js
index bc8594c671..8b7a2f3f20 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -62,6 +62,8 @@ function twelveHourTime(date) {
 module.exports = {
     formatDate: function(date) {
         var now = new Date();
+        const days = getDaysArray();
+        const months = getMonthsArray();
         if (date.toDateString() === now.toDateString()) {
             return this.formatTime(date);
         }

From 23fbce66a292509d2418c8aa3d68dc33cae23818 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 17:56:51 +0100
Subject: [PATCH 245/312] Translate 'email' threepid label

---
 src/components/structures/UserSettings.js | 1 +
 src/i18n/strings/en_EN.json               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 862d2480ce..a861e8ebd1 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -826,6 +826,7 @@ module.exports = React.createClass({
 
     nameForMedium: function(medium) {
         if (medium === 'msisdn') return _t('Phone');
+        if (medium === 'email') return _t('Email');
         return medium[0].toUpperCase() + medium.slice(1);
     },
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2a934d5f2f..f98423d67c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -227,6 +227,7 @@
   "Drop here %(toAction)s": "Drop here %(toAction)s",
   "Drop here to tag %(section)s": "Drop here to tag %(section)s",
   "Ed25519 fingerprint": "Ed25519 fingerprint",
+  "Email": "Email",
   "Email Address": "Email Address",
   "Email, name or matrix ID": "Email, name or matrix ID",
   "Emoji": "Emoji",

From cf0073a631bacc608dbafe75ee9d97fef401c606 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 17:59:19 +0100
Subject: [PATCH 246/312] Missing translations in User Interface section

---
 src/i18n/strings/en_EN.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f98423d67c..73ae8c5515 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -133,6 +133,7 @@
   "Admin": "Admin",
   "Advanced": "Advanced",
   "Algorithm": "Algorithm",
+  "Always show message timestamps": "Always show message timestamps",
   "Authentication": "Authentication",
   "all room members": "all room members",
   "all room members, from the point they are invited": "all room members, from the point they are invited",
@@ -420,6 +421,7 @@
   "%(senderName)s set their display name to %(displayName)s": "%(senderName)s set their display name to %(displayName)s",
   "Settings": "Settings",
   "Show panel": "Show panel",
+  "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
   "Signed Out": "Signed Out",
   "Sign in": "Sign in",
   "Sign out": "Sign out",

From 62ffe929e49256d48401f6ec1acb42cc0d698cc5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 18:03:24 +0100
Subject: [PATCH 247/312] Translate Add Threepid labels

---
 src/components/structures/UserSettings.js       | 2 +-
 src/components/views/settings/AddPhoneNumber.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index a861e8ebd1..59b8f5a385 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -887,7 +887,7 @@ module.exports = React.createClass({
             addEmailSection = (
                 <div className="mx_UserSettings_profileTableRow" key="_newEmail">
                     <div className="mx_UserSettings_profileLabelCell">
-                        <label>Email</label>
+                        <label>{_t('Email')}</label>
                     </div>
                     <div className="mx_UserSettings_profileInputCell">
                         <EditableText
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 1fdd06cf00..358658ba60 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -146,7 +146,7 @@ export default WithMatrixClient(React.createClass({
         return (
             <form className="mx_UserSettings_profileTableRow" onSubmit={this._onAddMsisdnSubmit}>
                 <div className="mx_UserSettings_profileLabelCell">
-                    <label>Phone</label>
+                    <label>{_t('Phone')}</label>
                 </div>
                 <div className="mx_UserSettings_profileInputCell">
                     <div className="mx_UserSettings_phoneSection">

From 647c1b61699e8ebb6be73b9481df669aa129c289 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 18:19:32 +0100
Subject: [PATCH 248/312] Once more, with braces

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

diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 51042a59b3..fcaf05a8c8 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -128,7 +128,7 @@ class PasswordLogin extends React.Component {
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
                     onChange={this.onUsernameChanged}
-                    placeholder=_t('username')
+                    placeholder={_t('username')}
                     value={this.state.username}
                     autoFocus
                 />;

From 563b85ceb831f353a30509dbe0cef0e0ef2a6243 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 18:53:23 +0100
Subject: [PATCH 249/312] Merge
 https://github.com/MTRNord/matrix-react-sdk/pull/115

---
 src/i18n/strings/fr.json | 151 +++++++++++++++++++++++++++++++++------
 1 file changed, 129 insertions(+), 22 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e393d27bda..9967d70bc2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -120,27 +120,27 @@
     "zh-tw": "Chinese (Taiwan)",
     "zu": "Zulu",
     "anyone.": "anyone",
-    "Direct Chat": "Chat direct",
-    "Direct chats": "Direct chats",
-    "Disable inline URL previews by default": "Disable inline URL previews by default",
-    "Disinvite": "Disinvite",
-    "Display name": "Display name",
-    "Displays action": "Displays action",
-    "Don't send typing notifications": "Don't send typing notifications",
-    "Download %(text)s": "Download %(text)s",
-    "Drop here %(toAction)s": "Drop here %(toAction)s",
-    "Drop here to tag %(section)s": "Drop here to tag %(section)s",
-    "Ed25519 fingerprint": "Ed25519 fingerprint",
-    "Email Address": "Email Address",
-    "Email, name or matrix ID": "Email, name or matrix ID",
-    "Emoji": "Emoji",
-    "Enable encryption": "Enable encryption",
-    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
-    "Encrypted room": "Encrypted room",
-    "%(senderName)s ended the call": "%(senderName)s ended the call",
-    "End-to-end encryption information": "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",
-    "Enter Code": "Enter Code",
+    "Direct Chat": "Conversation Directe",
+    "Direct chats": "Conversations directes",
+    "Disable inline URL previews by default": "Désactiver l’aperçu des URLs",
+    "Disinvite": "Désinviter",
+    "Display name": "Nom d'affichage",
+    "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 marque comme %(section)s",
+    "Ed25519 fingerprint": "Empreinte Ed25519",
+    "Email Address": "Adresse e-mail",
+    "Email, name or matrix ID": "E-mail, nom or identifiant Matrix",
+    "Emoji": "Emoticône",
+    "Enable encryption": "Activer l'encryption",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Les messages encryptés ne seront pas visibles dans les clients qui n’implémentent pas encore l’encryption",
+    "Encrypted room": "Salon encrypté",
+    "%(senderName)s ended the call": "%(senderName)s a terminé l’appel",
+    "End-to-end encryption information": "Information sur l'encryption bout-en-bout",
+    "End-to-end encryption is in beta and may not be reliable": "L’encryption bout-en-bout est en béta et risque de ne pas être fiable",
+    "Enter Code": "Entrer le code",
     "Error": "Erreur",
     "Event information": "Event information",
     "Existing Call": "Existing Call",
@@ -166,5 +166,112 @@
     "bold": "gras",
     "italic": "italique",
     "strike": "barré",
-    "underline": "souligné"
+    "underline": "souligné",
+    "Favourite": "Favoris",
+    "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",
+    "accept": "Accepter",
+    "%(targetName)s accepted an invitation": "%(targetName)s a accepté une invitation",
+    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s a accepté une invitation de %(displayName)s",
+    "Account": "Compte",
+    "Add email address": "Ajouter une adresse e-mail",
+    "Add phone number": "Ajouter un numéro de téléphone",
+    "Admin": "Admin",
+    "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 joint",
+    "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",
+    "and %(overflowCount)s others...": "et %(overflowCount)s autres...",
+    "and one other...": "et un autre...",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s sont en train de taper",
+    "%(names)s and one other are typing": "%(names)s et un autre sont en train de taper",
+    "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train de taper",
+    "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é.",
+    "%(senderName)s answered the call": "%(senderName)s a répondu à l’appel",
+    "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les invités",
+    "Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les invités",
+    "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 upload the following files?": "Êtes-vous sûr de vouloir télécharger les fichiers suivants ?",
+    "Attachment": "Pièce jointe",
+    "Autoplay GIFs and videos": "Jouer automatiquement les GIFs et vidéos",
+    "%(senderName)s banned %(targetName)s": "%(senderName)s a banni %(targetName)s",
+    "Ban": "Bannir",
+    "Banned users": "Utilisateurs bannis",
+    "Bans user with given id": "Utilisateurs bannis avec un identifiant donné",
+    "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 %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Connexion au Home Server impossible - merci de vérifier votre connectivité et que le %(urlStart)s certificat SSL de votre Home Server %(urlEnd)s est de confiance",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Impossible de se connecter au homeserver en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou %(urlStart)s activez le support des scripts non-vérifiés %(urlEnd)s",
+    "Can't load user settings": "Impossible de charger les paramètres 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",
+    "%(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",
+    "Clear Cache and Reload": "Vider le cache et recharger",
+    "Clear Cache": "Vider le cache",
+    "Click here": "Cliquer ici",
+    "Click here to fix": "Cliquer ici pour réparer",
+    "Click to mute audio": "Cliquer pour couper le son",
+    "Click to mute video": "Cliquer ici pour couper la vidéo",
+    "click to reveal": "cliquer pour dévoiler",
+    "Click to unmute video": "Cliquer pour rétablir la vidéo",
+    "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 encryptés",
+    "Conference calls are not supported in this client": "Les appels en conférence ne sont pas supportés avec ce client",
+    "Confirm password": "Confirmer le mot de passe",
+    "Confirm your new password": "Confirmer votre nouveau mot de passe",
+    "Continue": "Continuer",
+    "Could not connect to the integration server": "Impossible de se connecter au serveur d'intégration",
+    "Create an account": "Créer un compte",
+    "Create Room": "Créer un salon",
+    "Cryptography": "Encryption",
+    "Current password": "Mot de passe actuel",
+    "Curve25519 identity key": "Clé d’identité Curve25519",
+    "/ddg is not a command": "/ddg n'est pas une commande",
+    "Deactivate Account": "Désactiver le compte",
+    "Deactivate my account": "Désactiver mon compte",
+    "decline": "décliner",
+    "Decrypt %(text)s": "Décrypter %(text)s",
+    "Decryption error": "Erreur de décryptage",
+    "Delete": "Supprimer",
+    "demote": "rétrograder",
+    "Deops user with given id": "Retire les privilèges d’opérateur d’un utilisateur avec un ID donné",
+    "Device ID": "ID 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écrypter l’historique précédant leur adhésion au 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": "Échec 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’établissement du statut de modérateur"
 }

From cddfe7e6ef34387a61e792ecefb03396b1ee85bb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 19:00:44 +0100
Subject: [PATCH 250/312] Fix inconsistent quoting in topic messages

---
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/pt.json    | 2 +-
 src/i18n/strings/pt_BR.json | 1 -
 src/i18n/strings/ru.json    | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f09ff9f99b..d927de847c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -358,7 +358,7 @@
     "%(senderName)s changed their profile picture": "%(senderName)s änderte das Profilbild",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s",
     "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s",
-    "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s änderte das Thema zu %(topic)s",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\"",
     "/ddg is not a command": "/ddg ist kein Kommando",
     "%(senderName)s ended the call": "%(senderName)s beendete den Anruf",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index f14f2b31f4..5beb530768 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -319,7 +319,7 @@
     "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
     "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
-    "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s alterou o tópico para %(topic)s",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s alterou o tópico para \"%(topic)s\"",
     "click to reveal": "clique para ver",
     "Conference call failed": "Chamada de conferência falhou",
     "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 87570228df..5722997165 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -324,7 +324,6 @@
     "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
     "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
-    "%(senderDisplayName)s changed the topic to %(topic)s": "%(senderDisplayName)s alterou o tópico para %(topic)s",
     "click to reveal": "clique para ver",
     "Conference call failed": "Chamada de conferência falhou",
     "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 2455317292..b22f2d0fa7 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -231,7 +231,7 @@
     "%(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 changed the topic to %(topic)s": "%(senderDisplayName)s измененная тема на %(topic)s",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s измененная тема на %(topic)s",
     "Conference call failed": "Конференц-вызов прервался",
     "Conference calling is in development and may not be reliable": "Конференц-вызов находится в процессе и может не быть надежным",
     "Conference calls are not supported in encrypted rooms": "Конференц-вызовы не поддерживаются в зашифрованных комнатах",

From 1edad35c9810c4958ba54073dc9fab8dde5455b3 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Fri, 26 May 2017 18:18:06 +0000
Subject: [PATCH 251/312] Translated using Weblate (German)

Currently translated at 100.0% (659 of 659 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f09ff9f99b..1632b9f9ad 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -699,5 +699,26 @@
     "%(severalUsers)schanged their avatar": "%(severalUsers)sänderten ihre Avatare",
     "%(oneUser)schanged their avatar": "%(oneUser)sänderte seinen/ihren Avatar",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
-    "%(oneUser)sleft and rejoined": "%(oneUser)sging und trat erneut bei"
+    "%(oneUser)sleft and rejoined": "%(oneUser)sging und trat erneut bei",
+    "A registered account is required for this action": "Für diese Aktion ist ein registrierter Account notwendig",
+    "Access Token:": "Zugangs-Token:",
+    "Always show message timestamps": "Immer Nachrichten-Zeitstempel anzeigen",
+    "Authentication": "Authentifikation",
+    "An error has occurred.": "Ein Fehler passierte.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\"",
+    "Confirm password": "Passwort bestätigen",
+    "Current password": "Aktuelles Passwort",
+    "Email": "E-Mail",
+    "Interface Language": "Oberflächen-Sprache",
+    "Logged in as:": "Angemeldet als:",
+    "matrix-react-sdk version:": "Version von matrix-react-sdk:",
+    "New passwords don't match": "Neue Passwörter nicht gleich",
+    "olm version:": "OLM-Version:",
+    "Passwords can't be empty": "Passwörter dürfen nicht leer sein",
+    "Registration required": "Registrierung benötigt",
+    "Report it": "Melde es",
+    "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)": "Zeige Zeitstempel im 12-Stunden format",
+    "to tag as %(tagName)s": "um als"
 }

From a77663d18b35f5b5c1a31369e8c8d82fccc176c0 Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Fri, 26 May 2017 18:17:14 +0000
Subject: [PATCH 252/312] Translated using Weblate (French)

Currently translated at 25.6% (169 of 659 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e393d27bda..e572b69d7b 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -166,5 +166,6 @@
     "bold": "gras",
     "italic": "italique",
     "strike": "barré",
-    "underline": "souligné"
+    "underline": "souligné",
+    "A registered account is required for this action": "Il est nécessaire d’avoir un compte enregistré pour cette action"
 }

From 9fcee811cb0c1c10bd0485d9832acc66a7ca1c94 Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Fri, 26 May 2017 18:20:28 +0000
Subject: [PATCH 253/312] Translated using Weblate (French)

Currently translated at 25.7% (170 of 659 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index e572b69d7b..a8859dfaa2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -167,5 +167,6 @@
     "italic": "italique",
     "strike": "barré",
     "underline": "souligné",
-    "A registered account is required for this action": "Il est nécessaire d’avoir un compte enregistré pour cette action"
+    "A registered account is required for this action": "Il est nécessaire d’avoir un compte enregistré pour cette action",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un message a été envoyé à +%(msisdn)s. Merci d’entrer le code de vérification qu’il contient"
 }

From c138e4d92ede3e495d6a1385ef3c2b07dbfde8b8 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Fri, 26 May 2017 18:20:29 +0000
Subject: [PATCH 254/312] Translated using Weblate (German)

Currently translated at 100.0% (659 of 659 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1632b9f9ad..7f0506375c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -720,5 +720,5 @@
     "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)": "Zeige Zeitstempel im 12-Stunden format",
-    "to tag as %(tagName)s": "um als"
+    "to tag as %(tagName)s": "um als \"%(tagName)s\" zu markieren"
 }

From 32207bd058de8f9825fc9b4615a1f97df12f851c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 26 May 2017 19:51:47 +0100
Subject: [PATCH 255/312] use develop js-sdk

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b94c8d66eb..0f1d4fb6e6 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.7.8",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^15.4.0",

From 65dd2d4db1fec936889629366c8f108953503e04 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 26 May 2017 13:43:01 -0600
Subject: [PATCH 256/312] Fix PM being AM

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

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

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 8b7a2f3f20..e8f92e34fa 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -54,7 +54,7 @@ function pad(n) {
 function twelveHourTime(date) {
     let hours = date.getHours() % 12;
     const minutes = pad(date.getMinutes());
-    const ampm = hours >= 12 ? 'PM' : 'AM';
+    const ampm = date.getHours() >= 12 ? 'PM' : 'AM';
     hours = pad(hours ? hours : 12);
     return `${hours}:${minutes} ${ampm}`;
 }

From 08529ba5a80b729a38f75be615c0f7bd2a4132f6 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Fri, 26 May 2017 20:01:32 +0000
Subject: [PATCH 257/312] Translated using Weblate (German)

Currently translated at 100.0% (659 of 659 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a97c3ed2fa..f496a1ec8f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -705,7 +705,6 @@
     "Always show message timestamps": "Immer Nachrichten-Zeitstempel anzeigen",
     "Authentication": "Authentifikation",
     "An error has occurred.": "Ein Fehler passierte.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\"",
     "Confirm password": "Passwort bestätigen",
     "Current password": "Aktuelles Passwort",
     "Email": "E-Mail",
@@ -713,7 +712,7 @@
     "Logged in as:": "Angemeldet als:",
     "matrix-react-sdk version:": "Version von matrix-react-sdk:",
     "New passwords don't match": "Neue Passwörter nicht gleich",
-    "olm version:": "OLM-Version:",
+    "olm version:": "Version von olm:",
     "Passwords can't be empty": "Passwörter dürfen nicht leer sein",
     "Registration required": "Registrierung benötigt",
     "Report it": "Melde es",

From 5f2012102c5252c520b98d4f22b4e25644f5f773 Mon Sep 17 00:00:00 2001
From: Stanislav N <pztrn@pztrn.name>
Date: Fri, 26 May 2017 20:10:35 +0000
Subject: [PATCH 258/312] Translated using Weblate (Russian)

Currently translated at 65.8% (434 of 659 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b22f2d0fa7..8f02fb50c5 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -472,5 +472,6 @@
     "Failed to delete device": "Не удалось удалить устройство",
     "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
     "Failed to join room": "Не удалось присоединиться к комнате",
-    "Failed to join the room": "Не удалось присоединиться к комнате"
+    "Failed to join the room": "Не удалось присоединиться к комнате",
+    "A registered account is required for this action": "Необходима зарегистрированная учетная запись для этого действия"
 }

From 53cb6d1d764aefab985114784826d8e4fd50732f Mon Sep 17 00:00:00 2001
From: Stanislav N <pztrn@pztrn.name>
Date: Fri, 26 May 2017 20:11:24 +0000
Subject: [PATCH 259/312] Translated using Weblate (Russian)

Currently translated at 65.8% (434 of 659 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8f02fb50c5..9506766c6f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -216,8 +216,8 @@
     "de": "Немецкий",
     "da": "Датский",
     "ru": "Русский",
-    "%(targetName)s accepted an invitation": "%(targetName)s принятое приглашение",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принятое приглашение от %(displayName)s.",
+    "%(targetName)s accepted an invitation": "%(targetName)s принял приглашение",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
     "Resend all": "Переслать снова всем",
     "cancel all": "отменить всем",
     "Active call": "Активный звонок",

From 594247dfa9d4ad35bd9fdb0a28fbb4d9b126061f Mon Sep 17 00:00:00 2001
From: Stanislav N <pztrn@pztrn.name>
Date: Fri, 26 May 2017 20:12:53 +0000
Subject: [PATCH 260/312] Translated using Weblate (Russian)

Currently translated at 66.3% (437 of 659 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9506766c6f..3b86b06b36 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -473,5 +473,8 @@
     "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
     "Failed to join room": "Не удалось присоединиться к комнате",
     "Failed to join the room": "Не удалось присоединиться к комнате",
-    "A registered account is required for this action": "Необходима зарегистрированная учетная запись для этого действия"
+    "A registered account is required for this action": "Необходима зарегистрированная учетная запись для этого действия",
+    "Access Token:": "Токен:",
+    "Always show message timestamps": "Всегда показывать время сообщения",
+    "Authentication": "Авторизация"
 }

From 477396f8200354cdc2de1bcb2f2e0082cedef282 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 May 2017 22:28:35 +0100
Subject: [PATCH 261/312] Use first language preference, not last

---
 src/languageHandler.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index cddc70da56..584a4ef82b 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -57,6 +57,7 @@ export function setLanguage(preferredLangs) {
         for (let i = 0; i < preferredLangs.length; ++i) {
             if (availLangs.hasOwnProperty(preferredLangs[i])) {
                 langToUse = preferredLangs[i];
+                break;
             }
         }
         if (!langToUse) {

From 81704a5b5e96260663cdb51de6a281b9551bd4ce Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 00:13:04 +0100
Subject: [PATCH 262/312] s/username/User name/

---
 src/components/views/login/PasswordLogin.js | 2 +-
 src/i18n/strings/de_DE.json                 | 2 +-
 src/i18n/strings/en_EN.json                 | 2 +-
 src/i18n/strings/pt.json                    | 2 +-
 src/i18n/strings/pt_BR.json                 | 2 +-
 src/i18n/strings/ru.json                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index fcaf05a8c8..8e5229c63d 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -128,7 +128,7 @@ class PasswordLogin extends React.Component {
                     type="text"
                     name="username" // make it a little easier for browser's remember-password
                     onChange={this.onUsernameChanged}
-                    placeholder={_t('username')}
+                    placeholder={_t('User name')}
                     value={this.state.username}
                     autoFocus
                 />;
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f496a1ec8f..5ec137fc9d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -252,7 +252,7 @@
     "Upload Files": "Dateien hochladen",
     "Upload file": "Datei hochladen",
     "User Interface": "Nutzerschnittstelle",
-    "username": "Nutzername",
+    "User name": "Nutzername",
     "Users": "Nutzer",
     "User": "Nutzer",
     "Verification Pending": "Verifizierung ausstehend",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 73ae8c5515..f317c6a08a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -508,7 +508,7 @@
   "Use with caution": "Use with caution",
   "User ID": "User ID",
   "User Interface": "User Interface",
-  "username": "username",
+  "User name": "User name",
   "Users": "Users",
   "User": "User",
   "Verification Pending": "Verification Pending",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 5beb530768..356510a94a 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -246,7 +246,7 @@
     "Upload file": "Enviar arquivo",
     "User ID": "Identificador de Usuário",
     "User Interface": "Interface de usuário",
-    "username": "Nome de usuária/o",
+    "User name": "Nome de usuária/o",
     "Users": "Usuários",
     "User": "Usuária/o",
     "Verification Pending": "Verificação pendente",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 5722997165..8f9bb015a0 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -251,7 +251,7 @@
     "Upload file": "Enviar arquivo",
     "User ID": "Identificador de Usuário",
     "User Interface": "Interface de usuário",
-    "username": "Nome de usuária/o",
+    "User name": "Nome de usuária/o",
     "Users": "Usuários",
     "User": "Usuária/o",
     "Verification Pending": "Verificação pendente",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 3b86b06b36..82286f06f9 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -180,7 +180,7 @@
     "Upload file": "Загрузка файла",
     "User ID": "ID пользователя",
     "User Interface": "Пользовательский интерфейс",
-    "username": "Имя пользователя",
+    "User name": "Имя пользователя",
     "Users": "Пользователи",
     "User": "Пользователь",
     "Verification Pending": "Ожидание проверки",

From 03194e66b3b7d58847af7007253ccdac077cbd6d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 00:14:16 +0100
Subject: [PATCH 263/312] actually wire up alwaysShowTimestamps

---
 src/components/structures/MessagePanel.js  | 10 +++++++++-
 src/components/structures/TimelinePanel.js |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index d98a464aef..6b80223e42 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -87,6 +87,9 @@ module.exports = React.createClass({
 
         // show twelve hour timestamps
         isTwelveHour: React.PropTypes.bool,
+
+        // show timestamps always
+        alwaysShowTimestamps: React.PropTypes.bool,
     },
 
     componentWillMount: function() {
@@ -618,8 +621,13 @@ module.exports = React.createClass({
         var style = this.props.hidden ? { display: 'none' } : {};
         style.opacity = this.props.opacity;
 
+        var className = this.props.className + " mx_fadable";
+        if (this.props.alwaysShowTimestamps) {
+            className += " mx_MessagePanel_alwaysShowTimestamps";
+        }
+
         return (
-            <ScrollPanel ref="scrollPanel" className={ this.props.className + " mx_fadable" }
+            <ScrollPanel ref="scrollPanel" className={ className }
                     onScroll={ this.props.onScroll }
                     onResize={ this.onResize }
                     onFillRequest={ this.props.onFillRequest }
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 5a5132a31e..76004ebbac 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -176,6 +176,9 @@ var TimelinePanel = React.createClass({
 
             // should the event tiles have twelve hour times
             isTwelveHour: UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps'),
+
+            // always show timestamps on event tiles?
+            alwaysShowTimestamps: UserSettingsStore.getSyncedSetting('alwaysShowTimestamps'),
         };
     },
 
@@ -1127,6 +1130,7 @@ var TimelinePanel = React.createClass({
                     onUnfillRequest={ this.onMessageListUnfillRequest }
                     opacity={ this.props.opacity }
                     isTwelveHour={ this.state.isTwelveHour }
+                    alwaysShowTimestamps={ this.state.alwaysShowTimestamps }
                     className={ this.props.className }
                     tileShape={ this.props.tileShape }
             />

From b6cd3fcdd2941d51ae4a16f14b6d01dbadee8c55 Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Fri, 26 May 2017 23:20:26 +0000
Subject: [PATCH 264/312] Translated using Weblate (French)

Currently translated at 51.5% (340 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
---
 src/i18n/strings/fr.json | 72 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9967d70bc2..f2950bf2bd 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -273,5 +273,75 @@
     "Failed to send request": "Échec 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’établissement du statut de modérateur"
+    "Failed to toggle moderator status": "Échec lors de l’établissement du statut de modérateur",
+    "A registered account is required for this action": "Il est nécessaire d’avoir un compte enregistré pour effectuer cette action",
+    "%(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",
+    "Authentication": "Authentification",
+    "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
+    "An error has occurred.": "Une erreur est survenue.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
+    "Email": "E-mail",
+    "Failed to send request.": "Erreur lors de l'envoi de la requête.",
+    "Failed to unban": "Échec de l'amnistie",
+    "Failed to upload file": "Échec du téléchargement",
+    "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",
+    "Favourites": "Favoris",
+    "Fill screen": "Plein écran",
+    "Filter room members": "Filtrer les membres par nom",
+    "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 authentifer à nouveau",
+    "Found a bug?": "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 utilisateurs invités ne peuvent créer de nouveaux salons. Merci de vous enregistrer pour commencer une discussion",
+    "Guest users can't upload files. Please register to upload": "Les utilisateurs invités ne peuvent telécharger de fichiers. Merci de vous enregistrer pour télécharger",
+    "had": "avait",
+    "Hangup": "Raccrocher",
+    "Hide read receipts": "Cacher les accusés de réception",
+    "Hide Text Formatting Toolbar": "Cacher la barre de formattage de texte",
+    "Historical": "Historique",
+    "Homeserver is": "Le homeserver 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 d’encryption 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",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s a invité %(targetName)s.",
+    "Invite new room members": "Inviter de nouveaux membres",
+    "Invites": "Invitations",
+    "Invites user with given id to current room": "Inviter l’utilisateur avec un ID donné dans le salon actuel",
+    "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 de taper",
+    "I want to sign in with": "Je veux m'identifier avec",
+    "Join Room": "Rejoindre le salon",
+    "joined and left": "a joint et quitté",
+    "joined": "a joint",
+    "%(targetName)s joined the room.": "%(targetName)s a joint le salon.",
+    "Joins room with given alias": "Joint le salon avec l'alias défini",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s a expulsé %(targetName)s.",
+    "Kick": "Expluser",
+    "Kicks user with given id": "Expulse l'utilisateur and l'ID donné",
+    "Labs": "Laboratoire",
+    "Leave room": "Quitter le salon",
+    "left and rejoined": "a quitté et rejoint",
+    "left": "a quitté",
+    "%(targetName)s left the room.": "%(targetName)s a quitté le salon.",
+    "Level": "Niveau",
+    "Local addresses for this room:": "Adresse locale pour ce salon :",
+    "Logged in as:": "Identifié en tant que :",
+    "Login as guest": "Identifié en tant que qu'invité",
+    "Logout": "Se déconnecter",
+    "Low priority": "Priorité basse",
+    "%(senderName)s made future room history visible to": "%(senderName)s a rendu l'historique visible de",
+    "Manage Integrations": "Gestion des intégrations",
+    "Markdown is disabled": "Le formatage \"Markdown\" est désactivé"
 }

From 88f760a53f02766c59d35557af2641329c8131c2 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Fri, 26 May 2017 21:04:44 +0000
Subject: [PATCH 265/312] Translated using Weblate (German)

Currently translated at 100.0% (659 of 659 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f496a1ec8f..e2f07645eb 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -666,12 +666,12 @@
     "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)strat bei und ging %(repeats)s mal",
     "%(severalUsers)sjoined and left": "%(severalUsers)straten bei und gingen",
     "%(oneUser)sjoined and left": "%(oneUser)strat bei und ging",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)sgingen und traten erneut bei - %(repeats)s mal",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sging und trat erneut bei - %(repeats)s mal",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)sgingen und traten erneut bei",
+    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)s gingen und traten erneut bei - %(repeats)s mal",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sging und trat %(repeats)s mal erneut bei",
+    "%(severalUsers)sleft and rejoined": "%(severalUsers)s gingen und traten erneut bei",
     "%(oneUser)sleft left and rejoined": "%(oneUser)sging und trat erneut bei",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)slehnten %(repeats)s mal ihre Einladung ab",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)slehnte seine/ihre Einladung %(repeats)s mal ab",
+    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s lehnten %(repeats)s mal ihre Einladung ab",
+    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)s lehnte seine/ihre Einladung %(repeats)s mal ab",
     "%(severalUsers)srejected their invitations": "%(severalUsers)slehnten ihre Einladung ab",
     "%(oneUser)srejected their invitation": "%(oneUser)slehnte seine/ihre Einladung ab",
     "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)szogen ihre Einladungen %(repeats)s mal zurück",
@@ -699,7 +699,7 @@
     "%(severalUsers)schanged their avatar": "%(severalUsers)sänderten ihre Avatare",
     "%(oneUser)schanged their avatar": "%(oneUser)sänderte seinen/ihren Avatar",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s. %(monthName)s %(fullYear)s %(time)s",
-    "%(oneUser)sleft and rejoined": "%(oneUser)sging und trat erneut bei",
+    "%(oneUser)sleft and rejoined": "%(oneUser)s ging und trat erneut bei",
     "A registered account is required for this action": "Für diese Aktion ist ein registrierter Account notwendig",
     "Access Token:": "Zugangs-Token:",
     "Always show message timestamps": "Immer Nachrichten-Zeitstempel anzeigen",

From 5d08393eb53b6bbc45c3b83743739b6c2a49e06e Mon Sep 17 00:00:00 2001
From: dambador <dambador@mailforspam.com>
Date: Fri, 26 May 2017 21:39:42 +0000
Subject: [PATCH 266/312] Translated using Weblate (Russian)

Currently translated at 92.8% (612 of 659 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 3b86b06b36..48a07ece67 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -6,7 +6,7 @@
     "Add email address": "Добавить email адрес",
     "Add phone number": "Добавить телефонный номер",
     "Admin": "Admin",
-    "Advanced": "Расширенный",
+    "Advanced": "Дополнительно",
     "Algorithm": "Алгоритм",
     "all room members": "все участники комнаты",
     "all room members, from the point they are invited": "все участники комнаты, с момента приглашения",
@@ -38,8 +38,8 @@
     "Changes to who can read history will only apply to future messages in this room": "Изменения того, кто может прочитать историю, будут только относиться к будущим сообщениям в этой комнате",
     "Changes your display nickname": "Изменяет Ваш псевдоним",
     "Claimed Ed25519 fingerprint key": "Требуемый Ed25519 ключ цифрового отпечатка",
-    "Clear Cache and Reload": "Очистите кэш и перезагрузку",
-    "Clear Cache": "Очистите кэш",
+    "Clear Cache and Reload": "Очистить кэш и перезагрузить",
+    "Clear Cache": "Очистить кэш",
     "Click here": "Нажать здесь",
     "Click here to fix": "Нажать здесь для фиксации",
     "Commands": "Команды",
@@ -48,7 +48,7 @@
     "Could not connect to the integration server": "Не может подключится к серверу интеграции",
     "Create an account": "Создайте учётную запись",
     "Create Room": "Создайте Комнату",
-    "Cryptography": "Криптография",
+    "Cryptography": "Шифрование",
     "Curve25519 identity key": "Curve25519 идентификационный ключ",
     "Deactivate Account": "Деактивировать Учётную запись",
     "Deactivate my account": "Деактивировать мою учётную запись",
@@ -82,14 +82,14 @@
     "Failed to send email": "Не удалось отослать email",
     "Failed to unban": "Не удалось отменить запрет",
     "Failed to upload file": "Не удалось закачать файл",
-    "Favourite": "Фаворит",
+    "Favourite": "Избранное",
     "favourite": "фаворит",
     "Favourites": "Фавориты",
     "Filter room members": "Фильтр участников комнаты",
     "Forget room": "Забыть комнату",
     "Forgot your password?": "Вы забыли пароль?",
     "For security, this session has been signed out. Please sign in again": "Для обеспечения безопасности, эта сессия была подписана. Войдите в систему еще раз.",
-    "Found a bug?": "Обнаружили ошибку?",
+    "Found a bug?": "Нашли ошибку?",
     "had": "имеет",
     "Hangup": "Отключение",
     "Historical": "Исторический",
@@ -145,7 +145,7 @@
     "Permissions": "Разрешение",
     "Phone": "Телефон",
     "placed a": "placed a",
-    "Please Register": "Пожалуйста зарегистрируйтесь",
+    "Please Register": "Пожалуйста, зарегистрируйтесь",
     "rejected the invitation.": "rejected the invitation.",
     "removed their display name": "removed their display name",
     "removed their profile picture": "removed their profile picture",
@@ -353,7 +353,7 @@
     "Wednesday": "Среда",
     "Thursday": "Четверг",
     "Friday": "Пятница",
-    "Saturday": "Субота",
+    "Saturday": "Суббота",
     "Sunday": "Воскресенье",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "Upload an avatar:": "Загрузить аватар",
@@ -472,9 +472,184 @@
     "Failed to delete device": "Не удалось удалить устройство",
     "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
     "Failed to join room": "Не удалось присоединиться к комнате",
-    "Failed to join the room": "Не удалось присоединиться к комнате",
+    "Failed to join the room": "Не удалось войти в комнату",
     "A registered account is required for this action": "Необходима зарегистрированная учетная запись для этого действия",
     "Access Token:": "Токен:",
     "Always show message timestamps": "Всегда показывать время сообщения",
-    "Authentication": "Авторизация"
+    "Authentication": "Авторизация",
+    "olm version:": "версия olm:",
+    "%(items)s and %(remaining)s others": "%(items)s и %(remaining)s другие",
+    "%(items)s and one other": "%(items)s и ещё один",
+    "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
+    "and one other...": "и ещё один...",
+    "An error has occurred.": "Произошла ошибка.",
+    "Attachment": "Вложение",
+    "Ban": "Запретить",
+    "Change Password": "Сменить пароль",
+    "Command error": "Ошибка команды",
+    "Confirm password": "Подтвердить пароль",
+    "Current password": "Текущий пароль",
+    "Email": "Электронная почта",
+    "Failed to kick": "Не удалось выгнать",
+    "Failed to load timeline position": "Не удалось узнать место во времени",
+    "Failed to mute user": "Не удалось заглушить",
+    "Failed to reject invite": "Не удалось отклонить приглашение",
+    "Failed to save settings": "Не удалось сохранить настройки",
+    "Failed to set display name": "Не удалось установить отображаемое имя",
+    "Failed to toggle moderator status": "Не удалось изменить статус модератора",
+    "Fill screen": "Заполнить экран",
+    "Guest users can't upload files. Please register to upload": "Гости не могут посылать файлы. Пожалуйста, зарегистрируйтесь для отправки",
+    "Hide read receipts": "Скрыть отметки о прочтении",
+    "Hide Text Formatting Toolbar": "Скрыть панель форматирования текста",
+    "Incorrect verification code": "Неверный код подтверждения",
+    "Interface Language": "Язык интерфейса",
+    "Invalid alias format": "Неверный формат привязки",
+    "Invalid address format": "Неверный формат адреса",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' неверный формат для адреса",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' неверный формат для привязки",
+    "Join Room": "Войти в комнату",
+    "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
+    "Kick": "Выгнать",
+    "Level": "Уровень",
+    "Local addresses for this room:": "Местный адрес этой комнаты:",
+    "Markdown is disabled": "Markdown отключен",
+    "Markdown is enabled": "Markdown включен",
+    "matrix-react-sdk version:": "версия matrix-react-sdk:",
+    "Never send encrypted messages to unverified devices in this room": "Никогда не отправлять зашифрованные сообщения непроверенным устройствам в этой комнате",
+    "New address (e.g. #foo:%(localDomain)s)": "Новый адрес (например, #foo:%(localDomain)s)",
+    "New passwords don't match": "Пароли не совпадают",
+    "not set": "не установлено",
+    "not specified": "не указано",
+    "No devices with registered encryption keys": "Нет устройств с записанными ключами шифрования",
+    "No more results": "Нет больше результатов",
+    "No results": "Нет результатов",
+    "OK": "Да",
+    "Only people who have been invited": "Только приглашённые люди",
+    "Passwords can't be empty": "Пароли не могут быть пустыми",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s выполнил %(callType)s вызов.",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Пожалуйста, проверьте вашу электронную почту и нажмите в ней ссылку. По завершении нажмите продолжить.",
+    "Power level must be positive integer.": "Уровень силы должен быть положительным числом.",
+    "Press": "Нажать",
+    "Profile": "Профиль",
+    "Reason": "Причина",
+    "Registration required": "Требуется регистрация",
+    "rejected": "отклонено",
+    "%(targetName)s rejected the invitation.": "%(targetName)s отклонил приглашение.",
+    "Reject invitation": "Отклонить приглашение",
+    "Remove Contact Information?": "Убрать контактную информацию?",
+    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s убрал своё отображаемое имя (%(oldDisplayName)s)",
+    "%(senderName)s removed their profile picture": "%(senderName)s убрал своё изображение",
+    "%(senderName)s requested a VoIP conference": "%(senderName)s запросил голосовую конференц-связь",
+    "Report it": "Сообщить об этом",
+    "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": "На данный момент сброс пароля сбросит все ключи шифрования на всех устройствах, зашифрованная история общения будет нечитаема, если вы сперва не скачаете ваши ключи от комнаты и не загрузите их после. В будущем это будет улучшено",
+    "restore": "восстановить",
+    "Return to app": "Вернуться в приложение",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot не имеет права для отправки вам уведомлений, пожалуйста, проверьте настройки вашего браузера",
+    "Riot was not given permission to send notifications - please try again": "Riot не получил разрешение для отправки уведомлений, пожалуйста, попробуйте снова",
+    "riot-web version:": "версия riot-web:",
+    "Room %(roomId)s not visible": "Комната %(roomId)s невидима",
+    "Room Colour": "Цвет комнаты",
+    "Room name (optional)": "Имя комнаты (необязательно)",
+    "Rooms": "Комнаты",
+    "Scroll to bottom of page": "Прокрутить вниз страницы",
+    "Scroll to unread messages": "Прокрутить к непрочитанным сообщениям",
+    "Search": "Поиск",
+    "Search failed": "Поиск не удался",
+    "Send a message (unencrypted)": "Отправить сообщение (не зашифровано)",
+    "Send an encrypted message": "Отправить зашифрованное сообщение",
+    "Sender device information": "Информация об устройстве отправителя",
+    "Send Invites": "Отправить приглашения",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил изображение.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderDisplayName)s отправил приглашение для %(targetDisplayName)s войти в комнату.",
+    "sent a video": "отправил видео",
+    "Show panel": "Показать панель",
+    "Sign in": "Войти",
+    "Sign out": "Выйти",
+    "since the point in time of selecting this option": "с момента выбора этой настройки",
+    "since they joined": "с момента входа",
+    "since they were invited": "с момента приглашения",
+    "Some of your messages have not been sent": "Некоторые из ваших сообщений не были отправлены",
+    "Someone": "Кто-то",
+    "Submit": "Отправить",
+    "Success": "Успех",
+    "tag as %(tagName)s": "отметить как %(tagName)s",
+    "tag direct chat": "отметить прямое общение",
+    "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.": "Необходимо ввести адрес электронной почты, связанный с вашей учётной записью.",
+    "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.": "Эта комната не опознана.",
+    "This room is private or inaccessible to guests. You may be able to join if you register": "Эта комната личная или недоступна для гостей. Мы может быть войдёте, если зарегистрируйтесь",
+    "These are experimental features that may break in unexpected ways": "Это экспериментальные возможности, которые могут сломаться неожиданным образом",
+    "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 этой комнаты",
+    "times": "раз",
+    "to demote": "для понижения",
+    "to favourite": "для избранного",
+    "to restore": "восстановить",
+    "Turn Markdown off": "Выключить Markdown",
+    "Turn Markdown on": "Включить Markdown",
+    "Unknown command": "Неизвестная команда",
+    "Unknown room %(roomId)s": "Неизвестная комната %(roomId)s",
+    "You have been invited to join this room by %(inviterName)s": "Вы были приглашены войти в эту комнату от %(inviterName)s",
+    "You seem to be uploading files, are you sure you want to quit?": "Похоже вы передаёте файлы, вы уверены, что хотите выйти?",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Make Moderator": "Сделать модератором",
+    "Room": "Комната",
+    "Cancel": "Отмена",
+    "bold": "жирный",
+    "italic": "наклонный",
+    "strike": "перечёркнутый",
+    "underline": "подчёркнутый",
+    "code": "текст",
+    "quote": "цитата",
+    "bullet": "пункт",
+    "numbullet": "нумерация",
+    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sвошли %(repeats)s раз",
+    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sвошёл %(repeats)s раз",
+    "%(severalUsers)sjoined": "%(severalUsers)sвошли",
+    "%(oneUser)sjoined": "%(oneUser)sвошёл",
+    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sушли %(repeats)s раз",
+    "%(oneUser)sleft %(repeats)s times": "%(oneUser)sушли %(repeats)s раз",
+    "%(severalUsers)sleft": "%(severalUsers)sушли",
+    "%(oneUser)sleft": "%(oneUser)sушёл",
+    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)sвошли и ушли %(repeats)s раз",
+    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sвошёл и ушёл %(repeats)s раз",
+    "%(severalUsers)sjoined and left": "%(severalUsers)sвошли и ушли",
+    "%(oneUser)sjoined and left": "%(oneUser)sвошёл и ушёл",
+    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)sушли и перезашли %(repeats)s раз",
+    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sушёл и перезашёл %(repeats)s раз",
+    "%(severalUsers)sleft and rejoined": "%(severalUsers)sушли и перезашли",
+    "%(oneUser)sleft and rejoined": "%(oneUser)sушёл и перезашёл",
+    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)sотклонили приглашения %(repeats)s раз",
+    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)sотклонил приглашения %(repeats)s раз",
+    "%(severalUsers)srejected their invitations": "%(severalUsers)sотклонили приглашения",
+    "%(oneUser)srejected their invitation": "%(oneUser)sотклонил приглашение",
+    "were invited %(repeats)s times": "были приглашёны %(repeats)s раз",
+    "was invited %(repeats)s times": "был приглашён %(repeats)s раз",
+    "were invited": "были приглашёны",
+    "were banned %(repeats)s times": "были запрещёны %(repeats)s раз",
+    "was banned %(repeats)s times": "был запрещён %(repeats)s раз",
+    "were banned": "были запрещёны",
+    "were unbanned %(repeats)s times": "были разрешены %(repeats)s раз",
+    "was unbanned %(repeats)s times": "был разрешён %(repeats)s раз",
+    "were unbanned": "были разрешены",
+    "were kicked %(repeats)s times": "были выгнаны %(repeats)s раз",
+    "was kicked %(repeats)s times": "был выгнан %(repeats)s раз",
+    "were kicked": "были выгнаны",
+    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)sизменили имена %(repeats)s раз",
+    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)sизменил имя %(repeats)s раз",
+    "%(severalUsers)schanged their name": "%(severalUsers)sизменили имя",
+    "%(oneUser)schanged their name": "%(oneUser)sизменил имя",
+    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)sизменили своё изображение %(repeats)s раз",
+    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sизменил своё изображение %(repeats)s раз",
+    "%(severalUsers)schanged their avatar": "%(severalUsers)sизменили своё изображение",
+    "%(oneUser)schanged their avatar": "%(oneUser)sизменил своё изображение"
 }

From 9fc20cbd34e399ad953a784e07d32d6b36acf231 Mon Sep 17 00:00:00 2001
From: Amandine <amandine@matrix.org>
Date: Fri, 26 May 2017 23:35:36 +0000
Subject: [PATCH 267/312] Translated using Weblate (French)

Currently translated at 55.8% (368 of 659 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f2950bf2bd..2c77aee405 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -343,5 +343,33 @@
     "Low priority": "Priorité basse",
     "%(senderName)s made future room history visible to": "%(senderName)s a rendu l'historique visible de",
     "Manage Integrations": "Gestion des intégrations",
-    "Markdown is disabled": "Le formatage \"Markdown\" est désactivé"
+    "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 :",
+    "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",
+    "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",
+    "Moderator": "Modérateur",
+    "Must be viewing a room": "Doit être en train de visualiser un salon",
+    "my Matrix ID": "mon Matrix ID",
+    "Name": "Nom",
+    "Never send encrypted messages to unverified devices from this device": "Ne jamais envoyer de message encryptés aux appareils non-vérifiés depuis cet appareil",
+    "Never send encrypted messages to unverified devices in this room": "Ne jamais envoyer de message encryptés 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 encryptés 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 & Autocomplé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.",
+    "none": "aucun",
+    "not set": "non défini",
+    "not specified": "non spécifié",
+    "(not supported by this browser)": "(non supporté par cet explorateur)",
+    "<not supported>": "<non supporté>",
+    "NOT verified": "NON vérifié",
+    "No devices with registered encryption keys": "Pas d’appareil avec des clés d’encryption enregistrées",
+    "No more results": "Fin des résultats",
+    "No results": "Pas de résultats"
 }

From ad2c84375d150ed386d2b73634630794abec5643 Mon Sep 17 00:00:00 2001
From: nouts <nouts@protonmail.com>
Date: Sat, 27 May 2017 10:08:13 +0000
Subject: [PATCH 268/312] Translated using Weblate (French)

Currently translated at 57.3% (378 of 659 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 2c77aee405..0ced014f14 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -371,5 +371,15 @@
     "NOT verified": "NON vérifié",
     "No devices with registered encryption keys": "Pas d’appareil avec des clés d’encryption enregistrées",
     "No more results": "Fin des résultats",
-    "No results": "Pas de résultats"
+    "No results": "Pas de résultats",
+    "unknown error code": "Code 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",
+    "or": "ou",
+    "Password": "Mot de passe",
+    "Passwords can't be empty": "Le mot de passe ne peut pas être vide",
+    "People": "Personne",
+    "Permissions": "Permissions",
+    "Phone": "Téléphone"
 }

From b8b6a874239a49e528c3f95a3afe74e3bf12188a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 13:58:20 +0100
Subject: [PATCH 269/312] fixing missing EN translation

---
 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 f317c6a08a..f8a0cb16eb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -407,6 +407,7 @@
   "Sender device information": "Sender device information",
   "Send Invites": "Send Invites",
   "Send Reset Email": "Send Reset Email",
+  "sent an image": "sent an image",
   "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sent an image.",
   "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.",
   "sent a video": "sent a video",

From 2bcb381aa73201b3c5d1e0bb8ab9cf04816535c6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 27 May 2017 14:19:34 +0100
Subject: [PATCH 270/312] maybe window focus should be ignored so focus is left
 as what it was but with this at least clicking on a text input will not make
 you be thrown into composer instead

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 0de38ab226..a4b6b3ea6c 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -906,7 +906,9 @@ module.exports = React.createClass({
     },
 
     onFocus: function(ev) {
-        dis.dispatch({action: 'focus_composer'});
+        if (document.activeElement.textLength === undefined) {
+            dis.dispatch({action: 'focus_composer'});
+        }
     },
 
     showScreen: function(screen, params) {

From 0cacf5b1a0e8807ffa9dee250c619bad563e46aa Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 14:54:05 +0100
Subject: [PATCH 271/312] script to make punctuation consistent in i18n strings

---
 scripts/fix-i18n.pl | 77 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100755 scripts/fix-i18n.pl

diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
new file mode 100755
index 0000000000..6afc93e05e
--- /dev/null
+++ b/scripts/fix-i18n.pl
@@ -0,0 +1,77 @@
+#!/usr/bin/perl -ni
+
+use strict;
+use warnings;
+
+# script which synchronises i18n strings to include punctuation.
+# i've cherry-picked ones which seem to have diverged between the different translations
+# from TextForEvent, causing missing events all over the place
+
+BEGIN {
+$::fixups = [split(/\n/, <<EOT
+%(targetName)s accepted the invitation for %(displayName)s.
+%(targetName)s accepted an invitation.
+%(senderName)s requested a VoIP conference.
+%(senderName)s invited %(targetName)s.
+%(senderName)s banned %(targetName)s.
+%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.
+%(senderName)s set their display name to %(displayName)s.
+%(senderName)s removed their display name (%(oldDisplayName)s).
+%(senderName)s removed their profile picture.
+%(senderName)s changed their profile picture.
+%(senderName)s set a profile picture.
+VoIP conference started.
+%(targetName)s joined the room.
+VoIP conference finished.
+%(targetName)s rejected the invitation.
+%(targetName)s left the room.
+%(senderName)s unbanned %(targetName)s.
+%(senderName)s kicked %(targetName)s.
+%(senderName)s withdrew %(targetName)s's inivitation.
+%(targetName)s left the room.
+%(senderDisplayName)s changed the topic to "%(topic)s".
+%(senderDisplayName)s changed the room name to %(roomName)s.
+%(senderDisplayName)s sent an image.
+%(senderName)s answered the call.
+%(senderName)s ended the call.
+%(senderName)s placed a %(callType)s call.
+%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.
+%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).
+%(senderName)s changed the power level of %(powerLevelDiffText)s.
+EOT
+)];
+}
+
+# example i18n format:
+#   "%(oneUser)sleft": "%(oneUser)sleft",
+
+# script called with the line of the file to be checked
+my $sub = 0;
+if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
+    my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
+
+    foreach my $fixup (@{$::fixups}) {
+        my $dotless_fixup = substr($fixup, 0, -1);
+
+        if ($src eq $dotless_fixup) {
+            print STDERR "fixing up src: $src\n";
+            $src .= '.';
+            $sub = 1;
+        }
+
+        if ($src eq $fixup && $dst !~ /\.$/) {
+            print STDERR "fixing up dst: $dst\n";
+            $dst .= '.';
+            $sub = 1;            
+        }
+
+        if ($sub) {
+            print qq($indent"$src"$colon"$dst"$comma\n);
+            last;
+        }        
+    }
+}
+
+if (!$sub) {
+    print $_;
+}

From 355f4974afc8f746b3f7ec7ad2c7279d052f5a1e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 14:55:55 +0100
Subject: [PATCH 272/312] standardise i18n TextForEvent to include punctuation.

fixes lots of missing & inconsistent strings, as somehow some of the i18n files had ended up with the raw strings being inconsistent in terms of punctuation, causing problems as per https://github.com/vector-im/riot-web/issues/4045
---
 src/TextForEvent.js         | 30 +++++++++++++++---------------
 src/i18n/strings/da.json    |  2 +-
 src/i18n/strings/de_DE.json | 28 ++++++++++++++--------------
 src/i18n/strings/en_EN.json | 28 ++++++++++++++--------------
 src/i18n/strings/fr.json    | 18 +++++++++---------
 src/i18n/strings/pt.json    | 30 +++++++++++++++---------------
 src/i18n/strings/pt_BR.json | 28 ++++++++++++++--------------
 src/i18n/strings/ru.json    | 26 +++++++++++++-------------
 8 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 2d53c5db9f..48a2a7cccc 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -39,7 +39,7 @@ function textForMemberEvent(ev) {
             }
             else {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return _t('%(senderName)s requested a VoIP conference', {senderName: senderName});
+                    return _t('%(senderName)s requested a VoIP conference.', {senderName: senderName});
                 }
                 else {
                     return _t('%(senderName)s invited %(targetName)s.', {senderName: senderName, targetName: targetName});
@@ -53,17 +53,17 @@ function textForMemberEvent(ev) {
         case 'join':
             if (ev.getPrevContent() && ev.getPrevContent().membership == 'join') {
                 if (ev.getPrevContent().displayname && ev.getContent().displayname && ev.getPrevContent().displayname != ev.getContent().displayname) {
-                    return _t('%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s', {senderName: ev.getSender(), oldDisplayName: ev.getPrevContent().displayname, displayName: ev.getContent().displayname});
+                    return _t('%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.', {senderName: ev.getSender(), oldDisplayName: ev.getPrevContent().displayname, displayName: ev.getContent().displayname});
                 } else if (!ev.getPrevContent().displayname && ev.getContent().displayname) {
-                    return _t('%(senderName)s set their display name to %(displayName)s', {senderName: ev.getSender(), displayName: ev.getContent().displayname});
+                    return _t('%(senderName)s set their display name to %(displayName)s.', {senderName: ev.getSender(), displayName: ev.getContent().displayname});
                 } else if (ev.getPrevContent().displayname && !ev.getContent().displayname) {
-                    return _t('%(senderName)s removed their display name (%(oldDisplayName)s)', {senderName: ev.getSender(), oldDisplayName: ev.getPrevContent().displayname});
+                    return _t('%(senderName)s removed their display name (%(oldDisplayName)s).', {senderName: ev.getSender(), oldDisplayName: ev.getPrevContent().displayname});
                 } else if (ev.getPrevContent().avatar_url && !ev.getContent().avatar_url) {
-                    return _t('%(senderName)s removed their profile picture', {senderName: senderName});
+                    return _t('%(senderName)s removed their profile picture.', {senderName: senderName});
                 } else if (ev.getPrevContent().avatar_url && ev.getContent().avatar_url && ev.getPrevContent().avatar_url != ev.getContent().avatar_url) {
-                    return _t('%(senderName)s changed their profile picture', {senderName: senderName});
+                    return _t('%(senderName)s changed their profile picture.', {senderName: senderName});
                 } else if (!ev.getPrevContent().avatar_url && ev.getContent().avatar_url) {
-                    return _t('%(senderName)s set a profile picture', {senderName: senderName});
+                    return _t('%(senderName)s set a profile picture.', {senderName: senderName});
                 } else {
                     // suppress null rejoins
                     return '';
@@ -71,7 +71,7 @@ function textForMemberEvent(ev) {
             } else {
                 if (!ev.target) console.warn("Join message has no target! -- " + ev.getContent().state_key);
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return _t('VoIP conference started');
+                    return _t('VoIP conference started.');
                 }
                 else {
                     return _t('%(targetName)s joined the room.', {targetName: targetName});
@@ -80,7 +80,7 @@ function textForMemberEvent(ev) {
         case 'leave':
             if (ev.getSender() === ev.getStateKey()) {
                 if (ConferenceHandler && ConferenceHandler.isConferenceUser(ev.getStateKey())) {
-                    return _t('VoIP conference finished');
+                    return _t('VoIP conference finished.');
                 }
                 else if (ev.getPrevContent().membership === "invite") {
                     return _t('%(targetName)s rejected the invitation.', {targetName: targetName});
@@ -112,13 +112,13 @@ function textForMemberEvent(ev) {
 
 function textForTopicEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
-    return _t('%(senderDisplayName)s changed the topic to "%(topic)s"', {senderDisplayName: senderDisplayName, topic: ev.getContent().topic});
+    return _t('%(senderDisplayName)s changed the topic to "%(topic)s".', {senderDisplayName: senderDisplayName, topic: ev.getContent().topic});
 }
 
 function textForRoomNameEvent(ev) {
     var senderDisplayName = ev.sender && ev.sender.name ? ev.sender.name : ev.getSender();
 
-    return _t('%(senderDisplayName)s changed the room name to %(roomName)s', {senderDisplayName: senderDisplayName, roomName: ev.getContent().name});
+    return _t('%(senderDisplayName)s changed the room name to %(roomName)s.', {senderDisplayName: senderDisplayName, roomName: ev.getContent().name});
 }
 
 function textForMessageEvent(ev) {
@@ -135,13 +135,13 @@ function textForMessageEvent(ev) {
 function textForCallAnswerEvent(event) {
     var senderName = event.sender ? event.sender.name : _t('Someone');
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('%(senderName)s answered the call', {senderName: senderName}) + ' ' + supported;
+    return _t('%(senderName)s answered the call.', {senderName: senderName}) + ' ' + supported;
 }
 
 function textForCallHangupEvent(event) {
     var senderName = event.sender ? event.sender.name : _t('Someone');
     var supported = MatrixClientPeg.get().supportsVoip() ? "" : _t('(not supported by this browser)');
-    return _t('%(senderName)s ended the call', {senderName: senderName}) + ' ' + supported;
+    return _t('%(senderName)s ended the call.', {senderName: senderName}) + ' ' + supported;
 }
 
 function textForCallInviteEvent(event) {
@@ -186,7 +186,7 @@ function textForHistoryVisibilityEvent(event) {
 
 function textForEncryptionEvent(event) {
     var senderName = event.sender ? event.sender.name : event.getSender();
-    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)', {senderName: senderName, algorithm: event.getContent().algorithm});
+    return _t('%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).', {senderName: senderName, algorithm: event.getContent().algorithm});
 }
 
 // Currently will only display a change if a user's power level is changed
@@ -224,7 +224,7 @@ function textForPowerEvent(event) {
     if (!diff.length) {
         return '';
     }
-    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s', {senderName: senderName, powerLevelDiffText: diff.join(", ")});
+    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {senderName: senderName, powerLevelDiffText: diff.join(", ")});
 }
 
 var handlers = {
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 72e0ae60c2..af6f0bb0fe 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -132,7 +132,7 @@
     "de": "Tysk",
     "da": "Dansk",
     "ru": "Russisk",
-    "%(targetName)s accepted an invitation": "%(targetName)s accepterede en invitation",
+    "%(targetName)s accepted an invitation.": "%(targetName)s accepterede en invitation.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepteret invitationen til %(displayName)s.",
     "%(names)s and %(lastPerson)s are typing": "%(names)s og %(lastPerson)s er ved at skrive",
     "%(names)s and one other are typing": "%(names)s og den anden skriver",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ed2d127771..0d14a80e81 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -258,8 +258,8 @@
     "Verification Pending": "Verifizierung ausstehend",
     "Video call": "Videoanruf",
     "Voice call": "Sprachanruf",
-    "VoIP conference finished": "VoIP-Konferenz beendet",
-    "VoIP conference started": "VoIP-Konferenz gestartet",
+    "VoIP conference finished.": "VoIP-Konferenz beendet.",
+    "VoIP conference started.": "VoIP-Konferenz gestartet.",
     "(warning: cannot be disabled again!)": "(Warnung: Kann nicht wieder deaktiviert werden!)",
     "was banned": "wurde gebannt",
     "was invited": "wurde eingeladen",
@@ -348,19 +348,19 @@
     "Encrypt room": "Entschlüssele Raum",
     "To send events of type": "Zum Senden von Ereignissen mit Typ",
     "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
-    "%(targetName)s accepted an invitation": "%(targetName)s akzeptierte eine Einladung",
+    "%(targetName)s accepted an invitation.": "%(targetName)s akzeptierte eine Einladung.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akzeptierte eine Einladung für %(displayName)s.",
     "%(names)s and one other are typing": "%(names)s und eine weitere Person tippen",
     "%(names)s and %(count)s others are typing": "%(names)s und %(count)s weitere Personen tippen",
     "%(senderName)s answered the call.": "%(senderName)s beantwortete den Anruf.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s bannte %(targetName)s.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s änderte den Anzeigenamen von %(oldDisplayName)s zu %(displayName)s",
-    "%(senderName)s changed their profile picture": "%(senderName)s änderte das Profilbild",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s",
-    "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s änderte den Anzeigenamen von %(oldDisplayName)s zu %(displayName)s.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s änderte das Profilbild.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\"",
     "/ddg is not a command": "/ddg ist kein Kommando",
-    "%(senderName)s ended the call": "%(senderName)s beendete den Anruf",
+    "%(senderName)s ended the call.": "%(senderName)s beendete den Anruf.",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
     "Failed to send request.": "Anfrage zu senden schlug fehl.",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s von %(fromPowerLevel)s zu %(toPowerLevel)s",
@@ -379,18 +379,18 @@
     "Power level must be positive integer.": "Berechtigungslevel muss eine positive Zahl sein.",
     "Reason": "Grund",
     "%(targetName)s rejected the invitation.": "%(targetName)s lehnte die Einladung ab.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s löschte den Anzeigenamen (%(oldDisplayName)s)",
-    "%(senderName)s removed their profile picture": "%(senderName)s löschte das Profilbild",
-    "%(senderName)s requested a VoIP conference": "%(senderName)s fragte nach einer VoIP-Konferenz",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s löschte den Anzeigenamen (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s löschte das Profilbild.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s fragte nach einer VoIP-Konferenz.",
     "Room %(roomId)s not visible": "Raum %(roomId)s ist nicht sichtbar",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s hat ein Bild gesendet.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sandte eine Einladung an %(targetDisplayName)s um diesem Raum beizutreten.",
-    "%(senderName)s set a profile picture": "%(senderName)s setzte ein Profilbild",
-    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s setzte den Anzeigenamen zu %(displayName)s",
+    "%(senderName)s set a profile picture.": "%(senderName)s setzte ein Profilbild.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s setzte den Anzeigenamen zu %(displayName)s.",
     "This room is not recognised.": "Dieser Raum wurde nicht erkannt.",
     "These are experimental features that may break in unexpected ways": "Dies sind experimentelle Funktionen, die in unerwarteter Weise Fehler verursachen können",
     "To use it, just wait for autocomplete results to load and tab through them.": "Um dies zu nutzen, warte auf die Autovervollständigungsergebnisse und benutze die TAB Taste.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s schaltete Ende-zu-Ende-Verschlüsselung ein (Algorithmus: %(algorithm)s)",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s schaltete Ende-zu-Ende-Verschlüsselung ein (Algorithmus: %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s zog Bann für %(targetName)s zurück.",
     "Usage": "Verwendung",
     "Use with caution": "Mit Vorsicht benutzen",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f8a0cb16eb..1d55f11c3c 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -124,7 +124,7 @@
   "A registered account is required for this action": "A registered account is required for this action",
   "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains",
   "accept": "accept",
-  "%(targetName)s accepted an invitation": "%(targetName)s accepted an invitation",
+  "%(targetName)s accepted an invitation.": "%(targetName)s accepted an invitation.",
   "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepted the invitation for %(displayName)s.",
   "Account": "Account",
   "Access Token:": "Access Token:",
@@ -172,10 +172,10 @@
   "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s",
   "Can't load user settings": "Can't load user settings",
   "Change Password": "Change Password",
-  "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s",
-  "%(senderName)s changed their profile picture": "%(senderName)s changed their profile picture",
-  "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s changed the power level of %(powerLevelDiffText)s",
-  "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s changed the room name to %(roomName)s",
+  "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.",
+  "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
+  "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
+  "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
   "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s changed the topic to \"%(topic)s\"",
   "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
   "Changes your display nickname": "Changes your display nickname",
@@ -235,7 +235,7 @@
   "Enable encryption": "Enable encryption",
   "Encrypted messages will not be visible on clients that do not yet implement encryption": "Encrypted messages will not be visible on clients that do not yet implement encryption",
   "Encrypted room": "Encrypted room",
-  "%(senderName)s ended the call": "%(senderName)s ended the call",
+  "%(senderName)s ended the call.": "%(senderName)s ended the call.",
   "End-to-end encryption information": "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",
   "Enter Code": "Enter Code",
@@ -381,10 +381,10 @@
   "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
   "Reject invitation": "Reject invitation",
   "Remove Contact Information?": "Remove Contact Information?",
-  "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removed their display name (%(oldDisplayName)s)",
-  "%(senderName)s removed their profile picture": "%(senderName)s removed their profile picture",
+  "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
+  "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
   "Remove": "Remove",
-  "%(senderName)s requested a VoIP conference": "%(senderName)s requested a VoIP conference",
+  "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
   "Report it": "Report it",
   "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": "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",
   "restore": "restore",
@@ -418,8 +418,8 @@
   "Server may be unavailable, overloaded, or you hit a bug": "Server may be unavailable, overloaded, or you hit a bug",
   "Server unavailable, overloaded, or something else went wrong": "Server unavailable, overloaded, or something else went wrong",
   "Session ID": "Session ID",
-  "%(senderName)s set a profile picture": "%(senderName)s set a profile picture",
-  "%(senderName)s set their display name to %(displayName)s": "%(senderName)s set their display name to %(displayName)s",
+  "%(senderName)s set a profile picture.": "%(senderName)s set a profile picture.",
+  "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
   "Settings": "Settings",
   "Show panel": "Show panel",
   "Show timestamps in 12 hour format (e.g. 2:30pm)": "Show timestamps in 12 hour format (e.g. 2:30pm)",
@@ -483,7 +483,7 @@
   "Tried to load a specific point in this room's timeline, but was unable to find it": "Tried to load a specific point in this room's timeline, but was unable to find it",
   "Turn Markdown off": "Turn Markdown off",
   "Turn Markdown on": "Turn Markdown on",
-  "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)",
+  "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).",
   "Unable to add email address": "Unable to add email address",
   "Unable to remove contact information": "Unable to remove contact information",
   "Unable to restore previous session": "Unable to restore previous session",
@@ -517,8 +517,8 @@
   "verified": "verified",
   "Video call": "Video call",
   "Voice call": "Voice call",
-  "VoIP conference finished": "VoIP conference finished",
-  "VoIP conference started": "VoIP conference started",
+  "VoIP conference finished.": "VoIP conference finished.",
+  "VoIP conference started.": "VoIP conference started.",
   "VoIP is unsupported": "VoIP is unsupported",
   "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
   "Warning!": "Warning!",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 0ced014f14..0a20bc1a87 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -137,7 +137,7 @@
     "Enable encryption": "Activer l'encryption",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Les messages encryptés ne seront pas visibles dans les clients qui n’implémentent pas encore l’encryption",
     "Encrypted room": "Salon encrypté",
-    "%(senderName)s ended the call": "%(senderName)s a terminé l’appel",
+    "%(senderName)s ended the call.": "%(senderName)s a terminé l’appel.",
     "End-to-end encryption information": "Information sur l'encryption bout-en-bout",
     "End-to-end encryption is in beta and may not be reliable": "L’encryption bout-en-bout est en béta et risque de ne pas être fiable",
     "Enter Code": "Entrer le code",
@@ -173,8 +173,8 @@
     "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",
     "accept": "Accepter",
-    "%(targetName)s accepted an invitation": "%(targetName)s a accepté une invitation",
-    "%(targetName)s accepted the invitation for %(displayName)s": "%(targetName)s a accepté une invitation de %(displayName)s",
+    "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté une invitation de %(displayName)s.",
     "Account": "Compte",
     "Add email address": "Ajouter une adresse e-mail",
     "Add phone number": "Ajouter un numéro de téléphone",
@@ -196,7 +196,7 @@
     "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train de taper",
     "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é.",
-    "%(senderName)s answered the call": "%(senderName)s a répondu à l’appel",
+    "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
     "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les invités",
     "Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les invités",
     "Are you sure?": "Êtes-vous sûr ?",
@@ -204,7 +204,7 @@
     "Are you sure you want upload the following files?": "Êtes-vous sûr de vouloir télécharger les fichiers suivants ?",
     "Attachment": "Pièce jointe",
     "Autoplay GIFs and videos": "Jouer automatiquement les GIFs et vidéos",
-    "%(senderName)s banned %(targetName)s": "%(senderName)s a banni %(targetName)s",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
     "Ban": "Bannir",
     "Banned users": "Utilisateurs bannis",
     "Bans user with given id": "Utilisateurs bannis avec un identifiant donné",
@@ -215,10 +215,10 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Impossible de se connecter au homeserver en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou %(urlStart)s activez le support des scripts non-vérifiés %(urlEnd)s",
     "Can't load user settings": "Impossible de charger les paramètres 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",
-    "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s",
+    "%(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.",
+    "%(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",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 356510a94a..fc4b32f929 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -254,8 +254,8 @@
     "verified": "verificado",
     "Video call": "Chamada de vídeo",
     "Voice call": "Chamada de voz",
-    "VoIP conference finished": "Conferência VoIP encerrada",
-    "VoIP conference started": "Conferência VoIP iniciada",
+    "VoIP conference finished.": "Conferência VoIP encerrada.",
+    "VoIP conference started.": "Conferência VoIP iniciada.",
     "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)",
     "Warning!": "Atenção!",
     "was banned": "banida/o",
@@ -304,7 +304,7 @@
     "de": "Alemão",
     "da": "Dinamarquês",
     "ru": "Russo",
-    "%(targetName)s accepted an invitation": "%(targetName)s aceitou um convite.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "all room members, from the point they are invited": "todas/os as/os integrantes da sala, a partir do momento em que foram convidadas/os",
     "all room members, from the point they joined": "todas/os as/os integrantes da sala, a partir do momento em que entraram na sala",
@@ -315,10 +315,10 @@
     "anyone.": "qualquer pessoa",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s",
-    "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
-    "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s alterou o tópico para \"%(topic)s\"",
     "click to reveal": "clique para ver",
     "Conference call failed": "Chamada de conferência falhou",
@@ -328,7 +328,7 @@
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here %(toAction)s": "Arraste aqui %(toAction)s",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
-    "%(senderName)s ended the call": "%(senderName)s finalizou a chamada",
+    "%(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",
@@ -342,7 +342,7 @@
     "%(displayName)s is typing": "%(displayName)s está escrevendo",
     "%(targetName)s joined the room.": "%(targetName)s entrou na sala.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
-    "%(targetName)s left the room": "%(targetName)s saiu da sala",
+    "%(targetName)s left the room.": "%(targetName)s saiu da sala.",
     "%(senderName)s made future room history visible to": "%(senderName)s deixou o histórico futuro da sala visível para",
     "Missing room_id in request": "Faltou o id da sala na requisição",
     "Missing user_id in request": "Faltou o id de usuário na requisição",
@@ -356,16 +356,16 @@
     "Reason": "Razão",
     "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s)",
-    "%(senderName)s removed their profile picture": "%(senderName)s removeu sua imagem de perfil",
-    "%(senderName)s requested a VoIP conference": "%(senderName)s está solicitando uma conferência de voz",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "%(senderName)s set a profile picture": "%(senderName)s definiu uma imagem de perfil",
-    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s definiu seu nome público para %(displayName)s",
+    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
     "tag as %(tagName)s": "marcar como %(tagName)s",
     "This email address is already in use": "Este endereço de email já está sendo usado",
     "This email address was not found": "Este endereço de email não foi encontrado",
@@ -384,7 +384,7 @@
     "to start a chat with someone": "para iniciar uma conversa com alguém",
     "to tag direct chat": "para marcar a conversa como pessoal",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s)",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
     "Unable to restore previous session": "Não foi possível restaurar a sessão anterior",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 8f9bb015a0..7cdecb3189 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -259,8 +259,8 @@
     "verified": "verificado",
     "Video call": "Chamada de vídeo",
     "Voice call": "Chamada de voz",
-    "VoIP conference finished": "Conferência VoIP encerrada",
-    "VoIP conference started": "Conferência VoIP iniciada",
+    "VoIP conference finished.": "Conferência VoIP encerrada.",
+    "VoIP conference started.": "Conferência VoIP iniciada.",
     "(warning: cannot be disabled again!)": "(atenção: esta operação não poderá ser desfeita depois!)",
     "Warning": "Atenção!",
     "was banned": "banida/o",
@@ -309,7 +309,7 @@
     "de": "Alemão",
     "da": "Dinamarquês",
     "ru": "Russo",
-    "%(targetName)s accepted an invitation": "%(targetName)s aceitou um convite",
+    "%(targetName)s accepted an invitation.": "%(targetName)s aceitou um convite.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceitou o convite para %(displayName)s.",
     "all room members, from the point they are invited": "todas/os as/os integrantes da sala, a partir do momento em que foram convidadas/os",
     "all room members, from the point they joined": "todas/os as/os integrantes da sala, a partir do momento em que entraram na sala",
@@ -320,10 +320,10 @@
     "anyone.": "qualquer pessoa",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s",
-    "%(senderName)s changed their profile picture": "%(senderName)s alterou sua imagem de perfil",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s",
-    "%(senderDisplayName)s changed the room name to %(roomName)s": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
     "click to reveal": "clique para ver",
     "Conference call failed": "Chamada de conferência falhou",
     "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
@@ -332,7 +332,7 @@
     "/ddg is not a command": "/ddg não é um comando",
     "Drop here %(toAction)s": "Arraste aqui %(toAction)s",
     "Drop here to tag %(section)s": "Arraste aqui para marcar como %(section)s",
-    "%(senderName)s ended the call": "%(senderName)s finalizou a chamada",
+    "%(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",
@@ -360,16 +360,16 @@
     "Reason": "Razão",
     "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
-    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s)",
-    "%(senderName)s removed their profile picture": "%(senderName)s removeu sua imagem de perfil",
-    "%(senderName)s requested a VoIP conference": "%(senderName)s está solicitando uma conferência de voz",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s está solicitando uma conferência de voz.",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot não tem permissões para enviar notificações a você - por favor, verifique as configurações do seu navegador",
     "Riot was not given permission to send notifications - please try again": "Riot não tem permissões para enviar notificações a você - por favor, tente novamente",
     "Room %(roomId)s not visible": "A sala %(roomId)s não está visível",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou uma imagem.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou um convite para %(targetDisplayName)s entrar na sala.",
-    "%(senderName)s set a profile picture": "%(senderName)s definiu uma imagem de perfil",
-    "%(senderName)s set their display name to %(displayName)s": "%(senderName)s definiu seu nome público para %(displayName)s",
+    "%(senderName)s set a profile picture.": "%(senderName)s definiu uma imagem de perfil.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s definiu seu nome público para %(displayName)s.",
     "tag as %(tagName)s": "marcar como %(tagName)s",
     "This email address is already in use": "Este endereço de email já está sendo usado",
     "This email address was not found": "Este endereço de email não foi encontrado",
@@ -389,7 +389,7 @@
     "to tag as %(tagName)s": "para marcar como %(tagName)s",
     "to tag direct chat": "para marcar a conversa como pessoal",
     "To use it, just wait for autocomplete results to load and tab through them.": "Para usar esta funcionalidade, espere o carregamento dos resultados de autocompletar e então escolha entre as opções.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s)",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ativou criptografia ponta a ponta (algoritmo %(algorithm)s).",
     "Unable to restore previous session": "Não foi possível restaurar a sessão anterior",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
     "Unable to capture screen": "Não foi possível capturar a imagem da tela",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index d17d4723c5..b34c633f94 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -188,8 +188,8 @@
     "verified": "проверенный",
     "Video call": "Видио вызов",
     "Voice call": "Голосовой вызов",
-    "VoIP conference finished": "VoIP конференция закончилась",
-    "VoIP conference started": "VoIP Конференция стартовала",
+    "VoIP conference finished.": "VoIP конференция закончилась.",
+    "VoIP conference started.": "VoIP Конференция стартовала.",
     "(warning: cannot be disabled again!)": "(предупреждение: не может быть снова отключен!)",
     "Warning!": "Предупреждение!",
     "was banned": "запрещен",
@@ -216,7 +216,7 @@
     "de": "Немецкий",
     "da": "Датский",
     "ru": "Русский",
-    "%(targetName)s accepted an invitation": "%(targetName)s принял приглашение",
+    "%(targetName)s accepted an invitation.": "%(targetName)s принял приглашение.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
     "Resend all": "Переслать снова всем",
     "cancel all": "отменить всем",
@@ -227,10 +227,10 @@
     "%(senderName)s answered the call.": "%(senderName)s ответил на звонок.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s запрещенный %(targetName)s.",
     "Call Timeout": "Время ожидания вызова",
-    "%(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",
+    "%(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 changed the topic to \"%(topic)s\"": "%(senderDisplayName)s измененная тема на %(topic)s",
     "Conference call failed": "Конференц-вызов прервался",
     "Conference calling is in development and may not be reliable": "Конференц-вызов находится в процессе и может не быть надежным",
@@ -239,7 +239,7 @@
     "/ddg is not a command": "/ddg не команда",
     "Drop here %(toAction)s": "Вставить здесь %(toAction)s",
     "Drop here to tag %(section)s": "Вставить здесь для тега %(section)s",
-    "%(senderName)s ended the call": "%(senderName)s прекратил звонок",
+    "%(senderName)s ended the call.": "%(senderName)s прекратил звонок.",
     "Existing Call": "Существующий вызов",
     "Failed to lookup current room": "Не удалось выполнить поиск текущий комнаты",
     "Failed to send request.": "Не удалось выслать запрос.",
@@ -251,7 +251,7 @@
     "click to reveal": "нажать для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s вводит текст",
-    "%(targetName)s joined the room": "%(targetName)s  присоединенный к комнате",
+    "%(targetName)s joined the room.": "%(targetName)s  присоединенный к комнате.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s выкинул %(targetName)s.",
     "%(targetName)s left the room.": "%(targetName)s покинул комнату.",
     "%(senderName)s made future room history visible to": "%(senderName)s  история сделаной будущей комнаты, видимая для",
@@ -390,7 +390,7 @@
     "to start a chat with someone": "Начать чат с кем-то",
     "to tag direct chat": "Пометить прямой чат",
     "To use it, just wait for autocomplete results to load and tab through them.": "Для его использования, просто подождите результатов автозаполнения для загрузки на вкладке и через них.",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s)": "%(senderName)s включил сквозное шифрование (algorithm %(algorithm)s)",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включил сквозное шифрование (algorithm %(algorithm)s).",
     "Unable to restore previous session": "Невозможно востановить предыдущий сеанс",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s запрет отменен %(targetName)s.",
     "Unable to capture screen": "Невозможно записать снимок экрана",
@@ -537,9 +537,9 @@
     "%(targetName)s rejected the invitation.": "%(targetName)s отклонил приглашение.",
     "Reject invitation": "Отклонить приглашение",
     "Remove Contact Information?": "Убрать контактную информацию?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s)": "%(senderName)s убрал своё отображаемое имя (%(oldDisplayName)s)",
-    "%(senderName)s removed their profile picture": "%(senderName)s убрал своё изображение",
-    "%(senderName)s requested a VoIP conference": "%(senderName)s запросил голосовую конференц-связь",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s убрал своё отображаемое имя (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s убрал своё изображение.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s запросил голосовую конференц-связь.",
     "Report it": "Сообщить об этом",
     "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": "На данный момент сброс пароля сбросит все ключи шифрования на всех устройствах, зашифрованная история общения будет нечитаема, если вы сперва не скачаете ваши ключи от комнаты и не загрузите их после. В будущем это будет улучшено",
     "restore": "восстановить",

From 398ad4798ec4b108bdfa54388d353f843588ec1e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 14:57:52 +0100
Subject: [PATCH 273/312] fix string typo

---
 src/TextForEvent.js         | 2 +-
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 src/i18n/strings/pt.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 src/i18n/strings/ru.json    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 48a2a7cccc..a1b13035ba 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -100,7 +100,7 @@ function textForMemberEvent(ev) {
             }
             else if (ev.getPrevContent().membership === "invite") {
                 return _t(
-                    '%(senderName)s withdrew %(targetName)s\'s inivitation.',
+                    '%(senderName)s withdrew %(targetName)s\'s invitation.',
                     {senderName: senderName, targetName: targetName}
                 ) + ' ' + reason;
             }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0d14a80e81..6ddbee0eb1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -394,7 +394,7 @@
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s zog Bann für %(targetName)s zurück.",
     "Usage": "Verwendung",
     "Use with caution": "Mit Vorsicht benutzen",
-    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s zog die Einladung für %(targetName)s zurück.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s zog die Einladung für %(targetName)s zurück.",
     "You need to be able to invite users to do that.": "Du musst in der Lage sein Nutzer einzuladen um dies zu tun.",
     "You need to be logged in.": "Du musst angemeldet sein.",
     "There are no visible files in this room": "Es gibt keine sichtbaren Dateien in diesem Raum",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1d55f11c3c..d2e2618869 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -526,7 +526,7 @@
   "Who can read history?": "Who can read history?",
   "Who would you like to add to this room?": "Who would you like to add to this room?",
   "Who would you like to communicate with?": "Who would you like to communicate with?",
-  "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s withdrew %(targetName)s's inivitation.",
+  "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
   "Would you like to": "Would you like to",
   "You are already in a call": "You are already in a call",
   "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index fc4b32f929..66ca428aeb 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -393,7 +393,7 @@
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
-    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s desfez o convite a %(targetName)s's.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s's.",
     "You are already in a call": "Você já está em  uma chamada",
     "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
     "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 7cdecb3189..d371ac51dc 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -398,7 +398,7 @@
     "Usage": "Uso",
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
-    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s desfez o convite a %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s desfez o convite a %(targetName)s.",
     "You are already in a call": "Você já está em  uma chamada",
     "You're not in any rooms yet! Press": "Você ainda não está em nenhuma sala! Pressione",
     "You are trying to access %(roomName)s": "Você está tentando acessar a sala %(roomName)s",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b34c633f94..bf506c60e0 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -364,7 +364,7 @@
     "You're not in any rooms yet! Press": "Вы еще не находитесь ни в каких комнатах! Нажать",
     "You are trying to access %(roomName)s": "Вы пытаетесь получить доступ %(roomName)s",
     "You cannot place a call with yourself": "Вы не можете позвонить самим себе",
-    "%(senderName)s withdrew %(targetName)s's inivitation.": "%(senderName)s анулировал %(targetName)s's преглашение.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s анулировал %(targetName)s's преглашение.",
     "Sep": "Сен.",
     "Jan": "Янв.",
     "Feb": "Фев.",

From 6d6b14a26ca4bdb90cc878a00bc7f9574d2d039c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 15:52:24 +0100
Subject: [PATCH 274/312] fix spurious missing translation ('Default')

---
 src/TextForEvent.js         | 11 +++++++++--
 src/i18n/strings/en_EN.json |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index a1b13035ba..169868e812 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -217,14 +217,21 @@ function textForPowerEvent(event) {
         const to = event.getContent().users[userId];
         if (to !== from) {
             diff.push(
-            	_t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {userId: userId, fromPowerLevel: Roles.textualPowerLevel(from, userDefault), toPowerLevel: Roles.textualPowerLevel(to, userDefault)})
+            	_t('%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s', {
+                    userId: userId,
+                    fromPowerLevel: Roles.textualPowerLevel(from, userDefault),
+                    toPowerLevel: Roles.textualPowerLevel(to, userDefault)
+                })
             );
         }
     });
     if (!diff.length) {
         return '';
     }
-    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {senderName: senderName, powerLevelDiffText: diff.join(", ")});
+    return _t('%(senderName)s changed the power level of %(powerLevelDiffText)s.', {
+        senderName: senderName,
+        powerLevelDiffText: diff.join(", ")
+    });
 }
 
 var handlers = {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d2e2618869..b16800fb04 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -214,6 +214,7 @@
   "Delete": "Delete",
   "demote": "demote",
   "Deops user with given id": "Deops user with given id",
+  "Default": "Default",
   "Device ID": "Device ID",
   "Devices": "Devices",
   "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room",

From f0f5bc83f252f9f68b84eeaebbc25de1b9e434c2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 15:54:52 +0100
Subject: [PATCH 275/312] fix more weirdly inconsistent fullstops

---
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 src/i18n/strings/fr.json    | 2 +-
 src/i18n/strings/pt.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 src/i18n/strings/ru.json    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6ddbee0eb1..417f332695 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -123,7 +123,7 @@
     "Forget room": "Raum vergessen",
     "Forgot your password?": "Passwort vergessen?",
     "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.": "Aus Sicherheitsgründen werden beim Ausloggen alle Ende-zu-Ende-Verschlüsselungsschlüssel von diesem Browser gelöscht. Wenn du in späteren Riot-Sitzungen die Konversationshistorie entschlüsseln möchtest, exportiere bitte deine Schlüssel zur sicheren Verwahrung.",
-    "For security, this session has been signed out. Please sign in again": "Zur Sicherheit wurde diese Sitzung abgemeldet. Bitte melde dich erneut an",
+    "For security, this session has been signed out. Please sign in again.": "Zur Sicherheit wurde diese Sitzung abgemeldet. Bitte melde dich erneut an.",
     "Found a bug?": "Fehler gefunden?",
     "Guests cannot join this room even if explicitly invited": "Gäste können diesem Raum nicht beitreten auch wenn sie explizit eingeladen werden",
     "Guests can't set avatars. Please register.": "Gäste können keine Avatare setzen. Bitte registriere dich.",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b16800fb04..4d1f3ad53f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -275,7 +275,7 @@
   "Filter room members": "Filter room members",
   "Forget room": "Forget room",
   "Forgot your password?": "Forgot your password?",
-  "For security, this session has been signed out. Please sign in again": "For security, this session has been signed out. Please sign in again",
+  "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
   "Found a bug?": "Found a bug?",
   "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
   "Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 0a20bc1a87..b8ed7684be 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -294,7 +294,7 @@
     "Filter room members": "Filtrer les membres par nom",
     "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 authentifer à nouveau",
+    "For security, this session has been signed out. Please sign in again.": "Par sécurité, la session a expiré. Merci de vous authentifer à nouveau.",
     "Found a bug?": "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 utilisateurs invités ne peuvent créer de nouveaux salons. Merci de vous enregistrer pour commencer une discussion",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 66ca428aeb..1d972ec1af 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -94,7 +94,7 @@
     "Forget room": "Esquecer sala",
     "Forgot your password?": "Esqueceu sua senha?",
     "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.": "Por segurança, deslogar irá remover qualquer chave de criptografia ponta-a-ponta deste navegador. Caso deseje descriptografar o histórico das suas conversas E2E em sessões Riot futuras, por favor exporte as chaves da sala para sua garantia.",
-    "For security, this session has been signed out. Please sign in again": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente",
+    "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
     "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
     "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
     "Guests can't set avatars. Please register": "Convidados não podem definir uma foto do perfil. Por favor, registre-se",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index d371ac51dc..9e1f864caa 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -97,7 +97,7 @@
     "Forget room": "Esquecer sala",
     "Forgot your password?": "Esqueceu sua senha?",
     "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.": "Por segurança, deslogar irá remover qualquer chave de criptografia ponta-a-ponta deste navegador. Caso deseje descriptografar o histórico das suas conversas E2E em sessões Riot futuras, por favor exporte as chaves da sala para sua garantia.",
-    "For security, this session has been signed out. Please sign in again": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente",
+    "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
     "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
     "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
     "Guests can't set avatars. Please register": "Convidados não podem definir uma foto do perfil. Por favor, registre-se",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index bf506c60e0..279ce3b6c0 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -88,7 +88,7 @@
     "Filter room members": "Фильтр участников комнаты",
     "Forget room": "Забыть комнату",
     "Forgot your password?": "Вы забыли пароль?",
-    "For security, this session has been signed out. Please sign in again": "Для обеспечения безопасности, эта сессия была подписана. Войдите в систему еще раз.",
+    "For security, this session has been signed out. Please sign in again.": "Для обеспечения безопасности, эта сессия была подписана. Войдите в систему еще раз.",
     "Found a bug?": "Нашли ошибку?",
     "had": "имеет",
     "Hangup": "Отключение",

From c34edbec3eda3d655bb497301f91e398a0fa6b46 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 16:02:51 +0100
Subject: [PATCH 276/312] include fullstop fixup

---
 scripts/fix-i18n.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
index 6afc93e05e..2924340dc2 100755
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@@ -38,6 +38,7 @@ VoIP conference finished.
 %(senderName)s sent an invitation to %(targetDisplayName)s to join the room.
 %(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).
 %(senderName)s changed the power level of %(powerLevelDiffText)s.
+For security, this session has been signed out. Please sign in again.
 EOT
 )];
 }

From 957aa0403d34f33f13d24f00e51ea86e56adef77 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 16:03:07 +0100
Subject: [PATCH 277/312] fix https://github.com/vector-im/riot-web/issues/4052

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

diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 2cf9ade847..b20b2ef58e 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -86,7 +86,7 @@ module.exports = React.createClass({
     _roomNameElement: function(fallback) {
         fallback = fallback || 'a room';
         const name = this.props.room ? this.props.room.name : (this.props.room_alias || "");
-        return name ? { name } : fallback;
+        return name ? name : fallback;
     },
 
     render: function() {

From c8dab3ae65513976d3b70bc2607df14690695e98 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 16:47:15 +0100
Subject: [PATCH 278/312] script for checking health of i18n

---
 scripts/check-i18n.pl | 68 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100755 scripts/check-i18n.pl

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
new file mode 100755
index 0000000000..ebafa0b19c
--- /dev/null
+++ b/scripts/check-i18n.pl
@@ -0,0 +1,68 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use Cwd 'abs_path';
+
+# script which checks how out of sync the i18ns are drifting
+
+# example i18n format:
+#   "%(oneUser)sleft": "%(oneUser)sleft",
+
+$|=1;
+
+$0 =~ /^(.*\/)/;
+my $i18ndir = abs_path($1."/../src/i18n/strings");
+my $en = read_i18n($i18ndir."/en_EN.json");
+
+opendir(DIR, $i18ndir) || die $!;
+my @files = readdir(DIR);
+closedir(DIR);
+foreach my $lang (grep { -f "$i18ndir/$_" && !/en_EN\.json/ } @files) {
+    print "\nChecking $lang\n";
+
+    my $map = read_i18n($i18ndir."/".$lang);
+    my $count = 0;
+
+    foreach my $k (sort keys %$map) {
+        if ($en->{$k}) {
+            if ($map->{$k} eq $k) {
+                printf ("%10s %24s\t%s\n", $lang, "Untranslated string?", "$k");
+            }
+            $count++;
+        }
+        else {
+            if ($en->{$k . "."}) {
+                printf ("%10s %24s\t%s\n", $lang, "en_EN has fullstop!", "$k");
+                next;
+            }
+
+            $k =~ /^(.*)\.?$/;
+            if ($en->{$1}) {
+                printf ("%10s %24s\t%s\n", $lang, "en_EN lacks fullstop!", "$k");
+                next;
+            }
+
+            printf ("%10s %24s\t%s\n", $lang, "Not present in en_EN", "$k");
+        }
+    }
+
+    printf ("$count/" . (scalar keys %$en) . " strings translated\n");
+}
+
+sub read_i18n {
+    my $path = shift;
+    my $map = {};
+
+    open(FILE, "<", $path) || die $!;
+    while(<FILE>) {
+        if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
+            my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
+
+            $map->{$src} = $dst;
+        }
+    }
+    close(FILE);
+
+    return $map;
+}
\ No newline at end of file

From 44f8ee44e641c740b57c68dfd33a0d0a69b3f084 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 17:13:17 +0100
Subject: [PATCH 279/312] check for missing src strings too

---
 scripts/check-i18n.pl | 47 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index ebafa0b19c..a7e5f3c2e2 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -13,8 +13,30 @@ $|=1;
 
 $0 =~ /^(.*\/)/;
 my $i18ndir = abs_path($1."/../src/i18n/strings");
+my $srcdir = abs_path($1."/../src");
+
 my $en = read_i18n($i18ndir."/en_EN.json");
 
+my $src_strings = read_src_strings($srcdir);
+
+print "Checking strings in src\n";
+foreach my $s (@$src_strings) {
+    if (!$en->{$s}) {
+        if ($en->{$s . '.'}) {
+            printf ("%10s %24s\t%s\n", "src", "en_EN has fullstop!", "$s");
+        }
+        else {
+            $s =~ /^(.*)\.?$/;
+            if ($en->{$1}) {
+                printf ("%10s %24s\t%s\n", "src", "en_EN lacks fullstop!", "$s");
+            }
+            else {
+                printf ("%10s %24s\t%s\n", "src", "Translation missing!", "$s");
+            }
+        }
+    }
+}
+
 opendir(DIR, $i18ndir) || die $!;
 my @files = readdir(DIR);
 closedir(DIR);
@@ -65,4 +87,29 @@ sub read_i18n {
     close(FILE);
 
     return $map;
+}
+
+sub read_src_strings {
+    my $path = shift;
+
+    use File::Find;
+    use File::Slurp;
+
+    my $strings = [];
+
+    my @files;
+    find( sub { push @files, $File::Find::name if (-f $_ && /\.jsx?$/) }, $path );
+    foreach my $file (@files) {
+        my $src = read_file($file);
+        while ($src =~ /_t\(\s*'(.*?[^\\])'/sg) {
+            my $s = $1;
+            $s =~ s/\\'/'/g;
+            push @$strings, $s;
+        }
+        while ($src =~ /_t\(\s*"(.*?[^\\])"/sg) {
+            push @$strings, $1;
+        }
+    }
+
+    return $strings;
 }
\ No newline at end of file

From e684cd5d288ec2d138a056c5c3bd7d0254fd8603 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 17:27:58 +0100
Subject: [PATCH 280/312] track broken i18n files

---
 scripts/check-i18n.pl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index a7e5f3c2e2..ff25955bdc 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -20,18 +20,19 @@ my $en = read_i18n($i18ndir."/en_EN.json");
 my $src_strings = read_src_strings($srcdir);
 
 print "Checking strings in src\n";
-foreach my $s (@$src_strings) {
+foreach my $tuple (@$src_strings) {
+    my ($s, $file) = (@$tuple);
     if (!$en->{$s}) {
         if ($en->{$s . '.'}) {
-            printf ("%10s %24s\t%s\n", "src", "en_EN has fullstop!", "$s");
+            printf ("%50s %24s\t%s\n", $file, "en_EN has fullstop!", $s);
         }
         else {
             $s =~ /^(.*)\.?$/;
             if ($en->{$1}) {
-                printf ("%10s %24s\t%s\n", "src", "en_EN lacks fullstop!", "$s");
+                printf ("%50s %24s\t%s\n", $file, "en_EN lacks fullstop!", $s);
             }
             else {
-                printf ("%10s %24s\t%s\n", "src", "Translation missing!", "$s");
+                printf ("%50s %24s\t%s\n", $file, "Translation missing!", $s);
             }
         }
     }
@@ -101,13 +102,14 @@ sub read_src_strings {
     find( sub { push @files, $File::Find::name if (-f $_ && /\.jsx?$/) }, $path );
     foreach my $file (@files) {
         my $src = read_file($file);
+        $file =~ s/^.*\/src/src/;
         while ($src =~ /_t\(\s*'(.*?[^\\])'/sg) {
             my $s = $1;
             $s =~ s/\\'/'/g;
-            push @$strings, $s;
+            push @$strings, [$s, $file];
         }
         while ($src =~ /_t\(\s*"(.*?[^\\])"/sg) {
-            push @$strings, $1;
+            push @$strings, [$1, $file];
         }
     }
 

From 730258bd3caa4174d4fa90c5132151ad59618c64 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 17:30:32 +0100
Subject: [PATCH 281/312] fix punctuation on e2e warning

---
 scripts/fix-i18n.pl         | 1 +
 src/Lifecycle.js            | 6 ++----
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 src/i18n/strings/pt.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 src/i18n/strings/ru.json    | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
index 2924340dc2..5002abd55d 100755
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@@ -39,6 +39,7 @@ VoIP conference finished.
 %(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).
 %(senderName)s changed the power level of %(powerLevelDiffText)s.
 For security, this session has been signed out. Please sign in again.
+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.
 EOT
 )];
 }
diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index 0e3e52fe40..a4a4f557bc 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -231,10 +231,8 @@ function _handleRestoreFailure(e) {
     let msg = e.message;
     if (msg == "OLM.BAD_LEGACY_ACCOUNT_PICKLE") {
         msg = _t(
-            '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'
-        ) + '.';
+            '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.'
+        );
 
         _clearLocalStorage();
 
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 417f332695..4f2db07633 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -307,7 +307,7 @@
     "You are already in a call": "Du bist bereits bei einem Anruf",
     "You cannot place a call with yourself": "Du kannst keinen Anruf mit dir selbst starten",
     "You cannot place VoIP calls in this browser": "Du kannst kein VoIP-Gespräch in diesem Browser starten",
-    "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": "Du musst dich erneut anmelden um Ende-zu-Ende-Verschlüsselungscodes für dieses Gerät zu generieren und den öffentl. Schlüssel an deinen Homeserver zu senden. Dies muss einmal gemacht werden. Entschuldige die Unannehmlichkeit",
+    "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.": "Du musst dich erneut anmelden um Ende-zu-Ende-Verschlüsselungscodes für dieses Gerät zu generieren und den öffentl. Schlüssel an deinen Homeserver zu senden. Dies muss einmal gemacht werden. Entschuldige die Unannehmlichkeit.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Deine E-Mail-Adresse scheint nicht mit einer Matrix-ID auf diesem Homeserver verknüpft zu sein",
     "Sun": "So",
     "Mon": "Mo",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4d1f3ad53f..ee4e439b91 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -541,7 +541,7 @@
   "you must be a": "you must be a",
   "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
   "You need to be logged in.": "You need to be logged in.",
-  "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": "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",
+  "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.": "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.",
   "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Your email address does not appear to be associated with a Matrix ID on this Homeserver",
   "Your password has been reset": "Your password has been reset",
   "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 1d972ec1af..9afd58b979 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -401,7 +401,7 @@
     "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
     "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
     "You need to be logged in.": "Você tem que estar logado.",
-    "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": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez",
+    "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.": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
     "Set a display name:": "Defina um nome público para você:",
     "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 9e1f864caa..7c1cdddd93 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -406,7 +406,7 @@
     "You cannot place VoIP calls in this browser": "Você não pode fazer chamadas de voz neste navegador",
     "You need to be able to invite users to do that.": "Para fazer isso, você tem que ter permissão para convidar outras pessoas.",
     "You need to be logged in.": "Você tem que estar logado.",
-    "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": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez",
+    "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.": "É necessário que você faça login novamente para poder gerar as chaves de criptografia ponta-a-ponta para este dispositivo e então enviar sua chave pública para o servidor. Pedimos desculpas pela inconveniência, é preciso fazer isso apenas única uma vez.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "O seu endereço de email não parece estar associado a uma conta de usuária/o Matrix neste servidor",
     "Set a display name:": "Defina um nome público para você:",
     "Upload an avatar:": "Envie uma imagem de perfil para identificar você:",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 279ce3b6c0..b66c5c304b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -385,7 +385,7 @@
     "Thu": "Чт",
     "Fri": "Пя",
     "Sat": "Сб",
-    "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": "Вам необходимо снова войти в генерировать сквозное шифрование (е2е) ключей для этого устройства и предоставить публичный ключ Вашему домашнему серверу. Это после выключения; приносим извинения за причиненные неудобства",
+    "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.": "Вам необходимо снова войти в генерировать сквозное шифрование (е2е) ключей для этого устройства и предоставить публичный ключ Вашему домашнему серверу. Это после выключения; приносим извинения за причиненные неудобства.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Ваш адрес электронной почты, кажется, не связан с Matrix ID на этом Homeserver",
     "to start a chat with someone": "Начать чат с кем-то",
     "to tag direct chat": "Пометить прямой чат",

From f442a665c835a23e32f1324db213a59080e98819 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 17:36:02 +0100
Subject: [PATCH 282/312] fix more i18n punctuation fails

---
 scripts/check-i18n.pl       | 5 ++++-
 scripts/fix-i18n.pl         | 2 ++
 src/TextForEvent.js         | 2 +-
 src/i18n/strings/da.json    | 2 +-
 src/i18n/strings/de_DE.json | 4 ++--
 src/i18n/strings/en_EN.json | 4 ++--
 src/i18n/strings/fr.json    | 4 ++--
 src/i18n/strings/pt.json    | 4 ++--
 src/i18n/strings/pt_BR.json | 4 ++--
 src/i18n/strings/ru.json    | 4 ++--
 10 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index ff25955bdc..b415108b96 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -38,6 +38,8 @@ foreach my $tuple (@$src_strings) {
     }
 }
 
+#exit;
+
 opendir(DIR, $i18ndir) || die $!;
 my @files = readdir(DIR);
 closedir(DIR);
@@ -81,7 +83,8 @@ sub read_i18n {
     while(<FILE>) {
         if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
             my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
-
+            $src =~ s/\\"/"/g;
+            $dst =~ s/\\"/"/g;
             $map->{$src} = $dst;
         }
     }
diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
index 5002abd55d..8f23673561 100755
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@@ -51,6 +51,8 @@ EOT
 my $sub = 0;
 if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
     my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
+    $src =~ s/\\"/"/g;
+    $dst =~ s/\\"/"/g;
 
     foreach my $fixup (@{$::fixups}) {
         my $dotless_fixup = substr($fixup, 0, -1);
diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 169868e812..6438a9a1ad 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -179,7 +179,7 @@ function textForHistoryVisibilityEvent(event) {
         text += _t('anyone') + '.';
     }
     else {
-        text += ' ' + _t('unknown') + ' (' + vis + ')';
+        text += ' ' + _t('unknown') + ' (' + vis + ').';
     }
     return text;
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index af6f0bb0fe..60904eb4af 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -64,7 +64,7 @@
     "and": "og",
     "An email has been sent to": "En e-mail blev sendt til",
     "answered the call.": "svarede på kaldet",
-    "anyone.": "alle",
+    "anyone": "alle",
     "Anyone who knows the room's link, apart from guests": "Alle der kender link til rummet, bortset fra gæster",
     "Anyone who knows the room's link, including guests": "Alle der kender link til rummet, inklusiv gæster",
     "Are you sure you want to leave the room?": "Er du sikker på du vil forlade rummet?",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4f2db07633..63c0c5a58e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -59,7 +59,7 @@
     "all room members, from the point they joined": "Alle Raum-Mitglieder - seitdem sie beigetreten sind",
     "and": "und",
     "An email has been sent to": "Eine E-Mail wurde gesendet an",
-    "anyone.": "Jeder",
+    "anyone": "Jeder",
     "Anyone who knows the room's link, apart from guests": "Jeder der den Raum-Link kennt - abgesehen von Gästen",
     "Anyone who knows the room's link, including guests": "Jeder der den Raum-Link kennt - auch Gäste",
     "Are you sure you want to leave the room?": "Bist du sicher, dass du den Raum verlassen willst?",
@@ -358,7 +358,7 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s änderte das Profilbild.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\"",
+    "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s änderte das Thema zu "%(topic)s".",
     "/ddg is not a command": "/ddg ist kein Kommando",
     "%(senderName)s ended the call.": "%(senderName)s beendete den Anruf.",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ee4e439b91..0870a6d574 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -151,7 +151,7 @@
   "An email has been sent to": "An email has been sent to",
   "A new password must be entered.": "A new password must be entered.",
   "%(senderName)s answered the call.": "%(senderName)s answered the call.",
-  "anyone.": "anyone",
+  "anyone": "anyone",
   "An error has occurred.": "An error has occurred.",
   "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
   "Anyone who knows the room's link, including guests": "Anyone who knows the room's link, including guests",
@@ -176,7 +176,7 @@
   "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
   "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
   "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
-  "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s changed the topic to \"%(topic)s\"",
+  "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s changed the topic to "%(topic)s".",
   "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
   "Changes your display nickname": "Changes your display nickname",
   "changing room on a RoomView is not supported": "changing room on a RoomView is not supported",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b8ed7684be..94cf453c65 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -119,7 +119,7 @@
     "zh-sg": "Chinese (Singapore)",
     "zh-tw": "Chinese (Taiwan)",
     "zu": "Zulu",
-    "anyone.": "anyone",
+    "anyone": "anyone",
     "Direct Chat": "Conversation Directe",
     "Direct chats": "Conversations directes",
     "Disable inline URL previews by default": "Désactiver l’aperçu des URLs",
@@ -219,7 +219,7 @@
     "%(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.",
     "%(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\"",
+    "%(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",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 9afd58b979..57dbc3ae25 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -312,14 +312,14 @@
     "%(names)s and one other are typing": "%(names)s e uma outra pessoa estão escrevendo",
     "%(names)s and %(count)s others are typing": "%(names)s e %(count)s outras pessoas estão escrevendo",
     "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
-    "anyone.": "qualquer pessoa",
+    "anyone": "qualquer pessoa",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s alterou o tópico para \"%(topic)s\"",
+    "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s alterou o tópico para "%(topic)s".",
     "click to reveal": "clique para ver",
     "Conference call failed": "Chamada de conferência falhou",
     "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 7c1cdddd93..e2cd527ee0 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -36,7 +36,7 @@
     "changed their profile picture": "alterou sua foto de perfil",
     "changed the power level of": "mudou o nível de permissões de",
     "changed the room name to": "mudou o nome da sala para",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\"": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\"",
+    "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s mudou o tópico para "%(topic)s".",
     "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
     "Changes your display nickname": "Troca o seu apelido",
     "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
@@ -317,7 +317,7 @@
     "%(names)s and one other are typing": "%(names)s e uma outra pessoa estão escrevendo",
     "%(names)s and %(count)s others are typing": "%(names)s e %(count)s outras pessoas estão escrevendo",
     "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
-    "anyone.": "qualquer pessoa",
+    "anyone": "qualquer pessoa",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s mudou seu nome público de %(oldDisplayName)s para %(displayName)s.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b66c5c304b..125defd9a3 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -16,7 +16,7 @@
     "An email has been sent to": "Email был отправлен",
     "A new password must be entered.": "Введите новый пароль.",
     "answered the call.": "принятый звонок.",
-    "anyone.": "кто угодно",
+    "anyone": "кто угодно",
     "Anyone who knows the room's link, apart from guests": "Любой, кто знает ссылку на комнату, кроме гостей",
     "Anyone who knows the room's link, including guests": "Любой, кто знает ссылку комнаты, включая гостей",
     "Are you sure you want to reject the invitation?": "Вы уверены что вы хотите отклонить приглашение?",
@@ -231,7 +231,7 @@
     "%(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 changed the topic to \"%(topic)s\"": "%(senderDisplayName)s измененная тема на %(topic)s",
+    "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s измененная тема на %(topic)s.",
     "Conference call failed": "Конференц-вызов прервался",
     "Conference calling is in development and may not be reliable": "Конференц-вызов находится в процессе и может не быть надежным",
     "Conference calls are not supported in encrypted rooms": "Конференц-вызовы не поддерживаются в зашифрованных комнатах",

From c61ca422616feb81ac88e4c9701dc1372fcf65c7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 17:41:54 +0100
Subject: [PATCH 283/312] oops, fix quoting

---
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 src/i18n/strings/fr.json    | 2 +-
 src/i18n/strings/pt.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 src/i18n/strings/ru.json    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 63c0c5a58e..20053a28f0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -358,7 +358,7 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s änderte das Profilbild.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s änderte das Berechtigungslevel von %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s änderte den Raumnamen zu %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s änderte das Thema zu "%(topic)s".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s änderte das Thema zu \"%(topic)s\".",
     "/ddg is not a command": "/ddg ist kein Kommando",
     "%(senderName)s ended the call.": "%(senderName)s beendete den Anruf.",
     "Failed to lookup current room": "Aktuellen Raum nachzuschlagen schlug fehl",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0870a6d574..27a9105ac6 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -176,7 +176,7 @@
   "%(senderName)s changed their profile picture.": "%(senderName)s changed their profile picture.",
   "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s changed the power level of %(powerLevelDiffText)s.",
   "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s changed the room name to %(roomName)s.",
-  "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s changed the topic to "%(topic)s".",
+  "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s changed the topic to \"%(topic)s\".",
   "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
   "Changes your display nickname": "Changes your display nickname",
   "changing room on a RoomView is not supported": "changing room on a RoomView is not supported",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 94cf453c65..e10c606233 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -219,7 +219,7 @@
     "%(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.",
     "%(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".",
+    "%(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",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 57dbc3ae25..955ee1837c 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -319,7 +319,7 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s alterou sua imagem de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s alterou o nível de permissões de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s alterou o nome da sala para %(roomName)s.",
-    "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s alterou o tópico para "%(topic)s".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s alterou o tópico para \"%(topic)s\".",
     "click to reveal": "clique para ver",
     "Conference call failed": "Chamada de conferência falhou",
     "Conference calling is in development and may not be reliable": "Chamadas de conferência estão em desenvolvimento e portanto podem não funcionar",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index e2cd527ee0..adc3650c4e 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -36,7 +36,7 @@
     "changed their profile picture": "alterou sua foto de perfil",
     "changed the power level of": "mudou o nível de permissões de",
     "changed the room name to": "mudou o nome da sala para",
-    "%(senderDisplayName)s changed the topic to "%(topic)s".": "%(senderDisplayName)s mudou o tópico para "%(topic)s".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s mudou o tópico para \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "As mudanças sobre quem pode ler o histórico da sala só serão aplicadas às mensagens futuras nesta sala",
     "Changes your display nickname": "Troca o seu apelido",
     "Claimed Ed25519 fingerprint key": "Chave reivindicada da Impressão Digital Ed25519",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 125defd9a3..bb7621e69d 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -231,7 +231,7 @@
     "%(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 changed the topic to "%(topic)s".": "%(senderDisplayName)s измененная тема на %(topic)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s измененная тема на %(topic)s.",
     "Conference call failed": "Конференц-вызов прервался",
     "Conference calling is in development and may not be reliable": "Конференц-вызов находится в процессе и может не быть надежным",
     "Conference calls are not supported in encrypted rooms": "Конференц-вызовы не поддерживаются в зашифрованных комнатах",

From 1305fd619e0857c95c058e33a0c166b68b9b6534 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 17:42:58 +0100
Subject: [PATCH 284/312] fix quoting

---
 scripts/fix-i18n.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
index 8f23673561..5d5e8f68b9 100755
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@@ -70,6 +70,8 @@ if ($_ =~ m/^(\s+)"(.*?)"(: *)"(.*?)"(,?)$/) {
         }
 
         if ($sub) {
+            $src =~ s/"/\\"/g;
+            $dst =~ s/"/\\"/g;
             print qq($indent"$src"$colon"$dst"$comma\n);
             last;
         }        

From 8524f5868c8d8b1adbdcc3554ce8d12b28959e04 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 27 May 2017 17:59:11 +0100
Subject: [PATCH 285/312] import _t, drop two unused imports without this
 FilePanel would ever-load

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

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index ea048df97e..b85e7dc2d2 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -15,12 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
-import ReactDOM from 'react-dom';
 
 import Matrix from 'matrix-js-sdk';
 import sdk from '../../index';
 import MatrixClientPeg from '../../MatrixClientPeg';
-import dis from '../../dispatcher';
+import { _t } from '../../languageHandler';
 
 /*
  * Component which shows the filtered file using a TimelinePanel

From 3302fc690f7d5a7ca8bcf7618c3483e704c5a48d Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 18:20:35 +0100
Subject: [PATCH 286/312] fix all missing translations picked up by
 check-i18n.pl

---
 scripts/check-i18n.pl                         |  5 +++--
 scripts/fix-i18n.pl                           |  8 +++++++
 src/components/structures/UserSettings.js     | 21 ++++++++++--------
 .../structures/login/ForgotPassword.js        |  8 +++----
 src/components/views/login/PasswordLogin.js   |  2 +-
 .../views/room_settings/AliasSettings.js      |  4 ++--
 src/components/views/rooms/RoomHeader.js      |  2 +-
 src/components/views/rooms/RoomSettings.js    |  2 +-
 .../views/settings/ChangePassword.js          |  2 +-
 src/i18n/strings/de_DE.json                   |  6 ++---
 src/i18n/strings/en_EN.json                   | 22 +++++++++++++++----
 src/i18n/strings/pt.json                      | 12 +++++-----
 src/i18n/strings/pt_BR.json                   | 12 +++++-----
 src/i18n/strings/ru.json                      |  4 ++--
 14 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index b415108b96..4b670a7694 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -38,8 +38,6 @@ foreach my $tuple (@$src_strings) {
     }
 }
 
-#exit;
-
 opendir(DIR, $i18ndir) || die $!;
 my @files = readdir(DIR);
 closedir(DIR);
@@ -105,6 +103,9 @@ sub read_src_strings {
     find( sub { push @files, $File::Find::name if (-f $_ && /\.jsx?$/) }, $path );
     foreach my $file (@files) {
         my $src = read_file($file);
+        $src =~ s/'\s*\+\s*'//g;
+        $src =~ s/"\s*\+\s*"//g;
+
         $file =~ s/^.*\/src/src/;
         while ($src =~ /_t\(\s*'(.*?[^\\])'/sg) {
             my $s = $1;
diff --git a/scripts/fix-i18n.pl b/scripts/fix-i18n.pl
index 5d5e8f68b9..d4ae3dfb49 100755
--- a/scripts/fix-i18n.pl
+++ b/scripts/fix-i18n.pl
@@ -40,6 +40,14 @@ VoIP conference finished.
 %(senderName)s changed the power level of %(powerLevelDiffText)s.
 For security, this session has been signed out. Please sign in again.
 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.
+A new password must be entered.
+Guests can't set avatars. Please register.
+Failed to set avatar.
+Unable to verify email address.
+Guests can't use labs features. Please register.
+A new password must be entered.
+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.
+Guests cannot join this room even if explicitly invited.
 EOT
 )];
 }
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 59b8f5a385..0ca1a6c57a 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -258,7 +258,7 @@ module.exports = React.createClass({
             const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
             Modal.createDialog(NeedToRegisterDialog, {
                 title: _t("Please Register"),
-                description: _t("Guests can't set avatars. Please register") + ".",
+                description: _t("Guests can't set avatars. Please register."),
             });
             return;
         }
@@ -283,7 +283,7 @@ module.exports = React.createClass({
             console.error("Failed to set avatar: " + err);
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
-                title: _t("Failed to set avatar"),
+                title: _t("Failed to set avatar."),
                 description: ((err && err.message) ? err.message : _t("Operation failed")),
             });
         });
@@ -295,7 +295,10 @@ module.exports = React.createClass({
             title: _t("Sign out"),
             description:
                 <div>
-             { _t("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.") }.
+             { _t("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.") }.
                 </div>,
             button: _t("Sign out"),
             extraButtons: [
@@ -391,7 +394,7 @@ module.exports = React.createClass({
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createDialog(QuestionDialog, {
             title: _t("Remove Contact Information?"),
-            description: _t("Remove ") + threepid.address + "?",
+            description: _t("Remove %(threePid)s?", { threePid : threepid.address }),
             button: _t('Remove'),
             onFinished: (submit) => {
                 if (submit) {
@@ -433,8 +436,8 @@ module.exports = React.createClass({
             this.setState({email_add_pending: false});
             if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
                 const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                let message = _t("Unable to verify email address. ");
-                message += _t("Please check your email and click on the link it contains. Once this is done, click continue.");
+                let message = _t("Unable to verify email address.") + " ";
+                              _t("Please check your email and click on the link it contains. Once this is done, click continue.");
                 Modal.createDialog(QuestionDialog, {
                     title: _t("Verification Pending"),
                     description: message,
@@ -445,7 +448,7 @@ module.exports = React.createClass({
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Unable to verify email address: " + err);
                 Modal.createDialog(ErrorDialog, {
-                    title: _t("Unable to verify email address"),
+                    title: _t("Unable to verify email address."),
                     description: ((err && err.message) ? err.message : _t("Operation failed")),
                 });
             }
@@ -536,7 +539,7 @@ module.exports = React.createClass({
             <div>
                 <h3>Referral</h3>
                 <div className="mx_UserSettings_section">
-                    {_t("Refer a friend to Riot: ")} <a href={href}>{href}</a>
+                    {_t("Refer a friend to Riot:")} <a href={href}>{href}</a>
                 </div>
             </div>
         );
@@ -734,7 +737,7 @@ module.exports = React.createClass({
                             const NeedToRegisterDialog = sdk.getComponent("dialogs.NeedToRegisterDialog");
                             Modal.createDialog(NeedToRegisterDialog, {
                                 title: _t("Please Register"),
-                                description: _t("Guests can't use labs features. Please register") + ".",
+                                description: _t("Guests can't use labs features. Please register."),
                             });
                             return;
                         }
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index c7dc35c1a8..6e7cda1365 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -82,7 +82,7 @@ module.exports = React.createClass({
             this.showErrorDialog(_t('The email address linked to your account must be entered.'));
         }
         else if (!this.state.password || !this.state.password2) {
-            this.showErrorDialog(_t('A new password must be entered') + ".");
+            this.showErrorDialog(_t('A new password must be entered.'));
         }
         else if (this.state.password !== this.state.password2) {
             this.showErrorDialog(_t('New passwords must match each other.'));
@@ -98,10 +98,8 @@ 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 ' +
-                            '<a href="https://github.com/vector-im/riot-web/issues/2671">' +
-                            'will be improved</a>'
-                        ) }.
+                            'them afterwards. In future this will be improved.'
+                        ) }
                     </div>,
                 button: _t('Continue'),
                 extraButtons: [
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 8e5229c63d..11d8f2cc7c 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -188,7 +188,7 @@ class PasswordLogin extends React.Component {
                         value={this.state.loginType}
                         onOptionChange={this.onLoginTypeChange}>
                             <span key={PasswordLogin.LOGIN_FIELD_MXID}>{ _t('my Matrix ID') }</span>
-                            <span key={PasswordLogin.LOGIN_FIELD_EMAIL}>{ _t('Email Address') }</span>
+                            <span key={PasswordLogin.LOGIN_FIELD_EMAIL}>{ _t('Email address') }</span>
                             <span key={PasswordLogin.LOGIN_FIELD_PHONE}>{ _t('Phone') }</span>
                     </Dropdown>
                 </div>
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index b5ef1d8309..b48c5a4fe2 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -156,7 +156,7 @@ module.exports = React.createClass({
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
                 title: _t('Invalid alias format'),
-                description: _t('"%(alias)s" is not a valid format for an alias', { alias: alias }),
+                description: _t('\'%(alias)s\' is not a valid format for an alias', { alias: alias }),
             });
         }
     },
@@ -172,7 +172,7 @@ module.exports = React.createClass({
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             Modal.createDialog(ErrorDialog, {
                 title: _t('Invalid address format'),
-                description: _t('"%(alias)s" is not a valid format for an address', { alias: alias }),
+                description: _t('\'%(alias)s\' is not a valid format for an address', { alias: alias }),
             });
         }
     },
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index c5e3a56922..3463ef948f 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -121,7 +121,7 @@ module.exports = React.createClass({
             console.error("Failed to set avatar: " + errMsg);
             Modal.createDialog(ErrorDialog, {
                 title: _t("Error"),
-                description: _t("Failed to set avatar") + ".",
+                description: _t("Failed to set avatar."),
             });
         }).done();
     },
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index e50bcdde46..8125adfe44 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -762,7 +762,7 @@ module.exports = React.createClass({
         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>.
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 33091f9c71..48c0b5501e 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -77,7 +77,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"),
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 20053a28f0..984754ad84 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -177,7 +177,7 @@
     "Privacy warning": "Datenschutzwarnung",
     "Privileged Users": "Privilegierte Nutzer",
     "Profile": "Profil",
-    "Refer a friend to Riot": "Lade eine(n) Freund(in) zu Riot ein",
+    "Refer a friend to Riot:": "Lade eine(n) Freund(in) zu Riot ein",
     "rejected": "abgeleht",
     "Once you&#39;ve followed the link it contains, click below": "Nachdem du dem Link gefolgt bist, klicke unten",
     "rejected the invitation.": "lehnte die Einladung ab.",
@@ -186,7 +186,7 @@
     "removed their display name": "löschte den eigenen Anzeigenamen",
     "Remove": "Entferne",
     "requested a VoIP conference": "hat eine VoIP-Konferenz angefordert",
-    "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": "Eine Passwortänderung sorgt aktuell dafür, dass alle Ende-zu-Ende-Schlüssel von allen Geräten zurückgesetzt werden. Dadurch wird die verschlüsselte Chat-Historie unlesbar, es sei denn Sie exportieren vorher Ihre Raum-Schlüssel und importieren sie nachher wieder. In Zukunft wird dies verbessert",
+    "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.": "Eine Passwortänderung sorgt aktuell dafür, dass alle Ende-zu-Ende-Schlüssel von allen Geräten zurückgesetzt werden. Dadurch wird die verschlüsselte Chat-Historie unlesbar, es sei denn Sie exportieren vorher Ihre Raum-Schlüssel und importieren sie nachher wieder. In Zukunft wird dies verbessert.",
     "restore": "Zum zurücksetzen",
     "Return to login screen": "Zur Anmeldung zurückkehren",
     "Room Colour": "Raumfarbe",
@@ -242,7 +242,7 @@
     "turned on end-to-end encryption (algorithm": "aktivierte Ende-zu-Ende-Verschlüsselung (Algorithmus",
     "Unable to add email address": "Unfähig die E-Mail-Adresse hinzuzufügen",
     "Unable to remove contact information": "Unfähig die Kontakt-Informationen zu löschen",
-    "Unable to verify email address": "Unfähig die E-Mail-Adresse zu verifizieren",
+    "Unable to verify email address.": "Unfähig die E-Mail-Adresse zu verifizieren.",
     "Unban": "Entbannen",
     "Unencrypted room": "Unverschlüsselter Raum",
     "unknown error code": "Unbekannter Fehlercode",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 27a9105ac6..4105594058 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -180,6 +180,7 @@
   "Changes to who can read history will only apply to future messages in this room": "Changes to who can read history will only apply to future messages in this room",
   "Changes your display nickname": "Changes your display nickname",
   "changing room on a RoomView is not supported": "changing room on a RoomView is not supported",
+  "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.",
   "Claimed Ed25519 fingerprint key": "Claimed Ed25519 fingerprint key",
   "Clear Cache and Reload": "Clear Cache and Reload",
   "Clear Cache": "Clear Cache",
@@ -230,7 +231,7 @@
   "Drop here to tag %(section)s": "Drop here to tag %(section)s",
   "Ed25519 fingerprint": "Ed25519 fingerprint",
   "Email": "Email",
-  "Email Address": "Email Address",
+  "Email address": "Email address",
   "Email, name or matrix ID": "Email, name or matrix ID",
   "Emoji": "Emoji",
   "Enable encryption": "Enable encryption",
@@ -241,6 +242,7 @@
   "End-to-end encryption is in beta and may not be reliable": "End-to-end encryption is in beta and may not be reliable",
   "Enter Code": "Enter Code",
   "Error": "Error",
+  "Error decrypting attachment": "Error decrypting attachment",
   "Event information": "Event information",
   "Existing Call": "Existing Call",
   "Export E2E room keys": "Export E2E room keys",
@@ -261,6 +263,7 @@
   "Failed to save settings": "Failed to save settings",
   "Failed to send email": "Failed to send email",
   "Failed to send request.": "Failed to send request.",
+  "Failed to set avatar.": "Failed to set avatar.",
   "Failed to set display name": "Failed to set display name",
   "Failed to set up conference call": "Failed to set up conference call",
   "Failed to toggle moderator status": "Failed to toggle moderator status",
@@ -276,10 +279,15 @@
   "Forget room": "Forget room",
   "Forgot your password?": "Forgot your password?",
   "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
+  "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.": "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.",
   "Found a bug?": "Found a bug?",
   "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s",
+  "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
   "Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat",
   "Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload",
+  "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
+  "Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.",
+  "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
   "had": "had",
   "Hangup": "Hangup",
   "Hide read receipts": "Hide read receipts",
@@ -294,6 +302,7 @@
   "Invalid alias format": "Invalid alias format",
   "Invalid address format": "Invalid address format",
   "Invalid Email Address": "Invalid Email Address",
+  "Invalid file%(extra)s": "Invalid file%(extra)s",
   "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
   "Invite new room members": "Invite new room members",
   "Invites": "Invites",
@@ -334,6 +343,7 @@
   "Mobile phone number": "Mobile phone number",
   "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",
@@ -360,6 +370,7 @@
   "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
   "Once you&#39;ve followed the link it contains, click below": "Once you&#39;ve followed the link it contains, click below",
   "Only people who have been invited": "Only people who have been invited",
+  "Operation failed": "Operation failed",
   "or": "or",
   "Password": "Password",
   "Passwords can't be empty": "Passwords can't be empty",
@@ -376,7 +387,7 @@
   "Profile": "Profile",
   "Reason": "Reason",
   "Revoke Moderator": "Revoke Moderator",
-  "Refer a friend to Riot": "Refer a friend to Riot",
+  "Refer a friend to Riot:": "Refer a friend to Riot:",
   "Registration required": "Registration required",
   "rejected": "rejected",
   "%(targetName)s rejected the invitation.": "%(targetName)s rejected the invitation.",
@@ -385,9 +396,10 @@
   "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removed their display name (%(oldDisplayName)s).",
   "%(senderName)s removed their profile picture.": "%(senderName)s removed their profile picture.",
   "Remove": "Remove",
+  "Remove %(threePid)s?": "Remove %(threePid)s?",
   "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
   "Report it": "Report it",
-  "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": "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",
+  "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.": "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.",
   "restore": "restore",
   "Return to app": "Return to app",
   "Return to login screen": "Return to login screen",
@@ -488,7 +500,7 @@
   "Unable to add email address": "Unable to add email address",
   "Unable to remove contact information": "Unable to remove contact information",
   "Unable to restore previous session": "Unable to restore previous session",
-  "Unable to verify email address": "Unable to verify email address",
+  "Unable to verify email address.": "Unable to verify email address.",
   "Unban": "Unban",
   "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbanned %(targetName)s.",
   "Unable to capture screen": "Unable to capture screen",
@@ -501,6 +513,7 @@
   "unknown error code": "unknown error code",
   "Unknown room %(roomId)s": "Unknown room %(roomId)s",
   "unknown": "unknown",
+  "Unmute": "Unmute",
   "uploaded a file": "uploaded a file",
   "Upload avatar": "Upload avatar",
   "Upload Failed": "Upload Failed",
@@ -541,6 +554,7 @@
   "you must be a": "you must be a",
   "You need to be able to invite users to do that.": "You need to be able to invite users to do that.",
   "You need to be logged in.": "You need to be logged in.",
+  "You need to enter a user name.": "You need to enter a user name.",
   "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.": "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.",
   "Your email address does not appear to be associated with a Matrix ID on this Homeserver": "Your email address does not appear to be associated with a Matrix ID on this Homeserver",
   "Your password has been reset": "Your password has been reset",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 955ee1837c..8b2cafb7a9 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -97,8 +97,8 @@
     "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
     "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
     "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
-    "Guests can't set avatars. Please register": "Convidados não podem definir uma foto do perfil. Por favor, registre-se",
-    "Guests can't use labs features. Please register": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre",
+    "Guests can't set avatars. Please register.": "Convidados não podem definir uma foto do perfil. Por favor, registre-se.",
+    "Guests can't use labs features. Please register.": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre.",
     "Guest users can't upload files. Please register to upload": "Usuários não podem fazer envio de arquivos. Por favor se cadastre para enviar arquivos",
     "had": "teve",
     "Hangup": "Desligar",
@@ -162,7 +162,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:": "Indicar um amigo para participar",
     "rejected": "recusou",
     "rejected the invitation.": "rejeitou o convite.",
     "Reject invitation": "Rejeitar convite",
@@ -171,7 +171,7 @@
     "removed their profile picture": "removeu sua foto de perfil",
     "Remove": "Remover",
     "requested a VoIP conference": "requisitou uma conferência VoIP",
-    "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": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado",
+    "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.": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado.",
     "restore": "restaurar",
     "Return to app": "Retornar ao aplicativo",
     "Return to login screen": "Retornar à tela de login",
@@ -233,7 +233,7 @@
     "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",
-    "Unable to verify email address": "Não foi possível verificar o endereço de email",
+    "Unable to verify email address.": "Não foi possível verificar o endereço de email.",
     "Unban": "Desfazer banimento",
     "Unencrypted room": "Sala não criptografada",
     "unencrypted": "não criptografado",
@@ -354,7 +354,7 @@
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
-    "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
+    "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index adc3650c4e..bb67aa4c5f 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -100,8 +100,8 @@
     "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
     "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
     "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
-    "Guests can't set avatars. Please register": "Convidados não podem definir uma foto do perfil. Por favor, registre-se",
-    "Guests can't use labs features. Please register": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre",
+    "Guests can't set avatars. Please register.": "Convidados não podem definir uma foto do perfil. Por favor, registre-se.",
+    "Guests can't use labs features. Please register.": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre.",
     "Guest users can't upload files. Please register to upload": "Usuários não podem fazer envio de arquivos. Por favor se cadastre para enviar arquivos",
     "had": "teve",
     "Hangup": "Desligar",
@@ -166,7 +166,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:": "Indicar um amigo para participar",
     "rejected": "recusou",
     "rejected the invitation.": "rejeitou o convite.",
     "Reject invitation": "Rejeitar convite",
@@ -175,7 +175,7 @@
     "removed their profile picture": "removeu sua foto de perfil",
     "Remove": "Remover",
     "requested a VoIP conference": "requisitou uma conferência VoIP",
-    "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": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado",
+    "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.": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado.",
     "restore": "restaurar",
     "Return to app": "Retornar ao aplicativo",
     "Return to login screen": "Retornar à tela de login",
@@ -238,7 +238,7 @@
     "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",
-    "Unable to verify email address": "Não foi possível verificar o endereço de email",
+    "Unable to verify email address.": "Não foi possível verificar o endereço de email.",
     "Unban": "Desfazer banimento",
     "Unencrypted room": "Sala não criptografada",
     "unencrypted": "não criptografado",
@@ -358,7 +358,7 @@
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
-    "Refer a friend to Riot": "Recomende Riot a um/a amigo/a",
+    "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index bb7621e69d..5b81b88a92 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -167,7 +167,7 @@
     "turned on end-to-end encryption (algorithm": "turned on end-to-end encryption (algorithm",
     "Unable to add email address": "Невозможно добавить email адрес",
     "Unable to remove contact information": "Невозможно удалить контактную информацию",
-    "Unable to verify email address": "Невозможно проверить адрес электронной почты",
+    "Unable to verify email address.": "Невозможно проверить адрес электронной почты.",
     "Unban": "Отменить запрет",
     "Unencrypted room": "Незашифрованная комната",
     "unencrypted": "незашифрованно",
@@ -541,7 +541,7 @@
     "%(senderName)s removed their profile picture.": "%(senderName)s убрал своё изображение.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s запросил голосовую конференц-связь.",
     "Report it": "Сообщить об этом",
-    "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": "На данный момент сброс пароля сбросит все ключи шифрования на всех устройствах, зашифрованная история общения будет нечитаема, если вы сперва не скачаете ваши ключи от комнаты и не загрузите их после. В будущем это будет улучшено",
+    "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.": "На данный момент сброс пароля сбросит все ключи шифрования на всех устройствах, зашифрованная история общения будет нечитаема, если вы сперва не скачаете ваши ключи от комнаты и не загрузите их после. В будущем это будет улучшено.",
     "restore": "восстановить",
     "Return to app": "Вернуться в приложение",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot не имеет права для отправки вам уведомлений, пожалуйста, проверьте настройки вашего браузера",

From 8766f8ab7eff56d46dcd3a67117f524ad309d19f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 18:22:36 +0100
Subject: [PATCH 287/312] sync punctuation

---
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/pt.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 984754ad84..4909acffb6 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -125,7 +125,7 @@
     "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.": "Aus Sicherheitsgründen werden beim Ausloggen alle Ende-zu-Ende-Verschlüsselungsschlüssel von diesem Browser gelöscht. Wenn du in späteren Riot-Sitzungen die Konversationshistorie entschlüsseln möchtest, exportiere bitte deine Schlüssel zur sicheren Verwahrung.",
     "For security, this session has been signed out. Please sign in again.": "Zur Sicherheit wurde diese Sitzung abgemeldet. Bitte melde dich erneut an.",
     "Found a bug?": "Fehler gefunden?",
-    "Guests cannot join this room even if explicitly invited": "Gäste können diesem Raum nicht beitreten auch wenn sie explizit eingeladen werden",
+    "Guests cannot join this room even if explicitly invited.": "Gäste können diesem Raum nicht beitreten auch wenn sie explizit eingeladen werden.",
     "Guests can't set avatars. Please register.": "Gäste können keine Avatare setzen. Bitte registriere dich.",
     "Guest users can't upload files. Please register to upload.": "Gäste können keine Dateien hochladen. Bitte registrieren um hochzuladen.",
     "had": "hatte",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 8b2cafb7a9..e636eb54d7 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -96,7 +96,7 @@
     "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.": "Por segurança, deslogar irá remover qualquer chave de criptografia ponta-a-ponta deste navegador. Caso deseje descriptografar o histórico das suas conversas E2E em sessões Riot futuras, por favor exporte as chaves da sala para sua garantia.",
     "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
     "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
-    "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
+    "Guests cannot join this room even if explicitly invited.": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os.",
     "Guests can't set avatars. Please register.": "Convidados não podem definir uma foto do perfil. Por favor, registre-se.",
     "Guests can't use labs features. Please register.": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre.",
     "Guest users can't upload files. Please register to upload": "Usuários não podem fazer envio de arquivos. Por favor se cadastre para enviar arquivos",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index bb67aa4c5f..fa9f3bc4da 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -99,7 +99,7 @@
     "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.": "Por segurança, deslogar irá remover qualquer chave de criptografia ponta-a-ponta deste navegador. Caso deseje descriptografar o histórico das suas conversas E2E em sessões Riot futuras, por favor exporte as chaves da sala para sua garantia.",
     "For security, this session has been signed out. Please sign in again.": "Por questões de segurança, esta sessão foi encerrada. Por gentileza conecte-se novamente.",
     "Found a bug?": "Encontrou um problema de funcionamento do sistema?",
-    "Guests cannot join this room even if explicitly invited": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os",
+    "Guests cannot join this room even if explicitly invited.": "Visitantes não podem entrar nesta sala, mesmo se forem explicitamente convidadas/os.",
     "Guests can't set avatars. Please register.": "Convidados não podem definir uma foto do perfil. Por favor, registre-se.",
     "Guests can't use labs features. Please register.": "Convidados não podem usar as funcionalidades de laboratório (lab), por gentileza se registre.",
     "Guest users can't upload files. Please register to upload": "Usuários não podem fazer envio de arquivos. Por favor se cadastre para enviar arquivos",

From 3703306a9e4a497a70127255f169fed90e37fb6e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 18:35:18 +0100
Subject: [PATCH 288/312] oops

---
 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 0ca1a6c57a..993586df84 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -436,7 +436,7 @@ module.exports = React.createClass({
             this.setState({email_add_pending: false});
             if (err.errcode == 'M_THREEPID_AUTH_FAILED') {
                 const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-                let message = _t("Unable to verify email address.") + " ";
+                let message = _t("Unable to verify email address.") + " " +
                               _t("Please check your email and click on the link it contains. Once this is done, click continue.");
                 Modal.createDialog(QuestionDialog, {
                     title: _t("Verification Pending"),

From 8d79ab6ce2b1100d2f5aa88b5ff5fed9e6defb9f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 18:35:34 +0100
Subject: [PATCH 289/312] track entries that exist in en_EN but not in the
 src...

---
 scripts/check-i18n.pl | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index 4b670a7694..21f10238e6 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -18,10 +18,12 @@ my $srcdir = abs_path($1."/../src");
 my $en = read_i18n($i18ndir."/en_EN.json");
 
 my $src_strings = read_src_strings($srcdir);
+my $src = {};
 
 print "Checking strings in src\n";
 foreach my $tuple (@$src_strings) {
     my ($s, $file) = (@$tuple);
+    $src->{$s} = $file;
     if (!$en->{$s}) {
         if ($en->{$s . '.'}) {
             printf ("%50s %24s\t%s\n", $file, "en_EN has fullstop!", $s);
@@ -38,6 +40,29 @@ foreach my $tuple (@$src_strings) {
     }
 }
 
+print "\nChecking en_EN\n";
+my $count = 0;
+foreach my $k (sort keys %$en) {
+    if (!$src->{$k}) {
+        if ($src->{$k. '.'}) {
+            printf ("%50s %24s\t%s\n", $src->{$k. '.'}, "src has fullstop!", $k);
+        }
+        else {
+            $k =~ /^(.*)\.?$/;
+            if ($src->{$1}) {
+                printf ("%50s %24s\t%s\n", $src->{$1}, "src lacks fullstop!", $k);                
+            }
+            else {
+                printf ("%50s %24s\t%s\n", '???', "Not present in src?", $k);
+            }
+        }
+    }
+    else {
+        $count++;
+    }
+}
+printf ("$count/" . (scalar keys %$src) . " strings found in src are present in en_EN\n");
+
 opendir(DIR, $i18ndir) || die $!;
 my @files = readdir(DIR);
 closedir(DIR);
@@ -50,23 +75,23 @@ foreach my $lang (grep { -f "$i18ndir/$_" && !/en_EN\.json/ } @files) {
     foreach my $k (sort keys %$map) {
         if ($en->{$k}) {
             if ($map->{$k} eq $k) {
-                printf ("%10s %24s\t%s\n", $lang, "Untranslated string?", "$k");
+                printf ("%10s %24s\t%s\n", $lang, "Untranslated string?", $k);
             }
             $count++;
         }
         else {
             if ($en->{$k . "."}) {
-                printf ("%10s %24s\t%s\n", $lang, "en_EN has fullstop!", "$k");
+                printf ("%10s %24s\t%s\n", $lang, "en_EN has fullstop!", $k);
                 next;
             }
 
             $k =~ /^(.*)\.?$/;
             if ($en->{$1}) {
-                printf ("%10s %24s\t%s\n", $lang, "en_EN lacks fullstop!", "$k");
+                printf ("%10s %24s\t%s\n", $lang, "en_EN lacks fullstop!", $k);
                 next;
             }
 
-            printf ("%10s %24s\t%s\n", $lang, "Not present in en_EN", "$k");
+            printf ("%10s %24s\t%s\n", $lang, "Not present in en_EN", $k);
         }
     }
 

From bc433bc2a2d15740c170bdc14e89559aa998acde Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 18:38:37 +0100
Subject: [PATCH 290/312] ignore country codes

---
 scripts/check-i18n.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index 21f10238e6..3cb2cec18c 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -43,6 +43,8 @@ foreach my $tuple (@$src_strings) {
 print "\nChecking en_EN\n";
 my $count = 0;
 foreach my $k (sort keys %$en) {
+    # crappy heuristic to ignore country codes for now...
+    next if ($k =~ /^(..|..-..)$/);
     if (!$src->{$k}) {
         if ($src->{$k. '.'}) {
             printf ("%50s %24s\t%s\n", $src->{$k. '.'}, "src has fullstop!", $k);

From b697c0472f8fca59c2c7f3ac3bf3a8512d480f1a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 18:41:43 +0100
Subject: [PATCH 291/312] fix fullstop

---
 scripts/check-i18n.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index 3cb2cec18c..6c92dae53d 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -68,7 +68,7 @@ printf ("$count/" . (scalar keys %$src) . " strings found in src are present in
 opendir(DIR, $i18ndir) || die $!;
 my @files = readdir(DIR);
 closedir(DIR);
-foreach my $lang (grep { -f "$i18ndir/$_" && !/en_EN\.json/ } @files) {
+foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files) {
     print "\nChecking $lang\n";
 
     my $map = read_i18n($i18ndir."/".$lang);

From 4cd7964b584bf88e4cf3e6cb6438b2c592324478 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 27 May 2017 18:43:59 +0100
Subject: [PATCH 292/312] remove window onFocus handling entirely

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/MatrixChat.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 6638431410..4b05d746f3 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -247,7 +247,6 @@ module.exports = React.createClass({
         UDEHandler.startListening();
 
         this.focusComposer = false;
-        window.addEventListener("focus", this.onFocus);
 
         // this can technically be done anywhere but doing this here keeps all
         // the routing url path logic together.
@@ -910,12 +909,6 @@ module.exports = React.createClass({
         });
     },
 
-    onFocus: function(ev) {
-        if (document.activeElement.textLength === undefined) {
-            dis.dispatch({action: 'focus_composer'});
-        }
-    },
-
     showScreen: function(screen, params) {
         if (screen == 'register') {
             dis.dispatch({

From 71bc15c2fc6f9267a0a9b186fbd0a081ed170ae7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 19:03:18 +0100
Subject: [PATCH 293/312] fix .

---
 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 e10c606233..53d24d484b 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -270,7 +270,7 @@
     "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": "Échec lors de l’envoi de la requête",
+    "Failed to send request.": "Échec 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’établissement du statut de modérateur",

From 796158422c4598228d08bb58e1894954c7eff728 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 19:03:26 +0100
Subject: [PATCH 294/312] list the strings remaining to be translated

---
 scripts/check-i18n.pl | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index 6c92dae53d..2d50138788 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -42,6 +42,9 @@ foreach my $tuple (@$src_strings) {
 
 print "\nChecking en_EN\n";
 my $count = 0;
+my $remaining_src = {};
+foreach (keys %$src) { $remaining_src->{$_}++ };
+
 foreach my $k (sort keys %$en) {
     # crappy heuristic to ignore country codes for now...
     next if ($k =~ /^(..|..-..)$/);
@@ -61,9 +64,13 @@ foreach my $k (sort keys %$en) {
     }
     else {
         $count++;
+        delete $remaining_src->{$k};
     }
 }
 printf ("$count/" . (scalar keys %$src) . " strings found in src are present in en_EN\n");
+foreach (keys %$remaining_src) {
+    printf "remaining: $_\n";
+}
 
 opendir(DIR, $i18ndir) || die $!;
 my @files = readdir(DIR);
@@ -74,12 +81,17 @@ foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files)
     my $map = read_i18n($i18ndir."/".$lang);
     my $count = 0;
 
+    my $remaining_en = {};
+    foreach (keys %$en) { $remaining_en->{$_}++ };
+
+
     foreach my $k (sort keys %$map) {
         if ($en->{$k}) {
             if ($map->{$k} eq $k) {
                 printf ("%10s %24s\t%s\n", $lang, "Untranslated string?", $k);
             }
             $count++;
+            delete $remaining_en->{$k};
         }
         else {
             if ($en->{$k . "."}) {
@@ -97,6 +109,12 @@ foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files)
         }
     }
 
+    if (scalar keys %$remaining_en < 100) {
+        foreach (keys %$remaining_en) {
+            printf ("%10s %24s\t%s\n", $lang, "Not yet translated", $_);
+        }
+    }
+
     printf ("$count/" . (scalar keys %$en) . " strings translated\n");
 }
 

From 063230af03f1f2c4381eae86aa41195ee15d108a Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 19:51:44 +0100
Subject: [PATCH 295/312] fix typo breaking russian i18n

---
 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 5b81b88a92..cdebc47160 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -449,7 +449,7 @@
     "sx": "Суту",
     "zh-hk": "Китайский (Гонконг)",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "На +%(msisdn)s было отправлено текстовое сообщение. Пожалуйста, введите проверочный код из него",
-    "and %(overflowCount)s others...": "и %(overflowCounts)s других...",
+    "and %(overflowCount)s others...": "и %(overflowCount)s других...",
     "Are you sure?": "Вы уверены?",
     "Autoplay GIFs and videos": "Проигрывать GIF и видео автоматически",
     "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "Невозможно соединиться с домашним сервером - проверьте своё соединение и убедитесь, что %(urlStart)s SSL-сертификат вашего домашнего сервера %(urlEnd)s включён в доверяемые",

From a30110b5d3e06c22b3f1769b04e33b83e9649c31 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Sat, 27 May 2017 21:11:00 +0200
Subject: [PATCH 296/312] Fix vector-im/riot-web#4042

---
 src/components/structures/UserSettings.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 993586df84..992830066f 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -546,11 +546,13 @@ module.exports = React.createClass({
     },
 
     onLanguageChange: function(l) {
-        UserSettingsStore.setLocalSetting('language', l);
-        this.setState({
-            language: l,
-        });
-        PlatformPeg.get().reload();
+        if(this.state.language !== l) {
+            UserSettingsStore.setLocalSetting('language', l);
+            this.setState({
+                language: l,
+            });
+            PlatformPeg.get().reload();
+        }
     },
 
     _renderLanguageSetting: function () {

From dba35f4901264ce4958b60897d12cb37f4abc7ac Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 May 2017 20:14:52 +0100
Subject: [PATCH 297/312] extend script to check for broken variables

---
 scripts/check-i18n.pl | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index 2d50138788..55499b0570 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -48,6 +48,11 @@ foreach (keys %$src) { $remaining_src->{$_}++ };
 foreach my $k (sort keys %$en) {
     # crappy heuristic to ignore country codes for now...
     next if ($k =~ /^(..|..-..)$/);
+
+    if ($en->{$k} ne $k) {
+        printf ("%50s %24s\t%s\n", "en_EN", "en_EN is not symmetrical", $k);
+    }
+
     if (!$src->{$k}) {
         if ($src->{$k. '.'}) {
             printf ("%50s %24s\t%s\n", $src->{$k. '.'}, "src has fullstop!", $k);
@@ -69,7 +74,7 @@ foreach my $k (sort keys %$en) {
 }
 printf ("$count/" . (scalar keys %$src) . " strings found in src are present in en_EN\n");
 foreach (keys %$remaining_src) {
-    printf "remaining: $_\n";
+    print "missing: $_\n";
 }
 
 opendir(DIR, $i18ndir) || die $!;
@@ -84,8 +89,23 @@ foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files)
     my $remaining_en = {};
     foreach (keys %$en) { $remaining_en->{$_}++ };
 
-
     foreach my $k (sort keys %$map) {
+        {
+            no warnings 'uninitialized';
+            my $vars = {};
+            while ($k =~ /%\((.*?)\)s/g) {
+                $vars->{$1}++;
+            }
+            while ($map->{$k} =~ /%\((.*?)\)s/g) {
+                $vars->{$1}--;
+            }
+            foreach my $var (keys %$vars) {
+                if ($vars->{$var} != 0) {
+                    printf ("%10s %24s\t%s\n", $lang, "Broken var ($var)s", $k);
+                }
+            }
+        }
+
         if ($en->{$k}) {
             if ($map->{$k} eq $k) {
                 printf ("%10s %24s\t%s\n", $lang, "Untranslated string?", $k);

From 8935e9706ebc7cbfc056f6fc396b335d071d2b59 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Sat, 27 May 2017 21:21:23 +0200
Subject: [PATCH 298/312] Change variable name as mentioned by t3chguy

---
 src/components/structures/UserSettings.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 992830066f..f4bf8b18cb 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -545,11 +545,11 @@ module.exports = React.createClass({
         );
     },
 
-    onLanguageChange: function(l) {
-        if(this.state.language !== l) {
-            UserSettingsStore.setLocalSetting('language', l);
+    onLanguageChange: function(newLang) {
+        if(this.state.language !== newLang) {
+            UserSettingsStore.setLocalSetting('language', newLang);
             this.setState({
-                language: l,
+                language: newLang,
             });
             PlatformPeg.get().reload();
         }

From b1f21f7d4e396cf454c1eff617e13f182848b63e Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Sat, 27 May 2017 20:27:07 +0000
Subject: [PATCH 299/312] Translated using Weblate (German)

Currently translated at 99.7% (672 of 674 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 4909acffb6..6746cb3e8e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -100,7 +100,7 @@
     "an address": "an Adresse",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Dein Passwort wurde erfolgreich geändert. Du wirst keine Benachrichtigungen an anderen Geräten empfangen bis du dich dort erneut anmeldest",
     "all room members": "Alle Raum-Mitglieder",
-    "all room members, from the point they are invited": "Alle Raum-Mitglieder - seitdem sie eingeladen wurden",
+    "all room members, from the point they are invited": "Alle Raum-Mitglieder, ab dem Zeitpunkt, an dem sie eingeladen werden",
     "answered the call.": "beantwortete den Anruf.",
     "Can't load user settings": "Kann Nutzereinstellungen nicht laden",
     "changed name": "änderte Namen",
@@ -133,7 +133,7 @@
     "Homeserver is": "Der Homeserver ist",
     "Identity Server is": "Der Identitätsserver ist",
     "I have verified my email address": "Ich habe meine E-Mail-Adresse verifiziert",
-    "Import E2E room keys": "Importe E2E-Raum-Schlüssel",
+    "Import E2E room keys": "E2E-Raum-Schlüssel importieren",
     "Invalid Email Address": "Ungültige E-Mail-Adresse",
     "invited": "eingeladen",
     "Invite new room members": "Lade neue Raum-Mitglieder ein",
@@ -211,7 +211,7 @@
     "Start Chat": "Starte Chat",
     "Success": "Erfolg",
     "tag direct chat": "Zum kennzeichnen als direkten Chat",
-    "The default role for new room members is": "Die Standard-Rolle for neue Raum-Mitglieder ist",
+    "The default role for new room members is": "Die Standard-Rolle für neue Raum-Mitglieder ist",
     "their invitations": "ihre Einladungen",
     "their invitation": "ihre Einladung",
     "These are experimental features that may break in unexpected ways. Use with caution": "Dies sind experimentelle Funktionen die in unerwarteter Weise Fehler verursachen können. Mit Vorsicht benutzen",
@@ -349,7 +349,7 @@
     "To send events of type": "Zum Senden von Ereignissen mit Typ",
     "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
     "%(targetName)s accepted an invitation.": "%(targetName)s akzeptierte eine Einladung.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akzeptierte eine Einladung für %(displayName)s.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akzeptierte die Einladung für %(displayName)s.",
     "%(names)s and one other are typing": "%(names)s und eine weitere Person tippen",
     "%(names)s and %(count)s others are typing": "%(names)s und %(count)s weitere Personen tippen",
     "%(senderName)s answered the call.": "%(senderName)s beantwortete den Anruf.",
@@ -719,5 +719,12 @@
     "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)": "Zeige Zeitstempel im 12-Stunden format",
-    "to tag as %(tagName)s": "um als \"%(tagName)s\" zu markieren"
+    "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",
+    "Mute": "Stummschalten",
+    "Operation failed": "Aktion fehlgeschlagen",
+    "You need to enter a user name.": "Du musst einen Benutzernamen eingeben.",
+    "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.": "Eine Änderung des Passworts setzt derzeit alle Schlüssel für die E2E-Verschlüsselung auf allen verwendeten Geräten zurück. Bereits verschlüsselte Chat-Inhalte sind somit nur noch lesbar, wenn du zunächst alle Schlüssel exportierst und später wieder importierst. Wir arbeiten an einer Verbesserung dieser momentan noch notwendigen Vorgehensweise.",
+    "Unmute": "Stummschalten aufheben"
 }

From b55503e67f79cf7de9a07ad9caf367f2c1f570ed Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 13:27:57 +0100
Subject: [PATCH 300/312] i18n the forwarding aux panel

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/ForwardMessage.js | 3 ++-
 src/i18n/strings/en_EN.json                  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 0ebcdf1e4a..33df201d7c 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -16,6 +16,7 @@
  */
 
 import React from 'react';
+import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import KeyCode from '../../../KeyCode';
@@ -88,7 +89,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_ForwardMessage">
-                <h1>Please select the destination room for this message</h1>
+                <h1>{_t('Please select the destination room for this message')}</h1>
             </div>
         );
     },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4105594058..c86d124ef3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -678,5 +678,6 @@
   "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)schanged their avatar %(repeats)s times",
   "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)schanged their avatar %(repeats)s times",
   "%(severalUsers)schanged their avatar": "%(severalUsers)schanged their avatar",
-  "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar"
+  "%(oneUser)schanged their avatar": "%(oneUser)schanged their avatar",
+  "Please select the destination room for this message": "Please select the destination room for this message"
 }

From c8732582d3fda8c4ca4859d1feac5bac9461d7a5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 13:35:30 +0100
Subject: [PATCH 301/312] remove most duplicate keys in en_EN

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index c86d124ef3..8b116109e1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -285,7 +285,6 @@
   "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
   "Guest users can't create new rooms. Please register to create room and start a chat": "Guest users can't create new rooms. Please register to create room and start a chat",
   "Guest users can't upload files. Please register to upload": "Guest users can't upload files. Please register to upload",
-  "Guests can't set avatars. Please register.": "Guests can't set avatars. Please register.",
   "Guests can't use labs features. Please register.": "Guests can't use labs features. Please register.",
   "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
   "had": "had",
@@ -371,7 +370,6 @@
   "Once you&#39;ve followed the link it contains, click below": "Once you&#39;ve followed the link it contains, click below",
   "Only people who have been invited": "Only people who have been invited",
   "Operation failed": "Operation failed",
-  "or": "or",
   "Password": "Password",
   "Passwords can't be empty": "Passwords can't be empty",
   "People": "People",
@@ -604,8 +602,6 @@
   "Encrypt room": "Encrypt room",
   "There are no visible files in this room": "There are no visible files in this room",
   "Room": "Room",
-  "Room name (optional)": "Room name (optional)",
-  "Who would you like to add to this room?": "Who would you like to add to this room?",
   "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.",
   "Auto-complete": "Auto-complete",

From 38abda3c566b0310d1f3b62f2e2bac2f5192a2aa Mon Sep 17 00:00:00 2001
From: PureTryOut <bart.ribbers@openmailbox.org>
Date: Sun, 28 May 2017 12:35:34 +0000
Subject: [PATCH 302/312] Added translation using Weblate (Dutch)

---
 src/i18n/strings/nl.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/nl.json

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/nl.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 8d64bf27af660dfc72870fc9217eafbc3aa9acbc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 13:38:37 +0100
Subject: [PATCH 303/312] fix weird mangled key vals (and dups)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/en_EN.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8b116109e1..dcd35bdaef 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -80,7 +80,6 @@
   "ja":"Japanese",
   "ji":"Yiddish",
   "ko":"Korean",
-  "ko":"Korean (Johab)",
   "lt":"Lithuanian",
   "lv":"Latvian",
   "mk":"Macedonian (FYROM)",
@@ -101,8 +100,7 @@
   "sk":"Slovak",
   "sl":"Slovenian",
   "sq":"Albanian",
-  "sr":"Serbian (Cyrillic)",
-  "sr":"Serbian (Latin)",
+  "sr":"Serbian",
   "sv-fi":"Swedish (Finland)",
   "sv":"Swedish",
   "sx":"Sutu",

From 3a8288bf345419a90b0c9924ff880bc344cf5dd2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 13:43:44 +0100
Subject: [PATCH 304/312] remove identical duplicates in fr

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/fr.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 53d24d484b..8849ade021 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -196,7 +196,6 @@
     "%(names)s and %(count)s others are typing": "%(names)s et %(count)s d'autres sont en train de taper",
     "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é.",
-    "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
     "Anyone who knows the room's link, apart from guests": "Tout ceux qui connaissent le lien du salon, à part les invités",
     "Anyone who knows the room's link, including guests": "Tout ceux qui connaissent le lien du salon, y compris les invités",
     "Are you sure?": "Êtes-vous sûr ?",
@@ -281,7 +280,6 @@
     "Authentication": "Authentification",
     "%(senderName)s answered the call.": "%(senderName)s a répondu à l’appel.",
     "An error has occurred.": "Une erreur est survenue.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s a banni %(targetName)s.",
     "Email": "E-mail",
     "Failed to send request.": "Erreur lors de l'envoi de la requête.",
     "Failed to unban": "Échec de l'amnistie",

From 00a6d218a5d7b9202df409a7fbef82938857f00f Mon Sep 17 00:00:00 2001
From: PureTryOut <bart.ribbers@openmailbox.org>
Date: Sun, 28 May 2017 12:37:21 +0000
Subject: [PATCH 305/312] Translated using Weblate (Dutch)

Currently translated at 0.2% (2 of 674 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 9e26dfeeb6..7bfe89dabd 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1 +1,4 @@
-{}
\ No newline at end of file
+{
+    "af": "Afrikaans",
+    "ar-ae": "Arabisch (U.A.E.)"
+}

From b709c981c017aba3de3223c1ac61027fa516a2d8 Mon Sep 17 00:00:00 2001
From: Rinat <rinat@gabidullin.com>
Date: Sun, 28 May 2017 11:34:38 +0000
Subject: [PATCH 306/312] Translated using Weblate (Russian)

Currently translated at 91.0% (614 of 674 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index cdebc47160..981dd49340 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -251,7 +251,7 @@
     "click to reveal": "нажать для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s вводит текст",
-    "%(targetName)s joined the room.": "%(targetName)s  присоединенный к комнате.",
+    "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s выкинул %(targetName)s.",
     "%(targetName)s left the room.": "%(targetName)s покинул комнату.",
     "%(senderName)s made future room history visible to": "%(senderName)s  история сделаной будущей комнаты, видимая для",
@@ -508,7 +508,6 @@
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' неверный формат для адреса",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' неверный формат для привязки",
     "Join Room": "Войти в комнату",
-    "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
     "Kick": "Выгнать",
     "Level": "Уровень",
     "Local addresses for this room:": "Местный адрес этой комнаты:",
@@ -651,5 +650,6 @@
     "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)sизменили своё изображение %(repeats)s раз",
     "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sизменил своё изображение %(repeats)s раз",
     "%(severalUsers)schanged their avatar": "%(severalUsers)sизменили своё изображение",
-    "%(oneUser)schanged their avatar": "%(oneUser)sизменил своё изображение"
+    "%(oneUser)schanged their avatar": "%(oneUser)sизменил своё изображение",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "Не возможно подключиться к серверу через HTTP, когда в строке браузера HTTPS. Используйте HTTPS или %(urlStart) включив небезопасные скрипты %(urlEnd)"
 }

From dc710f46448c2305e81366b90f09f677ccc7ea73 Mon Sep 17 00:00:00 2001
From: Radium <ztl8702@126.com>
Date: Sun, 28 May 2017 16:07:47 +0000
Subject: [PATCH 307/312] Added translation using Weblate (Chinese
 (Traditional))

---
 src/i18n/strings/zh_Hant.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/zh_Hant.json

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/zh_Hant.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 4e2e1d3d51c895ad5d9534f9eac66afc1952107b Mon Sep 17 00:00:00 2001
From: Radium <ztl8702@126.com>
Date: Sun, 28 May 2017 16:35:01 +0000
Subject: [PATCH 308/312] Translated using Weblate (Chinese (Traditional))

Currently translated at 3.2% (22 of 674 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9e26dfeeb6..b6295de844 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1 +1,24 @@
-{}
\ No newline at end of file
+{
+    "An email has been sent to": "電郵已經發送至",
+    "A new password must be entered.": "必須輸入新密碼。",
+    "anyone": "任何人",
+    "An error has occurred.": "發生了一個錯誤。",
+    "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 reject the invitation?": "您確認要謝絕邀請嗎？",
+    "Are you sure you want upload the following files?": "您確認要上傳以下文件嗎？",
+    "Attachment": "附件",
+    "Autoplay GIFs and videos": "自動播放GIF和影片",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s。",
+    "Ban": "封禁",
+    "Banned users": "已被封禁的使用者",
+    "Blacklisted": "已列入黑名單",
+    "Bug Report": "錯誤報告",
+    "Call Timeout": "通話超時",
+    "Can't connect to homeserver - please check your connectivity and ensure your %(urlStart)s homeserver's SSL certificate %(urlEnd)s is trusted": "無法連結主伺服器 - 請檢查網路狀況並確保您的 %(urlStart)s 主伺服器 SSL 證書 %(urlEnd)s 得到信任",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or %(urlStart)s enable unsafe scripts %(urlEnd)s": "當瀏覽器網址列里有 HTTPS URL 時，不能使用 HTTP 連結主伺服器。請採用 HTTPS 或者%(urlStart)s 允許不安全的腳本 %(urlEnd)s",
+    "Can't load user settings": "無法載入使用者設定",
+    "Change Password": "變更密碼",
+    "%(targetName)s left the room.": "%(targetName)s 離開了聊天室。"
+}

From 3ecd9964ec3a705bc7dd293f542fc8049a70fea6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 May 2017 20:24:33 +0100
Subject: [PATCH 309/312] fix vector-im/riot-web#4059 - missed it in code
 review :(

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

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index d2c0eda3ff..ae619a1359 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -144,7 +144,7 @@ const commands = {
 
                 dis.dispatch({
                     action: 'view_room',
-                    roomAlias: roomAlias,
+                    room_alias: roomAlias,
                     auto_join: true,
                 });
 

From 67323e3690a7427627f8b0397e83f37ecda9d878 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 28 May 2017 21:28:03 +0100
Subject: [PATCH 310/312] fix vars in RU translation (how did i not commit this
 yesterday?)

---
 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 cdebc47160..b4c5003336 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -560,7 +560,7 @@
     "Sender device information": "Информация об устройстве отправителя",
     "Send Invites": "Отправить приглашения",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s отправил изображение.",
-    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderDisplayName)s отправил приглашение для %(targetDisplayName)s войти в комнату.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s отправил приглашение для %(targetDisplayName)s войти в комнату.",
     "sent a video": "отправил видео",
     "Show panel": "Показать панель",
     "Sign in": "Войти",

From 85f830db7147a8e4f5e6b64483a2af3e10354716 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 28 May 2017 21:28:11 +0100
Subject: [PATCH 311/312] warn for duplicate translation keys

---
 scripts/check-i18n.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/check-i18n.pl b/scripts/check-i18n.pl
index 55499b0570..0ace98d0fc 100755
--- a/scripts/check-i18n.pl
+++ b/scripts/check-i18n.pl
@@ -141,6 +141,8 @@ foreach my $lang (grep { -f "$i18ndir/$_" && !/(basefile|en_EN)\.json/ } @files)
 sub read_i18n {
     my $path = shift;
     my $map = {};
+    $path =~ /.*\/(.*)$/;
+    my $lang = $1;
 
     open(FILE, "<", $path) || die $!;
     while(<FILE>) {
@@ -148,6 +150,10 @@ sub read_i18n {
             my ($indent, $src, $colon, $dst, $comma) = ($1, $2, $3, $4, $5);
             $src =~ s/\\"/"/g;
             $dst =~ s/\\"/"/g;
+
+            if ($map->{$src}) {
+                printf ("%10s %24s\t%s\n", $lang, "Duplicate translation!", $src);
+            }
             $map->{$src} = $dst;
         }
     }

From 51c3c121d43177170f8b09b69ebe6a5ac65515f5 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 28 May 2017 21:32:24 +0100
Subject: [PATCH 312/312] fix dup i18n keys found by check-i18n.pl

---
 src/i18n/strings/fr.json    | 1 -
 src/i18n/strings/pt.json    | 2 --
 src/i18n/strings/pt_BR.json | 2 --
 src/i18n/strings/ru.json    | 3 +--
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8849ade021..598b25b3fb 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -174,7 +174,6 @@
     "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",
     "accept": "Accepter",
     "%(targetName)s accepted an invitation.": "%(targetName)s a accepté une invitation.",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s a accepté une invitation de %(displayName)s.",
     "Account": "Compte",
     "Add email address": "Ajouter une adresse e-mail",
     "Add phone number": "Ajouter un numéro de téléphone",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index e636eb54d7..44fc335a2c 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -16,7 +16,6 @@
     "An email has been sent to": "Um email foi enviado para",
     "A new password must be entered.": "Uma nova senha precisa ser informada.",
     "answered the call.": "respondeu à chamada.",
-    "anyone": "qualquer um",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
     "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?",
@@ -354,7 +353,6 @@
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
-    "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index fa9f3bc4da..d2447e8ea3 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -17,7 +17,6 @@
     "New passwords don't match": "As novas senhas não conferem",
     "A new password must be entered.": "Uma nova senha precisa ser informada.",
     "answered the call.": "respondeu à chamada.",
-    "anyone": "qualquer um",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
     "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?",
@@ -358,7 +357,6 @@
     "Power level must be positive integer.": "O nível de permissões tem que ser um número inteiro e positivo.",
     "Press": "Aperte",
     "Reason": "Razão",
-    "Refer a friend to Riot:": "Recomende Riot a um/a amigo/a",
     "%(targetName)s rejected the invitation.": "%(targetName)s recusou o convite.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s removeu o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s removeu sua imagem de perfil.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b4c5003336..c800087370 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -251,7 +251,7 @@
     "click to reveal": "нажать для открытия",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s приглашает %(targetName)s.",
     "%(displayName)s is typing": "%(displayName)s вводит текст",
-    "%(targetName)s joined the room.": "%(targetName)s  присоединенный к комнате.",
+    "%(targetName)s joined the room.": "%(targetName)s присоединенный к комнате.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s выкинул %(targetName)s.",
     "%(targetName)s left the room.": "%(targetName)s покинул комнату.",
     "%(senderName)s made future room history visible to": "%(senderName)s  история сделаной будущей комнаты, видимая для",
@@ -508,7 +508,6 @@
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' неверный формат для адреса",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' неверный формат для привязки",
     "Join Room": "Войти в комнату",
-    "%(targetName)s joined the room.": "%(targetName)s вошёл в комнату.",
     "Kick": "Выгнать",
     "Level": "Уровень",
     "Local addresses for this room:": "Местный адрес этой комнаты:",