From 10017522e2556d85018b3a9ebaa165dd39916c0b Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 19 Dec 2016 17:59:13 +0000
Subject: [PATCH 001/927] Use correct 1-1 room avatar after users leave

The correct 1-1 avatar is used with rooms in which there are only two users with either "join" or "invite" as their membership (importantly, not "leave" or otherwise).

(This is important when a user moves accounts and re-joins previously left 1-1 chats)
---
 src/components/views/avatars/RoomAvatar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index dcb25eff61..2bb6caddb7 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -86,7 +86,7 @@ module.exports = React.createClass({
         var userIds = [];
         // for .. in optimisation to return early if there are >2 keys
         for (var uid in mlist) {
-            if (mlist.hasOwnProperty(uid)) {
+            if (mlist.hasOwnProperty(uid) && ["join", "invite"].includes(mlist[uid].membership)) {
                 userIds.push(uid);
             }
             if (userIds.length > 2) {

From 583f86eb06d7df4b49378ce7e2101311223b1104 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Mon, 19 Dec 2016 18:41:34 +0000
Subject: [PATCH 002/927] Handle the case where the other 1-1 user left

---
 src/components/views/avatars/RoomAvatar.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 2bb6caddb7..09a9e6c6c0 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -84,10 +84,15 @@ module.exports = React.createClass({
 
         var mlist = props.room.currentState.members;
         var userIds = [];
+        var leftUserIds = [];
         // for .. in optimisation to return early if there are >2 keys
         for (var uid in mlist) {
-            if (mlist.hasOwnProperty(uid) && ["join", "invite"].includes(mlist[uid].membership)) {
-                userIds.push(uid);
+            if (mlist.hasOwnProperty(uid)) {
+                if (["join", "invite"].includes(mlist[uid].membership)) {
+                    userIds.push(uid);
+                } else {
+                    leftUserIds.push(uid);
+                }
             }
             if (userIds.length > 2) {
                 return null;
@@ -101,12 +106,21 @@ module.exports = React.createClass({
             } else {
                 theOtherGuy = mlist[userIds[0]];
             }
+
             return theOtherGuy.getAvatarUrl(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 props.width, props.height, props.resizeMethod,
                 false
             );
         } else if (userIds.length == 1) {
+            // The other 1-1 user left, leaving just the current user, so show the left user's avatar
+            if (leftUserIds.length === 1) {
+                return mlist[leftUserIds[0]].getAvatarUrl(
+                    MatrixClientPeg.get().getHomeserverUrl(),
+                    props.width, props.height, props.resizeMethod,
+                        false
+                );
+            }
             return mlist[userIds[0]].getAvatarUrl(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 props.width, props.height, props.resizeMethod,

From 714b63519a8ebac1c58404236cd811f59259a905 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 20 Dec 2016 11:50:35 +0000
Subject: [PATCH 003/927] Remove empty line

---
 src/components/views/avatars/RoomAvatar.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 09a9e6c6c0..f5f42318eb 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -106,7 +106,6 @@ module.exports = React.createClass({
             } else {
                 theOtherGuy = mlist[userIds[0]];
             }
-
             return theOtherGuy.getAvatarUrl(
                 MatrixClientPeg.get().getHomeserverUrl(),
                 props.width, props.height, props.resizeMethod,

From b644751ca1ac919d4b919a84f43c29388d6497eb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 28 Aug 2017 00:16:22 +0100
Subject: [PATCH 004/927] skip direct chats which you have left in memberinfo

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

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 64eeddb406..4f7394fd91 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -620,17 +620,16 @@ module.exports = withMatrixClient(React.createClass({
                 const room = this.props.matrixClient.getRoom(roomId);
                 if (room) {
                     const me = room.getMember(this.props.matrixClient.credentials.userId);
-                    const highlight = (
-                        room.getUnreadNotificationCount('highlight') > 0 ||
-                        me.membership == "invite"
-                    );
+                    if (me.membership === 'leave') continue;
+                    const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === 'invite';
+
                     tiles.push(
                         <RoomTile key={room.roomId} room={room}
                             collapsed={false}
                             selected={false}
                             unread={Unread.doesRoomHaveUnreadMessages(room)}
                             highlight={highlight}
-                            isInvite={me.membership == "invite"}
+                            isInvite={me.membership === "invite"}
                             onClick={this.onRoomTileClick}
                         />
                     );

From 433cd505ee02977cf3ed2695f7d66f9f5c50212f Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 28 Aug 2017 00:39:59 +0100
Subject: [PATCH 005/927] skip direct chats which either you or the target have
 left

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

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 4f7394fd91..6d38797a2d 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -620,7 +620,12 @@ module.exports = withMatrixClient(React.createClass({
                 const room = this.props.matrixClient.getRoom(roomId);
                 if (room) {
                     const me = room.getMember(this.props.matrixClient.credentials.userId);
-                    if (me.membership === 'leave') continue;
+                    // not a DM room if we have left it
+                    if (!me.membership || me.membership === 'leave') continue;
+                    // not a DM room if they have left it
+                    const them = this.props.member;
+                    if (!them.membership || them.membership === 'leave') continue;
+
                     const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === 'invite';
 
                     tiles.push(

From 21af3fe189246b07f68a10d0174ae6d2723398b8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 28 Aug 2017 00:46:28 +0100
Subject: [PATCH 006/927] modularize and invert logic, so banned etc will count
 as left

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

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 6d38797a2d..af32d60cef 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -40,6 +40,8 @@ import withMatrixClient from '../../../wrappers/withMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 
+// States which both sides of the dmRoom must have for it to be considered relevant.
+const joinStates = ['invite', 'join'];
 
 module.exports = withMatrixClient(React.createClass({
     displayName: 'MemberInfo',
@@ -620,11 +622,11 @@ module.exports = withMatrixClient(React.createClass({
                 const room = this.props.matrixClient.getRoom(roomId);
                 if (room) {
                     const me = room.getMember(this.props.matrixClient.credentials.userId);
-                    // not a DM room if we have left it
-                    if (!me.membership || me.membership === 'leave') continue;
-                    // not a DM room if they have left it
+                    // not a DM room if we have are not joined/invited
+                    if (!me.membership || !joinStates.includes(me.membership)) continue;
+                    // not a DM room if they are not joined/invited
                     const them = this.props.member;
-                    if (!them.membership || them.membership === 'leave') continue;
+                    if (!them.membership || !joinStates.includes(them.membership)) continue;
 
                     const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === 'invite';
 

From 9658efd6d7f160552a87d4f29622c42c8c283744 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 28 Aug 2017 01:04:18 +0100
Subject: [PATCH 007/927] add comment and remove redundant logic

---
 src/components/views/rooms/MemberInfo.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index af32d60cef..8ed05023ad 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -40,9 +40,6 @@ import withMatrixClient from '../../../wrappers/withMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 
-// States which both sides of the dmRoom must have for it to be considered relevant.
-const joinStates = ['invite', 'join'];
-
 module.exports = withMatrixClient(React.createClass({
     displayName: 'MemberInfo',
 
@@ -613,6 +610,10 @@ module.exports = withMatrixClient(React.createClass({
         var startChat, kickButton, banButton, muteButton, giveModButton, spinner;
         if (this.props.member.userId !== this.props.matrixClient.credentials.userId) {
             const dmRoomMap = new DMRoomMap(this.props.matrixClient);
+            // dmRooms will not include dmRooms that we have been invited into but did not join.
+            // Because DMRoomMap runs off account_data[m.direct] which is only set on join of dm room.
+            // XXX: we potentially want DMs we have been invited to, to also show up here :L
+            // especially as logic below concerns specially if we haven't joined but have been invited
             const dmRooms = dmRoomMap.getDMRoomsForUserId(this.props.member.userId);
 
             const RoomTile = sdk.getComponent("rooms.RoomTile");
@@ -622,11 +623,11 @@ module.exports = withMatrixClient(React.createClass({
                 const room = this.props.matrixClient.getRoom(roomId);
                 if (room) {
                     const me = room.getMember(this.props.matrixClient.credentials.userId);
-                    // not a DM room if we have are not joined/invited
-                    if (!me.membership || !joinStates.includes(me.membership)) continue;
-                    // not a DM room if they are not joined/invited
+                    // not a DM room if we have are not joined
+                    if (!me.membership || me.membership !== 'join') continue;
+                    // not a DM room if they are not joined
                     const them = this.props.member;
-                    if (!them.membership || !joinStates.includes(them.membership)) continue;
+                    if (!them.membership || them.membership !== 'join') continue;
 
                     const highlight = room.getUnreadNotificationCount('highlight') > 0 || me.membership === 'invite';
 

From ba386e3417f5c1d86f46c08c2149a8f8dc1aaf36 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 11 Oct 2017 20:08:09 -0600
Subject: [PATCH 008/927] Singularise unsent message prompt, if applicable

Adds vector-im/riot-web#1217

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/components/structures/RoomStatusBar.js | 7 ++++++-
 src/components/structures/RoomView.js      | 4 +++-
 src/i18n/strings/en_EN.json                | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 3a2ab33db8..68d25e9a2a 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -39,6 +39,9 @@ module.exports = React.createClass({
         // string to display when there are messages in the room which had errors on send
         unsentMessageError: React.PropTypes.string,
 
+        // the number of messages not sent.
+        numUnsentMessages: React.PropTypes.number,
+
         // this is true if we are fully scrolled-down, and are looking at
         // the end of the live timeline.
         atEndOfLiveTimeline: React.PropTypes.bool,
@@ -252,6 +255,8 @@ module.exports = React.createClass({
         }
 
         if (this.props.unsentMessageError) {
+            let resendStr = "<a>Resend message</a> or <a>cancel message</a> now.";
+            if (this.props.numUnsentMessages > 1) resendStr = "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.";
             return (
                 <div className="mx_RoomStatusBar_connectionLostBar">
                     <img src="img/warning.svg" width="24" height="23" title="/!\ " alt="/!\ " />
@@ -259,7 +264,7 @@ module.exports = React.createClass({
                         { this.props.unsentMessageError }
                     </div>
                     <div className="mx_RoomStatusBar_connectionLostBar_desc">
-                    { _tJsx("<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
+                    { _tJsx(resendStr,
                         [/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/],
                         [
                             (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this.props.onResendAllClick}>{ sub }</a>,
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 14273fc95f..9a1eb9ef31 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -748,7 +748,8 @@ module.exports = React.createClass({
 
         for (const event of unsentMessages) {
             if (!event.error || event.error.name !== "UnknownDeviceError") {
-                return _t("Some of your messages have not been sent.");
+                if (unsentMessages.length > 1) return _t("Some of your messages have not been sent.");
+                return _t("Your message was not sent.");
             }
         }
         return _t("Message not sent due to unknown devices being present");
@@ -1570,6 +1571,7 @@ module.exports = React.createClass({
             isStatusAreaExpanded = this.state.statusBarVisible;
             statusBar = <RoomStatusBar
                 room={this.state.room}
+                numUnsentMessages={this._getUnsentMessages().length}
                 numUnreadMessages={this.state.numUnreadMessages}
                 unsentMessageError={this.state.unsentMessageError}
                 atEndOfLiveTimeline={this.state.atEndOfLiveTimeline}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e542253641..f0c5880d65 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -416,6 +416,7 @@
     "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.",
+    "Your message was not sent.": "Your message was not 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",
@@ -612,6 +613,7 @@
     "Connectivity to the server has been lost.": "Connectivity to the server has been lost.",
     "Sent messages will be stored until your connection has returned.": "Sent messages will be stored until your connection has returned.",
     "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
+    "<a>Resend message</a> or <a>cancel message</a> now.": "<a>Resend message</a> or <a>cancel message</a> now.",
     "(~%(count)s results)|one": "(~%(count)s result)",
     "(~%(count)s results)|other": "(~%(count)s results)",
     "Cancel": "Cancel",

From 0f8df97a475f02b73d9f7b33917de206d5f46fb2 Mon Sep 17 00:00:00 2001
From: Tong Hui <tonghuix@gmail.com>
Date: Fri, 10 Nov 2017 14:14:55 +0000
Subject: [PATCH 009/927] Translated using Weblate (Chinese (Simplified))

Currently translated at 70.4% (654 of 928 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 474233909f..317f1b4396 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -710,5 +710,7 @@
     "Autocomplete Delay (ms):": "自动完成延迟（毫秒）：",
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 添加",
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 移除",
-    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 修改"
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 修改",
+    "Unpin Message": "取消置顶消息",
+    "Add rooms to this community": "添加聊天室到此社区"
 }

From a97f53099990a1002d19b58094bd6fae801bfa41 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 13 Nov 2017 12:50:27 +0000
Subject: [PATCH 010/927] Translated using Weblate (German)

Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 db12a69657..eca34954f9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -963,12 +963,12 @@
     "%(names)s and %(count)s others are typing|one": "%(names)s und eine weitere Person schreiben",
     "Disinvite this user?": "Einladung für diesen Benutzer zurückziehen?",
     "Kick this user?": "Diesen Benutzer kicken?",
-    "Unban this user?": "Verbannung dieses Benutzers aufheben?",
+    "Unban this user?": "Verbannung für diesen Benutzer aufheben?",
     "Ban this user?": "Diesen Benutzer verbannen?",
     "Drop here to favourite": "Hierher ziehen, um als Favorit zu markieren",
     "Drop here to tag direct chat": "Hierher ziehen, um als Direkt-Chat zu markieren",
     "Drop here to restore": "Hierher ziehen zum Wiederherstellen",
-    "Drop here to demote": "Hier loslassen um zurückzustufen",
+    "Drop here to demote": "Hierher ziehen, um herabzustufen",
     "You have been kicked from this room by %(userName)s.": "Du wurdest von %(userName)s aus diesem Raum gekickt.",
     "You are trying to access a room.": "Du versuchst, auf einen Raum zuzugreifen.",
     "Members only (since the point in time of selecting this option)": "Nur Mitglieder (ab dem Zeitpunkt, an dem diese Option ausgewählt wird)",
@@ -993,13 +993,13 @@
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Eine E-Mail wurde an %(emailAddress)s gesendet. Folge dem in der E-Mail enthaltenen Link und klicke dann unten.",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Die Sichtbarkeit von '%(roomName)s' in %(groupId)s konnte nicht aktualisiert werden.",
     "Visibility in Room List": "Sichtbarkeit in Raum-Liste",
-    "Visible to everyone": "Für jeden sichtbar",
+    "Visible to everyone": "Für alle sichtbar",
     "Only visible to community members": "Nur für Community-Mitglieder sichtbar",
     "Community Invites": "Community-Einladungen",
     "Notify the whole room": "Den gesamten Raum benachrichtigen",
     "Room Notification": "Raum-Benachrichtigung",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Diese Räume werden Community-Mitgliedern auf der Community-Seite angezeigt. Community-Mitglieder können diesen Räumen beitreten, indem sie auf diese klicken.",
-    "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume Nicht-Mitgliedern auf der Community-Seite und Raum-Liste gezeigt werden?",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML für deine Community-Seite</h1>\n<p>\n    Nutze die lange Beschreibung um neuen Mitgliedern diese Community zu beschreiben\n    oder um einige wichtige Informationen oder <a href=\"foo\">Links</a> festzuhalten.\n</p>\n<p>\n    Du kannst auch 'img'-Tags (HTML) verwenden\n</p>\n",
-    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Deine Community hat noch keine lange Beschreibung oder eine HTML-Seite die Community-Mitgliedern gezeigt wird.<br />Klicke hier um die Einstellungen zu öffnen und ihr eine zu geben!"
+    "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume Nicht-Mitgliedern auf der Community-Seite und der Raum-Liste angezeigt werden?",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML für deine Community-Seite</h1>\n<p>\n    Nutze die ausführliche Beschreibung, um neuen Mitgliedern diese Community vorzustellen\n    oder um wichtige <a href=\"foo\">Links</a> bereitzustellen.\n</p>\n<p>\n    Du kannst sogar 'img'-Tags (HTML) verwenden\n</p>\n",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.<br />Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!"
 }

From beebe6b92b57339bee20a998097786b7cbaf75f0 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Mon, 13 Nov 2017 14:05:02 +0000
Subject: [PATCH 011/927] Translated using Weblate (German)

Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 eca34954f9..05b9392079 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -996,7 +996,7 @@
     "Visible to everyone": "Für alle sichtbar",
     "Only visible to community members": "Nur für Community-Mitglieder sichtbar",
     "Community Invites": "Community-Einladungen",
-    "Notify the whole room": "Den gesamten Raum benachrichtigen",
+    "Notify the whole room": "Alle im Raum benachrichtigen",
     "Room Notification": "Raum-Benachrichtigung",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Diese Räume werden Community-Mitgliedern auf der Community-Seite angezeigt. Community-Mitglieder können diesen Räumen beitreten, indem sie auf diese klicken.",
     "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume Nicht-Mitgliedern auf der Community-Seite und der Raum-Liste angezeigt werden?",

From 6c8283b3a8fc1828b21663eb1cff7e8b9632c4d3 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 14 Nov 2017 06:40:59 +0000
Subject: [PATCH 012/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b316e994a1..8a30c176b3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1001,5 +1001,9 @@
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "A közösségednek nincs bő leírása, HTML oldala ami megjelenik a közösség tagjainak.<br />A létrehozáshoz kattints ide!",
     "Notify the whole room": "Az egész szoba értesítése",
     "Room Notification": "Szoba értesítések",
-    "Show these rooms to non-members on the community page and room list?": "Mutassuk meg ezeket a szobákat kívülállóknak a közösségi oldalon és a szobák listájában?"
+    "Show these rooms to non-members on the community page and room list?": "Mutassuk meg ezeket a szobákat kívülállóknak a közösségi oldalon és a szobák listájában?",
+    "Sign in to get started": "Az induláshoz jelentkezz be",
+    "Status.im theme": "Állapot.im téma",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Figyelem, a %(hs)s szerverre jelentkezel be és nem a matrix.org szerverre.",
+    "Username on %(hs)s": "Felhasználónév a %(hs)s szerveren"
 }

From acd2be4b68eeba251696894759be796cde2032c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 14 Nov 2017 10:53:44 +0000
Subject: [PATCH 013/927] Translated using Weblate (French)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index a9b7232e29..da224ce4e1 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -997,5 +997,9 @@
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Ces salons sont affichés aux membres de la communauté sur la page de la communauté. Les membres de la communauté peuvent rejoindre ces salons en cliquant dessus.",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML pour votre page de communauté</h1>\n<p>\n    Utilisez la description longue pour présenter la communauté aux nouveaux membres\n    ou pour diffuser des <a href=\"foo\">liens</a> importants\n</p>\n<p>\n    Vous pouvez même utiliser des balises \"img\"\n</p>\n",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Votre communauté n'a pas de description longue, une page HTML à montrer aux membres de la communauté.<br />Cliquez ici pour ouvrir les réglages et créez-la !",
-    "Show these rooms to non-members on the community page and room list?": "Afficher ces salons aux non-membres sur la page de communauté et la liste des salons ?"
+    "Show these rooms to non-members on the community page and room list?": "Afficher ces salons aux non-membres sur la page de communauté et la liste des salons ?",
+    "Sign in to get started": "Connectez-vous pour commencer",
+    "Status.im theme": "Thème Status.im",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connecter au serveur %(hs)s, pas à matrix.org.",
+    "Username on %(hs)s": "Nom d'utilisateur sur %(hs)s"
 }

From 85f002b21cc3145f35437c9f536f57c357fb6af8 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Tue, 14 Nov 2017 03:16:09 +0000
Subject: [PATCH 014/927] Translated using Weblate (Russian)

Currently translated at 98.4% (918 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8ca50ec72f..d46076e2ff 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -986,5 +986,9 @@
     "Community Invites": "Приглашения в сообщества",
     "Notify the whole room": "Уведомить всю комнату",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Эти комнаты отображаются для участников сообщества на странице сообщества. Участники сообщества могут присоединиться к комнатам, щелкнув на них.",
-    "Show these rooms to non-members on the community page and room list?": "Следует ли показывать эти комнаты посторонним на странице сообщества и в комнате?"
+    "Show these rooms to non-members on the community page and room list?": "Следует ли показывать эти комнаты посторонним на странице сообщества и в комнате?",
+    "Sign in to get started": "Войдите, чтобы начать",
+    "Visibility in Room List": "Видимость в списке комнат",
+    "Visible to everyone": "Видимый для всех",
+    "Only visible to community members": "Только участникам сообщества"
 }

From 9d1949601194fe995766e272b5027006691c3339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 14 Nov 2017 13:19:43 +0000
Subject: [PATCH 015/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 837a55e380..11684c5488 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -926,5 +926,9 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Exportovaný súbor je chránený heslom. Súbor môžete importovať len ak zadáte zodpovedajúce heslo.",
     "File to import": "Importovať zo súboru",
     "Import": "Importovať",
-    "Show these rooms to non-members on the community page and room list?": "Zobrazovať tieto miestnosti na domovskej stránke komunity a v zozname miestností aj pre nečlenov?"
+    "Show these rooms to non-members on the community page and room list?": "Zobrazovať tieto miestnosti na domovskej stránke komunity a v zozname miestností aj pre nečlenov?",
+    "Sign in to get started": "Začnite prihlásením sa",
+    "Status.im theme": "Téma status.im",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Všimnite si: Práve sa prihlasujete na server %(hs)s, nie na server matrix.org.",
+    "Username on %(hs)s": "Meno používateľa na servery %(hs)s"
 }

From 3d677d84fe3292f7c430f98ded726ef5e84436f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 14 Nov 2017 14:05:15 +0000
Subject: [PATCH 016/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 11684c5488..ab2091d57b 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -140,7 +140,7 @@
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy boli pozvaní.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov, od kedy vstúpili.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých členov.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre všetkých.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s sprístupnil budúcu históriu miestnosti pre každého.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s sprístupnil budúcu históriu miestnosti neznámym (%(visibility)s).",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s povolil E2E šifrovanie (algoritmus %(algorithm)s).",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s z %(fromPowerLevel)s na %(toPowerLevel)s",
@@ -304,7 +304,7 @@
     "Unknown": "Neznámy",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s videl %(dateTime)s",
     "Unnamed room": "Nepomenovaná miestnosť",
-    "World readable": "Viditeľné pre všetkých",
+    "World readable": "Viditeľné pre každého",
     "Guests can join": "Aj hostia môžu vstúpiť",
     "No rooms to show": "Žiadne miestnosti na zobrazenie",
     "Failed to set avatar.": "Nepodarilo sa nastaviť avatara.",
@@ -505,7 +505,7 @@
     "Something went wrong!": "Niečo sa pokazilo!",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Nie je možné aktualizovať viditeľnosť miestnosti '%(roomName)s' v komunite %(groupId)s.",
     "Visibility in Room List": "Viditeľnosť v zozname miestností",
-    "Visible to everyone": "Viditeľná pre všetkých",
+    "Visible to everyone": "Viditeľná pre každého",
     "Only visible to community members": "Viditeľná len pre členov komunity",
     "Filter community rooms": "Filtrovať miestnosti v komunite",
     "Unknown Address": "Neznáma adresa",

From 64958d05b9743ee9a1a9f49287ebe108853058dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 14 Nov 2017 14:18:09 +0000
Subject: [PATCH 017/927] Translated using Weblate (French)

Currently translated at 100.0% (933 of 933 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index da224ce4e1..f252786732 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1001,5 +1001,7 @@
     "Sign in to get started": "Connectez-vous pour commencer",
     "Status.im theme": "Thème Status.im",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connecter au serveur %(hs)s, pas à matrix.org.",
-    "Username on %(hs)s": "Nom d'utilisateur sur %(hs)s"
+    "Username on %(hs)s": "Nom d'utilisateur sur %(hs)s",
+    "Restricted": "Restreint",
+    "Custom of %(powerLevel)s": "Personnalisé de %(powerLevel)s"
 }

From 20beb7990f4f23a6ddc3087e2c284580007f9373 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Tue, 14 Nov 2017 14:21:05 +0000
Subject: [PATCH 018/927] Translated using Weblate (German)

Currently translated at 99.4% (928 of 933 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 05b9392079..24036bde89 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -759,7 +759,7 @@
     "Create": "Erstelle",
     "Room creation failed": "Raum-Erstellung fehlgeschlagen",
     "Featured Rooms:": "Hervorgehobene Räume:",
-    "Featured Users:": "Hervorgehobene Nutzer:",
+    "Featured Users:": "Hervorgehobene Benutzer:",
     "Automatically replace plain text Emoji": "Klartext-Emoji automatisch ersetzen",
     "Failed to upload image": "Bild-Hochladen fehlgeschlagen",
     "Hide avatars in user and room mentions": "Profilbilder in Benutzer- und Raum-Erwähnungen verbergen",
@@ -880,7 +880,7 @@
     "Filter community members": "Community-Mitglieder filtern",
     "Filter community rooms": "Community-Räume filtern",
     "Failed to remove room from community": "Entfernen des Raumes aus der Community fehlgeschlagen",
-    "Removing a room from the community will also remove it from the community page.": "Ein Entfernen eines Raumes aus der Community wird ihn auch von der Community-Seite entfernen.",
+    "Removing a room from the community will also remove it from the community page.": "Das Entfernen eines Raumes aus der Community wird ihn auch von der Community-Seite entfernen.",
     "Community IDs may only contain alphanumeric characters": "Community-IDs dürfen nur alphanumerische Zeichen enthalten",
     "Create Community": "Community erstellen",
     "Community Name": "Community-Name",
@@ -1001,5 +1001,6 @@
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Diese Räume werden Community-Mitgliedern auf der Community-Seite angezeigt. Community-Mitglieder können diesen Räumen beitreten, indem sie auf diese klicken.",
     "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume Nicht-Mitgliedern auf der Community-Seite und der Raum-Liste angezeigt werden?",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML für deine Community-Seite</h1>\n<p>\n    Nutze die ausführliche Beschreibung, um neuen Mitgliedern diese Community vorzustellen\n    oder um wichtige <a href=\"foo\">Links</a> bereitzustellen.\n</p>\n<p>\n    Du kannst sogar 'img'-Tags (HTML) verwenden\n</p>\n",
-    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.<br />Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!"
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.<br />Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!",
+    "Custom of %(powerLevel)s": "benutzerdefiniert mit Wert %(powerLevel)s"
 }

From 1038e44672d12b4b47232844399ac1a7621b7daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 14 Nov 2017 14:10:14 +0000
Subject: [PATCH 019/927] Translated using Weblate (Slovak)

Currently translated at 99.7% (931 of 933 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index ab2091d57b..7a38caec82 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -8,7 +8,7 @@
     "Existing Call": "Existujúci hovor",
     "You are already in a call.": "Už ste súčasťou iného hovoru.",
     "VoIP is unsupported": "VoIP nie je podporovaný",
-    "You cannot place VoIP calls in this browser.": "Použitím tohoto webového prehliadača nemôžete uskutočniť hovory.",
+    "You cannot place VoIP calls in this browser.": "Pomocou tohoto webového prehliadača nemôžete uskutočňovať VoIP hovory.",
     "You cannot place a call with yourself.": "Nemôžete uskutočniť hovor so samým sebou.",
     "Conference calls are not supported in this client": "Tento klient nepodporuje konferenčné hovory",
     "Conference calls are not supported in encrypted rooms": "Konferenčné hovory nie sú podporované v šifrovaných miestnostiach",
@@ -107,7 +107,7 @@
     "Reason": "Dôvod",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s prijal pozvanie pre %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s prijal pozvanie.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s požiadal o VOIP konferenciu.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s požiadal o VoIP konferenciu.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s zakázal vstup %(targetName)s.",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s si zmenil zobrazované meno z %(oldDisplayName)s na %(displayName)s.",

From eb2d5d0ac515fbe8733966a74709b47d7e216048 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Tue, 14 Nov 2017 14:32:13 +0000
Subject: [PATCH 020/927] Translated using Weblate (German)

Currently translated at 99.4% (928 of 933 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 24036bde89..f6a9e00507 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -33,7 +33,7 @@
     "Bans user with given id": "Verbannt den 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 den Benutzer mit der angegebenen ID in den aktuellen Raum ein",
-    "Joins room with given alias": "Betrete Raum mit angegebenen Alias",
+    "Joins room with given alias": "Raum wird mit dem angegebenen Alias betreten",
     "Kicks user with given id": "Benutzer mit der angegebenen ID kicken",
     "Changes your display nickname": "Ändert deinen angezeigten Nicknamen",
     "Change Password": "Passwort ändern",
@@ -904,7 +904,7 @@
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Um einer bereits bestehenden Community beitreten zu können, musst dir deren Community-ID bekannt sein. Diese sieht z. B. aus wie <i>+example:matrix.org</i>.",
     "Your Communities": "Deine Communities",
     "You're not currently a member of any communities.": "Du bist aktuell kein Mitglied einer Community.",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erzeuge eine Community um Nutzer und Räume zu gruppieren! Erzeuge eine angepasste Homepage um dein Revier im Matrix-Universum zu markieren.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Erstelle eine Community, um Benutzer und Räume miteinander zu verbinden! Erstelle zusätzlich eine eigene Homepage, um deinen individuellen Bereich im Matrix-Universum zu gestalten.",
     "Something went wrong whilst creating your community": "Beim Erstellen deiner Community ist ein Fehler aufgetreten",
     "%(names)s and %(count)s others are typing|other": "%(names)s und %(count)s weitere schreiben",
     "And %(count)s more...|other": "Und %(count)s weitere...",
@@ -999,7 +999,7 @@
     "Notify the whole room": "Alle im Raum benachrichtigen",
     "Room Notification": "Raum-Benachrichtigung",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Diese Räume werden Community-Mitgliedern auf der Community-Seite angezeigt. Community-Mitglieder können diesen Räumen beitreten, indem sie auf diese klicken.",
-    "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume Nicht-Mitgliedern auf der Community-Seite und der Raum-Liste angezeigt werden?",
+    "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume Nicht-Mitgliedern auf der Community-Seite und in der Raum-Liste angezeigt werden?",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML für deine Community-Seite</h1>\n<p>\n    Nutze die ausführliche Beschreibung, um neuen Mitgliedern diese Community vorzustellen\n    oder um wichtige <a href=\"foo\">Links</a> bereitzustellen.\n</p>\n<p>\n    Du kannst sogar 'img'-Tags (HTML) verwenden\n</p>\n",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.<br />Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!",
     "Custom of %(powerLevel)s": "benutzerdefiniert mit Wert %(powerLevel)s"

From 07addbe1e025bbf6dc2abcb6f0aecfaed29830e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 14 Nov 2017 14:39:32 +0000
Subject: [PATCH 021/927] Translated using Weblate (Slovak)

Currently translated at 99.7% (931 of 933 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 7a38caec82..329af0e0a9 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -105,7 +105,7 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podpisovací kľúč, ktorý ste poskytli súhlasí s podpisovacím kľúčom, ktorý ste dostali zo zariadenia %(deviceId)s používateľa %(userId)s's. Zariadenie je považované za overené.",
     "Unrecognised command:": "Nerozpoznaný príkaz:",
     "Reason": "Dôvod",
-    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s prijal pozvanie pre %(displayName)s.",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s prijal pozvanie do %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s prijal pozvanie.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s požiadal o VoIP konferenciu.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval %(targetName)s.",

From 3a6e89584ce78824a6782744d10ca1c3820225d3 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 14 Nov 2017 20:32:13 +0000
Subject: [PATCH 022/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (933 of 933 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 8a30c176b3..b6cebfc403 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1005,5 +1005,7 @@
     "Sign in to get started": "Az induláshoz jelentkezz be",
     "Status.im theme": "Állapot.im téma",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Figyelem, a %(hs)s szerverre jelentkezel be és nem a matrix.org szerverre.",
-    "Username on %(hs)s": "Felhasználónév a %(hs)s szerveren"
+    "Username on %(hs)s": "Felhasználónév a %(hs)s szerveren",
+    "Restricted": "Korlátozott",
+    "Custom of %(powerLevel)s": "Egyedi beállítás: %(powerLevel)s"
 }

From 955362ee2d38f31cf8d506140bb00341d1d8bb50 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Wed, 15 Nov 2017 00:16:05 +0000
Subject: [PATCH 023/927] Translated using Weblate (German)

Currently translated at 99.4% (929 of 934 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f6a9e00507..6102fc884b 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1002,5 +1002,6 @@
     "Show these rooms to non-members on the community page and room list?": "Sollen diese Räume Nicht-Mitgliedern auf der Community-Seite und in der Raum-Liste angezeigt werden?",
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML für deine Community-Seite</h1>\n<p>\n    Nutze die ausführliche Beschreibung, um neuen Mitgliedern diese Community vorzustellen\n    oder um wichtige <a href=\"foo\">Links</a> bereitzustellen.\n</p>\n<p>\n    Du kannst sogar 'img'-Tags (HTML) verwenden\n</p>\n",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.<br />Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!",
-    "Custom of %(powerLevel)s": "benutzerdefiniert mit Wert %(powerLevel)s"
+    "Custom of %(powerLevel)s": "benutzerdefiniert mit Wert %(powerLevel)s",
+    "Username on %(hs)s": "Benutzername auf %(hs)s"
 }

From a226a4997be92c5debe67338f8d09b0d32c8082f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 14 Nov 2017 20:33:16 +0000
Subject: [PATCH 024/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (934 of 934 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b6cebfc403..3cc3f3e9cd 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1007,5 +1007,6 @@
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Figyelem, a %(hs)s szerverre jelentkezel be és nem a matrix.org szerverre.",
     "Username on %(hs)s": "Felhasználónév a %(hs)s szerveren",
     "Restricted": "Korlátozott",
-    "Custom of %(powerLevel)s": "Egyedi beállítás: %(powerLevel)s"
+    "Custom of %(powerLevel)s": "Egyedi beállítás: %(powerLevel)s",
+    "Presence Management": "Jelenlét menedzsment"
 }

From 648be26fb7618df081342e39f3a9c9d22c6eadf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Wed, 15 Nov 2017 16:27:03 +0000
Subject: [PATCH 025/927] Translated using Weblate (French)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f252786732..cc6f500820 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1003,5 +1003,11 @@
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Veuillez noter que vous vous connecter au serveur %(hs)s, pas à matrix.org.",
     "Username on %(hs)s": "Nom d'utilisateur sur %(hs)s",
     "Restricted": "Restreint",
-    "Custom of %(powerLevel)s": "Personnalisé de %(powerLevel)s"
+    "Custom of %(powerLevel)s": "Personnalisé de %(powerLevel)s",
+    "Presence Management": "Gestion de présence",
+    "Hide avatar changes": "Masquer les changements d'avatar",
+    "Hide display name changes": "Masquer les changements de nom affiché",
+    "Enable inline URL previews by default": "Activer l'aperçu des URL par défaut",
+    "Enable URL previews for this room (only affects you)": "Activer l'aperçu des URL pour ce salon (n'affecte que vous)",
+    "Enable URL previews by default for participants in this room": "Activer l'aperçu des URL par défaut pour les participants de ce salon"
 }

From 1f1ca152193e28e76b69cb9b34124c6c07d7d63b Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Wed, 15 Nov 2017 18:24:20 +0000
Subject: [PATCH 026/927] Translated using Weblate (German)

Currently translated at 98.9% (922 of 932 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6102fc884b..6d4ef41132 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -124,7 +124,7 @@
     "Phone": "Telefon",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bitte prüfe deinen E-Mail-Posteingang und klicke auf den in der E-Mail enthaltenen Link. Anschließend auf \"Fortsetzen\" klicken.",
     "Privacy warning": "Datenschutzwarnung",
-    "Privileged Users": "Privilegierte Nutzer",
+    "Privileged Users": "Privilegierte Benutzer",
     "Profile": "Profil",
     "Refer a friend to Riot:": "Freunde zu Riot einladen:",
     "Once you've followed the link it contains, click below": "Nachdem du dem darin enthaltenen Link gefolgt bist, klicke unten",
@@ -310,7 +310,7 @@
     "Usage": "Verwendung",
     "Use with caution": "Mit Vorsicht zu verwenden",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s hat die Einladung für %(targetName)s zurückgezogen.",
-    "You need to be able to invite users to do that.": "Du musst die Berechtigung haben, Nutzer einzuladen, um diese Aktion ausführen zu können.",
+    "You need to be able to invite users to do that.": "Du musst die Berechtigung haben, Benutzer einzuladen, um diese Aktion ausführen zu können.",
     "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",
     "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
@@ -390,7 +390,7 @@
     "Unknown room %(roomId)s": "Unbekannter Raum %(roomId)s",
     "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 diese Änderung nicht rückgängig machen können, da der Nutzer dasselbe Berechtigungslevel wie du selbst erhalten wird.",
+    "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 diese Änderung nicht rückgängig machen können, da der Benutzer dasselbe Berechtigungslevel wie du selbst erhalten wird.",
     "Make Moderator": "Zum Moderator ernennen",
     "Room": "Raum",
     "Cancel": "Abbrechen",
@@ -541,7 +541,7 @@
     "Error decrypting video": "Video-Entschlüsselung fehlgeschlagen",
     "Import room keys": "Raum-Schlüssel importieren",
     "File to import": "Zu importierende Datei",
-    "Failed to invite the following users to the %(roomName)s room:": "Das Einladen der folgenden Nutzer in den Raum \"%(roomName)s\" ist fehlgeschlagen:",
+    "Failed to invite the following users to the %(roomName)s room:": "Das Einladen der folgenden Benutzer in den Raum \"%(roomName)s\" ist fehlgeschlagen:",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Bist du sicher, dass du dieses Ereignis entfernen (löschen) möchtest? Wenn du die Änderung eines Raum-Namens oder eines Raum-Themas löscht, kann dies dazu führen, dass die ursprüngliche Änderung rückgängig gemacht wird.",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Dieser Prozess erlaubt es dir, die Schlüssel für die in verschlüsselten Räumen empfangenen Nachrichten in eine lokale Datei zu exportieren. In Zukunft wird es möglich sein, diese Datei in einen anderen Matrix-Client zu importieren, sodass dieser Client diese Nachrichten ebenfalls entschlüsseln kann.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Mit der exportierten Datei kann jeder, der diese Datei lesen kann, jede verschlüsselte Nachricht entschlüsseln, die für dich lesbar ist. Du solltest die Datei also unbedingt sicher verwahren. Um den Vorgang sicherer zu gestalten, solltest du unten eine Passphrase eingeben, die dazu verwendet wird, die exportierten Daten zu verschlüsseln. Anschließend wird es nur möglich sein, die Daten zu importieren, wenn dieselbe Passphrase verwendet wird.",
@@ -559,7 +559,7 @@
     " (unsupported)": " (nicht unterstützt)",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Dieser Prozess erlaubt es dir, die zuvor von einem anderen Matrix-Client exportierten Verschlüsselungs-Schlüssel zu importieren. Danach kannst du alle Nachrichten entschlüsseln, die auch bereits auf dem anderen Client entschlüsselt werden konnten.",
     "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Dies wird dein Benutzerkonto dauerhaft unbenutzbar machen. Du wirst nicht in der Lage sein, dich mit derselben Benutzer-ID erneut zu registrieren.",
-    "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:": "Um sicherzustellen, dass diesem Gerät vertraut werden kann, kontaktiere bitte den Eigentümer des Geräts über ein anderes Kommunikationsmittel (z.B. im persönlichen Gespräch oder durch einen Telefon-Anruf) und vergewissere dich, dass der Schlüssel, den der Eigentümer in den Nutzer-Einstellungen für dieses Gerät sieht, mit dem folgenden Schlüssel identisch ist:",
+    "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:": "Um sicherzustellen, dass diesem Gerät vertraut werden kann, kontaktiere bitte den Eigentümer des Geräts über ein anderes Kommunikationsmittel (z.B. im persönlichen Gespräch oder durch einen Telefonanruf) und vergewissere dich, dass der Schlüssel, den der Eigentümer in den Benutzer-Einstellungen für dieses Gerät sieht, mit dem folgenden Schlüssel identisch ist:",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Wenn er identisch ist, bitte den Bestätigen-Button unten verwenden. Falls er nicht identisch sein sollte, hat eine Fremdperson Kontrolle über dieses Gerät und es sollte gesperrt werden.",
     "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Bei der Wiederherstellung deiner letzten Sitzung ist ein Fehler aufgetreten. Um fortzufahren, musst du dich erneut anmelden. Ein zuvor verschlüsselter Chatverlauf wird in der Folge nicht mehr lesbar sein.",
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Wenn du zuvor eine aktuellere Version von Riot verwendet hast, ist deine Sitzung eventuell inkompatibel mit dieser Version. Bitte schließe dieses Fenster und kehre zur aktuelleren Version zurück.",
@@ -616,7 +616,7 @@
     "Save": "Speichern",
     "Tagged as: ": "Markiert als: ",
     "This Home Server does not support login using email address.": "Dieser Heimserver unterstützt den Login mittels E-Mail-Adresse nicht.",
-    "Unknown (user, device) pair:": "Unbekanntes (Nutzer-/Gerät-)Paar:",
+    "Unknown (user, device) pair:": "Unbekanntes (Benutzer-/Gerät-)Paar:",
     "Remote addresses for this room:": "Remote-Adressen für diesen Raum:",
     "Unrecognised command:": "Unbekannter Befehl:",
     "Unrecognised room alias:": "Unbekannter Raum-Alias:",
@@ -649,7 +649,7 @@
     "Start Chatting": "Starte Gespräche",
     "Click on the button below to start chatting!": "Unten auf den Button klicken, um einen Chat zu beginnen!",
     "Create a new chat or reuse an existing one": "Neuen Chat erstellen oder einen vorhandenen Chat fortsetzen",
-    "You already have existing direct chats with this user:": "Du hast bereits direkte Chats mit diesem Nutzer:",
+    "You already have existing direct chats with this user:": "Du hast bereits existierende direkte Chats mit diesem Benutzer:",
     "Username available": "Benutzername ist verfügbar",
     "Username not available": "Benutzername ist nicht verfügbar",
     "Something went wrong!": "Etwas ging schief!",
@@ -752,11 +752,11 @@
     "Unbans user with given id": "Verbannung aufheben für Benutzer mit angegebener ID",
     "You are not in this room.": "Du bist nicht in diesem Raum.",
     "You do not have permission to do that in this room.": "Du hast keine Berechtigung, dies in diesem Raum zu tun.",
-    "Verifies a user, device, and pubkey tuple": "Verifiziert ein Tupel aus Nutzer, Gerät und öffentlichem Schlüssel",
+    "Verifies a user, device, and pubkey tuple": "Verifiziert ein Tupel aus Benutzer, Gerät und öffentlichem Schlüssel",
     "Autocomplete Delay (ms):": "Verzögerung bei Autovervollständigung (ms):",
     "Loading device info...": "Lädt Geräte-Info...",
     "Example": "Beispiel",
-    "Create": "Erstelle",
+    "Create": "Erstellen",
     "Room creation failed": "Raum-Erstellung fehlgeschlagen",
     "Featured Rooms:": "Hervorgehobene Räume:",
     "Featured Users:": "Hervorgehobene Benutzer:",

From 45a90ef038e9a63d675d8a70434581247f9c17b7 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 15 Nov 2017 16:40:07 +0000
Subject: [PATCH 027/927] Translated using Weblate (Russian)

Currently translated at 98.3% (917 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index d46076e2ff..db4174ec0d 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -990,5 +990,12 @@
     "Sign in to get started": "Войдите, чтобы начать",
     "Visibility in Room List": "Видимость в списке комнат",
     "Visible to everyone": "Видимый для всех",
-    "Only visible to community members": "Только участникам сообщества"
+    "Only visible to community members": "Только участникам сообщества",
+    "Presence Management": "Управление присутствием",
+    "Hide avatar changes": "Скрыть изменения аватара",
+    "Hide display name changes": "Скрыть изменения отображаемого имени",
+    "Enable inline URL previews by default": "Включить просмотр URL-адресов по умолчанию",
+    "Enable URL previews for this room (only affects you)": "Включить просмотр URL-адресов для этой комнаты (влияет только на вас)",
+    "Enable URL previews by default for participants in this room": "Включить просмотр URL-адресов по умолчанию для участников этой комнаты",
+    "Status.im theme": "Тема status.im"
 }

From 0596925a8632ce6bd5e9f304f43a98a5f0fd1b01 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 15 Nov 2017 19:05:05 +0000
Subject: [PATCH 028/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 3cc3f3e9cd..7b57d306fd 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1008,5 +1008,10 @@
     "Username on %(hs)s": "Felhasználónév a %(hs)s szerveren",
     "Restricted": "Korlátozott",
     "Custom of %(powerLevel)s": "Egyedi beállítás: %(powerLevel)s",
-    "Presence Management": "Jelenlét menedzsment"
+    "Presence Management": "Jelenlét menedzsment",
+    "Hide avatar changes": "Avatar változások elrejtése",
+    "Hide display name changes": "Név változások elrejtése",
+    "Enable inline URL previews by default": "Beágyazott URL előnézetek alapértelmezett engedélyezése",
+    "Enable URL previews for this room (only affects you)": "URL előnézet engedélyezése ebben a szobában (csak téged érint)",
+    "Enable URL previews by default for participants in this room": "URL előnézet alapértelmezett engedélyezése a szoba tagságának"
 }

From 843bdd6e13502d85a79ef197142664b64cd56346 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Thu, 16 Nov 2017 00:25:51 +0000
Subject: [PATCH 029/927] Translated using Weblate (German)

Currently translated at 99.5% (928 of 932 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 6d4ef41132..9b7bc8f4a5 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -474,7 +474,7 @@
     "Passwords can't be empty": "Passwortfelder dürfen nicht leer sein",
     "Report it": "Melden",
     "riot-web version:": "Version von riot-web:",
-    "Scroll to bottom of page": "Zum Ende der Seite springen",
+    "Scroll to bottom of page": "Zum Seitenende springen",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zeitstempel im 12-Stunden-Format anzeigen (z. B. 2:30pm)",
     "Email address": "E-Mail-Adresse",
     "Error decrypting attachment": "Fehler beim Entschlüsseln des Anhangs",
@@ -769,7 +769,7 @@
     "Cannot add any more widgets": "Kann keine weiteren Widgets hinzufügen",
     "Do you want to load widget from URL:": "Möchtest du das Widget von folgender URL laden:",
     "Integrations Error": "Integrations-Error",
-    "NOTE: Apps are not end-to-end encrypted": "BEACHTE: Apps sind nicht Ende-zu-Ende verschlüsselt",
+    "NOTE: Apps are not end-to-end encrypted": "BEACHTE: Apps sind nicht Ende-zu-Ende-verschlüsselt",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s hinzugefügt",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s hat das Widget %(widgetName)s entfernt",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "In der Desktop-Version kann derzeit nicht geprüft werden, ob ein Benutzer ein Roboter ist. Bitte einen <a>Webbrowser</a> verwenden",
@@ -795,7 +795,7 @@
     "Advanced options": "Erweiterte Optionen",
     "Block users on other matrix homeservers from joining this room": "Benutzer anderer Matrix-Heimserver das Betreten dieses Raumes verbieten",
     "This setting cannot be changed later!": "Diese Einstellung kann nachträglich nicht mehr geändert werden!",
-    "Unignore": "Entignorieren",
+    "Unignore": "Ignorieren aufheben",
     "User Options": "Benutzer-Optionen",
     "Unignored user": "Benutzer nicht mehr ignoriert",
     "Ignored user": "Benutzer ignoriert",
@@ -1003,5 +1003,11 @@
     "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML für deine Community-Seite</h1>\n<p>\n    Nutze die ausführliche Beschreibung, um neuen Mitgliedern diese Community vorzustellen\n    oder um wichtige <a href=\"foo\">Links</a> bereitzustellen.\n</p>\n<p>\n    Du kannst sogar 'img'-Tags (HTML) verwenden\n</p>\n",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Deine Community hat noch keine ausführliche Beschreibung, d. h. eine HTML-Seite, die Community-Mitgliedern angezeigt wird.<br />Hier klicken, um die Einstellungen zu öffnen und eine Beschreibung zu erstellen!",
     "Custom of %(powerLevel)s": "benutzerdefiniert mit Wert %(powerLevel)s",
-    "Username on %(hs)s": "Benutzername auf %(hs)s"
+    "Username on %(hs)s": "Benutzername auf %(hs)s",
+    "Hide avatar changes": "Profilbild-Änderungen verbergen",
+    "Hide display name changes": "Anzeigenamen-Änderungen verbergen",
+    "Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren",
+    "Enable URL previews for this room (only affects you)": "URL-Vorschau für diesen Raum aktivieren (betrifft nur dich)",
+    "Enable URL previews by default for participants in this room": "URL-Vorschau standardmäßig für Mitglieder dieses Raumes aktivieren",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du meldest dich auf dem %(hs)s-Server an, nicht auf matrix.org."
 }

From 44e8a2cd545f0d2bea51abd1caa0925fde90c8d1 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Thu, 16 Nov 2017 12:45:37 +0000
Subject: [PATCH 030/927] Translated using Weblate (German)

Currently translated at 99.6% (927 of 930 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 9b7bc8f4a5..d4979767ba 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -266,7 +266,7 @@
     "%(names)s and one other are typing": "%(names)s und ein weiteres Raum-Mitglied schreiben",
     "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s dauerhaft aus dem Raum verbannt.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von \"%(oldDisplayName)s\" auf \"%(displayName)s\" geändert.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von %(oldDisplayName)s auf %(displayName)s geändert.",
     "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s.",
@@ -1009,5 +1009,8 @@
     "Enable inline URL previews by default": "URL-Vorschau standardmäßig aktivieren",
     "Enable URL previews for this room (only affects you)": "URL-Vorschau für diesen Raum aktivieren (betrifft nur dich)",
     "Enable URL previews by default for participants in this room": "URL-Vorschau standardmäßig für Mitglieder dieses Raumes aktivieren",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du meldest dich auf dem %(hs)s-Server an, nicht auf matrix.org."
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du meldest dich auf dem %(hs)s-Server an, nicht auf matrix.org.",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Alle erneut senden</resendText> oder <cancelText>alle verwerfen</cancelText>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Sonst ist hier aktuell niemand. Möchtest du <inviteText>Benutzer einladen</inviteText> oder die <nowarnText>Warnmeldung bezüglich des leeren Raums deaktivieren</nowarnText>?",
+    "Sign in to get started": "Melde dich an, um loszulegen"
 }

From 02ffa919c476c2404411db18e2b7c3c8aa82bcb3 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Thu, 16 Nov 2017 12:48:03 +0000
Subject: [PATCH 031/927] Translated using Weblate (Russian)

Currently translated at 98.7% (918 of 930 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index db4174ec0d..78d0f7b976 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -997,5 +997,10 @@
     "Enable inline URL previews by default": "Включить просмотр URL-адресов по умолчанию",
     "Enable URL previews for this room (only affects you)": "Включить просмотр URL-адресов для этой комнаты (влияет только на вас)",
     "Enable URL previews by default for participants in this room": "Включить просмотр URL-адресов по умолчанию для участников этой комнаты",
-    "Status.im theme": "Тема status.im"
+    "Status.im theme": "Тема status.im",
+    "Restricted": "Ограниченный",
+    "Username on %(hs)s": "Имя пользователя на %(hs)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Видимость '%(roomName)s' в %(groupId)s не может быть актуализирована.",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s ваше приглашение было отклонено %(count)s раз",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s ваше приглашение отклонил"
 }

From f4b7741449e25b8ac6d1e51243e343d0573a521a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 16 Nov 2017 12:54:02 +0000
Subject: [PATCH 032/927] Translated using Weblate (Slovak)

Currently translated at 99.7% (928 of 930 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 329af0e0a9..ae8dd9c336 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -266,7 +266,7 @@
     "Hangup": "Zavesiť",
     "Voice call": "Audio hovor",
     "Video call": "Video hovor",
-    "Hide Apps": "Skriť aplikácie",
+    "Hide Apps": "Skryť aplikácie",
     "Show Apps": "Zobraziť aplikácie",
     "Upload file": "Nahrať súbor",
     "Show Text Formatting Toolbar": "Zobraziť lištu formátovania textu",
@@ -275,7 +275,7 @@
     "You do not have permission to post to this room": "Nemáte udelené právo posielať do tejto miestnosti",
     "Turn Markdown on": "Povoliť Markdown",
     "Turn Markdown off": "Zakázať Markdown",
-    "Hide Text Formatting Toolbar": "Skriť lištu formátovania textu",
+    "Hide Text Formatting Toolbar": "Skryť lištu formátovania textu",
     "Server error": "Chyba servera",
     "Server unavailable, overloaded, or something else went wrong.": "Server je nedostupný, preťažený, alebo sa pokazilo niečo iné.",
     "Command error": "Chyba príkazu",
@@ -758,18 +758,18 @@
     "Uploading %(filename)s and %(count)s others|zero": "Nahrávanie %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Nahrávanie %(filename)s a %(count)s ďalší súbor",
     "Autoplay GIFs and videos": "Automaticky prehrávať animované GIF obrázky a videá",
-    "Hide read receipts": "Skriť potvrdenia o prečítaní",
+    "Hide read receipts": "Skryť potvrdenia o prečítaní",
     "Don't send typing notifications": "Neposielať oznámenia keď píšete",
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Skriť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykopnutí/zákazov vstupu)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Skryť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykopnutí/zákazov vstupu)",
     "Hide avatar and display name changes": "Skriť zmeny zobrazovaného mena a avatara",
     "Use compact timeline layout": "Použiť kompaktné rozloženie časovej osy",
-    "Hide removed messages": "Skriť odstránené správy",
+    "Hide removed messages": "Skryť odstránené správy",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
     "Automatically replace plain text Emoji": "Automaticky nahrádzať textové Emoji",
     "Disable Emoji suggestions while typing": "Zakázať návrhy Emoji počas písania",
-    "Hide avatars in user and room mentions": "Skriť avatarov pri zmienkach miestností a používateľov",
+    "Hide avatars in user and room mentions": "Skryť avatarov pri zmienkach miestností a používateľov",
     "Disable big emoji in chat": "Zakázať veľké Emoji v konverzácii",
     "Mirror local video feed": "Zrkadliť lokálne video",
     "Opt out of analytics": "Odhlásiť sa zo zberu analytických údajov",
@@ -930,5 +930,13 @@
     "Sign in to get started": "Začnite prihlásením sa",
     "Status.im theme": "Téma status.im",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Všimnite si: Práve sa prihlasujete na server %(hs)s, nie na server matrix.org.",
-    "Username on %(hs)s": "Meno používateľa na servery %(hs)s"
+    "Username on %(hs)s": "Meno používateľa na servery %(hs)s",
+    "Restricted": "Obmedzené",
+    "Presence Management": "Spravovanie prítomnosti",
+    "Hide avatar changes": "Skryť zmeny avatara",
+    "Hide display name changes": "Skryť zmeny zobrazovaného mena",
+    "Enable inline URL previews by default": "Predvolene povoliť náhľady URL adries",
+    "Enable URL previews for this room (only affects you)": "Povoliť náhľady URL adries pre túto miestnosť (ovplyvňuje len vás)",
+    "Enable URL previews by default for participants in this room": "Predvolene povoliť náhľady URL adries pre členov tejto miestnosti",
+    "Custom of %(powerLevel)s": "Vlastná úroveň %(powerLevel)s"
 }

From 1d2e13f91dde17e13a0b7432fa9cf30a03cfcba2 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 16 Nov 2017 13:21:52 +0000
Subject: [PATCH 033/927] Translated using Weblate (Russian)

Currently translated at 98.7% (920 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 78d0f7b976..e9eba019c8 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -998,9 +998,11 @@
     "Enable URL previews for this room (only affects you)": "Включить просмотр URL-адресов для этой комнаты (влияет только на вас)",
     "Enable URL previews by default for participants in this room": "Включить просмотр URL-адресов по умолчанию для участников этой комнаты",
     "Status.im theme": "Тема status.im",
-    "Restricted": "Ограниченный",
+    "Restricted": "Ограничен",
     "Username on %(hs)s": "Имя пользователя на %(hs)s",
-    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Видимость '%(roomName)s' в %(groupId)s не может быть актуализирована.",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s ваше приглашение было отклонено %(count)s раз",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s ваше приглашение отклонил"
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Видимость '%(roomName)s' в %(groupId)s не удалось обновить.",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s отклонили приглашения %(count)s раз",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s отклонили приглашения",
+    "URL previews are enabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию.",
+    "URL previews are disabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию."
 }

From c9a66d375f44c99c6c93bc314e9f7761b34749b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 16 Nov 2017 14:45:01 +0000
Subject: [PATCH 034/927] Translated using Weblate (Slovak)

Currently translated at 99.5% (928 of 932 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index ae8dd9c336..4ae115a4de 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -3,7 +3,7 @@
     "This phone number is already in use": "Toto telefónne číslo sa už používa",
     "Failed to verify email address: make sure you clicked the link in the email": "Nepodarilo sa overiť emailovú adresu: Uistite sa, že ste správne klikli na odkaz v emailovej správe",
     "Call Timeout": "Časový limit hovoru",
-    "The remote side failed to pick up": "Vzdialenej strane sa nepodarilo priať hovor",
+    "The remote side failed to pick up": "Vzdialenej strane sa nepodarilo prijať hovor",
     "Unable to capture screen": "Nie je možné zachytiť obrazovku",
     "Existing Call": "Existujúci hovor",
     "You are already in a call.": "Už ste súčasťou iného hovoru.",
@@ -469,7 +469,7 @@
     "Password:": "Heslo:",
     "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s bola odoslaná správa",
     "Please check your email to continue registration.": "Prosím, skontrolujte si emaily, aby ste mohli pokračovať v registrácii.",
-    "Token incorrect": "Nesprávny token",
+    "Token incorrect": "Neplatný token",
     "A text message has been sent to %(msisdn)s": "Na číslo %(msisdn)s bola odoslaná textová správa",
     "Please enter the code it contains:": "Prosím, zadajte kód z tejto správy:",
     "Start authentication": "Spustiť overenie",
@@ -870,7 +870,7 @@
     "This server does not support authentication with a phone number.": "Tento server nepodporuje overenie telefónnym číslom.",
     "Missing password.": "Chýba heslo.",
     "Passwords don't match.": "Heslá sa nezhodujú.",
-    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Heslo je veľmi krátke (minimálne %(MIN_PASSWORD_LENGTH)s).",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Heslo je veľmi krátke (minimálne %(MIN_PASSWORD_LENGTH)s znakov).",
     "This doesn't look like a valid email address.": "Zdá sa, že toto nie je platná emailová adresa.",
     "This doesn't look like a valid phone number.": "Zdá sa, že toto nie je platné telefónne číslo.",
     "You need to enter a user name.": "Musíte zadať používateľské meno.",

From c025d50400ad625c5b2f47a8293e780d09bbdfca Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 16 Nov 2017 19:42:16 +0000
Subject: [PATCH 035/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7b57d306fd..91e90d1c1e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1013,5 +1013,9 @@
     "Hide display name changes": "Név változások elrejtése",
     "Enable inline URL previews by default": "Beágyazott URL előnézetek alapértelmezett engedélyezése",
     "Enable URL previews for this room (only affects you)": "URL előnézet engedélyezése ebben a szobában (csak téged érint)",
-    "Enable URL previews by default for participants in this room": "URL előnézet alapértelmezett engedélyezése a szoba tagságának"
+    "Enable URL previews by default for participants in this room": "URL előnézet alapértelmezett engedélyezése a szoba tagságának",
+    "URL previews are enabled by default for participants in this room.": "Az URL előnézetek alapértelmezetten engedélyezve vannak a szobában jelenlévőknek.",
+    "URL previews are disabled by default for participants in this room.": "Az URL előnézet alapértelmezetten tiltva van a szobában jelenlévőknek.",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Mindet újraküldöd</resendText> vagy <cancelText>mindet megszakítod</cancelText>. De egyenként is kijelölheted az üzenetet elküldésre vagy megszakításra.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Senki más nincs itt! Szeretnél <inviteText>meghívni másokat</inviteText> vagy <nowarnText>leállítod a figyelmeztetést az üres szobára</nowarnText>?"
 }

From bceb11cde9cc58bac41ba37db727fc66d21d8df2 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Thu, 16 Nov 2017 20:23:47 +0000
Subject: [PATCH 036/927] Translated using Weblate (Finnish)

Currently translated at 89.0% (830 of 932 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index aeca03c48d..b6e16a901e 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -689,5 +689,202 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Et voi kumota tätä toimintoa koska olet antamassa käyttäjälle saman oikeustason kuin sinullakin on.",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Tämä prosessi mahdollistaa salatuissa huoneissa vastaanottamasi viestien salausavainten vieminen tiedostoon.  Voit sitten myöhemmin tuoda ne toiseen Matrix-asiakasohjelmaan niin että myös se ohjema voi purkaa viestit.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Tämän tiedoston avulla kuka tahansa pystyy purkamaan kaikki salatut viestit jotka sinä voit nähdä, joten sinun täytyy säilyttää se turvallisesti. Helpottaaksesi tätä sinun pitäisi syötää salasana alla jonka avulla tiedosto salataan. Käyttäen samaa salasanaa voit myöhemmin tuoda tiedot ohjelmaan.",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tämä prosessi mahdollistaa aiemmin tallennettujen salausavainten tuominen toiseen Matrix-asiakasohjelmaan. Tämän jälkeen voit purkaa kaikki salatut viestit jotka toinen asiakasohjelma pystyisi purkamaan."
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tämä prosessi mahdollistaa aiemmin tallennettujen salausavainten tuominen toiseen Matrix-asiakasohjelmaan. Tämän jälkeen voit purkaa kaikki salatut viestit jotka toinen asiakasohjelma pystyisi purkamaan.",
+    "Who would you like to add to this community?": "Kenet sinä haluaisit lisätä tähän yhteisöön?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varioitus: henkilöt jotka lisäät yhteisöön näkyvät kaikille jotka tietävät yhteisön tunnisteen",
+    "Invite new community members": "Kutsu uusia jäsenia yhteisöön",
+    "Name or matrix ID": "Nimi tai Matrix tunniste",
+    "Invite to Community": "Kutsu yhteisöön",
+    "Which rooms would you like to add to this community?": "Mitkä huoneet haluaisit listätä tähän yhteisöön?",
+    "Show these rooms to non-members on the community page and room list?": "Näytetäänkö nämä huoneet ei-jäsenille yhteisön sivulla ja huonelistassa?",
+    "Add rooms to the community": "Lisää huoneita tähän yhteisöön",
+    "Room name or alias": "Huoneen nimi taj alias",
+    "Add to community": "Lisää yhteisöön",
+    "Failed to invite the following users to %(groupId)s:": "Seuraavien käyttäjien kutsuminen ryhmään %(groupId)s epäonnistui:",
+    "Failed to invite users to community": "Käyttäjien kutsuminen yhteisöön epäonnostui",
+    "Failed to invite users to %(groupId)s": "Käyttäjien kutsuminen yhteisöön %(groupId)s epäonnistui",
+    "Failed to add the following rooms to %(groupId)s:": "Seiraavien huoneiden lisääminen yhteisöön %(groupId)s epäonnistui:",
+    "Restricted": "Rajoitettu",
+    "You are now ignoring %(userId)s": "Et enää huomioi käyttäjää %(userId)s",
+    "You are no longer ignoring %(userId)s": "Huomioit jälleen käyttäjän %(userId)s",
+    "%(senderName)s removed their profile picture.": "%(senderName)s poisti profiilikuvansa.",
+    "%(senderName)s set a profile picture.": "%(senderName)s asetti profiilikuvan.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, kutsusta lähtien.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, liittymisestä asti.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s teki tulevan huonehistorian näkyväksi tuntemattomalle (%(visibility)s).",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName) muutti tämän huoneen kiinnitetyt viestit.",
+    "%(names)s and %(count)s others are typing|other": "%(name)s ja %(count)s muuta kirjoittavat",
+    "%(names)s and %(count)s others are typing|one": "%(name)s ja yksi muu kirjoittvat",
+    "Message Pinning": "Kiinnitetyt viestit",
+    "Disable Emoji suggestions while typing": "Ota pois käytöstä emojiehdotukset kirjoittaessa",
+    "Hide avatar changes": "Piilota avatarmuutokset",
+    "Hide display name changes": "Piilota näyttönimimuutokset",
+    "Hide avatars in user and room mentions": "Piilota avatarit käyttäjä- ja huonemaininnoissa",
+    "Disable big emoji in chat": "Ota isot emojit pois käytöstä",
+    "Automatically replace plain text Emoji": "Korvaa automaattisesti teksimuotoiset emojit",
+    "Mirror local video feed": "Peilaa paikallinen videosyöte",
+    "Disable Peer-to-Peer for 1:1 calls": "Ota pois käytöstä suora P2P yhteys 1:1 puheluissa",
+    "Enable inline URL previews by default": "Ota URL esikatselu käyttöön oletusarvoisesti",
+    "Enable URL previews for this room (only affects you)": "Ota URL esikatselut käyttöön tässä huoneessa (koskee ainoastaan sinua)",
+    "Enable URL previews by default for participants in this room": "Ota URL esikatselu käyttöön kaikille huoneen jäsenille",
+    "%(senderName)s sent an image": "%(senderName)s lähetti kuvan",
+    "%(senderName)s sent a video": "%(senderName)s lähetti videon",
+    "%(senderName)s uploaded a file": "%(senderName)s latasi tiedoston",
+    "Disinvite this user?": "Peru tämän käyttäjän kutsu?",
+    "Kick this user?": "Poista tämä käyttäjä?",
+    "Unban this user?": "Poista tämän käyttäjän porttikielto?",
+    "Ban this user?": "Anna porttikielto tälle käyttäjälle?",
+    "Unignore": "Huomioi käyttäjä jälleen",
+    "Ignore": "Jätä käyttäjä huomioimatta",
+    "Jump to read receipt": "Hyppää lukukuittakseen",
+    "Mention": "Mainitse",
+    "Invite": "Kutsu",
+    "User Options": "Käyttäjä-asetukset",
+    "Make Moderator": "Anna moderaattorioikeudet",
+    "Admin Tools": "Ylläpitotyökalut",
+    "Show Apps": "Näytä appit",
+    "Unpin Message": "Poista viestin kiinnitys",
+    "Jump to message": "Hyppää viestiin",
+    "No pinned messages.": "Ei kiinnitettyjä viestejä.",
+    "Loading...": "Lataa...",
+    "Pinned Messages": "Kiinnitetyt viestit",
+    "Unnamed room": "Nimetön huone",
+    "World readable": "Täysin julkinen",
+    "Guests can join": "Vierailijat voivat liittyä",
+    "No rooms to show": "Ei huoneita",
+    "Failed to set avatar.": "Avatarin asettaminen epäonnistui",
+    "Upload avatar": "Lataa avatar",
+    "Remove avatar": "Poista avatar",
+    "Drop here to favourite": "Pudota tähän lisätäksesi suosikkeihin",
+    "Drop here to tag direct chat": "Pudota tähän merkitäksesi suoraksi viestittelyksi",
+    "Drop here to restore": "Pudota tähän palauttaaksesi",
+    "Drop here to demote": "Pudota tähän antaaksesi alhaisen prioriteetin",
+    "Community Invites": "Yhteisökutsut",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s on poistanut sinut tästä huoneesta.",
+    "You have been banned from this room by %(userName)s.": "%(userName)s on antanut sinulle porttikiellon tähän huoneeseen.",
+    "You are trying to access a room.": "Yrität liittyä huoneeseen.",
+    "Banned by %(displayName)s": "%(displayName)s antanut porttikiellon",
+    "Privileged Users": "Etuoikeutetut käyttäjät",
+    "Members only (since the point in time of selecting this option)": "Vain jäsenet (tämän valinnat tekemisestä lähtien)",
+    "Members only (since they were invited)": "Vain jäsenet (heidän kutsustaan lähtien)",
+    "Members only (since they joined)": "Vain jäsenet (heidän liittymisestään lähtien)",
+    "To send messages, you must be a": "Voidaksesi ähettääksesi viestejä sinun tulee olla",
+    "To invite users into the room, you must be a": "Voidaksesi kutsua käyttäjiä huoneseen tulee sinun olla",
+    "To configure the room, you must be a": "Voidaksesi muokata huoneen asetuksia sinun tulee olla",
+    "To kick users, you must be a": "Voidaksesi poistaa käyttäjiä huoneesta sinun tulee olla",
+    "To ban users, you must be a": "Voidaksesi antaa porttikieltoja huoneeseen sinun tulee olla",
+    "To remove other users' messages, you must be a": "Voidaksesi poistaa muiden käyttäjien viestejä sinun tulee olla",
+    "To send events of type <eventType/>, you must be a": "Voidaksesi lähettää <eventType/>-tyypin viestejä sinun tulee olla",
+    "Invalid community ID": "Virheellinen yhteistötunniste",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' on virheellinen yhteisötunniste",
+    "Related Communities": "Liittyvät yhteisöt",
+    "Related communities for this room:": "Tähän huoneeseen liittyvät yhteisöt:",
+    "This room has no related communities": "Tähän huoneseen ei liity yhtään yhteisöä",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisötunniste (esim. +foo:%(localDomain)s)",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutti huoneen %(roomName)s avatarin",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName) poisti huoneen avatarin.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s muutti huoneen avatariksi <img/>",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Sinut ohjataan kolmannen osapuolen sivustolle jotta voit autentikoida tilisi käyttääksesi %(integrationsUrl)s. Haluatko jatkaa?",
+    "Message removed by %(userId)s": "Käyttäjän %(userId)s poistama viesti",
+    "Message removed": "Viesti poistettu",
+    "Sign in with CAS": "Kirjaudu käyttäen CAS",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Voit kirjautua toiselle Matrix kotipalvelimelle syöttämällä palvelimen URL-osoite palvelin-asetuksissa.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Tämä mahdollistaa tämän ohjelman käytön olemassa olevan toisella palvelimella sijaitsevan Matrix tilin kanssa.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Voit myös käyttää toista identiteettipalvelinta mutta tyypillisesti tämä estää sähköpostiosoitteisiin perustuvan kanssakäynnin muiden käyttäjien kanssa.",
+    "An email has been sent to %(emailAddress)s": "Viesti lähetetty osoitteeseen %(emailAddress)s",
+    "Please check your email to continue registration.": "Ole hyvä ja tarkista sähköpostisi jatkaaksesi.",
+    "A text message has been sent to %(msisdn)s": "Tekstiviesti on lähetetty numeroon %(msisdn)s",
+    "Username on %(hs)s": "Käyttäjänimi palvelimella %(hs)s",
+    "Custom server": "Muu palvelin",
+    "Remove from community": "Poista yhteisöstä",
+    "Disinvite this user from community?": "Peruta tämän käyttäjän kutsu yhteisöön?",
+    "Remove this user from community?": "Poista tämä käyttäjä yhteisöstä?",
+    "Failed to withdraw invitation": "Kutsun peruminen epäonnistui",
+    "Failed to remove user from community": "Käyttäjän poistaminen yhteisöstä epäonnistui",
+    "Filter community members": "Suodata yhteisön jäsenet",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Oletko varma että haluat poistaa '%(roomName)s' yhteisöstä %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Huoneen poistaminen yhteisöstä poistaa sen myös yhteisösivulta.",
+    "Failed to remove room from community": "Huoneen poistaminen yhteisöstä epäonnistui",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Huoneen '%(roomName)s' poistaminen yhteisöstä %(groupId)s epäonnistui",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Huoneen '%(roomName)s' näkyvyys yhteisössä %(groupId)s ei voitu päivittää.",
+    "Visibility in Room List": "Näkyvyys huoneluettelossa",
+    "Visible to everyone": "Näkyy kaikille",
+    "Only visible to community members": "Vain näkyvä yhteisön jäsenille",
+    "Filter community rooms": "Suodata yhteisön huoneet",
+    "Communities": "Yhteisöt",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "were unbanned %(count)s times|other": "porttikiellot poistettiin %(count)s kertaa",
+    "And %(count)s more...|other": "Ja %(count)s lisää...",
+    "Matrix ID": "Matrix-tunniste",
+    "Matrix Room ID": "Matrix huonetunniste",
+    "email address": "sähköpostiosoite",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Kokeile käyttää yhtä näistä valideista osoitetyypeistä: %(validTypesList)s.",
+    "You have entered an invalid address.": "Olet syöttänyt virheellisen sähköpostiosoitteen.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Oletko varma että haluat poistaa tämän tapahtuman? Huomaa että jos poistat huoneen nimen tai aiheen muutoksen, saattaa muutos kumoutua.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Yhteisötunnisteet voivat sisältää vain merkit a-z, 0-9 tai '=_-/'",
+    "Something went wrong whilst creating your community": "Jokin epäonnistui yhteisön luomisessa",
+    "Create Community": "Luo yhteisö",
+    "Community Name": "Yhteisön nimi",
+    "Community ID": "Yhteisötunniste",
+    "example": "esimerkki",
+    "Advanced options": "Lisäasetukset",
+    "Block users on other matrix homeservers from joining this room": "Estä käyttäjiä toisilta kotipalvelimilta liittymästä tähän huoneseen",
+    "This setting cannot be changed later!": "Tätä asetusta ei voi muuttaa enää myöhemmin!",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Tämä tekee tilistäsi pysyvästi käyttökelvottoman. Et voi rekisteröidä samaa tunnusta uudestaan.",
+    "Add rooms to the community summary": "Lisää huoneita yhteisön yhteenvetoon",
+    "Which rooms would you like to add to this summary?": "Mitkä huoneet haluaisit lisätä tähän yhteenvetoon?",
+    "Add to summary": "Lisää yhteenvetoon",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Seuraavien huoneiden lisääminen yhteisöön %(groupId)s epäonnistui:",
+    "Add a Room": "Lisää huone",
+    "Failed to remove the room from the summary of %(groupId)s": "Huoneen poistaminen yhteisön %(groupId)s yhteenvedosta epäonnistui",
+    "The room '%(roomName)s' could not be removed from the summary.": "Huoneen '%(roomName)s' poistaminen yhteenvedosta epäonnistui.",
+    "Add users to the community summary": "Lisää käyttäjiä yhteisön yhteenvetoon",
+    "Who would you like to add to this summary?": "Kenet haluaisit lisätä tähän yhteenvetoon?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Seuraavien käyttäjien lisääminen yhteisön %(groupId)s yhteenvetoon epäonnistui:",
+    "Add a User": "Lisää käyttäjä",
+    "Failed to remove a user from the summary of %(groupId)s": "Käyttäjän poistaminen yhteisöstä %(groupId)s epäonnistui",
+    "The user '%(displayName)s' could not be removed from the summary.": "Käyttäjän '%(displayName)s' poistaminen yhteenvedosta epäonnistui.",
+    "Failed to update community": "Yhteisön päivittäminen epäonnistui",
+    "Unable to accept invite": "Kutsun hyväksyminen epäonnistui",
+    "Unable to reject invite": "Kutsun hylkääminen epäonnistui",
+    "Leave Community": "Poistu yhteisöstä",
+    "Leave %(groupName)s?": "Poistu yhteisöstä %(groupName)s?",
+    "Leave": "Poistu",
+    "Unable to leave room": "Poistuminen epäonnistui",
+    "Community Settings": "Yhteisöasetukset",
+    "Add rooms to this community": "Lisää huoneita tähän yhteisöön",
+    "Featured Rooms:": "Esiinnostetut huoneet:",
+    "Featured Users:": "Esiinnostetut käyttäjät:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s on kutsunut sinut tähän yhteisöön",
+    "You are an administrator of this community": "Olet tämän yhteisön ylläpitäjä",
+    "You are a member of this community": "Olet tämän yhteisön jäsen",
+    "Community Member Settings": "Yhteisöjäsenasetukset",
+    "Publish this community on your profile": "Julkaise tämä yhteisö profiilissasi",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Sinun yhteistöltäsi puuttuu pitkä kuvaus, HTML sivu joka  näytetään yhteistön jäsenille. <br />Klikkaa tästä avataksesi asetukset luodaksesi sivun!",
+    "Long Description (HTML)": "Pitkä kuvaus (HTML)",
+    "Description": "Kuvaus",
+    "Community %(groupId)s not found": "Yhteisöä %(groupId)s ei löytynyt",
+    "This Home server does not support communities": "Tämä kotipalvelin ei tue yhteisöjä",
+    "Failed to load %(groupId)s": "Yhteisön %(groupId)s lataaminen epäonnistui",
+    "Your Communities": "Sinun yhteistösi",
+    "You're not currently a member of any communities.": "Et ole minkään yhteisön jäsen tällä hetkellä.",
+    "Error whilst fetching joined communities": "Virhe ladatessa listaa yhteistöistä joihin olet liittynyt",
+    "Create a new community": "Luo uusi yhteisö",
+    "Join an existing community": "Liity olemassaolevaan yhteisöön",
+    "Light theme": "Vaalea ulkoasu",
+    "Dark theme": "Tumma ulkoasu",
+    "Status.im theme": "Status.im ulkoasu",
+    "Autocomplete Delay (ms):": "Automaattitäydennyksen viive (ms):",
+    "Ignored Users": "Huomiotta jätetyt käyttäjät:",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Viesti on lähetetty osoitteeseen %(emailAddress)s. Klikkaa alla sen jälkeen kun olet seurannut viestin sisältämää linkkiä.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Huomaa että olet kirjautumassa palvelimelle %(hs)s, etkä palvelimelle matrix.org.",
+    "Sign in to get started": "Kirjaudu aloittaksesi",
+    "Upload an avatar:": "Lataa avatar:",
+    "Deops user with given id": "Poistaa annetun tunnisteen omaavalta käyttäjältä ylläpito-oikeudet",
+    "Ignores a user, hiding their messages from you": "Jättää käyttäjän huomioimatta jolloin heidän viestejä ei näytetä sinulle",
+    "Stops ignoring a user, showing their messages going forward": "Lopettaa käyttäjän huomiotta jättämisen jolloin heidän tulevat viestit näytetään sinulle",
+    "Notify the whole room": "Hälytä koko huone",
+    "Room Notification": "Huonehälytys"
 }

From 99bb64915fef1c4f4315463a0a59867c8317fbd2 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Thu, 16 Nov 2017 15:55:40 +0000
Subject: [PATCH 037/927] Translated using Weblate (Russian)

Currently translated at 98.8% (921 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e9eba019c8..9a29dd9603 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1004,5 +1004,6 @@
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s отклонили приглашения %(count)s раз",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s отклонили приглашения",
     "URL previews are enabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию.",
-    "URL previews are disabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию."
+    "URL previews are disabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию.",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотклонил приглашения %(count)s раз"
 }

From 4de4b5206bf340d0383e7d2ebb075ade9b0826d4 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Fri, 17 Nov 2017 07:51:33 +0000
Subject: [PATCH 038/927] Translated using Weblate (Finnish)

Currently translated at 89.0% (830 of 932 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index b6e16a901e..4752d68999 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -714,9 +714,9 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s teki tulevan huonehistorian näkyväksi tuntemattomalle (%(visibility)s).",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName) muutti tämän huoneen kiinnitetyt viestit.",
-    "%(names)s and %(count)s others are typing|other": "%(name)s ja %(count)s muuta kirjoittavat",
-    "%(names)s and %(count)s others are typing|one": "%(name)s ja yksi muu kirjoittvat",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s muutti tämän huoneen kiinnitetyt viestit.",
+    "%(names)s and %(count)s others are typing|other": "%(names)s ja %(count)s muuta kirjoittavat",
+    "%(names)s and %(count)s others are typing|one": "%(names)s ja yksi muu kirjoittvat",
     "Message Pinning": "Kiinnitetyt viestit",
     "Disable Emoji suggestions while typing": "Ota pois käytöstä emojiehdotukset kirjoittaessa",
     "Hide avatar changes": "Piilota avatarmuutokset",
@@ -754,7 +754,7 @@
     "World readable": "Täysin julkinen",
     "Guests can join": "Vierailijat voivat liittyä",
     "No rooms to show": "Ei huoneita",
-    "Failed to set avatar.": "Avatarin asettaminen epäonnistui",
+    "Failed to set avatar.": "Avatarin asettaminen epäonnistui.",
     "Upload avatar": "Lataa avatar",
     "Remove avatar": "Poista avatar",
     "Drop here to favourite": "Pudota tähän lisätäksesi suosikkeihin",
@@ -784,7 +784,7 @@
     "This room has no related communities": "Tähän huoneseen ei liity yhtään yhteisöä",
     "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisötunniste (esim. +foo:%(localDomain)s)",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutti huoneen %(roomName)s avatarin",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName) poisti huoneen avatarin.",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s poisti huoneen avatarin.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s muutti huoneen avatariksi <img/>",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Sinut ohjataan kolmannen osapuolen sivustolle jotta voit autentikoida tilisi käyttääksesi %(integrationsUrl)s. Haluatko jatkaa?",
     "Message removed by %(userId)s": "Käyttäjän %(userId)s poistama viesti",
@@ -877,7 +877,7 @@
     "Dark theme": "Tumma ulkoasu",
     "Status.im theme": "Status.im ulkoasu",
     "Autocomplete Delay (ms):": "Automaattitäydennyksen viive (ms):",
-    "Ignored Users": "Huomiotta jätetyt käyttäjät:",
+    "Ignored Users": "Huomiotta jätetyt käyttäjät",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Viesti on lähetetty osoitteeseen %(emailAddress)s. Klikkaa alla sen jälkeen kun olet seurannut viestin sisältämää linkkiä.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Huomaa että olet kirjautumassa palvelimelle %(hs)s, etkä palvelimelle matrix.org.",
     "Sign in to get started": "Kirjaudu aloittaksesi",

From ee5d43385cdae68e611c4513dc1c77f43f2e446a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 16 Nov 2017 16:03:01 +0000
Subject: [PATCH 039/927] Translated using Weblate (French)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index cc6f500820..52a663f501 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1009,5 +1009,9 @@
     "Hide display name changes": "Masquer les changements de nom affiché",
     "Enable inline URL previews by default": "Activer l'aperçu des URL par défaut",
     "Enable URL previews for this room (only affects you)": "Activer l'aperçu des URL pour ce salon (n'affecte que vous)",
-    "Enable URL previews by default for participants in this room": "Activer l'aperçu des URL par défaut pour les participants de ce salon"
+    "Enable URL previews by default for participants in this room": "Activer l'aperçu des URL par défaut pour les participants de ce salon",
+    "URL previews are enabled by default for participants in this room.": "Les aperçus d'URL sont activés par défaut pour les participants de ce salon.",
+    "URL previews are disabled by default for participants in this room.": "Les aperçus d'URL sont désactivés par défaut pour les participants de ce salon.",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez également sélectionner des messages individuels à renvoyer ou annuler.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Il n'y a personne d'autre ici ! Souhaitez-vous <inviteText>inviter d'autres personnes</inviteText> ou <nowarnText>ne plus être notifié à propos du salon vide</nowarnText> ?"
 }

From c60c4c3463509fcd570a124001416d8757ca3cfa Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Thu, 16 Nov 2017 22:29:42 +0000
Subject: [PATCH 040/927] Translated using Weblate (German)

Currently translated at 99.6% (929 of 932 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d4979767ba..7715397b0a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -265,7 +265,7 @@
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hat die Einladung für %(displayName)s akzeptiert.",
     "%(names)s and one other are typing": "%(names)s und ein weiteres Raum-Mitglied schreiben",
     "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s dauerhaft aus dem Raum verbannt.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s verbannt.",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von %(oldDisplayName)s auf %(displayName)s geändert.",
     "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
@@ -279,7 +279,7 @@
     "%(senderName)s invited %(targetName)s.": "%(senderName)s hat %(targetName)s eingeladen.",
     "%(displayName)s is typing": "%(displayName)s schreibt",
     "%(targetName)s joined the room.": "%(targetName)s hat den Raum betreten.",
-    "%(senderName)s kicked %(targetName)s.": "%(senderName)s hat %(targetName)s aus dem Raum gekickt.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s hat %(targetName)s gekickt.",
     "%(targetName)s left the room.": "%(targetName)s hat den Raum verlassen.",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie eingeladen wurden).",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s hat den zukünftigen Chatverlauf sichtbar gemacht für alle Raum-Mitglieder (ab dem Zeitpunkt, an dem sie beigetreten sind).",
@@ -486,7 +486,7 @@
     "Invalid file%(extra)s": "Ungültige Datei%(extra)s",
     "Remove %(threePid)s?": "%(threePid)s entfernen?",
     "Please select the destination room for this message": "Bitte den Raum auswählen, an den diese Nachricht gesendet werden soll",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hat den Raum-Namen gelöscht.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s hat den Raum-Namen entfernt.",
     "Passphrases must match": "Passphrases müssen übereinstimmen",
     "Passphrase must not be empty": "Passphrase darf nicht leer sein",
     "Export room keys": "Raum-Schlüssel exportieren",
@@ -751,7 +751,7 @@
     "Unable to create widget.": "Widget kann nicht erstellt werden.",
     "Unbans user with given id": "Verbannung aufheben für Benutzer mit angegebener ID",
     "You are not in this room.": "Du bist nicht in diesem Raum.",
-    "You do not have permission to do that in this room.": "Du hast keine Berechtigung, dies in diesem Raum zu tun.",
+    "You do not have permission to do that in this room.": "Du hast dafür keine Berechtigung in diesem Raum.",
     "Verifies a user, device, and pubkey tuple": "Verifiziert ein Tupel aus Benutzer, Gerät und öffentlichem Schlüssel",
     "Autocomplete Delay (ms):": "Verzögerung bei Autovervollständigung (ms):",
     "Loading device info...": "Lädt Geräte-Info...",
@@ -793,7 +793,7 @@
     "You have entered an invalid address.": "Du hast eine ungültige Adresse eingegeben.",
     "Matrix ID": "Matrix-ID",
     "Advanced options": "Erweiterte Optionen",
-    "Block users on other matrix homeservers from joining this room": "Benutzer anderer Matrix-Heimserver das Betreten dieses Raumes verbieten",
+    "Block users on other matrix homeservers from joining this room": "Benutzern auf anderen Matrix-Heimservern das Betreten dieses Raumes verbieten",
     "This setting cannot be changed later!": "Diese Einstellung kann nachträglich nicht mehr geändert werden!",
     "Unignore": "Ignorieren aufheben",
     "User Options": "Benutzer-Optionen",
@@ -989,7 +989,7 @@
     "was unbanned %(count)s times|one": "wurde entbannt",
     "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)shat den Namen geändert",
     "%(items)s and %(count)s others|other": "%(items)s und %(count)s andere",
-    "%(items)s and %(count)s others|one": "%(items)s und ein anderer",
+    "%(items)s and %(count)s others|one": "%(items)s und noch jemand",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Eine E-Mail wurde an %(emailAddress)s gesendet. Folge dem in der E-Mail enthaltenen Link und klicke dann unten.",
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Die Sichtbarkeit von '%(roomName)s' in %(groupId)s konnte nicht aktualisiert werden.",
     "Visibility in Room List": "Sichtbarkeit in Raum-Liste",
@@ -1012,5 +1012,7 @@
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du meldest dich auf dem %(hs)s-Server an, nicht auf matrix.org.",
     "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Alle erneut senden</resendText> oder <cancelText>alle verwerfen</cancelText>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Sonst ist hier aktuell niemand. Möchtest du <inviteText>Benutzer einladen</inviteText> oder die <nowarnText>Warnmeldung bezüglich des leeren Raums deaktivieren</nowarnText>?",
-    "Sign in to get started": "Melde dich an, um loszulegen"
+    "Sign in to get started": "Melde dich an, um loszulegen",
+    "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.",
+    "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert."
 }

From 979d1194dbc8350006f36233882c5b3850a94769 Mon Sep 17 00:00:00 2001
From: Brenno Martins <emanuel.breno@gmail.com>
Date: Thu, 16 Nov 2017 20:21:56 +0000
Subject: [PATCH 041/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 71.3% (665 of 932 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index fee6bcba31..3e04f9d06a 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -299,7 +299,7 @@
     "Use with caution": "Use com cautela",
     "VoIP is unsupported": "Chamada de voz não permitida",
     "%(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 are already in a call.": "Você já está em uma chamada.",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Você ainda não está em nenhuma sala! Clique em <CreateRoomButton> para criar uma sala ou em <RoomDirectoryButton> para navegar pela lista pública de salas",
     "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.",
@@ -729,5 +729,18 @@
     "Ignore request": "Ignorar o pedido",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "Você adicionou um novo dispositivo '%(displayName)s', que está solicitando chaves de criptografia.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Seu dispositivo não verificado '%(displayName)s' está solicitando chaves de criptografia.",
-    "Encryption key request": "Solicitação de chave de criptografia"
+    "Encryption key request": "Solicitação de chave de criptografia",
+    "Invite to Community": "Convidar à comunidade",
+    "Restricted": "Restrito",
+    "Name or matrix ID": "Nome ou ID matrix",
+    "Add to community": "Adicionar à comunidade",
+    "Add rooms to the community": "Adicionar salas à comunidade",
+    "Failed to invite users to community": "Falha ao convidar os usuários à comunidade",
+    "Failed to invite users to %(groupId)s": "Falha ao convidar os usuários para %(groupId)s",
+    "Failed to invite the following users to %(groupId)s:": "Falha ao convidar os seguintes usuários para %(groupId)s:",
+    "Failed to add the following rooms to %(groupId)s:": "Falha ao adicionar as seguintes salas para %(groupId)s:",
+    "You are not in this room.": "Você não está nesta sala.",
+    "You do not have permission to do that in this room.": "Você não tem permissão para fazer isto nesta sala.",
+    "Ignored user": "Usuário ignorado",
+    "You are no longer ignoring %(userId)s": "Você parou de ignorar %(userId)s"
 }

From 1c8b3061513b8eda4afd2afaaad52c3e7ffc5ef2 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 17 Nov 2017 09:03:26 +0000
Subject: [PATCH 042/927] Translated using Weblate (Russian)

Currently translated at 98.8% (921 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9a29dd9603..f0321e3364 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -561,7 +561,7 @@
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Вы действительно хотите удалить это событие? Обратите внимание, что если это смена названия комнаты или темы, то удаление отменит это изменение.",
     "Unknown error": "Неизвестная ошибка",
     "Incorrect password": "Неверный пароль",
-    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Таким образом, ваша учетная запись будет заблокирована навсегда. Вы не сможете зарегистрироваться снова с тем же идентификатором пользователя.",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Ваша учетная запись будет заблокирована навсегда. Вы не сможете повторно зарегистрировать тот же идентификатор пользователя.",
     "This action is irreversible.": "Это действие необратимо.",
     "To continue, please enter your password.": "Для продолжения введите ваш пароль.",
     "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:": "Чтобы удостовериться, что этому устройству можно доверять, пожалуйста, свяжитесь с владельцем другим способом (например, лично или по телефону) и спросите его, совпадает ли ключ, указанный у него в настройках для этого устройства, с ключом ниже:",

From ca5ffb202987c41ff195d64e57efe396496840d5 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Fri, 17 Nov 2017 19:43:58 +0000
Subject: [PATCH 043/927] Translated using Weblate (Russian)

Currently translated at 99.4% (927 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index f0321e3364..6221ac7bdb 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1005,5 +1005,11 @@
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s отклонили приглашения",
     "URL previews are enabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию.",
     "URL previews are disabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию.",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотклонил приглашения %(count)s раз"
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотклонил их приглашение %(count)s раз",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s отклонил приглашение",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s снова отозвали приглашение %(count)s раз",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s снова отозвали приглашение",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s снова отозвал приглашение %(count)s раз",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s снова отозвал приглашение",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Пожалуйста обратите внимание, что вы регистрируете на %(hs)s-сервере а не на matrix.org."
 }

From f033ada5a35196182a89783b928a99b6b20d8a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Sat, 18 Nov 2017 11:57:42 +0000
Subject: [PATCH 044/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 4ae115a4de..2be5c49474 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -938,5 +938,9 @@
     "Enable inline URL previews by default": "Predvolene povoliť náhľady URL adries",
     "Enable URL previews for this room (only affects you)": "Povoliť náhľady URL adries pre túto miestnosť (ovplyvňuje len vás)",
     "Enable URL previews by default for participants in this room": "Predvolene povoliť náhľady URL adries pre členov tejto miestnosti",
-    "Custom of %(powerLevel)s": "Vlastná úroveň %(powerLevel)s"
+    "Custom of %(powerLevel)s": "Vlastná úroveň %(powerLevel)s",
+    "URL previews are enabled by default for participants in this room.": "Náhľady URL adries sú predvolene povolené pre členov tejto miestnosti.",
+    "URL previews are disabled by default for participants in this room.": "Náhľady URL adries sú predvolene zakázané pre členov tejto miestnosti.",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Znovu odoslať všetky</resendText> alebo <cancelText>Zrušiť všetky</cancelText> teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <inviteText>Pozvať ďalších</inviteText> alebo <nowarnText>Prestať upozorňovať na prázdnu miestnosť</nowarnText>?"
 }

From 07be7b6032fa9e7593ee404691494068b43081f4 Mon Sep 17 00:00:00 2001
From: grrgui <baz.14@zaclys.net>
Date: Fri, 17 Nov 2017 22:24:11 +0000
Subject: [PATCH 045/927] Translated using Weblate (French)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 52a663f501..615c802e5b 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -274,7 +274,7 @@
     "Send a message (unencrypted)": "Envoyer un message (non chiffré)",
     "Send an encrypted message": "Envoyer un message chiffré",
     "Sender device information": "Informations de l'appareil de l'expéditeur",
-    "Send Invites": "Envoyer les invitations",
+    "Send Invites": "Envoyer des invitations",
     "Send Reset Email": "Envoyer l'e-mail de réinitialisation",
     "sent an image": "a envoyé une image",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s a envoyé une image.",
@@ -746,7 +746,7 @@
     "Sets the room topic": "Défini le sujet du salon",
     "Show Apps": "Afficher les applications",
     "To get started, please pick a username!": "Pour commencer, choisissez un nom d'utilisateur !",
-    "Unable to create widget.": "Impossible de créer le widget.",
+    "Unable to create widget.": "Impossible de créer un widget.",
     "Unbans user with given id": "Révoque le bannissement de l'utilisateur à partir de son identifiant",
     "You are not in this room.": "Vous n'êtes pas dans ce salon.",
     "You do not have permission to do that in this room.": "Vous n'avez pas la permission d'effectuer cette action dans ce salon.",

From 4f05ffcc52acfb8f38c91d4d9df1ff4d81a6a948 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Sat, 18 Nov 2017 09:12:20 +0000
Subject: [PATCH 046/927] Translated using Weblate (Russian)

Currently translated at 99.4% (927 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 6221ac7bdb..4a5741545e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1006,10 +1006,10 @@
     "URL previews are enabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию.",
     "URL previews are disabled by default for participants in this room.": "Предварительный просмотр URL-адресов для участников этой комнаты по умолчанию.",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотклонил их приглашение %(count)s раз",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s отклонил приглашение",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s снова отозвали приглашение %(count)s раз",
-    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s снова отозвали приглашение",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s снова отозвал приглашение %(count)s раз",
-    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s снова отозвал приглашение",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Пожалуйста обратите внимание, что вы регистрируете на %(hs)s-сервере а не на matrix.org."
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sотклонил приглашение",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sотозвали приглашения %(count)s раз",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sотозвали приглашения",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sотклонил приглашение %(count)s раз",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sотозвал приглашение",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Обратите внимание, что вы заходите на сервер %(hs)s, а не на matrix.org."
 }

From f0752572a76da82f73a1cfc6e31babbcc11c8011 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 12:49:26 +0000
Subject: [PATCH 047/927] make RoomDetailRow reusable for the Room Directory

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/RoomDetailList.js | 109 +++--------------
 src/components/views/rooms/RoomDetailRow.js  | 119 +++++++++++++++++++
 2 files changed, 133 insertions(+), 95 deletions(-)
 create mode 100644 src/components/views/rooms/RoomDetailRow.js

diff --git a/src/components/views/rooms/RoomDetailList.js b/src/components/views/rooms/RoomDetailList.js
index 27972af484..11fad41b39 100644
--- a/src/components/views/rooms/RoomDetailList.js
+++ b/src/components/views/rooms/RoomDetailList.js
@@ -18,121 +18,40 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import React from 'react';
 import { _t } from '../../../languageHandler';
-import linkifyString from 'linkifyjs/string';
-import sanitizeHtml from 'sanitize-html';
-import { ContentRepo } from 'matrix-js-sdk';
-import MatrixClientPeg from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-function getDisplayAliasForRoom(room) {
-    return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
-}
-
-const RoomDetailRow = React.createClass({
-    propTypes: {
-        room: PropTypes.shape({
-            name: PropTypes.string,
-            topic: PropTypes.string,
-            roomId: PropTypes.string,
-            avatarUrl: PropTypes.string,
-            numJoinedMembers: PropTypes.number,
-            canonicalAlias: PropTypes.string,
-            aliases: PropTypes.arrayOf(PropTypes.string),
-
-            worldReadable: PropTypes.bool,
-            guestCanJoin: PropTypes.bool,
-        }),
-    },
-
-    onClick: function(ev) {
-        ev.preventDefault();
-        dis.dispatch({
-            action: 'view_room',
-            room_id: this.props.room.roomId,
-            room_alias: this.props.room.canonicalAlias || (this.props.room.aliases || [])[0],
-        });
-    },
-
-    onTopicClick: function(ev) {
-        // When clicking a link in the topic, prevent the event being propagated
-        // to `onClick`.
-        ev.stopPropagation();
-    },
-
-    render: function() {
-        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
-
-        const room = this.props.room;
-        const name = room.name || getDisplayAliasForRoom(room) || _t('Unnamed room');
-        const topic = linkifyString(sanitizeHtml(room.topic || ''));
-
-        const guestRead = room.worldReadable ? (
-                <div className="mx_RoomDirectory_perm">{ _t('World readable') }</div>
-            ) : <div />;
-        const guestJoin = room.guestCanJoin ? (
-                <div className="mx_RoomDirectory_perm">{ _t('Guests can join') }</div>
-            ) : <div />;
-
-        const perms = (guestRead || guestJoin) ? (<div className="mx_RoomDirectory_perms">
-            { guestRead }
-            { guestJoin }
-        </div>) : <div />;
-
-        return <tr key={room.roomId} onClick={this.onClick}>
-            <td className="mx_RoomDirectory_roomAvatar">
-                <BaseAvatar width={24} height={24} resizeMethod='crop'
-                    name={name} idName={name}
-                    url={ContentRepo.getHttpUriForMxc(
-                            MatrixClientPeg.get().getHomeserverUrl(),
-                            room.avatarUrl, 24, 24, "crop")} />
-            </td>
-            <td className="mx_RoomDirectory_roomDescription">
-                <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
-                { perms }
-                <div className="mx_RoomDirectory_topic"
-                     onClick={this.onTopicClick}
-                     dangerouslySetInnerHTML={{ __html: topic }} />
-                <div className="mx_RoomDirectory_alias">{ getDisplayAliasForRoom(room) }</div>
-            </td>
-            <td className="mx_RoomDirectory_roomMemberCount">
-                { room.numJoinedMembers }
-            </td>
-        </tr>;
-    },
-});
+import {roomShape} from './RoomDetailRow';
 
 export default React.createClass({
     displayName: 'RoomDetailList',
 
     propTypes: {
-        rooms: PropTypes.arrayOf(PropTypes.shape({
-            name: PropTypes.string,
-            topic: PropTypes.string,
-            roomId: PropTypes.string,
-            avatarUrl: PropTypes.string,
-            numJoinedMembers: PropTypes.number,
-            canonicalAlias: PropTypes.string,
-            aliases: PropTypes.arrayOf(PropTypes.string),
-
-            worldReadable: PropTypes.bool,
-            guestCanJoin: PropTypes.bool,
-        })),
-
+        rooms: PropTypes.arrayOf(roomShape),
         className: PropTypes.string,
     },
 
     getRows: function() {
         if (!this.props.rooms) return [];
+
+        const RoomDetailRow = sdk.getComponent('rooms.RoomDetailRow');
         return this.props.rooms.map((room, index) => {
-            return <RoomDetailRow key={index} room={room} />;
+            return <RoomDetailRow key={index} room={room} onClick={this.onDetailsClick} />;
+        });
+    },
+
+    onDetailsClick: function(ev, room) {
+        dis.dispatch({
+            action: 'view_room',
+            room_id: room.roomId,
+            room_alias: room.canonicalAlias || (room.aliases || [])[0],
         });
     },
 
     render() {
         const rows = this.getRows();
         let rooms;
-        if (rows.length == 0) {
+        if (rows.length === 0) {
             rooms = <i>{ _t('No rooms to show') }</i>;
         } else {
             rooms = <table ref="directory_table" className="mx_RoomDirectory_table">
diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
new file mode 100644
index 0000000000..fbb9db4505
--- /dev/null
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -0,0 +1,119 @@
+/*
+Copyright 2017 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import sdk from '../../../index';
+import dis from '../../../dispatcher';
+import React from 'react';
+import { _t } from '../../../languageHandler';
+import linkifyElement from 'linkifyjs/element';
+import linkifyMatrix from '../../../linkify-matrix';
+import { ContentRepo } from 'matrix-js-sdk';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+function getDisplayAliasForRoom(room) {
+    return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
+}
+
+export const roomShape = PropTypes.shape({
+    name: PropTypes.string,
+    topic: PropTypes.string,
+    roomId: PropTypes.string,
+    avatarUrl: PropTypes.string,
+    numJoinedMembers: PropTypes.number,
+    canonicalAlias: PropTypes.string,
+    aliases: PropTypes.arrayOf(PropTypes.string),
+
+    worldReadable: PropTypes.bool,
+    guestCanJoin: PropTypes.bool,
+});
+
+export default React.createClass({
+    propTypes: {
+        room: roomShape,
+        // passes ev, room as args
+        onClick: PropTypes.func,
+        onMouseDown: PropTypes.func,
+    },
+
+    _linkifyTopic: function() {
+        if (this.refs.topic) {
+            linkifyElement(this.refs.topic, linkifyMatrix.options);
+        }
+    },
+
+    componentDidMount: function() {
+        this._linkifyTopic();
+    },
+
+    componentDidUpdate: function() {
+        this._linkifyTopic();
+    },
+
+    onClick: function(ev) {
+        ev.preventDefault();
+        if (this.props.onClick) {
+            this.props.onClick(ev, this.props.room);
+        }
+    },
+
+    onTopicClick: function(ev) {
+        // When clicking a link in the topic, prevent the event being propagated
+        // to `onClick`.
+        ev.stopPropagation();
+    },
+
+    render: function() {
+        const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+
+        const room = this.props.room;
+        const name = room.name || getDisplayAliasForRoom(room) || _t('Unnamed room');
+
+        const guestRead = room.worldReadable ? (
+                <div className="mx_RoomDirectory_perm">{ _t('World readable') }</div>
+            ) : <div />;
+        const guestJoin = room.guestCanJoin ? (
+                <div className="mx_RoomDirectory_perm">{ _t('Guests can join') }</div>
+            ) : <div />;
+
+        const perms = (guestRead || guestJoin) ? (<div className="mx_RoomDirectory_perms">
+            { guestRead }&nbsp;
+            { guestJoin }
+        </div>) : <div />;
+
+        return <tr key={room.roomId} onClick={this.onClick} onMouseDown={this.props.onMouseDown}>
+            <td className="mx_RoomDirectory_roomAvatar">
+                <BaseAvatar width={24} height={24} resizeMethod='crop'
+                    name={name} idName={name}
+                    url={ContentRepo.getHttpUriForMxc(
+                            MatrixClientPeg.get().getHomeserverUrl(),
+                            room.avatarUrl, 24, 24, "crop")} />
+            </td>
+            <td className="mx_RoomDirectory_roomDescription">
+                <div className="mx_RoomDirectory_name">{ name }</div>&nbsp;
+                { perms }
+                <div className="mx_RoomDirectory_topic" ref="topic" onClick={this.onTopicClick}>
+                    { room.topic }
+                </div>
+                <div className="mx_RoomDirectory_alias">{ getDisplayAliasForRoom(room) }</div>
+            </td>
+            <td className="mx_RoomDirectory_roomMemberCount">
+                { room.numJoinedMembers }
+            </td>
+        </tr>;
+    },
+});

From ff3cef7c7dfe3cda7996bc481021d0cbfe682ed5 Mon Sep 17 00:00:00 2001
From: dark159123 <r.j.hansen@protonmail.com>
Date: Sat, 18 Nov 2017 21:30:49 +0000
Subject: [PATCH 048/927] Translated using Weblate (Danish)

Currently translated at 26.6% (248 of 932 strings)

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

diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 9f5d3468ca..8727eadfc6 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -65,7 +65,7 @@
     "Clear Cache": "Ryd cache",
     "Click here to fix": "Klik her for at rette",
     "Confirm your new password": "Bekræft din nye adgangskode",
-    "Continue": "fortsætte",
+    "Continue": "Fortsæt",
     "Could not connect to the integration server": "Kunne ikke oprette forbindelse til integrationsserveren",
     "Create an account": "Opret en brugerkonto",
     "Create Room": "Opret rum",
@@ -76,7 +76,7 @@
     "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",
     "Disable inline URL previews by default": "Deaktiver forrige weblinks forhåndsvisninger som standard",
     "Display name": "Visningsnavn",
-    "Email, name or matrix ID": "E-mail, navn eller matrix-id",
+    "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",
@@ -84,21 +84,171 @@
     "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 change password. Is your password correct?": "Kunne ikke ændre password. Er dit password korrekt?",
     "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",
-    "Remove": "Fjerne",
+    "Notifications": "Notifikationer",
+    "Remove": "Fjern",
     "Settings": "Indstillinger",
     "unknown error code": "Ukendt fejlkode",
     "%(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 accepterede 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",
     "%(senderName)s answered the call.": "%(senderName)s besvarede opkaldet.",
-    "Add a widget": "Tilføj en widget"
+    "Add a widget": "Tilføj en widget",
+    "OK": "OK",
+    "Search": "Søg",
+    "Custom Server Options": "Brugerdefinerede serverindstillinger",
+    "Dismiss": "Afskedige",
+    "powered by Matrix": "Drevet af Matrix",
+    "Close": "Luk",
+    "Cancel": "Afbryd",
+    "Edit": "Rediger",
+    "Unpin Message": "Fasthold ikke længere Besked",
+    "Failed to forget room %(errCode)s": "Kunne ikke glemme rummet %(errCode)s",
+    "Mute": "Sæt på lydløs",
+    "Leave": "Forlad",
+    "Register": "Registrér",
+    "Add rooms to this community": "Tilføj rum til dette fællesskab",
+    "Unnamed room": "Unavngivet rum",
+    "World readable": "Læselig af alle",
+    "Guests can join": "Gæster kan deltage",
+    "No rooms to show": "Ingen rum at vise",
+    "This email address is already in use": "Denne emailadresse er allerede i brug",
+    "This phone number is already in use": "Dette telefonnummer er allerede i brug",
+    "Failed to verify email address: make sure you clicked the link in the email": "Kunne ikke bekræfte emailaddressen: vær sikker på at du klikke på linket i emailen",
+    "Call Timeout": "Opkalds Timeout",
+    "The remote side failed to pick up": "Den anden side tog den ikke",
+    "Unable to capture screen": "Kunne ikke optage skærm",
+    "Existing Call": "Eksisterende Opkald",
+    "You are already in a call.": "Du er allerede i et opkald.",
+    "VoIP is unsupported": "VoIP er ikke understøttet",
+    "You cannot place VoIP calls in this browser.": "Du kan ikke lave VoIP-opkald i denne browser.",
+    "You cannot place a call with yourself.": "Du kan ikke ringe til dig selv.",
+    "Conference calls are not supported in this client": "Konferenceopkald er ikke undersøttede i denne klient",
+    "Conference calls are not supported in encrypted rooms": "Konferenceopkald er ikke understøttede i krypterede rum",
+    "Conference calling is in development and may not be reliable.": "Konferenceopkald er under udvikling og kan være utilregnelige.",
+    "Failed to set up conference call": "Kunne ikke starte konferenceopkald",
+    "Conference call failed.": "Konferenceopkald fejlede.",
+    "The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunne ikke uploades",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' overskrider denne home servers størrelsesbegrænsning på uploads",
+    "Upload Failed": "Upload Fejlede",
+    "Sun": "Søn",
+    "Mon": "Man",
+    "Tue": "Tirs",
+    "Wed": "Ons",
+    "Thu": "Tors",
+    "Fri": "Fre",
+    "Sat": "Lør",
+    "Jan": "Jan",
+    "Feb": "Feb",
+    "Mar": "Mar",
+    "Apr": "Apr",
+    "May": "Maj",
+    "Jun": "Jun",
+    "Jul": "Jul",
+    "Aug": "Aug",
+    "Sep": "Sep",
+    "Oct": "Okt",
+    "Nov": "Nov",
+    "Dec": "Dec",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(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",
+    "Who would you like to add to this community?": "Hvem vil du tilføje til dette fællesskab?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Advarsel: alle personer du tilføjer til et fællesskab vil være synlige for alle der kender Fællesskabs ID'et",
+    "Invite new community members": "Inviter nye fællesskabsmedlemmer",
+    "Name or matrix ID": "Navn eller matrix ID",
+    "Invite to Community": "Inviter til Fællesskab",
+    "Which rooms would you like to add to this community?": "Hvilke rum vil du tilføje til dette fællesskab?",
+    "Show these rooms to non-members on the community page and room list?": "Vis disse rum til ikke-medlemmer på fællesskabssiden og rumlisten?",
+    "Add rooms to the community": "Tilføj rum til fællesskabet",
+    "Room name or alias": "Rum navn eller alias",
+    "Add to community": "Tilføj til fællesskab",
+    "Failed to invite the following users to %(groupId)s:": "Kunne ikke invitere de følgende brugere til %(groupId)s:",
+    "Failed to invite users to community": "Kunne ikke invitere brugere til fællesskab",
+    "Failed to invite users to %(groupId)s": "Kunne ikke invitere brugere til %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Kunne ikke tilføje de følgende rum til %(groupId)s:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot har ikke tilladelse til at sende dig notifikationer - tjek venligst dine browser indstillinger",
+    "Riot was not given permission to send notifications - please try again": "Riot fik ikke tilladelse til at sende notifikationer - prøv igen",
+    "Unable to enable Notifications": "Kunne ikke slå Notifikationer til",
+    "This email address was not found": "Denne emailadresse blev ikke fundet",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Din emailadresse lader ikke til at være tilknyttet en Matrix ID på denne Homeserver.",
+    "Restricted": "Begrænset",
+    "Moderator": "Moderator",
+    "Start a chat": "Start en chat",
+    "Who would you like to communicate with?": "Hvem vil du kommunikere med?",
+    "Start Chat": "Start Chat",
+    "Invite new room members": "Inviter nye rummedlemmer",
+    "Who would you like to add to this room?": "Hvem vil du tilføje til dette rum?",
+    "Send Invites": "Send invitationer",
+    "Failed to invite user": "Kunne ikke invitere bruger",
+    "Operation failed": "Operation mislykkedes",
+    "Failed to invite": "Kunne ikke invitere",
+    "Failed to invite the following users to the %(roomName)s room:": "Kunne ikke invitere de følgende brugere til %(roomName)s rummet:",
+    "You need to be logged in.": "Du skal være logget ind.",
+    "You need to be able to invite users to do that.": "Du skal kunne invitere brugere for at gøre dette.",
+    "Unable to create widget.": "Kunne ikke lave widget.",
+    "Failed to send request.": "Kunne ikke sende forespørgsel.",
+    "This room is not recognised.": "Dette rum kan ikke genkendes.",
+    "Power level must be positive integer.": "Magtniveau skal være positivt heltal.",
+    "You are not in this room.": "Du er ikke i dette rum.",
+    "You do not have permission to do that in this room.": "Du har ikke tilladelse til at gøre dét i dette rum.",
+    "Missing room_id in request": "Mangler room_id i forespørgsel",
+    "Must be viewing a room": "Du skal være i gang med at se på rummet",
+    "Room %(roomId)s not visible": "rum %(roomId)s ikke synligt",
+    "Missing user_id in request": "Manglende user_id i forespørgsel",
+    "Failed to lookup current room": "Kunne ikke slå nuværende rum op",
+    "Usage": "Brug",
+    "/ddg is not a command": "/ddg er ikke en kommando",
+    "To use it, just wait for autocomplete results to load and tab through them.": "For at bruge det skal du bare vente på autocomplete resultaterne indlæser og tab'e igennem dem.",
+    "Unrecognised room alias:": "Ugenkendt rum alias:",
+    "Ignored user": "Ignoreret bruger",
+    "You are now ignoring %(userId)s": "Du ignorere nu %(userId)s",
+    "Unignored user": "Holdt op med at ignorere bruger",
+    "You are no longer ignoring %(userId)s": "Du ignorer ikke længere %(userId)s",
+    "Unknown (user, device) pair:": "Ukendt (bruger, enhed) par:",
+    "Device already verified!": "Enhed allerede verificeret!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ADVARSEL: Enhed allerede verificeret, men nøgler PASSER IKKE!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ADVARSEL: NØGLE VERIFICERING FEJLEDE! Signaturnøglen for %(userId)s and enhed %(deviceId)s er \"%(fprint)s\" hvilket ikke passer med den oplyste nøgle \"%(fingerprint)s\". Dette kan betyde jeres kommunikation bliver opsnappet!",
+    "Verified key": "Verificeret nøgle",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signaturnøglen du oplste passer med nøglen fra %(userId)ss enhed %(deviceId)s. Enheden er markeret som verificeret.",
+    "Unrecognised command:": "Ukendt kommando:",
+    "Reason": "Årsag",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s forespurgte en VoIP konference.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterede %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bannede %(targetName)s.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ændrede deres viste navn fra %(oldDisplayName)s til %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte deres viste navn til %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernede deres viste navn (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s fjernede deres profilbillede.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ændrede deres profilbillede.",
+    "%(senderName)s set a profile picture.": "%(senderName)s indstillede deres profilbillede.",
+    "VoIP conference started.": "VoIP konference startet.",
+    "%(targetName)s joined the room.": "%(targetName)s forbandt til rummet.",
+    "VoIP conference finished.": "VoIP konference afsluttet.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s afviste invitationen.",
+    "%(targetName)s left the room.": "%(targetName)s forlod rummet.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s unbannede %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s kickede %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s trak %(targetName)ss invitation tilbage.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ændrede emnet til \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s fjernede rumnavnet.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ændrede rumnavnet til %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendte et billed.",
+    "Someone": "Nogen",
+    "(not supported by this browser)": "(Ikke understøttet af denne browser)",
+    "(could not connect media)": "(kunne ikke forbinde til mediet)",
+    "(no answer)": "(intet svar)",
+    "(unknown failure: %(reason)s)": "(ukendt fejl: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s afsluttede opkaldet.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s startede et %(callType)s opkald.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s inviterede %(targetDisplayName)s til rummet."
 }

From d943807ad1e9a8e70071a422bcb641ce27a757aa Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 13:18:06 +0000
Subject: [PATCH 049/927] remove unused imports

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

diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index fbb9db4505..4725bb4a14 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import sdk from '../../../index';
-import dis from '../../../dispatcher';
 import React from 'react';
 import { _t } from '../../../languageHandler';
 import linkifyElement from 'linkifyjs/element';
@@ -23,9 +22,8 @@ import linkifyMatrix from '../../../linkify-matrix';
 import { ContentRepo } from 'matrix-js-sdk';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
-import classNames from 'classnames';
 
-function getDisplayAliasForRoom(room) {
+export function getDisplayAliasForRoom(room) {
     return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
 }
 

From 4d177626b5395345f84f56f65b9c74caaf5651a3 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 13:24:18 +0000
Subject: [PATCH 050/927] init Linkify properly to make tests happy

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

diff --git a/src/components/views/rooms/RoomDetailRow.js b/src/components/views/rooms/RoomDetailRow.js
index 4725bb4a14..f7dc9086ec 100644
--- a/src/components/views/rooms/RoomDetailRow.js
+++ b/src/components/views/rooms/RoomDetailRow.js
@@ -17,12 +17,15 @@ limitations under the License.
 import sdk from '../../../index';
 import React from 'react';
 import { _t } from '../../../languageHandler';
+import * as linkify from 'linkifyjs';
 import linkifyElement from 'linkifyjs/element';
 import linkifyMatrix from '../../../linkify-matrix';
 import { ContentRepo } from 'matrix-js-sdk';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import PropTypes from 'prop-types';
 
+linkifyMatrix(linkify);
+
 export function getDisplayAliasForRoom(room) {
     return room.canonicalAlias || (room.aliases ? room.aliases[0] : "");
 }

From f61f858cf723cae37a834cff5b7517822d42599b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 15:33:07 +0000
Subject: [PATCH 051/927] Add Analytics Info and add Piwik to
 SdkConfig.DEFAULTS

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Analytics.js                          | 101 ++++++++++++++++++----
 src/SdkConfig.js                          |   8 ++
 src/components/structures/UserSettings.js |   6 ++
 src/i18n/strings/en_EN.json               |  15 +++-
 4 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 1b4f45bc6b..602728038e 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -14,25 +14,54 @@
  limitations under the License.
  */
 
-import { getCurrentLanguage } from './languageHandler';
+import { getCurrentLanguage, _t, _td } from './languageHandler';
 import PlatformPeg from './PlatformPeg';
-import SdkConfig from './SdkConfig';
+import SdkConfig, { DEFAULTS } from './SdkConfig';
+import Modal from './Modal';
+import sdk from './index';
+
+function getRedactedHash() {
+    return window.location.hash.replace(/#\/(group|room|user)\/(.+)/, "#/$1/<redacted>");
+}
 
 function getRedactedUrl() {
-    const redactedHash = window.location.hash.replace(/#\/(group|room|user)\/(.+)/, "#/$1/<redacted>");
     // hardcoded url to make piwik happy
-    return 'https://riot.im/app/' + redactedHash;
+    return 'https://riot.im/app/' + getRedactedHash();
 }
 
 const customVariables = {
-    'App Platform': 1,
-    'App Version': 2,
-    'User Type': 3,
-    'Chosen Language': 4,
-    'Instance': 5,
-    'RTE: Uses Richtext Mode': 6,
-    'Homeserver URL': 7,
-    'Identity Server URL': 8,
+    'App Platform': {
+        id: 1,
+        expl: _td('The platform you\'re on'),
+    },
+    'App Version': {
+        id: 2,
+        expl: _td('The version of Riot.im'),
+    },
+    'User Type': {
+        id: 3,
+        expl: _td('Whether or not you\'re logged in (we don\'t record your user name)'),
+    },
+    'Chosen Language': {
+        id: 4,
+        expl: _td('Your language of choice'),
+    },
+    'Instance': {
+        id: 5,
+        expl: _td('Which officially provided instance you are using, if any'),
+    },
+    'RTE: Uses Richtext Mode': {
+        id: 6,
+        expl: _td('Whether or not you\'re using the Richtext mode of the Rich Text Editor'),
+    },
+    'Homeserver URL': {
+        id: 7,
+        expl: _td('Your homeserver\'s URL'),
+    },
+    'Identity Server URL': {
+        id: 8,
+        expl: _td('Your identity server\'s URL'),
+    },
 };
 
 function whitelistRedact(whitelist, str) {
@@ -40,9 +69,6 @@ function whitelistRedact(whitelist, str) {
     return '<redacted>';
 }
 
-const whitelistedHSUrls = ["https://matrix.org"];
-const whitelistedISUrls = ["https://vector.im"];
-
 class Analytics {
     constructor() {
         this._paq = null;
@@ -140,11 +166,16 @@ class Analytics {
     }
 
     _setVisitVariable(key, value) {
-        this._paq.push(['setCustomVariable', customVariables[key], key, value, 'visit']);
+        this._paq.push(['setCustomVariable', customVariables[key].id, key, value, 'visit']);
     }
 
     setLoggedIn(isGuest, homeserverUrl, identityServerUrl) {
         if (this.disabled) return;
+
+        const config = SdkConfig.get();
+        const whitelistedHSUrls = config.piwik.whitelistedHSUrls || DEFAULTS.piwik.whitelistedHSUrls;
+        const whitelistedISUrls = config.piwik.whitelistedISUrls || DEFAULTS.piwik.whitelistedISUrls;
+
         this._setVisitVariable('User Type', isGuest ? 'Guest' : 'Logged In');
         this._setVisitVariable('Homeserver URL', whitelistRedact(whitelistedHSUrls, homeserverUrl));
         this._setVisitVariable('Identity Server URL', whitelistRedact(whitelistedISUrls, identityServerUrl));
@@ -154,6 +185,44 @@ class Analytics {
         if (this.disabled) return;
         this._setVisitVariable('RTE: Uses Richtext Mode', state ? 'on' : 'off');
     }
+
+    showDetailsModal() {
+        const Tracker = window.Piwik.getAsyncTracker();
+        const rows = Object.values(customVariables).map((v) => Tracker.getCustomVariable(v.id)).filter(Boolean);
+
+        const resolution = `${window.screen.width}x${window.screen.height}`;
+
+        const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+        Modal.createTrackedDialog('Analytics Details', '', ErrorDialog, {
+            title: _t('Analytics'),
+            description: <div>
+                <div>
+                    { _t('The following information is sent to us to help make Riot.im better:') }
+                </div>
+                <table>
+                    { rows.map((row) => <tr key={row[0]}>
+                        <td>{ _t(customVariables[row[0]].expl) }</td>
+                        <td><code>{ row[1] }</code></td>
+                    </tr>) }
+                </table>
+                <br />
+                <div>
+                    { _t('We also record each page you use in the app (currently <CurrentPageHash>), your User Agent'
+                        + ' (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).',
+                        {},
+                        {
+                            CurrentPageHash: <code>{ getRedactedHash() }</code>,
+                            CurrentUserAgent: <code>{ navigator.userAgent }</code>,
+                            CurrentDeviceResolution: <code>{ resolution }</code>,
+                        },
+                    ) }
+
+                    { _t('Where this page includes identifiable information, such as a room, '
+                        + 'user or group ID, that data is removed before being sent to the server.') }
+                </div>
+            </div>,
+        });
+    }
 }
 
 if (!global.mxAnalytics) {
diff --git a/src/SdkConfig.js b/src/SdkConfig.js
index 8df725a913..64bf21ecf8 100644
--- a/src/SdkConfig.js
+++ b/src/SdkConfig.js
@@ -21,6 +21,13 @@ const DEFAULTS = {
     integrations_rest_url: "https://scalar.vector.im/api",
     // Where to send bug reports. If not specified, bugs cannot be sent.
     bug_report_endpoint_url: null,
+
+    piwik: {
+        url: "https://piwik.riot.im/",
+        whitelistedHSUrls: ["https://matrix.org"],
+        whitelistedISUrls: ["https://vector.im", "https://matrix.org"],
+        siteId: 1,
+    },
 };
 
 class SdkConfig {
@@ -45,3 +52,4 @@ class SdkConfig {
 }
 
 module.exports = SdkConfig;
+module.exports.DEFAULTS = DEFAULTS;
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 88619266ce..6e2d3d5669 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -806,6 +806,12 @@ module.exports = React.createClass({
             <h3>{ _t('Analytics') }</h3>
             <div className="mx_UserSettings_section">
                 { _t('Riot collects anonymous analytics to allow us to improve the application.') }
+                <br />
+                { _t('Privacy is important to us, so we don\'t collect any personal'
+                    + ' or identifiable data for our analytics.') }
+                <div className="mx_UserSettings_advanced_spoiler" onClick={Analytics.showDetailsModal}>
+                    { _t('Learn more about how we use analytics.') }
+                </div>
                 { ANALYTICS_SETTINGS.map( this._renderDeviceSetting ) }
             </div>
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 128a07bc15..b45c2708be 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -807,6 +807,8 @@
     "Report it": "Report it",
     "Analytics": "Analytics",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
+    "Learn more about how we use analytics.": "Learn more about how we use analytics.",
     "Labs": "Labs",
     "These are experimental features that may break in unexpected ways": "These are experimental features that may break in unexpected ways",
     "Use with caution": "Use with caution",
@@ -930,5 +932,16 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
-    "Import": "Import"
+    "Import": "Import",
+    "The following information is sent to us to help make Riot.im better:": "The following information is sent to us to help make Riot.im better:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
+    "The platform you're on": "The platform you're on",
+    "The version of Riot.im": "The version of Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Whether or not you're logged in (we don't record your user name)",
+    "Your language of choice": "Your language of choice",
+    "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
+    "Your homeserver's URL": "Your homeserver's URL",
+    "Your identity server's URL": "Your identity server's URL"
 }

From f8bb03cbc8a0d39423ba422edc6561b193ad9ff6 Mon Sep 17 00:00:00 2001
From: Pavel Kardash <slipeer@gmail.com>
Date: Mon, 20 Nov 2017 09:56:39 +0000
Subject: [PATCH 052/927] Translated using Weblate (Russian)

Currently translated at 99.6% (929 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 4a5741545e..c274bc7b48 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1011,5 +1011,7 @@
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sотозвали приглашения",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sотклонил приглашение %(count)s раз",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sотозвал приглашение",
-    "Please note you are logging into the %(hs)s server, not matrix.org.": "Обратите внимание, что вы заходите на сервер %(hs)s, а не на matrix.org."
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Обратите внимание, что вы заходите на сервер %(hs)s, а не на matrix.org.",
+    "Custom of %(powerLevel)s": "Пользовательский %(powerLevel)s",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML страницы вашего сообщества</h1>\n<p>\n    Используйте описание для предстваления вашего сообщества новым пользователям, или поделитесь чем-нибудь важным, например<a href=\"foo\">ссылками</a>\n</p>\n<p>\n    Вы можете также вставлять изображения с помощью тэгов 'img'\n</p>\n"
 }

From 230d14bf70dfb9df371437d44f5abacd6fa46e39 Mon Sep 17 00:00:00 2001
From: Jan Kudrik <jan@kudrik.cz>
Date: Sun, 19 Nov 2017 13:49:33 +0000
Subject: [PATCH 053/927] Translated using Weblate (Czech)

Currently translated at 69.4% (647 of 932 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index c797044693..a6ed5d0077 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -672,5 +672,14 @@
     "Add an Integration": "Přidat začlenění",
     "Message removed": "Zpráva odstraněna",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Ochrana před roboty není aktuálně na desktopu dostupná. Použijte prosím <a>webový prohlížeč</a>",
-    "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s jsme poslali e-mail"
+    "An email has been sent to %(emailAddress)s": "Na adresu %(emailAddress)s jsme poslali e-mail",
+    "File to import": "Soubor k importu",
+    "none": "žádný",
+    "Passphrases must match": "Hesla se musí shodovat",
+    "Passphrase must not be empty": "Heslo nesmí být prázdné",
+    "Export room keys": "Exportovat klíče místnosti",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Tento proces vám umožňuje exportovat do souboru klíče ke zprávám, které jste dostali v šifrovaných místnostech. Když pak tento soubor importujete do jiného Matrix klienta, všechny tyto zprávy bude možné opět dešifrovat.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Kdokoliv, kdo získá přístup k exportovanému souboru, bude moci dešifrovat všechny vaše přijaté zprávy, a proto je třeba dbát zvýšenou pozornost jeho zabezpečení. Z toho důvodu byste měl/a do kolonky níže zadat heslo, se kterým exportovaná data zašifrujeme. Import pak bude možný pouze se znalostí zadaného hesla.",
+    "Confirm passphrase": "Potvrďte heslo",
+    "Import room keys": "Importovat klíče místnosti"
 }

From e25840e376844463d356d66d7ac6819efdc14d09 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 20 Nov 2017 10:15:47 +0000
Subject: [PATCH 054/927] Translated using Weblate (Russian)

Currently translated at 99.6% (929 of 932 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index c274bc7b48..e90f34cd1e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1012,6 +1012,6 @@
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sотклонил приглашение %(count)s раз",
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sотозвал приглашение",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Обратите внимание, что вы заходите на сервер %(hs)s, а не на matrix.org.",
-    "Custom of %(powerLevel)s": "Пользовательский %(powerLevel)s",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML страницы вашего сообщества</h1>\n<p>\n    Используйте описание для предстваления вашего сообщества новым пользователям, или поделитесь чем-нибудь важным, например<a href=\"foo\">ссылками</a>\n</p>\n<p>\n    Вы можете также вставлять изображения с помощью тэгов 'img'\n</p>\n"
+    "Custom of %(powerLevel)s": "Пользовательский уровень %(powerLevel)s",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML для страницы вашего сообщества</h1>\n<p>\n    Используйте подробное описание для представления вашего сообщества новым участникам, или\n    поделитесь чем-нибудь важным, например <a href=\"foo\">ссылками</a>\n</p>\n<p>\n    Также вы можете использовать теги 'img'\n</p>\n"
 }

From 588e3f910a4b0c8261bb9f415a51fd3faf6decac Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 21 Nov 2017 14:17:20 +0000
Subject: [PATCH 055/927] Translated using Weblate (German)

Currently translated at 99.8% (931 of 932 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7715397b0a..9a8dfe358f 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1014,5 +1014,7 @@
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Sonst ist hier aktuell niemand. Möchtest du <inviteText>Benutzer einladen</inviteText> oder die <nowarnText>Warnmeldung bezüglich des leeren Raums deaktivieren</nowarnText>?",
     "Sign in to get started": "Melde dich an, um loszulegen",
     "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.",
-    "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert."
+    "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert.",
+    "Restricted": "Eingeschränkt",
+    "Presence Management": "Präsenz-Verwaltung"
 }

From 46f41a0e732c7aa837cee7ec04388c0eabc2bae8 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Tue, 21 Nov 2017 14:17:31 +0000
Subject: [PATCH 056/927] Translated using Weblate (German)

Currently translated at 99.8% (931 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 9a8dfe358f..72781952df 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1016,5 +1016,5 @@
     "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.",
     "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert.",
     "Restricted": "Eingeschränkt",
-    "Presence Management": "Präsenz-Verwaltung"
+    "Presence Management": "Anwesenheitsmanagement"
 }

From 7e440e832aafb85f9938244ec7a358b0b652b9ce Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 21 Nov 2017 14:17:58 +0000
Subject: [PATCH 057/927] Translated using Weblate (German)

Currently translated at 99.8% (932 of 932 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 72781952df..cbb47208a3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1016,5 +1016,6 @@
     "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.",
     "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert.",
     "Restricted": "Eingeschränkt",
-    "Presence Management": "Anwesenheitsmanagement"
+    "Presence Management": "Anwesenheitsmanagement",
+    "Status.im theme": "Status.im-Thema"
 }

From d81d2f17a9acf141fbd7e4514382a89487acc349 Mon Sep 17 00:00:00 2001
From: Bamstam <am-em-am@posteo.de>
Date: Wed, 22 Nov 2017 13:33:10 +0000
Subject: [PATCH 058/927] Translated using Weblate (German)

Currently translated at 100.0% (932 of 932 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index cbb47208a3..5a9a4f1e44 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -117,7 +117,7 @@
     "Notifications": "Benachrichtigungen",
     "<not supported>": "<nicht unterstützt>",
     "No users have specific privileges in this room": "Kein Benutzer hat in diesem Raum besondere Berechtigungen",
-    "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",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Sobald die  Verschlüsselung für einen Raum aktiviert wird, kann diese (Stand heute) nicht mehr deaktiviert werden",
     "Only people who have been invited": "Nur Personen, die eingeladen wurden",
     "Password": "Passwort",
     "Permissions": "Berechtigungen",
@@ -183,7 +183,7 @@
     "Voice call": "Sprachanruf",
     "VoIP conference finished.": "VoIP-Konferenz wurde beendet.",
     "VoIP conference started.": "VoIP-Konferenz gestartet.",
-    "(warning: cannot be disabled again!)": "(Warnung: Kann nicht wieder deaktiviert werden!)",
+    "(warning: cannot be disabled again!)": "(Warnung: Kann anschließend nicht mehr deaktiviert werden!)",
     "was banned": "wurde aus dem Raum verbannt",
     "was invited": "wurde eingeladen",
     "was kicked": "wurde gekickt",

From c3afa907a30f60be400a5580aaa0413ab7ba0640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Wed, 22 Nov 2017 17:49:06 +0000
Subject: [PATCH 059/927] Translated using Weblate (French)

Currently translated at 100.0% (936 of 936 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 615c802e5b..8e305e93a5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1013,5 +1013,13 @@
     "URL previews are enabled by default for participants in this room.": "Les aperçus d'URL sont activés par défaut pour les participants de ce salon.",
     "URL previews are disabled by default for participants in this room.": "Les aperçus d'URL sont désactivés par défaut pour les participants de ce salon.",
     "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez également sélectionner des messages individuels à renvoyer ou annuler.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Il n'y a personne d'autre ici ! Souhaitez-vous <inviteText>inviter d'autres personnes</inviteText> ou <nowarnText>ne plus être notifié à propos du salon vide</nowarnText> ?"
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Il n'y a personne d'autre ici ! Souhaitez-vous <inviteText>inviter d'autres personnes</inviteText> ou <nowarnText>ne plus être notifié à propos du salon vide</nowarnText> ?",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sj",
+    "Online for %(duration)s": "En ligne depuis %(duration)s",
+    "Idle for %(duration)s": "Inactif depuis %(duration)s",
+    "Offline for %(duration)s": "Hors ligne depuis %(duration)s",
+    "Unknown for %(duration)s": "Inconnu depuis %(duration)s"
 }

From 1083df274d51a208e16a042030008afbf361594c Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Wed, 22 Nov 2017 19:20:12 +0000
Subject: [PATCH 060/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (936 of 936 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 91e90d1c1e..4800872ae5 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1017,5 +1017,13 @@
     "URL previews are enabled by default for participants in this room.": "Az URL előnézetek alapértelmezetten engedélyezve vannak a szobában jelenlévőknek.",
     "URL previews are disabled by default for participants in this room.": "Az URL előnézet alapértelmezetten tiltva van a szobában jelenlévőknek.",
     "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Mindet újraküldöd</resendText> vagy <cancelText>mindet megszakítod</cancelText>. De egyenként is kijelölheted az üzenetet elküldésre vagy megszakításra.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Senki más nincs itt! Szeretnél <inviteText>meghívni másokat</inviteText> vagy <nowarnText>leállítod a figyelmeztetést az üres szobára</nowarnText>?"
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Senki más nincs itt! Szeretnél <inviteText>meghívni másokat</inviteText> vagy <nowarnText>leállítod a figyelmeztetést az üres szobára</nowarnText>?",
+    "%(duration)ss": "%(duration)s mp.",
+    "%(duration)sm": "%(duration)s p.",
+    "%(duration)sh": "%(duration)s ó.",
+    "%(duration)sd": "%(duration)s nap",
+    "Online for %(duration)s": "%(duration)s óta elérhető",
+    "Idle for %(duration)s": "%(duration)s óta tétlen",
+    "Offline for %(duration)s": "%(duration)s óta elérhetetlen",
+    "Unknown for %(duration)s": "%(duration)s óta az állapota ismeretlen"
 }

From f91812491d129f16d0cd8c430ac55eb8a9d7e769 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Fri, 24 Nov 2017 18:53:04 +0000
Subject: [PATCH 061/927] Added translation using Weblate (Serbian)

---
 src/i18n/strings/sr.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/sr.json

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/sr.json
@@ -0,0 +1 @@
+{}

From 56437768c317b22f9eded9a3642343792dd93f47 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 22 Nov 2017 18:16:34 +0000
Subject: [PATCH 062/927] Translated using Weblate (Russian)

Currently translated at 99.4% (931 of 936 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e90f34cd1e..77e2e63bcd 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1013,5 +1013,11 @@
     "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sотозвал приглашение",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Обратите внимание, что вы заходите на сервер %(hs)s, а не на matrix.org.",
     "Custom of %(powerLevel)s": "Пользовательский уровень %(powerLevel)s",
-    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML для страницы вашего сообщества</h1>\n<p>\n    Используйте подробное описание для представления вашего сообщества новым участникам, или\n    поделитесь чем-нибудь важным, например <a href=\"foo\">ссылками</a>\n</p>\n<p>\n    Также вы можете использовать теги 'img'\n</p>\n"
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML для страницы вашего сообщества</h1>\n<p>\n    Используйте подробное описание для представления вашего сообщества новым участникам, или\n    поделитесь чем-нибудь важным, например <a href=\"foo\">ссылками</a>\n</p>\n<p>\n    Также вы можете использовать теги 'img'\n</p>\n",
+    "%(duration)ss": "%(duration)sсек",
+    "%(duration)sm": "%(duration)sмин",
+    "%(duration)sh": "%(duration)sчас",
+    "%(duration)sd": "%(duration)sдн",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "У вашего сообщества нет подробного описания HTML-страницы для показа участникам.<br />Щелкните здесь, чтобы открыть параметры и добавить его!",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Переотправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для повторной отправки или отмены."
 }

From 3a94b57e4a126e6034117278d5835ef7d352c2fe Mon Sep 17 00:00:00 2001
From: Vlad <wwwlad1slaw@ya.ru>
Date: Sun, 26 Nov 2017 14:24:17 +0000
Subject: [PATCH 063/927] Translated using Weblate (Russian)

Currently translated at 100.0% (936 of 936 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 77e2e63bcd..bc3b217263 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1019,5 +1019,10 @@
     "%(duration)sh": "%(duration)sчас",
     "%(duration)sd": "%(duration)sдн",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "У вашего сообщества нет подробного описания HTML-страницы для показа участникам.<br />Щелкните здесь, чтобы открыть параметры и добавить его!",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Переотправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для повторной отправки или отмены."
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Переотправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для повторной отправки или отмены.",
+    "Online for %(duration)s": "В сети %(duration)s",
+    "Offline for %(duration)s": "Не в сети %(duration)s",
+    "Idle for %(duration)s": "Неактивен %(duration)s",
+    "Unknown for %(duration)s": "Неизвестно %(duration)s",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить уведомления о пустой комнате</nowarnText>?"
 }

From 3d9e7322b4e0019880b4b814c78f4508013a6a06 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Thu, 23 Nov 2017 15:25:56 +0000
Subject: [PATCH 064/927] Translated using Weblate (Esperanto)

Currently translated at 6.3% (59 of 936 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 363b61faad..4176d41ba0 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -39,5 +39,23 @@
     "Who would you like to add to this community?": "Kiun vi volas aldoni al tiu ĉi komunumo?",
     "Invite new community members": "Invitu novajn komunumanojn",
     "Name or matrix ID": "Nomo aŭ Matrix-identigilo",
-    "Invite to Community": "Inviti al komunumo"
+    "Invite to Community": "Inviti al komunumo",
+    "Existing Call": "Jama voko",
+    "You are already in a call.": "Vi jam partoprenas vokon.",
+    "VoIP is unsupported": "VoIP ne estas subtenata",
+    "You cannot place VoIP calls in this browser.": "VoIP-vokoj ne fareblas en tiu ĉi foliumilo.",
+    "Conference calls are not supported in this client": "Grupaj vokoj ne fareblas en tiu ĉi kliento",
+    "Conference calls are not supported in encrypted rooms": "Grupaj vokoj ne fareblas en ĉifritaj ĉambroj",
+    "Conference calling is in development and may not be reliable.": "Grupaj vokoj ankoraŭ evoluas kaj povas malbone funkcii.",
+    "Failed to set up conference call": "Komenco de grupa voko malsukcesis",
+    "Conference call failed.": "Grupa voko malsukcesis.",
+    "The file '%(fileName)s' failed to upload": "Elŝuto de la dosiero «%(fileName)s» malsukcesis",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "La dosiero «%(fileName)s» estas tro granda por la hejma servilo",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Averto: ajna persono aldonita al komunumo estos publike videbla al iu ajn, kiu konas la identigilon de tiu komunumo",
+    "Which rooms would you like to add to this community?": "Kiujn ĉambrojn vi volas aldoni al ĉi tiu komunumo?",
+    "Show these rooms to non-members on the community page and room list?": "Ĉu la ĉambroj montriĝu al malanoj en la komunuma paĝo kaj listo de ĉambroj?",
+    "Add rooms to the community": "Aldoni ĉambrojn al la komunumo",
+    "Room name or alias": "Nomo aŭ kromnomo de ĉambro",
+    "Add to community": "Aldoni al komunumo",
+    "Failed to invite the following users to %(groupId)s:": "Malsukcesis inviti jenajn uzantojn al %(groupId)s:"
 }

From ce4c470c829e2508a94c9ef66685731565158f88 Mon Sep 17 00:00:00 2001
From: xmeta <x_metawork@yahoo.co.jp>
Date: Wed, 22 Nov 2017 17:48:20 +0000
Subject: [PATCH 065/927] Translated using Weblate (Japanese)

Currently translated at 6.1% (58 of 936 strings)

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

diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 73b1a915ec..295d42d5fe 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -57,5 +57,7 @@
     "No Webcams detected": "カメラが見つかりません",
     "Microphone": "マイク",
     "Camera": "カメラ",
-    "Are you sure?": "本当によろしいですか？"
+    "Are you sure?": "本当によろしいですか？",
+    "OK": "OK",
+    "Operation failed": "操作に失敗しました"
 }

From d824be602c4dfadbc59cdb3ca0622183cba38c7a Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Sun, 26 Nov 2017 15:00:18 +0000
Subject: [PATCH 066/927] Translated using Weblate (Russian)

Currently translated at 100.0% (936 of 936 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index bc3b217263..7690243bc7 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1024,5 +1024,5 @@
     "Offline for %(duration)s": "Не в сети %(duration)s",
     "Idle for %(duration)s": "Неактивен %(duration)s",
     "Unknown for %(duration)s": "Неизвестно %(duration)s",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить уведомления о пустой комнате</nowarnText>?"
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить предупреждение о пустой комнате</nowarnText>?"
 }

From 71590477b00a60f4cebd347098276e685c603057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Sat, 25 Nov 2017 08:55:12 +0000
Subject: [PATCH 067/927] Translated using Weblate (Serbian)

Currently translated at 9.5% (89 of 936 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 0967ef424b..b43afe6116 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1 +1,91 @@
-{}
+{
+    "This email address is already in use": "Ова мејл адреса се већ користи",
+    "This phone number is already in use": "Овај број телефона се већ користи",
+    "Failed to verify email address: make sure you clicked the link in the email": "Нисам успео да потврдим мејл адресу, постарајте се да сте кликнули на везу у мејлу",
+    "The remote side failed to pick up": "Друга страна није подигла слушалицу",
+    "Unable to capture screen": "Не могу да ухватим садржај екрана",
+    "Existing Call": "Постојећи позив",
+    "You are already in a call.": "Већ сте у позиву.",
+    "VoIP is unsupported": "VoIP није подржан",
+    "You cannot place VoIP calls in this browser.": "Не можете правити VoIP позиве у овом прегледачу.",
+    "You cannot place a call with yourself.": "Не можете позвати сами себе.",
+    "Conference calls are not supported in this client": "Конференцијски позиви нису подржани у овом клијенту",
+    "Conference calls are not supported in encrypted rooms": "Конференцијски позиви нису подржани у шифрованим собама",
+    "Warning!": "Упозорење!",
+    "Conference calling is in development and may not be reliable.": "Конференцијски позиви су још у развоју и могу бити непоуздани.",
+    "Failed to set up conference call": "Нисам успео да поставим конференцијски позив",
+    "Conference call failed.": "Конференцијски позив није успео.",
+    "The file '%(fileName)s' failed to upload": "Нисам успео да отпремим датотеку „%(fileName)s“",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Датотека „%(fileName)s“ премашује ограничење величине отпремања на овом кућном серверу",
+    "Upload Failed": "Отпремање није успело",
+    "Sun": "Нед",
+    "Mon": "Пон",
+    "Tue": "Уто",
+    "Wed": "Сре",
+    "Thu": "Чет",
+    "Fri": "Пет",
+    "Sat": "Суб",
+    "Jan": "Јан",
+    "Feb": "Феб",
+    "Mar": "Мар",
+    "Apr": "Апр",
+    "May": "Мај",
+    "Jun": "Јун",
+    "Jul": "Јул",
+    "Aug": "Авг",
+    "Sep": "Сеп",
+    "Oct": "Окт",
+    "Nov": "Нов",
+    "Dec": "Дец",
+    "PM": "после подне",
+    "AM": "пре подне",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(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",
+    "Who would you like to add to this community?": "Кога желите додати у ову заједницу?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Упозорење: било која особа додата у заједницу биће јавно видљива било коме ко зна ИБ заједнице",
+    "Invite new community members": "Позови нове чланове заједнице",
+    "Name or matrix ID": "Назив или матрикс ИБ",
+    "Invite to Community": "Позови у заједницу",
+    "Which rooms would you like to add to this community?": "Које собе желите додати у ову заједницу?",
+    "Show these rooms to non-members on the community page and room list?": "Приказати ове собе нечлановима на страници заједнице и у списку соба?",
+    "Add rooms to the community": "Додај собе у заједницу",
+    "Room name or alias": "Назив собе или алијас",
+    "Add to community": "Додај у заједницу",
+    "Failed to invite the following users to %(groupId)s:": "Нисам успео да позовем следеће кориснике у %(groupId)s:",
+    "Failed to invite users to community": "Нисам успео да позовем кориснике у заједницу",
+    "Failed to invite users to %(groupId)s": "Нисам успео да позовем кориснике у %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Нисам успео да додам следеће собе у %(groupId)s:",
+    "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-у није дато овлашћење за слање обавештења, пробајте поново касније",
+    "Unable to enable Notifications": "Нисам успео да омогућим обавештења",
+    "This email address was not found": "Ова мејл адреса није нађена",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Изгледа да ваша мејл адреса није повезана са Матрикс ИБ-јем на овом кућном серверу.",
+    "Default": "Подразумевано",
+    "Restricted": "Ограничено",
+    "Moderator": "Модератор",
+    "Admin": "Админ",
+    "Start a chat": "Крени са ћаскањем",
+    "Who would you like to communicate with?": "Са киме желите да разговарате?",
+    "Email, name or matrix ID": "Мејл, име или матрикс ИБ",
+    "Start Chat": "Ћаскај",
+    "Invite new room members": "Позови нове чланове у собу",
+    "Who would you like to add to this room?": "Кога желите да додате у ову собу?",
+    "Send Invites": "Пошаљи позивнице",
+    "Failed to invite user": "Неуспех при позивању корисника",
+    "Operation failed": "Радња није успела",
+    "Failed to invite": "Нисам успео да пошаљем позивницу",
+    "Failed to invite the following users to the %(roomName)s room:": "Нисам успео да пошаљем позивницу корисницима за собу %(roomName)s:",
+    "You need to be logged in.": "Морате бити пријављени.",
+    "You need to be able to invite users to do that.": "Морате имати могућност слања позивница корисницима да бисте то урадили.",
+    "Unable to create widget.": "Не могу да направим виџет.",
+    "Failed to send request.": "Неуспех при слању захтева.",
+    "This room is not recognised.": "Ова соба није препозната.",
+    "Power level must be positive integer.": "Ниво моћи мора бити позитивни број.",
+    "You are not in this room.": "Нисте у овој соби.",
+    "You do not have permission to do that in this room.": "Немате овлашћење да урадите то у овој соби.",
+    "Missing room_id in request": "Недостаје room_id у захтеву",
+    "Must be viewing a room": "Морате гледати собу",
+    "Room %(roomId)s not visible": "Соба %(roomId)s није видљива",
+    "Missing user_id in request": "Недостаје user_id у захтеву"
+}

From 2b57747e2e6ffa120b91014d903dd55fcd99ef0e Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 27 Nov 2017 16:22:39 +0000
Subject: [PATCH 068/927] Translated using Weblate (German)

Currently translated at 100.0% (936 of 936 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 5a9a4f1e44..7e2c5c677a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1017,5 +1017,16 @@
     "URL previews are enabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig aktiviert.",
     "Restricted": "Eingeschränkt",
     "Presence Management": "Anwesenheitsmanagement",
-    "Status.im theme": "Status.im-Thema"
+    "Status.im theme": "Status.im-Thema",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "Online seit %(duration)s",
+    "Idle for %(duration)s": "Untätig seit %(duration)s",
+    "Offline for %(duration)s": "Offline seit %(duration)s",
+    "Unknown for %(duration)s": "Unbekannt seit %(duration)s",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Flair für diese Communities zeigen:",
+    "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities den Flair an"
 }

From 246b33bd7eca767d4137d7d90e8e77bf8eeb2621 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Mon, 27 Nov 2017 16:28:37 +0000
Subject: [PATCH 069/927] Translated using Weblate (German)

Currently translated at 100.0% (936 of 936 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7e2c5c677a..c65e512928 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1026,7 +1026,7 @@
     "Idle for %(duration)s": "Untätig seit %(duration)s",
     "Offline for %(duration)s": "Offline seit %(duration)s",
     "Unknown for %(duration)s": "Unbekannt seit %(duration)s",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Flair für diese Communities zeigen:",
-    "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities den Flair an"
+    "Flair": "Abzeichen",
+    "Showing flair for these communities:": "Abzeichen für diese Communities zeigen:",
+    "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an"
 }

From 88917c77bce149627a3cd8acf2bdb2a2f0409b09 Mon Sep 17 00:00:00 2001
From: Mateo Castro <maroca@riseup.net>
Date: Mon, 27 Nov 2017 16:11:29 +0000
Subject: [PATCH 070/927] Translated using Weblate (Spanish)

Currently translated at 60.2% (564 of 936 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 261700a916..6a8bc3ccee 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -472,7 +472,7 @@
     "Changes colour scheme of current room": "Cambia el esquema de colores de esta sala",
     "Delete widget": "Eliminar widget",
     "Define the power level of a user": "Definir el nivel de poder de los usuarios",
-    "Edit": "Editar",
+    "Edit": "Edita",
     "Enable automatic language detection for syntax highlighting": "Activar la detección automática del lenguaje para resaltar la sintaxis",
     "Hide Apps": "Ocultar aplicaciones",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensajes de entrada/salida (no afecta invitaciones/kicks/bans)",

From 3441a4aa5c2dc464f654bee2156fa0b232d031c9 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Tue, 28 Nov 2017 11:22:13 +0000
Subject: [PATCH 071/927] Translated using Weblate (Russian)

Currently translated at 99.2% (931 of 938 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 7690243bc7..d7763aa86d 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1024,5 +1024,6 @@
     "Offline for %(duration)s": "Не в сети %(duration)s",
     "Idle for %(duration)s": "Неактивен %(duration)s",
     "Unknown for %(duration)s": "Неизвестно %(duration)s",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить предупреждение о пустой комнате</nowarnText>?"
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить предупреждение о пустой комнате</nowarnText>?",
+    "Something went wrong when trying to get your communities.": "Что-то пошло не так, во время отображения ваших сообществ."
 }

From 6e555509208d11ab20cfcd0061bc1bf1cc70a203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 28 Nov 2017 17:49:54 +0000
Subject: [PATCH 072/927] Translated using Weblate (French)

Currently translated at 100.0% (941 of 941 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8e305e93a5..b64a998b61 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1021,5 +1021,16 @@
     "Online for %(duration)s": "En ligne depuis %(duration)s",
     "Idle for %(duration)s": "Inactif depuis %(duration)s",
     "Offline for %(duration)s": "Hors ligne depuis %(duration)s",
-    "Unknown for %(duration)s": "Inconnu depuis %(duration)s"
+    "Unknown for %(duration)s": "Inconnu depuis %(duration)s",
+    "Delete %(count)s devices|one": "Supprimer l'appareil",
+    "Delete %(count)s devices|other": "Supprimer %(count)s appareils",
+    "Select devices": "Sélectionner les appareils",
+    "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de l'obtention de vos communautés.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucun flux compatible avec ce client.",
+    "Flair": "Talent",
+    "Showing flair for these communities:": "Montre les talents pour ces communautés :",
+    "This room is not showing flair for any communities": "Ce salon n'affiche de talent pour aucune communauté",
+    "Flair will appear if enabled in room settings": "Les talents apparaîtront s'ils sont activés dans les paramètres du salon",
+    "Flair will not appear": "Les talents n'apparaîtront pas",
+    "Display your community flair in rooms configured to show it.": "Afficher vos talents de communauté dans les salons configurés pour les afficher."
 }

From e5d1f2a05b561cc87384537692c146e69fc2cefe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Koreck=C3=BD?= <milan.korecky@gmail.com>
Date: Wed, 29 Nov 2017 11:49:53 +0000
Subject: [PATCH 073/927] Translated using Weblate (Czech)

Currently translated at 100.0% (941 of 941 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index a6ed5d0077..b29aedb4db 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -346,7 +346,7 @@
     "These are experimental features that may break in unexpected ways": "Tyto funkce jsou experimentální a mohou se pokazit nečekanými způsoby",
     "The visibility of existing history will be unchanged": "Viditelnost existující historie nebude změněna",
     "VoIP is unsupported": "VoIP není podporován",
-    "Warning!": "Pozor!",
+    "Warning!": "Varování!",
     "Who can access this room?": "Kdo má přístup k této místnosti?",
     "Who can read history?": "Kdo může číst historii?",
     "Who would you like to add to this room?": "Koho byste chtěli přidat do této místnosti?",
@@ -452,20 +452,20 @@
     "(warning: cannot be disabled again!)": "(varování: nepůjde znovu zakázat!)",
     "WARNING: Device already verified, but keys do NOT MATCH!": "VAROVÁNÍ: Zařízení byl již ověřeno, ale klíče se NESHODUJÍ!",
     "The remote side failed to pick up": "Vzdálené straně se nepodařilo hovor přijmout",
-    "Who would you like to add to this community?": "Koho chcete přidat do této komunity?",
-    "Invite new community members": "Pozvěte nové členy komunity",
+    "Who would you like to add to this community?": "Koho chcete přidat do této skupiny?",
+    "Invite new community members": "Pozvěte nové členy skupiny",
     "Name or matrix ID": "Jméno nebo matrix ID",
-    "Invite to Community": "Pozvat do komunity",
-    "Which rooms would you like to add to this community?": "Které místnosti chcete přidat do této komunity?",
+    "Invite to Community": "Pozvat do skupiny",
+    "Which rooms would you like to add to this community?": "Které místnosti chcete přidat do této skupiny?",
     "Warning: any room you add to a community will be publicly visible to anyone who knows the community ID": "Varování: místnost, kterou přidáte do této komunity, bude veřejně viditelná každému, kdo zná ID komunity",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varování: osoba, kterou přidáte do této komunity, bude veřejně viditelná každému, kdo zná ID komunity",
-    "Add rooms to the community": "Přidat místnosti do komunity",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varování: osoba, kterou přidáte do této skupiny, bude veřejně viditelná každému, kdo zná ID skupiny",
+    "Add rooms to the community": "Přidat místnosti do skupiny",
     "Room name or alias": "Název nebo alias místnosti",
-    "Add to community": "Přidat do komunity",
+    "Add to community": "Přidat do skupiny",
     "Failed to invite the following users to %(groupId)s:": "Následující uživatele se nepodařilo přidat do %(groupId)s:",
     "Invites sent": "Pozvánky odeslány",
     "Your community invitations have been sent.": "Vaše komunitní pozvánky byly odeslány.",
-    "Failed to invite users to community": "Nepodařilo se pozvat uživatele do komunity",
+    "Failed to invite users to community": "Nepodařilo se pozvat uživatele do skupiny",
     "Failed to invite users to %(groupId)s": "Nepodařilo se pozvat uživatele do %(groupId)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
@@ -479,7 +479,7 @@
     "You need to be logged in.": "Musíte být přihlášen/a.",
     "You are now ignoring %(userId)s": "Nyní ignorujete %(userId)s",
     "You are no longer ignoring %(userId)s": "Už neignorujete %(userId)s",
-    "Add rooms to this community": "Přidat místnosti do této komunity",
+    "Add rooms to this community": "Přidat místnosti do této skupiny",
     "Unpin Message": "Odepnout zprávu",
     "Ignored user": "Ignorovaný uživatel",
     "Unignored user": "Odignorovaný uživatel",
@@ -492,7 +492,7 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s požádal/a o VoIP konferenci.",
     "%(senderName)s removed their profile picture.": "%(senderName)s odstranil/a svůj profilový obrázek.",
     "%(targetName)s rejected the invitation.": "%(targetName)s odmítl/a pozvání.",
-    "Communities": "Komunity",
+    "Communities": "Skupiny",
     "Message Pinning": "Připíchnutí zprávy",
     "Your browser does not support the required cryptography extensions": "Váš prohlížeč nepodporuje požadovaná kryptografická rozšíření",
     "Do you want to set an email address?": "Chcete nastavit e-mailovou adresu?",
@@ -542,8 +542,8 @@
     "uploaded a file": "nahrál/a soubor",
     "Example": "Příklad",
     "Create Community": "Vytvořit komunitu",
-    "Community Name": "Název komunity",
-    "Community ID": "ID komunity",
+    "Community Name": "Název skupiny",
+    "Community ID": "ID skupiny",
     "example": "příklad",
     "Create": "Vytvořit",
     "Advanced options": "Pokročilé volby",
@@ -587,7 +587,7 @@
     "was unbanned": "byl/a přijat/a zpět",
     "was unbanned %(repeats)s times": "byl/a přijat/a zpět %(repeats)skrát",
     "were unbanned %(repeats)s times": "byli přijati zpět %(repeats)skrát",
-    "Leave Community": "Odejít z komunity",
+    "Leave Community": "Odejít ze skupiny",
     "Leave %(groupName)s?": "Odejít z %(groupName)s?",
     "Leave": "Odejít",
     "Unable to leave room": "Nepodařilo se odejít z místnosti",
@@ -596,8 +596,8 @@
     "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s vstoupil/a a odešel/la %(repeats)skrát",
     "%(severalUsers)sjoined and left": "%(severalUsers)s vstoupilo a odešlo",
     "%(oneUser)sjoined and left": "%(oneUser)s vstoupil/a a odešel/la",
-    "Failed to remove user from community": "Nepodařilo se odebrat uživatele z komunity",
-    "Failed to remove room from community": "Nepodařilo se odebrat místnost z komunity",
+    "Failed to remove user from community": "Nepodařilo se odebrat uživatele ze skupiny",
+    "Failed to remove room from community": "Nepodařilo se odebrat místnost ze skupiny",
     "Failed to remove '%(roomName)s' from %(groupId)s": "'%(roomName)s' se nepodařilo odebrat z %(groupId)s",
     "Failed to update community": "Nepodařilo se aktualizovat komunitu",
     "Failed to load %(groupId)s": "Nepodařilo se načíst %(groupId)s",
@@ -636,12 +636,12 @@
     "To send events of type <eventType/>, you must be a": "Abyste mohl/a odesílat události typu <eventType/>, musíte být",
     "You should not yet trust it to secure data": "Zatím byste jeho zabezpečení dat neměl/a důvěřovat",
     "Remote addresses for this room:": "Vzdálené adresy této místnosti:",
-    "Invalid community ID": "Neplatné ID komunity",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' není platné ID komunity",
+    "Invalid community ID": "Neplatné ID skupiny",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' není platné ID skupiny",
     "Related Communities": "Související komunity",
     "Related communities for this room:": "Komunity související s touto místností:",
     "This room has no related communities": "Tato místnost nemá žádné související komunity",
-    "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID komunity (např. +neco:%(localDomain)s)",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID skupiny (např. +neco:%(localDomain)s)",
     "%(names)s and %(count)s others are typing|one": "%(names)s a jeden další píší",
     "%(senderName)s sent an image": "%(senderName)s poslal/a obrázek",
     "%(senderName)s sent a video": "%(senderName)s poslal/a video",
@@ -681,5 +681,302 @@
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Tento proces vám umožňuje exportovat do souboru klíče ke zprávám, které jste dostali v šifrovaných místnostech. Když pak tento soubor importujete do jiného Matrix klienta, všechny tyto zprávy bude možné opět dešifrovat.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Kdokoliv, kdo získá přístup k exportovanému souboru, bude moci dešifrovat všechny vaše přijaté zprávy, a proto je třeba dbát zvýšenou pozornost jeho zabezpečení. Z toho důvodu byste měl/a do kolonky níže zadat heslo, se kterým exportovaná data zašifrujeme. Import pak bude možný pouze se znalostí zadaného hesla.",
     "Confirm passphrase": "Potvrďte heslo",
-    "Import room keys": "Importovat klíče místnosti"
+    "Import room keys": "Importovat klíče místnosti",
+    "Call Timeout": "Časový limit hovoru",
+    "Show these rooms to non-members on the community page and room list?": "Zobrazovat tyto místnosti na domovské stránce skupiny a v seznamu místností i pro nečleny?",
+    "Restricted": "Omezené",
+    "Missing room_id in request": "V zadání chybí room_id",
+    "Must be viewing a room": "Musí být zobrazena místnost",
+    "Missing user_id in request": "V zadání chybí user_id",
+    "Failed to lookup current room": "Nepodařilo se vyhledat aktuální místnost",
+    "(could not connect media)": "(média se nepodařilo spojit)",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s uskutečnil %(callType)s hovor.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s zpřístupnil budoucí historii místnosti neznámým (%(visibility)s).",
+    "Not a valid Riot keyfile": "Neplatný soubor s klíčem Riot",
+    "Presence Management": "Správce účasti",
+    "Disable Emoji suggestions while typing": "Zakázat návrhy Emoji během psaní",
+    "Hide avatar changes": "Skrýt změny avatara",
+    "Hide display name changes": "Skrýt změny zobrazovaného jména",
+    "Hide avatars in user and room mentions": "Skrýt avatary avatary v poznámkách uživatelů a místností",
+    "Disable big emoji in chat": "Zakázat velké Emoji v konverzaci",
+    "Mirror local video feed": "Zrcadlit lokání video",
+    "Disable Peer-to-Peer for 1:1 calls": "Zakázat Peer-to-Peer pro 1:1 hovory",
+    "Opt out of analytics": "Odhlásit se z analytiky údajů",
+    "Never send encrypted messages to unverified devices from this device": "Z tohoto zařízení nikdy neodesílat šifrované zprávy na neověřená zařízení",
+    "Enable inline URL previews by default": "Nastavit povolení náhledů URL adres jako výchozí",
+    "Enable URL previews for this room (only affects you)": "Povolit náhledy URL adres pro tuto místnost (ovlivňuje pouze vás)",
+    "Enable URL previews by default for participants in this room": "Povolit náhledy URL adres pro členy této místnosti jako výchozí",
+    "Delete %(count)s devices|one": "Smazat zařízení",
+    "Delete %(count)s devices|other": "Smazat %(count)s zařízení",
+    "Select devices": "Vybrat zařízení",
+    " (unsupported)": " (nepodporované)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Připojte se prostřednictvím <voiceText>audio</voiceText> nebo <videoText>video</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Probíhající konferenční hovor%(supportedText)s.",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "Online po dobu %(duration)s",
+    "Idle for %(duration)s": "Idle po dobu %(duration)s",
+    "Offline for %(duration)s": "Offline po dobu %(duration)s",
+    "Unknown for %(duration)s": "Neznámý po dobu %(duration)s",
+    "You may wish to login with a different account, or add this email to this account.": "Můžete se přihlásit k jinému účtu anebo přidat tuto emailovou adresu do právě přihlášeného účtu.",
+    "Flair": "Zájem",
+    "Showing flair for these communities:": "Zobrazovat zájmy těmto komunitám:",
+    "This room is not showing flair for any communities": "Tato místnost nezobrazuje zájmy žádné komunitě",
+    "URL previews are enabled by default for participants in this room.": "Náhledy URL adres jsou defaultně nastavené jako povolené pro členy této místnosti.",
+    "URL previews are disabled by default for participants in this room.": "Náhledy URL adres jsou defaultně nastavené jako zakázané pro členy této místnosti.",
+    "Invalid file%(extra)s": "Neplatný soubor%(extra)s",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Budete přesměrováni na stránku třetí strany k ověření svého účtu pro používání s  %(integrationsUrl)s. Chcete pokračovat?",
+    "Sign in with CAS": "Přihlásit se pomocí CAS",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Umožní vám použít aplikaci s existujícím Matrix účtem z jiného domácího serveru.",
+    "To continue, please enter your password.": "Aby jste mohli pokračovat, zadejte prosím své heslo.",
+    "Please check your email to continue registration.": "Prosím zkontrolujte své emaily, abyste mohli pokračovat v registraci.",
+    "Token incorrect": "Neplatný token",
+    "A text message has been sent to %(msisdn)s": "Na číslo %(msisdn)s byla odeslána textová zpráva",
+    "Please enter the code it contains:": "Prosím zadejte kód z této zprávy:",
+    "Username on %(hs)s": "Uživatelské jméno pro %(hs)s",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
+    "Sign in with": "Přihlásit se s",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Pokud nezadáte vaši emailovou adresu, nebude možné obnovit vaše heslo. Opravdu chcete pokračovat?",
+    "You are registering with %(SelectedTeamName)s": "Regristrujete se s %(SelectedTeamName)s",
+    "Default server": "Výchozí server",
+    "Custom server": "Vlastní server",
+    "Home server URL": "Adresa domácího serveru",
+    "What does this mean?": "Co to znamená?",
+    "Remove from community": "Odstranit ze skupiny",
+    "Disinvite this user from community?": "Zrušit pozvání tohoto uživatele?",
+    "Remove this user from community?": "Odstranit tohoto uživatele ze skupiny?",
+    "Failed to withdraw invitation": "Stažení pozvání selhalo",
+    "Filter community members": "Filtrovat členy skupiny",
+    "Flair will appear if enabled in room settings": "Zájmy budou zobrazeny pokud budou povoleny v nastavení místnosti",
+    "Flair will not appear": "Zájmy se nebudou zobrazovat",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Opravdu chcete odstranit místnost '%(roomName)s' z %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Pokud odstraníte místnost ze skupiny, odstraní se i odkaz do místnosti ze stránky skupiny.",
+    "Something went wrong!": "Něco se nepodařilo!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Zobrazení místnosti '%(roomName)s' ve skupině %(groupId)s nelze aktualizovat.",
+    "Visibility in Room List": "Zobrazení v Seznamu Místností",
+    "Visible to everyone": "Zobrazení pro každého",
+    "Only visible to community members": "Zobrazuje se pouze pro členy skupiny",
+    "Filter community rooms": "Filtrovat místnosti skupiny",
+    "Something went wrong when trying to get your communities.": "Při pokusu o nahrání vašich skupin se něco pokazilo.",
+    "Display your community flair in rooms configured to show it.": "Zobrazit zájmy skupiny v místnostech s povolených zobrazováním.",
+    "You're not currently a member of any communities.": "V současnosti nejste členem žádné skupiny.",
+    "Unknown Address": "Neznámá adresa",
+    "NOTE: Apps are not end-to-end encrypted": "VAROVÁNÍ: Aplikace nejsou end-to-end šifrované",
+    "Revoke widget access": "Odmítnout přístup k widgetu",
+    "Unblacklist": "Odstranit z černé listiny",
+    "Blacklist": "Přidat do černé listiny",
+    "Unverify": "Zrušit ověřování",
+    "Verify...": "Ověřit...",
+    "Integrations Error": "Chyby integrace",
+    "Manage Integrations": "Správa nastavení",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s krát vstoupili",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)svstoupili",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)svstoupil",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s %(count)s krát opustili",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sopustili",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s %(count)s krát opustil",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sopustil",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s %(count)s krát vstoupili a opustili",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)svstoupili a opustili",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil a opustil",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)svstoupil a opustil",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s %(count)s krát opustili a znovu vstoupili",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sopustili a znovu vstoupili",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s %(count)s krát opustil a znovu vstoupil",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sopustil a znovu vstoupil",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s %(count)s krát odmítli pozvání",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sodmítli pozvání",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s %(count)s krát odmítl pozvání",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sodmítl pozvání",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)směli %(count)s krát stažené pozvání",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)smeli stažené pozvání",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)směl %(count)s krát stažené pozvání",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)směl stažené pozvání",
+    "were invited %(count)s times|other": "byli %(count)s krát pozvaní",
+    "were invited %(count)s times|one": "byli pozvaní",
+    "was invited %(count)s times|other": "byl %(count)s krát pozvaný",
+    "was invited %(count)s times|one": "byl pozvaný",
+    "were banned %(count)s times|other": "mělid %(count)s krát zakázaný vstup",
+    "were banned %(count)s times|one": "měli zakázaný vstup",
+    "was banned %(count)s times|other": "měl %(count)s krát zakázaný vstup",
+    "was banned %(count)s times|one": "měl zakázaný vstup",
+    "were unbanned %(count)s times|other": "měli %(count)s krát povolený vstup",
+    "were unbanned %(count)s times|one": "měli povolený vstup",
+    "was unbanned %(count)s times|other": "měl %(count)s krát povolený vstup",
+    "was unbanned %(count)s times|one": "měl povolený vstup",
+    "were kicked %(count)s times|other": "byli %(count)s krát vyhozeni",
+    "were kicked %(count)s times|one": "byli vyhozeni",
+    "was kicked %(count)s times|other": "byl %(count)s krát vyhozen",
+    "was kicked %(count)s times|one": "byl vyhozen",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)ssi %(count)s krát změnili jméno",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)ssi změnili jméno",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)ssi %(count)s krát změnili jméno",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)ssi změnili jméno",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)ssi %(count)s krát změnili avatara",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)ssi změnili avatara",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)ssi %(count)s krát změnil avatara",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)ssi změnil avatara",
+    "%(items)s and %(count)s others|other": "%(items)s a %(count)s další",
+    "%(items)s and %(count)s others|one": "%(items)s a jeden další",
+    "%(items)s and %(lastItem)s": "%(items)s a také %(lastItem)s",
+    "Custom of %(powerLevel)s": "Vlastní úroveň %(powerLevel)s",
+    "And %(count)s more...|other": "A %(count)s dalších...",
+    "ex. @bob:example.com": "pr. @jan:příklad.com",
+    "Add User": "Přidat uživatele",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "ID Matrix místnosti",
+    "email address": "emailová adresa",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Zkuste použít jeden z následujících správných tvarů adres: %(validTypesList)s.",
+    "You have entered an invalid address.": "Zadali jste neplatnou adresu.",
+    "Create a new chat or reuse an existing one": "Vytvořte nový chat anebo se připojte k již existujícímu",
+    "Start new chat": "Začít nový chat",
+    "You already have existing direct chats with this user:": "S tímto uživatelem již společně chatujete:",
+    "Click on the button below to start chatting!": "Pro zahájení chatu klikněte na tlačítko níže!",
+    "Confirm Removal": "Potvrdit odstranění",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Opravdu chcete odstranit (smazat) tuto událost? V případě, že smažete název místnosti anebo změníte téma, je možné, že se změny neprovedou.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID skupiny může obsahovat pouze znaky a-z, 0-9, or '=_-./'",
+    "Something went wrong whilst creating your community": "Něco se pokazilo v během vytváření vaší skupiny",
+    "Block users on other matrix homeservers from joining this room": "Blokovat vstup do místnosti uživatelům z ostatních domácích matrix serverů",
+    "This setting cannot be changed later!": "Toto nastavení nelze v budoucnu změnit!",
+    "Unknown error": "Neznámá chyba",
+    "Incorrect password": "Nesprávné heslo",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Toto způsobí, že váš účet nebude již nikdy použitelný. Zároveň nebude možné se znovu zaregistrovat pod stejným uživatelským ID.",
+    "This action is irreversible.": "Tuto operaci nebude možné vrátit zpět.",
+    "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:": "Pokud si chcete ověřit, zda je zařízení skutečně důvěryhodné, kontaktujte vlastníka jiným způsobem (např. osobně anebo telefonicky) a zeptejte se ho na klíč, který má pro toto zařízení zobrazený v nastavení a zda se shoduje s klíčem zobrazeným níže:",
+    "Device name": "Název zařízení",
+    "Device key": "Klíč zařízení",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Pokud se klíče shodují, stlačte ověřovací tlačítko uvedené níže. Pokud se neshodují, někdo další odposlouchává toto zařízení a v takovém případě by jste měli místo toho vybrat tlačítko černé listiny.",
+    "In future this verification process will be more sophisticated.": "V budoucnu plánujeme proces ověřování zařízení zjednodušit.",
+    "Verify device": "Ověřit zařízení",
+    "I verify that the keys match": "Ověřil jsem, klíče se shodují",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Přidali jste nové zařízení s názvem  '%(displayName)s', vyžadující šifrovací klíč.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Vaše neověřené zařízení s názvem '%(displayName)s' vyžaduje šifrovací klíč.",
+    "Start verification": "Zahájit ověřování",
+    "Share without verifying": "Sdílet bez ověření",
+    "Ignore request": "Ignorovat žádost",
+    "Encryption key request": "Žádost o šifrovací klíč",
+    "Unable to restore session": "Nelze obnovit relaci",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Při pokusu o obnovení vaší předcházející relace se vyskytla chyba. Pokud budete pokračovat musíte se znovu přihlásit a historie šifrovaného rozhovoru nebude již dostupná.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Pokud jste se v minulosti již přihlásili s novější verzi programu Riot, vaše relace nemusí být kompatibilní s touto verzí. Zavřete prosím toto okno a přihlaste se znovu pomocí nové verze.",
+    "Continue anyway": "Přesto pokračovat",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Prosím, zkontrolujte si email a klikněte na odkaz ve zprávě, kterou jsme vám zaslali. V případě, že jste tak již učinili, klikněte na tlačítko Pokračovat.",
+    "This will allow you to reset your password and receive notifications.": "Toto vám umožní obnovit si heslo a přijímat oznámení emailem.",
+    "Skip": "Přeskočit",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Uživatelské jméno může obsahovat pouze písmena, číslice, tečky, pomlčky a podtržítka.",
+    "Username not available": "Uživatelské jméno není dostupné",
+    "An error occurred: %(error_string)s": "Vyskytla se chyba: %(error_string)s",
+    "Username available": "Dostupné uživatelské jméno",
+    "To get started, please pick a username!": "Začněte tím, že si zvolíte uživatelské jméno!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Toto bude název vašeho účtu na domácím serveru <span></span>, anebo si můžete zvolit <a>jiný server</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Pokud již účet Matrix máte, můžete se ihned <a>Přihlásit</a>.",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Neověřená zařízení jsou v této chvíli na černé listině; pokud chcete zasílat zprávy na tato zařízení, musíte je nejdříve ověřit.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Doporučujeme vám projít procesem ověřování pro všechna zařízení, abyste si potvrdili, že patří jejich pravým vlastníkům, ale pokud si to přejete, můžete zprávu znovu odeslat bez ověřování.",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "V místnosti \"%(RoomName)s\" jsou zařízení s kterými jste dosud nikdy nekomunikovali.",
+    "Unknown devices": "Neznámá zařízení",
+    "Private Chat": "Soukromý chat",
+    "Public Chat": "Veřejný chat",
+    "Topic": "Téma",
+    "Make this room private": "Nastavit místnost jako soukromou",
+    "Share message history with new users": "Sdílet historii zpráv s novými uživateli",
+    "Encrypt room": "Zašifrovat místnost",
+    "You must <a>register</a> to use this functionality": "Musíte být <a>zaregistrovaný</a> pokud chcete využívat této funkce",
+    "You must join the room to see its files": "Musíte vstoupit do místnosti pokud chcete soubory zobrazit",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML kód vaší skupiny</h1>\n<p>\n    Pomocí dlouhého popisu představte skupinu novým členům anebo uvěďte \n    nějaké důležité <a href=\"foo\">odkazy</a>\n</p>\n<p>\n    Můžete používat i HTML 'img' značky\n</p>\n",
+    "Add rooms to the community summary": "Přidat místnosti do přehledu skupiny",
+    "Which rooms would you like to add to this summary?": "Které místnosti se přejete přidat do tohoto přehledu?",
+    "Add to summary": "Přidat do přehledu",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Do přehledu skupiny %(groupId)s se nepodařilo přidat následující místnosti:",
+    "Add a Room": "Přidat místnost",
+    "Failed to remove the room from the summary of %(groupId)s": "Z přehledu skupiny %(groupId)s se nepodařilo odstranit místnost",
+    "The room '%(roomName)s' could not be removed from the summary.": "Nelze odstranit místnost '%(roomName)s' z přehledu.",
+    "Add users to the community summary": "Přidat uživatele do přehledu skupiny",
+    "Who would you like to add to this summary?": "Koho si přejete přidat do seznamu?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Do souhrnného seznamu skupiny %(groupId)s se nepodařilo přidat následující uživatele:",
+    "Add a User": "Přidat uživatele",
+    "Failed to remove a user from the summary of %(groupId)s": "Ze souhrnného seznamu skupiny %(groupId)s se nepodařilo odstranit uživatele",
+    "The user '%(displayName)s' could not be removed from the summary.": "Nelze odstranit uživatele '%(displayName)s'  ze souhrnného seznamu.",
+    "Unable to accept invite": "Nelze přijmout pozvání",
+    "Unable to reject invite": "Nelze odmítnout pozvání",
+    "Community Settings": "Nastavení skupiny",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Tyto místnosti se zobrazují všem členům na stránce skupiny. Členové skupiny mohou vstoupit do místnosti kliknutím.",
+    "Featured Rooms:": "Hlavní místnosti:",
+    "Featured Users:": "Významní uživatelé:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s vás pozval ke vstupu do této místnosti",
+    "You are an administrator of this community": "Jste správcem této skupiny",
+    "You are a member of this community": "Jste členem této skupiny",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Vaše skupina nemá vyplněný dlouhý popis, který je součástí HTML stránky skupiny a která se zobrazuje jejím členům.<br />Kliknutím zde otevřete nastavení, kde ho můžete doplnit!",
+    "Long Description (HTML)": "Dlouhý popis (HTML)",
+    "Description": "Popis",
+    "Community %(groupId)s not found": "Skupina %(groupId)s nenalezena",
+    "This Home server does not support communities": "Tento domácí server nepodporuje skupiny",
+    "Reject invitation": "Odmítnout pozvání",
+    "Signed Out": "Jste odhlášeni",
+    "Your Communities": "Vaše skupiny",
+    "Error whilst fetching joined communities": "Při získávání vašich skupin se vyskytla chyba",
+    "Create a new community": "Vytvořit novou skupinu",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Vytvořte skupinu s cílem seskupit uživatele a místnosti! Vytvořte si vlastní domovskou stránku a vymezte tak váš prostor ve světe Matrix.",
+    "Join an existing community": "Vstoupit do existující skupiny",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Aby jste mohli vstoupit do existující skupiny, musíte znát její identifikátor; Měl by vypadat asi takto <i>+priklad:matrix.org</i>.",
+    "You have no visible notifications": "Nejsou dostupná žádná oznámení",
+    "Connectivity to the server has been lost.": "Spojení se serverem bylo přerušené.",
+    "Sent messages will be stored until your connection has returned.": "Odeslané zprávy zůstanou uložené, dokud se spojení znovu neobnoví.",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Znovu odeslat vše</resendText> nebo <cancelText>zrušit vše</cancelText> nyní. Můžete také znovu odeslat anebo zrušit odesílání jednotlivých zpráv zvlášť.",
+    "Active call": "Aktivní hovor",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Kromě vás není v této místnosti nikdo jiný! Přejete si <inviteText>Pozvat další</inviteText> anebo <nowarnText>Přestat upozorňovat na prázdnou místnost</nowarnText>?",
+    "Message not sent due to unknown devices being present": "Zpráva nebyla odeslána vzhledem k nalezeným neznámým zařízením",
+    "Room": "Místnost",
+    "Failed to load timeline position": "Nepodařilo se načíst pozici na časové ose",
+    "Light theme": "Světlý motiv",
+    "Dark theme": "Tmavý motiv",
+    "Status.im theme": "Status.im motivu",
+    "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.": "S cílem posílit zabezpečení se všechny E2E šifrovací klíče při odhlášení odstraní z tohoto prohlížeče. Pokud chcete dostupnou historii šifrovaných konverzací i při opětovném přihlášení, prosím stáhněte si a bezpečně uložte klíče vašich místností.",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Vaše heslo bylo úspěšně změněno. Na ostatních zařízeních se vám již nebudou zobrazovat okamžitá oznámení do té chvíle než se na nich znovu přihlásíte",
+    "Remove Contact Information?": "Odstranit kontaktní informace?",
+    "Remove %(threePid)s?": "Odstranit %(threePid)s?",
+    "Refer a friend to Riot:": "Doporučit Riot známému:",
+    "Autocomplete Delay (ms):": "Zpoždění automatického dokončování (ms):",
+    "Ignored Users": "Ignorovaní uživatelé",
+    "Analytics": "Analytické údaje",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot sbírá anonymní analytické údaje, které nám umožňují aplikaci dále zlepšovat.",
+    "Labs": "Experimentální funkce",
+    "Reject all %(invitedRooms)s invites": "Odmítnutí všech %(invitedRooms)s pozvání",
+    "Desktop specific": "Specifické pro Desktop zobrazení",
+    "Start automatically after system login": "Zahájit automaticky po přihlášení do systému",
+    "No media permissions": "Žádná oprávnění k médiím",
+    "You may need to manually permit Riot to access your microphone/webcam": "Je možné, že budete potřebovat manuálně povolit Riot přístup k mikrofónu/webkameře",
+    "Missing Media Permissions, click here to request.": "Kliknutím sem získáte chybějící oprávnění pro přístup k mediálním zařízením.",
+    "Profile": "Profil",
+    "To return to your account in future you need to set a password": "Pokud se v budoucnu chcete vrátit k vašemu účtu je třeba si nyní nastavit heslo",
+    "The email address linked to your account must be entered.": "Musíte zadat emailovou adresu spojenou s vaším účtem.",
+    "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.": "Změna hesla v této chvílí povede k resetu end-to-end šifrovacích klíčů na všech zařízení a nečitelnosti šifrovaných konverzací pokud si klíče vašich místností předem nestáhnete a následně nenaimportujete zpět. Tato funkce bude v budoucnu vylepšena.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Na adresu %(emailAddress)s byla odeslána zpráva. Potom, co přejdete na odkaz z této zprávy, klikněte níže.",
+    "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": "Byli jste odhlášení ze všech zařízení a nebudete již dále dostávat okamžitá oznámení. Povolíte je tak, že se znovu přihlásíte na každém zařízení zvláš'ť",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Upozornění: právě se přihlašujete na server %(hs)s, a nikoliv na server matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Tento domácí server nenabízí žádné přihlašovací toky podporované touto službou/klientem.",
+    "Sign in to get started": "Začněte přihlášením",
+    "Set a display name:": "Nastavit zobrazované jméno:",
+    "Upload an avatar:": "Nahrát avatar:",
+    "This server does not support authentication with a phone number.": "Tento server nepodporuje ověření telefonním číslem.",
+    "Missing password.": "Chybí heslo.",
+    "Passwords don't match.": "Hesla se neshodují.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Heslo je velmi krátké (min %(MIN_PASSWORD_LENGTH)s znaků).",
+    "This doesn't look like a valid email address.": "Zdá se, že toto není platná emailová adresa.",
+    "This doesn't look like a valid phone number.": "Zdá se, že toto není platné telefonní číslo.",
+    "An unknown error occurred.": "Vyskytla se neznámá chyba.",
+    "I already have an account": "Už mám účet",
+    "Deops user with given id": "Zruší stav moderátor uživateli se zadaným ID",
+    "Searches DuckDuckGo for results": "Vyhledá výsledky na DuckDuckGo",
+    "Verifies a user, device, and pubkey tuple": "Ověří zadané údaje uživatele, zařízení a veřejný klíč",
+    "Ignores a user, hiding their messages from you": "Ignoruje uživatele a skryje všechny jeho zprávy",
+    "Stops ignoring a user, showing their messages going forward": "Přestane ignorovat uživatele a začne zobrazovat jeho zprávy",
+    "Notify the whole room": "Oznámení pro celou místnost",
+    "Room Notification": "Oznámení místnosti",
+    "Curve25519 identity key": "Klíč totožnosti Curve25519",
+    "Claimed Ed25519 fingerprint key": "Údajný klíč s otiskem prstu Ed25519",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tento proces vás provede importem šifrovacích klíčů, které jste si stáhli z jiného Matrix klienta. Po úspěšném naimportování budete v tomto klientovi moci dešifrovat všechny zprávy, které jste mohli dešifrovat v původním klientovi.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo."
 }

From f490adfdd9000b4d4f2fc9b1ab3590cb050e193d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 28 Nov 2017 17:51:41 +0000
Subject: [PATCH 074/927] Translated using Weblate (French)

Currently translated at 100.0% (941 of 941 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b64a998b61..7b3f29ade5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1027,7 +1027,7 @@
     "Select devices": "Sélectionner les appareils",
     "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de l'obtention de vos communautés.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucun flux compatible avec ce client.",
-    "Flair": "Talent",
+    "Flair": "Talents",
     "Showing flair for these communities:": "Montre les talents pour ces communautés :",
     "This room is not showing flair for any communities": "Ce salon n'affiche de talent pour aucune communauté",
     "Flair will appear if enabled in room settings": "Les talents apparaîtront s'ils sont activés dans les paramètres du salon",

From cb5c9f2c5ae34e019d34b121e1ee32ce4ab7c6c0 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Wed, 29 Nov 2017 21:13:48 +0100
Subject: [PATCH 075/927] Make Dialogs more accessible

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
---
 src/components/views/dialogs/BaseDialog.js     | 8 ++++++--
 src/components/views/dialogs/QuestionDialog.js | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 295bb21ea1..aec9af4e98 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -45,6 +45,10 @@ export default React.createClass({
 
         // children should be the content of the dialog
         children: React.PropTypes.node,
+
+        // Id of content element
+        // If provided, this is used to add a aria-describedby attribute
+        contentId: React.PropTypes.string
     },
 
     _onKeyDown: function(e) {
@@ -69,13 +73,13 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div onKeyDown={this._onKeyDown} className={this.props.className}>
+            <div onKeyDown={this._onKeyDown} className={this.props.className} role="dialog" aria-labelledby='mx_BaseDialog_title' aria-describedby={this.props.contentId}>
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >
                     <TintableSvg src="img/icons-close-button.svg" width="35" height="35" />
                 </AccessibleButton>
-                <div className='mx_Dialog_title'>
+                <div className='mx_Dialog_title' id='mx_BaseDialog_title'>
                     { this.props.title }
                 </div>
                 { this.props.children }
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 339b284e2f..db20fd00ed 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -66,6 +66,7 @@ export default React.createClass({
             <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished}
                 onEnterPressed={this.onOk}
                 title={this.props.title}
+                contentId='mx_Dialog_content'
             >
                 <div className="mx_Dialog_content">
                     { this.props.description }

From 6e3c12e754f537c832cc4c9f3fe340547525525c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 28 Nov 2017 17:51:41 +0000
Subject: [PATCH 076/927] Translated using Weblate (French)

Currently translated at 100.0% (941 of 941 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7b3f29ade5..fe248746bf 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1032,5 +1032,6 @@
     "This room is not showing flair for any communities": "Ce salon n'affiche de talent pour aucune communauté",
     "Flair will appear if enabled in room settings": "Les talents apparaîtront s'ils sont activés dans les paramètres du salon",
     "Flair will not appear": "Les talents n'apparaîtront pas",
-    "Display your community flair in rooms configured to show it.": "Afficher vos talents de communauté dans les salons configurés pour les afficher."
+    "Display your community flair in rooms configured to show it.": "Afficher vos talents de communauté dans les salons configurés pour les afficher.",
+    "Tag Panel": "Panneau des étiquettes"
 }

From 437a440bdfa17553e83e5d7e762b7494bb803ddb Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <pafcu@iki.fi>
Date: Thu, 30 Nov 2017 08:32:18 +0100
Subject: [PATCH 077/927] Add missing id

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

diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index db20fd00ed..92051a0df7 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -68,7 +68,7 @@ export default React.createClass({
                 title={this.props.title}
                 contentId='mx_Dialog_content'
             >
-                <div className="mx_Dialog_content">
+                <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     { this.props.description }
                 </div>
                 <div className="mx_Dialog_buttons">

From 4be057ee2caa3f28d858f1ad24af7dcbddc695fc Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 30 Nov 2017 07:51:15 +0000
Subject: [PATCH 078/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (941 of 941 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 4800872ae5..840f12381c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1025,5 +1025,17 @@
     "Online for %(duration)s": "%(duration)s óta elérhető",
     "Idle for %(duration)s": "%(duration)s óta tétlen",
     "Offline for %(duration)s": "%(duration)s óta elérhetetlen",
-    "Unknown for %(duration)s": "%(duration)s óta az állapota ismeretlen"
+    "Unknown for %(duration)s": "%(duration)s óta az állapota ismeretlen",
+    "Delete %(count)s devices|other": "%(count)s darab eszköz törlése",
+    "Delete %(count)s devices|one": "Eszköz törlése",
+    "Select devices": "Eszköz kiválasztása",
+    "Flair": "Jelvény",
+    "Showing flair for these communities:": "Ezekben a közösségekben mutassa a jelvényt:",
+    "This room is not showing flair for any communities": "Ez a szoba nem mutat jelvényt egyetlen közösséghez sem",
+    "Flair will appear if enabled in room settings": "Ha a szoba beállításai megengedik akkor jelennek meg a jelvények",
+    "Flair will not appear": "Jelvények nem jelennek meg",
+    "Something went wrong when trying to get your communities.": "Valami nem sikerült a közösségeid elérésénél.",
+    "Display your community flair in rooms configured to show it.": "Közösségi jelvényeid megjelenítése azokban a szobákban ahol ez engedélyezett.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Ez a saját szerver egyetlen bejelentkezési metódust sem támogat amit ez a kliens ismer.",
+    "Tag Panel": "Címke panel"
 }

From 09aaafdf2b73f7177bdbd69dde1aaa5570409794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Koreck=C3=BD?= <milan.korecky@gmail.com>
Date: Wed, 29 Nov 2017 11:50:58 +0000
Subject: [PATCH 079/927] Translated using Weblate (Czech)

Currently translated at 100.0% (941 of 941 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index b29aedb4db..8380afbc83 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -978,5 +978,6 @@
     "Curve25519 identity key": "Klíč totožnosti Curve25519",
     "Claimed Ed25519 fingerprint key": "Údajný klíč s otiskem prstu Ed25519",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tento proces vás provede importem šifrovacích klíčů, které jste si stáhli z jiného Matrix klienta. Po úspěšném naimportování budete v tomto klientovi moci dešifrovat všechny zprávy, které jste mohli dešifrovat v původním klientovi.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo."
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo.",
+    "Tag Panel": "Připnout panel"
 }

From 26c6c25a4cce7a87799ffd52ec86b41a418f6192 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Sun, 3 Dec 2017 11:23:44 +0000
Subject: [PATCH 080/927] Add dom-to-image dep.

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

diff --git a/package.json b/package.json
index b443b4c72a..dc526b7105 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "classnames": "^2.1.2",
     "commonmark": "^0.27.0",
     "counterpart": "^0.18.0",
+    "dom-to-image": "^2.6.0",
     "draft-js": "^0.11.0-alpha",
     "draft-js-export-html": "^0.6.0",
     "draft-js-export-markdown": "^0.3.0",

From 3a89b90e57c7e2b13a2fe623e71495da2e0603ca Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Sun, 3 Dec 2017 11:25:15 +0000
Subject: [PATCH 081/927] Add stub handler for image snapshot

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index a005406133..db722bd66d 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -221,6 +221,10 @@ export default React.createClass({
         }, "mx_IntegrationsManager");
     },
 
+    _onSnapshotClick(e) {
+        console.log("Snapshot widget ID ", this.props.id);
+    },
+
     /* If user has permission to modify widgets, delete the widget,
      * otherwise revoke access for the widget to load in the user's browser
     */
@@ -379,11 +383,25 @@ export default React.createClass({
             deleteClasses += ' mx_AppTileMenuBarWidgetDelete';
         }
 
+        // Picture snapshot
+        const showPictureSnapshotButton = true; // FIXME - Make this dynamic
+        const showPictureSnapshotIcon = 'img/camera_green.svg';
+
         return (
             <div className={this.props.fullWidth ? "mx_AppTileFullWidth" : "mx_AppTile"} id={this.props.id}>
                 <div ref="menu_bar" className="mx_AppTileMenuBar" onClick={this.onClickMenuBar}>
                     <b>{ this.formatAppTileName() }</b>
                     <span className="mx_AppTileMenuBarWidgets">
+                      { /* Snapshot widget */ }
+                      { showPictureSnapshotButton && <TintableSvgButton
+                          src={showPictureSnapshotIcon}
+                          className="mx_AppTileMenuBarWidget mx_AppTileMenuBarWidgetPadding"
+                          title={_t('Picture')}
+                          onClick={this._onSnapshotClick}
+                          width="10"
+                          height="10"
+                      /> }
+
                         { /* Edit widget */ }
                         { showEditButton && <TintableSvgButton
                             src="img/edit_green.svg"

From c9b8aab0e0adeec34926e5aa8c3c31bef0a39655 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Sun, 3 Dec 2017 19:44:59 +0000
Subject: [PATCH 082/927] Workings for future posterity - Can't access iframe
 content from parent. iframe needs to initiate. Postmessage data up the stack.

---
 src/components/structures/RoomView.js    |  3 +++
 src/components/views/elements/AppTile.js | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 1fda05fb76..cf3320b607 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -468,6 +468,9 @@ module.exports = React.createClass({
                     unsentMessageError: this._getUnsentMessageError(this.state.room),
                 });
                 break;
+            case 'picture_snapshot':
+                this.uploadFile(payload.file);
+                break;
             case 'notifier_enabled':
             case 'upload_failed':
             case 'upload_started':
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index db722bd66d..a0eb7efe52 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -32,6 +32,7 @@ import AppWarning from './AppWarning';
 import MessageSpinner from './MessageSpinner';
 import WidgetUtils from '../../../WidgetUtils';
 import dis from '../../../dispatcher';
+import domtoimage from 'dom-to-image';
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 
@@ -222,7 +223,14 @@ export default React.createClass({
     },
 
     _onSnapshotClick(e) {
-        console.log("Snapshot widget ID ", this.props.id);
+        const iframe = this.refs.appFrame;
+        domtoimage.toPng(iframe).then(function(dataUrl) {
+            console.log("Image data URL:", dataUrl);
+            dis.dispatch({
+                action: 'picture_snapshot',
+                file: dataURLtoBlob(dataUrl),
+            }, true);
+        });
     },
 
     /* If user has permission to modify widgets, delete the widget,
@@ -428,3 +436,15 @@ export default React.createClass({
         );
     },
 });
+
+function dataURLtoBlob(dataurl) {
+    const arr = dataurl.split(',');
+    const mime = arr[0].match(/:(.*?);/)[1];
+    const bstr = atob(arr[1]);
+    let n = bstr.length;
+    const u8arr = new Uint8Array(n);
+    while (n--) {
+        u8arr[n] = bstr.charCodeAt(n);
+    }
+    return new Blob([u8arr], {type: mime});
+}

From 5ccbcf02e200aa8348a7415dda40a0c73e35937d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Sun, 3 Dec 2017 21:38:21 +0100
Subject: [PATCH 083/927] Several changes improving accessibility of the
 dialogs

- Wrapped all the modals inside a react-focus-trap component disabling
keyboard navigation outside the modal dialogs
- Disabled our custom key handling at dialog level. Cancelling on esc
key is now handled via FocusTrap component.
- Removed onEnter prop from the BaseDialog component. Dialogs that
submit data all now embed a form with onSubmit handler. And since
keyboard focus is now managed better via FocusTrap it no longer makes
sense for the other dialog types. Fixes
https://github.com/vector-im/riot-web/issues/5736
- Set aria-hidden on the matrixChat outer node when showing dialogs to
disable navigating outside the modals by using screen reader specific
features.
---
 package.json                                  |  1 +
 src/Modal.js                                  |  6 +-
 src/components/views/dialogs/BaseDialog.js    | 26 ++++-----
 .../views/dialogs/ConfirmUserActionDialog.js  |  4 +-
 .../views/dialogs/CreateGroupDialog.js        |  1 -
 .../views/dialogs/CreateRoomDialog.js         | 57 +++++++++----------
 .../views/dialogs/QuestionDialog.js           |  1 -
 .../views/dialogs/TextInputDialog.js          | 29 +++++-----
 8 files changed, 60 insertions(+), 65 deletions(-)

diff --git a/package.json b/package.json
index b443b4c72a..46517230a7 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,7 @@
     "react": "^15.4.0",
     "react-addons-css-transition-group": "15.3.2",
     "react-dom": "^15.4.0",
+    "react-focus-trap": "^2.5.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
diff --git a/src/Modal.js b/src/Modal.js
index 68d75d1ff1..daf66a37de 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -19,6 +19,7 @@ limitations under the License.
 
 const React = require('react');
 const ReactDOM = require('react-dom');
+import FocusTrap from 'react-focus-trap';
 import Analytics from './Analytics';
 import sdk from './index';
 
@@ -164,6 +165,7 @@ class ModalManager {
         );
         modal.onFinished = props ? props.onFinished : null;
         modal.className = className;
+        modal.closeDialog = closeDialog;
 
         this._modals.unshift(modal);
 
@@ -194,9 +196,9 @@ class ModalManager {
         const modal = this._modals[0];
         const dialog = (
             <div className={"mx_Dialog_wrapper " + (modal.className ? modal.className : '')}>
-                <div className="mx_Dialog">
+                <FocusTrap className="mx_Dialog" onExit={modal.closeDialog}>
                     { modal.elem }
-                </div>
+                </FocusTrap>
                 <div className="mx_Dialog_background" onClick={this.closeAll}></div>
             </div>
         );
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index aec9af4e98..1f29f2d1f4 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -33,9 +33,6 @@ export default React.createClass({
         // onFinished callback to call when Escape is pressed
         onFinished: React.PropTypes.func.isRequired,
 
-        // callback to call when Enter is pressed
-        onEnterPressed: React.PropTypes.func,
-
         // CSS class to apply to dialog div
         className: React.PropTypes.string,
 
@@ -51,17 +48,16 @@ export default React.createClass({
         contentId: React.PropTypes.string
     },
 
-    _onKeyDown: 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);
-            }
+    componentDidMount: function() {
+        this.applicationNode = document.getElementById('matrixchat');
+        if (this.applicationNode) {
+            this.applicationNode.setAttribute('aria-hidden', 'true');
+        }
+    },
+
+    componentWillUnmount: function() {
+        if (this.applicationNode) {
+            this.applicationNode.setAttribute('aria-hidden', 'false');
         }
     },
 
@@ -73,7 +69,7 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div onKeyDown={this._onKeyDown} className={this.props.className} role="dialog" aria-labelledby='mx_BaseDialog_title' aria-describedby={this.props.contentId}>
+            <div className={this.props.className} role="dialog" aria-labelledby='mx_BaseDialog_title' aria-describedby={this.props.contentId}>
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 78d084b709..1c246a580b 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -116,10 +116,10 @@ export default React.createClass({
 
         return (
             <BaseDialog className="mx_ConfirmUserActionDialog" onFinished={this.props.onFinished}
-                onEnterPressed={this.onOk}
                 title={this.props.title}
+                contentId='mx_Dialog_content'
             >
-                <div className="mx_Dialog_content">
+                <div id="mx_Dialog_content" className="mx_Dialog_content">
                     <div className="mx_ConfirmUserActionDialog_avatar">
                         { avatar }
                     </div>
diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 168fe75947..8e262a6e51 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -116,7 +116,6 @@ export default React.createClass({
 
         return (
             <BaseDialog className="mx_CreateGroupDialog" onFinished={this.props.onFinished}
-                onEnterPressed={this._onFormSubmit}
                 title={_t('Create Community')}
             >
                 <form onSubmit={this._onFormSubmit}>
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index f7be47b3eb..f5a5f87b72 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -43,38 +43,37 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog className="mx_CreateRoomDialog" onFinished={this.props.onFinished}
-                onEnterPressed={this.onOk}
                 title={_t('Create Room')}
             >
-                <div className="mx_Dialog_content">
-                    <div className="mx_CreateRoomDialog_label">
-                        <label htmlFor="textinput"> { _t('Room name (optional)') } </label>
-                    </div>
-                    <div>
-                        <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" />
-                    </div>
-                    <br />
-
-                    <details className="mx_CreateRoomDialog_details">
-                        <summary className="mx_CreateRoomDialog_details_summary">{ _t('Advanced options') }</summary>
-                        <div>
-                            <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.defaultNoFederate} />
-                            <label htmlFor="checkbox">
-                                { _t('Block users on other matrix homeservers from joining this room') }
-                                <br />
-                                ({ _t('This setting cannot be changed later!') })
-                            </label>
+                <form onSubmit={this.onOk}>
+                    <div className="mx_Dialog_content">
+                        <div className="mx_CreateRoomDialog_label">
+                            <label htmlFor="textinput"> { _t('Room name (optional)') } </label>
                         </div>
-                    </details>
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.onCancel}>
-                        { _t('Cancel') }
-                    </button>
-                    <button className="mx_Dialog_primary" onClick={this.onOk}>
-                        { _t('Create Room') }
-                    </button>
-                </div>
+                        <div>
+                            <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" />
+                        </div>
+                        <br />
+
+                        <details className="mx_CreateRoomDialog_details">
+                            <summary className="mx_CreateRoomDialog_details_summary">{ _t('Advanced options') }</summary>
+                            <div>
+                                <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.defaultNoFederate} />
+                                <label htmlFor="checkbox">
+                                    { _t('Block users on other matrix homeservers from joining this room') }
+                                    <br />
+                                    ({ _t('This setting cannot be changed later!') })
+                                </label>
+                            </div>
+                        </details>
+                    </div>
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={this.onCancel}>
+                            { _t('Cancel') }
+                        </button>
+                        <input type="submit" className="mx_Dialog_primary" value={ _t('Create Room') }/>
+                    </div>
+                </form>
             </BaseDialog>
         );
     },
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 92051a0df7..41733470a1 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -64,7 +64,6 @@ export default React.createClass({
         });
         return (
             <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished}
-                onEnterPressed={this.onOk}
                 title={this.props.title}
                 contentId='mx_Dialog_content'
             >
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 5ea4191e5e..907848b3b8 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -60,25 +60,24 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog className="mx_TextInputDialog" onFinished={this.props.onFinished}
-                onEnterPressed={this.onOk}
                 title={this.props.title}
             >
-                <div className="mx_Dialog_content">
-                    <div className="mx_TextInputDialog_label">
-                        <label htmlFor="textinput"> { this.props.description } </label>
+                <form onSubmit={this.onOk}>
+                    <div className="mx_Dialog_content">
+                        <div className="mx_TextInputDialog_label">
+                            <label htmlFor="textinput"> { this.props.description } </label>
+                        </div>
+                        <div>
+                            <input id="textinput" ref="textinput" className="mx_TextInputDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" />
+                        </div>
                     </div>
-                    <div>
-                        <input id="textinput" ref="textinput" className="mx_TextInputDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" />
+                    <div className="mx_Dialog_buttons">
+                        <button onClick={this.onCancel}>
+                            { _t("Cancel") }
+                        </button>
+                        <input type="submit" className="mx_Dialog_primary" value={ this.props.button }/>
                     </div>
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.onCancel}>
-                        { _t("Cancel") }
-                    </button>
-                    <button className="mx_Dialog_primary" onClick={this.onOk}>
-                        { this.props.button }
-                    </button>
-                </div>
+                </form>
             </BaseDialog>
         );
     },

From c0d9f819283678867777d09c5c35dd93b50c3700 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 3 Dec 2017 14:15:06 +0000
Subject: [PATCH 084/927] Translated using Weblate (Czech)

Currently translated at 100.0% (941 of 941 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 8380afbc83..860b50b8d9 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -109,7 +109,7 @@
     "%(senderName)s changed their profile picture.": "%(senderName)s změnil/a svůj profilový obrázek.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s změnil/a název místnosti na %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s odstranil/a název místnosti.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil/a téma na \"%(topic)s\".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s změnil/a téma na „%(topic)s“.",
     "Changes to who can read history will only apply to future messages in this room": "Změny viditelnosti historie budou platné až pro budoucí zprávy v této místnosti",
     "Changes your display nickname": "Změní vaši zobrazovanou přezdívku",
     "Changes colour scheme of current room": "Změní barevné schéma aktuální místnosti",
@@ -483,7 +483,7 @@
     "Unpin Message": "Odepnout zprávu",
     "Ignored user": "Ignorovaný uživatel",
     "Unignored user": "Odignorovaný uživatel",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVÁNÍ: OVĚŘENÍ KLÍČE SELHALO! Podepisovací klíč uživatele %(userId)s a zařízení %(deviceId)s je \"%(fprint)s\", což nesouhlasí s dodaným klíčem \"%(fingerprint)s\". Toto může znamenat, že vaše komunikace je odposlouchávána!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROVÁNÍ: OVĚŘENÍ KLÍČE SELHALO! Podepisovací klíč uživatele %(userId)s a zařízení %(deviceId)s je „%(fprint)s“, což nesouhlasí s dodaným klíčem „%(fingerprint)s“. Toto může znamenat, že vaše komunikace je odposlouchávána!",
     "Reason": "Důvod",
     "VoIP conference started.": "VoIP konference započata.",
     "VoIP conference finished.": "VoIP konference ukončena.",
@@ -875,7 +875,7 @@
     "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s %(count)s krát vstoupil",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Neověřená zařízení jsou v této chvíli na černé listině; pokud chcete zasílat zprávy na tato zařízení, musíte je nejdříve ověřit.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Doporučujeme vám projít procesem ověřování pro všechna zařízení, abyste si potvrdili, že patří jejich pravým vlastníkům, ale pokud si to přejete, můžete zprávu znovu odeslat bez ověřování.",
-    "\"%(RoomName)s\" contains devices that you haven't seen before.": "V místnosti \"%(RoomName)s\" jsou zařízení s kterými jste dosud nikdy nekomunikovali.",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "V místnosti „%(RoomName)s“ jsou zařízení s kterými jste dosud nikdy nekomunikovali.",
     "Unknown devices": "Neznámá zařízení",
     "Private Chat": "Soukromý chat",
     "Public Chat": "Veřejný chat",

From e56584e39a8f53cf9f8188fbe119a31b4bc44956 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 3 Dec 2017 13:59:37 +0000
Subject: [PATCH 085/927] Translated using Weblate (Esperanto)

Currently translated at 19.0% (179 of 941 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 4176d41ba0..96a15c5a2d 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -57,5 +57,125 @@
     "Add rooms to the community": "Aldoni ĉambrojn al la komunumo",
     "Room name or alias": "Nomo aŭ kromnomo de ĉambro",
     "Add to community": "Aldoni al komunumo",
-    "Failed to invite the following users to %(groupId)s:": "Malsukcesis inviti jenajn uzantojn al %(groupId)s:"
+    "Failed to invite the following users to %(groupId)s:": "Malsukcesis inviti jenajn uzantojn al %(groupId)s:",
+    "Failed to invite users to community": "Malsukcesis inviti novajn uzantojn al komunumo",
+    "Failed to invite users to %(groupId)s": "Malsukcesis inviti uzantojn al %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Malsukcesis aldoni jenajn ĉambrojn al %(groupId)s:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot ne havas permeson sciigi vin – bonvolu kontroli la agordojn de via foliumilo",
+    "Riot was not given permission to send notifications - please try again": "Riot ne ricevis permeson sendi sciigojn – bonvolu reprovi",
+    "Unable to enable Notifications": "Sciigoj ne sendeblas",
+    "This email address was not found": "Tiu ĉi retpoŝtadreso ne troviĝis",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Via retpoŝtareso ŝajne ne ligiĝas al Matrix-identigaĵo sur tiu ĉi hejmservilo.",
+    "Default": "Norma",
+    "Restricted": "Limigita",
+    "Moderator": "Ĉambrestro",
+    "Admin": "Administranto",
+    "Start a chat": "Komenci babilon",
+    "Who would you like to communicate with?": "Kun kiu vi volas komuniki?",
+    "Email, name or matrix ID": "Retpoŝtadreso, nomo, aŭ Matrix-identigaĵo",
+    "Start Chat": "Komenci babilon",
+    "Invite new room members": "Inviti novajn ĉambranojn",
+    "Who would you like to add to this room?": "Kiun vi ŝatus aldoni al tiu ĉi ĉambro?",
+    "Send Invites": "Sendi invitojn",
+    "Failed to invite user": "Malsukcesis inviti uzanton",
+    "Operation failed": "Ago malsukcesis",
+    "Failed to invite": "Invito malsukcesis",
+    "Failed to invite the following users to the %(roomName)s room:": "Malsukcesis inviti la jenajn uzantojn al la ĉambro %(roomName)s:",
+    "You need to be logged in.": "Vi devas saluti.",
+    "You need to be able to invite users to do that.": "Vi bezonas permeson inviti uzantojn por tio.",
+    "Unable to create widget.": "Fenestraĵo ne kreeblas.",
+    "Failed to send request.": "Malsukcesis sendi peton.",
+    "This room is not recognised.": "Ĉi tiu ĉambro ne estas rekonita.",
+    "Power level must be positive integer.": "Nivelo de potenco devas esti entjero pozitiva.",
+    "You are not in this room.": "Vi ne estas en tiu ĉi ĉambro.",
+    "You do not have permission to do that in this room.": "Vi ne havas permeson fari tion en tiu ĉi ĉambro.",
+    "Missing room_id in request": "En peto mankas «room_id»",
+    "Must be viewing a room": "Necesas vidi ĉambron",
+    "Room %(roomId)s not visible": "Ĉambro %(roomId)s ne videblas",
+    "Missing user_id in request": "En peto mankas «user_id»",
+    "Failed to lookup current room": "Malsukcesis trovi nunan ĉambron",
+    "Usage": "Uzo",
+    "/ddg is not a command": "/ddg ne estas komando",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Por uzi ĝin, atendu aperon de sugestaj rezultoj, kaj tabu tra ili.",
+    "Unrecognised room alias:": "Nerekonita ĉambra alinomo:",
+    "Ignored user": "Malatentata uzanto",
+    "You are now ignoring %(userId)s": "Vi nun malatentas uzanton %(userId)s",
+    "Unignored user": "Reatentata uzanto",
+    "You are no longer ignoring %(userId)s": "Vi nun reatentas uzanton %(userId)s",
+    "Unknown (user, device) pair:": "Nekonata duopo (uzanto, aparato):",
+    "Device already verified!": "Aparato jam kontroliĝis!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "AVERTO: Aparato jam kontroliĝis, sed la ŝlosiloj NE KONGRUAS!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVERTO: KONTROLO DE ŜLOSILO MALSUKCESIS! Subskriba ŝlosilo por %(userId)s kaj aparato%(deviceId)s estas «%(fprint)s», kiu ne kongruas kun la donita ŝlosilo «%(fingerprint)s». Eble do via komuniko estas subaŭskultata!",
+    "Verified key": "Kontrolita ŝlosilo",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La donita subskriba ŝlosilo kongruas kun la ŝlosilo ricevita de %(userId)s por ĝia aparato %(deviceId)s. Aparato markita kiel kontrolita.",
+    "Unrecognised command:": "Nerekonita komando:",
+    "Reason": "Kialo",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s akceptis la inviton por %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s akceptis inviton.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s petis rettelefonan vokon.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s invitis uzanton %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s forbaris uzanton %(targetName)s.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ŝanĝis sian vidigan nomon de %(oldDisplayName)s al %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s agordis sian vidigan nomon al %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s forigis sian vidigan nomon (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s forigis sian profilbildon.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ŝanĝis sian profilbildon.",
+    "%(senderName)s set a profile picture.": "%(senderName)s agordis profilbildon.",
+    "VoIP conference started.": "Rettelefona voko komenciĝis.",
+    "%(targetName)s joined the room.": "%(targetName)s venis en la ĉambron.",
+    "VoIP conference finished.": "Rettelefona voko finiĝis.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rifuzis la inviton.",
+    "%(targetName)s left the room.": "%(targetName)s forlasis la ĉambron.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s malbaris uzanton %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s forpelis uzanton %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s nuligis inviton por %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ŝanĝis la temon al «%(topic)s».",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s forigis nomon de la ĉambro.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro al %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendis bildon.",
+    "Someone": "Iu",
+    "(not supported by this browser)": "(nesubtenata de tiu ĉi foliumilo)",
+    "%(senderName)s answered the call.": "%(senderName)s akceptis la vokon.",
+    "(could not connect media)": "(aŭdvidaĵoj ne kunigeblis)",
+    "(no answer)": "(sen respondo)",
+    "(unknown failure: %(reason)s)": "(nekonata eraro: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s finis la vokon.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s faris vokon de speco: %(callType)s.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s sendis ĉambran inviton al %(targetDisplayName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de invito.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj, de la tempo de aliĝo.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj ĉambranoj.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s videbligis estontan historion de la ĉambro al ĉiuj.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s videbligis estontan historion de la ĉambro al nekonatoj (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ŝaltis ĝiscelan ĉifradon (algoritmo: %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s al %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ŝanĝis la potencan nivelon de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ŝanĝis la fiksitajn mesaĝojn de la ĉambro.",
+    "%(widgetName)s widget modified by %(senderName)s": "Fenestraĵon %(widgetName)s ŝanĝis %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Fenestraĵon %(widgetName)s aldonis %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Fenestraĵon %(widgetName)s forigis %(senderName)s",
+    "%(displayName)s is typing": "%(displayName)s tajpas",
+    "%(names)s and %(count)s others are typing|other": "%(names)s kaj %(count)s aliaj tajpas",
+    "%(names)s and %(count)s others are typing|one": "%(names)s kaj unu alia tajpas",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s kaj %(lastPerson)s tajpas",
+    "Failure to create room": "Malsukcesis krei ĉambron",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Servilo povas esti neatingebla, troŝarĝita, aŭ vi renkontis cimon.",
+    "Unnamed Room": "Sennoma ĉambro",
+    "Your browser does not support the required cryptography extensions": "Via foliumilo ne subtenas la bezonatajn ĉifrajn kromprogramojn",
+    "Not a valid Riot keyfile": "Nevalida ŝlosila dosiero de Riot",
+    "Authentication check failed: incorrect password?": "Aŭtentiga kontrolo malsukcesis: ĉu pro malĝusta pasvorto?",
+    "Failed to join room": "Malsukcesis aliĝi al ĉambro",
+    "Message Pinning": "Fikso de mesaĝoj",
+    "Presence Management": "Ĉeesta administrado",
+    "Tag Panel": "Etikeda panelo",
+    "Disable Emoji suggestions while typing": "Malŝalti mienetajn sugestojn dum tajpado",
+    "Use compact timeline layout": "Uzi densan okazordan aranĝon",
+    "Hide removed messages": "Kaŝi forigitajn mesaĝojn",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Kaŝi envenajn/forlasajn mesaĝojn (sed ne invitajn/forpelajn/forbarajn)",
+    "Hide avatar changes": "Kaŝi profilbildajn ŝanĝojn",
+    "Hide display name changes": "Kaŝi ŝanĝojn de vidigaj nomoj",
+    "Hide read receipts": "Kaŝi legokonfrimojn",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Montri tempindikojn en 12-hora formo (ekz. 2:30 post.)",
+    "Always show message timestamps": "Ĉiam montri mesaĝajn tempindikojn",
+    "Autoplay GIFs and videos": "Aŭtomate ludi GIF-bildojn kaj videojn"
 }

From 648174476c42d4ef02a45ba160660b99cea2d0bb Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 1 Dec 2017 19:45:17 +0000
Subject: [PATCH 086/927] Translated using Weblate (Russian)

Currently translated at 99.3% (935 of 941 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index d7763aa86d..3fedcd37ff 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1025,5 +1025,10 @@
     "Idle for %(duration)s": "Неактивен %(duration)s",
     "Unknown for %(duration)s": "Неизвестно %(duration)s",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Здесь никого нет! Хотите <inviteText>пригласить кого-нибудь</inviteText> или <nowarnText>выключить предупреждение о пустой комнате</nowarnText>?",
-    "Something went wrong when trying to get your communities.": "Что-то пошло не так, во время отображения ваших сообществ."
+    "Something went wrong when trying to get your communities.": "Что-то пошло не так, во время отображения ваших сообществ.",
+    "Tag Panel": "Панель тегов",
+    "Delete %(count)s devices|other": "Удалить %(count)s устройств",
+    "Delete %(count)s devices|one": "Удалить устройство",
+    "Select devices": "Выбрать устройства",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Этот домашний сервер не поддерживает метод входа, поддерживаемый клиентом."
 }

From 4f83f6cf25480776c04329a0463d8f6fe82f48ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 5 Dec 2017 08:50:40 +0100
Subject: [PATCH 087/927] Move keyboard focus management back to the BaseDialog
 rather than leaving it in the Modal manager. We are using Modal manager to
 load other components not just BaseDialog and its subclasses and they might
 require different keyboard handling. Also depend on focus-trap-react rather
 than react-focus-trap for locking keyboard focus inside the dialog. The
 experience is much nicer and even the FocusTrap element it-self no longer
 gains the focus. On a side note using the FocusTrap element outside the
 dialog (on its parent) stops it from working properly.

---
 package.json                               |  2 +-
 src/Modal.js                               |  6 ++----
 src/components/views/dialogs/BaseDialog.js | 13 +++++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 46517230a7..ee089daf29 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "file-saver": "^1.3.3",
     "filesize": "3.5.6",
     "flux": "2.1.1",
+    "focus-trap-react": "^3.0.5",
     "fuse.js": "^2.2.0",
     "glob": "^5.0.14",
     "highlight.js": "^8.9.1",
@@ -78,7 +79,6 @@
     "react": "^15.4.0",
     "react-addons-css-transition-group": "15.3.2",
     "react-dom": "^15.4.0",
-    "react-focus-trap": "^2.5.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
diff --git a/src/Modal.js b/src/Modal.js
index daf66a37de..68d75d1ff1 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -19,7 +19,6 @@ limitations under the License.
 
 const React = require('react');
 const ReactDOM = require('react-dom');
-import FocusTrap from 'react-focus-trap';
 import Analytics from './Analytics';
 import sdk from './index';
 
@@ -165,7 +164,6 @@ class ModalManager {
         );
         modal.onFinished = props ? props.onFinished : null;
         modal.className = className;
-        modal.closeDialog = closeDialog;
 
         this._modals.unshift(modal);
 
@@ -196,9 +194,9 @@ class ModalManager {
         const modal = this._modals[0];
         const dialog = (
             <div className={"mx_Dialog_wrapper " + (modal.className ? modal.className : '')}>
-                <FocusTrap className="mx_Dialog" onExit={modal.closeDialog}>
+                <div className="mx_Dialog">
                     { modal.elem }
-                </FocusTrap>
+                </div>
                 <div className="mx_Dialog_background" onClick={this.closeAll}></div>
             </div>
         );
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 1f29f2d1f4..25909a18fa 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import FocusTrap from 'focus-trap-react';
 
 import * as KeyCode from '../../../KeyCode';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -61,6 +62,14 @@ export default React.createClass({
         }
     },
 
+    _onKeyDown: function(e) {
+        if (e.keyCode === KeyCode.ESCAPE) {
+            e.stopPropagation();
+            e.preventDefault();
+            this.props.onFinished();
+        }
+    },
+
     _onCancelClick: function(e) {
         this.props.onFinished();
     },
@@ -69,7 +78,7 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <div className={this.props.className} role="dialog" aria-labelledby='mx_BaseDialog_title' aria-describedby={this.props.contentId}>
+            <FocusTrap onKeyDown={this._onKeyDown} className={this.props.className} role="dialog" aria-labelledby='mx_BaseDialog_title' aria-describedby={this.props.contentId}>
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >
@@ -79,7 +88,7 @@ export default React.createClass({
                     { this.props.title }
                 </div>
                 { this.props.children }
-            </div>
+            </FocusTrap>
         );
     },
 });

From 35c7f6e13d02e5bb5ee89e0495da894b7792ace0 Mon Sep 17 00:00:00 2001
From: jfkimmes <jfkimmes@mailbox.org>
Date: Mon, 4 Dec 2017 14:58:30 +0000
Subject: [PATCH 088/927] Translated using Weblate (German)

Currently translated at 99.1% (933 of 941 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index c65e512928..27f10c0ad8 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1028,5 +1028,6 @@
     "Unknown for %(duration)s": "Unbekannt seit %(duration)s",
     "Flair": "Abzeichen",
     "Showing flair for these communities:": "Abzeichen für diese Communities zeigen:",
-    "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an"
+    "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an",
+    "Delete %(count)s devices|other": "Lösche %(count)s Geräte"
 }

From a31af39ca8af8da06462d6d2cc3dd8d20093ca64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 5 Dec 2017 13:52:20 +0100
Subject: [PATCH 089/927] Applied aria-describedby to all other dialogs that
 are using BaseDialog. Also added initial focus where it has not been set.

---
 .../views/dialogs/ChatCreateOrReuseDialog.js  | 11 +++++-----
 src/components/views/dialogs/ErrorDialog.js   | 14 +++++--------
 .../views/dialogs/InteractiveAuthDialog.js    |  8 +++++---
 .../views/dialogs/KeyShareDialog.js           |  7 ++++---
 .../dialogs/SessionRestoreErrorDialog.js      | 16 +++++++++++----
 .../views/dialogs/SetEmailDialog.js           |  5 ++++-
 src/components/views/dialogs/SetMxIdDialog.js |  7 ++++---
 .../views/dialogs/UnknownDeviceDialog.js      |  5 +++--
 .../login/InteractiveAuthEntryComponents.js   | 20 +++++++++++++------
 9 files changed, 57 insertions(+), 36 deletions(-)

diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index e0578f3b53..0623177e1a 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -127,7 +127,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                 </div>
                 <div className={labelClasses}><i>{ _t("Start new chat") }</i></div>
             </AccessibleButton>;
-            content = <div className="mx_Dialog_content">
+            content = <div className="mx_Dialog_content" id='mx_Dialog_content'>
                 { _t('You already have existing direct chats with this user:') }
                 <div className="mx_ChatCreateOrReuseDialog_tiles">
                     { this.state.tiles }
@@ -144,7 +144,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
             if (this.state.busyProfile) {
                 profile = <Spinner />;
             } else if (this.state.profileError) {
-                profile = <div className="error">
+                profile = <div className="error" role="alert">
                     Unable to load profile information for { this.props.userId }
                 </div>;
             } else {
@@ -160,14 +160,14 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                 </div>;
             }
             content = <div>
-                <div className="mx_Dialog_content">
+                <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     <p>
                         { _t('Click on the button below to start chatting!') }
                     </p>
                     { profile }
                 </div>
                 <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this.props.onNewDMClick}>
+                    <button className="mx_Dialog_primary" onClick={this.props.onNewDMClick} autoFocus="true">
                         { _t('Start Chatting') }
                     </button>
                 </div>
@@ -179,6 +179,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
             <BaseDialog className='mx_ChatCreateOrReuseDialog'
                 onFinished={this.props.onFinished.bind(false)}
                 title={title}
+                contentId='mx_Dialog_content'
             >
                 { content }
             </BaseDialog>
@@ -186,7 +187,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
     }
 }
 
-ChatCreateOrReuseDialog.propTyps = {
+ChatCreateOrReuseDialog.propTypes = {
     userId: React.PropTypes.string.isRequired,
     // Called when clicking outside of the dialog
     onFinished: React.PropTypes.func.isRequired,
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index 97ed47e10f..0910264cef 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -51,22 +51,18 @@ export default React.createClass({
         };
     },
 
-    componentDidMount: function() {
-        if (this.props.focus) {
-            this.refs.button.focus();
-        }
-    },
-
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         return (
             <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
-                    title={this.props.title || _t('Error')}>
-                <div className="mx_Dialog_content">
+                    title={this.props.title || _t('Error')}
+                    contentId='mx_Dialog_content'
+            >
+                <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     { 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}>
+                    <button className="mx_Dialog_primary" onClick={this.props.onFinished} autoFocus={this.props.focus}>
                         { this.props.button || _t('OK') }
                     </button>
                 </div>
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index 59de7c7f59..d1273849ae 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -72,11 +72,12 @@ export default React.createClass({
         let content;
         if (this.state.authError) {
             content = (
-                <div>
-                    <div>{ this.state.authError.message || this.state.authError.toString() }</div>
+                <div id='mx_Dialog_content'>
+                    <div role={(this.state.authError.message || this.state.authError.toString()) ? "alert" : ""}>{ this.state.authError.message || this.state.authError.toString() }</div>
                     <br />
                     <AccessibleButton onClick={this._onDismissClick}
                         className="mx_UserSettings_button"
+                        autoFocus="true"
                     >
                         { _t("Dismiss") }
                     </AccessibleButton>
@@ -84,7 +85,7 @@ export default React.createClass({
             );
         } else {
             content = (
-                <div>
+                <div id='mx_Dialog_content'>
                     <InteractiveAuth ref={this._collectInteractiveAuth}
                         matrixClient={this.props.matrixClient}
                         authData={this.props.authData}
@@ -99,6 +100,7 @@ export default React.createClass({
             <BaseDialog className="mx_InteractiveAuthDialog"
                 onFinished={this.props.onFinished}
                 title={this.state.authError ? 'Error' : (this.props.title || _t('Authentication'))}
+                contentId='mx_Dialog_content'
             >
                 { content }
             </BaseDialog>
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
index 9c8be27c89..821939ff0d 100644
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -125,11 +125,11 @@ export default React.createClass({
         text = _t(text, {displayName: displayName});
 
         return (
-            <div>
+            <div id='mx_Dialog_content'>
                 <p>{ text }</p>
 
                 <div className="mx_Dialog_buttons">
-                    <button onClick={this._onVerifyClicked}>
+                    <button onClick={this._onVerifyClicked} autoFocus="true">
                         { _t('Start verification') }
                     </button>
                     <button onClick={this._onShareClicked}>
@@ -153,7 +153,7 @@ export default React.createClass({
             content = this._renderContent();
         } else {
             content = (
-                <div>
+                <div id='mx_Dialog_content'>
                     <p>{ _t('Loading device info...') }</p>
                     <Spinner />
                 </div>
@@ -164,6 +164,7 @@ export default React.createClass({
             <BaseDialog className='mx_KeyShareRequestDialog'
                 onFinished={this.props.onFinished}
                 title={_t('Encryption key request')}
+                contentId='mx_Dialog_content'
             >
                 { content }
             </BaseDialog>
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index 75ae0eda17..e68a097e80 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -29,6 +29,12 @@ export default React.createClass({
         onFinished: React.PropTypes.func.isRequired,
     },
 
+    componentDidMount: function() {
+        if (this.refs.bugreportLink) {
+            this.refs.bugreportLink.focus();
+        }
+    },
+
     _sendBugReport: function() {
         const BugReportDialog = sdk.getComponent("dialogs.BugReportDialog");
         Modal.createTrackedDialog('Session Restore Error', 'Send Bug Report Dialog', BugReportDialog, {});
@@ -48,7 +54,7 @@ export default React.createClass({
                 { _t(
                     "Otherwise, <a>click here</a> to send a bug report.",
                     {},
-                    { 'a': (sub) => <a onClick={this._sendBugReport} key="bugreport" href='#'>{ sub }</a> },
+                    { 'a': (sub) => <a ref="bugreportLink" onClick={this._sendBugReport} key="bugreport" href='#'>{ sub }</a> },
                 ) }
                 </p>
             );
@@ -56,8 +62,10 @@ export default React.createClass({
 
         return (
             <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
-                    title={_t('Unable to restore session')}>
-                <div className="mx_Dialog_content">
+                    title={_t('Unable to restore session')}
+                contentId='mx_Dialog_content'
+            >
+                <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     <p>{ _t("We encountered an error trying to restore your previous session. If " +
                     "you continue, you will need to log in again, and encrypted chat " +
                     "history will be unreadable.") }</p>
@@ -68,7 +76,7 @@ export default React.createClass({
 
                     { bugreport }
                 </div>
-                <div className="mx_Dialog_buttons">
+                <div className="mx_Dialog_buttons" autoFocus={SdkConfig.get().bug_report_endpoint_url ? false : true}>
                     <button className="mx_Dialog_primary" onClick={this._continueClicked}>
                         { _t("Continue anyway") }
                     </button>
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index 2dd996953d..5a9569c1b5 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -41,6 +41,7 @@ export default React.createClass({
     },
 
     componentDidMount: function() {
+        this.refs.emailInputField.focus();
     },
 
     onEmailAddressChanged: function(value) {
@@ -130,6 +131,7 @@ export default React.createClass({
 
         const emailInput = this.state.emailBusy ? <Spinner /> : <EditableText
             className="mx_SetEmailDialog_email_input"
+            ref="emailInputField"
             placeholder={_t("Email address")}
             placeholderClassName="mx_SetEmailDialog_email_input_placeholder"
             blurToCancel={false}
@@ -139,9 +141,10 @@ export default React.createClass({
             <BaseDialog className="mx_SetEmailDialog"
                 onFinished={this.onCancelled}
                 title={this.props.title}
+                contentId='mx_Dialog_content'
             >
                 <div className="mx_Dialog_content">
-                    <p>
+                    <p id='mx_Dialog_content'>
                         { _t('This will allow you to reset your password and receive notifications.') }
                     </p>
                     { emailInput }
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index 6fc1d77682..5ef04f5be1 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -234,14 +234,14 @@ export default React.createClass({
                 "error": Boolean(this.state.usernameError),
                 "success": usernameAvailable,
             });
-            usernameIndicator = <div className={usernameIndicatorClasses}>
+            usernameIndicator = <div className={usernameIndicatorClasses} role="alert">
                 { usernameAvailable ? _t('Username available') : this.state.usernameError }
             </div>;
         }
 
         let authErrorIndicator = null;
         if (this.state.authError) {
-            authErrorIndicator = <div className="error">
+            authErrorIndicator = <div className="error" role="alert">
                 { this.state.authError }
             </div>;
         }
@@ -253,8 +253,9 @@ export default React.createClass({
             <BaseDialog className="mx_SetMxIdDialog"
                 onFinished={this.props.onFinished}
                 title={_t('To get started, please pick a username!')}
+                contentId='mx_Dialog_content'
             >
-                <div className="mx_Dialog_content">
+                <div className="mx_Dialog_content" id='mx_Dialog_content'>
                     <div className="mx_SetMxIdDialog_input_group">
                         <input type="text" ref="input_value" value={this.state.username}
                             autoFocus={true}
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 34cf544bb7..245dbff361 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -143,8 +143,9 @@ export default React.createClass({
                             this.props.onFinished();
                 }}
                 title={_t('Room contains unknown devices')}
+                contentId='mx_Dialog_content'
             >
-                <GeminiScrollbar autoshow={false} className="mx_Dialog_content">
+                <GeminiScrollbar autoshow={false} className="mx_Dialog_content" id='mx_Dialog_content'>
                     <h4>
                         { _t('"%(RoomName)s" contains devices that you haven\'t seen before.', {RoomName: this.props.room.name}) }
                     </h4>
@@ -161,7 +162,7 @@ export default React.createClass({
                             }}>
                         { _t("Send anyway") }
                     </button>
-                    <button className="mx_Dialog_primary" autoFocus={true}
+                    <button className="mx_Dialog_primary"
                             onClick={() => {
                                 // XXX: temporary logging to try to diagnose
                                 // https://github.com/vector-im/riot-web/issues/3148
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index d0b6c8decb..81b84684fc 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -130,9 +130,10 @@ export const PasswordAuthEntry = React.createClass({
         return (
             <div>
                 <p>{ _t("To continue, please enter your password.") }</p>
-                <p>{ _t("Password:") }</p>
                 <form onSubmit={this._onSubmit}>
+                    <label htmlFor="passwordField">{ _t("Password:") }</label>
                     <input
+                        name="passwordField"
                         ref="passwordField"
                         className={passwordBoxClass}
                         onChange={this._onPasswordFieldChange}
@@ -142,7 +143,7 @@ export const PasswordAuthEntry = React.createClass({
                         { submitButtonOrSpinner }
                     </div>
                 </form>
-                <div className="error">
+                <div className="error" role={ this.props.errorText ? "alert" : ""}>
                     { this.props.errorText }
                 </div>
             </div>
@@ -184,7 +185,7 @@ export const RecaptchaAuthEntry = React.createClass({
                 <CaptchaForm sitePublicKey={sitePublicKey}
                     onCaptchaResponse={this._onCaptchaResponse}
                 />
-                <div className="error">
+                <div className="error" role={ this.props.errorText ? "alert" : ""}>
                     { this.props.errorText }
                 </div>
             </div>
@@ -384,6 +385,7 @@ export const MsisdnAuthEntry = React.createClass({
                                 className="mx_InteractiveAuthEntryComponents_msisdnEntry"
                                 value={this.state.token}
                                 onChange={this._onTokenChange}
+                                aria-label={ _t("Code")}
                             />
                             <br />
                             <input type="submit" value={_t("Submit")}
@@ -391,7 +393,7 @@ export const MsisdnAuthEntry = React.createClass({
                                 disabled={!enableSubmit}
                             />
                         </form>
-                        <div className="error">
+                        <div className="error" role={this.state.errorText ? "alert" : ""}>
                             { this.state.errorText }
                         </div>
                     </div>
@@ -426,6 +428,12 @@ export const FallbackAuthEntry = React.createClass({
         }
     },
 
+    focus: function() {
+        if (this.refs.fallbackButton) {
+            this.refs.fallbackButton.focus();
+        }
+    },
+
     _onShowFallbackClick: function() {
         const url = this.props.matrixClient.getFallbackAuthUrl(
             this.props.loginType,
@@ -446,8 +454,8 @@ export const FallbackAuthEntry = React.createClass({
     render: function() {
         return (
             <div>
-                <a onClick={this._onShowFallbackClick}>{ _t("Start authentication") }</a>
-                <div className="error">
+                <a ref="fallbackButton" onClick={this._onShowFallbackClick}>{ _t("Start authentication") }</a>
+                <div className="error" role={ this.props.errorText ? "alert" : ""}>
                     { this.props.errorText }
                 </div>
             </div>

From eda453bbe5aac4e16896df473ee9faad045352d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 5 Dec 2017 23:23:40 +0100
Subject: [PATCH 090/927] Fixed an issue where pressing enter key to activate
 the AccessibleButton was also activating normal button that might just have
 received the system focus as a result of the key press and the other way
 round. The most obvious occurence of this issue is that dialogs were
 reappearing when dismissed by pressing the enter key.

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

diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.js
index 794e0a4dd7..59c4b99798 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.js
@@ -27,8 +27,12 @@ import React from 'react';
 export default function AccessibleButton(props) {
     const {element, onClick, children, ...restProps} = props;
     restProps.onClick = onClick;
-    restProps.onKeyUp = function(e) {
-        if (e.keyCode == 13 || e.keyCode == 32) return onClick(e);
+    restProps.onKeyDown = function(e) {
+        if (e.keyCode == 13 || e.keyCode == 32) {
+            e.stopPropagation();
+            e.preventDefault();
+            return onClick(e);
+        }
     };
     restProps.tabIndex = restProps.tabIndex || "0";
     restProps.role = "button";

From 60ada30680a643cdd19201f3f7991f292ca6c62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 5 Dec 2017 23:46:02 +0100
Subject: [PATCH 091/927] Forgot to turn div displaying error text into an
 aria-alert in the create group dialog.

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

diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 8e262a6e51..00b9e99021 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -108,7 +108,7 @@ export default React.createClass({
             // XXX: We should catch errcodes and give sensible i18ned messages for them,
             // rather than displaying what the server gives us, but synapse doesn't give
             // any yet.
-            createErrorNode = <div className="error">
+            createErrorNode = <div className="error" role="alert">
                 <div>{ _t('Something went wrong whilst creating your community') }</div>
                 <div>{ this.state.createError.message }</div>
             </div>;

From 9146fde308a86d06726f090442d0752b280abc7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 5 Dec 2017 23:48:42 +0100
Subject: [PATCH 092/927] Add a missing language string

---
 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 d632692e04..00d260c88d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -497,6 +497,7 @@
     "Token incorrect": "Token incorrect",
     "A text message has been sent to %(msisdn)s": "A text message has been sent to %(msisdn)s",
     "Please enter the code it contains:": "Please enter the code it contains:",
+    "Code": "Code",
     "Start authentication": "Start authentication",
     "powered by Matrix": "powered by Matrix",
     "Username on %(hs)s": "Username on %(hs)s",

From 3e1888b6d80439e479a2c36ca818b83f08888a11 Mon Sep 17 00:00:00 2001
From: vricci <valerio.ricci.jp@gmail.com>
Date: Tue, 5 Dec 2017 17:42:31 +0000
Subject: [PATCH 093/927] Translated using Weblate (Italian)

Currently translated at 8.6% (81 of 941 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 1bc002f5f4..3caa3119f1 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -47,5 +47,40 @@
     "Alias (optional)": "Alias (opzionale)",
     "Add a widget": "Aggiungi un widget",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Un messaggio di testo è stato inviato a +%(msisdn)s. Inserisci il codice di verifica che contiene",
-    "Edit": "Modifica"
+    "Edit": "Modifica",
+    "This email address is already in use": "Questo indirizzo e-mail è già in uso",
+    "This phone number is already in use": "Questo numero di telefono è già in uso",
+    "Failed to verify email address: make sure you clicked the link in the email": "Impossibile verificare l'indirizzo e-mail: accertati di aver cliccato il link nella e-mail",
+    "VoIP is unsupported": "VoIP non supportato",
+    "You cannot place VoIP calls in this browser.": "Non puoi effettuare chiamate VoIP con questo browser.",
+    "You cannot place a call with yourself.": "Non puoi chiamare te stesso.",
+    "Conference calls are not supported in this client": "Le chiamate di gruppo non sono supportate da questo client",
+    "Conference calls are not supported in encrypted rooms": "Le chiamate di gruppo non sono supportate nelle stanze con crittografia",
+    "Warning!": "Attenzione!",
+    "Sun": "Dom",
+    "Mon": "Lun",
+    "Tue": "Mar",
+    "Wed": "Mer",
+    "Thu": "Gio",
+    "Fri": "Ven",
+    "Sat": "Sab",
+    "Jan": "Gen",
+    "Feb": "Feb",
+    "Mar": "Mar",
+    "Apr": "Apr",
+    "May": "Mag",
+    "Jun": "Giu",
+    "Jul": "Lug",
+    "Aug": "Ago",
+    "Sep": "Set",
+    "Oct": "Ott",
+    "Nov": "Nov",
+    "Dec": "Dic",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(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",
+    "Register": "Registrati",
+    "Rooms": "Stanze"
 }

From 0941789b7f26b52413ae25cf5e54e091b0358d88 Mon Sep 17 00:00:00 2001
From: jfkimmes <jfkimmes@mailbox.org>
Date: Wed, 6 Dec 2017 22:02:10 +0000
Subject: [PATCH 094/927] Translated using Weblate (German)

Currently translated at 99.4% (936 of 941 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 27f10c0ad8..661c237193 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1029,5 +1029,8 @@
     "Flair": "Abzeichen",
     "Showing flair for these communities:": "Abzeichen für diese Communities zeigen:",
     "This room is not showing flair for any communities": "Dieser Raum zeigt für keine Communities die Abzeichen an",
-    "Delete %(count)s devices|other": "Lösche %(count)s Geräte"
+    "Delete %(count)s devices|other": "Lösche %(count)s Geräte",
+    "Delete %(count)s devices|one": "Lösche Gerät",
+    "Select devices": "Wähle Geräte",
+    "Flair will appear if enabled in room settings": "Abzeichen wird angezeigt, falls es die Raumeinstellungen zulassen"
 }

From 58f7647e8abd39e88690b98a43f348c92e96e459 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 6 Dec 2017 22:02:47 +0000
Subject: [PATCH 095/927] Translated using Weblate (German)

Currently translated at 99.4% (936 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 661c237193..54bf352f95 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1032,5 +1032,5 @@
     "Delete %(count)s devices|other": "Lösche %(count)s Geräte",
     "Delete %(count)s devices|one": "Lösche Gerät",
     "Select devices": "Wähle Geräte",
-    "Flair will appear if enabled in room settings": "Abzeichen wird angezeigt, falls es die Raumeinstellungen zulassen"
+    "Flair will appear if enabled in room settings": "Abzeichen wird angezeigt, falls es in den Raumeinstellungen aktiviert wurde"
 }

From 80de90edb79e34e969bb99dd78ba635b82b96ed3 Mon Sep 17 00:00:00 2001
From: jfkimmes <jfkimmes@mailbox.org>
Date: Wed, 6 Dec 2017 22:03:04 +0000
Subject: [PATCH 096/927] Translated using Weblate (German)

Currently translated at 99.6% (938 of 941 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 54bf352f95..460f2d6cde 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1032,5 +1032,7 @@
     "Delete %(count)s devices|other": "Lösche %(count)s Geräte",
     "Delete %(count)s devices|one": "Lösche Gerät",
     "Select devices": "Wähle Geräte",
-    "Flair will appear if enabled in room settings": "Abzeichen wird angezeigt, falls es in den Raumeinstellungen aktiviert wurde"
+    "Flair will appear if enabled in room settings": "Abzeichen wird angezeigt, falls es in den Raumeinstellungen aktiviert wurde",
+    "Flair will not appear": "Abzeichen wird nicht angezeigt",
+    "Something went wrong when trying to get your communities.": "Beim laden deiner Communites ist etwas schief gelaufen."
 }

From b22ec73b5dbe4a3d2771c6f4debffd0abbd0a377 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 6 Dec 2017 22:03:13 +0000
Subject: [PATCH 097/927] Translated using Weblate (German)

Currently translated at 99.6% (938 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 460f2d6cde..65a2484181 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1034,5 +1034,5 @@
     "Select devices": "Wähle Geräte",
     "Flair will appear if enabled in room settings": "Abzeichen wird angezeigt, falls es in den Raumeinstellungen aktiviert wurde",
     "Flair will not appear": "Abzeichen wird nicht angezeigt",
-    "Something went wrong when trying to get your communities.": "Beim laden deiner Communites ist etwas schief gelaufen."
+    "Something went wrong when trying to get your communities.": "Beim Laden deiner Communites ist etwas schief gelaufen."
 }

From 178cf2d3012110c1df19745bec190a230118eb52 Mon Sep 17 00:00:00 2001
From: jfkimmes <jfkimmes@mailbox.org>
Date: Wed, 6 Dec 2017 22:03:58 +0000
Subject: [PATCH 098/927] Translated using Weblate (German)

Currently translated at 99.8% (940 of 941 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 65a2484181..dbcdc4f0aa 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1034,5 +1034,7 @@
     "Select devices": "Wähle Geräte",
     "Flair will appear if enabled in room settings": "Abzeichen wird angezeigt, falls es in den Raumeinstellungen aktiviert wurde",
     "Flair will not appear": "Abzeichen wird nicht angezeigt",
-    "Something went wrong when trying to get your communities.": "Beim Laden deiner Communites ist etwas schief gelaufen."
+    "Something went wrong when trying to get your communities.": "Beim Laden deiner Communites ist etwas schief gelaufen.",
+    "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstützten Anmeldeverlauf."
 }

From 2c95055aaa47560b6c56f2b2044e0d2e48818e0a Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 6 Dec 2017 22:04:10 +0000
Subject: [PATCH 099/927] Translated using Weblate (German)

Currently translated at 99.8% (940 of 941 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 dbcdc4f0aa..0c529c7416 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1036,5 +1036,5 @@
     "Flair will not appear": "Abzeichen wird nicht angezeigt",
     "Something went wrong when trying to get your communities.": "Beim Laden deiner Communites ist etwas schief gelaufen.",
     "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstützten Anmeldeverlauf."
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstütztes Anmeldeverfahren."
 }

From 4171675221fbea38f3f1f2c53113ebcbda38b58b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 7 Dec 2017 09:44:00 +0100
Subject: [PATCH 100/927] Add some comments explaining how we are using
 aria-hidden property to hide content outside of the BaseDialog to screen
 reader users.

---
 src/components/views/dialogs/BaseDialog.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index face7ee0cb..c72f45c078 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -50,14 +50,19 @@ export default React.createClass({
     },
 
     componentDidMount: function() {
+        // Retrieve the root node of the Riot application outside the dialog
         this.applicationNode = document.getElementById('matrixchat');
         if (this.applicationNode) {
+            // Hide the content outside the dialog to screen reader users
+            // so they won't be able to navigate into it and act on it using
+            // screen reader specific features
             this.applicationNode.setAttribute('aria-hidden', 'true');
         }
     },
 
     componentWillUnmount: function() {
         if (this.applicationNode) {
+            // When dismissing the dialog, make all of Riot available to screen reader users again
             this.applicationNode.setAttribute('aria-hidden', 'false');
         }
     },

From 839f938c91cfe9106ab0b577f0692fed531c48bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 7 Dec 2017 10:20:27 +0100
Subject: [PATCH 101/927] Argh! Reworked AccessibleButton key handling again.
 It turned out by fixing behaviour when pressing the enter key breaks
 behaviour when pressing space to activate the buttons. So we are now handling
 enter onKeyDown and space onKeyUp. Also briefly explained the situation with
 comments.

---
 src/components/views/elements/AccessibleButton.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.js
index 59c4b99798..f5254de490 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.js
@@ -16,6 +16,8 @@
 
 import React from 'react';
 
+import { KeyCode } from '../../../Keyboard';
+
 /**
  * AccessibleButton is a generic wrapper for any element that should be treated
  * as a button.  Identifies the element as a button, setting proper tab
@@ -27,8 +29,18 @@ import React from 'react';
 export default function AccessibleButton(props) {
     const {element, onClick, children, ...restProps} = props;
     restProps.onClick = onClick;
+    // We need to consume enter onKeyDown and space onKeyUp
+    // otherwise we are risking also activating other keyboard focusable elements
+    // that might receive focus as a result of the AccessibleButtonClick action
     restProps.onKeyDown = function(e) {
-        if (e.keyCode == 13 || e.keyCode == 32) {
+        if (e.keyCode === KeyCode.ENTER) {
+            e.stopPropagation();
+            e.preventDefault();
+            return onClick(e);
+        }
+    };
+    restProps.onKeyUp = function(e) {
+        if (e.keyCode === KeyCode.SPACE) {
             e.stopPropagation();
             e.preventDefault();
             return onClick(e);

From 47c444f91db9c1943a963bbc5de7607bb4a732b9 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 7 Dec 2017 15:44:56 +0000
Subject: [PATCH 102/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (944 of 944 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 840f12381c..ee0207d398 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1037,5 +1037,8 @@
     "Something went wrong when trying to get your communities.": "Valami nem sikerült a közösségeid elérésénél.",
     "Display your community flair in rooms configured to show it.": "Közösségi jelvényeid megjelenítése azokban a szobákban ahol ez engedélyezett.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Ez a saját szerver egyetlen bejelentkezési metódust sem támogat amit ez a kliens ismer.",
-    "Tag Panel": "Címke panel"
+    "Tag Panel": "Címke panel",
+    "Addresses": "Címek",
+    "collapse": "becsuk",
+    "expand": "kinyit"
 }

From ae61b66f10b69d44b1cf9a260484e15a34749f1b Mon Sep 17 00:00:00 2001
From: giapelle <giapelle@gmail.com>
Date: Thu, 7 Dec 2017 15:39:47 +0000
Subject: [PATCH 103/927] Translated using Weblate (Italian)

Currently translated at 8.7% (83 of 944 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 3caa3119f1..a81bcfb666 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -82,5 +82,7 @@
     "%(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",
     "Register": "Registrati",
-    "Rooms": "Stanze"
+    "Rooms": "Stanze",
+    "The remote side failed to pick up": "Il destinatario non ha risposto",
+    "Unable to capture screen": "Impossibile acquisire lo schermo"
 }

From 2b74dcc6b7b1511611ba665233722fc40d9e10ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 7 Dec 2017 21:17:02 +0000
Subject: [PATCH 104/927] Translated using Weblate (French)

Currently translated at 100.0% (944 of 944 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index fe248746bf..1b1834e649 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1033,5 +1033,8 @@
     "Flair will appear if enabled in room settings": "Les talents apparaîtront s'ils sont activés dans les paramètres du salon",
     "Flair will not appear": "Les talents n'apparaîtront pas",
     "Display your community flair in rooms configured to show it.": "Afficher vos talents de communauté dans les salons configurés pour les afficher.",
-    "Tag Panel": "Panneau des étiquettes"
+    "Tag Panel": "Panneau des étiquettes",
+    "Addresses": "Adresses",
+    "expand": "développer",
+    "collapse": "réduire"
 }

From 321b1adb99e7f0f2e5361cc833111bdf0f17cea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Fri, 8 Dec 2017 07:47:08 +0100
Subject: [PATCH 105/927] Elliminate lint errors and warnings

---
 src/components/views/dialogs/BaseDialog.js                | 2 +-
 src/components/views/dialogs/CreateRoomDialog.js          | 2 +-
 src/components/views/dialogs/SessionRestoreErrorDialog.js | 3 ++-
 src/components/views/dialogs/TextInputDialog.js           | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index c72f45c078..fbeb35c808 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -46,7 +46,7 @@ export default React.createClass({
 
         // Id of content element
         // If provided, this is used to add a aria-describedby attribute
-        contentId: React.PropTypes.string
+        contentId: React.PropTypes.string,
     },
 
     componentDidMount: function() {
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index f5a5f87b72..cc04f4202b 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -71,7 +71,7 @@ export default React.createClass({
                         <button onClick={this.onCancel}>
                             { _t('Cancel') }
                         </button>
-                        <input type="submit" className="mx_Dialog_primary" value={ _t('Create Room') }/>
+                        <input type="submit" className="mx_Dialog_primary" value={_t('Create Room')} />
                     </div>
                 </form>
             </BaseDialog>
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index e68a097e80..f018a83301 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -54,7 +54,8 @@ export default React.createClass({
                 { _t(
                     "Otherwise, <a>click here</a> to send a bug report.",
                     {},
-                    { 'a': (sub) => <a ref="bugreportLink" onClick={this._sendBugReport} key="bugreport" href='#'>{ sub }</a> },
+                    { 'a': (sub) => <a ref="bugreportLink" onClick={this._sendBugReport}
+                    key="bugreport" href='#'>{ sub }</a> },
                 ) }
                 </p>
             );
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 907848b3b8..4d73752641 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -75,7 +75,7 @@ export default React.createClass({
                         <button onClick={this.onCancel}>
                             { _t("Cancel") }
                         </button>
-                        <input type="submit" className="mx_Dialog_primary" value={ this.props.button }/>
+                        <input type="submit" className="mx_Dialog_primary" value={this.props.button} />
                     </div>
                 </form>
             </BaseDialog>

From 509fbd4331ca4d41d3bb863d67f743efda057b2f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 8 Dec 2017 18:07:44 +0000
Subject: [PATCH 106/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index ee0207d398..f20370f40d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1040,5 +1040,19 @@
     "Tag Panel": "Címke panel",
     "Addresses": "Címek",
     "collapse": "becsuk",
-    "expand": "kinyit"
+    "expand": "kinyit",
+    "Call Failed": "Sikertelen hívás",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ismeretlen eszközök vannak ebben a szobában: ha ellenőrzés nélkül folytatod lehetséges, hogy valaki belehallgat a hívásba.",
+    "Review Devices": "Eszközök áttekintése",
+    "Call Anyway": "Mindenképpen hívj",
+    "Answer Anyway": "Mindenképpen felvesz",
+    "Call": "Hívás",
+    "Answer": "Felvesz",
+    "Send": "Elküld",
+    "Cryptography data migrated": "Titkosítási adatok migrálva",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "A titkosítási adatok egyszeri migrációja megtörtént. Ha egy régebbi Riot verzióra állsz vissza a végponttól-végpontig titkosítás nem fog működni. Ha régi verzióval szeretnéd használni a végponttól-végpontig titkosítást először jelentkezz ki a Riotból. A régi üzenetek későbbi eléréséhez először mentsd ki a kulcsokat majd töltsd be újra.",
+    "Old cryptography data detected": "Régi titkosítási adatot találhatók",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Régebbi Riot verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Eszközök megmutatása</showDevicesText> vagy <cancelText>mind elutasítása</cancelText>.",
+    "Warning": "Figyelmeztetés"
 }

From f9d4af155b252267d7cf2cf12b0da5ecfe03ad44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Sat, 9 Dec 2017 18:06:52 +0000
Subject: [PATCH 107/927] Translated using Weblate (French)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 1b1834e649..9883e0eb21 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1036,5 +1036,19 @@
     "Tag Panel": "Panneau des étiquettes",
     "Addresses": "Adresses",
     "expand": "développer",
-    "collapse": "réduire"
+    "collapse": "réduire",
+    "Call Failed": "Échec de l'appel",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Il y a des appareils inconnus dans ce salon : si vous continuez sans les vérifier, quelqu'un pourrait épier votre appel.",
+    "Review Devices": "Passer en revue les appareils",
+    "Call Anyway": "Appeler quand même",
+    "Answer Anyway": "Répondre quand même",
+    "Call": "Appel",
+    "Answer": "Répondre",
+    "Send": "Envoyer",
+    "Cryptography data migrated": "Données de chiffrement migrées",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Une migration unique des données de chiffrement a été effectuée. Le chiffrement de bout-en-bout ne fonctionnera pas si vous revenez sur une version antérieure de Riot. Si vous avez besoin d'utiliser le chiffrement de bout-en-bout sur une ancienne version, déconnectez-vous de Riot. Pour conserver l'historique des messages, exportez et réimportez vos clés de chiffrement.",
+    "Old cryptography data detected": "Anciennes données de chiffrement détectées",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nous avons détecté des données d'une ancienne version de Riot. Le chiffrement de bout-en-bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText> ou <cancelText>tout annuler</cancelText>.",
+    "Warning": "Attention"
 }

From 0f853915876b10d34ed53f6365c30bb5f7d34ad4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 10 Dec 2017 12:50:41 +0000
Subject: [PATCH 108/927] Implement Rich Quoting/Replies

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Quote.js        | 138 +++++++++++++++
 src/components/views/messages/TextualBody.js  |  17 ++
 src/components/views/rooms/EventTile.js       | 159 ++++++++++--------
 .../views/rooms/MessageComposerInput.js       |  65 +++----
 src/components/views/rooms/QuotePreview.js    |  75 +++++++++
 src/linkify-matrix.js                         |   4 +-
 src/matrix-to.js                              |  33 ++++
 src/stores/RoomViewStore.js                   |  12 ++
 8 files changed, 405 insertions(+), 98 deletions(-)
 create mode 100644 src/components/views/elements/Quote.js
 create mode 100644 src/components/views/rooms/QuotePreview.js
 create mode 100644 src/matrix-to.js

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
new file mode 100644
index 0000000000..1925cfbd65
--- /dev/null
+++ b/src/components/views/elements/Quote.js
@@ -0,0 +1,138 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import React from 'react';
+import sdk from '../../../index';
+import dis from '../../../dispatcher';
+import classNames from 'classnames';
+import { Room, RoomMember } from 'matrix-js-sdk';
+import PropTypes from 'prop-types';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import { getDisplayAliasForRoom } from '../../../Rooms';
+import {makeUserPermalink} from "../../../matrix-to";
+import DateUtils from "../../../DateUtils";
+
+// For URLs of matrix.to links in the timeline which have been reformatted by
+// HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
+const REGEX_LOCAL_MATRIXTO = /^#\/room\/(([\#\!])[^\/]*)\/(\$[^\/]*)$/;
+
+const Quote = React.createClass({
+    statics: {
+        isMessageUrl: (url) => {
+            return !!REGEX_LOCAL_MATRIXTO.exec(url);
+        },
+    },
+
+    childContextTypes: {
+        matrixClient: React.PropTypes.object,
+    },
+
+    props: {
+        // The matrix.to url of the event
+        url: PropTypes.string,
+        // Whether to include an avatar in the pill
+        shouldShowPillAvatar: PropTypes.bool,
+    },
+
+    getChildContext: function() {
+        return {
+            matrixClient: MatrixClientPeg.get(),
+        };
+    },
+
+    getInitialState() {
+        return {
+            // The room related to this quote
+            room: null,
+            // The event related to this quote
+            event: null,
+        };
+    },
+
+    componentWillReceiveProps(nextProps) {
+        let roomId;
+        let prefix;
+        let eventId;
+
+        if (nextProps.url) {
+            // Default to the empty array if no match for simplicity
+            // resource and prefix will be undefined instead of throwing
+            const matrixToMatch = REGEX_LOCAL_MATRIXTO.exec(nextProps.url) || [];
+
+            roomId = matrixToMatch[1]; // The room ID
+            prefix = matrixToMatch[2]; // The first character of prefix
+            eventId = matrixToMatch[3]; // The event ID
+        }
+
+        const room = prefix === '#' ?
+            MatrixClientPeg.get().getRooms().find((r) => {
+                return r.getAliases().includes(roomId);
+            }) : MatrixClientPeg.get().getRoom(roomId);
+
+        // Only try and load the event if we know about the room
+        // otherwise we just leave a `Quote` anchor which can be used to navigate/join the room manually.
+        if (room) this.getEvent(room, eventId);
+    },
+
+    componentWillMount() {
+        this._unmounted = false;
+        this.componentWillReceiveProps(this.props);
+    },
+
+    componentWillUnmount() {
+        this._unmounted = true;
+    },
+
+    async getEvent(room, eventId) {
+        let event = room.findEventById(eventId);
+        if (event) {
+            this.setState({room, event});
+            return;
+        }
+
+        await MatrixClientPeg.get().getEventTimeline(room.getUnfilteredTimelineSet(), eventId);
+        event = room.findEventById(eventId);
+        this.setState({room, event});
+    },
+
+    render: function() {
+        const ev = this.state.event;
+        if (ev) {
+            const EventTile = sdk.getComponent('views.rooms.EventTile');
+            // const EmojiText = sdk.getComponent('views.elements.EmojiText');
+            // const Pill = sdk.getComponent('views.elements.Pill');
+            // const senderUrl = makeUserPermalink(ev.getSender());
+            // const EventTileType = sdk.getComponent(EventTile.getHandlerTile(ev));
+            /*return <a href={this.props.url} >*/
+            return <blockquote>
+                {/*<span style={{borderBottom: '2px red'}}>*/}
+                    {/*<Pill room={this.state.room} url={senderUrl} shouldShowPillAvatar={this.props.shouldShowPillAvatar} />*/}
+                    {/*&nbsp;<a href={this.props.url}><EmojiText>🔗</EmojiText> { DateUtils.formatTime(new Date(ev.getTs())) }</a>*/}
+                {/*</span>*/}
+                <EventTile mxEvent={ev} tileShape="quote" />
+                {/*<EventTileType mxEvent={ev} />*/}
+            </blockquote>;
+            /*</a>;*/
+        } else {
+            // Deliberately render nothing if the URL isn't recognised
+            return <div>
+                <a href={this.props.url}>Quote</a>
+                <br />
+            </div>;
+        }
+    },
+});
+
+export default Quote;
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 4b096d0a76..1899e8428a 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -56,6 +57,9 @@ module.exports = React.createClass({
 
         /* callback for when our widget has loaded */
         onWidgetLoad: React.PropTypes.func,
+
+        /* the shsape of the tile, used */
+        tileShape: React.PropTypes.string,
     },
 
     getInitialState: function() {
@@ -179,6 +183,7 @@ module.exports = React.createClass({
 
                 // If the link is a (localised) matrix.to link, replace it with a pill
                 const Pill = sdk.getComponent('elements.Pill');
+                const Quote = sdk.getComponent('elements.Quote');
                 if (Pill.isMessagePillUrl(href)) {
                     const pillContainer = document.createElement('span');
 
@@ -197,6 +202,18 @@ module.exports = React.createClass({
 
                     // update the current node with one that's now taken its place
                     node = pillContainer;
+                } else if (this.props.tileShape !== 'quote' && Quote.isMessageUrl(href)) {
+                    // only allow this branch if we're not already in a quote, as fun as infinite nesting is.
+                    const quoteContainer = document.createElement('span');
+
+                    const quote = <Quote url={href} shouldShowPillAvatar={shouldShowPillAvatar} />;
+
+                    ReactDOM.render(quote, quoteContainer);
+                    node.parentNode.replaceChild(quoteContainer, node);
+
+                    pillified = true;
+
+                    node = quoteContainer;
                 }
             } else if (node.nodeType == Node.TEXT_NODE) {
                 const Pill = sdk.getComponent('elements.Pill');
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 3407ea159d..645a3fdb71 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -528,79 +529,103 @@ module.exports = withMatrixClient(React.createClass({
         const timestamp = this.props.mxEvent.getTs() ?
             <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());
-            return (
-                <div className={classes}>
-                    <div className="mx_EventTile_roomName">
-                        <a href={permalink} onClick={this.onPermalinkClicked}>
-                            { room ? room.name : '' }
-                        </a>
-                    </div>
-                    <div className="mx_EventTile_senderDetails">
-                        { avatar }
-                        <a href={permalink} onClick={this.onPermalinkClicked}>
-                            { sender }
-                            { timestamp }
-                        </a>
-                    </div>
-                    <div className="mx_EventTile_line" >
-                        <EventTileType ref="tile"
-                            mxEvent={this.props.mxEvent}
-                            highlights={this.props.highlights}
-                            highlightLink={this.props.highlightLink}
-                            showUrlPreview={this.props.showUrlPreview}
-                            onWidgetLoad={this.props.onWidgetLoad} />
-                    </div>
-                </div>
-            );
-        } else if (this.props.tileShape === "file_grid") {
-            return (
-                <div className={classes}>
-                    <div className="mx_EventTile_line" >
-                        <EventTileType ref="tile"
-                            mxEvent={this.props.mxEvent}
-                            highlights={this.props.highlights}
-                            highlightLink={this.props.highlightLink}
-                            showUrlPreview={this.props.showUrlPreview}
-                            tileShape={this.props.tileShape}
-                            onWidgetLoad={this.props.onWidgetLoad} />
-                    </div>
-                    <a
-                        className="mx_EventTile_senderDetailsLink"
-                        href={permalink}
-                        onClick={this.onPermalinkClicked}
-                    >
+        switch (this.props.tileShape) {
+            case 'notif': {
+                const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());
+                return (
+                    <div className={classes}>
+                        <div className="mx_EventTile_roomName">
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
+                                { room ? room.name : '' }
+                            </a>
+                        </div>
                         <div className="mx_EventTile_senderDetails">
+                            { avatar }
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { sender }
                                 { timestamp }
+                            </a>
+                        </div>
+                        <div className="mx_EventTile_line" >
+                            <EventTileType ref="tile"
+                                           mxEvent={this.props.mxEvent}
+                                           highlights={this.props.highlights}
+                                           highlightLink={this.props.highlightLink}
+                                           showUrlPreview={this.props.showUrlPreview}
+                                           onWidgetLoad={this.props.onWidgetLoad} />
                         </div>
-                    </a>
-                </div>
-            );
-        } else {
-            return (
-                <div className={classes}>
-                    <div className="mx_EventTile_msgOption">
-                        { readAvatars }
                     </div>
-                    { avatar }
-                    { sender }
-                    <div className="mx_EventTile_line">
-                        <a href={permalink} onClick={this.onPermalinkClicked}>
-                            { timestamp }
+                );
+            }
+            case 'file_grid': {
+                return (
+                    <div className={classes}>
+                        <div className="mx_EventTile_line" >
+                            <EventTileType ref="tile"
+                                           mxEvent={this.props.mxEvent}
+                                           highlights={this.props.highlights}
+                                           highlightLink={this.props.highlightLink}
+                                           showUrlPreview={this.props.showUrlPreview}
+                                           tileShape={this.props.tileShape}
+                                           onWidgetLoad={this.props.onWidgetLoad} />
+                        </div>
+                        <a
+                            className="mx_EventTile_senderDetailsLink"
+                            href={permalink}
+                            onClick={this.onPermalinkClicked}
+                        >
+                            <div className="mx_EventTile_senderDetails">
+                                { sender }
+                                { timestamp }
+                            </div>
                         </a>
-                        { this._renderE2EPadlock() }
-                        <EventTileType ref="tile"
-                            mxEvent={this.props.mxEvent}
-                            highlights={this.props.highlights}
-                            highlightLink={this.props.highlightLink}
-                            showUrlPreview={this.props.showUrlPreview}
-                            onWidgetLoad={this.props.onWidgetLoad} />
-                        { editButton }
                     </div>
-                </div>
-            );
+                );
+            }
+            case 'quote': {
+                return (
+                    <div className={classes}>
+                        { avatar }
+                        { sender }
+                        <div className="mx_EventTile_line">
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
+                                { timestamp }
+                            </a>
+                            { this._renderE2EPadlock() }
+                            <EventTileType ref="tile"
+                                           tileShape="quote"
+                                           mxEvent={this.props.mxEvent}
+                                           highlights={this.props.highlights}
+                                           highlightLink={this.props.highlightLink}
+                                           showUrlPreview={false} />
+                        </div>
+                    </div>
+                );
+            }
+            default: {
+                return (
+                    <div className={classes}>
+                        <div className="mx_EventTile_msgOption">
+                            { readAvatars }
+                        </div>
+                        { avatar }
+                        { sender }
+                        <div className="mx_EventTile_line">
+                            <a href={permalink} onClick={this.onPermalinkClicked}>
+                                { timestamp }
+                            </a>
+                            { this._renderE2EPadlock() }
+                            <EventTileType ref="tile"
+                                           mxEvent={this.props.mxEvent}
+                                           highlights={this.props.highlights}
+                                           highlightLink={this.props.highlightLink}
+                                           showUrlPreview={this.props.showUrlPreview}
+                                           onWidgetLoad={this.props.onWidgetLoad} />
+                            { editButton }
+                        </div>
+                    </div>
+                );
+            }
         }
     },
 }));
@@ -653,3 +678,5 @@ function E2ePadlockUnencrypted(props) {
 function E2ePadlock(props) {
     return <img className="mx_EventTile_e2eIcon" {...props} />;
 }
+
+module.exports.getHandlerTile = getHandlerTile;
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index cd30f20645..ad7e81ccb1 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -50,6 +50,10 @@ const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g')
 
 import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
+import {makeEventPermalink} from "../../../matrix-to";
+import QuotePreview from "./QuotePreview";
+import RoomViewStore from '../../../stores/RoomViewStore';
+
 const EMOJI_SHORTNAMES = Object.keys(emojioneList);
 const EMOJI_UNICODE_TO_SHORTNAME = mapUnicodeToShort();
 const REGEX_EMOJI_WHITESPACE = new RegExp('(?:^|\\s)(' + asciiRegexp + ')\\s$');
@@ -293,35 +297,6 @@ export default class MessageComposerInput extends React.Component {
                 });
             }
                 break;
-            case 'quote': {
-                /// XXX: Not doing rich-text quoting from formatted-body because draft-js
-                /// has regressed such that when links are quoted, errors are thrown. See
-                /// https://github.com/vector-im/riot-web/issues/4756.
-                const body = escape(payload.text);
-                if (body) {
-                    let content = RichText.htmlToContentState(`<blockquote>${body}</blockquote>`);
-                    if (!this.state.isRichtextEnabled) {
-                        content = ContentState.createFromText(RichText.stateToMarkdown(content));
-                    }
-
-                    const blockMap = content.getBlockMap();
-                    let startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    contentState = Modifier.splitBlock(contentState, startSelection);
-                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    contentState = Modifier.replaceWithFragment(contentState,
-                        startSelection,
-                        blockMap);
-                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
-                    if (this.state.isRichtextEnabled) {
-                        contentState = Modifier.setBlockType(contentState, startSelection, 'blockquote');
-                    }
-                    let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
-                    editorState = EditorState.moveSelectionToEnd(editorState);
-                    this.onEditorContentChanged(editorState);
-                    editor.focus();
-                }
-            }
-                break;
         }
     };
 
@@ -659,7 +634,7 @@ export default class MessageComposerInput extends React.Component {
         }
 
         return false;
-    }
+    };
 
     onTextPasted(text: string, html?: string) {
         const currentSelection = this.state.editorState.getSelection();
@@ -749,9 +724,17 @@ export default class MessageComposerInput extends React.Component {
             return true;
         }
 
+        const quotingEv = RoomViewStore.getQuotingEvent();
+
         if (this.state.isRichtextEnabled) {
             // We should only send HTML if any block is styled or contains inline style
             let shouldSendHTML = false;
+
+            // If we are quoting we need HTML Content
+            if (quotingEv) {
+                shouldSendHTML = true;
+            }
+
             const blocks = contentState.getBlocksAsArray();
             if (blocks.some((block) => block.getType() !== 'unstyled')) {
                 shouldSendHTML = true;
@@ -809,7 +792,8 @@ export default class MessageComposerInput extends React.Component {
             }).join('\n');
 
             const md = new Markdown(pt);
-            if (md.isPlainText()) {
+            // if contains no HTML and we're not quoting (needing HTML)
+            if (md.isPlainText() && !quotingEv) {
                 contentText = md.toPlaintext();
             } else {
                 contentHTML = md.toHTML();
@@ -832,6 +816,24 @@ export default class MessageComposerInput extends React.Component {
             sendTextFn = this.client.sendEmoteMessage;
         }
 
+        if (quotingEv) {
+            const cli = MatrixClientPeg.get();
+            const room = cli.getRoom(quotingEv.getRoomId());
+            const sender = room.currentState.getMember(quotingEv.getSender());
+
+            const {body/*, formatted_body*/} = quotingEv.getContent();
+
+            const perma = makeEventPermalink(quotingEv.getRoomId(), quotingEv.getId());
+            contentText = `${sender.name}:\n> ${body}\n\n${contentText}`;
+            contentHTML = `<a href="${perma}">Quote<br></a>${contentHTML}`;
+
+            // we have finished quoting, clear the quotingEvent
+            dis.dispatch({
+                action: 'quote_event',
+                event: null,
+            });
+        }
+
         let sendMessagePromise;
         if (contentHTML) {
             sendMessagePromise = sendHtmlFn.call(
@@ -1144,6 +1146,7 @@ export default class MessageComposerInput extends React.Component {
         return (
             <div className="mx_MessageComposer_input_wrapper">
                 <div className="mx_MessageComposer_autocomplete_wrapper">
+                    <QuotePreview />
                     <Autocomplete
                         ref={(e) => this.autocomplete = e}
                         room={this.props.room}
diff --git a/src/components/views/rooms/QuotePreview.js b/src/components/views/rooms/QuotePreview.js
new file mode 100644
index 0000000000..2259350cdc
--- /dev/null
+++ b/src/components/views/rooms/QuotePreview.js
@@ -0,0 +1,75 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import dis from '../../../dispatcher';
+import sdk from '../../../index';
+import RoomViewStore from '../../../stores/RoomViewStore';
+
+function cancelQuoting() {
+    dis.dispatch({
+        action: 'quote_event',
+        event: null,
+    });
+}
+
+export default class QuotePreview extends React.Component {
+    constructor(props, context) {
+        super(props, context);
+
+        this.state = {
+            event: null,
+        };
+
+        this._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
+
+        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
+        this._onRoomViewStoreUpdate();
+    }
+
+    componentWillUnmount() {
+        // Remove RoomStore listener
+        if (this._roomStoreToken) {
+            this._roomStoreToken.remove();
+        }
+    }
+
+    _onRoomViewStoreUpdate() {
+        const event = RoomViewStore.getQuotingEvent();
+        if (this.state.event !== event) {
+            this.setState({ event });
+        }
+    }
+
+    render() {
+        if (!this.state.event) return null;
+
+        const EventTile = sdk.getComponent('rooms.EventTile');
+        const EmojiText = sdk.getComponent('views.elements.EmojiText');
+
+        return <div className="mx_Quoting">
+            <div className="mx_Quoting_section">
+                <EmojiText element="div" className="mx_Quoting_header mx_Quoting_title">💬 Quoting</EmojiText>
+                <div className="mx_Quoting_header mx_Quoting_cancel">
+                    <img className="mx_filterFlipColor" src="img/cancel.svg" width="18" height="18"
+                         onClick={cancelQuoting} />
+                </div>
+                <div className="mx_Quoting_clear" />
+                <EventTile mxEvent={this.state.event} last={true} tileShape="quote" />
+            </div>
+        </div>;
+    }
+}
diff --git a/src/linkify-matrix.js b/src/linkify-matrix.js
index 74489a09ea..6bbea77733 100644
--- a/src/linkify-matrix.js
+++ b/src/linkify-matrix.js
@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import {baseUrl} from "./matrix-to";
+
 function matrixLinkify(linkify) {
     // Text tokens
     const TT = linkify.scanner.TOKENS;
@@ -170,7 +172,7 @@ matrixLinkify.VECTOR_URL_PATTERN = "^(?:https?:\/\/)?(?:"
 matrixLinkify.MATRIXTO_URL_PATTERN = "^(?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!).*)";
 matrixLinkify.MATRIXTO_MD_LINK_PATTERN =
     '\\[([^\\]]*)\\]\\((?:https?:\/\/)?(?:www\\.)?matrix\\.to/#/((#|@|!)[^\\)]*)\\)';
-matrixLinkify.MATRIXTO_BASE_URL= "https://matrix.to";
+matrixLinkify.MATRIXTO_BASE_URL= baseUrl;
 
 matrixLinkify.options = {
     events: function(href, type) {
diff --git a/src/matrix-to.js b/src/matrix-to.js
new file mode 100644
index 0000000000..72fb3c38fc
--- /dev/null
+++ b/src/matrix-to.js
@@ -0,0 +1,33 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+export const baseUrl = "https://matrix.to";
+
+export function makeEventPermalink(roomId, eventId) {
+    return `${baseUrl}/#/${roomId}/${eventId}`;
+}
+
+export function makeUserPermalink(userId) {
+    return `${baseUrl}/#/${userId}`;
+}
+
+export function makeRoomPermalink(roomId) {
+    return `${baseUrl}/#/${roomId}`;
+}
+
+export function makeGroupPermalink(groupId) {
+    return `${baseUrl}/#/${groupId}`;
+}
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index 0a8eca8797..cf895d2190 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -41,6 +42,8 @@ const INITIAL_STATE = {
     roomLoadError: null,
 
     forwardingEvent: null,
+
+    quotingEvent: null,
 };
 
 /**
@@ -108,6 +111,10 @@ class RoomViewStore extends Store {
                     forwardingEvent: payload.event,
                 });
                 break;
+            case 'quote_event':
+                this._setState({
+                    quotingEvent: payload.event,
+                });
         }
     }
 
@@ -286,6 +293,11 @@ class RoomViewStore extends Store {
         return this._state.forwardingEvent;
     }
 
+    // The mxEvent if one is currently being replied to/quoted
+    getQuotingEvent() {
+        return this._state.quotingEvent;
+    }
+
     shouldPeek() {
         return this._state.shouldPeek;
     }

From b6182f7e6c73e375c16cb5b33a4e982e5acd8dbf Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 10 Dec 2017 12:54:19 +0000
Subject: [PATCH 109/927] Tidy Quote class, removing comments etc

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

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index 1925cfbd65..c7f785f2cf 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -15,14 +15,8 @@ limitations under the License.
 */
 import React from 'react';
 import sdk from '../../../index';
-import dis from '../../../dispatcher';
-import classNames from 'classnames';
-import { Room, RoomMember } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import { getDisplayAliasForRoom } from '../../../Rooms';
-import {makeUserPermalink} from "../../../matrix-to";
-import DateUtils from "../../../DateUtils";
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
@@ -87,14 +81,9 @@ const Quote = React.createClass({
     },
 
     componentWillMount() {
-        this._unmounted = false;
         this.componentWillReceiveProps(this.props);
     },
 
-    componentWillUnmount() {
-        this._unmounted = true;
-    },
-
     async getEvent(room, eventId) {
         let event = room.findEventById(eventId);
         if (event) {
@@ -111,27 +100,16 @@ const Quote = React.createClass({
         const ev = this.state.event;
         if (ev) {
             const EventTile = sdk.getComponent('views.rooms.EventTile');
-            // const EmojiText = sdk.getComponent('views.elements.EmojiText');
-            // const Pill = sdk.getComponent('views.elements.Pill');
-            // const senderUrl = makeUserPermalink(ev.getSender());
-            // const EventTileType = sdk.getComponent(EventTile.getHandlerTile(ev));
-            /*return <a href={this.props.url} >*/
             return <blockquote>
-                {/*<span style={{borderBottom: '2px red'}}>*/}
-                    {/*<Pill room={this.state.room} url={senderUrl} shouldShowPillAvatar={this.props.shouldShowPillAvatar} />*/}
-                    {/*&nbsp;<a href={this.props.url}><EmojiText>🔗</EmojiText> { DateUtils.formatTime(new Date(ev.getTs())) }</a>*/}
-                {/*</span>*/}
                 <EventTile mxEvent={ev} tileShape="quote" />
-                {/*<EventTileType mxEvent={ev} />*/}
             </blockquote>;
-            /*</a>;*/
-        } else {
-            // Deliberately render nothing if the URL isn't recognised
-            return <div>
-                <a href={this.props.url}>Quote</a>
-                <br />
-            </div>;
         }
+
+        // Deliberately render nothing if the URL isn't recognised
+        return <div>
+            <a href={this.props.url}>Quote</a>
+            <br />
+        </div>;
     },
 });
 

From a3f74d14a0eff2c12bc927a70ae3ca1cc0a31325 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 9 Dec 2017 18:03:45 +0000
Subject: [PATCH 110/927] Translated using Weblate (Esperanto)

Currently translated at 29.7% (285 of 958 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 96a15c5a2d..c054daab0c 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -177,5 +177,111 @@
     "Hide read receipts": "Kaŝi legokonfrimojn",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Montri tempindikojn en 12-hora formo (ekz. 2:30 post.)",
     "Always show message timestamps": "Ĉiam montri mesaĝajn tempindikojn",
-    "Autoplay GIFs and videos": "Aŭtomate ludi GIF-bildojn kaj videojn"
+    "Autoplay GIFs and videos": "Aŭtomate ludi GIF-bildojn kaj videojn",
+    "Call Failed": "Voko malsukcesis",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "En la ĉambro estas nekonataj aparatoj. Se vi pluigos sen ilia kontrolo, iu povos subaŭskulti vian vokon.",
+    "Review Devices": "Kontroli aparatojn",
+    "Call Anyway": "Tamen voki",
+    "Answer Anyway": "Tamen respondi",
+    "Call": "Voki",
+    "Answer": "Respondi",
+    "Send anyway": "Tamen sendi",
+    "Send": "Sendi",
+    "Enable automatic language detection for syntax highlighting": "Ŝalti aŭtomatan rekonon de lingvo por sintaksa markado",
+    "Hide avatars in user and room mentions": "Kaŝi profilbildojn en mencioj de uzantoj kaj ĉambroj",
+    "Disable big emoji in chat": "Malŝalti grandajn mienetojn en babilo",
+    "Don't send typing notifications": "Ne elsendi sciigojn pri tajpado",
+    "Automatically replace plain text Emoji": "Aŭtomate anstataŭigi tekstajn mienetojn",
+    "Mirror local video feed": "Speguli lokan videon",
+    "Disable Peer-to-Peer for 1:1 calls": "Malŝalti samtavolajn duopajn vokojn",
+    "Opt out of analytics": "Malpermesi datuman analizon",
+    "Never send encrypted messages to unverified devices from this device": "Neniam sendi neĉifritajn mesaĝojn al nekontrolitaj aparatoj de tiu ĉi aparato",
+    "Never send encrypted messages to unverified devices in this room from this device": "Neniam sendi ĉifritajn mesaĝojn al nekontrolitaj aparatoj en tiu ĉi ĉambro de tiu ĉi aparto",
+    "Enable inline URL previews by default": "Ŝalti entekstan antaŭrigardon al retadresoj",
+    "Enable URL previews for this room (only affects you)": "Ŝalti antaŭrigardon al retadresoj por ĉi tiu ĉambro (nur pro vi)",
+    "Enable URL previews by default for participants in this room": "Ŝalti antaŭrigardon al retadresoj por anoj de ĉi tiu ĉambro",
+    "Room Colour": "Koloro de ĉambro",
+    "Active call (%(roomName)s)": "Aktiva voko (%(roomName)s)",
+    "unknown caller": "nekonata vokanto",
+    "Incoming voice call from %(name)s": "Envena voĉvoko de %(name)s",
+    "Incoming video call from %(name)s": "Envena vidvoko de %(name)s",
+    "Incoming call from %(name)s": "Envena voko de %(name)s",
+    "Decline": "Rifuzi",
+    "Accept": "Akcepti",
+    "Error": "Eraro",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Teksta mesaĝo sendiĝis al +%(msisdn)s. Bonvolu enigi la entenatan kontrolan kodon",
+    "Incorrect verification code": "Malĝusta kontrola kodo",
+    "Enter Code": "Enigu kodon",
+    "Submit": "Sendi",
+    "Phone": "Telefono",
+    "Add phone number": "Aldoni telefonan numeron",
+    "Add": "Aldoni",
+    "Failed to upload profile picture!": "Malsukcesis alŝuti vian profilbildon!",
+    "Upload new:": "Alŝuti novan:",
+    "No display name": "Sen vidiga nomo",
+    "New passwords don't match": "Novaj pasvortoj ne kongruas",
+    "Passwords can't be empty": "Pasvortoj ne povas esti malplenaj",
+    "Continue": "Daŭrigi",
+    "Export E2E room keys": "Elporti ĝiscele ĉifrajn ŝlosilojn de la ĉambro",
+    "Do you want to set an email address?": "Ĉu vi volas agordi retpoŝtadreson?",
+    "Current password": "Nuna pasvorto",
+    "Password": "Pasvorto",
+    "New Password": "Nova pasvorto",
+    "Confirm password": "Konfirmi pasvorton",
+    "Change Password": "Ŝanĝi pasvorton",
+    "Your home server does not support device management.": "Via hejma servilo ne subtenas administradon de aparatoj.",
+    "Unable to load device list": "Listo de aparatoj ne legeblas",
+    "Authentication": "Aŭtentigo",
+    "Delete %(count)s devices|other": "Forigi %(count)s aparatojn",
+    "Delete %(count)s devices|one": "Forigi aparaton",
+    "Device ID": "Aparata identigaĵo",
+    "Device Name": "Aparata nomo",
+    "Last seen": "Laste vidita",
+    "Select devices": "Elekti aparatojn",
+    "Failed to set display name": "Malsukcesis agordi vidigan nomon",
+    "Disable Notifications": "Malŝalti sciigojn",
+    "Enable Notifications": "Ŝalti sciigojn",
+    "Cannot add any more widgets": "Pluaj fenestraĵoj ne aldoneblas",
+    "The maximum permitted number of widgets have already been added to this room.": "La plejgranda nombro da fenestraĵoj jam aldoniĝis al ĉi tiu ĉambro.",
+    "Add a widget": "Aldoni fenestraĵon",
+    "Drop File Here": "Demetu dosieron tien ĉi",
+    "Drop file here to upload": "Demetu dosieron tien ĉi por ĝin alŝuti",
+    " (unsupported)": " (nesubtenata)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Aliĝu al voko kun <voiceText>voĉo</voiceText> aŭ <videoText>video</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Nuntempa voko%(supportedText)s.",
+    "%(senderName)s sent an image": "%(senderName)s sendis bildon",
+    "%(senderName)s sent a video": "%(senderName)s sendis videon",
+    "%(senderName)s uploaded a file": "%(senderName)s alŝutis dosieron",
+    "Options": "Agordoj",
+    "Undecryptable": "Nemalĉifrebla",
+    "Encrypted by a verified device": "Ĉifrita de kontrolita aparato",
+    "Encrypted by an unverified device": "Ĉifrita de nekontrolita aparato",
+    "Unencrypted message": "Neĉifrita mesaĝo",
+    "Please select the destination room for this message": "Bonvolu elekti celan ĉambron por ĉi tiu mesaĝo",
+    "Blacklisted": "Sur nigra listo",
+    "Verified": "Kontrolita",
+    "Unverified": "Nekontrolita",
+    "device id: ": "aparata identigaĵo: ",
+    "Disinvite": "Malinviti",
+    "Kick": "Forpeli",
+    "Disinvite this user?": "Ĉu malinviti ĉi tiun uzanton?",
+    "Kick this user?": "Ĉu forpeli ĉi tiun uzanton?",
+    "Failed to kick": "Malsukcesis forpelo",
+    "Unban": "Malforbari",
+    "Ban": "Forbari",
+    "Unban this user?": "Ĉu malforbari ĉi tiun uzanton?",
+    "Ban this user?": "Ĉu forbari ĉi tiun uzanton?",
+    "Failed to ban user": "Malsukcesis forbari uzanton",
+    "Failed to mute user": "Malsukcesis silentigi uzanton",
+    "Failed to toggle moderator status": "Malsukcesis baskuligi estrecon",
+    "Failed to change power level": "Malsukcesis ŝanĝi nivelon de potenco",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tiun ĉi ŝanĝon vi ne povos fareblos, ĉar vi donas al la uzanto la saman nivelon de potenco, kiun havas vi mem.",
+    "Are you sure?": "Ĉu vi certas?",
+    "No devices with registered encryption keys": "Neniuj aparatoj kun registritaj ĉifraj ŝlosiloj",
+    "Devices": "Aparatoj",
+    "Unignore": "Reatenti",
+    "Ignore": "Malatenti",
+    "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.": "Ŝanĝo de pasvorto nuntempe nuligos ĉiujn ĝiscele ĉifrajn ŝlosilojn sur ĉiuj viaj aparatoj. Tio faros ĉifritajn babilajn historiojn nelegeblaj, krom se vi unue elportos viajn ĉambrajn ŝlosilojn kaj reenportos ilin poste. Estontece ĉi tio pliboniĝos.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ŝanĝis la profilbildon de %(roomName)s",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?"
 }

From 1131e18368dac2485e1d00eaedd9a016e53efd50 Mon Sep 17 00:00:00 2001
From: EternalElectron <EternalElectron@gmail.com>
Date: Fri, 8 Dec 2017 21:39:33 +0000
Subject: [PATCH 111/927] Translated using Weblate (German)

Currently translated at 99.6% (955 of 958 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0c529c7416..19327771d8 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -803,7 +803,7 @@
     "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer und verbirgt dessen Nachrichten",
     "Disable Emoji suggestions while typing": "Emoji-Vorschläge während des Schreibens deaktivieren",
     "Banned by %(displayName)s": "Verbannt von %(displayName)s",
-    "To send messages, you must be a": "Notwendiges Berechtigungslevel, um Nachrichten zu senden",
+    "To send messages, you must be a": "Notwendiges Berechtigungslevel, um Nachrichten zu senden:",
     "To invite users into the room, you must be a": "Notwendiges Berechtigungslevel, um Benutzer in diesen Raum einladen zu können:",
     "To configure the room, you must be a": "Notwendiges Berechtigungslevel, um diesen Raum zu konfigurieren:",
     "To kick users, you must be a": "Notwendiges Berechtigungslevel, um Benutzer zu kicken:",
@@ -1036,5 +1036,20 @@
     "Flair will not appear": "Abzeichen wird nicht angezeigt",
     "Something went wrong when trying to get your communities.": "Beim Laden deiner Communites ist etwas schief gelaufen.",
     "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstütztes Anmeldeverfahren."
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstütztes Anmeldeverfahren.",
+    "Call Failed": "Anruf fehlgeschlagen",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "In diesem Raum befinden sich nicht verifizierte Geräte. Wenn du ohne Verifizierung fortfährst, könnten Angreifer den Anruf mithören.",
+    "Review Devices": "Geräte ansehen",
+    "Call Anyway": "Trotzdem anrufen",
+    "Answer Anyway": "Trotzdem annehmen",
+    "Call": "Anrufen",
+    "Answer": "Annehmen",
+    "Send": "Senden",
+    "Addresses": "Adressen",
+    "collapse": "Verbergen",
+    "expand": "Erweitern",
+    "Cryptography data migrated": "Kryptographie-Schlüssel wurden übertragen",
+    "Old cryptography data detected": "Alte Kryptografiedaten erkannt",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText> oder <cancelText>alle abbrechen</cancelText>.",
+    "Warning": "Warnung"
 }

From 11d2a88d13567b2ec041a13151a030a91386d4c2 Mon Sep 17 00:00:00 2001
From: GuyOfThePery <guy.pery10@gmail.com>
Date: Mon, 11 Dec 2017 06:39:21 +0000
Subject: [PATCH 112/927] Translated using Weblate (Hebrew)

Currently translated at 5.8% (56 of 958 strings)

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

diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 0967ef424b..bd96159ae1 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -1 +1,58 @@
-{}
+{
+    "This email address is already in use": "כתובת הדואר הזו כבר בשימוש",
+    "This phone number is already in use": "מספר הטלפון הזה כבר בשימוש",
+    "Failed to verify email address: make sure you clicked the link in the email": "אימות כתובת הדוא\"ל נכשלה: וודא שלחצת על הקישור בדוא\"ל",
+    "Call Failed": "השיחה נכשלה",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "ישנם מכשירים לא ידועים בחדר: המשך ללא אימותם יאפשר למישהו לצוטט לשיחתך.",
+    "Review Devices": "סקירת מכשירים",
+    "Call Anyway": "התקשר בכל זאת",
+    "Answer Anyway": "ענה בכל זאת",
+    "Call": "התקשר",
+    "Answer": "ענה",
+    "The remote side failed to pick up": "הצד המרוחק לא ענה",
+    "Unable to capture screen": "כישלון בצילום המסך",
+    "Existing Call": "שיחה קיימת",
+    "You are already in a call.": "אתה כבר נמצא בשיחה.",
+    "VoIP is unsupported": "שיחה מעל IP לא נתמכת",
+    "You cannot place VoIP calls in this browser.": "אין אפשרות ליצור שיחה מעל IP בדפדפן זה.",
+    "You cannot place a call with yourself.": "אין אפשרות ליצור שיחה עם עצמך.",
+    "Conference calls are not supported in this client": "שיחות וועידה לא נתמכות בתכנה הזו",
+    "Conference calls are not supported in encrypted rooms": "שיחות וועידה לא נתמכות בחדרים מוצפנים",
+    "Warning!": "אזהרה!",
+    "Conference calling is in development and may not be reliable.": "שיחות וועידה נמצאות תחת פיתוח ועלולות להיות לא אמינות.",
+    "Failed to set up conference call": "כישלון ביצירת שיחת וועידה",
+    "Conference call failed.": "שיחת וועידה נכשלה.",
+    "The file '%(fileName)s' failed to upload": "העלאת הקובץ '%(fileName)s' נכשלה",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "הקובץ '%(fileName)s' גדול מהגבלת ההעלאה של שרת הבית",
+    "Upload Failed": "העלאה נכשלה",
+    "Sun": "ראשון",
+    "Mon": "שני",
+    "Tue": "שלישי",
+    "Wed": "רביעי",
+    "Thu": "חמישי",
+    "Fri": "שישי",
+    "Sat": "שבת",
+    "Jan": "ינואר",
+    "Feb": "פברואר",
+    "Mar": "מרץ",
+    "Apr": "אפריל",
+    "May": "מאי",
+    "Jun": "יוני",
+    "Jul": "יולי",
+    "Aug": "אוגוסט",
+    "Sep": "ספטמבר",
+    "Oct": "אוקטובר",
+    "Nov": "נובמבר",
+    "Dec": "דצמבר",
+    "PM": "PM",
+    "AM": "AM",
+    "Who would you like to add to this community?": "מי תרצה להוסיף לקהילה?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "אזהרה: כל אחד שיודע את מזהה הקהילה יוכל לראות את האנשים המוזמנים לקהילה",
+    "Invite new community members": "הזמן חברי קהילה חדשים",
+    "Name or matrix ID": "שם או מזהה מטריקס",
+    "Invite to Community": "הזמן לקהילה",
+    "Which rooms would you like to add to this community?": "אילו חדרים תרצה להוסיף לקהילה?",
+    "Show these rooms to non-members on the community page and room list?": "הצג חדרים אלה לחסרי-חשבון על דף הקהילה ורשימת החדרים?",
+    "Add rooms to the community": "הוסף חדרים לקהילה",
+    "Room name or alias": "שם חדר או כינוי"
+}

From 85c272ba82b5aa6d0d0d0f6b2b0c5d07698c9e30 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 8 Dec 2017 19:08:55 +0000
Subject: [PATCH 113/927] Translated using Weblate (Russian)

Currently translated at 99.3% (952 of 958 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 3fedcd37ff..1550d3d133 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1030,5 +1030,22 @@
     "Delete %(count)s devices|other": "Удалить %(count)s устройств",
     "Delete %(count)s devices|one": "Удалить устройство",
     "Select devices": "Выбрать устройства",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Этот домашний сервер не поддерживает метод входа, поддерживаемый клиентом."
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Этот домашний сервер не поддерживает метод входа, поддерживаемый клиентом.",
+    "Call Failed": "Звонок не удался",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "В этой комнате есть неизвестные устройства: если вы продолжите без их проверки, имейте в виду, что кто-то посторонний может вас прослушать.",
+    "Review Devices": "Обзор устройств",
+    "Call Anyway": "Позвонить в любом случае",
+    "Answer Anyway": "Ответить в любом случае",
+    "Call": "Вызов",
+    "Answer": "Ответить",
+    "Send": "Отправить",
+    "Addresses": "Адреса",
+    "collapse": "свернуть",
+    "expand": "развернуть",
+    "Cryptography data migrated": "Миграция данных криптографии",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Выполнена одноразовая миграция данных криптографии. Сквозное шифрование не будет работать, если вы вернетесь к старой версии Riot. Если требуется использовать сквозную криптографию для более старой версии, сначала выйдите из Riot. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
+    "Old cryptography data detected": "Обнаружены старые криптографические данные",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Обнаружены данные из более старой версии Riot. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText> или <cancelText>отменить все</cancelText>.",
+    "Warning": "Предупреждение"
 }

From ab0ff9b7814240f91ba0ad03351adf26cf4a63e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Tue, 12 Dec 2017 18:55:57 +0100
Subject: [PATCH 114/927] BaseDialog: split a very long line

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

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index fbeb35c808..db8e530fa0 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -83,7 +83,12 @@ export default React.createClass({
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 
         return (
-            <FocusTrap onKeyDown={this._onKeyDown} className={this.props.className} role="dialog" aria-labelledby='mx_BaseDialog_title' aria-describedby={this.props.contentId}>
+            <FocusTrap onKeyDown={this._onKeyDown}
+                className={this.props.className}
+                role="dialog"
+                aria-labelledby='mx_BaseDialog_title'
+                aria-describedby={this.props.contentId}
+            >
                 <AccessibleButton onClick={this._onCancelClick}
                     className="mx_Dialog_cancelButton"
                 >

From 38e8488c2a0003767d89fbde98dee9d3d688d7a4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Dec 2017 23:25:38 +0000
Subject: [PATCH 115/927] we don't actually use state.room

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

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index c7f785f2cf..96bebf8bcd 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -48,8 +48,6 @@ const Quote = React.createClass({
 
     getInitialState() {
         return {
-            // The room related to this quote
-            room: null,
             // The event related to this quote
             event: null,
         };

From 4666ac7c830c54ff65a51d6bfed54d1e624474a4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Dec 2017 23:29:43 +0000
Subject: [PATCH 116/927] hide rich quoting behind flags, retaining original
 quoting for now

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/messages/TextualBody.js  |  4 ++-
 .../views/rooms/MessageComposerInput.js       | 32 ++++++++++++++++++-
 src/settings/Settings.js                      |  6 ++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 1899e8428a..4c41cbe669 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -202,7 +202,9 @@ module.exports = React.createClass({
 
                     // update the current node with one that's now taken its place
                     node = pillContainer;
-                } else if (this.props.tileShape !== 'quote' && Quote.isMessageUrl(href)) {
+                } else if (SettingsStore.isFeatureEnabled("feature_rich_quoting") && this.props.tileShape !== 'quote' &&
+                    Quote.isMessageUrl(href)
+                ) {
                     // only allow this branch if we're not already in a quote, as fun as infinite nesting is.
                     const quoteContainer = document.createElement('span');
 
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index ad7e81ccb1..3305ba7994 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -297,6 +297,36 @@ export default class MessageComposerInput extends React.Component {
                 });
             }
                 break;
+
+            case 'quote': { // old quoting, whilst rich quoting is in labs
+                /// XXX: Not doing rich-text quoting from formatted-body because draft-js
+                /// has regressed such that when links are quoted, errors are thrown. See
+                /// https://github.com/vector-im/riot-web/issues/4756.
+                const body = escape(payload.text);
+                if (body) {
+                    let content = RichText.htmlToContentState(`<blockquote>${body}</blockquote>`);
+                    if (!this.state.isRichtextEnabled) {
+                        content = ContentState.createFromText(RichText.stateToMarkdown(content));
+                    }
+
+                    const blockMap = content.getBlockMap();
+                    let startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
+                    contentState = Modifier.splitBlock(contentState, startSelection);
+                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
+                    contentState = Modifier.replaceWithFragment(contentState,
+                        startSelection,
+                        blockMap);
+                    startSelection = SelectionState.createEmpty(contentState.getFirstBlock().getKey());
+                    if (this.state.isRichtextEnabled) {
+                        contentState = Modifier.setBlockType(contentState, startSelection, 'blockquote');
+                    }
+                    let editorState = EditorState.push(this.state.editorState, contentState, 'insert-characters');
+                    editorState = EditorState.moveSelectionToEnd(editorState);
+                    this.onEditorContentChanged(editorState);
+                    editor.focus();
+                }
+            }
+                break;
         }
     };
 
@@ -1146,7 +1176,7 @@ export default class MessageComposerInput extends React.Component {
         return (
             <div className="mx_MessageComposer_input_wrapper">
                 <div className="mx_MessageComposer_autocomplete_wrapper">
-                    <QuotePreview />
+                    { SettingsStore.isFeatureEnabled("feature_rich_quoting") && <QuotePreview /> }
                     <Autocomplete
                         ref={(e) => this.autocomplete = e}
                         room={this.props.room}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 07de17ccfd..4a5ed3f661 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -76,6 +76,12 @@ export const SETTINGS = {
     //     // level is always appended to the end.
     //     supportedLevelsAreOrdered: false,
     // },
+    "feature_rich_quoting": {
+        isFeature: true,
+        displayName: _td("Rich Quoting"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "feature_pinning": {
         isFeature: true,
         displayName: _td("Message Pinning"),

From 5c229b9ef85374b6d3e9f369fe50f1bb16acd548 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 12 Dec 2017 23:33:40 +0000
Subject: [PATCH 117/927] DRY matrix.to link generation so it is all changeable
 in one class

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/RoomProvider.js                   | 3 ++-
 src/autocomplete/UserProvider.js                   | 3 ++-
 src/components/structures/GroupView.js             | 5 +++--
 src/components/views/rooms/EventTile.js            | 5 ++---
 src/components/views/rooms/MessageComposerInput.js | 4 ++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 1e1928a1ee..31599703c2 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -25,6 +25,7 @@ import {PillCompletion} from './Components';
 import {getDisplayAliasForRoom} from '../Rooms';
 import sdk from '../index';
 import _sortBy from 'lodash/sortBy';
+import {makeRoomPermalink} from "../matrix-to";
 
 const ROOM_REGEX = /(?=#)(\S*)/g;
 
@@ -78,7 +79,7 @@ export default class RoomProvider extends AutocompleteProvider {
                 return {
                     completion: displayAlias,
                     suffix: ' ',
-                    href: 'https://matrix.to/#/' + displayAlias,
+                    href: makeRoomPermalink(displayAlias),
                     component: (
                         <PillCompletion initialComponent={<RoomAvatar width={24} height={24} room={room.room} />} title={room.name} description={displayAlias} />
                     ),
diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index 9d587c2eb4..5814f40437 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -28,6 +28,7 @@ import _sortBy from 'lodash/sortBy';
 import MatrixClientPeg from '../MatrixClientPeg';
 
 import type {Room, RoomMember} from 'matrix-js-sdk';
+import {makeUserPermalink} from "../matrix-to";
 
 const USER_REGEX = /@\S*/g;
 
@@ -104,7 +105,7 @@ export default class UserProvider extends AutocompleteProvider {
                     // relies on the length of the entity === length of the text in the decoration.
                     completion: user.rawDisplayName.replace(' (IRC)', ''),
                     suffix: range.start === 0 ? ': ' : ' ',
-                    href: 'https://matrix.to/#/' + user.userId,
+                    href: makeUserPermalink(user.userId),
                     component: (
                         <PillCompletion
                             initialComponent={<MemberAvatar member={user} width={24} height={24} />}
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 5ffb97c6ed..64f9955aa9 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -31,6 +31,7 @@ import GroupStoreCache from '../../stores/GroupStoreCache';
 import GroupStore from '../../stores/GroupStore';
 import { showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GeminiScrollbar from 'react-gemini-scrollbar';
+import {makeGroupPermalink, makeUserPermalink} from "../../matrix-to";
 
 const LONG_DESC_PLACEHOLDER = _td(
 `<h1>HTML for your community's page</h1>
@@ -209,7 +210,7 @@ const FeaturedRoom = React.createClass({
 
         let permalink = null;
         if (this.props.summaryInfo.profile && this.props.summaryInfo.profile.canonical_alias) {
-            permalink = 'https://matrix.to/#/' + this.props.summaryInfo.profile.canonical_alias;
+            permalink = makeGroupPermalink(this.props.summaryInfo.profile.canonical_alias);
         }
 
         let roomNameNode = null;
@@ -366,7 +367,7 @@ const FeaturedUser = React.createClass({
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
         const name = this.props.summaryInfo.displayname || this.props.summaryInfo.user_id;
 
-        const permalink = 'https://matrix.to/#/' + this.props.summaryInfo.user_id;
+        const permalink = makeUserPermalink(this.props.summaryInfo.user_id);
         const userNameNode = <a href={permalink} onClick={this.onClick}>{ name }</a>;
         const httpUrl = MatrixClientPeg.get()
             .mxcUrlToHttp(this.props.summaryInfo.avatar_url, 64, 64);
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 645a3fdb71..3937c490f9 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -29,6 +29,7 @@ import withMatrixClient from '../../../wrappers/withMatrixClient';
 
 const ContextualMenu = require('../../structures/ContextualMenu');
 import dis from '../../../dispatcher';
+import {makeEventPermalink} from "../../../matrix-to";
 
 const ObjectUtils = require('../../../ObjectUtils');
 
@@ -472,9 +473,7 @@ module.exports = withMatrixClient(React.createClass({
             mx_EventTile_redacted: isRedacted,
         });
 
-        const permalink = "https://matrix.to/#/" +
-            this.props.mxEvent.getRoomId() + "/" +
-            this.props.mxEvent.getId();
+        const permalink = makeEventPermalink(this.props.mxEvent.getRoomId(), this.props.mxEvent.getId());
 
         const readAvatars = this.getReadAvatars();
 
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 3305ba7994..4810f0267b 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -50,7 +50,7 @@ const REGEX_MATRIXTO_MARKDOWN_GLOBAL = new RegExp(MATRIXTO_MD_LINK_PATTERN, 'g')
 
 import {asciiRegexp, shortnameToUnicode, emojioneList, asciiList, mapUnicodeToShort} from 'emojione';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import {makeEventPermalink} from "../../../matrix-to";
+import {makeEventPermalink, makeUserPermalink} from "../../../matrix-to";
 import QuotePreview from "./QuotePreview";
 import RoomViewStore from '../../../stores/RoomViewStore';
 
@@ -292,7 +292,7 @@ export default class MessageComposerInput extends React.Component {
                 this.setDisplayedCompletion({
                     completion,
                     selection,
-                    href: `https://matrix.to/#/${payload.user_id}`,
+                    href: makeUserPermalink(payload.user_id),
                     suffix: selection.getStartOffset() === 0 ? ': ' : ' ',
                 });
             }

From 68f4dcbc23562e96c7744247b77d72f260edea38 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 12 Dec 2017 10:29:18 +0000
Subject: [PATCH 118/927] Translated using Weblate (Esperanto)

Currently translated at 52.6% (504 of 958 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index c054daab0c..3a46ae428c 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -283,5 +283,224 @@
     "Ignore": "Malatenti",
     "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.": "Ŝanĝo de pasvorto nuntempe nuligos ĉiujn ĝiscele ĉifrajn ŝlosilojn sur ĉiuj viaj aparatoj. Tio faros ĉifritajn babilajn historiojn nelegeblaj, krom se vi unue elportos viajn ĉambrajn ŝlosilojn kaj reenportos ilin poste. Estontece ĉi tio pliboniĝos.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ŝanĝis la profilbildon de %(roomName)s",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?"
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vi estas direktota al ekstera retejo por aŭtentigi vian konton por uzo kun %(integrationsUrl)s. Ĉu vi volas daŭrigi tion?",
+    "Jump to read receipt": "Salti al legokonfirmo",
+    "Mention": "Mencio",
+    "Invite": "Inviti",
+    "User Options": "Agordoj de uzanto",
+    "Direct chats": "Rektaj babiloj",
+    "Unmute": "Malsilentigi",
+    "Mute": "Silentigi",
+    "Revoke Moderator": "Forigi estrajn rajtojn",
+    "Make Moderator": "Kunestrigi",
+    "Admin Tools": "Estriloj",
+    "Level:": "Nivelo:",
+    "and %(count)s others...|other": "kaj %(count)s aliaj…",
+    "and %(count)s others...|one": "kaj unu alia…",
+    "Invited": "Invititaj",
+    "Filter room members": "Filtri ĉambranojn",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (potenco je %(powerLevelNumber)s)",
+    "Attachment": "Kunsendaĵo",
+    "Upload Files": "Alŝuti dosierojn",
+    "Are you sure you want to upload the following files?": "Ĉu vi certe volas alŝuti la jenajn dosierojn?",
+    "Encrypted room": "Ĉifrita ĉambro",
+    "Unencrypted room": "Neĉifrita ĉambro",
+    "Hangup": "Fini vokon",
+    "Voice call": "Voĉvoko",
+    "Video call": "Vidvoko",
+    "Hide Apps": "Kaŝi aplikaĵojn",
+    "Show Apps": "Montri aplikaĵojn",
+    "Upload file": "Alŝuti dosieron",
+    "Show Text Formatting Toolbar": "Montri tekstaranĝan breton",
+    "Send an encrypted message": "Sendi ĉirfitan mesaĝon",
+    "Send a message (unencrypted)": "Sendi mesaĝon (neĉifritan)",
+    "You do not have permission to post to this room": "Mankas al vi permeso afiŝi en la ĉambro",
+    "Turn Markdown on": "Ŝalti Marksubon",
+    "Turn Markdown off": "Malŝalti Marksubon",
+    "Hide Text Formatting Toolbar": "Kaŝi tekstaranĝan breton",
+    "Server error": "Servila eraro",
+    "Server unavailable, overloaded, or something else went wrong.": "Servilo estas neatingebla, troŝarĝita, aŭ io alia misokazis.",
+    "Command error": "Komanda eraro",
+    "bold": "grasa",
+    "italic": "kursiva",
+    "strike": "trastrekita",
+    "underline": "substrekita",
+    "code": "kodo",
+    "quote": "citaĵo",
+    "bullet": "bulo",
+    "numbullet": "numerita",
+    "Markdown is disabled": "Marksubo estas malŝaltita",
+    "Markdown is enabled": "Marksubo estas ŝaltita",
+    "Unpin Message": "Malfiksi mesaĝon",
+    "Jump to message": "Salti al mesaĝo",
+    "No pinned messages.": "Neniuj fiksitaj mesaĝoj.",
+    "Loading...": "Enleganta…",
+    "Pinned Messages": "Fiksitaj mesaĝoj",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)st",
+    "Online for %(duration)s": "Enreta jam je %(duration)s",
+    "Idle for %(duration)s": "Senfara jam je %(duration)s",
+    "Offline for %(duration)s": "Eksterreta jam je %(duration)s",
+    "Unknown for %(duration)s": "Nekonata jam je %(duration)s",
+    "Online": "Enreta",
+    "Idle": "Senfara",
+    "Offline": "Eksterreta",
+    "Unknown": "Nekonata",
+    "Seen by %(userName)s at %(dateTime)s": "Vidita de %(userName)s je %(dateTime)s",
+    "Unnamed room": "Sennoma ĉambro",
+    "World readable": "Legebla de ĉiuj",
+    "Guests can join": "Gastoj povas aliĝi",
+    "No rooms to show": "Neniuj ĉambroj montreblas",
+    "Failed to set avatar.": "Malsukcesis agordi profilbildon.",
+    "Save": "Konservi",
+    "(~%(count)s results)|other": "(~%(count)s rezultoj)",
+    "(~%(count)s results)|one": "(~%(count)s rezulto)",
+    "Join Room": "Aliĝi al ĉambro",
+    "Upload avatar": "Alŝuti profilbildon",
+    "Remove avatar": "Forigi profilbildon",
+    "Settings": "Agordoj",
+    "Forget room": "Forgesi ĉambron",
+    "Search": "Serĉi",
+    "Show panel": "Montri panelon",
+    "Drop here to favourite": "Demetu tien ĉi por ŝati",
+    "Drop here to tag direct chat": "Demeti tien ĉi por marki rektan babilon",
+    "Drop here to restore": "Demeti tien ĉi por reigi",
+    "Drop here to demote": "Demeti tien ĉi por malpligravigi",
+    "Drop here to tag %(section)s": "Demeti tien ĉi por marki %(section)s",
+    "Press <StartChatButton> to start a chat with someone": "Premu <StartChatButton> por komenci babilon kun iu",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Vi ankoraŭ estas en neniuj ĉambroj! Premu <CreateRoomButton> por fari ĉambron aŭ <RoomDirectoryButton> por esplori la ĉambrujon",
+    "Community Invites": "Komunumaj invitoj",
+    "Invites": "Invitoj",
+    "Favourites": "Ŝatataj",
+    "People": "Homoj",
+    "Rooms": "Ĉambroj",
+    "Low priority": "Malpli gravaj",
+    "Historical": "Estintaj",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Ne certigeblas, ke la adreso, kien ĉi tiu invito sendiĝis, kongruas kun tiu rilata al via konto.",
+    "This invitation was sent to an email address which is not associated with this account:": "Ĉi tiu invito sendiĝis al retpoŝtadreso, kiu ne rilatas al ĉi tiu konto:",
+    "You may wish to login with a different account, or add this email to this account.": "Vi povas saluti per alia konto, aŭ aldoni ĉi tiun retpoŝtadreson al tiu ĉi konto.",
+    "You have been invited to join this room by %(inviterName)s": "%(inviterName)s vin invitis al ĉi tiu ĉambro",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Ĉu vi volas <acceptText>akcepti</acceptText> aŭ <declineText>rifuzi</declineText> ĉi tiun inviton?",
+    "Reason: %(reasonText)s": "Kialo: %(reasonText)s",
+    "Rejoin": "Realiĝi",
+    "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s vin forpelis de %(roomName)s.",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s vin forpelis de tiu ĉi ĉambro.",
+    "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s vi forbaris de %(roomName)s.",
+    "You have been banned from this room by %(userName)s.": "%(userName)s vin forbaris de tiu ĉi ĉambro.",
+    "This room": "Ĉi tiu ĉambro",
+    "%(roomName)s does not exist.": "%(roomName)s ne ekzistas.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s ne estas atingebla nun.",
+    "You are trying to access %(roomName)s.": "Vi provas atingi %(roomName)s.",
+    "You are trying to access a room.": "Vi provas atingi ĉambron.",
+    "<a>Click here</a> to join the discussion!": "<a>Klaku ĉi tie</a> por aliĝi al la diskuto!",
+    "This is a preview of this room. Room interactions have been disabled": "Tio ĉi estas antaŭrigardo al la ĉambro. Ĉambraj interagoj estas malŝaltitaj",
+    "To change the room's avatar, you must be a": "Por ŝanĝi la ĉambran profilbildon, vi devas esti",
+    "To change the room's name, you must be a": "Por ŝanĝi la ĉambran nomon, videvas esti",
+    "To change the room's main address, you must be a": "Por ŝanĝi la ĉambran ĉefadreson, vi devas esti",
+    "To change the room's history visibility, you must be a": "Por ŝanĝi videblecon de la ĉambra historio, vi devas esti",
+    "To change the permissions in the room, you must be a": "Por ŝanĝi permesojn en la ĉambro, vi devas esti",
+    "To change the topic, you must be a": "Por ŝanĝi la temon, vi devas esti",
+    "To modify widgets in the room, you must be a": "Por ŝanĝi fenestraĵojn en la ĉambro, vi devas esti",
+    "Failed to unban": "Malsukcesis malforbari",
+    "Banned by %(displayName)s": "Forbarita de %(displayName)s",
+    "Privacy warning": "Priprivata averto",
+    "Changes to who can read history will only apply to future messages in this room": "Ŝanĝoj al videbleco de la historio nur efektiviĝos nur por estontaj mesaĝoj en ĉi tiu ĉambro",
+    "The visibility of existing history will be unchanged": "Videbleco de la jama historio restos senŝanĝa",
+    "unknown error code": "nekonata kodo de eraro",
+    "Failed to forget room %(errCode)s": "Malsukcesis forgesi ĉambron %(errCode)s",
+    "End-to-end encryption is in beta and may not be reliable": "Ĝiscela ĉifrado estas beta-versia kaj eble ne dependebla",
+    "You should not yet trust it to secure data": "Ankoraŭ ne fidu ĝin pri sekurigo de datumoj",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Aparatoj ankoraŭ ne povos malĉifri historion de antaŭ ilia aliĝo",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Post ĉifrado ŝaltiĝos en ĉambro, ĝi ne malŝalteblos (ankoraŭ)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Ĉifritaj mesaĝoj ne videblos en klinteoj, kiuj ankoraŭ ne subtenas ĉifradon",
+    "Enable encryption": "Ŝalti ĉifradon",
+    "(warning: cannot be disabled again!)": "(averto: ĝi ne malŝalteblas poste!)",
+    "Encryption is enabled in this room": "Ĉifrado estas ŝaltita en tiu ĉi ĉambro",
+    "Encryption is not enabled in this room": "Ĉifrado ne estas ŝaltita en tiu ĉi ĉambro",
+    "Privileged Users": "Privilegiuloj",
+    "%(user)s is a": "%(user)s estas",
+    "No users have specific privileges in this room": "Neniuj uzantoj havas specialajn privilegiojn en tiu ĉi ĉambro",
+    "Banned users": "Forbaritaj uzantoj",
+    "This room is not accessible by remote Matrix servers": "Ĉi tiu ĉambro ne atingeblas por foraj serviloj de Matrix",
+    "Leave room": "Eliri el ĉambro",
+    "Favourite": "Ŝatata",
+    "Tagged as: ": "Etikedita kiel: ",
+    "To link to a room it must have <a>an address</a>.": "Por esti ligebla, ĉambro devas havi <a>adreson</a>.",
+    "Guests cannot join this room even if explicitly invited.": "Gastoj ne povas aliĝi ĉi tiun ĉambron eĉ kun malimplica invito.",
+    "Click here to fix": "Klaku ĉi tie por riparo",
+    "Who can access this room?": "Kiu povas atingi ĉi tiun ĉambron?",
+    "Only people who have been invited": "Nur invititaj uzantoj",
+    "Anyone who knows the room's link, apart from guests": "Iu ajn kun la ligilo, krom gastoj",
+    "Anyone who knows the room's link, including guests": "Iu ajn kun la ligilo, inkluzive gastojn",
+    "Publish this room to the public in %(domain)s's room directory?": "Ĉu publikigi ĉi tiun ĉambron al la publika ĉambrujo de %(domain)s?",
+    "Who can read history?": "Kiu povas legi la historion?",
+    "Anyone": "Iu ajn",
+    "Members only (since the point in time of selecting this option)": "Nur ĉambranoj (ekde ĉi tiu elekto)",
+    "Members only (since they were invited)": "Nur ĉambranoj (ekde la invito)",
+    "Members only (since they joined)": "Nur ĉambranoj (ekde la aliĝo)",
+    "Permissions": "Permesoj",
+    "The default role for new room members is": "La implicita rolo de novaj ĉambranoj estas",
+    "To send messages, you must be a": "Por sendi mesaĝojn, vi devas esti",
+    "To invite users into the room, you must be a": "Por inviti uzantojn al la ĉambro, vi devas esti",
+    "To configure the room, you must be a": "Por agordi la ĉambron, vi devas esti",
+    "To kick users, you must be a": "Por forpeli uzantojn, vi devas esti",
+    "To ban users, you must be a": "Por forbari uzantojn, vi devas esti",
+    "To remove other users' messages, you must be a": "Por forigi mesaĝojn de aliaj uzantoj, vi devas esti",
+    "To send events of type <eventType/>, you must be a": "Por sendi okazojn de tipo <eventType/>, vi devas esti",
+    "Advanced": "Specialaj",
+    "This room's internal ID is": "Interna identigaĵo de tiu ĉi ĉambro estas",
+    "Add a topic": "Aldoni temon",
+    "Cancel": "Nuligi",
+    "Scroll to unread messages": "Rulumi al nelegitaj mesaĝoj",
+    "Jump to first unread message.": "Salti al unua nelegita mesaĝo.",
+    "Close": "Fermi",
+    "Invalid alias format": "Malvalida formo de kromnomo",
+    "'%(alias)s' is not a valid format for an alias": "‹%(alias)s› ne estas valida formo de kromnomo",
+    "Invalid address format": "Malvalida formo de adreso",
+    "'%(alias)s' is not a valid format for an address": "‹%(alias)s› ne estas valida formo de adreso",
+    "not specified": "nespecifita",
+    "not set": "neagordita",
+    "Remote addresses for this room:": "Foraj adresoj de ĉi tiu ĉambro:",
+    "Addresses": "Adresoj",
+    "The main address for this room is": "La ĉefadreso por ĉi tiu ĉambro estas",
+    "Local addresses for this room:": "Lokaj adresoj por ĉi tiu ĉambro:",
+    "This room has no local addresses": "Ĉi tiu ĉambro ne havas lokajn adresojn",
+    "New address (e.g. #foo:%(localDomain)s)": "Nova adreso (ekz-e #io:%(localDomain)s)",
+    "Invalid community ID": "Malvalida komunuma identigaĵo",
+    "'%(groupId)s' is not a valid community ID": "‹%(groupId)s› ne estas valida komunuma identigaĵo",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nova komunuma identigaĵo (ekz-e +io:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "Vi <a>ŝaltis</a> implicitajn antaŭrigardojn al retpaĝoj.",
+    "You have <a>disabled</a> URL previews by default.": "Vi <a>malŝaltis</a> implicitajn antaŭrigardojn al retpaĝoj.",
+    "URL previews are enabled by default for participants in this room.": "Antaŭrigardoj al retpaĝoj estas implicite ŝaltitaj por ĉambranoj ĉi tie.",
+    "URL previews are disabled by default for participants in this room.": "Antaŭrigardoj al retpaĝoj estas implicite malŝaltitaj por ĉambranoj ĉi tie.",
+    "URL Previews": "Antaŭrigardoj al retpaĝoj",
+    "Error decrypting audio": "Eraro malĉifrante sonon",
+    "Error decrypting attachment": "Eraro malĉifrante kunsendaĵon",
+    "Decrypt %(text)s": "Malĉifri %(text)s",
+    "Download %(text)s": "Elŝuti %(text)s",
+    "Invalid file%(extra)s": "Malvalida dosiero%(extra)s",
+    "Error decrypting image": "Eraro malĉifrante bildon",
+    "Image '%(Body)s' cannot be displayed.": "Bildo ‹%(Body)s› ne montreblas.",
+    "This image cannot be displayed.": "Ĉi tiu bildo ne montreblas.",
+    "Error decrypting video": "Eraro malĉifrante videon",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s forigis la ĉambran profilbildon.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s agordis la ĉambran profilbildon al <img/>",
+    "Copied!": "Kopiita!",
+    "Failed to copy": "Malsukcesis kopii",
+    "Add an Integration": "Aldoni integron",
+    "Removed or unknown message type": "Forigita aŭ nekonata tipo de mesaĝo",
+    "Message removed by %(userId)s": "Mesaĝo forigita de %(userId)s",
+    "Message removed": "Mesaĝo forigita",
+    "Custom Server Options": "Propraj servilaj elektoj",
+    "Dismiss": "Rezigni",
+    "powered by Matrix": "funkciigata de Matrix",
+    "Warning": "Averto",
+    "Remove": "Forigi",
+    "Edit": "Redakti",
+    "Failed to change password. Is your password correct?": "Malsukcesis ŝanĝi la pasvorton. Ĉu via pasvorto estas ĝusta?",
+    "Leave": "Foriri",
+    "Register": "Registriĝi",
+    "Add rooms to this community": "Aldoni ĉambrojn al ĉi tiu komunumo"
 }

From 83f1beb04fe5c15d514d9ead6789e399116d2387 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 12 Dec 2017 14:56:22 +0000
Subject: [PATCH 119/927] Translated using Weblate (German)

Currently translated at 99.8% (957 of 958 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 19327771d8..91c75ff975 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1051,5 +1051,7 @@
     "Cryptography data migrated": "Kryptographie-Schlüssel wurden übertragen",
     "Old cryptography data detected": "Alte Kryptografiedaten erkannt",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText> oder <cancelText>alle abbrechen</cancelText>.",
-    "Warning": "Warnung"
+    "Warning": "Warnung",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Eine tiefgreifende Migration im Kontext der Verschlüsselungsdaten wurde durchgeführt. Ende-zu-Ende-Verschlüsselung wird nicht mehr funktionieren, wenn du zu einer älteren Version von Riot zurückkehrst. Wenn du Ende-zu-Ende-Verschlüssung bei einer älteren Version von Riot brauchst, melde dich bitte vorher ab. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel."
 }

From 642675c96da9fb31d191539f884872d2b7717c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 14 Dec 2017 10:31:28 +0100
Subject: [PATCH 120/927] Address review request comments

---
 .../views/dialogs/InteractiveAuthDialog.js    |  2 +-
 .../dialogs/SessionRestoreErrorDialog.js      |  5 +-
 .../login/InteractiveAuthEntryComponents.js   | 51 ++++++++++++++-----
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index d1273849ae..5b0e34df2c 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -73,7 +73,7 @@ export default React.createClass({
         if (this.state.authError) {
             content = (
                 <div id='mx_Dialog_content'>
-                    <div role={(this.state.authError.message || this.state.authError.toString()) ? "alert" : ""}>{ this.state.authError.message || this.state.authError.toString() }</div>
+                    <div role="alert">{ this.state.authError.message || this.state.authError.toString() }</div>
                     <br />
                     <AccessibleButton onClick={this._onDismissClick}
                         className="mx_UserSettings_button"
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index f018a83301..f0006f3c1a 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -60,6 +60,7 @@ export default React.createClass({
                 </p>
             );
         }
+        const shouldFocusContinueButton =!(bugreport==true);
 
         return (
             <BaseDialog className="mx_ErrorDialog" onFinished={this.props.onFinished}
@@ -77,8 +78,8 @@ export default React.createClass({
 
                     { bugreport }
                 </div>
-                <div className="mx_Dialog_buttons" autoFocus={SdkConfig.get().bug_report_endpoint_url ? false : true}>
-                    <button className="mx_Dialog_primary" onClick={this._continueClicked}>
+                <div className="mx_Dialog_buttons">
+                    <button className="mx_Dialog_primary" onClick={this._continueClicked} autoFocus={shouldFocusContinueButton}>
                         { _t("Continue anyway") }
                     </button>
                 </div>
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index 81b84684fc..a0bb1065f2 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -127,6 +127,15 @@ export const PasswordAuthEntry = React.createClass({
             );
         }
 
+        let errorSection;
+        if (this.props.errorText) {
+            errorSection = (
+                <div className="error" role="alert">
+                    { this.props.errorText }
+                </div>
+            );
+        }
+
         return (
             <div>
                 <p>{ _t("To continue, please enter your password.") }</p>
@@ -143,9 +152,7 @@ export const PasswordAuthEntry = React.createClass({
                         { submitButtonOrSpinner }
                     </div>
                 </form>
-                <div className="error" role={ this.props.errorText ? "alert" : ""}>
-                    { this.props.errorText }
-                </div>
+            { errorSection }
             </div>
         );
     },
@@ -180,14 +187,22 @@ export const RecaptchaAuthEntry = React.createClass({
 
         const CaptchaForm = sdk.getComponent("views.login.CaptchaForm");
         const sitePublicKey = this.props.stageParams.public_key;
+
+        let errorSection;
+        if (this.props.errorText) {
+            errorSection = (
+                <div className="error" role="alert">
+                    { this.props.errorText }
+                </div>
+            );
+        }
+
         return (
             <div>
                 <CaptchaForm sitePublicKey={sitePublicKey}
                     onCaptchaResponse={this._onCaptchaResponse}
                 />
-                <div className="error" role={ this.props.errorText ? "alert" : ""}>
-                    { this.props.errorText }
-                </div>
+                { errorSection }
             </div>
         );
     },
@@ -372,6 +387,14 @@ export const MsisdnAuthEntry = React.createClass({
                 mx_InteractiveAuthEntryComponents_msisdnSubmit: true,
                 mx_UserSettings_button: true, // XXX button classes
             });
+            let errorSection;
+            if (this.state.errorText) {
+                errorSection = (
+                    <div className="error" role="alert">
+                        { this.state.errorText }
+                    </div>
+                );
+            }
             return (
                 <div>
                     <p>{ _t("A text message has been sent to %(msisdn)s",
@@ -393,9 +416,7 @@ export const MsisdnAuthEntry = React.createClass({
                                 disabled={!enableSubmit}
                             />
                         </form>
-                        <div className="error" role={this.state.errorText ? "alert" : ""}>
-                            { this.state.errorText }
-                        </div>
+                        {errorSection}
                     </div>
                 </div>
             );
@@ -452,12 +473,18 @@ export const FallbackAuthEntry = React.createClass({
     },
 
     render: function() {
+        let errorSection;
+        if (this.props.errorText) {
+            errorSection = (
+                <div className="error" role="alert">
+                    { this.props.errorText }
+                </div>
+            );
+        }
         return (
             <div>
                 <a ref="fallbackButton" onClick={this._onShowFallbackClick}>{ _t("Start authentication") }</a>
-                <div className="error" role={ this.props.errorText ? "alert" : ""}>
-                    { this.props.errorText }
-                </div>
+                {errorSection}
             </div>
         );
     },

From 34e455c6fcdab56ec404ed8f0b677d402850a823 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Dec 2017 14:12:21 +0000
Subject: [PATCH 121/927] Fix leaking of GroupStore listeners in RoomList

---
 src/components/views/rooms/RoomList.js | 16 ++++++++++++----
 src/stores/GroupStore.js               |  6 ++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index d94fef7d31..8c2bdd5994 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -86,6 +86,7 @@ module.exports = React.createClass({
 
         const dmRoomMap = DMRoomMap.shared();
         this._groupStores = {};
+        this._groupStoreTokens = [];
         // A map between tags which are group IDs and the room IDs of rooms that should be kept
         // in the room list when filtering by that tag.
         this._selectedTagsRoomIdsForGroup = {
@@ -100,10 +101,12 @@ module.exports = React.createClass({
                     return;
                 }
                 this._groupStores[tag] = GroupStoreCache.getGroupStore(tag);
-                this._groupStores[tag].registerListener(() => {
-                    // This group's rooms or members may have updated, update rooms for its tag
-                    this.updateSelectedTagsRooms(dmRoomMap, [tag]);
-                });
+                this._groupStoreTokens.push(
+                    this._groupStores[tag].registerListener(() => {
+                        // This group's rooms or members may have updated, update rooms for its tag
+                        this.updateSelectedTagsRooms(dmRoomMap, [tag]);
+                    }),
+                );
             });
             // Filters themselves have changed, refresh the selected tags
             this.updateSelectedTagsRooms(dmRoomMap, FilterStore.getSelectedTags());
@@ -182,6 +185,11 @@ module.exports = React.createClass({
             this._filterStoreToken.remove();
         }
 
+        if (this._groupStoreTokens.length > 0) {
+            // NB: GroupStore is not a Flux.Store
+            this._groupStoreTokens.forEach((token) => token.unregister());
+        }
+
         // cancel any pending calls to the rate_limited_funcs
         this._delayedRefreshRoomList.cancelPendingCall();
     },
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 8d95d1975b..483eed96a5 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -110,6 +110,12 @@ export default class GroupStore extends EventEmitter {
         this._fetchSummary();
         this._fetchRooms();
         this._fetchMembers();
+
+        return {
+            unregister: () => {
+                this.unregisterListener(fn);
+            },
+        };
     }
 
     unregisterListener(fn) {

From c234e209fbb375b8ef227fa1d27648d961bb496b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 15 Dec 2017 15:24:22 +0000
Subject: [PATCH 122/927] Add postmessage api and move functions in to class

---
 src/MatrixPostMessageApi.js | 101 +++++++++++
 src/WidgetMessaging.js      | 348 +++++++++++++++++++-----------------
 2 files changed, 286 insertions(+), 163 deletions(-)
 create mode 100644 src/MatrixPostMessageApi.js

diff --git a/src/MatrixPostMessageApi.js b/src/MatrixPostMessageApi.js
new file mode 100644
index 0000000000..dd65cbd8fa
--- /dev/null
+++ b/src/MatrixPostMessageApi.js
@@ -0,0 +1,101 @@
+import Promise from "bluebird";
+
+
+function defer() {
+    let resolve, reject;
+    let isPending = true;
+    let promise = new Promise(function(...args) {
+        resolve = args[0];
+        reject = args[1];
+    });
+    return {
+        resolve: function(...args) {
+            if (!isPending) {
+                return;
+            }
+            isPending = false;
+            resolve(args[0]);
+        },
+        reject: function(...args) {
+            if (!isPending) {
+                return;
+            }
+            isPending = false;
+            reject(args[0]);
+        },
+        isPending: function() {
+            return isPending;
+        },
+        promise: promise,
+    };
+}
+
+// NOTE: PostMessageApi only handles message events with a data payload with a
+// response field
+export default class PostMessageApi {
+    constructor(targetWindow, timeoutMs) {
+        this._window = targetWindow || window.parent; // default to parent window
+        this._timeoutMs = timeoutMs || 5000; // default to 5s timer
+        this._counter = 0;
+        this._pending = {
+            // $ID: Deferred
+        };
+    }
+
+    start() {
+        addEventListener('message', this.getOnMessageCallback());
+    }
+
+    stop() {
+        removeEventListener('message', this.getOnMessageCallback());
+    }
+
+    // Somewhat convoluted so we can successfully capture the PostMessageApi 'this' instance.
+    getOnMessageCallback() {
+        if (this._onMsgCallback) {
+            return this._onMsgCallback;
+        }
+        let self = this;
+        this._onMsgCallback = function(ev) {
+            // THIS IS ALL UNSAFE EXECUTION.
+            // We do not verify who the sender of `ev` is!
+            let payload = ev.data;
+            // NOTE: Workaround for running in a mobile WebView where a
+            // postMessage immediately triggers this callback even though it is
+            // not the response.
+            if (payload.response === undefined) {
+                return;
+            }
+            let deferred = self._pending[payload._id];
+            if (!deferred) {
+                return;
+            }
+            if (!deferred.isPending()) {
+                return;
+            }
+            delete self._pending[payload._id];
+            deferred.resolve(payload);
+        };
+        return this._onMsgCallback;
+    }
+
+    exec(action, target) {
+        this._counter += 1;
+        target = target || "*";
+        action._id = Date.now() + "-" + Math.random().toString(36) + "-" + this._counter;
+        let d = defer();
+        this._pending[action._id] = d;
+        this._window.postMessage(action, target);
+
+        if (this._timeoutMs > 0) {
+            setTimeout(function() {
+                if (!d.isPending()) {
+                    return;
+                }
+                console.error("postMessage request timed out. Sent object: " + JSON.stringify(action));
+                d.reject(new Error("Timed out"));
+            }, this._timeoutMs);
+        }
+        return d.promise;
+    }
+}
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 0f23413b5f..7cd18132af 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -112,14 +112,14 @@ Example:
 */
 
 import URL from 'url';
+import dis from './dispatcher';
+import MatrixPostMessageApi from './MatrixPostMessageApi';
 
 const WIDGET_API_VERSION = '0.0.1'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
     '0.0.1',
 ];
 
-import dis from './dispatcher';
-
 if (!global.mxWidgetMessagingListenerCount) {
     global.mxWidgetMessagingListenerCount = 0;
 }
@@ -127,176 +127,205 @@ if (!global.mxWidgetMessagingMessageEndpoints) {
     global.mxWidgetMessagingMessageEndpoints = [];
 }
 
-
-/**
- * Register widget message event listeners
- */
-function startListening() {
-    if (global.mxWidgetMessagingListenerCount === 0) {
-        window.addEventListener("message", onMessage, false);
-    }
-    global.mxWidgetMessagingListenerCount += 1;
-}
-
-/**
- * De-register widget message event listeners
- */
-function stopListening() {
-    global.mxWidgetMessagingListenerCount -= 1;
-    if (global.mxWidgetMessagingListenerCount === 0) {
-        window.removeEventListener("message", onMessage);
-    }
-    if (global.mxWidgetMessagingListenerCount < 0) {
-        // Make an error so we get a stack trace
-        const e = new Error(
-            "WidgetMessaging: mismatched startListening / stopListening detected." +
-            " Negative count",
-        );
-        console.error(e);
-    }
-}
-
-/**
- * Register a widget endpoint for trusted postMessage communication
- * @param {string} widgetId    Unique widget identifier
- * @param {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
- */
-function addEndpoint(widgetId, endpointUrl) {
-    const u = URL.parse(endpointUrl);
-    if (!u || !u.protocol || !u.host) {
-        console.warn("Invalid origin:", endpointUrl);
-        return;
+export default class WidgetMessaging extends MatrixPostMessageApi {
+    constructor(targetWindow) {
+        super(targetWindow);
     }
 
-    const origin = u.protocol + '//' + u.host;
-    const endpoint = new WidgetMessageEndpoint(widgetId, origin);
-    if (global.mxWidgetMessagingMessageEndpoints) {
-        if (global.mxWidgetMessagingMessageEndpoints.some(function(ep) {
-            return (ep.widgetId === widgetId && ep.endpointUrl === endpointUrl);
-        })) {
-            // Message endpoint already registered
-            console.warn("Endpoint already registered");
+    exec(action) {
+        return super.exec(action).then((data) => {
+            // check for errors and reject if found
+            if (data.response === undefined) { // null is valid
+                throw new Error("Missing 'response' field");
+            }
+            if (data.response && data.response.error) {
+                const err = data.response.error;
+                const msg = String(err.message ? err.message : "An error was returned");
+                if (err._error) {
+                    console.error(err._error);
+                }
+                // Potential XSS attack if 'msg' is not appropriately sanitized,
+                // as it is untrusted input by our parent window (which we assume is Riot).
+                // We can't aggressively sanitize [A-z0-9] since it might be a translation.
+                throw new Error(msg);
+            }
+            // return the response field for the request
+            return data.response;
+        });
+    }
+
+    /**
+     * Register widget message event listeners
+     */
+    startListening() {
+        if (global.mxWidgetMessagingListenerCount === 0) {
+            window.addEventListener("message", this.onMessage, false);
+        }
+        global.mxWidgetMessagingListenerCount += 1;
+    }
+
+    /**
+     * De-register widget message event listeners
+     */
+    stopListening() {
+        global.mxWidgetMessagingListenerCount -= 1;
+        if (global.mxWidgetMessagingListenerCount === 0) {
+            window.removeEventListener("message", this.onMessage);
+        }
+        if (global.mxWidgetMessagingListenerCount < 0) {
+            // Make an error so we get a stack trace
+            const e = new Error(
+                "WidgetMessaging: mismatched startListening / stopListening detected." +
+                " Negative count",
+            );
+            console.error(e);
+        }
+    }
+
+    /**
+     * Register a widget endpoint for trusted postMessage communication
+     * @param {string} widgetId    Unique widget identifier
+     * @param {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
+     */
+    addEndpoint(widgetId, endpointUrl) {
+        const u = URL.parse(endpointUrl);
+        if (!u || !u.protocol || !u.host) {
+            console.warn("Invalid origin:", endpointUrl);
             return;
         }
-        global.mxWidgetMessagingMessageEndpoints.push(endpoint);
-    }
-}
 
-/**
- * De-register a widget endpoint from trusted communication sources
- * @param  {string} widgetId Unique widget identifier
- * @param  {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
- * @return {boolean} True if endpoint was successfully removed
- */
-function removeEndpoint(widgetId, endpointUrl) {
-    const u = URL.parse(endpointUrl);
-    if (!u || !u.protocol || !u.host) {
-        console.warn("Invalid origin");
-        return;
+        const origin = u.protocol + '//' + u.host;
+        const endpoint = new WidgetMessageEndpoint(widgetId, origin);
+        if (global.mxWidgetMessagingMessageEndpoints) {
+            if (global.mxWidgetMessagingMessageEndpoints.some(function(ep) {
+                return (ep.widgetId === widgetId && ep.endpointUrl === endpointUrl);
+            })) {
+                // Message endpoint already registered
+                console.warn("Endpoint already registered");
+                return;
+            }
+            global.mxWidgetMessagingMessageEndpoints.push(endpoint);
+        }
     }
 
-    const origin = u.protocol + '//' + u.host;
-    if (global.mxWidgetMessagingMessageEndpoints && global.mxWidgetMessagingMessageEndpoints.length > 0) {
-        const length = global.mxWidgetMessagingMessageEndpoints.length;
-        global.mxWidgetMessagingMessageEndpoints = global.mxWidgetMessagingMessageEndpoints.filter(function(endpoint) {
-            return (endpoint.widgetId != widgetId || endpoint.endpointUrl != origin);
-        });
-        return (length > global.mxWidgetMessagingMessageEndpoints.length);
-    }
-    return false;
-}
+    /**
+     * De-register a widget endpoint from trusted communication sources
+     * @param  {string} widgetId Unique widget identifier
+     * @param  {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
+     * @return {boolean} True if endpoint was successfully removed
+     */
+    removeEndpoint(widgetId, endpointUrl) {
+        const u = URL.parse(endpointUrl);
+        if (!u || !u.protocol || !u.host) {
+            console.warn("Invalid origin");
+            return;
+        }
 
-
-/**
- * Handle widget postMessage events
- * @param  {Event} event Event to handle
- * @return {undefined}
- */
-function onMessage(event) {
-    if (!event.origin) { // Handle chrome
-        event.origin = event.originalEvent.origin;
-    }
-
-    // Event origin is empty string if undefined
-    if (
-        event.origin.length === 0 ||
-        !trustedEndpoint(event.origin) ||
-        event.data.api !== "widget" ||
-        !event.data.widgetId
-    ) {
-        return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
-    }
-
-    const action = event.data.action;
-    const widgetId = event.data.widgetId;
-    if (action === 'content_loaded') {
-        dis.dispatch({
-            action: 'widget_content_loaded',
-            widgetId: widgetId,
-        });
-        sendResponse(event, {success: true});
-    } else if (action === 'supported_api_versions') {
-        sendResponse(event, {
-            api: "widget",
-            supported_versions: SUPPORTED_WIDGET_API_VERSIONS,
-        });
-    } else if (action === 'api_version') {
-        sendResponse(event, {
-            api: "widget",
-            version: WIDGET_API_VERSION,
-        });
-    } else {
-        console.warn("Widget postMessage event unhandled");
-        sendError(event, {message: "The postMessage was unhandled"});
-    }
-}
-
-/**
- * Check if message origin is registered as trusted
- * @param  {string} origin PostMessage origin to check
- * @return {boolean}       True if trusted
- */
-function trustedEndpoint(origin) {
-    if (!origin) {
+        const origin = u.protocol + '//' + u.host;
+        if (global.mxWidgetMessagingMessageEndpoints && global.mxWidgetMessagingMessageEndpoints.length > 0) {
+            const length = global.mxWidgetMessagingMessageEndpoints.length;
+            global.mxWidgetMessagingMessageEndpoints = global.mxWidgetMessagingMessageEndpoints.
+                filter(function(endpoint) {
+                return (endpoint.widgetId != widgetId || endpoint.endpointUrl != origin);
+            });
+            return (length > global.mxWidgetMessagingMessageEndpoints.length);
+        }
         return false;
     }
 
-    return global.mxWidgetMessagingMessageEndpoints.some((endpoint) => {
-        return endpoint.endpointUrl === origin;
-    });
-}
 
-/**
- * Send a postmessage response to a postMessage request
- * @param  {Event} event  The original postMessage request event
- * @param  {Object} res   Response data
- */
-function sendResponse(event, res) {
-    const data = JSON.parse(JSON.stringify(event.data));
-    data.response = res;
-    event.source.postMessage(data, event.origin);
-}
+    /**
+     * Handle widget postMessage events
+     * @param  {Event} event Event to handle
+     * @return {undefined}
+     */
+    onMessage(event) {
+        if (!event.origin) { // Handle chrome
+            event.origin = event.originalEvent.origin;
+        }
 
-/**
- * Send an error response to a postMessage request
- * @param  {Event} event        The original postMessage request event
- * @param  {string} msg         Error message
- * @param  {Error} nestedError  Nested error event (optional)
- */
-function sendError(event, msg, nestedError) {
-    console.error("Action:" + event.data.action + " failed with message: " + msg);
-    const data = JSON.parse(JSON.stringify(event.data));
-    data.response = {
-        error: {
-            message: msg,
-        },
-    };
-    if (nestedError) {
-        data.response.error._error = nestedError;
+        // Event origin is empty string if undefined
+        if (
+            event.origin.length === 0 ||
+            !this.trustedEndpoint(event.origin) ||
+            event.data.api !== "widget" ||
+            !event.data.widgetId
+        ) {
+            return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
+        }
+
+        const action = event.data.action;
+        const widgetId = event.data.widgetId;
+        if (action === 'content_loaded') {
+            dis.dispatch({
+                action: 'widget_content_loaded',
+                widgetId: widgetId,
+            });
+            this.sendResponse(event, {success: true});
+        } else if (action === 'supported_api_versions') {
+            this.sendResponse(event, {
+                api: "widget",
+                supported_versions: SUPPORTED_WIDGET_API_VERSIONS,
+            });
+        } else if (action === 'api_version') {
+            this.sendResponse(event, {
+                api: "widget",
+                version: WIDGET_API_VERSION,
+            });
+        } else {
+            console.warn("Widget postMessage event unhandled");
+            this.sendError(event, {message: "The postMessage was unhandled"});
+        }
+    }
+
+    /**
+     * Check if message origin is registered as trusted
+     * @param  {string} origin PostMessage origin to check
+     * @return {boolean}       True if trusted
+     */
+    trustedEndpoint(origin) {
+        if (!origin) {
+            return false;
+        }
+
+        return global.mxWidgetMessagingMessageEndpoints.some((endpoint) => {
+            return endpoint.endpointUrl === origin;
+        });
+    }
+
+    /**
+     * Send a postmessage response to a postMessage request
+     * @param  {Event} event  The original postMessage request event
+     * @param  {Object} res   Response data
+     */
+    sendResponse(event, res) {
+        const data = JSON.parse(JSON.stringify(event.data));
+        data.response = res;
+        event.source.postMessage(data, event.origin);
+    }
+
+    /**
+     * Send an error response to a postMessage request
+     * @param  {Event} event        The original postMessage request event
+     * @param  {string} msg         Error message
+     * @param  {Error} nestedError  Nested error event (optional)
+     */
+    sendError(event, msg, nestedError) {
+        console.error("Action:" + event.data.action + " failed with message: " + msg);
+        const data = JSON.parse(JSON.stringify(event.data));
+        data.response = {
+            error: {
+                message: msg,
+            },
+        };
+        if (nestedError) {
+            data.response.error._error = nestedError;
+        }
+        event.source.postMessage(data, event.origin);
     }
-    event.source.postMessage(data, event.origin);
 }
 
+
 /**
  * Represents mapping of widget instance to URLs for trusted postMessage communication.
  */
@@ -317,10 +346,3 @@ class WidgetMessageEndpoint {
         this.endpointUrl = endpointUrl;
     }
 }
-
-export default {
-    startListening: startListening,
-    stopListening: stopListening,
-    addEndpoint: addEndpoint,
-    removeEndpoint: removeEndpoint,
-};

From 6e832c7d73b93c48187c7692792e03ff26c69e45 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Dec 2017 16:28:50 +0000
Subject: [PATCH 123/927] Dedupe requests to fetch group profile data

---
 src/stores/FlairStore.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 55c4978925..e9e84e9aa1 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -39,6 +39,9 @@ class FlairStore {
             //      avatar_url: 'mxc://...'
             //  }
         };
+        this._groupProfilesPromise = {
+            //  $groupId: Promise
+        };
         this._usersPending = {
             //  $userId: {
             //      prom: Promise
@@ -149,15 +152,22 @@ class FlairStore {
             return this._groupProfiles[groupId];
         }
 
-        const profile = await matrixClient.getGroupProfile(groupId);
+        // No request yet, start one
+        if (!this._groupProfilesPromise[groupId]) {
+            this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId);
+        }
+
+        const profile = await this._groupProfilesPromise[groupId];
         this._groupProfiles[groupId] = {
             groupId,
             avatarUrl: profile.avatar_url,
             name: profile.name,
             shortDescription: profile.short_description,
         };
+
         setTimeout(() => {
             delete this._groupProfiles[groupId];
+            delete this._groupProfilesPromise[groupId];
         }, GROUP_PROFILES_CACHE_BUST_MS);
 
         return this._groupProfiles[groupId];

From 66fb73af5dd4b4baecb016d2936f653904f138af Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 15 Dec 2017 13:33:11 +0000
Subject: [PATCH 124/927] Translated using Weblate (Esperanto)

Currently translated at 58.2% (558 of 958 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 3a46ae428c..463713e9ea 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -502,5 +502,59 @@
     "Failed to change password. Is your password correct?": "Malsukcesis ŝanĝi la pasvorton. Ĉu via pasvorto estas ĝusta?",
     "Leave": "Foriri",
     "Register": "Registriĝi",
-    "Add rooms to this community": "Aldoni ĉambrojn al ĉi tiu komunumo"
+    "Add rooms to this community": "Aldoni ĉambrojn al ĉi tiu komunumo",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Kontrolo kontraŭ robotoj ne disponeblas sur labortablo – bonvolu uzi <a>retan foliumilon</a>",
+    "This Home Server would like to make sure you are not a robot": "Tiu ĉi hejmservilo volas certigi, ke vi ne estas roboto",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix per alia hejmservila URL.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Tio ĉi permesos al vi uzi ĉi tiun aplikaĵon kun jama konto de Matrix el alia hejmservilo.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Vi ankaŭ povas agordi propran identigan servilon, sed tio kutime malebligas interagadon kun uzantkontoj bazitaj sur retpoŝto.",
+    "To continue, please enter your password.": "Por daŭrigi, bonvolu enigi vian pasvorton.",
+    "Password:": "Pasvorto:",
+    "An email has been sent to %(emailAddress)s": "Retletero sendiĝis al %(emailAddress)s",
+    "Please check your email to continue registration.": "Bonvolu kontroli vian retpoŝton por daŭrigi la registriĝon.",
+    "Token incorrect": "Malĝusta ĵetono",
+    "A text message has been sent to %(msisdn)s": "Tekstmesaĝo sendiĝîs al %(msisdn)s",
+    "Please enter the code it contains:": "Bonvolu enigi la enhavatan kodon:",
+    "Start authentication": "Komenci aŭtentigon",
+    "Username on %(hs)s": "Uzantnomo je %(hs)s",
+    "User name": "Uzantnomo",
+    "Mobile phone number": "Telefona numero",
+    "Forgot your password?": "Ĉu vi forgesis vian pasvorton?",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
+    "Email address": "Retpoŝtadreso",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se vi ne enigos retpoŝtadreson, vi ne povos restarigi vian pasvorton. Ĉu vi certas?",
+    "Email address (optional)": "Retpoŝtadreso (malnepra)",
+    "You are registering with %(SelectedTeamName)s": "Vi registriĝas kun %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Telefona numero (malnepra)",
+    "Default server": "Implicita servilo",
+    "Custom server": "Propra servilo",
+    "Home server URL": "URL de hejmservilo",
+    "Identity server URL": "URL de identiga servilo",
+    "What does this mean?": "Kion ĝi signifas?",
+    "Remove from community": "Forigi de komunumo",
+    "Disinvite this user from community?": "Ĉu malinviti ĉi tiun uzanton de komunumo?",
+    "Remove this user from community?": "Ĉu forigi ĉi tiun uzanton de komunumo?",
+    "Failed to withdraw invitation": "Malsukcesis malinviti",
+    "Failed to remove user from community": "Malsukcesis forigi uzanton de komunumo",
+    "Filter community members": "Filtri komunumanojn",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ĉu vi certe volas forigi ‹%(roomName)s› de %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Per forigo de ĉambro de la komunumo vi ankaŭ forigos ĝin de la paĝo de tiu komunumo.",
+    "Failed to remove room from community": "Malsukcesis forigi ĉambron de komunumo",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Malsukcesis forigi ‹%(roomName)s› de %(groupId)s",
+    "Something went wrong!": "Io misokazis!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Videbleco de ‹%(roomName)s› en %(groupId)s ne ĝisdatigeblis.",
+    "Visibility in Room List": "Videbleco en Listo de ĉambroj",
+    "Visible to everyone": "Videbla al ĉiuj",
+    "Only visible to community members": "Videbla nur al komunumanoj",
+    "Filter community rooms": "Filtri komunumajn ĉambrojn",
+    "Something went wrong when trying to get your communities.": "Io misokazis dum legado de viaj komunumoj.",
+    "You're not currently a member of any communities.": "Vi nuntempe apartenas al neniu komunumo.",
+    "Unknown Address": "Nekonata adreso",
+    "NOTE: Apps are not end-to-end encrypted": "RIMARKO: Aplikaĝoj ne estas ĝiscele ĉifritaj",
+    "Do you want to load widget from URL:": "Ĉu vi volas enlegi fenestraĵon el URL:",
+    "Allow": "Permesi",
+    "Delete Widget": "Forigi fenestraĵon",
+    "Delete widget": "Forigi fenestraĵon",
+    "Revoke widget access": "Malvalidigi atingon de fenestraĵo",
+    "Create new room": "Krei novan ĉambron"
 }

From 86f1dc1130c05dbf717c7f62c70ccc16e500db8d Mon Sep 17 00:00:00 2001
From: Juho Ylikorpi <juho@ylikorpi.com>
Date: Thu, 14 Dec 2017 18:40:10 +0000
Subject: [PATCH 125/927] Translated using Weblate (Finnish)

Currently translated at 92.0% (882 of 958 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 4752d68999..5c7095b511 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -255,7 +255,7 @@
     "Public Chat": "Julkinen keskustelu",
     "Reason": "Syy",
     "Reason: %(reasonText)s": "Syy: %(reasonText)s",
-    "Register": "Rekisteröi",
+    "Register": "Rekisteröidy",
     "Reject invitation": "Hylkää kutsu",
     "Rejoin": "Liity uudestaan",
     "Remove Contact Information?": "Poista yhteystiedot?",
@@ -854,7 +854,7 @@
     "Leave": "Poistu",
     "Unable to leave room": "Poistuminen epäonnistui",
     "Community Settings": "Yhteisöasetukset",
-    "Add rooms to this community": "Lisää huoneita tähän yhteisöön",
+    "Add rooms to this community": "Lisää huoneita yhteisöön",
     "Featured Rooms:": "Esiinnostetut huoneet:",
     "Featured Users:": "Esiinnostetut käyttäjät:",
     "%(inviter)s has invited you to join this community": "%(inviter)s on kutsunut sinut tähän yhteisöön",
@@ -886,5 +886,64 @@
     "Ignores a user, hiding their messages from you": "Jättää käyttäjän huomioimatta jolloin heidän viestejä ei näytetä sinulle",
     "Stops ignoring a user, showing their messages going forward": "Lopettaa käyttäjän huomiotta jättämisen jolloin heidän tulevat viestit näytetään sinulle",
     "Notify the whole room": "Hälytä koko huone",
-    "Room Notification": "Huonehälytys"
+    "Room Notification": "Huonehälytys",
+    "Call Failed": "Puhelu epäonnistui",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Huoneessa on tuntemattomia laitteita: jos jatkat varmentamatta niitä, joku voi kuunnella puheluasi.",
+    "Review Devices": "Näytä Laitteet",
+    "Call Anyway": "Soita",
+    "Answer Anyway": "Vastaa",
+    "Call": "Puhelu",
+    "Answer": "Vastaa",
+    "Call Timeout": "Puhelun aikakatkaisu",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(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",
+    "Ignored user": "Estetyt käyttäjät",
+    "Unignored user": "Sallitut käyttäjät",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s tasolta %(fromPowerLevel)s tasolle %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s muutettiin tehotasoa %(powerLevelDiffText)s.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s pienoisohjelmaa muokannut %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s pienoisohjelman lisännyt %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s pienoisohjelman poistanut %(senderName)s",
+    "Send": "Lähetä",
+    "Presence Management": "Tilanhallinta",
+    "Tag Panel": "Tagit",
+    "Delete %(count)s devices|other": "Poista %(count)s laitetta",
+    "Delete %(count)s devices|one": "Poista laite",
+    "Select devices": "Valitse laitteet",
+    "Ongoing conference call%(supportedText)s.": "Menossa oleva ryhmäpuhelu %(supportedText)s.",
+    "%(duration)ss": "%(duration)s",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)s päivä",
+    "Online for %(duration)s": "Läsnä %(duration)s",
+    "Idle for %(duration)s": "Toimettomana %(duration)s",
+    "Offline for %(duration)s": "Poissa %(duration)s",
+    "Unknown for %(duration)s": "Tuntematon %(duration)s",
+    "Online": "Online",
+    "Idle": "Toimeton",
+    "Offline": "Offline",
+    "Unknown": "Tuntematon",
+    "To change the room's avatar, you must be a": "Vaihtaaksesi huoneen kuvan, sinun tulee olla",
+    "To change the room's name, you must be a": "Vaihtaaksesi huoneen nimen, sinun tulee olla",
+    "To change the room's main address, you must be a": "Vaihtaaksesi huoneen osoitteen, sinun tulee olla",
+    "To change the room's history visibility, you must be a": "Vaihtaaksesi huoneen historiatietojen näkyvyyttä, sinun tulee olla",
+    "To change the permissions in the room, you must be a": "Vaihtaaksesi huoneen oikeuksia, sinun tulee olla",
+    "To change the topic, you must be a": "Vaihtaaksesi huoneen aihetta, sinun tulee olla",
+    "To modify widgets in the room, you must be a": "Vaihtaaksesi huoneen pienoisohjelmia, sinun tulee olla",
+    "Addresses": "Osoitteet",
+    "Flair": "Tyyppi",
+    "Showing flair for these communities:": "Yhteisöjen tyypit:",
+    "This room is not showing flair for any communities": "Tälle huoneelle ei ole määritelty minkään yhteisön tyyppiä",
+    "URL previews are enabled by default for participants in this room.": "URL esikatselut on päällä oletusarvoisesti tämän huoneen jäsenillä.",
+    "URL previews are disabled by default for participants in this room.": "URL esikatselut ovat oletuksena pois päältä tämän huoneen jäsenillä.",
+    "Token incorrect": "Väärä tunniste",
+    "Flair will appear if enabled in room settings": "Tyyppi näkyy jos määritelty tämän huoneen asetuksissa",
+    "Flair will not appear": "Tyyppi ei näkyvissä",
+    "Something went wrong when trying to get your communities.": "Jokin meni pieleen haettaessa yhteisöjäsi.",
+    "Delete Widget": "Poista pienoisohjelma",
+    "Revoke widget access": "Poista pienoisohjelman oikeudet",
+    "Unblacklist": "Poista estolistalta",
+    "Blacklist": "Estolista",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s käyttäjää liittyi"
 }

From 74bc992fd94e2af301d9f1ade82909e525b19226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6ller=20Bertalan?= <petbottle@protonmail.com>
Date: Thu, 14 Dec 2017 18:38:04 +0000
Subject: [PATCH 126/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f20370f40d..35278a5975 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -747,7 +747,7 @@
     "PM": "du",
     "Revoke widget access": "Kisalkalmazás hozzáférésének visszavonása",
     "Sets the room topic": "Szoba téma beállítás",
-    "Show Apps": "Alkalmazások megmutatása",
+    "Show Apps": "Alkalmazások mutatása",
     "To get started, please pick a username!": "Az induláshoz válassz egy felhasználói nevet!",
     "Unable to create widget.": "Nem lehet kisalkalmazást létrehozni.",
     "Unbans user with given id": "Visszaengedi a megadott azonosítójú felhasználót",
@@ -1018,9 +1018,9 @@
     "URL previews are disabled by default for participants in this room.": "Az URL előnézet alapértelmezetten tiltva van a szobában jelenlévőknek.",
     "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Mindet újraküldöd</resendText> vagy <cancelText>mindet megszakítod</cancelText>. De egyenként is kijelölheted az üzenetet elküldésre vagy megszakításra.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Senki más nincs itt! Szeretnél <inviteText>meghívni másokat</inviteText> vagy <nowarnText>leállítod a figyelmeztetést az üres szobára</nowarnText>?",
-    "%(duration)ss": "%(duration)s mp.",
-    "%(duration)sm": "%(duration)s p.",
-    "%(duration)sh": "%(duration)s ó.",
+    "%(duration)ss": "%(duration)s mp",
+    "%(duration)sm": "%(duration)s p",
+    "%(duration)sh": "%(duration)s ó",
     "%(duration)sd": "%(duration)s nap",
     "Online for %(duration)s": "%(duration)s óta elérhető",
     "Idle for %(duration)s": "%(duration)s óta tétlen",

From 56f497d39eddefa036bb9c81fe1c27e9f799f69a Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 15 Dec 2017 16:39:04 +0000
Subject: [PATCH 127/927] Add comments and outbound postmessage action to
 request a widget screenshot.

---
 src/WidgetMessaging.js | 53 ++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 7cd18132af..a35dc3d714 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -52,8 +52,8 @@ They look like:
 }
 The "message" key should be a human-friendly string.
 
-ACTIONS
-=======
+INBOUND ACTIONS
+===============
 ** All actions must include an "api" field with valie "widget".**
 All actions can return an error response instead of the response outlined below.
 
@@ -109,6 +109,45 @@ Example:
     action: "supported_api_versions",
 }
 
+
+OUTBOUND ACTIONS
+================
+
+In addition to listening for inbound requests, the API can be used to initiate
+actionss in the widget iframe, and request data from the widget instance.
+
+Outbound actions use the "widget_client" API key / name, which must be included
+on all requests.
+
+{
+    api: "widget_client",
+    action: "screenshot",
+    widgetId: $WIDGET_ID,
+    data: {}
+    // additional request fields
+}
+
+
+screenshot
+----------
+
+Request a screenshot from the widget (if supported).
+This can only be supported by widgets that have access to all of their DOM tree.
+For example, widgets that nest further levels of iframes can not support this.
+
+Request:
+ - No additional fields.
+Response:
+{
+    screenshot: {data...}
+}
+Example:
+{
+    api: "widget_client",
+    action: "screenshot",
+    widgetId: $WIDGET_ID
+}
+
 */
 
 import URL from 'url';
@@ -323,6 +362,16 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
         }
         event.source.postMessage(data, event.origin);
     }
+
+    /**
+     * Request a screenshot from a widget
+     */
+    getScreenshot() {
+        const screenshot = this.exec({
+            action: "screenshot",
+        });
+        console.warn("got screenshot", screenshot);
+    }
 }
 
 

From 9f733ebc940760059ecf6321163b1c2f67a9098c Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 15 Dec 2017 16:55:33 +0000
Subject: [PATCH 128/927] Fix binding and promise handling

---
 src/WidgetMessaging.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index a35dc3d714..1180dd2df2 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -198,7 +198,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      */
     startListening() {
         if (global.mxWidgetMessagingListenerCount === 0) {
-            window.addEventListener("message", this.onMessage, false);
+            window.addEventListener("message", () => this.onMessage, false);
         }
         global.mxWidgetMessagingListenerCount += 1;
     }
@@ -209,7 +209,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
     stopListening() {
         global.mxWidgetMessagingListenerCount -= 1;
         if (global.mxWidgetMessagingListenerCount === 0) {
-            window.removeEventListener("message", this.onMessage);
+            window.removeEventListener("message", () => this.onMessage);
         }
         if (global.mxWidgetMessagingListenerCount < 0) {
             // Make an error so we get a stack trace
@@ -367,10 +367,11 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      * Request a screenshot from a widget
      */
     getScreenshot() {
-        const screenshot = this.exec({
+        this.exec({
             action: "screenshot",
+        }).then(function(screenshot) {
+            console.warn("got screenshot", screenshot);
         });
-        console.warn("got screenshot", screenshot);
     }
 }
 

From f2ad7be3f3e77a38bb15aa5a2faffa50b54f38c8 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 15 Dec 2017 16:56:02 +0000
Subject: [PATCH 129/927] Add event handlers and comments.

---
 src/components/views/elements/AppTile.js | 33 ++++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 812d8e8bdd..d97f844038 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -155,12 +155,15 @@ export default React.createClass({
     },
 
     componentWillMount() {
-        WidgetMessaging.startListening();
-        WidgetMessaging.addEndpoint(this.props.id, this.props.url);
-        window.addEventListener('message', this._onMessage, false);
         this.setScalarToken();
     },
 
+    componentDidMount() {
+        // Legacy Jitsi widget messaging -- TODO replace this with standard widget
+        // postMessaging API
+        window.addEventListener('message', this._onMessage, false);
+    },
+
     /**
      * Adds a scalar token to the widget URL, if required
      * Component initialisation is only complete when this function has resolved
@@ -234,6 +237,8 @@ export default React.createClass({
         }
     },
 
+    // Legacy Jitsi widget messaging
+    // TODO -- This should be replaced with the new widget postMessaging API
     _onMessage(event) {
         if (this.props.type !== 'jitsi') {
             return;
@@ -268,14 +273,16 @@ export default React.createClass({
     },
 
     _onSnapshotClick(e) {
-        const iframe = this.refs.appFrame;
-        domtoimage.toPng(iframe).then(function(dataUrl) {
-            console.log("Image data URL:", dataUrl);
-            dis.dispatch({
-                action: 'picture_snapshot',
-                file: dataURLtoBlob(dataUrl),
-            }, true);
-        });
+        console.warn("Requesting widget snapshot");
+        this.widgetMessaging.getScreenshot();
+        // const iframe = this.refs.appFrame;
+        // domtoimage.toPng(iframe).then(function(dataUrl) {
+        //     console.log("Image data URL:", dataUrl);
+        //     dis.dispatch({
+        //         action: 'picture_snapshot',
+        //         file: dataURLtoBlob(dataUrl),
+        //     }, true);
+        // });
     },
 
     /* If user has permission to modify widgets, delete the widget,
@@ -317,6 +324,10 @@ export default React.createClass({
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
+        // console.warn("App frame", this.refs.appFrame.contentWindow);
+        this.widgetMessaging = new WidgetMessaging(this.refs.appFrame.contentWindow);
+        this.widgetMessaging.startListening();
+        this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
         this.setState({loading: false});
     },
 

From 6f896098e380c5817fa88e6fc1dfa8e7932270c8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 15 Dec 2017 17:14:56 +0000
Subject: [PATCH 130/927] Get Group profile from TagTile instead of TagPanel

So that instead of getting all group profiles everytime the tags
change order, get them when the TagTile mounts for a group tag.
---
 src/components/structures/TagPanel.js       | 32 +++++----------------
 src/components/views/elements/DNDTagTile.js |  6 ++--
 src/components/views/elements/TagTile.js    | 27 ++++++++++++++---
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 49d22d8e52..aa35101197 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -18,7 +18,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
 import FilterStore from '../../stores/FilterStore';
-import FlairStore from '../../stores/FlairStore';
 import TagOrderStore from '../../stores/TagOrderStore';
 
 import GroupActions from '../../actions/GroupActions';
@@ -36,17 +35,7 @@ const TagPanel = React.createClass({
 
     getInitialState() {
         return {
-            // A list of group profiles for tags that are group IDs. The intention in future
-            // is to allow arbitrary tags to be selected in the TagPanel, not just groups.
-            // For now, it suffices to maintain a list of ordered group profiles.
-            orderedGroupTagProfiles: [
-            // {
-            //     groupId: '+awesome:foo.bar',{
-            //     name: 'My Awesome Community',
-            //     avatarUrl: 'mxc://...',
-            //     shortDescription: 'Some description...',
-            // },
-            ],
+            orderedTags: [],
             selectedTags: [],
         };
     },
@@ -67,15 +56,8 @@ const TagPanel = React.createClass({
             if (this.unmounted) {
                 return;
             }
-
-            const orderedTags = TagOrderStore.getOrderedTags() || [];
-            const orderedGroupTags = orderedTags.filter((t) => t[0] === '+');
-            // XXX: One profile lookup failing will bring the whole lot down
-            Promise.all(orderedGroupTags.map(
-                (groupId) => FlairStore.getGroupProfileCached(this.context.matrixClient, groupId),
-            )).then((orderedGroupTagProfiles) => {
-                if (this.unmounted) return;
-                this.setState({orderedGroupTagProfiles});
+            this.setState({
+                orderedTags: TagOrderStore.getOrderedTags() || [],
             });
         });
         // This could be done by anything with a matrix client
@@ -113,11 +95,11 @@ const TagPanel = React.createClass({
         const TintableSvg = sdk.getComponent('elements.TintableSvg');
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
 
-        const tags = this.state.orderedGroupTagProfiles.map((groupProfile, index) => {
+        const tags = this.state.orderedTags.map((tag, index) => {
             return <DNDTagTile
-                key={groupProfile.groupId + '_' + index}
-                groupProfile={groupProfile}
-                selected={this.state.selectedTags.includes(groupProfile.groupId)}
+                key={tag + '_' + index}
+                tag={tag}
+                selected={this.state.selectedTags.includes(tag)}
                 onEndDrag={this.onTagTileEndDrag}
             />;
         });
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 4d03534980..539163d0dc 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -29,7 +29,7 @@ const tagTileSource = {
     beginDrag: function(props) {
         // Return the data describing the dragged item
         return {
-            tag: props.groupProfile.groupId,
+            tag: props.tag,
         };
     },
 
@@ -55,7 +55,7 @@ const tagTileTarget = {
         dis.dispatch({
             action: 'order_tag',
             tag: monitor.getItem().tag,
-            targetTag: props.groupProfile.groupId,
+            targetTag: props.tag,
             // Note: we indicate that the tag should be after the target when
             // it's being dragged over the top half of the target.
             after: draggedY < targetY,
@@ -65,7 +65,7 @@ const tagTileTarget = {
     drop(props) {
         // Return the data to be returned by getDropResult
         return {
-            tag: props.groupProfile.groupId,
+            tag: props.tag,
         };
     },
 };
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 124559a838..9bad02e37d 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -22,17 +22,36 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
 
+import FlairStore from '../../../stores/FlairStore';
+
 export default React.createClass({
     displayName: 'TagTile',
 
     propTypes: {
-        groupProfile: PropTypes.object,
+        tag: PropTypes.string,
     },
 
     contextTypes: {
         matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
     },
 
+    componentWillMount() {
+        this.unmounted = false;
+        if (this.props.tag[0] === '+') {
+            FlairStore.getGroupProfileCached(
+                this.context.matrixClient,
+                this.props.tag,
+            ).then((profile) => {
+                if (this.unmounted) return;
+                this.setState({profile});
+            });
+        }
+    },
+
+    componentWillUnmount() {
+        this.unmounted = true;
+    },
+
     getInitialState() {
         return {
             hover: false,
@@ -44,7 +63,7 @@ export default React.createClass({
         e.stopPropagation();
         dis.dispatch({
             action: 'select_tag',
-            tag: this.props.groupProfile.groupId,
+            tag: this.props.tag,
             ctrlOrCmdKey: isOnlyCtrlOrCmdKeyEvent(e),
             shiftKey: e.shiftKey,
         });
@@ -62,8 +81,8 @@ export default React.createClass({
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const RoomTooltip = sdk.getComponent('rooms.RoomTooltip');
-        const profile = this.props.groupProfile || {};
-        const name = profile.name || profile.groupId;
+        const profile = this.state.profile || {};
+        const name = profile.name || this.props.tag;
         const avatarHeight = 35;
 
         const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(

From 4043ea7d5730231775402e59790077aff347c43e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Dec 2017 17:57:24 +0000
Subject: [PATCH 131/927] change CSS classes and i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/QuotePreview.js | 11 ++++++-----
 src/i18n/strings/en_EN.json                |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/QuotePreview.js b/src/components/views/rooms/QuotePreview.js
index 2259350cdc..6b30e73a51 100644
--- a/src/components/views/rooms/QuotePreview.js
+++ b/src/components/views/rooms/QuotePreview.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import dis from '../../../dispatcher';
 import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
 import RoomViewStore from '../../../stores/RoomViewStore';
 
 function cancelQuoting() {
@@ -60,14 +61,14 @@ export default class QuotePreview extends React.Component {
         const EventTile = sdk.getComponent('rooms.EventTile');
         const EmojiText = sdk.getComponent('views.elements.EmojiText');
 
-        return <div className="mx_Quoting">
-            <div className="mx_Quoting_section">
-                <EmojiText element="div" className="mx_Quoting_header mx_Quoting_title">💬 Quoting</EmojiText>
-                <div className="mx_Quoting_header mx_Quoting_cancel">
+        return <div className="mx_QuotePreview">
+            <div className="mx_QuotePreview_section">
+                <EmojiText element="div" className="mx_QuotePreview_header mx_QuotePreview_title">💬 { _t('Quoting') }</EmojiText>
+                <div className="mx_QuotePreview_header mx_QuotePreview_cancel">
                     <img className="mx_filterFlipColor" src="img/cancel.svg" width="18" height="18"
                          onClick={cancelQuoting} />
                 </div>
-                <div className="mx_Quoting_clear" />
+                <div className="mx_QuotePreview_clear" />
                 <EventTile mxEvent={this.state.event} last={true} tileShape="quote" />
             </div>
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d632692e04..db9f1e35e1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -939,5 +939,6 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
-    "Import": "Import"
+    "Import": "Import",
+    "Quoting": "Quoting"
 }

From 0ad0c0e9f70b6a256692e7e1f6436880fb62a2e4 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Dec 2017 18:39:01 +0000
Subject: [PATCH 132/927] finish i18n, and add a Date Sep to quote if it needs
 it

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Quote.js       | 31 ++++++++++++++++++--
 src/components/views/messages/TextualBody.js |  3 +-
 src/i18n/strings/en_EN.json                  |  3 +-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index 96bebf8bcd..a417e9a6de 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -15,13 +15,31 @@ limitations under the License.
 */
 import React from 'react';
 import sdk from '../../../index';
+import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import {MatrixEvent} from 'matrix-js-sdk';
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
 const REGEX_LOCAL_MATRIXTO = /^#\/room\/(([\#\!])[^\/]*)\/(\$[^\/]*)$/;
 
+const MILLIS_IN_DAY = 86400000;
+function wantsDateSeparator(parentEvent, event) {
+    const parentEventDate = parentEvent.getDate();
+    const eventDate = event.getDate();
+    if (!eventDate || !parentEventDate) {
+        return false;
+    }
+    // Return early for events that are > 24h apart
+    if (Math.abs(parentEvent.getTs() - eventDate.getTime()) > MILLIS_IN_DAY) {
+        return true;
+    }
+
+    // Compare weekdays
+    return parentEventDate.getDay() !== eventDate.getDay();
+}
+
 const Quote = React.createClass({
     statics: {
         isMessageUrl: (url) => {
@@ -36,6 +54,8 @@ const Quote = React.createClass({
     props: {
         // The matrix.to url of the event
         url: PropTypes.string,
+        // The parent event
+        parentEv: PropTypes.instanceOf(MatrixEvent),
         // Whether to include an avatar in the pill
         shouldShowPillAvatar: PropTypes.bool,
     },
@@ -98,14 +118,21 @@ const Quote = React.createClass({
         const ev = this.state.event;
         if (ev) {
             const EventTile = sdk.getComponent('views.rooms.EventTile');
-            return <blockquote>
+            let dateSep = null;
+            if (wantsDateSeparator(this.props.parentEv, this.state.event)) {
+                const DateSeparator = sdk.getComponent('messages.DateSeparator');
+                dateSep = <a href={this.props.url}><DateSeparator ts={this.state.event.getDate()} /></a>;
+            }
+
+            return <blockquote className="mx_Quote">
+                { dateSep }
                 <EventTile mxEvent={ev} tileShape="quote" />
             </blockquote>;
         }
 
         // Deliberately render nothing if the URL isn't recognised
         return <div>
-            <a href={this.props.url}>Quote</a>
+            <a href={this.props.url}>{ _t('Quote') }</a>
             <br />
         </div>;
     },
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 4c41cbe669..adf79d3135 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -208,7 +208,8 @@ module.exports = React.createClass({
                     // only allow this branch if we're not already in a quote, as fun as infinite nesting is.
                     const quoteContainer = document.createElement('span');
 
-                    const quote = <Quote url={href} shouldShowPillAvatar={shouldShowPillAvatar} />;
+                    const quote =
+                        <Quote url={href} parentEv={this.props.mxEvent} shouldShowPillAvatar={shouldShowPillAvatar} />;
 
                     ReactDOM.render(quote, quoteContainer);
                     node.parentNode.replaceChild(quoteContainer, node);
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index db9f1e35e1..908a203a42 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -940,5 +940,6 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
-    "Quoting": "Quoting"
+    "Quoting": "Quoting",
+    "Rich Quoting": "Rich Quoting"
 }

From 954c6eecd6665d204a4fb9ec7767971b4db84dc2 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 15 Dec 2017 19:42:06 +0000
Subject: [PATCH 133/927] Set correct API name.

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

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 1180dd2df2..134f93f0f7 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -368,6 +368,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      */
     getScreenshot() {
         this.exec({
+            api: "widget_client",
             action: "screenshot",
         }).then(function(screenshot) {
             console.warn("got screenshot", screenshot);

From 9baf71c4fce4566706be50c671553af8a6f298b5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 15 Dec 2017 19:52:47 +0000
Subject: [PATCH 134/927] only pass one child to EmojiText otherwise it cries

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

diff --git a/src/components/views/rooms/QuotePreview.js b/src/components/views/rooms/QuotePreview.js
index 6b30e73a51..7241feeac6 100644
--- a/src/components/views/rooms/QuotePreview.js
+++ b/src/components/views/rooms/QuotePreview.js
@@ -63,7 +63,11 @@ export default class QuotePreview extends React.Component {
 
         return <div className="mx_QuotePreview">
             <div className="mx_QuotePreview_section">
-                <EmojiText element="div" className="mx_QuotePreview_header mx_QuotePreview_title">💬 { _t('Quoting') }</EmojiText>
+                <EmojiText element="div" className="mx_QuotePreview_header mx_QuotePreview_title">
+                    <span>
+                        💬 { _t('Quoting') }
+                    </span>
+                </EmojiText>
                 <div className="mx_QuotePreview_header mx_QuotePreview_cancel">
                     <img className="mx_filterFlipColor" src="img/cancel.svg" width="18" height="18"
                          onClick={cancelQuoting} />

From e63f5696a6897341d24909bb53bb97e049654be0 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 15 Dec 2017 21:36:02 +0000
Subject: [PATCH 135/927] Screenshot handlers

---
 src/WidgetMessaging.js                   | 19 ++++++++++++++-----
 src/components/views/elements/AppTile.js | 17 ++++++++---------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 134f93f0f7..2efdc366b6 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -153,6 +153,7 @@ Example:
 import URL from 'url';
 import dis from './dispatcher';
 import MatrixPostMessageApi from './MatrixPostMessageApi';
+import Promise from 'bluebird';
 
 const WIDGET_API_VERSION = '0.0.1'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -197,6 +198,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      * Register widget message event listeners
      */
     startListening() {
+        this.start();
         if (global.mxWidgetMessagingListenerCount === 0) {
             window.addEventListener("message", () => this.onMessage, false);
         }
@@ -207,6 +209,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      * De-register widget message event listeners
      */
     stopListening() {
+        this.stop();
         global.mxWidgetMessagingListenerCount -= 1;
         if (global.mxWidgetMessagingListenerCount === 0) {
             window.removeEventListener("message", () => this.onMessage);
@@ -365,13 +368,19 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
 
     /**
      * Request a screenshot from a widget
+     * @return {Promise} To be resolved when screenshot has been generated
      */
     getScreenshot() {
-        this.exec({
-            api: "widget_client",
-            action: "screenshot",
-        }).then(function(screenshot) {
-            console.warn("got screenshot", screenshot);
+        return new Promise((resolve, reject) => {
+            this.exec({
+                api: "widget_client",
+                action: "screenshot",
+            }).then(function(response) {
+                // console.warn("got screenshot", response.screenshot);
+                resolve(response.screenshot);
+            }).catch((error) => {
+                reject(Error("Failed to get screenshot: " + error.message));
+            });
         });
     }
 }
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index d97f844038..b10d7f91ad 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -274,15 +274,14 @@ export default React.createClass({
 
     _onSnapshotClick(e) {
         console.warn("Requesting widget snapshot");
-        this.widgetMessaging.getScreenshot();
-        // const iframe = this.refs.appFrame;
-        // domtoimage.toPng(iframe).then(function(dataUrl) {
-        //     console.log("Image data URL:", dataUrl);
-        //     dis.dispatch({
-        //         action: 'picture_snapshot',
-        //         file: dataURLtoBlob(dataUrl),
-        //     }, true);
-        // });
+        this.widgetMessaging.getScreenshot().then((screenshot) => {
+            dis.dispatch({
+                action: 'picture_snapshot',
+                file: screenshot,
+            }, true);
+        }).catch((err) => {
+            console.error("Failed to get screenshot", err);
+        });
     },
 
     /* If user has permission to modify widgets, delete the widget,

From 83f9a4162b1fd3d5dcd279dc227583fb142a25d6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Sat, 16 Dec 2017 09:16:24 +0000
Subject: [PATCH 136/927] Request capabilities (e.g. ability to take snapshots)
 from widgets.

---
 src/WidgetMessaging.js                   | 14 +++++++++++
 src/components/views/elements/AppTile.js | 32 +++++++++++++-----------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 2efdc366b6..d71d86f8f5 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -383,6 +383,20 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
             });
         });
     }
+
+    getCapabilities() {
+        return new Promise((resolve, reject) => {
+            this.exec({
+                api: "widget_client",
+                action: "capabilities",
+            }).then(function(response) {
+                // console.warn("got capabilities", response.capabilities);
+                resolve(response.capabilities);
+            }).catch((error) => {
+                reject(Error("Failed to get capabilities: " + error.message));
+            });
+        });
+    }
 }
 
 
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index b10d7f91ad..770406e645 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -33,7 +33,6 @@ import AppWarning from './AppWarning';
 import MessageSpinner from './MessageSpinner';
 import WidgetUtils from '../../../WidgetUtils';
 import dis from '../../../dispatcher';
-import domtoimage from 'dom-to-image';
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 
@@ -83,9 +82,20 @@ export default React.createClass({
             error: null,
             deleting: false,
             widgetPageTitle: newProps.widgetPageTitle,
+            capabilities: [],
         };
     },
 
+
+    /**
+     * Does the widget support a given capability
+     * @param  {[type]}  capability Capability to check for
+     * @return {Boolean}            True if capability supported
+     */
+    _hasCapability(capability) {
+        return this.state.capabilities.some((c) => {return c === capability;});
+    },
+
     /**
      * Add widget instance specific parameters to pass in wUrl
      * Properties passed to widget instance:
@@ -327,6 +337,12 @@ export default React.createClass({
         this.widgetMessaging = new WidgetMessaging(this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
+        this.widgetMessaging.getCapabilities().then((capabilities) => {
+            console.log("Got widget capabilities", this.widgetId, capabilities);
+            this.setState({capabilities});
+        }).catch((err) => {
+            console.log("Failed to get widget capabilities", this.widgetId, err);
+        });
         this.setState({loading: false});
     },
 
@@ -468,7 +484,7 @@ export default React.createClass({
         }
 
         // Picture snapshot
-        const showPictureSnapshotButton = true; // FIXME - Make this dynamic
+        const showPictureSnapshotButton = this._hasCapability('screenshot');
         const showPictureSnapshotIcon = 'img/camera_green.svg';
         const windowStateIcon = (this.props.show ? 'img/minimize.svg' : 'img/maximize.svg');
 
@@ -525,15 +541,3 @@ export default React.createClass({
         );
     },
 });
-
-function dataURLtoBlob(dataurl) {
-    const arr = dataurl.split(',');
-    const mime = arr[0].match(/:(.*?);/)[1];
-    const bstr = atob(arr[1]);
-    let n = bstr.length;
-    const u8arr = new Uint8Array(n);
-    while (n--) {
-        u8arr[n] = bstr.charCodeAt(n);
-    }
-    return new Blob([u8arr], {type: mime});
-}

From dca6fb6b816881ed1f7a4d8b4618f8b635c6dbf7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 16 Dec 2017 20:04:32 -0700
Subject: [PATCH 137/927] Attempt to re-register for a scalar token if ours is
 invalid

This mostly helps with people migrating between integration managers where their old scalar token may no longer be valid. This also solves the problem of people switching between scalar and scalar-staging in the wild.

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/ScalarAuthClient.js | 50 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 3e775a94ab..0d67a08eac 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -38,11 +38,53 @@ class ScalarAuthClient {
 
     // Returns a scalar_token string
     getScalarToken() {
-        const tok = window.localStorage.getItem("mx_scalar_token");
-        if (tok) return Promise.resolve(tok);
+        const token = window.localStorage.getItem("mx_scalar_token");
 
-        // No saved token, so do the dance to get one. First, we
-        // need an openid bearer token from the HS.
+        if (!token) {
+            return this.registerForToken();
+        } else {
+            return this.validateToken(token).then(userId => {
+                const me = MatrixClientPeg.get().getUserId();
+                if (userId !== me) {
+                    throw new Error("Scalar token is owned by someone else: " + me);
+                }
+                return token;
+            }).catch(err => {
+                console.error(err);
+
+                // Something went wrong - try to get a new token.
+                console.warn("Registering for new scalar token");
+                return this.registerForToken();
+            })
+        }
+    }
+
+    validateToken(token) {
+        let url = SdkConfig.get().integrations_rest_url + "/account";
+
+        const defer = Promise.defer();
+        request({
+            method: "GET",
+            uri: url,
+            qs: {scalar_token: token},
+            json: true,
+        }, (err, response, body) => {
+            if (err) {
+                defer.reject(err);
+            } else if (response.statusCode / 100 !== 2) {
+                defer.reject({statusCode: response.statusCode});
+            } else if (!body || !body.user_id) {
+                defer.reject(new Error("Missing user_id in response"));
+            } else {
+                defer.resolve(body.user_id);
+            }
+        });
+
+        return defer.promise;
+    }
+
+    registerForToken() {
+        // Get openid bearer token from the HS as the first part of our dance
         return MatrixClientPeg.get().getOpenIdToken().then((token_object) => {
             // Now we can send that to scalar and exchange it for a scalar token
             return this.exchangeForScalarToken(token_object);

From 9603b21199a080cbcae58a22e312afa396094fe6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 17 Dec 2017 20:20:45 +0000
Subject: [PATCH 138/927] s/Quote/Reply/ and ES6 tweaks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Quote.js       | 54 +++++++++-----------
 src/components/views/messages/TextualBody.js |  2 +-
 src/components/views/rooms/QuotePreview.js   |  4 +-
 src/i18n/strings/en_EN.json                  |  4 +-
 src/settings/Settings.js                     |  2 +-
 5 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index a417e9a6de..f1fa3bdbac 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -40,38 +40,36 @@ function wantsDateSeparator(parentEvent, event) {
     return parentEventDate.getDay() !== eventDate.getDay();
 }
 
-const Quote = React.createClass({
-    statics: {
-        isMessageUrl: (url) => {
-            return !!REGEX_LOCAL_MATRIXTO.exec(url);
-        },
-    },
+export default class Quote extends React.Component {
+    static isMessageUrl(url) {
+        return !!REGEX_LOCAL_MATRIXTO.exec(url);
+    }
 
-    childContextTypes: {
-        matrixClient: React.PropTypes.object,
-    },
+    static childContextTypes = {
+        matrixClient: PropTypes.object,
+    };
 
-    props: {
+    static propTypes = {
         // The matrix.to url of the event
         url: PropTypes.string,
         // The parent event
         parentEv: PropTypes.instanceOf(MatrixEvent),
-        // Whether to include an avatar in the pill
-        shouldShowPillAvatar: PropTypes.bool,
-    },
+    };
 
-    getChildContext: function() {
-        return {
-            matrixClient: MatrixClientPeg.get(),
-        };
-    },
+    constructor(props, context) {
+        super(props, context);
 
-    getInitialState() {
-        return {
+        this.state = {
             // The event related to this quote
             event: null,
         };
-    },
+    }
+
+    getChildContext() {
+        return {
+            matrixClient: MatrixClientPeg.get(),
+        };
+    }
 
     componentWillReceiveProps(nextProps) {
         let roomId;
@@ -96,11 +94,11 @@ const Quote = React.createClass({
         // Only try and load the event if we know about the room
         // otherwise we just leave a `Quote` anchor which can be used to navigate/join the room manually.
         if (room) this.getEvent(room, eventId);
-    },
+    }
 
     componentWillMount() {
         this.componentWillReceiveProps(this.props);
-    },
+    }
 
     async getEvent(room, eventId) {
         let event = room.findEventById(eventId);
@@ -112,9 +110,9 @@ const Quote = React.createClass({
         await MatrixClientPeg.get().getEventTimeline(room.getUnfilteredTimelineSet(), eventId);
         event = room.findEventById(eventId);
         this.setState({room, event});
-    },
+    }
 
-    render: function() {
+    render() {
         const ev = this.state.event;
         if (ev) {
             const EventTile = sdk.getComponent('views.rooms.EventTile');
@@ -135,7 +133,5 @@ const Quote = React.createClass({
             <a href={this.props.url}>{ _t('Quote') }</a>
             <br />
         </div>;
-    },
-});
-
-export default Quote;
+    }
+}
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index adf79d3135..54576fa794 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -209,7 +209,7 @@ module.exports = React.createClass({
                     const quoteContainer = document.createElement('span');
 
                     const quote =
-                        <Quote url={href} parentEv={this.props.mxEvent} shouldShowPillAvatar={shouldShowPillAvatar} />;
+                        <Quote url={href} parentEv={this.props.mxEvent} />;
 
                     ReactDOM.render(quote, quoteContainer);
                     node.parentNode.replaceChild(quoteContainer, node);
diff --git a/src/components/views/rooms/QuotePreview.js b/src/components/views/rooms/QuotePreview.js
index 7241feeac6..a76c9e2d1a 100644
--- a/src/components/views/rooms/QuotePreview.js
+++ b/src/components/views/rooms/QuotePreview.js
@@ -64,9 +64,7 @@ export default class QuotePreview extends React.Component {
         return <div className="mx_QuotePreview">
             <div className="mx_QuotePreview_section">
                 <EmojiText element="div" className="mx_QuotePreview_header mx_QuotePreview_title">
-                    <span>
-                        💬 { _t('Quoting') }
-                    </span>
+                    { '💬' + _t('Replying') }
                 </EmojiText>
                 <div className="mx_QuotePreview_header mx_QuotePreview_cancel">
                     <img className="mx_filterFlipColor" src="img/cancel.svg" width="18" height="18"
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 908a203a42..0a7d274c96 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -940,6 +940,6 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
-    "Quoting": "Quoting",
-    "Rich Quoting": "Rich Quoting"
+    "Message Replies": "Message Replies",
+    "Replying": "Replying"
 }
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 4a5ed3f661..519d2dd39a 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -78,7 +78,7 @@ export const SETTINGS = {
     // },
     "feature_rich_quoting": {
         isFeature: true,
-        displayName: _td("Rich Quoting"),
+        displayName: _td("Message Replies"),
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },

From 882068078dda18d980eff6ef60203effa5ed8f0c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 17 Dec 2017 20:53:53 +0000
Subject: [PATCH 139/927] fix missing space

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

diff --git a/src/components/views/rooms/QuotePreview.js b/src/components/views/rooms/QuotePreview.js
index a76c9e2d1a..614d51dada 100644
--- a/src/components/views/rooms/QuotePreview.js
+++ b/src/components/views/rooms/QuotePreview.js
@@ -64,7 +64,7 @@ export default class QuotePreview extends React.Component {
         return <div className="mx_QuotePreview">
             <div className="mx_QuotePreview_section">
                 <EmojiText element="div" className="mx_QuotePreview_header mx_QuotePreview_title">
-                    { '💬' + _t('Replying') }
+                    { '💬 ' + _t('Replying') }
                 </EmojiText>
                 <div className="mx_QuotePreview_header mx_QuotePreview_cancel">
                     <img className="mx_filterFlipColor" src="img/cancel.svg" width="18" height="18"

From 5d0a82c83b5c17b13a9862062f2134a842b8fce1 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 16 Dec 2017 14:45:13 +0000
Subject: [PATCH 140/927] Translated using Weblate (Basque)

Currently translated at 75.2% (721 of 958 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 486991d350..4ca09d5d71 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -40,7 +40,7 @@
     "No results": "Emaitzarik ez",
     "Bug Report": "Arazte-txostena",
     "Join Room": "Elkartu gelara",
-    "Register": "Erregistratu",
+    "Register": "Eman izena",
     "Submit": "Bidali",
     "Skip": "Saltatu",
     "Send Reset Email": "Bidali berrezartzeko e-maila",
@@ -796,5 +796,15 @@
     "To configure the room, you must be a": "Gela konfiguratzeko hau izan behar zara:",
     "To kick users, you must be a": "Erabiltzaileak kanporatzeko hau izan behar zara:",
     "To ban users, you must be a": "Erabiltzaileak debekatzeko hau izan behar zara:",
-    "To remove other users' messages, you must be a": "Beste erabiltzaileen mezuak kentzeko hau izan behar zara:"
+    "To remove other users' messages, you must be a": "Beste erabiltzaileen mezuak kentzeko hau izan behar zara:",
+    "Unpin Message": "Desfinkatu mezua",
+    "Add rooms to this community": "Gehitu gelak komunitate honetara",
+    "Call Failed": "Deiak huts egin du",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Gailu ezezagunak daude gela honetan: hauek egiaztatu gabe aurrera jarraituz gero, posiblea litzateke inork zure deia entzutea.",
+    "Review Devices": "Aztertu gailuak",
+    "Call Anyway": "Deitu hala ere",
+    "Answer Anyway": "Erantzun hala ere",
+    "Call": "Deitu",
+    "Answer": "Erantzun",
+    "Who would you like to add to this community?": "Nor gehitu nahi duzu komunitate honetara?"
 }

From cfedd57920f79c05fc5f81a53f5608b0d977200f Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 16 Dec 2017 22:59:32 +0000
Subject: [PATCH 141/927] Translated using Weblate (Esperanto)

Currently translated at 72.6% (696 of 958 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 463713e9ea..b16ef6ca34 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -516,8 +516,8 @@
     "A text message has been sent to %(msisdn)s": "Tekstmesaĝo sendiĝîs al %(msisdn)s",
     "Please enter the code it contains:": "Bonvolu enigi la enhavatan kodon:",
     "Start authentication": "Komenci aŭtentigon",
-    "Username on %(hs)s": "Uzantnomo je %(hs)s",
-    "User name": "Uzantnomo",
+    "Username on %(hs)s": "Salutnomo je %(hs)s",
+    "User name": "Salutnomo",
     "Mobile phone number": "Telefona numero",
     "Forgot your password?": "Ĉu vi forgesis vian pasvorton?",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
@@ -556,5 +556,143 @@
     "Delete Widget": "Forigi fenestraĵon",
     "Delete widget": "Forigi fenestraĵon",
     "Revoke widget access": "Malvalidigi atingon de fenestraĵo",
-    "Create new room": "Krei novan ĉambron"
+    "Create new room": "Krei novan ĉambron",
+    "Verify...": "Kontroli…",
+    "No results": "Neniuj rezultoj",
+    "Delete": "Forigi",
+    "Communities": "Komunumoj",
+    "Home": "Hejmo",
+    "Integrations Error": "Integra eraro",
+    "Could not connect to the integration server": "Malsukcesis konektiĝi al la integra servilo",
+    "Manage Integrations": "Administri integrojn",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)saliĝis",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s%(count)s-foje aliĝis",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)saliĝis",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s-foje foriris",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sforiris",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s%(count)s-foje foriris",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sforiris",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s%(count)s-foje aliĝis kaj foriris",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)saliĝis kaj foriris",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s%(count)s-foje aliĝis kaj foriris",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)saliĝis kaj foriris",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s%(count)s-foje foriris kaj realiĝis",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sforiris kaj realiĝis",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s%(count)s-foje foriris kaj realiĝis",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sforiris kaj realiĝis",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s%(count)s-foje rifuzis inviton",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)srifuzis inviton",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s%(count)s-foje rifuzis inviton",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)srifuzis inviton",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s%(count)s-foje malinvitiĝis",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)smalinvitiĝis",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s%(count)s-foje malinvitiĝis",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)smalinvitiĝis",
+    "were invited %(count)s times|other": "%(count)s-foje invitiĝis",
+    "were invited %(count)s times|one": "invitiĝis",
+    "was invited %(count)s times|other": "%(count)s-foje invitiĝis",
+    "was invited %(count)s times|one": "invitiĝis",
+    "were banned %(count)s times|other": "%(count)s-foje forbariĝis",
+    "were banned %(count)s times|one": "forbariĝis",
+    "was banned %(count)s times|other": "%(count)s-foje forbariĝis",
+    "was banned %(count)s times|one": "forbariĝis",
+    "were unbanned %(count)s times|other": "%(count)s-foje malforbariĝis",
+    "were unbanned %(count)s times|one": "malforbariĝis",
+    "was unbanned %(count)s times|other": "%(count)s-foje malforbariĝis",
+    "was unbanned %(count)s times|one": "malforbariĝis",
+    "were kicked %(count)s times|other": "%(count)s-foje forpeliĝis",
+    "were kicked %(count)s times|one": "forpeliĝis",
+    "was kicked %(count)s times|other": "%(count)s-foje forpeliĝis",
+    "was kicked %(count)s times|one": "forpeliĝis",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s%(count)s-foje sanĝis sian nomon",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sŝanĝis sian nomon",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s%(count)s-foje ŝanĝis sian nomon",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sŝanĝis sian nomon",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s%(count)s-foje ŝanĝis sian profilbildon",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sŝanĝis sian profilbildon",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s%(count)s-foje ŝanĝis sian profilbildon",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sŝanĝis sian profilbildon",
+    "%(items)s and %(count)s others|other": "%(items)s kaj %(count)s aliaj",
+    "%(items)s and %(count)s others|one": "%(items)s kaj unu alia",
+    "%(items)s and %(lastItem)s": "%(items)s kaj %(lastItem)s",
+    "collapse": "maletendi",
+    "expand": "etendi",
+    "Custom of %(powerLevel)s": "Propra nivelo %(powerLevel)s",
+    "Custom level": "Propra nivelo",
+    "Room directory": "Ĉambrujo",
+    "Username not available": "Salutnomo ne disponeblas",
+    "Username invalid: %(errMessage)s": "Salutnomo ne validas: %(errMessage)s",
+    "Username available": "Salutnomo disponeblas",
+    "To get started, please pick a username!": "Por komenci, bonvolu elekti salutnomon!",
+    "Incorrect username and/or password.": "Malĝusta salutnomo kaj/aŭ pasvorto.",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Salutnomoj enhavu nur literojn, numerojn, punktojn, streketojn, kaj substrekojn.",
+    "You need to enter a user name.": "Vi devas enigi salutnomon.",
+    "Start chat": "Komenci babilon",
+    "And %(count)s more...|other": "Kaj %(count)s pliaj…",
+    "ex. @bob:example.com": "ekz-e @nomo:ekzemplo.net",
+    "Add User": "Aldoni uzanton",
+    "Matrix ID": "Identigaĵo en Matrix",
+    "Matrix Room ID": "Ĉambra identigaĵo en Matrix",
+    "email address": "retpoŝtadreso",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Provu unu el la sekvaj validaj tipoj de adreso: %(validTypesList)s.",
+    "You have entered an invalid address.": "Vi enigis malvalidan adreson.",
+    "Create a new chat or reuse an existing one": "Kreu novan babilon aŭ aliĝu al jama",
+    "Start new chat": "Komenci novan babilon",
+    "You already have existing direct chats with this user:": "Vi jam havas rekte babilas kun ĉi tiu uzanto:",
+    "Start chatting": "Komenci babilon",
+    "Click on the button below to start chatting!": "Alklaku la butonon sube por komenci babilon!",
+    "Start Chatting": "Komenci babilon",
+    "Confirm Removal": "Konfirmi forigon",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Ĉu vi certe volas forigi ĉi tiun okazaĵon? Per ŝanĝo de la ĉambra nomo aŭ temo, la ŝanĝo malfareblas.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Komunuma identigaĵo povas enhavi nur signojn a-z, 0-9, aŭ ‹=_-./› (malinkluzive la citilojn)",
+    "Something went wrong whilst creating your community": "Io misokazis dum kreado de via komunumo",
+    "Create Community": "Krei komunumon",
+    "Community Name": "Komunuma nomo",
+    "Example": "Ekzemplo",
+    "Community ID": "Komunuma identigaĵo",
+    "example": "ekzemplo",
+    "Create": "Krei",
+    "Create Room": "Krei ĉambron",
+    "Room name (optional)": "Ĉambra nomo (malnepra)",
+    "Advanced options": "Specialaj agordoj",
+    "Block users on other matrix homeservers from joining this room": "Forbari uzantojn el aliaj hejmserviloj for de ĉi tiu ĉambro",
+    "This setting cannot be changed later!": "Tiu ĉi agordo ne ŝanĝeblas poste!",
+    "Unknown error": "Nekonata eraro",
+    "Incorrect password": "Malĝusta pasvorto",
+    "Deactivate Account": "Malaktivigi konton",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Tio ĉi por ĉiam senuzebligos vian konton. Vi ne povos reregistriĝi kun la sama identigaĵo.",
+    "This action is irreversible.": "Tiu ĉi ago ne malfareblas.",
+    "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:": "Por kontroli ke tiu ĉi aparato estas fidinda, bonvolu kontakti ties posedanton per alia maniero (ekz-e persone aŭ telefone) kaj demandi ĝin ĉu la ŝlosilo, kiun ĝi vidas en agordoj de uzanto ĉe si, kongruas kun la ĉi-suba ŝlosilo:",
+    "Device name": "Aparata nomo",
+    "Device key": "Aparata ŝlosilo",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Se ĝi kongruas, premu la kontrolan butonon sube. Se ne, tiuokaze iu alia interkaptas ĉi tiun aparaton, kaj eble vi premu la malpermesan butonon anstataŭe.",
+    "In future this verification process will be more sophisticated.": "Ni planas plifaciligi la kontrolan procedon estontece.",
+    "Verify device": "Kontroli aparaton",
+    "I verify that the keys match": "Mi kontrolas, ke la ŝlosiloj kongruas",
+    "An error has occurred.": "Eraro okazis.",
+    "OK": "Bone",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Vi aldonis novan aparaton ‹%(displayName)s›, kiu petas ĉifrajn ŝlasilojn.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Via nekontrolita aparato ‹%(displayName)s› petas ĉifrajn ŝlosilojn.",
+    "Start verification": "Komenci kontrolon",
+    "Share without verifying": "Kunhavigi sen kontrolo",
+    "Ignore request": "Malatenti peton",
+    "Loading device info...": "Enleganta informojn pri aparato…",
+    "Encryption key request": "Peto por ĉifra ŝlosilo",
+    "Otherwise, <a>click here</a> to send a bug report.": "Alie, <a>klaku ĉi tie</a> por sendi cimraporton.",
+    "Unable to restore session": "Seanco ne restaŭreblas",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Okazis eraron dum restaŭro de via antaŭa seanco. Se vi daŭrigos, vi devos denove saluti, kaj ĉifrita babila historio estos nelegebla.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Se vi antaŭe uzis pli novan version de Riot, via seanco eble ne kongruos kun ĉi tiu versio. Fermu ĉi tiun fenestron kaj revenu al la pli nova versio.",
+    "Continue anyway": "Tamen daŭrigi",
+    "Invalid Email Address": "Malvalida retpoŝtadreso",
+    "This doesn't appear to be a valid email address": "Tio ĉi ne ŝajnas esti valida retpoŝtadreso",
+    "Verification Pending": "Atendanta kontrolon",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Bonvolu kontroli vian retpoŝton, kaj alklaki la ligilon enhavatan en la sendita mesaĝo. Farinte tion, klaku je «daŭrigi».",
+    "Unable to add email address": "Retpoŝtadreso ne aldoneblas",
+    "Unable to verify email address.": "Retpoŝtadreso ne kontroleblas.",
+    "This will allow you to reset your password and receive notifications.": "Tio ĉi permesos al vi restarigi vian pasvorton kaj ricevi sciigojn.",
+    "Skip": "Preterpasi",
+    "An error occurred: %(error_string)s": "Okazis eraro: %(error_string)s",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tio ĉi estos la nomo de via konto sur la hejmservilo <span></span>, aŭ vi povas elekti <a>alian servilon</a>."
 }

From 5fddf3bbeb8292efd265ac45b9726b2f1d1931fc Mon Sep 17 00:00:00 2001
From: Juho Ylikorpi <juho@ylikorpi.com>
Date: Sun, 17 Dec 2017 21:39:09 +0000
Subject: [PATCH 142/927] Translated using Weblate (Finnish)

Currently translated at 98.4% (943 of 958 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 5c7095b511..7af645f969 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -5,7 +5,7 @@
     "Cancel": "Peruuta",
     "Close": "Sulje",
     "Create new room": "Luo uusi huone",
-    "Custom Server Options": "Omat palvelinasetukset",
+    "Custom Server Options": "Palvelinasetukset",
     "Dismiss": "Hylkää",
     "Drop here %(toAction)s": "Pudota tänne %(toAction)s",
     "Error": "Virhe",
@@ -22,7 +22,7 @@
     "unknown error code": "tuntematon virhekoodi",
     "Failed to change password. Is your password correct?": "Salasanan muuttaminen epäonnistui. Onko salasanasi oikein?",
     "Continue": "Jatka",
-    "powered by Matrix": "Matrix-pohjainen",
+    "powered by Matrix": "Matrix",
     "Active call (%(roomName)s)": "Aktivoi puhelu (%(roomName)s)",
     "Add": "Lisää",
     "Add a topic": "Lisää aihe",
@@ -131,7 +131,7 @@
     "Email": "Sähköposti",
     "Email address": "Sähköpostiosoite",
     "Email address (optional)": "Sähköpostiosoite (valinnainen)",
-    "Email, name or matrix ID": "Sähköpostiosoite, nimi, tai Matrix tunniste",
+    "Email, name or matrix ID": "Sähköpostiosoite, nimi tai Matrix ID",
     "Emoji": "Emoji",
     "Enable encryption": "Ota salaus käyttöön",
     "Enable Notifications": "Ota ilmoitukset käyttöön",
@@ -171,7 +171,7 @@
     "Failure to create room": "Huoneen luominen epäonnistui",
     "Favourites": "Suosikit",
     "Fill screen": "Täytä näyttö",
-    "Filter room members": "Suodata huoneen jäsenet",
+    "Filter room members": "Suodata jäsenistä",
     "Forget room": "Unohda huone",
     "Forgot your password?": "Unohditko salasanasi?",
     "For security, this session has been signed out. Please sign in again.": "Turvallisuussyistä tämä istunto on vanhentunut. Ole hyvä ja kirjaudu uudestaan.",
@@ -199,7 +199,7 @@
     "Invited": "Kutsuttu",
     "Invites": "Kutsuu",
     "Invites user with given id to current room": "Kutsuu annetun käyttäjätunnisteen mukaisen käyttäjän huoneeseen",
-    "Sign in with": "Kirjaudu käyttäen",
+    "Sign in with": "Tunnistus",
     "Join Room": "Liity huoneeseen",
     "Joins room with given alias": "Liittyy huoneeseen jolla on annettu alias",
     "Jump to first unread message.": "Hyppää ensimmäiseen lukemattomaan viestiin.",
@@ -220,10 +220,10 @@
     "matrix-react-sdk version:": "Matrix-react-sdk versio:",
     "Members only": "Vain jäsenet",
     "Message not sent due to unknown devices being present": "Viestiä ei lähetetty koska paikalla on tuntemattomia laitteita",
-    "Mobile phone number": "Matkapuhelinnumero",
-    "Mobile phone number (optional)": "Matkapuhelinnumero (valinnainen)",
+    "Mobile phone number": "Puhelinnumero",
+    "Mobile phone number (optional)": "Puhelinnumero (valinnainen)",
     "Moderator": "Moderaattori",
-    "%(serverName)s Matrix ID": "%(serverName)s Matrix tunniste",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
     "Name": "Nimi",
     "New password": "Uusi salasana",
     "New passwords don't match": "Uudet salasanat eivät täsmää",
@@ -693,7 +693,7 @@
     "Who would you like to add to this community?": "Kenet sinä haluaisit lisätä tähän yhteisöön?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varioitus: henkilöt jotka lisäät yhteisöön näkyvät kaikille jotka tietävät yhteisön tunnisteen",
     "Invite new community members": "Kutsu uusia jäsenia yhteisöön",
-    "Name or matrix ID": "Nimi tai Matrix tunniste",
+    "Name or matrix ID": "Nimi tai Matrix ID",
     "Invite to Community": "Kutsu yhteisöön",
     "Which rooms would you like to add to this community?": "Mitkä huoneet haluaisit listätä tähän yhteisöön?",
     "Show these rooms to non-members on the community page and room list?": "Näytetäänkö nämä huoneet ei-jäsenille yhteisön sivulla ja huonelistassa?",
@@ -709,7 +709,7 @@
     "You are no longer ignoring %(userId)s": "Huomioit jälleen käyttäjän %(userId)s",
     "%(senderName)s removed their profile picture.": "%(senderName)s poisti profiilikuvansa.",
     "%(senderName)s set a profile picture.": "%(senderName)s asetti profiilikuvan.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, kutsusta lähtien.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s muutti tulevat viestit näkyviksi kaikille huoneen jäsenille, alkaen kutsusta huoneeseen.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille, liittymisestä asti.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille huoneen jäsenille.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s teki tulevan huonehistorian näkyväksi kaikille.",
@@ -785,12 +785,12 @@
     "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisötunniste (esim. +foo:%(localDomain)s)",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutti huoneen %(roomName)s avatarin",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s poisti huoneen avatarin.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s muutti huoneen avatariksi <img/>",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s vaihtoi huoneen kuvaksi <img/>",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Sinut ohjataan kolmannen osapuolen sivustolle jotta voit autentikoida tilisi käyttääksesi %(integrationsUrl)s. Haluatko jatkaa?",
     "Message removed by %(userId)s": "Käyttäjän %(userId)s poistama viesti",
     "Message removed": "Viesti poistettu",
     "Sign in with CAS": "Kirjaudu käyttäen CAS",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Voit kirjautua toiselle Matrix kotipalvelimelle syöttämällä palvelimen URL-osoite palvelin-asetuksissa.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Voit kirjautua toiselle Matrix kotipalvelimelle syöttämällä palvelimen URL-osoite palvelinasetuksissa.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Tämä mahdollistaa tämän ohjelman käytön olemassa olevan toisella palvelimella sijaitsevan Matrix tilin kanssa.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Voit myös käyttää toista identiteettipalvelinta mutta tyypillisesti tämä estää sähköpostiosoitteisiin perustuvan kanssakäynnin muiden käyttäjien kanssa.",
     "An email has been sent to %(emailAddress)s": "Viesti lähetetty osoitteeseen %(emailAddress)s",
@@ -817,7 +817,7 @@
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "were unbanned %(count)s times|other": "porttikiellot poistettiin %(count)s kertaa",
     "And %(count)s more...|other": "Ja %(count)s lisää...",
-    "Matrix ID": "Matrix-tunniste",
+    "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix huonetunniste",
     "email address": "sähköpostiosoite",
     "Try using one of the following valid address types: %(validTypesList)s.": "Kokeile käyttää yhtä näistä valideista osoitetyypeistä: %(validTypesList)s.",
@@ -830,8 +830,8 @@
     "Community ID": "Yhteisötunniste",
     "example": "esimerkki",
     "Advanced options": "Lisäasetukset",
-    "Block users on other matrix homeservers from joining this room": "Estä käyttäjiä toisilta kotipalvelimilta liittymästä tähän huoneseen",
-    "This setting cannot be changed later!": "Tätä asetusta ei voi muuttaa enää myöhemmin!",
+    "Block users on other matrix homeservers from joining this room": "Salli vain tämän palvelimen käyttäjät",
+    "This setting cannot be changed later!": "Tätä asetusta ei voi muuttaa myöhemmin!",
     "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Tämä tekee tilistäsi pysyvästi käyttökelvottoman. Et voi rekisteröidä samaa tunnusta uudestaan.",
     "Add rooms to the community summary": "Lisää huoneita yhteisön yhteenvetoon",
     "Which rooms would you like to add to this summary?": "Mitkä huoneet haluaisit lisätä tähän yhteenvetoon?",
@@ -945,5 +945,66 @@
     "Revoke widget access": "Poista pienoisohjelman oikeudet",
     "Unblacklist": "Poista estolistalta",
     "Blacklist": "Estolista",
-    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s käyttäjää liittyi"
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s käyttäjää liittyi",
+    "You are registering with %(SelectedTeamName)s": "Rekisteröidyt %(SelectedTeamName)s tiimeihin",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s liittyi %(count)s kertaa",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s liittyi",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s poistui %(count)s kertaa",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s poistui",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s poistui %(count)s kertaa",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s poistui",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s liittyi ja poistui %(count)s kertaa",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s liittyi ja poistui",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s liittyi ja poistui %(count)s kertaa",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s liittyi ja poistui",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s poistui ja liittyi uudelleen %(count)s kertaa",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s poistui ja liittyi uudelleen",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s poistui ja liittyi uudelleen %(count)s kertaa",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s poistui ja liittyi uudelleen",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s hylkäsi kutsun %(count)s kertaa",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s hylkäsi kutsun",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s hylkäsi kutsun %(count)s kertaa",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s hylkäsi kutsun",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s kutsu peruttiin %(count)s kertaa",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s kutsu peruttiin",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s kutsu peruttiin %(count)s kertaa",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s kutsu peruttiin",
+    "were invited %(count)s times|other": "kutsuttiin %(count)s kertaa",
+    "were invited %(count)s times|one": "kutsuttiin",
+    "was invited %(count)s times|other": "kutsuttiin %(count)s kertaa",
+    "was invited %(count)s times|one": "kutsuttiin",
+    "were banned %(count)s times|other": "estettiin %(count)s kertaa",
+    "were banned %(count)s times|one": "estettiin",
+    "was banned %(count)s times|other": "estettiin %(count)s kertaa",
+    "was banned %(count)s times|one": "estettiin",
+    "were unbanned %(count)s times|one": "estoi poistettiin",
+    "was unbanned %(count)s times|other": "esto poistettiin %(count)s kertaa",
+    "was unbanned %(count)s times|one": "esto poistettiin",
+    "were kicked %(count)s times|other": "poistettiin %(count)s kertaa",
+    "were kicked %(count)s times|one": "poistettiin",
+    "was kicked %(count)s times|other": "poistettiin %(count)s kertaa",
+    "was kicked %(count)s times|one": "poistettiin",
+    "expand": "laajenna",
+    "collapse": "supista",
+    "Display your community flair in rooms configured to show it.": "Näytä yhteisöjesi tyylit huoneissa joissa ominaisuus on päällä.",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Pienoisohjelman poistaminen poistaa sen kaikilta huoneen käyttäjiltä. Oletko varma että haluat poistaa pienoisohjelman?",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s liittyi %(count)s kertaa",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s vaihtoi nimensä %(count)s kertaa",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s vaihtoi nimensä",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s vaihtoi nimensä %(count)s kertaa",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s vaihtoi nimensä",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s vaihtoi pienoiskuvansa %(count)s kertaa",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s vaihtoi pienoiskuvansa",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s vaihtoi pienoiskuvansa %(count)s kertaa",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s vaihtoi pienoiskuvansa",
+    "%(items)s and %(count)s others|other": "%(items)s ja %(count)s muuta",
+    "%(items)s and %(count)s others|one": "%(items)s ja yksi toinen",
+    "Custom of %(powerLevel)s": "Valinnaiset %(powerLevel)s",
+    "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:": "Varmistaaksesi että tähän laitteeseen voidaan luottaa, ole yhteydessä omistajaan jollain muulla tavalla (henkilökohtaisesti tai puhelimitse) ja pyydä heitä varmistamaan näkyykö Käyttäjäasetuksissa laite jolla on alla oleva avain:",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Jos avain täsmää, valitse painike alla. Jos avain ei täsmää, niin joku muu salakuuntelee laitetta ja haluat todennäköisesti painaa estopainiketta.",
+    "Cryptography data migrated": "Salaustiedot siirretty",
+    "Old cryptography data detected": "Vanhat salaustiedot havaittu",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Lähetä kaikki uudelleen</resendText> tai <cancelText>peruuta kaikki</cancelText> nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai peruttavaksi.",
+    "Warning": "Varoitus",
+    "Access Token:": "Pääsykoodi:"
 }

From b0b2e761a805ad39cb4565bd3a739bbcb8107bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Wi=C5=9Bniewski?= <siwypl@o2.pl>
Date: Fri, 15 Dec 2017 19:09:43 +0000
Subject: [PATCH 143/927] Translated using Weblate (Polish)

Currently translated at 72.6% (696 of 958 strings)

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

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 4e7aa2fd55..87d5598d7c 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -779,5 +779,6 @@
     "Invite to Community": "Zaproszenie do Społeczności",
     "Which rooms would you like to add to this community?": "Które pokoje chcesz dodać do tej społeczności?",
     "Room name or alias": "Nazwa pokoju lub alias",
-    "Add to community": "Dodaj do społeczności"
+    "Add to community": "Dodaj do społeczności",
+    "Call": "Połącz"
 }

From 47d4e5f8d15dc6bfb63415158dc632801f6bbb24 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Dec 2017 19:28:01 +0000
Subject: [PATCH 144/927] nest quotes, but only when people want to click
 through them loads pre-emptively

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Quote.js       | 36 +++++++++++++++-----
 src/components/views/messages/TextualBody.js |  6 ++--
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index f1fa3bdbac..6a7e5d058f 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -54,6 +54,8 @@ export default class Quote extends React.Component {
         url: PropTypes.string,
         // The parent event
         parentEv: PropTypes.instanceOf(MatrixEvent),
+        // Whether this isn't the first Quote, and we're being nested
+        isNested: PropTypes.bool,
     };
 
     constructor(props, context) {
@@ -62,7 +64,10 @@ export default class Quote extends React.Component {
         this.state = {
             // The event related to this quote
             event: null,
+            show: !this.props.isNested,
         };
+
+        this.onShowNested = this.onShowNested.bind(this);
     }
 
     getChildContext() {
@@ -112,20 +117,33 @@ export default class Quote extends React.Component {
         this.setState({room, event});
     }
 
+    onShowNested() {
+        this.setState({
+            show: true,
+        });
+    }
+
     render() {
         const ev = this.state.event;
         if (ev) {
-            const EventTile = sdk.getComponent('views.rooms.EventTile');
-            let dateSep = null;
-            if (wantsDateSeparator(this.props.parentEv, this.state.event)) {
-                const DateSeparator = sdk.getComponent('messages.DateSeparator');
-                dateSep = <a href={this.props.url}><DateSeparator ts={this.state.event.getDate()} /></a>;
+            if (this.state.show) {
+                const EventTile = sdk.getComponent('views.rooms.EventTile');
+                let dateSep = null;
+                if (wantsDateSeparator(this.props.parentEv, this.state.event)) {
+                    const DateSeparator = sdk.getComponent('messages.DateSeparator');
+                    dateSep = <a href={this.props.url}><DateSeparator ts={this.state.event.getDate()} /></a>;
+                }
+
+                return <blockquote className="mx_Quote">
+                    { dateSep }
+                    <EventTile mxEvent={ev} tileShape="quote" />
+                </blockquote>;
             }
 
-            return <blockquote className="mx_Quote">
-                { dateSep }
-                <EventTile mxEvent={ev} tileShape="quote" />
-            </blockquote>;
+            return <div>
+                <a onClick={this.onShowNested} className="mx_Quote_show">{ _t('Quote') }</a>
+                <br />
+            </div>;
         }
 
         // Deliberately render nothing if the URL isn't recognised
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 54576fa794..fc5f1cc5f8 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -202,14 +202,12 @@ module.exports = React.createClass({
 
                     // update the current node with one that's now taken its place
                     node = pillContainer;
-                } else if (SettingsStore.isFeatureEnabled("feature_rich_quoting") && this.props.tileShape !== 'quote' &&
-                    Quote.isMessageUrl(href)
-                ) {
+                } else if (SettingsStore.isFeatureEnabled("feature_rich_quoting") && Quote.isMessageUrl(href)) {
                     // only allow this branch if we're not already in a quote, as fun as infinite nesting is.
                     const quoteContainer = document.createElement('span');
 
                     const quote =
-                        <Quote url={href} parentEv={this.props.mxEvent} />;
+                        <Quote url={href} parentEv={this.props.mxEvent} isNested={this.props.tileShape === 'quote'} />;
 
                     ReactDOM.render(quote, quoteContainer);
                     node.parentNode.replaceChild(quoteContainer, node);

From 05434e782a0df6292c8c6ec4400e66b2c9d50f6c Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 18 Dec 2017 19:49:38 +0000
Subject: [PATCH 145/927] change Composer placeholder text based on
 replying/rich quoting state

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 2841f30423..65e9f5f8ed 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -21,7 +21,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
-import Autocomplete from './Autocomplete';
+import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 
 
@@ -42,6 +42,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._onRoomViewStoreUpdate = this._onRoomViewStoreUpdate.bind(this);
 
         this.state = {
             autocompleteQuery: '',
@@ -53,6 +54,7 @@ export default class MessageComposer extends React.Component {
                 wordCount: 0,
             },
             showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
+            isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
         };
     }
 
@@ -62,12 +64,16 @@ 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);
+        this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
     }
 
     componentWillUnmount() {
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("event", this.onEvent);
         }
+        if (this._roomStoreToken) {
+            this._roomStoreToken.remove();
+        }
     }
 
     onEvent(event) {
@@ -76,6 +82,12 @@ export default class MessageComposer extends React.Component {
         this.forceUpdate();
     }
 
+    _onRoomViewStoreUpdate() {
+        const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
+        if (this.state.isQuoting === isQuoting) return;
+        this.setState({ isQuoting });
+    }
+
     onUploadClick(ev) {
         if (MatrixClientPeg.get().isGuest()) {
             dis.dispatch({action: 'view_set_mxid'});
@@ -325,8 +337,20 @@ export default class MessageComposer extends React.Component {
                      key="controls_formatting" />
             );
 
-            const placeholderText = roomIsEncrypted ?
-                _t('Send an encrypted message') + '…' : _t('Send a message (unencrypted)') + '…';
+            let placeholderText;
+            if (this.state.isQuoting) {
+                if (roomIsEncrypted) {
+                    placeholderText = _t('Send an encrypted reply');
+                } else {
+                    placeholderText = _t('Send a reply (unencrypted)');
+                }
+            } else {
+                if (roomIsEncrypted) {
+                    placeholderText = _t('Send an encrypted message');
+                } else {
+                    placeholderText = _t('Send a message (unencrypted)');
+                }
+            }
 
             controls.push(
                 <MessageComposerInput
@@ -334,7 +358,7 @@ export default class MessageComposer extends React.Component {
                     key="controls_input"
                     onResize={this.props.onResize}
                     room={this.props.room}
-                    placeholder={placeholderText}
+                    placeholder={placeholderText + '…'}
                     onFilesPasted={this.uploadFiles}
                     onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0a7d274c96..81b89d823e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -298,7 +298,9 @@
     "Upload file": "Upload file",
     "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
     "Send an encrypted message": "Send an encrypted message",
+    "Send an encrypted reply": "Send an encrypted reply",
     "Send a message (unencrypted)": "Send a message (unencrypted)",
+    "Send a reply (unencrypted)": "Send a reply (unencrypted)",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
     "Turn Markdown on": "Turn Markdown on",
     "Turn Markdown off": "Turn Markdown off",

From 21bca7e2d3c467e081a186e556f80ab59090fb2d Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Mon, 18 Dec 2017 21:34:17 +0000
Subject: [PATCH 146/927] Translated using Weblate (Korean)

Currently translated at 67.7% (649 of 958 strings)

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

.(could not connect media)
---
 src/i18n/strings/ko.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index f3d54e9449..7c49e3114d 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -318,7 +318,7 @@
     "Reason: %(reasonText)s": "이유: %(reasonText)s",
     "Revoke Moderator": "조정자 철회",
     "Refer a friend to Riot:": "라이엇을 친구에게 추천해주세요:",
-    "Register": "등록하기",
+    "Register": "등록",
     "%(targetName)s rejected the invitation.": "%(targetName)s님이 초대를 거절하셨어요.",
     "Reject invitation": "초대 거절",
     "Rejoin": "다시 들어가기",
@@ -731,5 +731,6 @@
     "Ignore request": "요청 무시하기",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "새 장치 '%(displayName)s'를 추가했고 암호화 키를 요청하고 있어요.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "인증하지 않은 장치 '%(displayName)s'가 암호화 키를 요청하고 있어요.",
-    "Encryption key request": "암호화 키 요청"
+    "Encryption key request": "암호화 키 요청",
+    "Edit": "수정하기"
 }

From af2feb5e581f318b89fa2495825f1ad195a6c146 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 19 Dec 2017 11:26:12 +0000
Subject: [PATCH 147/927] Translated using Weblate (Esperanto)

Currently translated at 99.3% (952 of 958 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index b16ef6ca34..e464a991b7 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -258,7 +258,7 @@
     "Encrypted by an unverified device": "Ĉifrita de nekontrolita aparato",
     "Unencrypted message": "Neĉifrita mesaĝo",
     "Please select the destination room for this message": "Bonvolu elekti celan ĉambron por ĉi tiu mesaĝo",
-    "Blacklisted": "Sur nigra listo",
+    "Blacklisted": "Senpova legi ĉifritajn mesaĝojn",
     "Verified": "Kontrolita",
     "Unverified": "Nekontrolita",
     "device id: ": "aparata identigaĵo: ",
@@ -504,9 +504,9 @@
     "Register": "Registriĝi",
     "Add rooms to this community": "Aldoni ĉambrojn al ĉi tiu komunumo",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Kontrolo kontraŭ robotoj ne disponeblas sur labortablo – bonvolu uzi <a>retan foliumilon</a>",
-    "This Home Server would like to make sure you are not a robot": "Tiu ĉi hejmservilo volas certigi, ke vi ne estas roboto",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix per alia hejmservila URL.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "Tio ĉi permesos al vi uzi ĉi tiun aplikaĵon kun jama konto de Matrix el alia hejmservilo.",
+    "This Home Server would like to make sure you are not a robot": "Tiu ĉi hejma servilo volas certigi, ke vi ne estas roboto",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Vi povas uzi proprajn servilajn elektojn por saluti aliajn servilojn de Matrix per alia adreso de hejma servilo.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Tio ĉi permesos al vi uzi ĉi tiun aplikaĵon kun jama konto de Matrix el alia hejma servilo.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Vi ankaŭ povas agordi propran identigan servilon, sed tio kutime malebligas interagadon kun uzantkontoj bazitaj sur retpoŝto.",
     "To continue, please enter your password.": "Por daŭrigi, bonvolu enigi vian pasvorton.",
     "Password:": "Pasvorto:",
@@ -528,7 +528,7 @@
     "Mobile phone number (optional)": "Telefona numero (malnepra)",
     "Default server": "Implicita servilo",
     "Custom server": "Propra servilo",
-    "Home server URL": "URL de hejmservilo",
+    "Home server URL": "Adreso de hejma servilo",
     "Identity server URL": "URL de identiga servilo",
     "What does this mean?": "Kion ĝi signifas?",
     "Remove from community": "Forigi de komunumo",
@@ -645,7 +645,7 @@
     "Click on the button below to start chatting!": "Alklaku la butonon sube por komenci babilon!",
     "Start Chatting": "Komenci babilon",
     "Confirm Removal": "Konfirmi forigon",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Ĉu vi certe volas forigi ĉi tiun okazaĵon? Per ŝanĝo de la ĉambra nomo aŭ temo, la ŝanĝo malfareblas.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Ĉu vi certe volas forigi ĉi tiun okazaĵon? Per ŝanĝo de la ĉambra nomo aŭ temo, la ŝanĝo eble malfariĝos.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Komunuma identigaĵo povas enhavi nur signojn a-z, 0-9, aŭ ‹=_-./› (malinkluzive la citilojn)",
     "Something went wrong whilst creating your community": "Io misokazis dum kreado de via komunumo",
     "Create Community": "Krei komunumon",
@@ -694,5 +694,261 @@
     "This will allow you to reset your password and receive notifications.": "Tio ĉi permesos al vi restarigi vian pasvorton kaj ricevi sciigojn.",
     "Skip": "Preterpasi",
     "An error occurred: %(error_string)s": "Okazis eraro: %(error_string)s",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tio ĉi estos la nomo de via konto sur la hejmservilo <span></span>, aŭ vi povas elekti <a>alian servilon</a>."
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tio ĉi estos la nomo de via konto sur la hejmservilo <span></span>, aŭ vi povas elekti <a>alian servilon</a>.",
+    "Blacklist": "Malpermesi legadon de ĉifritaj mesaĝoj",
+    "Unverify": "Malkontroli",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Se vi jam havas konton ĉe Matrix, vi povas <a>saluti</a> anstataŭe.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Vi nun malpermesas legadon de ĉifritaj mesaĝoj al nekontrolitaj aparatoj; por sendi mesaĝojn al tiuj, vi devas ilin kontroli.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ni rekomendas al vi bone kontroli ĉiun aparaton por certigi, ke ĝi apartenas al la verŝajna posedanto, sed vi povas resendi la mesaĝon sen kontrolo, laŭprefere.",
+    "Room contains unknown devices": "Ĉambro enhavas nekonatajn aparatojn",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "«%(RoomName)s» enhavas aparatojn, kiujn vi neniam vidis antaŭe.",
+    "Unknown devices": "Nekonataj aparatoj",
+    "Private Chat": "Privata babilo",
+    "Public Chat": "Publika babilo",
+    "Custom": "Propra",
+    "Alias (optional)": "Kromnomo (malnepra)",
+    "Name": "Nomo",
+    "Topic": "Temo",
+    "Make this room private": "Privatigi ĉi tiun ĉambron",
+    "Share message history with new users": "Kunhavi mesaĝan historion kun novaj uzantoj",
+    "Encrypt room": "Ĉifri ĉambron",
+    "You must <a>register</a> to use this functionality": "Vi devas <a>registriĝî</a> por uzi tiun ĉi funkcion",
+    "You must join the room to see its files": "Vi devas aliĝi al la ĉambro por vidi tie dosierojn",
+    "There are no visible files in this room": "En ĉi tiu ĉambro estas neniaj videblaj dosieroj",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML por la paĝo de via komunumo</h1>\n<p>\n    Uzu la longan priskribon por enkonduki novajn komunumanojn, aŭ disdoni iujn\n    gravajn <a href=\"ligo\">ligilojn</a>\n</p>\n<p>\n    Vi povas eĉ uzi etikedojn ‹img›\n</p>\n",
+    "Add rooms to the community summary": "Aldoni ĉambrojn al la komunuma superrigardo",
+    "Which rooms would you like to add to this summary?": "Kiujn ĉambrojn vi volas aldoni al ĉi tiu superrigardo?",
+    "Add to summary": "Aldoni al superrigardo",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Malsukcesis aldoni la jenajn ĉambrojn al la superrigardo de %(groupId)s:",
+    "Add a Room": "Aldoni ĉambron",
+    "Failed to remove the room from the summary of %(groupId)s": "Malsukcesis forigi la ĉambron de la superrigardo de %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Ĉambro ‹%(roomName)s› ne forigeblas de la superrigardo.",
+    "Add users to the community summary": "Aldoni uzantojn al la komunuma superrigardo",
+    "Who would you like to add to this summary?": "Kiun vi ŝatus aldoni al tiu ĉi superrigardo?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Malsukcesis aldoni la jenajn uzantojn al la superrigardo de %(groupId)s:",
+    "Add a User": "Aldoni uzanton",
+    "Failed to remove a user from the summary of %(groupId)s": "Malsukcesis forigi uzanton de la superrigardo de %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Uzanto ‹%(displayName)s› ne forigeblas de la superrigardo.",
+    "Failed to upload image": "Malsukcesis alŝuti bildon",
+    "Failed to update community": "Malskucesis ĝisdatigi la komunumon",
+    "Unable to accept invite": "Invito ne akcepteblas",
+    "Unable to reject invite": "Invito ne rifuzeblas",
+    "Leave Community": "Forlasi komunumon",
+    "Leave %(groupName)s?": "Ĉu foriri el %(groupName)s?",
+    "Unable to leave room": "Ĉambro ne forlaseblas",
+    "Community Settings": "Komunumaj agordoj",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Tiuj ĉi ĉambroj montriĝas al komunumanoj sur la paĝo de la komunumo. Ili povas aliĝi al la ĉambroj per alklakoj.",
+    "Featured Rooms:": "Elstarigitaj ĉambroj:",
+    "Featured Users:": "Elstarigitaj uzantoj:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s invitis vin al tiu ĉi komunumo",
+    "You are an administrator of this community": "Vi estas administranto de tiu ĉi komunumo",
+    "You are a member of this community": "Vi estas ano de tiu ĉi komunumo",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Via komunumo ne havas longan priskribon – HTML-paĝon por montri al komunumanoj.<br />Klaku ĉi tie por malfermi agordojn kaj fari ĝin!",
+    "Long Description (HTML)": "Longa priskribo (HTML)",
+    "Description": "Priskribo",
+    "Community %(groupId)s not found": "Komunumo %(groupId)s ne troviĝis",
+    "This Home server does not support communities": "Tiu ĉi hejma servilo ne subtenas komunumojn",
+    "Failed to load %(groupId)s": "Malsukcesis enlegi %(groupId)s",
+    "Reject invitation": "Rifuzi inviton",
+    "Are you sure you want to reject the invitation?": "Ĉu vi certe volas rifuzi la inviton?",
+    "Failed to reject invitation": "Malsukcesis rifuzi la inviton",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Ĉu vi certe volas forlasi la ĉambron ‹%(roomName)s›?",
+    "Failed to leave room": "Malsukcesis forlasi la ĉambron",
+    "Signed Out": "Adiaŭinta",
+    "Cryptography data migrated": "Kriptografiaj datumoj transmetiĝis",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Unufoja transmeto de kriptografiaj datumoj fariĝis. Ĝiscela ĉifrado ne funkcios se vi revenos al pli malnova versio de Riot. Se vi bezonas ĝiscelan ĉifradon ĉe pli malnova versio, adiaŭu unue. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
+    "Old cryptography data detected": "Malnovaj kriptografiaj datumoj troviĝis",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Datumoj el malnova versio de Riot troviĝis. Ĉi tio malfunkciigos ĝiscelan ĉifradon en la malnova versio. Ĝiscele ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
+    "Logout": "Adiaŭi",
+    "Your Communities": "Viaj komunumoj",
+    "Error whilst fetching joined communities": "Okazis eraro dum venigado de viaj komunumoj",
+    "Create a new community": "Krei novan komunumon",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Kreu komunumon por kunigi uzantojn kaj ĉambrojn! Fari propran hejmpaĝon por montri vian spacon en la universo de Matrix.",
+    "Join an existing community": "Aliĝi al jama komunumo",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Por aliĝi al jama komunumo, vi devos scii ĝian komunuman identigilon; ĝi aspektas proksimume tiel ĉi: <i>+ekzemplo:matrix.org</i>.",
+    "You have no visible notifications": "Neniuj videblaj sciigoj",
+    "Scroll to bottom of page": "Rulumi al susbo de la paĝo",
+    "Message not sent due to unknown devices being present": "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj aparatoj",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Montri aparatojn</showDevicesText> aŭ <cancelText>nuligi ĉiujn</cancelText>.",
+    "Some of your messages have not been sent.": "Iuj viaj mesaĝoj ne sendiĝis.",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Resendi ĉion</resendText> aŭ <cancelText>nuligi ĉion</cancelText> nun. Vi ankaŭ povas elekti unuopajn mesaĝojn por resendo aŭ nuligo.",
+    "Connectivity to the server has been lost.": "Konekto al la servilo perdiĝis.",
+    "Sent messages will be stored until your connection has returned.": "Senditaj mesaĝoj konserviĝos ĝis via konekto refunkcios.",
+    "%(count)s new messages|other": "%(count)s novaj mesaĝoj",
+    "%(count)s new messages|one": "%(count)s nova mesaĝo",
+    "Active call": "Aktiva voko",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Neniu alia ĉeestas! Ĉu vi ŝatus <inviteText>inviti aliajn</inviteText> aŭ <nowarnText>ĉesigi avertadon pri la malplena ĉambro</nowarnText>?",
+    "You seem to be uploading files, are you sure you want to quit?": "Ŝajne vi alŝutas dosierojn nun; ĉu vi tamen volas foriri?",
+    "You seem to be in a call, are you sure you want to quit?": "Ŝajne vi vokas nun; ĉu vi tamen volas foriri?",
+    "Failed to upload file": "Malsukcesis alŝuti dosieron",
+    "Server may be unavailable, overloaded, or the file too big": "Aŭ la servilo estas neatingebla aŭ troŝargita, aŭ la dosiero estas tro granda",
+    "Search failed": "Serĉo malsukcesis",
+    "Server may be unavailable, overloaded, or search timed out :(": "Aŭ la servilo estas neatingebla aŭ troŝargita, aŭ la serĉo eltempiĝis :(",
+    "No more results": "Neniuj pliaj rezultoj",
+    "Unknown room %(roomId)s": "Nekonata ĉambro %(roomId)s",
+    "Room": "Ĉambro",
+    "Failed to save settings": "Malsukcesis konservi agordojn",
+    "Failed to reject invite": "Malsukcesis rifuzi inviton",
+    "Fill screen": "Plenigi ekranon",
+    "Click to unmute video": "Klaku por ŝalti videon",
+    "Click to mute video": "Klaku por malŝalti videon",
+    "Click to unmute audio": "Klaku por ŝalti sonon",
+    "Click to mute audio": "Klaku por malŝalti sonon",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Provis enlegi certan parton de ĉi tiu historio, sed vi ne havas permeson vidi ĝin.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Provis enlegi certan parton de ĉi tiu historio, sed malsukcesis ĝin trovi.",
+    "Failed to load timeline position": "Malsukcesis enlegi lokon en historio",
+    "Uploading %(filename)s and %(count)s others|other": "Alŝutanta dosieron %(filename)s kaj %(count)s aliajn",
+    "Uploading %(filename)s and %(count)s others|zero": "Alŝutanta dosieron %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Alŝutanta dosieron %(filename)s kaj %(count)s alian",
+    "Light theme": "Hela haŭto",
+    "Dark theme": "Malhela haŭto",
+    "Status.im theme": "Temo de status.im",
+    "Can't load user settings": "Agordoj de uzanto ne enlegeblas",
+    "Server may be unavailable or overloaded": "Servilo eble estas neatingebla aŭ troŝarĝita",
+    "Sign out": "Adiaŭi",
+    "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.": "Pro sekureco, adiaŭo forigos ĉiujn ĝiscele ĉifrajn ŝlosilojn de tiu ĉi foliumilo. Se vi volas malĉifri vian babilan historion el estontaj seancoj de Riot, bonvolu elporti kaj bone reteni viajn ĉambrojn ŝlosilojn.",
+    "Success": "Sukceso",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Via pasvorto sukcese ŝanĝiĝis. Vi ne ricevos puŝatentigojn en aliaj aparatoj ĝis vi resalutos ilin",
+    "Remove Contact Information?": "Ĉu forigi kontaktajn informojn?",
+    "Remove %(threePid)s?": "Ĉu forigi %(threePid)s?",
+    "Unable to remove contact information": "Kontaktaj informoj ne forigeblas",
+    "Refer a friend to Riot:": "Rekomendi programon Riot al konato:",
+    "Interface Language": "Fasada lingvo",
+    "User Interface": "Fasado por uzantoj",
+    "Autocomplete Delay (ms):": "Prokrasto de aŭtomata finado (ms):",
+    "<not supported>": "<nesubtenata>",
+    "Import E2E room keys": "Enporti ĝiscele ĉifrajn ĉambrajn ŝlosilojn",
+    "Cryptography": "Kriptografio",
+    "Device ID:": "Aparata identigilo:",
+    "Device key:": "Aparata ŝlosilo:",
+    "Ignored Users": "Malatentataj uzantoj",
+    "Bug Report": "Cimraporto",
+    "Found a bug?": "Ĉu vi trovis cimon?",
+    "Report it": "Raporti ĝin",
+    "Analytics": "Analizo",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot kolektas sennomaj analizajn datumojn por helpi plibonigadon de la programo.",
+    "Labs": "Eksperimentaj funkcioj",
+    "These are experimental features that may break in unexpected ways": "Tiu ĉi funkcioj estas eksperimentaj, kaj povas misfunkcii diversmaniere",
+    "Use with caution": "Uzu atenteme",
+    "Deactivate my account": "Malaktivigi mian konton",
+    "Clear Cache": "Vakigi kaŝmemoron",
+    "Clear Cache and Reload": "Vakigi kaŝmemoron kaj relegi",
+    "Updates": "Ĝisdatigoj",
+    "Check for update": "Kontroli ĝisdatigojn",
+    "Reject all %(invitedRooms)s invites": "Rifuzi ĉiujn %(invitedRooms)s invitojn",
+    "Bulk Options": "Amasaj agordoj",
+    "Desktop specific": "Specialaj al labortablo",
+    "Start automatically after system login": "Aŭtomate ruli post operaciuma saluto",
+    "No media permissions": "Neniuj permesoj pri aŭdvidaĵoj",
+    "You may need to manually permit Riot to access your microphone/webcam": "Eble vi devos permane permesi al Riot atingon de viaj mikrofono/kamerao",
+    "Missing Media Permissions, click here to request.": "Mankas permesoj pri aŭdvidaĵoj; klaku ĉi tie por peti ilin.",
+    "No Microphones detected": "Neniu mikrofono troviĝis",
+    "No Webcams detected": "Neniu kamerao troviĝis",
+    "Default Device": "Implicita aparato",
+    "Microphone": "Mikrofono",
+    "Camera": "Kamerao",
+    "VoIP": "Rettelefonado",
+    "Email": "Retpoŝto",
+    "Add email address": "Aldoni retpoŝtadreson",
+    "Notifications": "Sciigoj",
+    "Profile": "Profilo",
+    "Display name": "Vidiga nomo",
+    "Account": "Konto",
+    "To return to your account in future you need to set a password": "Por reveni al via konto estontece, vi devas agordi pasvorton",
+    "Logged in as:": "Salutinta kiel:",
+    "Access Token:": "Atinga ĵetono:",
+    "click to reveal": "klaku por malkovri",
+    "Homeserver is": "Hejmservilo estas",
+    "Identity Server is": "Identiga servilo estas",
+    "matrix-react-sdk version:": "versio de matrix-react-sdk:",
+    "riot-web version:": "versio de riot-web:",
+    "olm version:": "versio de olm:",
+    "Failed to send email": "Malsukcesis sendi retleteron",
+    "The email address linked to your account must be entered.": "Vi devas enigi retpoŝtadreson ligitan al via konto.",
+    "A new password must be entered.": "Vi devas enigi novan pasvorton.",
+    "New passwords must match each other.": "Novaj pasvortoj devas kongrui.",
+    "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.": "Restarigo de pasvorto nun nuligos ĝiscele ĉifrajn ŝlosilojn sur ĉiuj aparatoj, farante babilan historion nelegebla, krom se vi unue elportos viajn ĉambrajn ŝlosilojn kaj reenportos ilin poste. Estontece tio ĉi plifaciliĝos.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Retletero sendiĝis al %(emailAddress)s. Irinte al la ligilo en tiu mesaĝo, klaku sube.",
+    "I have verified my email address": "Mi kontrolis mian retpoŝtadreson",
+    "Your password has been reset": "Via pasvorto restariĝis",
+    "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": "Vi aŭtomate adiaŭis ĉiujn aparatojn kaj ne ricevos plu puŝsciigojn. Por reŝalti sciigojn, saluti denove per ĉiu aparato",
+    "Return to login screen": "Reiri al saluta paĝo",
+    "To reset your password, enter the email address linked to your account": "Por restarigi vian pasvorton, enigu la retpoŝtadreson ligitan al via konto",
+    "New password": "Nova pasvorto",
+    "Confirm your new password": "Konfirmu vian novan pasvorton",
+    "Send Reset Email": "Sendi restarigan retleteron",
+    "Create an account": "Krei konton",
+    "This Home Server does not support login using email address.": "Tiu ĉi hejma servilo ne subtenas saluton per retpoŝtadreso.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Sciu, ke vi salutas la servilon %(hs)s, ne la servilon matrix.org.",
+    "Guest access is disabled on this Home Server.": "Gasta atingo estas malŝaltita en tiu ĉi hejma servilo.",
+    "The phone number entered looks invalid": "Tiu ĉi telefona numero ŝajnas malvalida",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Tiu ĉi hejmservilo ne proponas salutajn fluojn subtenatajn de tiu ĉi kliento.",
+    "Error: Problem communicating with the given homeserver.": "Eraro: Estas problemo en komunikado kun la hejmservilo.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Hejmservilo ne alkonekteblas per HTTP kun HTTPS URL en via adresbreto. Aŭ uzu HTTPS aŭ <a>ŝaltu malsekurajn skriptojn</a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ne eblas konekti al hejmservilo – bonvolu kontroli vian konekton, certigi ke <a>la SSL-atestilo de via hejmservilo</a> estas fidata, kaj ke neniu foliumila kromprogramo baras petojn.",
+    "Login as guest": "Saluti kiel gasto",
+    "Sign in to get started": "Komencu per saluto",
+    "Failed to fetch avatar URL": "Malsukcesis venigi adreson de profilbildo",
+    "Set a display name:": "Agordi vidigan nomon:",
+    "Upload an avatar:": "Alŝuti profilbildon:",
+    "This server does not support authentication with a phone number.": "Ĉi tiu servilo ne subtenas aŭtentigon per telefona numero.",
+    "Missing password.": "Mankas pasvorto.",
+    "Passwords don't match.": "Pasvortoj ne kongruas.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Pasvorto estas tro mallonga (malplejlonge %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Tio ĉi ne ŝajnas esti valida retpoŝtadreso.",
+    "This doesn't look like a valid phone number.": "Tio ĉi ne ŝajnas esti valida telefona numero.",
+    "An unknown error occurred.": "Okazis nekonata eraro.",
+    "I already have an account": "Mi jam havas konton",
+    "Displays action": "Montras agon",
+    "Bans user with given id": "Forbaras uzanton kun la donita identigaĵo",
+    "Unbans user with given id": "Malforbaras uzanton kun la donita identigaĵo",
+    "Define the power level of a user": "Difini la potencan nivelon de uzanto",
+    "Deops user with given id": "Senestrigas uzanton kun donita identigaĵo",
+    "Invites user with given id to current room": "Invitas uzanton kun donita identigaĵo al la nuna ĉambro",
+    "Joins room with given alias": "Aliĝigas al ĉambro kun la donita kromnomo",
+    "Sets the room topic": "Agordas la ĉambran temon",
+    "Kicks user with given id": "Forpelas uzanton kun la donita identigaĵo",
+    "Changes your display nickname": "Ŝanĝas vian vidigan nomon",
+    "Searches DuckDuckGo for results": "Serĉas rezultojn per DuckDuckGo",
+    "Changes colour scheme of current room": "Ŝanĝas kolorsĥemon de la nuna ĉambro",
+    "Verifies a user, device, and pubkey tuple": "Kontrolas opon de uzanto, aparato, kaj publika ŝlosilo",
+    "Ignores a user, hiding their messages from you": "Malatentas uzanton, kaŝante ĝiajn mesaĝojn de vi",
+    "Stops ignoring a user, showing their messages going forward": "Ĉesas malatenti uzanton, montronte ĝiajn pluajn mesaĝojn",
+    "Commands": "Komandoj",
+    "Results from DuckDuckGo": "Rezultoj de DuckDuckGo",
+    "Emoji": "Mienetoj",
+    "Notify the whole room": "Sciigi la tutan ĉambron",
+    "Room Notification": "Ĉambra sciigo",
+    "Users": "Uzantoj",
+    "unknown device": "nekonata aparato",
+    "NOT verified": "nekontrolita",
+    "verified": "kontrolita",
+    "Verification": "Kontrolo",
+    "Ed25519 fingerprint": "Premsigno laŭ Ed25519",
+    "User ID": "Identigaĵo de uzanto",
+    "Curve25519 identity key": "Identiga ŝlosilo laŭ Curve25519",
+    "Claimed Ed25519 fingerprint key": "Asertita premsigno laŭ Ed25519",
+    "Algorithm": "Algoritmo",
+    "unencrypted": "neĉifritaj",
+    "Decryption error": "Malĉifra eraro",
+    "Session ID": "Seanca identigaĵo",
+    "End-to-end encryption information": "Informoj pri ĝiscela ĉifrado",
+    "Event information": "Informoj pri okazaĵo",
+    "Sender device information": "Informoj pri aparato de sendinto",
+    "Passphrases must match": "Pasfrazoj devas kongrui",
+    "Passphrase must not be empty": "Pasfrazoj maldevas esti malplenaj",
+    "Export room keys": "Elporti ĉambrajn ŝlosilojn",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Tio ĉi permesos al vi elporti al loka dosiero ŝlosilojn por la mesaĝoj ricevitaj en ĉifritaj ĉambroj. Poste vi povos enporti la dosieron en alian klienton de Matrix, por povigi ĝin malĉifri tiujn mesaĝojn.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "La elportita dosiero permesos al ajna havanto malĉifradon de ĉiuj ĉifritaj mesaĝoj videblaj al vi; tenu ĝin do sekure. Tial vi enigu sube pasfrazon, uzotan por ĉifri la elportitajn datumojn. Tiuj nur enporteblos kun la sama pasfrazo.",
+    "Enter passphrase": "Enigu pasfrazon",
+    "Confirm passphrase": "Konfirmu pasfrazon",
+    "Export": "Elporti",
+    "Import room keys": "Enporti ĉambrajn ŝlosilojn",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tio ĉi permesos al vi enporti ĉifrajn ŝlosilojn, kiujn vi antaŭe elportis el alia kliento de Matrix. Poste vi povos malĉifri la samajn mesaĝojn, kiujn la alia kliento povis.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "La elportita dosiero estos protektata de pasfrazo. Por malĉifri ĝin, enigu la pasfrazon ĉi tien.",
+    "File to import": "Enportota dosiero",
+    "Import": "Enporti",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Forigo de fenestraĵo efektiviĝos por ĉiuj uzantoj en ĉi tiu ĉambro. Ĉu vi certe volas ĝin forigi?",
+    "Unblacklist": "Repermesi legadon de ĉifritaj mesaĝoj",
+    "none": "neniu"
 }

From 774774c365a69ec4a563f972c608bf9f05dd45b5 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 19 Dec 2017 17:06:08 +0000
Subject: [PATCH 148/927] Remove unused dep.

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

diff --git a/package.json b/package.json
index 0e2074f381..943c443c59 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,6 @@
     "classnames": "^2.1.2",
     "commonmark": "^0.27.0",
     "counterpart": "^0.18.0",
-    "dom-to-image": "^2.6.0",
     "draft-js": "^0.11.0-alpha",
     "draft-js-export-html": "^0.6.0",
     "draft-js-export-markdown": "^0.3.0",

From 8e5c3f01b47da99b6188805d671e792d4eb6b0d6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 19 Dec 2017 17:08:17 +0000
Subject: [PATCH 149/927] License and linting fixes.

---
 src/MatrixPostMessageApi.js | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/MatrixPostMessageApi.js b/src/MatrixPostMessageApi.js
index dd65cbd8fa..d6417f8764 100644
--- a/src/MatrixPostMessageApi.js
+++ b/src/MatrixPostMessageApi.js
@@ -1,10 +1,26 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 import Promise from "bluebird";
 
-
 function defer() {
-    let resolve, reject;
+    let resolve;
+    let reject;
     let isPending = true;
-    let promise = new Promise(function(...args) {
+    const promise = new Promise(function(...args) {
         resolve = args[0];
         reject = args[1];
     });
@@ -55,18 +71,18 @@ export default class PostMessageApi {
         if (this._onMsgCallback) {
             return this._onMsgCallback;
         }
-        let self = this;
+        const self = this;
         this._onMsgCallback = function(ev) {
             // THIS IS ALL UNSAFE EXECUTION.
             // We do not verify who the sender of `ev` is!
-            let payload = ev.data;
+            const payload = ev.data;
             // NOTE: Workaround for running in a mobile WebView where a
             // postMessage immediately triggers this callback even though it is
             // not the response.
             if (payload.response === undefined) {
                 return;
             }
-            let deferred = self._pending[payload._id];
+            const deferred = self._pending[payload._id];
             if (!deferred) {
                 return;
             }
@@ -83,7 +99,7 @@ export default class PostMessageApi {
         this._counter += 1;
         target = target || "*";
         action._id = Date.now() + "-" + Math.random().toString(36) + "-" + this._counter;
-        let d = defer();
+        const d = defer();
         this._pending[action._id] = d;
         this._window.postMessage(action, target);
 

From 536d4efc4059127c6e407524436e1ea034057a99 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 19 Dec 2017 17:11:36 +0000
Subject: [PATCH 150/927] Fix comments.

---
 src/WidgetMessaging.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index d71d86f8f5..2ca8589b54 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -54,7 +54,7 @@ The "message" key should be a human-friendly string.
 
 INBOUND ACTIONS
 ===============
-** All actions must include an "api" field with valie "widget".**
+** All actions must include an "api" field with value of "widget".**
 All actions can return an error response instead of the response outlined below.
 
 content_loaded
@@ -66,7 +66,7 @@ Request:
  - No additional fields.
 Response:
 {
-    success: true
+    success: "true"
 }
 Example:
 {
@@ -114,7 +114,7 @@ OUTBOUND ACTIONS
 ================
 
 In addition to listening for inbound requests, the API can be used to initiate
-actionss in the widget iframe, and request data from the widget instance.
+actions in the widget iframe, and request data from the widget instance.
 
 Outbound actions use the "widget_client" API key / name, which must be included
 on all requests.
@@ -135,11 +135,13 @@ Request a screenshot from the widget (if supported).
 This can only be supported by widgets that have access to all of their DOM tree.
 For example, widgets that nest further levels of iframes can not support this.
 
+The screenshot is returned as a Blob object.
+
 Request:
  - No additional fields.
 Response:
 {
-    screenshot: {data...}
+    screenshot: {<Blob>data...}
 }
 Example:
 {

From 08bcfc5c4e123f7382c06d182350b6df70438c47 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 19 Dec 2017 17:15:06 +0000
Subject: [PATCH 151/927] Make sure that capabilities array is initialised.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 770406e645..ea4f07e657 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -339,6 +339,7 @@ export default React.createClass({
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
         this.widgetMessaging.getCapabilities().then((capabilities) => {
             console.log("Got widget capabilities", this.widgetId, capabilities);
+            capabilities = capabilities || [];
             this.setState({capabilities});
         }).catch((err) => {
             console.log("Failed to get widget capabilities", this.widgetId, err);

From baf472b4a32d91992e3b774c6f2bfeff1df3f306 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 19 Dec 2017 17:16:38 +0000
Subject: [PATCH 152/927] Only show snapshot button when apps are maximised.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index ea4f07e657..07a24cba5b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -484,8 +484,8 @@ export default React.createClass({
             deleteClasses += ' mx_AppTileMenuBarWidgetDelete';
         }
 
-        // Picture snapshot
-        const showPictureSnapshotButton = this._hasCapability('screenshot');
+        // Picture snapshot - only show button when apps are maximised.
+        const showPictureSnapshotButton = this._hasCapability('screenshot') && this.props.show;
         const showPictureSnapshotIcon = 'img/camera_green.svg';
         const windowStateIcon = (this.props.show ? 'img/minimize.svg' : 'img/maximize.svg');
 

From 20c485d85e4deaae0a8090496241133902a76486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Wed, 20 Dec 2017 10:09:26 +0100
Subject: [PATCH 153/927] Move aria-hidden management from the BaseDialog
 component to the Modal

---
 src/Modal.js                               | 14 ++++++++++++++
 src/components/views/dialogs/BaseDialog.js | 18 ------------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index 68d75d1ff1..69ff806045 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -186,11 +186,25 @@ class ModalManager {
     }
 
     _reRender() {
+        // Retrieve the root node of the Riot application outside the modal
+        let applicationNode = document.getElementById('matrixchat');
         if (this._modals.length == 0) {
+            if (applicationNode) {
+                // If there is no modal to render, make all of Riot available
+                // to screen reader users again
+                applicationNode.setAttribute('aria-hidden', 'false');
+            }
             ReactDOM.unmountComponentAtNode(this.getOrCreateContainer());
             return;
         }
 
+        if (applicationNode) {
+            // Hide the content outside the modal to screen reader users
+            // so they won't be able to navigate into it and act on it using
+            // screen reader specific features
+            applicationNode.setAttribute('aria-hidden', 'true');
+        }
+
         const modal = this._modals[0];
         const dialog = (
             <div className={"mx_Dialog_wrapper " + (modal.className ? modal.className : '')}>
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index db8e530fa0..7fb642b560 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -49,24 +49,6 @@ export default React.createClass({
         contentId: React.PropTypes.string,
     },
 
-    componentDidMount: function() {
-        // Retrieve the root node of the Riot application outside the dialog
-        this.applicationNode = document.getElementById('matrixchat');
-        if (this.applicationNode) {
-            // Hide the content outside the dialog to screen reader users
-            // so they won't be able to navigate into it and act on it using
-            // screen reader specific features
-            this.applicationNode.setAttribute('aria-hidden', 'true');
-        }
-    },
-
-    componentWillUnmount: function() {
-        if (this.applicationNode) {
-            // When dismissing the dialog, make all of Riot available to screen reader users again
-            this.applicationNode.setAttribute('aria-hidden', 'false');
-        }
-    },
-
     _onKeyDown: function(e) {
         if (e.keyCode === KeyCode.ESCAPE) {
             e.stopPropagation();

From f2ca02eaf8aa7b4cd997526bc23396bddf25b8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Wed, 20 Dec 2017 10:13:37 +0100
Subject: [PATCH 154/927] SetEmailDialog: use autoFocus prop on the
 EditableText rather than using its ref inside onComponentDidMount function.
 This is shorter better and has been requested.

---
 src/components/views/dialogs/SetEmailDialog.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index 5a9569c1b5..ba054b0c27 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -40,10 +40,6 @@ export default React.createClass({
         };
     },
 
-    componentDidMount: function() {
-        this.refs.emailInputField.focus();
-    },
-
     onEmailAddressChanged: function(value) {
         this.setState({
             emailAddress: value,
@@ -131,7 +127,7 @@ export default React.createClass({
 
         const emailInput = this.state.emailBusy ? <Spinner /> : <EditableText
             className="mx_SetEmailDialog_email_input"
-            ref="emailInputField"
+            autoFocus="true"
             placeholder={_t("Email address")}
             placeholderClassName="mx_SetEmailDialog_email_input_placeholder"
             blurToCancel={false}

From 9702e60f4600d987d0c7bfdbd6856affe3bfc2df Mon Sep 17 00:00:00 2001
From: SimonLefort <moi@simonlefort.be>
Date: Wed, 20 Dec 2017 10:55:39 +0000
Subject: [PATCH 155/927] Translated using Weblate (French)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 9883e0eb21..980f20ade4 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -219,7 +219,7 @@
     "unknown error code": "Code d'erreur inconnu",
     "OK": "OK",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Une fois le chiffrement activé dans un salon il ne peut pas être désactivé (pour le moment)",
-    "Only people who have been invited": "Seul les personnes ayant été invitées",
+    "Only people who have been invited": "Seules les personnes ayant été invitées",
     "Password": "Mot de passe",
     "Passwords can't be empty": "Le mot de passe ne peut pas être vide",
     "People": "Personnes",

From ab347c82f7479eca4794b74eb37b2ae728403889 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 21 Dec 2017 12:23:48 +0000
Subject: [PATCH 156/927] Allow argument to op slashcommand to be negative as
 PLs can be -ve

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 344bac1ddb..711805f8ef 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -295,7 +295,7 @@ const commands = {
     // Define the power level of a user
     op: new Command("op", "<userId> [<power level>]", function(roomId, args) {
         if (args) {
-            const matches = args.match(/^(\S+?)( +(\d+))?$/);
+            const matches = args.match(/^(\S+?)( +(-?\d+))?$/);
             let powerLevel = 50; // default power level for op
             if (matches) {
                 const userId = matches[1];

From e1a132b27bdb8d3daf3a6a0869dfe3b44ec1807e Mon Sep 17 00:00:00 2001
From: Joachim Nielandt <joachim.nielandt@gmail.com>
Date: Fri, 22 Dec 2017 08:59:20 +0000
Subject: [PATCH 157/927] Translated using Weblate (Dutch)

Currently translated at 74.1% (710 of 958 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 357ab92026..ac41825e58 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -97,7 +97,7 @@
     "Failed to forget room %(errCode)s": "Ruimte vergeten mislukt %(errCode)s",
     "Favourite": "Favoriet",
     "Mute": "Dempen",
-    "Notifications": "Meldingen",
+    "Notifications": "Notificaties",
     "Operation failed": "Actie mislukt",
     "powered by Matrix": "mogelijk gemaakt door Matrix",
     "Remove": "Verwijderen",
@@ -142,7 +142,7 @@
     "Reason: %(reasonText)s": "Reden: %(reasonText)s",
     "Revoke Moderator": "Beheerder terugtrekken",
     "Refer a friend to Riot:": "Laat een vriend weten over Riot:",
-    "Register": "Registreren",
+    "Register": "Registreer",
     "%(targetName)s rejected the invitation.": "%(targetName)s heeft de uitnodiging geweigerd.",
     "Reject invitation": "Uitnodiging weigeren",
     "Rejoin": "Opnieuw toetreden",
@@ -184,7 +184,7 @@
     "Create an account": "Open een account",
     "Cryptography": "Cryptografie",
     "Current password": "Huidig wachtwoord",
-    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de naam van de kamer verwijderd.",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de naam van de ruimte verwijderd.",
     "Create a new chat or reuse an existing one": "Maak een nieuwe chat aan of ga verder met een bestaande",
     "Create Room": "Maak een kamer aan",
     "Curve25519 identity key": "Curve25519-identiteitssleutel",
@@ -308,7 +308,7 @@
     "Sign in with": "Inloggen met",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Toetreden als <voiceText>spraak</voiceText> of <videoText>video</videoText>.",
     "Join Room": "Ruimte toetreden",
-    "%(targetName)s joined the room.": "%(targetName)s in de ruimte toegetreden.",
+    "%(targetName)s joined the room.": "%(targetName)s is aan de ruimte toegevoegd.",
     "Joins room with given alias": "Treed de ruimte toe met een gegeven naam",
     "Jump to first unread message.": "Spring naar het eerste ongelezen bericht.",
     "Labs": "Labs",
@@ -367,7 +367,7 @@
     "Room name (optional)": "Ruimtenaam (optioneel)",
     "%(roomName)s does not exist.": "%(roomName)s bestaat niet.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s is niet toegankelijk op dit moment.",
-    "Rooms": "Ruimtes",
+    "Rooms": "Kamers",
     "Save": "Opslaan",
     "Scroll to bottom of page": "Scroll naar de onderkant van de pagina",
     "Scroll to unread messages": "Scroll naar ongelezen berichten",
@@ -740,7 +740,7 @@
     "Changes colour scheme of current room": "Verander het kleurenschema van de huidige ruimte",
     "Delete widget": "Widget verwijderen",
     "Do you want to load widget from URL:": "Wil je de widget laden van de URL:",
-    "Edit": "Wijzigen",
+    "Edit": "Aanpassen",
     "Enable automatic language detection for syntax highlighting": "Automatische taaldetectie voor zinsbouwmarkeringen aanzetten",
     "Hide Apps": "Apps verbergen",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Toetreed/verlaat berichten verbergen (uitnodigingen/verwijderingen/verbanningen zullen ongeschonden blijven)",
@@ -775,5 +775,25 @@
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot-check is momenteel niet beschikbaar op de desktop - gebruik in plaats daarvan een <a>webbrowser</a>",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s-widget aangepast door %(senderName)s",
     "Copied!": "Gekopieerd!",
-    "Failed to copy": "Kopiëren mislukt"
+    "Failed to copy": "Kopiëren mislukt",
+    "Unpin Message": "Maak pin los",
+    "Add rooms to this community": "Voeg kamers toe aan deze community",
+    "Call Failed": "Oproep mislukt",
+    "Call": "Bel",
+    "Answer": "Antwoord",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Opgepast: elke persoon die je toevoegt aan een community zal publiek zichtbaar zijn voor iedereen die het community ID kent",
+    "Invite new community members": "Nodig nieuwe community leden uit",
+    "Name or matrix ID": "Naam of Matrix ID",
+    "Which rooms would you like to add to this community?": "Welke kamers wil je toevoegen aan deze community?",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Een widget verwijderen doet dat voor alle gebruikers in deze ruimte. Ben je zeker dat je het widget wil verwijderen?",
+    "Delete Widget": "Widget verwijderen",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Er zijn onbekende toestellen in deze kamer: als je verder gaat zonder ze te verifieren zal het mogelijk zijn dat iemand je oproep afluistert.",
+    "Review Devices": "Toestellen nakijken",
+    "Call Anyway": "Bel toch",
+    "Answer Anyway": "Antwoord toch",
+    "Who would you like to add to this community?": "Wie wil je toevoegen aan deze community?",
+    "Invite to Community": "Nodig uit in deze community",
+    "Show these rooms to non-members on the community page and room list?": "Toon deze ruimtes aan niet-leden op de community pagina en lijst van ruimtes?",
+    "Add rooms to the community": "Voeg ruimtes toe aan de community",
+    "Room name or alias": "Ruimte naam of alias"
 }

From 8bb16466d68a06fe9f05bf1e8ddbbe0be34229b1 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 18 Dec 2017 22:36:12 +1300
Subject: [PATCH 158/927] Rebase AddressSelector on BaseDialog

---
 .../views/dialogs/AddressPickerDialog.js          | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 837d2f5349..716c6dac29 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -20,7 +20,6 @@ import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import AccessibleButton from '../elements/AccessibleButton';
 import Promise from 'bluebird';
 import { addressTypes, getAddressType } from '../../../UserAddress.js';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
@@ -507,7 +506,7 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const AddressSelector = sdk.getComponent("elements.AddressSelector");
         this.scrollElement = null;
 
@@ -580,14 +579,8 @@ module.exports = React.createClass({
         }
 
         return (
-            <div className="mx_ChatInviteDialog" onKeyDown={this.onKeyDown}>
-                <div className="mx_Dialog_title">
-                    { this.props.title }
-                </div>
-                <AccessibleButton className="mx_ChatInviteDialog_cancel"
-                        onClick={this.onCancel} >
-                    <TintableSvg src="img/icons-close-button.svg" width="35" height="35" />
-                </AccessibleButton>
+            <BaseDialog className="mx_ChatInviteDialog" onKeyDown={this.onKeyDown}
+                onFinished={this.props.onFinished} title={this.props.title}>
                 <div className="mx_ChatInviteDialog_label">
                     <label htmlFor="textinput">{ this.props.description }</label>
                 </div>
@@ -602,7 +595,7 @@ module.exports = React.createClass({
                         { this.props.button }
                     </button>
                 </div>
-            </div>
+            </BaseDialog>
         );
     },
 });

From c5284eb07039845a2d03968c593af6b379529b45 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 18 Dec 2017 23:06:21 +1300
Subject: [PATCH 159/927] Allow BaseDialog to take a class for the title <div>

Some dialogs need to set additional classes on the `mx_Dialog_title` `div`
element (for example `danger`).
---
 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 b88a6c026e..56c8322c0b 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -75,7 +75,7 @@ export default React.createClass({
                 >
                     <TintableSvg src="img/icons-close-button.svg" width="35" height="35" />
                 </AccessibleButton>
-                <div className='mx_Dialog_title'>
+                <div className={'mx_Dialog_title ' + this.props.titleClass}>
                     { this.props.title }
                 </div>
                 { this.props.children }

From 9ebd58852c7ccc68a445121389ddd43eec157dc2 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 18 Dec 2017 23:08:51 +1300
Subject: [PATCH 160/927] Rebase DeactivateAccountDialog on BaseDialog

---
 .../views/dialogs/DeactivateAccountDialog.js         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index c45e072d72..2af9acfbb5 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -77,6 +77,7 @@ export default class DeactivateAccountDialog extends React.Component {
     }
 
     render() {
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const Loader = sdk.getComponent("elements.Spinner");
         let passwordBoxClass = '';
 
@@ -99,10 +100,11 @@ export default class DeactivateAccountDialog extends React.Component {
         }
 
         return (
-            <div className="mx_DeactivateAccountDialog">
-                <div className="mx_Dialog_title danger">
-                    { _t("Deactivate Account") }
-                </div>
+            <BaseDialog className="mx_DeactivateAccountDialog"
+                onFinished={this.props.onFinished}
+                onEnterPressed={this.onOk}
+                titleClass="danger"
+                title={_t("Deactivate Account")}>
                 <div className="mx_Dialog_content">
                     <p>{ _t("This will make your account permanently unusable. You will not be able to re-register the same user ID.") }</p>
 
@@ -130,7 +132,7 @@ export default class DeactivateAccountDialog extends React.Component {
 
                     { cancelButton }
                 </div>
-            </div>
+            </BaseDialog>
         );
     }
 }

From 45d86ea7ca764c00dac2ae4c04a09bfc89eb23ab Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Thu, 21 Dec 2017 23:48:46 +1300
Subject: [PATCH 161/927] Add DialogButton component

A component to normalise the buttons in dialogs.
---
 .../views/elements/DialogButtons.js           | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 src/components/views/elements/DialogButtons.js

diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
new file mode 100644
index 0000000000..e730bfb377
--- /dev/null
+++ b/src/components/views/elements/DialogButtons.js
@@ -0,0 +1,61 @@
+/*
+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.
+*/
+
+"use strict";
+
+import React from "react";
+import { _t } from '../../../languageHandler';
+
+/**
+ * Basic container for buttons in modal dialogs.
+ */
+module.exports = React.createClass({
+    displayName: "DialogButtons",
+
+    propTypes: {
+        // The primary button which is styled differently and has default focus.
+        primaryButton: React.PropTypes.node.isRequired,
+
+        // onClick handler for the primary button.
+        onPrimaryButtonClick: React.PropTypes.func.isRequired,
+
+        // onClick handler for the cancel button.
+        onCancel: React.PropTypes.func.isRequired,
+
+        focus: React.PropTypes.bool,
+    },
+
+    render: function() {
+        let primaryButtonClassName = "mx_Dialog_primary";
+        if (this.props.primaryButtonClass) {
+            primaryButtonClassName += " " + this.props.primaryButtonClass;
+        }
+        return (
+            <div className="mx_Dialog_buttons">
+                <button className={primaryButtonClassName}
+                    onClick={this.props.onPrimaryButtonClick}
+                    autoFocus={this.props.focus}
+                >
+                    { this.props.primaryButton }
+                </button>
+                { this.props.children }
+                <button onClick={this.props.onCancel}>
+                    { _t("Cancel") }
+                </button>
+            </div>
+        );
+    },
+});

From 3b2c61e4566512b3f513aacd2ccfece2dbc37e31 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Thu, 21 Dec 2017 23:51:14 +1300
Subject: [PATCH 162/927] Use DialogButtons in QuestionDialog

Use DialogButtons to eliminate duplicate button code.
---
 .../views/dialogs/QuestionDialog.js           | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 339b284e2f..4197199bde 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -18,7 +18,6 @@ limitations under the License.
 import React from 'react';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import classnames from 'classnames';
 
 export default React.createClass({
     displayName: 'QuestionDialog',
@@ -53,30 +52,27 @@ export default React.createClass({
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
-        const cancelButton = this.props.hasCancelButton ? (
-            <button onClick={this.onCancel}>
-                { _t("Cancel") }
-            </button>
-        ) : null;
-        const buttonClasses = classnames({
-            mx_Dialog_primary: true,
-            danger: this.props.danger,
-        });
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
+        let primaryButtonClass = "";
+        if (this.props.danger) {
+            primaryButtonClass = "danger";
+        }
         return (
             <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished}
                 onEnterPressed={this.onOk}
                 title={this.props.title}
+                focus={this.props.focus}
             >
                 <div className="mx_Dialog_content">
                     { this.props.description }
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button className={buttonClasses} onClick={this.onOk} autoFocus={this.props.focus}>
-                        { this.props.button || _t('OK') }
-                    </button>
+                </div>.
+                <DialogButtons primaryButton={this.props.button || _t('OK')}
+                    onPrimaryButtonClick={this.onOk}
+                    primaryButtonClass={primaryButtonClass}
+                    onCancel={this.onCancel}
+                >
                     { this.props.extraButtons }
-                    { cancelButton }
-                </div>
+                </DialogButtons>
             </BaseDialog>
         );
     },

From 0f6125e74958cc7e2e62f4a60916804a72df0311 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 10:12:47 +1300
Subject: [PATCH 163/927] Use DialogButtons in AddressSelector

Use DialogButtons to eliminate duplicate button code.
---
 src/components/views/dialogs/AddressPickerDialog.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/AddressPickerDialog.js b/src/components/views/dialogs/AddressPickerDialog.js
index 716c6dac29..685c4fcde3 100644
--- a/src/components/views/dialogs/AddressPickerDialog.js
+++ b/src/components/views/dialogs/AddressPickerDialog.js
@@ -507,6 +507,7 @@ module.exports = React.createClass({
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         const AddressSelector = sdk.getComponent("elements.AddressSelector");
         this.scrollElement = null;
 
@@ -590,11 +591,9 @@ module.exports = React.createClass({
                     { addressSelector }
                     { this.props.extraNode }
                 </div>
-                <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this.onButtonClick}>
-                        { this.props.button }
-                    </button>
-                </div>
+                <DialogButtons primaryButton={this.props.button}
+                    onPrimaryButtonClick={this.onButtonClick}
+                    onCancel={this.onCancel} />
             </BaseDialog>
         );
     },

From c863dbfc7601f254edf3c7ec7bcf7e18575cfd36 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 13:42:44 +1300
Subject: [PATCH 164/927] Use DialogButtons in CreateRoomDialog

Use DialogButtons to eliminate duplicate button code.
---
 src/components/views/dialogs/CreateRoomDialog.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index f7be47b3eb..a53f88f707 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -41,6 +41,7 @@ export default React.createClass({
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return (
             <BaseDialog className="mx_CreateRoomDialog" onFinished={this.props.onFinished}
                 onEnterPressed={this.onOk}
@@ -67,14 +68,9 @@ export default React.createClass({
                         </div>
                     </details>
                 </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.onCancel}>
-                        { _t('Cancel') }
-                    </button>
-                    <button className="mx_Dialog_primary" onClick={this.onOk}>
-                        { _t('Create Room') }
-                    </button>
-                </div>
+                <DialogButtons primaryButton={_t('Create Room')}
+                    onPrimaryButtonClick={this.onOk}
+                    onCancel={this.onCancel} />
             </BaseDialog>
         );
     },

From aecb4650bc901d2c610be2e71c1b376ed541f804 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 13:56:04 +1300
Subject: [PATCH 165/927] Correct order of buttons in CreateGroupDialog

We can't use DialogButtons because the primary button is an <input> element.
---
 src/components/views/dialogs/CreateGroupDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 168fe75947..d811dde09e 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -159,10 +159,10 @@ export default React.createClass({
                         { createErrorNode }
                     </div>
                     <div className="mx_Dialog_buttons">
+                        <input type="submit" value={_t('Create')} className="mx_Dialog_primary" />
                         <button onClick={this._onCancel}>
                             { _t("Cancel") }
                         </button>
-                        <input type="submit" value={_t('Create')} className="mx_Dialog_primary" />
                     </div>
                 </form>
             </BaseDialog>

From 7a761dbf6bdfef2067956e8968ef660e214b2caf Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 16:15:28 +1300
Subject: [PATCH 166/927] Use DialogButtons in ChatCreateOrReuseDialog

Use DialogButtons to eliminate duplicate button code.
---
 src/components/views/dialogs/ChatCreateOrReuseDialog.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index e0578f3b53..22e747a989 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -137,6 +137,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
         } else {
             // Show the avatar, name and a button to confirm that a new chat is requested
             const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
+            const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
             const Spinner = sdk.getComponent('elements.Spinner');
             title = _t('Start chatting');
 
@@ -166,11 +167,8 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                     </p>
                     { profile }
                 </div>
-                <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this.props.onNewDMClick}>
-                        { _t('Start Chatting') }
-                    </button>
-                </div>
+                <DialogButtons primaryButton={_t('Start Chatting')}
+                    onPrimaryButtonClick={this.props.onNewDMClick} />
             </div>;
         }
 

From 93b789438b90888006d714a8e9cd07dc71a9a598 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 16:15:53 +1300
Subject: [PATCH 167/927] Use DialogButtons in ConfirmUserActionDialog

Use DialogButtons to eliminate duplicate button code.
---
 .../views/dialogs/ConfirmUserActionDialog.js  | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 78d084b709..91d2b342a4 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -76,13 +76,11 @@ export default React.createClass({
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
         const BaseAvatar = sdk.getComponent("views.avatars.BaseAvatar");
 
-        const confirmButtonClass = classnames({
-            'mx_Dialog_primary': true,
-            'danger': this.props.danger,
-        });
+        const confirmButtonClass = this.props.danger ? 'danger' : '';
 
         let reasonBox;
         if (this.props.askReason) {
@@ -127,17 +125,11 @@ export default React.createClass({
                     <div className="mx_ConfirmUserActionDialog_userId">{ userId }</div>
                 </div>
                 { reasonBox }
-                <div className="mx_Dialog_buttons">
-                    <button className={confirmButtonClass}
-                        onClick={this.onOk} autoFocus={!this.props.askReason}
-                    >
-                        { this.props.action }
-                    </button>
-
-                    <button onClick={this.onCancel}>
-                        { _t("Cancel") }
-                    </button>
-                </div>
+                <DialogButtons primaryButton={this.props.action}
+                    onPrimaryButtonClick={this.onOk}
+                    primaryButtonClass={confirmButtonClass}
+                    focus={!this.props.askReason}
+                    onCancel={this.onCancel} />
             </BaseDialog>
         );
     },

From a11146f39d890e906f6262909ce2dfa4e57e93eb Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 16:44:32 +1300
Subject: [PATCH 168/927] Use DialogButtons in SessionRestoreErrorDialog

Use DialogButtons to eliminate duplicate button code.
---
 .../views/dialogs/SessionRestoreErrorDialog.js           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index 75ae0eda17..2e384a268f 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -40,6 +40,7 @@ export default React.createClass({
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         let bugreport;
 
         if (SdkConfig.get().bug_report_endpoint_url) {
@@ -68,11 +69,9 @@ export default React.createClass({
 
                     { bugreport }
                 </div>
-                <div className="mx_Dialog_buttons">
-                    <button className="mx_Dialog_primary" onClick={this._continueClicked}>
-                        { _t("Continue anyway") }
-                    </button>
-                </div>
+                <DialogButtons primaryButton={_t("Continue anyway")}
+                    onPrimaryButtonClick={this._continueClicked}
+                    onCancel={this.props.onFinished} />
             </BaseDialog>
         );
     },

From 2674fcb6d3f5735d8158b1399000169cce9e00e9 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 16:50:35 +1300
Subject: [PATCH 169/927] Use DialogButtons in TextInputDialog

Use DialogButtons to eliminate duplicate button code.
---
 src/components/views/dialogs/TextInputDialog.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 5ea4191e5e..2e40ee0d67 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -58,6 +58,7 @@ export default React.createClass({
 
     render: function() {
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return (
             <BaseDialog className="mx_TextInputDialog" onFinished={this.props.onFinished}
                 onEnterPressed={this.onOk}
@@ -71,14 +72,9 @@ export default React.createClass({
                         <input id="textinput" ref="textinput" className="mx_TextInputDialog_input" defaultValue={this.props.value} autoFocus={this.props.focus} size="64" />
                     </div>
                 </div>
-                <div className="mx_Dialog_buttons">
-                    <button onClick={this.onCancel}>
-                        { _t("Cancel") }
-                    </button>
-                    <button className="mx_Dialog_primary" onClick={this.onOk}>
-                        { this.props.button }
-                    </button>
-                </div>
+                <DialogButtons primaryButton={this.props.button}
+                    onPrimaryButtonClick={this.onOk}
+                    onCancel={this.onCancel} />
             </BaseDialog>
         );
     },

From e6dbc3b863a7010a14e58c24abeddd933eb70870 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 23 Dec 2017 16:50:45 +1300
Subject: [PATCH 170/927] Use DialogButtons in UnknownDeviceDialog

Use DialogButtons to eliminate duplicate button code.
---
 .../views/dialogs/UnknownDeviceDialog.js      | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 9c19ee6eca..b81700cac0 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -187,18 +187,11 @@ export default React.createClass({
                 }
             });
         });
-        let sendButton;
-        if (haveUnknownDevices) {
-            sendButton = <button onClick={this._onSendAnywayClicked}>
-                { this.props.sendAnywayLabel }
-            </button>;
-        } else {
-            sendButton = <button onClick={this._onSendClicked}>
-                { this.props.sendLabel }
-            </button>;
-        }
+        const sendButtonOnClick = haveUnknownDevices ? this._onSendAnywayClicked : this._onSendClicked;
+        const sendButtonLabel = haveUnknownDevices ? this.props.sendAnywayLabel : this.props.sendAnywayLabel;
 
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
         return (
             <BaseDialog className='mx_UnknownDeviceDialog'
                 onFinished={this.props.onFinished}
@@ -213,14 +206,9 @@ export default React.createClass({
 
                     <UnknownDeviceList devices={this.props.devices} />
                 </GeminiScrollbar>
-                <div className="mx_Dialog_buttons">
-                    {sendButton}
-                    <button className="mx_Dialog_primary" autoFocus={true}
-                        onClick={this._onDismissClicked}
-                    >
-                        {_t("Dismiss")}
-                    </button>
-                </div>
+                <DialogButtons primaryButton={sendButtonLabel}
+                    onPrimaryButtonClick={sendButtonOnClick}
+                    onCancel={this._onDismissClicked} />
             </BaseDialog>
         );
         // XXX: do we want to give the user the option to enable blacklistUnverifiedDevices for this room (or globally) at this point?

From 6f674f21f652699da0d0b9855fcfa061f713586f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 Dec 2017 13:27:23 -0700
Subject: [PATCH 171/927] Hide the notification nag bar after enabling
 notifications

and add a bit of documentation around why the notificationsEnabled setting isn't set here.

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

diff --git a/src/Notifier.js b/src/Notifier.js
index 75b698862c..e69bdf4461 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -135,6 +135,10 @@ const Notifier = {
         const plaf = PlatformPeg.get();
         if (!plaf) return;
 
+        // Dev note: We don't set the "notificationsEnabled" setting to true here because it is a
+        // calculated value. It is determined based upon whether or not the master rule is enabled
+        // and other flags. Setting it here would cause a circular reference.
+
         Analytics.trackEvent('Notifier', 'Set Enabled', enable);
 
         // make sure that we persist the current setting audio_enabled setting
@@ -168,7 +172,7 @@ const Notifier = {
             });
             // clear the notifications_hidden flag, so that if notifications are
             // disabled again in the future, we will show the banner again.
-            this.setToolbarHidden(false);
+            this.setToolbarHidden(true);
         } else {
             dis.dispatch({
                 action: "notifier_enabled",

From 2815c576c1c2758ec6fce69775b92ff99b6e505e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 Dec 2017 13:29:30 -0700
Subject: [PATCH 172/927] Ignore the default value when calculating if
 notifications are enabled

This is to make the "Enable desktop notifications" checkbox accurately reflect the user's preference. The device-level setting is still respected.

Signed-off-by: Travis Ralston <travpc@gmail.com>
---
 src/settings/SettingsStore.js                       | 12 ++++++------
 src/settings/controllers/NotificationControllers.js |  4 ++--
 src/settings/controllers/SettingController.js       |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index d93a48005d..a1b88fb0c2 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -222,9 +222,9 @@ export default class SettingsStore {
 
         if (explicit) {
             const handler = handlers[level];
-            if (!handler) return SettingsStore._tryControllerOverride(settingName, level, roomId, null);
+            if (!handler) return SettingsStore._tryControllerOverride(settingName, level, roomId, null, null);
             const value = handler.getValue(settingName, roomId);
-            return SettingsStore._tryControllerOverride(settingName, level, roomId, value);
+            return SettingsStore._tryControllerOverride(settingName, level, roomId, value, level);
         }
 
         for (let i = minIndex; i < levelOrder.length; i++) {
@@ -234,17 +234,17 @@ export default class SettingsStore {
 
             const value = handler.getValue(settingName, roomId);
             if (value === null || value === undefined) continue;
-            return SettingsStore._tryControllerOverride(settingName, level, roomId, value);
+            return SettingsStore._tryControllerOverride(settingName, level, roomId, value, levelOrder[i]);
         }
 
-        return SettingsStore._tryControllerOverride(settingName, level, roomId, null);
+        return SettingsStore._tryControllerOverride(settingName, level, roomId, null, null);
     }
 
-    static _tryControllerOverride(settingName, level, roomId, calculatedValue) {
+    static _tryControllerOverride(settingName, level, roomId, calculatedValue, calculatedAtLevel) {
         const controller = SETTINGS[settingName].controller;
         if (!controller) return calculatedValue;
 
-        const actualValue = controller.getValueOverride(level, roomId, calculatedValue);
+        const actualValue = controller.getValueOverride(level, roomId, calculatedValue, calculatedAtLevel);
         if (actualValue !== undefined && actualValue !== null) return actualValue;
         return calculatedValue;
     }
diff --git a/src/settings/controllers/NotificationControllers.js b/src/settings/controllers/NotificationControllers.js
index 9dcf78e26b..e78b67e847 100644
--- a/src/settings/controllers/NotificationControllers.js
+++ b/src/settings/controllers/NotificationControllers.js
@@ -35,11 +35,11 @@ function isMasterRuleEnabled() {
 }
 
 export class NotificationsEnabledController extends SettingController {
-    getValueOverride(level, roomId, calculatedValue) {
+    getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
         const Notifier = require('../../Notifier'); // avoids cyclical references
         if (!Notifier.isPossible()) return false;
 
-        if (calculatedValue === null) {
+        if (calculatedValue === null || calculatedAtLevel === "default") {
             return isMasterRuleEnabled();
         }
 
diff --git a/src/settings/controllers/SettingController.js b/src/settings/controllers/SettingController.js
index a91b616da9..0ebe0042e6 100644
--- a/src/settings/controllers/SettingController.js
+++ b/src/settings/controllers/SettingController.js
@@ -31,9 +31,11 @@ export default class SettingController {
      * @param {String} roomId The room ID, may be null.
      * @param {*} calculatedValue The value that the handlers think the setting should be,
      * may be null.
+     * @param {string} calculatedAtLevel The level for which the calculated value was
+     * calculated at. May be null.
      * @return {*} The value that should be used, or null if no override is applicable.
      */
-    getValueOverride(level, roomId, calculatedValue) {
+    getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
         return null; // no override
     }
 

From e8392dfa0093466a708a3a14ba8da576469e6c60 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 25 Dec 2017 13:39:32 -0700
Subject: [PATCH 173/927] Have /tint use the primary color as the secondary if
 no secondary was given

This is to make the color scheme actually apply itself now that the secondary color is not optional. In order to preserve it being optional in the command, we'll use the primary color as the secondary color as it has no major visual impact.

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

diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 344bac1ddb..4e711d6f44 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -96,6 +96,8 @@ const commands = {
                 colorScheme.primary_color = matches[1];
                 if (matches[4]) {
                     colorScheme.secondary_color = matches[4];
+                } else {
+                    colorScheme.secondary_color = colorScheme.primary_color;
                 }
                 return success(
                     SettingsStore.setValue("roomColor", roomId, SettingLevel.ROOM_ACCOUNT, colorScheme),

From e4b86f073069cc93b4bcb4c559db24d684d3002c Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Tue, 26 Dec 2017 11:55:15 +1300
Subject: [PATCH 174/927] Fix use of deprecated module

Use PropTypes from "prop-types" instead of the deprecated React.PropTypes
submodule.
---
 src/components/views/elements/DialogButtons.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index e730bfb377..4f22d43ae0 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -17,6 +17,7 @@ limitations under the License.
 "use strict";
 
 import React from "react";
+import PropTypes from "prop-types";
 import { _t } from '../../../languageHandler';
 
 /**
@@ -27,15 +28,15 @@ module.exports = React.createClass({
 
     propTypes: {
         // The primary button which is styled differently and has default focus.
-        primaryButton: React.PropTypes.node.isRequired,
+        primaryButton: PropTypes.node.isRequired,
 
         // onClick handler for the primary button.
-        onPrimaryButtonClick: React.PropTypes.func.isRequired,
+        onPrimaryButtonClick: PropTypes.func.isRequired,
 
         // onClick handler for the cancel button.
-        onCancel: React.PropTypes.func.isRequired,
+        onCancel: PropTypes.func.isRequired,
 
-        focus: React.PropTypes.bool,
+        focus: PropTypes.bool,
     },
 
     render: function() {

From 9531b219d21f09f6f92eb41e923a525db268f12e Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Tue, 26 Dec 2017 12:53:01 +1300
Subject: [PATCH 175/927] Remove unused imports

---
 src/components/views/dialogs/ConfirmUserActionDialog.js | 1 -
 src/components/views/dialogs/TextInputDialog.js         | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 91d2b342a4..3515b1f58d 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -18,7 +18,6 @@ import React from 'react';
 import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
-import classnames from 'classnames';
 import { GroupMemberType } from '../../../groups';
 
 /*
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 2e40ee0d67..cfe4ae0c99 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import sdk from '../../../index';
-import { _t } from '../../../languageHandler';
 
 export default React.createClass({
     displayName: 'TextInputDialog',

From 35780f5ae0050e2e828721b752311006a742c2f2 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Tue, 26 Dec 2017 14:03:18 +1300
Subject: [PATCH 176/927] Remove use of deprecated React.PropTypes

Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
---
 src/Modal.js                                  |  3 +-
 src/Velociraptor.js                           |  9 +--
 .../views/dialogs/EncryptedEventDialog.js     |  5 +-
 .../views/dialogs/ExportE2eKeysDialog.js      |  5 +-
 .../views/dialogs/ImportE2eKeysDialog.js      |  5 +-
 src/autocomplete/Components.js                | 19 +++---
 src/components/structures/ContextualMenu.js   | 11 ++--
 src/components/structures/CreateRoom.js       |  5 +-
 src/components/structures/FilePanel.js        |  3 +-
 src/components/structures/GroupView.js        |  4 +-
 src/components/structures/InteractiveAuth.js  | 27 ++++----
 src/components/structures/LoggedInView.js     | 17 +++---
 src/components/structures/MatrixChat.js       | 29 ++++-----
 src/components/structures/MessagePanel.js     | 37 +++++------
 src/components/structures/MyGroups.js         |  3 +-
 src/components/structures/RoomStatusBar.js    | 29 ++++-----
 src/components/structures/RoomView.js         | 11 ++--
 src/components/structures/ScrollPanel.js      | 17 +++---
 src/components/structures/TimelinePanel.js    | 31 +++++-----
 src/components/structures/UploadBar.js        |  3 +-
 src/components/structures/UserSettings.js     | 13 ++--
 .../structures/login/ForgotPassword.js        | 15 ++---
 src/components/structures/login/Login.js      | 23 +++----
 .../structures/login/PostRegistration.js      |  3 +-
 .../structures/login/Registration.js          | 39 ++++++------
 src/components/views/avatars/BaseAvatar.js    | 19 +++---
 src/components/views/avatars/MemberAvatar.js  | 15 ++---
 .../views/avatars/MemberPresenceAvatar.js     |  9 +--
 src/components/views/avatars/RoomAvatar.js    | 11 ++--
 .../views/create_room/CreateRoomButton.js     |  3 +-
 src/components/views/create_room/Presets.js   |  5 +-
 src/components/views/create_room/RoomAlias.js |  7 ++-
 src/components/views/dialogs/BaseDialog.js    | 11 ++--
 .../views/dialogs/ChatCreateOrReuseDialog.js  |  9 +--
 .../views/dialogs/ConfirmUserActionDialog.js  | 15 ++---
 .../views/dialogs/CreateRoomDialog.js         |  3 +-
 .../views/dialogs/DeactivateAccountDialog.js  |  3 +-
 .../views/dialogs/DeviceVerifyDialog.js       |  7 ++-
 src/components/views/dialogs/ErrorDialog.js   | 15 ++---
 .../views/dialogs/InteractiveAuthDialog.js    | 17 +++---
 .../views/dialogs/KeyShareDialog.js           |  9 +--
 .../views/dialogs/QuestionDialog.js           | 15 ++---
 .../dialogs/SessionRestoreErrorDialog.js      |  5 +-
 .../views/dialogs/SetEmailDialog.js           |  3 +-
 src/components/views/dialogs/SetMxIdDialog.js |  7 ++-
 .../views/dialogs/TextInputDialog.js          | 17 +++---
 .../views/elements/AccessibleButton.js        |  7 ++-
 .../views/elements/AddressSelector.js         | 13 ++--
 src/components/views/elements/AddressTile.js  |  7 ++-
 src/components/views/elements/AppTile.js      | 19 +++---
 .../views/elements/DeviceVerifyButtons.js     |  5 +-
 .../views/elements/DirectorySearchBox.js      | 13 ++--
 src/components/views/elements/Dropdown.js     | 29 ++++-----
 src/components/views/elements/EditableText.js | 21 ++++---
 .../views/elements/EditableTextContainer.js   | 11 ++--
 src/components/views/elements/EmojiText.js    |  5 +-
 src/components/views/elements/Flair.js        |  4 +-
 .../views/elements/LanguageDropdown.js        |  7 ++-
 .../views/elements/MemberEventListSummary.js  | 15 ++---
 .../views/elements/PowerSelector.js           | 13 ++--
 src/components/views/elements/ProgressBar.js  |  5 +-
 src/components/views/elements/SettingsFlag.js | 19 +++---
 src/components/views/elements/TagTile.js      |  2 +-
 src/components/views/elements/TintableSvg.js  |  9 +--
 src/components/views/elements/UserSelector.js |  5 +-
 src/components/views/groups/GroupRoomTile.js  |  2 +-
 src/components/views/groups/GroupTile.js      |  2 +-
 src/components/views/login/CaptchaForm.js     |  5 +-
 src/components/views/login/CasLogin.js        |  3 +-
 src/components/views/login/CountryDropdown.js | 13 ++--
 .../login/InteractiveAuthEntryComponents.js   | 61 ++++++++++---------
 src/components/views/login/PasswordLogin.js   | 23 +++----
 .../views/login/RegistrationForm.js           | 27 ++++----
 src/components/views/login/ServerConfig.js    | 15 ++---
 src/components/views/messages/MFileBody.js    |  3 +-
 src/components/views/messages/MImageBody.js   |  5 +-
 src/components/views/messages/MVideoBody.js   |  5 +-
 src/components/views/messages/MessageEvent.js | 13 ++--
 .../views/messages/RoomAvatarEvent.js         |  3 +-
 src/components/views/messages/TextualBody.js  | 11 ++--
 src/components/views/messages/TextualEvent.js |  3 +-
 .../views/room_settings/AliasSettings.js      | 11 ++--
 .../views/room_settings/ColorSettings.js      |  3 +-
 .../room_settings/RelatedGroupSettings.js     |  9 +--
 .../views/room_settings/UrlPreviewSettings.js |  3 +-
 src/components/views/rooms/AppsDrawer.js      |  3 +-
 src/components/views/rooms/AuxPanel.js        | 17 +++---
 src/components/views/rooms/EntityTile.js      | 25 ++++----
 src/components/views/rooms/EventTile.js       | 35 +++++------
 src/components/views/rooms/ForwardMessage.js  |  3 +-
 .../views/rooms/LinkPreviewWidget.js          |  9 +--
 .../views/rooms/MemberDeviceInfo.js           |  5 +-
 src/components/views/rooms/MemberInfo.js      |  5 +-
 src/components/views/rooms/MemberTile.js      |  3 +-
 src/components/views/rooms/MessageComposer.js | 11 ++--
 .../views/rooms/MessageComposerInput.js       | 19 +++---
 src/components/views/rooms/PinnedEventTile.js |  7 ++-
 .../views/rooms/PinnedEventsPanel.js          |  5 +-
 src/components/views/rooms/PresenceLabel.js   |  7 ++-
 .../views/rooms/ReadReceiptMarker.js          | 19 +++---
 src/components/views/rooms/RoomHeader.js      | 25 ++++----
 src/components/views/rooms/RoomList.js        |  7 ++-
 src/components/views/rooms/RoomNameEditor.js  |  3 +-
 src/components/views/rooms/RoomPreviewBar.js  | 21 ++++---
 src/components/views/rooms/RoomSettings.js    | 13 ++--
 src/components/views/rooms/RoomTile.js        | 21 ++++---
 src/components/views/rooms/RoomTopicEditor.js |  3 +-
 .../views/rooms/SearchResultTile.js           |  9 +--
 .../views/rooms/SearchableEntityList.js       | 13 ++--
 .../views/rooms/SimpleRoomHeader.js           |  7 ++-
 .../views/rooms/TopUnreadMessagesBar.js       |  5 +-
 src/components/views/rooms/UserTile.js        |  3 +-
 .../views/settings/AddPhoneNumber.js          |  5 +-
 src/components/views/settings/ChangeAvatar.js | 13 ++--
 .../views/settings/ChangePassword.js          | 19 +++---
 src/components/views/settings/DevicesPanel.js |  3 +-
 .../views/settings/DevicesPanelEntry.js       |  5 +-
 src/components/views/voip/CallPreview.js      |  3 +-
 src/components/views/voip/CallView.js         | 13 ++--
 src/components/views/voip/IncomingCallBox.js  |  3 +-
 src/components/views/voip/VideoFeed.js        |  5 +-
 src/components/views/voip/VideoView.js        |  7 ++-
 src/wrappers/withMatrixClient.js              |  3 +-
 123 files changed, 750 insertions(+), 632 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index 68d75d1ff1..c9f08772e7 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -19,6 +19,7 @@ limitations under the License.
 
 const React = require('react');
 const ReactDOM = require('react-dom');
+import PropTypes from 'prop-types';
 import Analytics from './Analytics';
 import sdk from './index';
 
@@ -33,7 +34,7 @@ const AsyncWrapper = React.createClass({
         /** A function which takes a 'callback' argument which it will call
          * with the real component once it loads.
          */
-        loader: React.PropTypes.func.isRequired,
+        loader: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/Velociraptor.js b/src/Velociraptor.js
index 9a674d4f09..af4e6dcb60 100644
--- a/src/Velociraptor.js
+++ b/src/Velociraptor.js
@@ -1,5 +1,6 @@
 const React = require('react');
 const ReactDom = require('react-dom');
+import PropTypes from 'prop-types';
 const Velocity = require('velocity-vector');
 
 /**
@@ -14,16 +15,16 @@ module.exports = React.createClass({
 
     propTypes: {
         // either a list of child nodes, or a single child.
-        children: React.PropTypes.any,
+        children: PropTypes.any,
 
         // optional transition information for changing existing children
-        transition: React.PropTypes.object,
+        transition: PropTypes.object,
 
         // a list of state objects to apply to each child node in turn
-        startStyles: React.PropTypes.array,
+        startStyles: PropTypes.array,
 
         // a list of transition options from the corresponding startStyle
-        enterTransitionOpts: React.PropTypes.array,
+        enterTransitionOpts: PropTypes.array,
     },
 
     getDefaultProps: function() {
diff --git a/src/async-components/views/dialogs/EncryptedEventDialog.js b/src/async-components/views/dialogs/EncryptedEventDialog.js
index a8f588d39a..5db8b2365f 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.
 */
 
 const React = require("react");
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 const sdk = require('../../../index');
 const MatrixClientPeg = require("../../../MatrixClientPeg");
@@ -23,8 +24,8 @@ module.exports = React.createClass({
     displayName: 'EncryptedEventDialog',
 
     propTypes: {
-        event: React.PropTypes.object.isRequired,
-        onFinished: React.PropTypes.func.isRequired,
+        event: PropTypes.object.isRequired,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/async-components/views/dialogs/ExportE2eKeysDialog.js b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
index 04274442c2..06fb0668d5 100644
--- a/src/async-components/views/dialogs/ExportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ExportE2eKeysDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import FileSaver from 'file-saver';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
 import * as Matrix from 'matrix-js-sdk';
@@ -29,8 +30,8 @@ export default React.createClass({
     displayName: 'ExportE2eKeysDialog',
 
     propTypes: {
-        matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
-        onFinished: React.PropTypes.func.isRequired,
+        matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/async-components/views/dialogs/ImportE2eKeysDialog.js b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
index a01b6580f1..10744a8911 100644
--- a/src/async-components/views/dialogs/ImportE2eKeysDialog.js
+++ b/src/async-components/views/dialogs/ImportE2eKeysDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import * as Matrix from 'matrix-js-sdk';
 import * as MegolmExportEncryption from '../../../utils/MegolmExportEncryption';
@@ -40,8 +41,8 @@ export default React.createClass({
     displayName: 'ImportE2eKeysDialog',
 
     propTypes: {
-        matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
-        onFinished: React.PropTypes.func.isRequired,
+        matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/autocomplete/Components.js b/src/autocomplete/Components.js
index a27533f7c2..b09f4e963e 100644
--- a/src/autocomplete/Components.js
+++ b/src/autocomplete/Components.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 /* These were earlier stateless functional components but had to be converted
@@ -42,10 +43,10 @@ export class TextualCompletion extends React.Component {
     }
 }
 TextualCompletion.propTypes = {
-    title: React.PropTypes.string,
-    subtitle: React.PropTypes.string,
-    description: React.PropTypes.string,
-    className: React.PropTypes.string,
+    title: PropTypes.string,
+    subtitle: PropTypes.string,
+    description: PropTypes.string,
+    className: PropTypes.string,
 };
 
 export class PillCompletion extends React.Component {
@@ -69,9 +70,9 @@ export class PillCompletion extends React.Component {
     }
 }
 PillCompletion.propTypes = {
-    title: React.PropTypes.string,
-    subtitle: React.PropTypes.string,
-    description: React.PropTypes.string,
-    initialComponent: React.PropTypes.element,
-    className: React.PropTypes.string,
+    title: PropTypes.string,
+    subtitle: PropTypes.string,
+    description: PropTypes.string,
+    initialComponent: PropTypes.element,
+    className: PropTypes.string,
 };
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 3c2308e6a7..94f5713a79 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -20,6 +20,7 @@ limitations under the License.
 const classNames = require('classnames');
 const React = require('react');
 const ReactDOM = require('react-dom');
+import PropTypes from 'prop-types';
 
 // Shamelessly ripped off Modal.js.  There's probably a better way
 // of doing reusable widgets like dialog boxes & menus where we go and
@@ -29,11 +30,11 @@ module.exports = {
     ContextualMenuContainerId: "mx_ContextualMenu_Container",
 
     propTypes: {
-        menuWidth: React.PropTypes.number,
-        menuHeight: React.PropTypes.number,
-        chevronOffset: React.PropTypes.number,
-        menuColour: React.PropTypes.string,
-        chevronFace: React.PropTypes.string, // top, bottom, left, right
+        menuWidth: PropTypes.number,
+        menuHeight: PropTypes.number,
+        chevronOffset: PropTypes.number,
+        menuColour: PropTypes.string,
+        chevronFace: PropTypes.string, // top, bottom, left, right
     },
 
     getOrCreateContainer: function() {
diff --git a/src/components/structures/CreateRoom.js b/src/components/structures/CreateRoom.js
index 26454c5ea6..2bb9adb544 100644
--- a/src/components/structures/CreateRoom.js
+++ b/src/components/structures/CreateRoom.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
 import sdk from '../../index';
 import MatrixClientPeg from '../../MatrixClientPeg';
@@ -30,8 +31,8 @@ module.exports = React.createClass({
     displayName: 'CreateRoom',
 
     propTypes: {
-        onRoomCreated: React.PropTypes.func,
-        collapsedRhs: React.PropTypes.bool,
+        onRoomCreated: PropTypes.func,
+        collapsedRhs: PropTypes.bool,
     },
 
     phases: {
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index ffa5e45249..e86b76333d 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import Matrix from 'matrix-js-sdk';
 import sdk from '../../index';
@@ -28,7 +29,7 @@ const FilePanel = React.createClass({
     displayName: 'FilePanel',
 
     propTypes: {
-        roomId: React.PropTypes.string.isRequired,
+        roomId: PropTypes.string.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 5ffb97c6ed..8bb6ba49b0 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -390,7 +390,7 @@ const FeaturedUser = React.createClass({
 });
 
 const GroupContext = {
-    groupStore: React.PropTypes.instanceOf(GroupStore).isRequired,
+    groupStore: PropTypes.instanceOf(GroupStore).isRequired,
 };
 
 CategoryRoomList.contextTypes = GroupContext;
@@ -408,7 +408,7 @@ export default React.createClass({
     },
 
     childContextTypes: {
-        groupStore: React.PropTypes.instanceOf(GroupStore),
+        groupStore: PropTypes.instanceOf(GroupStore),
     },
 
     getChildContext: function() {
diff --git a/src/components/structures/InteractiveAuth.js b/src/components/structures/InteractiveAuth.js
index 8a2c1b8c79..8428e3c714 100644
--- a/src/components/structures/InteractiveAuth.js
+++ b/src/components/structures/InteractiveAuth.js
@@ -18,6 +18,7 @@ import Matrix from 'matrix-js-sdk';
 const InteractiveAuth = Matrix.InteractiveAuth;
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import {getEntryComponentForLoginType} from '../views/login/InteractiveAuthEntryComponents';
 
@@ -26,18 +27,18 @@ export default React.createClass({
 
     propTypes: {
         // matrix client to use for UI auth requests
-        matrixClient: React.PropTypes.object.isRequired,
+        matrixClient: PropTypes.object.isRequired,
 
         // response from initial request. If not supplied, will do a request on
         // mount.
-        authData: React.PropTypes.shape({
-            flows: React.PropTypes.array,
-            params: React.PropTypes.object,
-            session: React.PropTypes.string,
+        authData: PropTypes.shape({
+            flows: PropTypes.array,
+            params: PropTypes.object,
+            session: PropTypes.string,
         }),
 
         // callback
-        makeRequest: React.PropTypes.func.isRequired,
+        makeRequest: PropTypes.func.isRequired,
 
         // callback called when the auth process has finished,
         // successfully or unsuccessfully.
@@ -51,22 +52,22 @@ export default React.createClass({
         //            the auth session.
         //      * clientSecret {string} The client secret used in auth
         //            sessions with the ID server.
-        onAuthFinished: React.PropTypes.func.isRequired,
+        onAuthFinished: PropTypes.func.isRequired,
 
         // Inputs provided by the user to the auth process
         // and used by various stages. As passed to js-sdk
         // interactive-auth
-        inputs: React.PropTypes.object,
+        inputs: PropTypes.object,
 
         // As js-sdk interactive-auth
-        makeRegistrationUrl: React.PropTypes.func,
-        sessionId: React.PropTypes.string,
-        clientSecret: React.PropTypes.string,
-        emailSid: React.PropTypes.string,
+        makeRegistrationUrl: PropTypes.func,
+        sessionId: PropTypes.string,
+        clientSecret: PropTypes.string,
+        emailSid: PropTypes.string,
 
         // If true, poll to see if the auth flow has been completed
         // out-of-band
-        poll: React.PropTypes.bool,
+        poll: PropTypes.bool,
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 38b7634edb..4338ea6cab 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -18,6 +18,7 @@ limitations under the License.
 
 import * as Matrix from 'matrix-js-sdk';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { DragDropContext } from 'react-dnd';
 import HTML5Backend from 'react-dnd-html5-backend';
 
@@ -44,23 +45,23 @@ const LoggedInView = React.createClass({
     displayName: 'LoggedInView',
 
     propTypes: {
-        matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
-        page_type: React.PropTypes.string.isRequired,
-        onRoomCreated: React.PropTypes.func,
-        onUserSettingsClose: React.PropTypes.func,
+        matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
+        page_type: PropTypes.string.isRequired,
+        onRoomCreated: PropTypes.func,
+        onUserSettingsClose: PropTypes.func,
 
         // Called with the credentials of a registered user (if they were a ROU that
         // transitioned to PWLU)
-        onRegistered: React.PropTypes.func,
+        onRegistered: PropTypes.func,
 
-        teamToken: React.PropTypes.string,
+        teamToken: PropTypes.string,
 
         // and lots and lots of other stuff.
     },
 
     childContextTypes: {
-        matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient),
-        authCache: React.PropTypes.object,
+        matrixClient: PropTypes.instanceOf(Matrix.MatrixClient),
+        authCache: PropTypes.object,
     },
 
     getChildContext: function() {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 3452d13841..733007677b 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -19,6 +19,7 @@ limitations under the License.
 import Promise from 'bluebird';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import Matrix from "matrix-js-sdk";
 
 import Analytics from "../../Analytics";
@@ -92,38 +93,38 @@ export default React.createClass({
     displayName: 'MatrixChat',
 
     propTypes: {
-        config: React.PropTypes.object,
-        ConferenceHandler: React.PropTypes.any,
-        onNewScreen: React.PropTypes.func,
-        registrationUrl: React.PropTypes.string,
-        enableGuest: React.PropTypes.bool,
+        config: PropTypes.object,
+        ConferenceHandler: PropTypes.any,
+        onNewScreen: PropTypes.func,
+        registrationUrl: PropTypes.string,
+        enableGuest: PropTypes.bool,
 
         // the queryParams extracted from the [real] query-string of the URI
-        realQueryParams: React.PropTypes.object,
+        realQueryParams: PropTypes.object,
 
         // the initial queryParams extracted from the hash-fragment of the URI
-        startingFragmentQueryParams: React.PropTypes.object,
+        startingFragmentQueryParams: PropTypes.object,
 
         // called when we have completed a token login
-        onTokenLoginCompleted: React.PropTypes.func,
+        onTokenLoginCompleted: PropTypes.func,
 
         // Represents the screen to display as a result of parsing the initial
         // window.location
-        initialScreenAfterLogin: React.PropTypes.shape({
-            screen: React.PropTypes.string.isRequired,
-            params: React.PropTypes.object,
+        initialScreenAfterLogin: PropTypes.shape({
+            screen: PropTypes.string.isRequired,
+            params: PropTypes.object,
         }),
 
         // displayname, if any, to set on the device when logging
         // in/registering.
-        defaultDeviceDisplayName: React.PropTypes.string,
+        defaultDeviceDisplayName: PropTypes.string,
 
         // A function that makes a registration URL
-        makeRegistrationUrl: React.PropTypes.func.isRequired,
+        makeRegistrationUrl: PropTypes.func.isRequired,
     },
 
     childContextTypes: {
-        appConfig: React.PropTypes.object,
+        appConfig: PropTypes.object,
     },
 
     AuxPanel: {
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 53cc660a9b..84441e1317 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import shouldHideEvent from '../../shouldHideEvent';
 import dis from "../../dispatcher";
@@ -32,63 +33,63 @@ module.exports = React.createClass({
 
     propTypes: {
         // true to give the component a 'display: none' style.
-        hidden: React.PropTypes.bool,
+        hidden: PropTypes.bool,
 
         // true to show a spinner at the top of the timeline to indicate
         // back-pagination in progress
-        backPaginating: React.PropTypes.bool,
+        backPaginating: PropTypes.bool,
 
         // true to show a spinner at the end of the timeline to indicate
         // forward-pagination in progress
-        forwardPaginating: React.PropTypes.bool,
+        forwardPaginating: PropTypes.bool,
 
         // the list of MatrixEvents to display
-        events: React.PropTypes.array.isRequired,
+        events: PropTypes.array.isRequired,
 
         // ID of an event to highlight. If undefined, no event will be highlighted.
-        highlightedEventId: React.PropTypes.string,
+        highlightedEventId: PropTypes.string,
 
         // Should we show URL Previews
-        showUrlPreview: React.PropTypes.bool,
+        showUrlPreview: PropTypes.bool,
 
         // event after which we should show a read marker
-        readMarkerEventId: React.PropTypes.string,
+        readMarkerEventId: PropTypes.string,
 
         // whether the read marker should be visible
-        readMarkerVisible: React.PropTypes.bool,
+        readMarkerVisible: PropTypes.bool,
 
         // the userid of our user. This is used to suppress the read marker
         // for pending messages.
-        ourUserId: React.PropTypes.string,
+        ourUserId: PropTypes.string,
 
         // true to suppress the date at the start of the timeline
-        suppressFirstDateSeparator: React.PropTypes.bool,
+        suppressFirstDateSeparator: PropTypes.bool,
 
         // whether to show read receipts
-        showReadReceipts: React.PropTypes.bool,
+        showReadReceipts: PropTypes.bool,
 
         // true if updates to the event list should cause the scroll panel to
         // scroll down when we are at the bottom of the window. See ScrollPanel
         // for more details.
-        stickyBottom: React.PropTypes.bool,
+        stickyBottom: PropTypes.bool,
 
         // callback which is called when the panel is scrolled.
-        onScroll: React.PropTypes.func,
+        onScroll: PropTypes.func,
 
         // callback which is called when more content is needed.
-        onFillRequest: React.PropTypes.func,
+        onFillRequest: PropTypes.func,
 
         // className for the panel
-        className: React.PropTypes.string.isRequired,
+        className: PropTypes.string.isRequired,
 
         // shape parameter to be passed to EventTiles
-        tileShape: React.PropTypes.string,
+        tileShape: PropTypes.string,
 
         // show twelve hour timestamps
-        isTwelveHour: React.PropTypes.bool,
+        isTwelveHour: PropTypes.bool,
 
         // show timestamps always
-        alwaysShowTimestamps: React.PropTypes.bool,
+        alwaysShowTimestamps: PropTypes.bool,
     },
 
     componentWillMount: function() {
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 9281fb199e..22157beaca 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 import sdk from '../../index';
 import { _t } from '../../languageHandler';
@@ -26,7 +27,7 @@ export default withMatrixClient(React.createClass({
     displayName: 'MyGroups',
 
     propTypes: {
-        matrixClient: React.PropTypes.object.isRequired,
+        matrixClient: PropTypes.object.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 77d506d9af..4f9de7eac9 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import Matrix from 'matrix-js-sdk';
 import { _t } from '../../languageHandler';
 import sdk from '../../index';
@@ -41,59 +42,59 @@ module.exports = React.createClass({
 
     propTypes: {
         // the room this statusbar is representing.
-        room: React.PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
 
         // the number of messages which have arrived since we've been scrolled up
-        numUnreadMessages: React.PropTypes.number,
+        numUnreadMessages: PropTypes.number,
 
         // this is true if we are fully scrolled-down, and are looking at
         // the end of the live timeline.
-        atEndOfLiveTimeline: React.PropTypes.bool,
+        atEndOfLiveTimeline: PropTypes.bool,
 
         // This is true when the user is alone in the room, but has also sent a message.
         // Used to suggest to the user to invite someone
-        sentMessageAndIsAlone: React.PropTypes.bool,
+        sentMessageAndIsAlone: PropTypes.bool,
 
         // true if there is an active call in this room (means we show
         // the 'Active Call' text in the status bar if there is nothing
         // more interesting)
-        hasActiveCall: React.PropTypes.bool,
+        hasActiveCall: PropTypes.bool,
 
         // Number of names to display in typing indication. E.g. set to 3, will
         // result in "X, Y, Z and 100 others are typing."
-        whoIsTypingLimit: React.PropTypes.number,
+        whoIsTypingLimit: PropTypes.number,
 
         // callback for when the user clicks on the 'resend all' button in the
         // 'unsent messages' bar
-        onResendAllClick: React.PropTypes.func,
+        onResendAllClick: PropTypes.func,
 
         // callback for when the user clicks on the 'cancel all' button in the
         // 'unsent messages' bar
-        onCancelAllClick: React.PropTypes.func,
+        onCancelAllClick: PropTypes.func,
 
         // callback for when the user clicks on the 'invite others' button in the
         // 'you are alone' bar
-        onInviteClick: React.PropTypes.func,
+        onInviteClick: PropTypes.func,
 
         // callback for when the user clicks on the 'stop warning me' button in the
         // 'you are alone' bar
-        onStopWarningClick: React.PropTypes.func,
+        onStopWarningClick: PropTypes.func,
 
         // callback for when the user clicks on the 'scroll to bottom' button
-        onScrollToBottomClick: React.PropTypes.func,
+        onScrollToBottomClick: PropTypes.func,
 
         // callback for when we do something that changes the size of the
         // status bar. This is used to trigger a re-layout in the parent
         // component.
-        onResize: React.PropTypes.func,
+        onResize: PropTypes.func,
 
         // callback for when the status bar can be hidden from view, as it is
         // not displaying anything
-        onHidden: React.PropTypes.func,
+        onHidden: PropTypes.func,
 
         // callback for when the status bar is displaying something and should
         // be visible
-        onVisible: React.PropTypes.func,
+        onVisible: PropTypes.func,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e240ab38d5..0bc825f076 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -24,6 +24,7 @@ import shouldHideEvent from "../../shouldHideEvent";
 
 const React = require("react");
 const ReactDOM = require("react-dom");
+import PropTypes from 'prop-types';
 import Promise from 'bluebird';
 const classNames = require("classnames");
 import { _t } from '../../languageHandler';
@@ -58,18 +59,18 @@ if (DEBUG) {
 module.exports = React.createClass({
     displayName: 'RoomView',
     propTypes: {
-        ConferenceHandler: React.PropTypes.any,
+        ConferenceHandler: PropTypes.any,
 
         // Called with the credentials of a registered user (if they were a ROU that
         // transitioned to PWLU)
-        onRegistered: React.PropTypes.func,
+        onRegistered: PropTypes.func,
 
         // An object representing a third party invite to join this room
         // Fields:
         // * inviteSignUrl (string) The URL used to join this room from an email invite
         //                          (given as part of the link in the invite email)
         // * invitedEmail (string) The email address that was invited to this room
-        thirdPartyInvite: React.PropTypes.object,
+        thirdPartyInvite: PropTypes.object,
 
         // Any data about the room that would normally come from the Home Server
         // but has been passed out-of-band, eg. the room name and avatar URL
@@ -80,10 +81,10 @@ module.exports = React.createClass({
         //  * avatarUrl (string) The mxc:// avatar URL for the room
         //  * inviterName (string) The display name of the person who
         //  *                      invited us tovthe room
-        oobData: React.PropTypes.object,
+        oobData: PropTypes.object,
 
         // is the RightPanel collapsed?
-        collapsedRhs: React.PropTypes.bool,
+        collapsedRhs: PropTypes.bool,
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 37cb2977aa..cbb6001d5f 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 const React = require("react");
 const ReactDOM = require("react-dom");
+import PropTypes from 'prop-types';
 const GeminiScrollbar = require('react-gemini-scrollbar');
 import Promise from 'bluebird';
 import { KeyCode } from '../../Keyboard';
@@ -86,7 +87,7 @@ module.exports = React.createClass({
          * scroll down to show the new element, rather than preserving the
          * existing view.
          */
-        stickyBottom: React.PropTypes.bool,
+        stickyBottom: PropTypes.bool,
 
         /* startAtBottom: if set to true, the view is assumed to start
          * scrolled to the bottom.
@@ -95,7 +96,7 @@ module.exports = React.createClass({
          * behaviour stays the same for other uses of ScrollPanel.
          * If so, let's remove this parameter down the line.
          */
-        startAtBottom: React.PropTypes.bool,
+        startAtBottom: PropTypes.bool,
 
         /* onFillRequest(backwards): a callback which is called on scroll when
          * the user nears the start (backwards = true) or end (backwards =
@@ -110,7 +111,7 @@ module.exports = React.createClass({
          * directon (at this time) - which will stop the pagination cycle until
          * the user scrolls again.
          */
-        onFillRequest: React.PropTypes.func,
+        onFillRequest: PropTypes.func,
 
         /* onUnfillRequest(backwards): a callback which is called on scroll when
          * there are children elements that are far out of view and could be removed
@@ -121,24 +122,24 @@ module.exports = React.createClass({
          * first element to remove if removing from the front/bottom, and last element
          * to remove if removing from the back/top.
          */
-        onUnfillRequest: React.PropTypes.func,
+        onUnfillRequest: PropTypes.func,
 
         /* onScroll: a callback which is called whenever any scroll happens.
          */
-        onScroll: React.PropTypes.func,
+        onScroll: PropTypes.func,
 
         /* onResize: a callback which is called whenever the Gemini scroll
          * panel is resized
          */
-        onResize: React.PropTypes.func,
+        onResize: PropTypes.func,
 
         /* className: classnames to add to the top-level div
          */
-        className: React.PropTypes.string,
+        className: PropTypes.string,
 
         /* style: styles to add to the top-level div
          */
-        style: React.PropTypes.object,
+        style: PropTypes.object,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 98f57a60b5..3760bb37c5 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -19,6 +19,7 @@ import SettingsStore from "../../settings/SettingsStore";
 
 const React = require('react');
 const ReactDOM = require("react-dom");
+import PropTypes from 'prop-types';
 import Promise from 'bluebird';
 
 const Matrix = require("matrix-js-sdk");
@@ -58,49 +59,49 @@ var TimelinePanel = React.createClass({
         // representing.  This may or may not have a room, depending on what it's
         // a timeline representing.  If it has a room, we maintain RRs etc for
         // that room.
-        timelineSet: React.PropTypes.object.isRequired,
+        timelineSet: PropTypes.object.isRequired,
 
-        showReadReceipts: React.PropTypes.bool,
+        showReadReceipts: PropTypes.bool,
         // Enable managing RRs and RMs. These require the timelineSet to have a room.
-        manageReadReceipts: React.PropTypes.bool,
-        manageReadMarkers: React.PropTypes.bool,
+        manageReadReceipts: PropTypes.bool,
+        manageReadMarkers: PropTypes.bool,
 
         // true to give the component a 'display: none' style.
-        hidden: React.PropTypes.bool,
+        hidden: PropTypes.bool,
 
         // ID of an event to highlight. If undefined, no event will be highlighted.
         // typically this will be either 'eventId' or undefined.
-        highlightedEventId: React.PropTypes.string,
+        highlightedEventId: PropTypes.string,
 
         // id of an event to jump to. If not given, will go to the end of the
         // live timeline.
-        eventId: React.PropTypes.string,
+        eventId: PropTypes.string,
 
         // where to position the event given by eventId, in pixels from the
         // bottom of the viewport. If not given, will try to put the event
         // half way down the viewport.
-        eventPixelOffset: React.PropTypes.number,
+        eventPixelOffset: PropTypes.number,
 
         // Should we show URL Previews
-        showUrlPreview: React.PropTypes.bool,
+        showUrlPreview: PropTypes.bool,
 
         // callback which is called when the panel is scrolled.
-        onScroll: React.PropTypes.func,
+        onScroll: PropTypes.func,
 
         // callback which is called when the read-up-to mark is updated.
-        onReadMarkerUpdated: React.PropTypes.func,
+        onReadMarkerUpdated: PropTypes.func,
 
         // maximum number of events to show in a timeline
-        timelineCap: React.PropTypes.number,
+        timelineCap: PropTypes.number,
 
         // classname to use for the messagepanel
-        className: React.PropTypes.string,
+        className: PropTypes.string,
 
         // shape property to be passed to EventTiles
-        tileShape: React.PropTypes.string,
+        tileShape: PropTypes.string,
 
         // placeholder text to use if the timeline is empty
-        empty: React.PropTypes.string,
+        empty: PropTypes.string,
     },
 
     statics: {
diff --git a/src/components/structures/UploadBar.js b/src/components/structures/UploadBar.js
index ca566d3a64..fed4ff33b3 100644
--- a/src/components/structures/UploadBar.js
+++ b/src/components/structures/UploadBar.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const ContentMessages = require('../../ContentMessages');
 const dis = require('../../dispatcher');
 const filesize = require('filesize');
@@ -22,7 +23,7 @@ import { _t } from '../../languageHandler';
 
 module.exports = React.createClass({displayName: 'UploadBar',
     propTypes: {
-        room: React.PropTypes.object,
+        room: PropTypes.object,
     },
 
     componentDidMount: function() {
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 09844c3d63..3cd13a6ecb 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -19,6 +19,7 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 
 const React = require('react');
 const ReactDOM = require('react-dom');
+import PropTypes from 'prop-types';
 const sdk = require('../../index');
 const MatrixClientPeg = require("../../MatrixClientPeg");
 const PlatformPeg = require("../../PlatformPeg");
@@ -125,8 +126,8 @@ const THEMES = [
 
 const IgnoredUser = React.createClass({
     propTypes: {
-        userId: React.PropTypes.string.isRequired,
-        onUnignored: React.PropTypes.func.isRequired,
+        userId: PropTypes.string.isRequired,
+        onUnignored: PropTypes.func.isRequired,
     },
 
     _onUnignoreClick: function() {
@@ -155,16 +156,16 @@ module.exports = React.createClass({
     displayName: 'UserSettings',
 
     propTypes: {
-        onClose: React.PropTypes.func,
+        onClose: PropTypes.func,
         // The brand string given when creating email pushers
-        brand: React.PropTypes.string,
+        brand: PropTypes.string,
 
         // The base URL to use in the referral link. Defaults to window.location.origin.
-        referralBaseUrl: React.PropTypes.string,
+        referralBaseUrl: PropTypes.string,
 
         // Team token for the referral link. If falsy, the referral section will
         // not appear
-        teamToken: React.PropTypes.string,
+        teamToken: PropTypes.string,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index 43753bfd38..53688ee6c3 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -18,6 +18,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import Modal from "../../../Modal";
@@ -29,13 +30,13 @@ module.exports = React.createClass({
     displayName: 'ForgotPassword',
 
     propTypes: {
-        defaultHsUrl: React.PropTypes.string,
-        defaultIsUrl: React.PropTypes.string,
-        customHsUrl: React.PropTypes.string,
-        customIsUrl: React.PropTypes.string,
-        onLoginClick: React.PropTypes.func,
-        onRegisterClick: React.PropTypes.func,
-        onComplete: React.PropTypes.func.isRequired,
+        defaultHsUrl: PropTypes.string,
+        defaultIsUrl: PropTypes.string,
+        customHsUrl: PropTypes.string,
+        customIsUrl: PropTypes.string,
+        onLoginClick: PropTypes.func,
+        onRegisterClick: PropTypes.func,
+        onComplete: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 9ed710534b..f4c08e8362 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 PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import * as languageHandler from '../../../languageHandler';
 import sdk from '../../../index';
@@ -36,27 +37,27 @@ module.exports = React.createClass({
     displayName: 'Login',
 
     propTypes: {
-        onLoggedIn: React.PropTypes.func.isRequired,
+        onLoggedIn: PropTypes.func.isRequired,
 
-        enableGuest: React.PropTypes.bool,
+        enableGuest: PropTypes.bool,
 
-        customHsUrl: React.PropTypes.string,
-        customIsUrl: React.PropTypes.string,
-        defaultHsUrl: React.PropTypes.string,
-        defaultIsUrl: React.PropTypes.string,
+        customHsUrl: PropTypes.string,
+        customIsUrl: PropTypes.string,
+        defaultHsUrl: PropTypes.string,
+        defaultIsUrl: PropTypes.string,
         // Secondary HS which we try to log into if the user is using
         // the default HS but login fails. Useful for migrating to a
         // different home server without confusing users.
-        fallbackHsUrl: React.PropTypes.string,
+        fallbackHsUrl: PropTypes.string,
 
-        defaultDeviceDisplayName: React.PropTypes.string,
+        defaultDeviceDisplayName: PropTypes.string,
 
         // login shouldn't know or care how registration is done.
-        onRegisterClick: React.PropTypes.func.isRequired,
+        onRegisterClick: PropTypes.func.isRequired,
 
         // login shouldn't care how password recovery is done.
-        onForgotPasswordClick: React.PropTypes.func,
-        onCancelClick: React.PropTypes.func,
+        onForgotPasswordClick: PropTypes.func,
+        onCancelClick: PropTypes.func,
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/login/PostRegistration.js b/src/components/structures/login/PostRegistration.js
index 184356e852..f6165348bd 100644
--- a/src/components/structures/login/PostRegistration.js
+++ b/src/components/structures/login/PostRegistration.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
@@ -25,7 +26,7 @@ module.exports = React.createClass({
     displayName: 'PostRegistration',
 
     propTypes: {
-        onComplete: React.PropTypes.func.isRequired,
+        onComplete: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index e57b7fd0c2..b8a85c5f82 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -19,6 +19,7 @@ import Matrix from 'matrix-js-sdk';
 
 import Promise from 'bluebird';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import ServerConfig from '../../views/login/ServerConfig';
@@ -35,31 +36,31 @@ module.exports = React.createClass({
     displayName: 'Registration',
 
     propTypes: {
-        onLoggedIn: React.PropTypes.func.isRequired,
-        clientSecret: React.PropTypes.string,
-        sessionId: React.PropTypes.string,
-        makeRegistrationUrl: React.PropTypes.func.isRequired,
-        idSid: React.PropTypes.string,
-        customHsUrl: React.PropTypes.string,
-        customIsUrl: React.PropTypes.string,
-        defaultHsUrl: React.PropTypes.string,
-        defaultIsUrl: React.PropTypes.string,
-        brand: React.PropTypes.string,
-        email: React.PropTypes.string,
-        referrer: React.PropTypes.string,
-        teamServerConfig: React.PropTypes.shape({
+        onLoggedIn: PropTypes.func.isRequired,
+        clientSecret: PropTypes.string,
+        sessionId: PropTypes.string,
+        makeRegistrationUrl: PropTypes.func.isRequired,
+        idSid: PropTypes.string,
+        customHsUrl: PropTypes.string,
+        customIsUrl: PropTypes.string,
+        defaultHsUrl: PropTypes.string,
+        defaultIsUrl: PropTypes.string,
+        brand: PropTypes.string,
+        email: PropTypes.string,
+        referrer: PropTypes.string,
+        teamServerConfig: PropTypes.shape({
             // Email address to request new teams
-            supportEmail: React.PropTypes.string.isRequired,
+            supportEmail: PropTypes.string.isRequired,
             // URL of the riot-team-server to get team configurations and track referrals
-            teamServerURL: React.PropTypes.string.isRequired,
+            teamServerURL: PropTypes.string.isRequired,
         }),
-        teamSelected: React.PropTypes.object,
+        teamSelected: PropTypes.object,
 
-        defaultDeviceDisplayName: React.PropTypes.string,
+        defaultDeviceDisplayName: PropTypes.string,
 
         // registration shouldn't know or care how login is done.
-        onLoginClick: React.PropTypes.func.isRequired,
-        onCancelClick: React.PropTypes.func,
+        onLoginClick: PropTypes.func.isRequired,
+        onCancelClick: PropTypes.func,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index f68e98ec3d..47c217eb96 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import AvatarLogic from '../../../Avatar';
 import sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -23,16 +24,16 @@ module.exports = React.createClass({
     displayName: 'BaseAvatar',
 
     propTypes: {
-        name: React.PropTypes.string.isRequired, // The name (first initial used as default)
-        idName: React.PropTypes.string, // ID for generating hash colours
-        title: React.PropTypes.string, // onHover title text
-        url: React.PropTypes.string, // highest priority of them all, shortcut to set in urls[0]
-        urls: React.PropTypes.array, // [highest_priority, ... , lowest_priority]
-        width: React.PropTypes.number,
-        height: React.PropTypes.number,
+        name: PropTypes.string.isRequired, // The name (first initial used as default)
+        idName: PropTypes.string, // ID for generating hash colours
+        title: PropTypes.string, // onHover title text
+        url: PropTypes.string, // highest priority of them all, shortcut to set in urls[0]
+        urls: PropTypes.array, // [highest_priority, ... , lowest_priority]
+        width: PropTypes.number,
+        height: PropTypes.number,
         // XXX resizeMethod not actually used.
-        resizeMethod: React.PropTypes.string,
-        defaultToInitialLetter: React.PropTypes.bool, // true to add default url
+        resizeMethod: PropTypes.string,
+        defaultToInitialLetter: PropTypes.bool, // true to add default url
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/avatars/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js
index 89047cd69c..a4fe5e280f 100644
--- a/src/components/views/avatars/MemberAvatar.js
+++ b/src/components/views/avatars/MemberAvatar.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const Avatar = require('../../../Avatar');
 const sdk = require("../../../index");
 const dispatcher = require("../../../dispatcher");
@@ -25,15 +26,15 @@ module.exports = React.createClass({
     displayName: 'MemberAvatar',
 
     propTypes: {
-        member: React.PropTypes.object.isRequired,
-        width: React.PropTypes.number,
-        height: React.PropTypes.number,
-        resizeMethod: React.PropTypes.string,
+        member: PropTypes.object.isRequired,
+        width: PropTypes.number,
+        height: PropTypes.number,
+        resizeMethod: PropTypes.string,
         // The onClick to give the avatar
-        onClick: React.PropTypes.func,
+        onClick: PropTypes.func,
         // Whether the onClick of the avatar should be overriden to dispatch 'view_user'
-        viewUserOnClick: React.PropTypes.bool,
-        title: React.PropTypes.string,
+        viewUserOnClick: PropTypes.bool,
+        title: PropTypes.string,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/avatars/MemberPresenceAvatar.js b/src/components/views/avatars/MemberPresenceAvatar.js
index 49cfee2cff..aa6def00ae 100644
--- a/src/components/views/avatars/MemberPresenceAvatar.js
+++ b/src/components/views/avatars/MemberPresenceAvatar.js
@@ -17,6 +17,7 @@
 'use strict';
 
 import React from "react";
+import PropTypes from 'prop-types';
 import * as sdk from "../../../index";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import AccessibleButton from '../elements/AccessibleButton';
@@ -30,10 +31,10 @@ module.exports = React.createClass({
     displayName: 'MemberPresenceAvatar',
 
     propTypes: {
-        member: React.PropTypes.object.isRequired,
-        width: React.PropTypes.number,
-        height: React.PropTypes.number,
-        resizeMethod: React.PropTypes.string,
+        member: PropTypes.object.isRequired,
+        width: PropTypes.number,
+        height: PropTypes.number,
+        resizeMethod: PropTypes.string,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 11554b2379..cae02ac408 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from "react";
+import PropTypes from 'prop-types';
 import {ContentRepo} from "matrix-js-sdk";
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import sdk from "../../../index";
@@ -25,11 +26,11 @@ module.exports = React.createClass({
     // oobData.avatarUrl should be set (else there
     // would be nowhere to get the avatar from)
     propTypes: {
-        room: React.PropTypes.object,
-        oobData: React.PropTypes.object,
-        width: React.PropTypes.number,
-        height: React.PropTypes.number,
-        resizeMethod: React.PropTypes.string,
+        room: PropTypes.object,
+        oobData: PropTypes.object,
+        width: PropTypes.number,
+        height: PropTypes.number,
+        resizeMethod: PropTypes.string,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/create_room/CreateRoomButton.js b/src/components/views/create_room/CreateRoomButton.js
index 8a5f00d942..25f71f542d 100644
--- a/src/components/views/create_room/CreateRoomButton.js
+++ b/src/components/views/create_room/CreateRoomButton.js
@@ -17,11 +17,12 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 module.exports = React.createClass({
     displayName: 'CreateRoomButton',
     propTypes: {
-        onCreateRoom: React.PropTypes.func,
+        onCreateRoom: PropTypes.func,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/create_room/Presets.js b/src/components/views/create_room/Presets.js
index 2073896d87..c9607c0082 100644
--- a/src/components/views/create_room/Presets.js
+++ b/src/components/views/create_room/Presets.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
 const Presets = {
@@ -28,8 +29,8 @@ const Presets = {
 module.exports = React.createClass({
     displayName: 'CreateRoomPresets',
     propTypes: {
-        onChange: React.PropTypes.func,
-        preset: React.PropTypes.string,
+        onChange: PropTypes.func,
+        preset: PropTypes.string,
     },
 
     Presets: Presets,
diff --git a/src/components/views/create_room/RoomAlias.js b/src/components/views/create_room/RoomAlias.js
index d4228a8bca..6262db7833 100644
--- a/src/components/views/create_room/RoomAlias.js
+++ b/src/components/views/create_room/RoomAlias.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 const React = require('react');
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
@@ -22,9 +23,9 @@ module.exports = React.createClass({
     propTypes: {
         // Specifying a homeserver will make magical things happen when you,
         // e.g. start typing in the room alias box.
-        homeserver: React.PropTypes.string,
-        alias: React.PropTypes.string,
-        onChange: React.PropTypes.func,
+        homeserver: PropTypes.string,
+        alias: PropTypes.string,
+        onChange: PropTypes.func,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index b88a6c026e..518d29aa8c 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import { KeyCode } from '../../../Keyboard';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -31,20 +32,20 @@ export default React.createClass({
 
     propTypes: {
         // onFinished callback to call when Escape is pressed
-        onFinished: React.PropTypes.func.isRequired,
+        onFinished: PropTypes.func.isRequired,
 
         // callback to call when Enter is pressed
-        onEnterPressed: React.PropTypes.func,
+        onEnterPressed: PropTypes.func,
 
         // CSS class to apply to dialog div
-        className: React.PropTypes.string,
+        className: PropTypes.string,
 
         // Title for the dialog.
         // (could probably actually be something more complicated than a string if desired)
-        title: React.PropTypes.string.isRequired,
+        title: PropTypes.string.isRequired,
 
         // children should be the content of the dialog
-        children: React.PropTypes.node,
+        children: PropTypes.node,
     },
 
     _onKeyDown: function(e) {
diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index e0578f3b53..ef21db7ecb 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -187,9 +188,9 @@ export default class ChatCreateOrReuseDialog extends React.Component {
 }
 
 ChatCreateOrReuseDialog.propTyps = {
-    userId: React.PropTypes.string.isRequired,
+    userId: PropTypes.string.isRequired,
     // Called when clicking outside of the dialog
-    onFinished: React.PropTypes.func.isRequired,
-    onNewDMClick: React.PropTypes.func.isRequired,
-    onExistingRoomSelected: React.PropTypes.func.isRequired,
+    onFinished: PropTypes.func.isRequired,
+    onNewDMClick: PropTypes.func.isRequired,
+    onExistingRoomSelected: PropTypes.func.isRequired,
 };
diff --git a/src/components/views/dialogs/ConfirmUserActionDialog.js b/src/components/views/dialogs/ConfirmUserActionDialog.js
index 78d084b709..39e1f66f96 100644
--- a/src/components/views/dialogs/ConfirmUserActionDialog.js
+++ b/src/components/views/dialogs/ConfirmUserActionDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
@@ -33,20 +34,20 @@ export default React.createClass({
     displayName: 'ConfirmUserActionDialog',
     propTypes: {
         // matrix-js-sdk (room) member object. Supply either this or 'groupMember'
-        member: React.PropTypes.object,
+        member: PropTypes.object,
         // group member object. Supply either this or 'member'
         groupMember: GroupMemberType,
         // needed if a group member is specified
-        matrixClient: React.PropTypes.instanceOf(MatrixClient),
-        action: React.PropTypes.string.isRequired, // eg. 'Ban'
-        title: React.PropTypes.string.isRequired, // eg. 'Ban this user?'
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+        action: PropTypes.string.isRequired, // eg. 'Ban'
+        title: PropTypes.string.isRequired, // eg. 'Ban this user?'
 
         // Whether to display a text field for a reason
         // If true, the second argument to onFinished will
         // be the string entered.
-        askReason: React.PropTypes.bool,
-        danger: React.PropTypes.bool,
-        onFinished: React.PropTypes.func.isRequired,
+        askReason: PropTypes.bool,
+        danger: PropTypes.bool,
+        onFinished: PropTypes.func.isRequired,
     },
 
     defaultProps: {
diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index f7be47b3eb..366c5ac678 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import { _t } from '../../../languageHandler';
@@ -22,7 +23,7 @@ import { _t } from '../../../languageHandler';
 export default React.createClass({
     displayName: 'CreateRoomDialog',
     propTypes: {
-        onFinished: React.PropTypes.func.isRequired,
+        onFinished: PropTypes.func.isRequired,
     },
 
     componentDidMount: function() {
diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index c45e072d72..7d850fce2b 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import Analytics from '../../../Analytics';
@@ -136,5 +137,5 @@ export default class DeactivateAccountDialog extends React.Component {
 }
 
 DeactivateAccountDialog.propTypes = {
-    onFinished: React.PropTypes.func.isRequired,
+    onFinished: PropTypes.func.isRequired,
 };
diff --git a/src/components/views/dialogs/DeviceVerifyDialog.js b/src/components/views/dialogs/DeviceVerifyDialog.js
index ba31d2a8c2..6bec933389 100644
--- a/src/components/views/dialogs/DeviceVerifyDialog.js
+++ b/src/components/views/dialogs/DeviceVerifyDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
@@ -71,7 +72,7 @@ export default function DeviceVerifyDialog(props) {
 }
 
 DeviceVerifyDialog.propTypes = {
-    userId: React.PropTypes.string.isRequired,
-    device: React.PropTypes.object.isRequired,
-    onFinished: React.PropTypes.func.isRequired,
+    userId: PropTypes.string.isRequired,
+    device: PropTypes.object.isRequired,
+    onFinished: PropTypes.func.isRequired,
 };
diff --git a/src/components/views/dialogs/ErrorDialog.js b/src/components/views/dialogs/ErrorDialog.js
index 97ed47e10f..2af2d6214f 100644
--- a/src/components/views/dialogs/ErrorDialog.js
+++ b/src/components/views/dialogs/ErrorDialog.js
@@ -26,20 +26,21 @@ limitations under the License.
  */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default React.createClass({
     displayName: 'ErrorDialog',
     propTypes: {
-        title: React.PropTypes.string,
-        description: React.PropTypes.oneOfType([
-            React.PropTypes.element,
-            React.PropTypes.string,
+        title: PropTypes.string,
+        description: PropTypes.oneOfType([
+            PropTypes.element,
+            PropTypes.string,
         ]),
-        button: React.PropTypes.string,
-        focus: React.PropTypes.bool,
-        onFinished: React.PropTypes.func.isRequired,
+        button: PropTypes.string,
+        focus: PropTypes.bool,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/dialogs/InteractiveAuthDialog.js b/src/components/views/dialogs/InteractiveAuthDialog.js
index 59de7c7f59..a47702305c 100644
--- a/src/components/views/dialogs/InteractiveAuthDialog.js
+++ b/src/components/views/dialogs/InteractiveAuthDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
@@ -27,22 +28,22 @@ export default React.createClass({
 
     propTypes: {
         // matrix client to use for UI auth requests
-        matrixClient: React.PropTypes.object.isRequired,
+        matrixClient: PropTypes.object.isRequired,
 
         // response from initial request. If not supplied, will do a request on
         // mount.
-        authData: React.PropTypes.shape({
-            flows: React.PropTypes.array,
-            params: React.PropTypes.object,
-            session: React.PropTypes.string,
+        authData: PropTypes.shape({
+            flows: PropTypes.array,
+            params: PropTypes.object,
+            session: PropTypes.string,
         }),
 
         // callback
-        makeRequest: React.PropTypes.func.isRequired,
+        makeRequest: PropTypes.func.isRequired,
 
-        onFinished: React.PropTypes.func.isRequired,
+        onFinished: PropTypes.func.isRequired,
 
-        title: React.PropTypes.string,
+        title: PropTypes.string,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/dialogs/KeyShareDialog.js b/src/components/views/dialogs/KeyShareDialog.js
index 9c8be27c89..00bcc942a1 100644
--- a/src/components/views/dialogs/KeyShareDialog.js
+++ b/src/components/views/dialogs/KeyShareDialog.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import Modal from '../../../Modal';
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 
 import { _t, _td } from '../../../languageHandler';
@@ -30,10 +31,10 @@ import { _t, _td } from '../../../languageHandler';
  */
 export default React.createClass({
     propTypes: {
-        matrixClient: React.PropTypes.object.isRequired,
-        userId: React.PropTypes.string.isRequired,
-        deviceId: React.PropTypes.string.isRequired,
-        onFinished: React.PropTypes.func.isRequired,
+        matrixClient: PropTypes.object.isRequired,
+        userId: PropTypes.string.isRequired,
+        deviceId: PropTypes.string.isRequired,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 339b284e2f..719f372cfe 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 PropTypes from 'prop-types';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import classnames from 'classnames';
@@ -23,13 +24,13 @@ import classnames from 'classnames';
 export default React.createClass({
     displayName: 'QuestionDialog',
     propTypes: {
-        title: React.PropTypes.string,
-        description: React.PropTypes.node,
-        extraButtons: React.PropTypes.node,
-        button: React.PropTypes.string,
-        danger: React.PropTypes.bool,
-        focus: React.PropTypes.bool,
-        onFinished: React.PropTypes.func.isRequired,
+        title: PropTypes.string,
+        description: PropTypes.node,
+        extraButtons: PropTypes.node,
+        button: PropTypes.string,
+        danger: PropTypes.bool,
+        focus: PropTypes.bool,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/dialogs/SessionRestoreErrorDialog.js b/src/components/views/dialogs/SessionRestoreErrorDialog.js
index 75ae0eda17..63b9c64530 100644
--- a/src/components/views/dialogs/SessionRestoreErrorDialog.js
+++ b/src/components/views/dialogs/SessionRestoreErrorDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
@@ -25,8 +26,8 @@ export default React.createClass({
     displayName: 'SessionRestoreErrorDialog',
 
     propTypes: {
-        error: React.PropTypes.string.isRequired,
-        onFinished: React.PropTypes.func.isRequired,
+        error: PropTypes.string.isRequired,
+        onFinished: PropTypes.func.isRequired,
     },
 
     _sendBugReport: function() {
diff --git a/src/components/views/dialogs/SetEmailDialog.js b/src/components/views/dialogs/SetEmailDialog.js
index 2dd996953d..c00cc1122b 100644
--- a/src/components/views/dialogs/SetEmailDialog.js
+++ b/src/components/views/dialogs/SetEmailDialog.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
@@ -30,7 +31,7 @@ import Modal from '../../../Modal';
 export default React.createClass({
     displayName: 'SetEmailDialog',
     propTypes: {
-        onFinished: React.PropTypes.func.isRequired,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/dialogs/SetMxIdDialog.js b/src/components/views/dialogs/SetMxIdDialog.js
index 3ffafb0659..6ebc2eb87f 100644
--- a/src/components/views/dialogs/SetMxIdDialog.js
+++ b/src/components/views/dialogs/SetMxIdDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 import Promise from 'bluebird';
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import classnames from 'classnames';
@@ -35,11 +36,11 @@ const USERNAME_CHECK_DEBOUNCE_MS = 250;
 export default React.createClass({
     displayName: 'SetMxIdDialog',
     propTypes: {
-        onFinished: React.PropTypes.func.isRequired,
+        onFinished: PropTypes.func.isRequired,
         // Called when the user requests to register with a different homeserver
-        onDifferentServerClicked: React.PropTypes.func.isRequired,
+        onDifferentServerClicked: PropTypes.func.isRequired,
         // Called if the user wants to switch to login instead
-        onLoginClick: React.PropTypes.func.isRequired,
+        onLoginClick: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/dialogs/TextInputDialog.js b/src/components/views/dialogs/TextInputDialog.js
index 5ea4191e5e..d45e70c043 100644
--- a/src/components/views/dialogs/TextInputDialog.js
+++ b/src/components/views/dialogs/TextInputDialog.js
@@ -15,21 +15,22 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
 export default React.createClass({
     displayName: 'TextInputDialog',
     propTypes: {
-        title: React.PropTypes.string,
-        description: React.PropTypes.oneOfType([
-            React.PropTypes.element,
-            React.PropTypes.string,
+        title: PropTypes.string,
+        description: PropTypes.oneOfType([
+            PropTypes.element,
+            PropTypes.string,
         ]),
-        value: React.PropTypes.string,
-        button: React.PropTypes.string,
-        focus: React.PropTypes.bool,
-        onFinished: React.PropTypes.func.isRequired,
+        value: PropTypes.string,
+        button: PropTypes.string,
+        focus: PropTypes.bool,
+        onFinished: PropTypes.func.isRequired,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.js
index 794e0a4dd7..c6a973270a 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.js
@@ -15,6 +15,7 @@
  */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * AccessibleButton is a generic wrapper for any element that should be treated
@@ -44,9 +45,9 @@ export default function AccessibleButton(props) {
  *           implemented exactly like a normal onClick handler.
  */
 AccessibleButton.propTypes = {
-    children: React.PropTypes.node,
-    element: React.PropTypes.string,
-    onClick: React.PropTypes.func.isRequired,
+    children: PropTypes.node,
+    element: PropTypes.string,
+    onClick: PropTypes.func.isRequired,
 };
 
 AccessibleButton.defaultProps = {
diff --git a/src/components/views/elements/AddressSelector.js b/src/components/views/elements/AddressSelector.js
index 9330206a39..b4279c7f70 100644
--- a/src/components/views/elements/AddressSelector.js
+++ b/src/components/views/elements/AddressSelector.js
@@ -18,6 +18,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import classNames from 'classnames';
 import { UserAddressType } from '../../../UserAddress';
@@ -26,17 +27,17 @@ export default React.createClass({
     displayName: 'AddressSelector',
 
     propTypes: {
-        onSelected: React.PropTypes.func.isRequired,
+        onSelected: PropTypes.func.isRequired,
 
         // List of the addresses to display
-        addressList: React.PropTypes.arrayOf(UserAddressType).isRequired,
+        addressList: PropTypes.arrayOf(UserAddressType).isRequired,
         // Whether to show the address on the address tiles
-        showAddress: React.PropTypes.bool,
-        truncateAt: React.PropTypes.number.isRequired,
-        selected: React.PropTypes.number,
+        showAddress: PropTypes.bool,
+        truncateAt: PropTypes.number.isRequired,
+        selected: PropTypes.number,
 
         // Element to put as a header on top of the list
-        header: React.PropTypes.node,
+        header: PropTypes.node,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/elements/AddressTile.js b/src/components/views/elements/AddressTile.js
index c8ea4062b1..16e340756a 100644
--- a/src/components/views/elements/AddressTile.js
+++ b/src/components/views/elements/AddressTile.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import sdk from "../../../index";
 import MatrixClientPeg from "../../../MatrixClientPeg";
@@ -28,9 +29,9 @@ export default React.createClass({
 
     propTypes: {
         address: UserAddressType.isRequired,
-        canDismiss: React.PropTypes.bool,
-        onDismissed: React.PropTypes.func,
-        justified: React.PropTypes.bool,
+        canDismiss: PropTypes.bool,
+        onDismissed: PropTypes.func,
+        justified: PropTypes.bool,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0d67b4c814..a63823555f 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -19,6 +19,7 @@ limitations under the License.
 import url from 'url';
 import qs from 'querystring';
 import React from 'react';
+import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import PlatformPeg from '../../../PlatformPeg';
 import ScalarAuthClient from '../../../ScalarAuthClient';
@@ -40,19 +41,19 @@ export default React.createClass({
     displayName: 'AppTile',
 
     propTypes: {
-        id: React.PropTypes.string.isRequired,
-        url: React.PropTypes.string.isRequired,
-        name: React.PropTypes.string.isRequired,
-        room: React.PropTypes.object.isRequired,
-        type: React.PropTypes.string.isRequired,
+        id: PropTypes.string.isRequired,
+        url: PropTypes.string.isRequired,
+        name: PropTypes.string.isRequired,
+        room: PropTypes.object.isRequired,
+        type: PropTypes.string.isRequired,
         // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
         // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
-        fullWidth: React.PropTypes.bool,
+        fullWidth: PropTypes.bool,
         // UserId of the current user
-        userId: React.PropTypes.string.isRequired,
+        userId: PropTypes.string.isRequired,
         // UserId of the entity that added / modified the widget
-        creatorUserId: React.PropTypes.string,
-        waitForIframeLoad: React.PropTypes.bool,
+        creatorUserId: PropTypes.string,
+        waitForIframeLoad: PropTypes.bool,
     },
 
     getDefaultProps() {
diff --git a/src/components/views/elements/DeviceVerifyButtons.js b/src/components/views/elements/DeviceVerifyButtons.js
index bb89efaa30..c775cba610 100644
--- a/src/components/views/elements/DeviceVerifyButtons.js
+++ b/src/components/views/elements/DeviceVerifyButtons.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
 import Modal from '../../../Modal';
@@ -24,8 +25,8 @@ export default React.createClass({
     displayName: 'DeviceVerifyButtons',
 
     propTypes: {
-        userId: React.PropTypes.string.isRequired,
-        device: React.PropTypes.object.isRequired,
+        userId: PropTypes.string.isRequired,
+        device: PropTypes.object.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/elements/DirectorySearchBox.js b/src/components/views/elements/DirectorySearchBox.js
index 7132162d5c..14f79687e1 100644
--- a/src/components/views/elements/DirectorySearchBox.js
+++ b/src/components/views/elements/DirectorySearchBox.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
 export default class DirectorySearchBox extends React.Component {
@@ -105,10 +106,10 @@ export default class DirectorySearchBox extends React.Component {
 }
 
 DirectorySearchBox.propTypes = {
-    className: React.PropTypes.string,
-    onChange: React.PropTypes.func,
-    onClear: React.PropTypes.func,
-    onJoinClick: React.PropTypes.func,
-    placeholder: React.PropTypes.string,
-    showJoinButton: React.PropTypes.bool,
+    className: PropTypes.string,
+    onChange: PropTypes.func,
+    onClear: PropTypes.func,
+    onJoinClick: PropTypes.func,
+    placeholder: PropTypes.string,
+    showJoinButton: PropTypes.bool,
 };
diff --git a/src/components/views/elements/Dropdown.js b/src/components/views/elements/Dropdown.js
index b1291710b7..10111e415e 100644
--- a/src/components/views/elements/Dropdown.js
+++ b/src/components/views/elements/Dropdown.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import AccessibleButton from './AccessibleButton';
 import { _t } from '../../../languageHandler';
@@ -56,14 +57,14 @@ class MenuOption extends React.Component {
 }
 
 MenuOption.propTypes = {
-    children: React.PropTypes.oneOfType([
-      React.PropTypes.arrayOf(React.PropTypes.node),
-      React.PropTypes.node,
+    children: PropTypes.oneOfType([
+      PropTypes.arrayOf(React.PropTypes.node),
+      PropTypes.node,
     ]),
-    highlighted: React.PropTypes.bool,
-    dropdownKey: React.PropTypes.string,
-    onClick: React.PropTypes.func.isRequired,
-    onMouseEnter: React.PropTypes.func.isRequired,
+    highlighted: PropTypes.bool,
+    dropdownKey: PropTypes.string,
+    onClick: PropTypes.func.isRequired,
+    onMouseEnter: PropTypes.func.isRequired,
 };
 
 /*
@@ -322,20 +323,20 @@ Dropdown.propTypes = {
     // The width that the dropdown should be. If specified,
     // the dropped-down part of the menu will be set to this
     // width.
-    menuWidth: React.PropTypes.number,
+    menuWidth: PropTypes.number,
     // Called when the selected option changes
-    onOptionChange: React.PropTypes.func.isRequired,
+    onOptionChange: PropTypes.func.isRequired,
     // Called when the value of the search field changes
-    onSearchChange: React.PropTypes.func,
-    searchEnabled: React.PropTypes.bool,
+    onSearchChange: PropTypes.func,
+    searchEnabled: PropTypes.bool,
     // Function that, given the key of an option, returns
     // a node representing that option to be displayed in the
     // box itself as the currently-selected option (ie. as
     // opposed to in the actual dropped-down part). If
     // unspecified, the appropriate child element is used as
     // in the dropped-down menu.
-    getShortOption: React.PropTypes.func,
-    value: React.PropTypes.string,
+    getShortOption: PropTypes.func,
+    value: PropTypes.string,
     // negative for consistency with HTML
-    disabled: React.PropTypes.bool,
+    disabled: PropTypes.bool,
 };
diff --git a/src/components/views/elements/EditableText.js b/src/components/views/elements/EditableText.js
index ac8821a0c2..ce1817c272 100644
--- a/src/components/views/elements/EditableText.js
+++ b/src/components/views/elements/EditableText.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 
 const KEY_TAB = 9;
 const KEY_SHIFT = 16;
@@ -26,18 +27,18 @@ module.exports = React.createClass({
     displayName: 'EditableText',
 
     propTypes: {
-        onValueChanged: React.PropTypes.func,
-        initialValue: React.PropTypes.string,
-        label: React.PropTypes.string,
-        placeholder: React.PropTypes.string,
-        className: React.PropTypes.string,
-        labelClassName: React.PropTypes.string,
-        placeholderClassName: React.PropTypes.string,
+        onValueChanged: PropTypes.func,
+        initialValue: PropTypes.string,
+        label: PropTypes.string,
+        placeholder: PropTypes.string,
+        className: PropTypes.string,
+        labelClassName: PropTypes.string,
+        placeholderClassName: PropTypes.string,
         // Overrides blurToSubmit if true
-        blurToCancel: React.PropTypes.bool,
+        blurToCancel: PropTypes.bool,
         // Will cause onValueChanged(value, true) to fire on blur
-        blurToSubmit: React.PropTypes.bool,
-        editable: React.PropTypes.bool,
+        blurToSubmit: PropTypes.bool,
+        editable: PropTypes.bool,
     },
 
     Phases: {
diff --git a/src/components/views/elements/EditableTextContainer.js b/src/components/views/elements/EditableTextContainer.js
index 0025862967..064d2f1c39 100644
--- a/src/components/views/elements/EditableTextContainer.js
+++ b/src/components/views/elements/EditableTextContainer.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import Promise from 'bluebird';
 
@@ -126,21 +127,21 @@ export default class EditableTextContainer extends React.Component {
 
 EditableTextContainer.propTypes = {
     /* callback to retrieve the initial value. */
-    getInitialValue: React.PropTypes.func,
+    getInitialValue: PropTypes.func,
 
     /* initial value; used if getInitialValue is not given */
-    initialValue: React.PropTypes.string,
+    initialValue: PropTypes.string,
 
     /* placeholder text to use when the value is empty (and not being
      * edited) */
-    placeholder: React.PropTypes.string,
+    placeholder: PropTypes.string,
 
     /* callback to update the value. Called with a single argument: the new
      * value. */
-    onSubmit: React.PropTypes.func,
+    onSubmit: PropTypes.func,
 
     /* should the input submit when focus is lost? */
-    blurToSubmit: React.PropTypes.bool,
+    blurToSubmit: PropTypes.bool,
 };
 
 
diff --git a/src/components/views/elements/EmojiText.js b/src/components/views/elements/EmojiText.js
index faab0241ae..9fb650b2c3 100644
--- a/src/components/views/elements/EmojiText.js
+++ b/src/components/views/elements/EmojiText.js
@@ -16,6 +16,7 @@
  */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import {emojifyText, containsEmoji} from '../../../HtmlUtils';
 
 export default function EmojiText(props) {
@@ -32,8 +33,8 @@ export default function EmojiText(props) {
 }
 
 EmojiText.propTypes = {
-    element: React.PropTypes.string,
-    children: React.PropTypes.string.isRequired,
+    element: PropTypes.string,
+    children: PropTypes.string.isRequired,
 };
 
 EmojiText.defaultProps = {
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 25a8d538e1..a487395a87 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -63,7 +63,7 @@ FlairAvatar.propTypes = {
 };
 
 FlairAvatar.contextTypes = {
-    matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
+    matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
 };
 
 export default class Flair extends React.Component {
@@ -134,5 +134,5 @@ Flair.propTypes = {
 // this.context.matrixClient everywhere instead of this.props.matrixClient.
 // See https://github.com/vector-im/riot-web/issues/4951.
 Flair.contextTypes = {
-    matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
+    matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
 };
diff --git a/src/components/views/elements/LanguageDropdown.js b/src/components/views/elements/LanguageDropdown.js
index 6c86296a38..365f9ded61 100644
--- a/src/components/views/elements/LanguageDropdown.js
+++ b/src/components/views/elements/LanguageDropdown.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import * as languageHandler from '../../../languageHandler';
@@ -114,7 +115,7 @@ export default class LanguageDropdown extends React.Component {
 }
 
 LanguageDropdown.propTypes = {
-    className: React.PropTypes.string,
-    onOptionChange: React.PropTypes.func.isRequired,
-    value: React.PropTypes.string,
+    className: PropTypes.string,
+    onOptionChange: PropTypes.func.isRequired,
+    value: PropTypes.string,
 };
diff --git a/src/components/views/elements/MemberEventListSummary.js b/src/components/views/elements/MemberEventListSummary.js
index e2368a2fe3..3c58f90a2b 100644
--- a/src/components/views/elements/MemberEventListSummary.js
+++ b/src/components/views/elements/MemberEventListSummary.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 const MemberAvatar = require('../avatars/MemberAvatar.js');
 import { _t } from '../../../languageHandler';
@@ -23,19 +24,19 @@ module.exports = React.createClass({
 
     propTypes: {
         // An array of member events to summarise
-        events: React.PropTypes.array.isRequired,
+        events: PropTypes.array.isRequired,
         // An array of EventTiles to render when expanded
-        children: React.PropTypes.array.isRequired,
+        children: PropTypes.array.isRequired,
         // The maximum number of names to show in either each summary e.g. 2 would result "A, B and 234 others left"
-        summaryLength: React.PropTypes.number,
+        summaryLength: PropTypes.number,
         // The maximum number of avatars to display in the summary
-        avatarsMaxLength: React.PropTypes.number,
+        avatarsMaxLength: PropTypes.number,
         // The minimum number of events needed to trigger summarisation
-        threshold: React.PropTypes.number,
+        threshold: PropTypes.number,
         // Called when the MELS expansion is toggled
-        onToggle: React.PropTypes.func,
+        onToggle: PropTypes.func,
         // Whether or not to begin with state.expanded=true
-        startExpanded: React.PropTypes.bool,
+        startExpanded: PropTypes.bool,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index d5c167fac9..f8443c6ecd 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import * as Roles from '../../../Roles';
 import { _t } from '../../../languageHandler';
 
@@ -24,23 +25,23 @@ module.exports = React.createClass({
     displayName: 'PowerSelector',
 
     propTypes: {
-        value: React.PropTypes.number.isRequired,
+        value: PropTypes.number.isRequired,
         // The maximum value that can be set with the power selector
-        maxValue: React.PropTypes.number.isRequired,
+        maxValue: PropTypes.number.isRequired,
 
         // Default user power level for the room
-        usersDefault: React.PropTypes.number.isRequired,
+        usersDefault: PropTypes.number.isRequired,
 
         // if true, the <select/> should be a 'controlled' form element and updated by React
         // to reflect the current value, rather than left freeform.
         // MemberInfo uses controlled; RoomSettings uses non-controlled.
         //
         // ignored if disabled is truthy. false by default.
-        controlled: React.PropTypes.bool,
+        controlled: PropTypes.bool,
 
         // should the user be able to change the value? false by default.
-        disabled: React.PropTypes.bool,
-        onChange: React.PropTypes.func,
+        disabled: PropTypes.bool,
+        onChange: PropTypes.func,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/elements/ProgressBar.js b/src/components/views/elements/ProgressBar.js
index 861bfb1335..15da5d44f6 100644
--- a/src/components/views/elements/ProgressBar.js
+++ b/src/components/views/elements/ProgressBar.js
@@ -17,12 +17,13 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 
 module.exports = React.createClass({
     displayName: 'ProgressBar',
     propTypes: {
-        value: React.PropTypes.number,
-        max: React.PropTypes.number,
+        value: PropTypes.number,
+        max: PropTypes.number,
     },
 
     render: function() {
diff --git a/src/components/views/elements/SettingsFlag.js b/src/components/views/elements/SettingsFlag.js
index 782dc30ede..7f6c74538a 100644
--- a/src/components/views/elements/SettingsFlag.js
+++ b/src/components/views/elements/SettingsFlag.js
@@ -15,23 +15,24 @@ limitations under the License.
 */
 
 import React from "react";
+import PropTypes from 'prop-types';
 import SettingsStore from "../../../settings/SettingsStore";
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'SettingsFlag',
     propTypes: {
-        name: React.PropTypes.string.isRequired,
-        level: React.PropTypes.string.isRequired,
-        roomId: React.PropTypes.string, // for per-room settings
-        label: React.PropTypes.string, // untranslated
-        onChange: React.PropTypes.func,
-        isExplicit: React.PropTypes.bool,
-        manualSave: React.PropTypes.bool,
+        name: PropTypes.string.isRequired,
+        level: PropTypes.string.isRequired,
+        roomId: PropTypes.string, // for per-room settings
+        label: PropTypes.string, // untranslated
+        onChange: PropTypes.func,
+        isExplicit: PropTypes.bool,
+        manualSave: PropTypes.bool,
 
         // If group is supplied, then this will create a radio button instead.
-        group: React.PropTypes.string,
-        value: React.PropTypes.any, // the value for the radio button
+        group: PropTypes.string,
+        value: PropTypes.any, // the value for the radio button
     },
 
     getInitialState: function() {
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 124559a838..f5f691b3a5 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -30,7 +30,7 @@ export default React.createClass({
     },
 
     contextTypes: {
-        matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
+        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
     },
 
     getInitialState() {
diff --git a/src/components/views/elements/TintableSvg.js b/src/components/views/elements/TintableSvg.js
index 3649cbccdb..e04bf87793 100644
--- a/src/components/views/elements/TintableSvg.js
+++ b/src/components/views/elements/TintableSvg.js
@@ -18,16 +18,17 @@ limitations under the License.
 
 const React = require('react');
 const ReactDOM = require("react-dom");
+import PropTypes from 'prop-types';
 const Tinter = require("../../../Tinter");
 
 var TintableSvg = React.createClass({
     displayName: 'TintableSvg',
 
     propTypes: {
-        src: React.PropTypes.string.isRequired,
-        width: React.PropTypes.string.isRequired,
-        height: React.PropTypes.string.isRequired,
-        className: React.PropTypes.string,
+        src: PropTypes.string.isRequired,
+        width: PropTypes.string.isRequired,
+        height: PropTypes.string.isRequired,
+        className: PropTypes.string,
     },
 
     statics: {
diff --git a/src/components/views/elements/UserSelector.js b/src/components/views/elements/UserSelector.js
index a523c57d9f..a05f615e34 100644
--- a/src/components/views/elements/UserSelector.js
+++ b/src/components/views/elements/UserSelector.js
@@ -17,14 +17,15 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'UserSelector',
 
     propTypes: {
-        onChange: React.PropTypes.func,
-        selected_users: React.PropTypes.arrayOf(React.PropTypes.string),
+        onChange: PropTypes.func,
+        selected_users: PropTypes.arrayOf(React.PropTypes.string),
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/groups/GroupRoomTile.js b/src/components/views/groups/GroupRoomTile.js
index 907ce93a4a..a4961fefa9 100644
--- a/src/components/views/groups/GroupRoomTile.js
+++ b/src/components/views/groups/GroupRoomTile.js
@@ -66,7 +66,7 @@ const GroupRoomTile = React.createClass({
 });
 
 GroupRoomTile.contextTypes = {
-    matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
+    matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
 };
 
 
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index 7ea67de98e..ce426a9b78 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -33,7 +33,7 @@ const GroupTile = React.createClass({
     },
 
     contextTypes: {
-        matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
+        matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
     },
 
     getInitialState() {
diff --git a/src/components/views/login/CaptchaForm.js b/src/components/views/login/CaptchaForm.js
index 21e5094b28..ab1bfbd393 100644
--- a/src/components/views/login/CaptchaForm.js
+++ b/src/components/views/login/CaptchaForm.js
@@ -18,6 +18,7 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
 const DIV_ID = 'mx_recaptcha';
@@ -29,10 +30,10 @@ module.exports = React.createClass({
     displayName: 'CaptchaForm',
 
     propTypes: {
-        sitePublicKey: React.PropTypes.string,
+        sitePublicKey: PropTypes.string,
 
         // called with the captcha response
-        onCaptchaResponse: React.PropTypes.func,
+        onCaptchaResponse: PropTypes.func,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/login/CasLogin.js b/src/components/views/login/CasLogin.js
index 49d121687d..9219c79733 100644
--- a/src/components/views/login/CasLogin.js
+++ b/src/components/views/login/CasLogin.js
@@ -17,13 +17,14 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
 module.exports = React.createClass({
     displayName: 'CasLogin',
 
     propTypes: {
-      onSubmit: React.PropTypes.func, // fn()
+      onSubmit: PropTypes.func, // fn()
     },
 
     render: function() {
diff --git a/src/components/views/login/CountryDropdown.js b/src/components/views/login/CountryDropdown.js
index d8695bb1c1..3fd28e32d2 100644
--- a/src/components/views/login/CountryDropdown.js
+++ b/src/components/views/login/CountryDropdown.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 
@@ -131,11 +132,11 @@ export default class CountryDropdown extends React.Component {
 }
 
 CountryDropdown.propTypes = {
-    className: React.PropTypes.string,
-    isSmall: React.PropTypes.bool,
+    className: PropTypes.string,
+    isSmall: PropTypes.bool,
     // if isSmall, show +44 in the selected value
-    showPrefix: React.PropTypes.bool,
-    onOptionChange: React.PropTypes.func.isRequired,
-    value: React.PropTypes.string,
-    disabled: React.PropTypes.bool,
+    showPrefix: PropTypes.bool,
+    onOptionChange: PropTypes.func.isRequired,
+    value: PropTypes.string,
+    disabled: PropTypes.bool,
 };
diff --git a/src/components/views/login/InteractiveAuthEntryComponents.js b/src/components/views/login/InteractiveAuthEntryComponents.js
index e8997b4112..eeda5cd9f3 100644
--- a/src/components/views/login/InteractiveAuthEntryComponents.js
+++ b/src/components/views/login/InteractiveAuthEntryComponents.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import url from 'url';
 import classnames from 'classnames';
 
@@ -69,12 +70,12 @@ export const PasswordAuthEntry = React.createClass({
     },
 
     propTypes: {
-        matrixClient: React.PropTypes.object.isRequired,
-        submitAuthDict: React.PropTypes.func.isRequired,
-        errorText: React.PropTypes.string,
+        matrixClient: PropTypes.object.isRequired,
+        submitAuthDict: PropTypes.func.isRequired,
+        errorText: PropTypes.string,
         // is the auth logic currently waiting for something to
         // happen?
-        busy: React.PropTypes.bool,
+        busy: PropTypes.bool,
     },
 
     getInitialState: function() {
@@ -158,10 +159,10 @@ export const RecaptchaAuthEntry = React.createClass({
     },
 
     propTypes: {
-        submitAuthDict: React.PropTypes.func.isRequired,
-        stageParams: React.PropTypes.object.isRequired,
-        errorText: React.PropTypes.string,
-        busy: React.PropTypes.bool,
+        submitAuthDict: PropTypes.func.isRequired,
+        stageParams: PropTypes.object.isRequired,
+        errorText: PropTypes.string,
+        busy: PropTypes.bool,
     },
 
     _onCaptchaResponse: function(response) {
@@ -200,15 +201,15 @@ export const EmailIdentityAuthEntry = React.createClass({
     },
 
     propTypes: {
-        matrixClient: React.PropTypes.object.isRequired,
-        submitAuthDict: React.PropTypes.func.isRequired,
-        authSessionId: React.PropTypes.string.isRequired,
-        clientSecret: React.PropTypes.string.isRequired,
-        inputs: React.PropTypes.object.isRequired,
-        stageState: React.PropTypes.object.isRequired,
-        fail: React.PropTypes.func.isRequired,
-        setEmailSid: React.PropTypes.func.isRequired,
-        makeRegistrationUrl: React.PropTypes.func.isRequired,
+        matrixClient: PropTypes.object.isRequired,
+        submitAuthDict: PropTypes.func.isRequired,
+        authSessionId: PropTypes.string.isRequired,
+        clientSecret: PropTypes.string.isRequired,
+        inputs: PropTypes.object.isRequired,
+        stageState: PropTypes.object.isRequired,
+        fail: PropTypes.func.isRequired,
+        setEmailSid: PropTypes.func.isRequired,
+        makeRegistrationUrl: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
@@ -275,15 +276,15 @@ export const MsisdnAuthEntry = React.createClass({
     },
 
     propTypes: {
-        inputs: React.PropTypes.shape({
-            phoneCountry: React.PropTypes.string,
-            phoneNumber: React.PropTypes.string,
+        inputs: PropTypes.shape({
+            phoneCountry: PropTypes.string,
+            phoneNumber: PropTypes.string,
         }),
-        fail: React.PropTypes.func,
-        clientSecret: React.PropTypes.func,
-        submitAuthDict: React.PropTypes.func.isRequired,
-        matrixClient: React.PropTypes.object,
-        submitAuthDict: React.PropTypes.func,
+        fail: PropTypes.func,
+        clientSecret: PropTypes.func,
+        submitAuthDict: PropTypes.func.isRequired,
+        matrixClient: PropTypes.object,
+        submitAuthDict: PropTypes.func,
     },
 
     getInitialState: function() {
@@ -405,11 +406,11 @@ export const FallbackAuthEntry = React.createClass({
     displayName: 'FallbackAuthEntry',
 
     propTypes: {
-        matrixClient: React.PropTypes.object.isRequired,
-        authSessionId: React.PropTypes.string.isRequired,
-        loginType: React.PropTypes.string.isRequired,
-        submitAuthDict: React.PropTypes.func.isRequired,
-        errorText: React.PropTypes.string,
+        matrixClient: PropTypes.object.isRequired,
+        authSessionId: PropTypes.string.isRequired,
+        loginType: PropTypes.string.isRequired,
+        submitAuthDict: PropTypes.func.isRequired,
+        errorText: PropTypes.string,
     },
 
     componentWillMount: function() {
diff --git a/src/components/views/login/PasswordLogin.js b/src/components/views/login/PasswordLogin.js
index 83bb41c1a3..71dfbe2c36 100644
--- a/src/components/views/login/PasswordLogin.js
+++ b/src/components/views/login/PasswordLogin.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
@@ -256,17 +257,17 @@ PasswordLogin.LOGIN_FIELD_MXID = "login_field_mxid";
 PasswordLogin.LOGIN_FIELD_PHONE = "login_field_phone";
 
 PasswordLogin.propTypes = {
-    onSubmit: React.PropTypes.func.isRequired, // fn(username, password)
-    onForgotPasswordClick: React.PropTypes.func, // fn()
-    initialUsername: React.PropTypes.string,
-    initialPhoneCountry: React.PropTypes.string,
-    initialPhoneNumber: React.PropTypes.string,
-    initialPassword: React.PropTypes.string,
-    onUsernameChanged: React.PropTypes.func,
-    onPhoneCountryChanged: React.PropTypes.func,
-    onPhoneNumberChanged: React.PropTypes.func,
-    onPasswordChanged: React.PropTypes.func,
-    loginIncorrect: React.PropTypes.bool,
+    onSubmit: PropTypes.func.isRequired, // fn(username, password)
+    onForgotPasswordClick: PropTypes.func, // fn()
+    initialUsername: PropTypes.string,
+    initialPhoneCountry: PropTypes.string,
+    initialPhoneNumber: PropTypes.string,
+    initialPassword: PropTypes.string,
+    onUsernameChanged: PropTypes.func,
+    onPhoneCountryChanged: PropTypes.func,
+    onPhoneNumberChanged: PropTypes.func,
+    onPasswordChanged: PropTypes.func,
+    loginIncorrect: PropTypes.bool,
 };
 
 module.exports = PasswordLogin;
diff --git a/src/components/views/login/RegistrationForm.js b/src/components/views/login/RegistrationForm.js
index 32a36c3897..fff808cf22 100644
--- a/src/components/views/login/RegistrationForm.js
+++ b/src/components/views/login/RegistrationForm.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { field_input_incorrect } from '../../../UiEffects';
 import sdk from '../../../index';
 import Email from '../../../email';
@@ -40,25 +41,25 @@ module.exports = React.createClass({
 
     propTypes: {
         // Values pre-filled in the input boxes when the component loads
-        defaultEmail: React.PropTypes.string,
-        defaultPhoneCountry: React.PropTypes.string,
-        defaultPhoneNumber: React.PropTypes.string,
-        defaultUsername: React.PropTypes.string,
-        defaultPassword: React.PropTypes.string,
-        teamsConfig: React.PropTypes.shape({
+        defaultEmail: PropTypes.string,
+        defaultPhoneCountry: PropTypes.string,
+        defaultPhoneNumber: PropTypes.string,
+        defaultUsername: PropTypes.string,
+        defaultPassword: PropTypes.string,
+        teamsConfig: PropTypes.shape({
             // Email address to request new teams
-            supportEmail: React.PropTypes.string,
-            teams: React.PropTypes.arrayOf(React.PropTypes.shape({
+            supportEmail: PropTypes.string,
+            teams: PropTypes.arrayOf(React.PropTypes.shape({
                 // The displayed name of the team
-                "name": React.PropTypes.string,
+                "name": PropTypes.string,
                 // The domain of team email addresses
-                "domain": React.PropTypes.string,
+                "domain": PropTypes.string,
             })).required,
         }),
 
-        minPasswordLength: React.PropTypes.number,
-        onError: React.PropTypes.func,
-        onRegisterClick: React.PropTypes.func.isRequired, // onRegisterClick(Object) => ?Promise
+        minPasswordLength: PropTypes.number,
+        onError: PropTypes.func,
+        onRegisterClick: PropTypes.func.isRequired, // onRegisterClick(Object) => ?Promise
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/login/ServerConfig.js b/src/components/views/login/ServerConfig.js
index d53c7238b1..a6944ec20a 100644
--- a/src/components/views/login/ServerConfig.js
+++ b/src/components/views/login/ServerConfig.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const Modal = require('../../../Modal');
 const sdk = require('../../../index');
 import { _t } from '../../../languageHandler';
@@ -28,24 +29,24 @@ module.exports = React.createClass({
     displayName: 'ServerConfig',
 
     propTypes: {
-        onServerConfigChange: React.PropTypes.func,
+        onServerConfigChange: PropTypes.func,
 
         // default URLs are defined in config.json (or the hardcoded defaults)
         // they are used if the user has not overridden them with a custom URL.
         // In other words, if the custom URL is blank, the default is used.
-        defaultHsUrl: React.PropTypes.string, // e.g. https://matrix.org
-        defaultIsUrl: React.PropTypes.string, // e.g. https://vector.im
+        defaultHsUrl: PropTypes.string, // e.g. https://matrix.org
+        defaultIsUrl: PropTypes.string, // e.g. https://vector.im
 
         // custom URLs are explicitly provided by the user and override the
         // default URLs.  The user enters them via the component's input fields,
         // which is reflected on these properties whenever on..UrlChanged fires.
         // They are persisted in localStorage by MatrixClientPeg, and so can
         // override the default URLs when the component initially loads.
-        customHsUrl: React.PropTypes.string,
-        customIsUrl: React.PropTypes.string,
+        customHsUrl: PropTypes.string,
+        customIsUrl: PropTypes.string,
 
-        withToggleButton: React.PropTypes.bool,
-        delayTimeMs: React.PropTypes.number, // time to wait before invoking onChanged
+        withToggleButton: PropTypes.bool,
+        delayTimeMs: PropTypes.number, // time to wait before invoking onChanged
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index 8eedf4e1fe..d106d7368e 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import filesize from 'filesize';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
@@ -191,7 +192,7 @@ module.exports = React.createClass({
     },
 
     contextTypes: {
-        appConfig: React.PropTypes.object,
+        appConfig: PropTypes.object,
     },
 
     /**
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index ba7f8000ea..608f48112e 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import MFileBody from './MFileBody';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import ImageUtils from '../../../ImageUtils';
@@ -33,10 +34,10 @@ module.exports = React.createClass({
 
     propTypes: {
         /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
 
         /* called when the image has loaded */
-        onWidgetLoad: React.PropTypes.func.isRequired,
+        onWidgetLoad: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/messages/MVideoBody.js b/src/components/views/messages/MVideoBody.js
index 2e8f0071ac..21edbae9a2 100644
--- a/src/components/views/messages/MVideoBody.js
+++ b/src/components/views/messages/MVideoBody.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import MFileBody from './MFileBody';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { decryptFile, readBlobAsDataUri } from '../../../utils/DecryptFile';
@@ -29,10 +30,10 @@ module.exports = React.createClass({
 
     propTypes: {
         /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
 
         /* called when the video has loaded */
-        onWidgetLoad: React.PropTypes.func.isRequired,
+        onWidgetLoad: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index deda1d8d20..d35959599c 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const sdk = require('../../../index');
 
 module.exports = React.createClass({
@@ -24,22 +25,22 @@ module.exports = React.createClass({
 
     propTypes: {
         /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
 
         /* a list of words to highlight */
-        highlights: React.PropTypes.array,
+        highlights: PropTypes.array,
 
         /* link URL for the highlights */
-        highlightLink: React.PropTypes.string,
+        highlightLink: PropTypes.string,
 
         /* should show URL previews for this event */
-        showUrlPreview: React.PropTypes.bool,
+        showUrlPreview: PropTypes.bool,
 
         /* callback called when dynamic content in events are loaded */
-        onWidgetLoad: React.PropTypes.func,
+        onWidgetLoad: PropTypes.func,
 
         /* the shsape of the tile, used */
-        tileShape: React.PropTypes.string,
+        tileShape: PropTypes.string,
     },
 
     getEventTileOps: function() {
diff --git a/src/components/views/messages/RoomAvatarEvent.js b/src/components/views/messages/RoomAvatarEvent.js
index 3a572d0cbe..d035fc9237 100644
--- a/src/components/views/messages/RoomAvatarEvent.js
+++ b/src/components/views/messages/RoomAvatarEvent.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { ContentRepo } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
@@ -27,7 +28,7 @@ module.exports = React.createClass({
 
     propTypes: {
         /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
     },
 
     onAvatarClick: function(name) {
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 4b096d0a76..6a970a0563 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -18,6 +18,7 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import PropTypes from 'prop-types';
 import highlight from 'highlight.js';
 import * as HtmlUtils from '../../../HtmlUtils';
 import * as linkify from 'linkifyjs';
@@ -43,19 +44,19 @@ module.exports = React.createClass({
 
     propTypes: {
         /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
 
         /* a list of words to highlight */
-        highlights: React.PropTypes.array,
+        highlights: PropTypes.array,
 
         /* link URL for the highlights */
-        highlightLink: React.PropTypes.string,
+        highlightLink: PropTypes.string,
 
         /* should show URL previews for this event */
-        showUrlPreview: React.PropTypes.bool,
+        showUrlPreview: PropTypes.bool,
 
         /* callback for when our widget has loaded */
-        onWidgetLoad: React.PropTypes.func,
+        onWidgetLoad: PropTypes.func,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/messages/TextualEvent.js b/src/components/views/messages/TextualEvent.js
index be0962a868..6c87000615 100644
--- a/src/components/views/messages/TextualEvent.js
+++ b/src/components/views/messages/TextualEvent.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 
 const TextForEvent = require('../../../TextForEvent');
 import sdk from '../../../index';
@@ -26,7 +27,7 @@ module.exports = React.createClass({
 
     propTypes: {
         /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
     },
 
     render: function() {
diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index f1c5c0000c..2915a061de 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import Promise from 'bluebird';
 const React = require('react');
+import PropTypes from 'prop-types';
 const ObjectUtils = require("../../../ObjectUtils");
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 const sdk = require("../../../index");
@@ -26,11 +27,11 @@ module.exports = React.createClass({
     displayName: 'AliasSettings',
 
     propTypes: {
-        roomId: React.PropTypes.string.isRequired,
-        canSetCanonicalAlias: React.PropTypes.bool.isRequired,
-        canSetAliases: React.PropTypes.bool.isRequired,
-        aliasEvents: React.PropTypes.array, // [MatrixEvent]
-        canonicalAliasEvent: React.PropTypes.object, // MatrixEvent
+        roomId: PropTypes.string.isRequired,
+        canSetCanonicalAlias: PropTypes.bool.isRequired,
+        canSetAliases: PropTypes.bool.isRequired,
+        aliasEvents: PropTypes.array, // [MatrixEvent]
+        canonicalAliasEvent: PropTypes.object, // MatrixEvent
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/room_settings/ColorSettings.js b/src/components/views/room_settings/ColorSettings.js
index b6b8c9bad3..e82d3ffb0a 100644
--- a/src/components/views/room_settings/ColorSettings.js
+++ b/src/components/views/room_settings/ColorSettings.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 import Promise from 'bluebird';
 const React = require('react');
+import PropTypes from 'prop-types';
 
 const sdk = require('../../../index');
 const Tinter = require('../../../Tinter');
@@ -42,7 +43,7 @@ module.exports = React.createClass({
     displayName: 'ColorSettings',
 
     propTypes: {
-        room: React.PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index 5b2810d837..7cc517ef1e 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
@@ -26,13 +27,13 @@ module.exports = React.createClass({
     displayName: 'RelatedGroupSettings',
 
     propTypes: {
-        roomId: React.PropTypes.string.isRequired,
-        canSetRelatedGroups: React.PropTypes.bool.isRequired,
-        relatedGroupsEvent: React.PropTypes.instanceOf(MatrixEvent),
+        roomId: PropTypes.string.isRequired,
+        canSetRelatedGroups: PropTypes.bool.isRequired,
+        relatedGroupsEvent: PropTypes.instanceOf(MatrixEvent),
     },
 
     contextTypes: {
-        matrixClient: React.PropTypes.instanceOf(MatrixClient),
+        matrixClient: PropTypes.instanceOf(MatrixClient),
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js
index e4a8c9d353..ed58d610aa 100644
--- a/src/components/views/room_settings/UrlPreviewSettings.js
+++ b/src/components/views/room_settings/UrlPreviewSettings.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const sdk = require("../../../index");
 import { _t, _td } from '../../../languageHandler';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
@@ -25,7 +26,7 @@ module.exports = React.createClass({
     displayName: 'UrlPreviewSettings',
 
     propTypes: {
-        room: React.PropTypes.object,
+        room: PropTypes.object,
     },
 
     saveSettings: function() {
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index e29f46fd37..9707cd95de 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import AppTile from '../elements/AppTile';
 import Modal from '../../../Modal';
@@ -36,7 +37,7 @@ module.exports = React.createClass({
     displayName: 'AppsDrawer',
 
     propTypes: {
-        room: React.PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index c0857d9691..2713b1d30f 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import sdk from '../../../index';
 import dis from "../../../dispatcher";
@@ -29,26 +30,26 @@ module.exports = React.createClass({
 
     propTypes: {
         // js-sdk room object
-        room: React.PropTypes.object.isRequired,
-        userId: React.PropTypes.string.isRequired,
-        showApps: React.PropTypes.bool,
+        room: PropTypes.object.isRequired,
+        userId: PropTypes.string.isRequired,
+        showApps: PropTypes.bool,
 
         // Conference Handler implementation
-        conferenceHandler: React.PropTypes.object,
+        conferenceHandler: PropTypes.object,
 
         // set to true to show the file drop target
-        draggingFile: React.PropTypes.bool,
+        draggingFile: PropTypes.bool,
 
         // set to true to show the 'active conf call' banner
-        displayConfCallNotification: React.PropTypes.bool,
+        displayConfCallNotification: PropTypes.bool,
 
         // maxHeight attribute for the aux panel and the video
         // therein
-        maxHeight: React.PropTypes.number,
+        maxHeight: PropTypes.number,
 
         // a callback which is called when the content of the aux panel changes
         // content in a way that is likely to make it change size.
-        onResize: React.PropTypes.func,
+        onResize: PropTypes.func,
     },
 
     shouldComponentUpdate: function(nextProps, nextState) {
diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index ffcb289437..949eebada0 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 const sdk = require('../../../index');
@@ -51,18 +52,18 @@ const EntityTile = React.createClass({
     displayName: 'EntityTile',
 
     propTypes: {
-        name: React.PropTypes.string,
-        title: React.PropTypes.string,
-        avatarJsx: React.PropTypes.any, // <BaseAvatar />
-        className: React.PropTypes.string,
-        presenceState: React.PropTypes.string,
-        presenceLastActiveAgo: React.PropTypes.number,
-        presenceLastTs: React.PropTypes.number,
-        presenceCurrentlyActive: React.PropTypes.bool,
-        showInviteButton: React.PropTypes.bool,
-        shouldComponentUpdate: React.PropTypes.func,
-        onClick: React.PropTypes.func,
-        suppressOnHover: React.PropTypes.bool,
+        name: PropTypes.string,
+        title: PropTypes.string,
+        avatarJsx: PropTypes.any, // <BaseAvatar />
+        className: PropTypes.string,
+        presenceState: PropTypes.string,
+        presenceLastActiveAgo: PropTypes.number,
+        presenceLastTs: PropTypes.number,
+        presenceCurrentlyActive: PropTypes.bool,
+        showInviteButton: PropTypes.bool,
+        shouldComponentUpdate: PropTypes.func,
+        onClick: PropTypes.func,
+        suppressOnHover: PropTypes.bool,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 0b55c3aa2a..d5589000c6 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -18,6 +18,7 @@ limitations under the License.
 
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const classNames = require("classnames");
 import { _t, _td } from '../../../languageHandler';
 const Modal = require('../../../Modal');
@@ -75,65 +76,65 @@ module.exports = withMatrixClient(React.createClass({
 
     propTypes: {
         /* MatrixClient instance for sender verification etc */
-        matrixClient: React.PropTypes.object.isRequired,
+        matrixClient: PropTypes.object.isRequired,
 
         /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
 
         /* true if mxEvent is redacted. This is a prop because using mxEvent.isRedacted()
          * might not be enough when deciding shouldComponentUpdate - prevProps.mxEvent
          * references the same this.props.mxEvent.
          */
-        isRedacted: React.PropTypes.bool,
+        isRedacted: PropTypes.bool,
 
         /* true if this is a continuation of the previous event (which has the
          * effect of not showing another avatar/displayname
          */
-        continuation: React.PropTypes.bool,
+        continuation: PropTypes.bool,
 
         /* true if this is the last event in the timeline (which has the effect
          * of always showing the timestamp)
          */
-        last: React.PropTypes.bool,
+        last: PropTypes.bool,
 
         /* true if this is search context (which has the effect of greying out
          * the text
          */
-        contextual: React.PropTypes.bool,
+        contextual: PropTypes.bool,
 
         /* a list of words to highlight, ordered by longest first */
-        highlights: React.PropTypes.array,
+        highlights: PropTypes.array,
 
         /* link URL for the highlights */
-        highlightLink: React.PropTypes.string,
+        highlightLink: PropTypes.string,
 
         /* should show URL previews for this event */
-        showUrlPreview: React.PropTypes.bool,
+        showUrlPreview: PropTypes.bool,
 
         /* is this the focused event */
-        isSelectedEvent: React.PropTypes.bool,
+        isSelectedEvent: PropTypes.bool,
 
         /* callback called when dynamic content in events are loaded */
-        onWidgetLoad: React.PropTypes.func,
+        onWidgetLoad: PropTypes.func,
 
         /* a list of read-receipts we should show. Each object has a 'roomMember' and 'ts'. */
-        readReceipts: React.PropTypes.arrayOf(React.PropTypes.object),
+        readReceipts: PropTypes.arrayOf(React.PropTypes.object),
 
         /* opaque readreceipt info for each userId; used by ReadReceiptMarker
          * to manage its animations. Should be an empty object when the room
          * first loads
          */
-        readReceiptMap: React.PropTypes.object,
+        readReceiptMap: PropTypes.object,
 
         /* A function which is used to check if the parent panel is being
          * unmounted, to avoid unnecessary work. Should return true if we
          * are being unmounted.
          */
-        checkUnmounting: React.PropTypes.func,
+        checkUnmounting: PropTypes.func,
 
         /* the status of this event - ie, mxEvent.status. Denormalised to here so
          * that we can tell when it changes. */
-        eventSendStatus: React.PropTypes.string,
+        eventSendStatus: PropTypes.string,
 
         /* the shape of the tile. by default, the layout is intended for the
          * normal room timeline.  alternative values are: "file_list", "file_grid"
@@ -142,10 +143,10 @@ module.exports = withMatrixClient(React.createClass({
          * boiilerplatey.  So just make the necessary render decisions conditional
          * for now.
          */
-        tileShape: React.PropTypes.string,
+        tileShape: PropTypes.string,
 
         // show twelve hour timestamps
-        isTwelveHour: React.PropTypes.bool,
+        isTwelveHour: PropTypes.bool,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/ForwardMessage.js b/src/components/views/rooms/ForwardMessage.js
index 6f9d1d0b69..11ca7487cc 100644
--- a/src/components/views/rooms/ForwardMessage.js
+++ b/src/components/views/rooms/ForwardMessage.js
@@ -16,6 +16,7 @@
  */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import dis from '../../../dispatcher';
 import { KeyCode } from '../../../Keyboard';
@@ -25,7 +26,7 @@ module.exports = React.createClass({
     displayName: 'ForwardMessage',
 
     propTypes: {
-        onCancelClick: React.PropTypes.func.isRequired,
+        onCancelClick: PropTypes.func.isRequired,
     },
 
     componentWillMount: function() {
diff --git a/src/components/views/rooms/LinkPreviewWidget.js b/src/components/views/rooms/LinkPreviewWidget.js
index d69a8fbcf1..2c70f36e07 100644
--- a/src/components/views/rooms/LinkPreviewWidget.js
+++ b/src/components/views/rooms/LinkPreviewWidget.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 
 const sdk = require('../../../index');
 const MatrixClientPeg = require('../../../MatrixClientPeg');
@@ -32,10 +33,10 @@ module.exports = React.createClass({
     displayName: 'LinkPreviewWidget',
 
     propTypes: {
-        link: React.PropTypes.string.isRequired, // the URL being previewed
-        mxEvent: React.PropTypes.object.isRequired, // the Event associated with the preview
-        onCancelClick: React.PropTypes.func, // called when the preview's cancel ('hide') button is clicked
-        onWidgetLoad: React.PropTypes.func, // called when the preview's contents has loaded
+        link: PropTypes.string.isRequired, // the URL being previewed
+        mxEvent: PropTypes.object.isRequired, // the Event associated with the preview
+        onCancelClick: PropTypes.func, // called when the preview's cancel ('hide') button is clicked
+        onWidgetLoad: PropTypes.func, // called when the preview's contents has loaded
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/MemberDeviceInfo.js b/src/components/views/rooms/MemberDeviceInfo.js
index 6e284fc886..41ed995ffb 100644
--- a/src/components/views/rooms/MemberDeviceInfo.js
+++ b/src/components/views/rooms/MemberDeviceInfo.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 
@@ -65,6 +66,6 @@ export default class MemberDeviceInfo extends React.Component {
 
 MemberDeviceInfo.displayName = 'MemberDeviceInfo';
 MemberDeviceInfo.propTypes = {
-    userId: React.PropTypes.string.isRequired,
-    device: React.PropTypes.object.isRequired,
+    userId: PropTypes.string.isRequired,
+    device: PropTypes.object.isRequired,
 };
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index cb6cb6c0f3..8bb6650d1e 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -27,6 +27,7 @@ limitations under the License.
  * 'isTargetMod': boolean
  */
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import dis from '../../../dispatcher';
 import Modal from '../../../Modal';
@@ -46,8 +47,8 @@ module.exports = withMatrixClient(React.createClass({
     displayName: 'MemberInfo',
 
     propTypes: {
-        matrixClient: React.PropTypes.object.isRequired,
-        member: React.PropTypes.object.isRequired,
+        matrixClient: PropTypes.object.isRequired,
+        member: PropTypes.object.isRequired,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 4848c4b258..50ee6befa8 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 const sdk = require('../../../index');
@@ -28,7 +29,7 @@ module.exports = React.createClass({
     displayName: 'MemberTile',
 
     propTypes: {
-        member: React.PropTypes.any.isRequired, // RoomMember
+        member: PropTypes.any.isRequired, // RoomMember
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 2841f30423..f3492de25b 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import CallHandler from '../../../CallHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
@@ -399,17 +400,17 @@ export default class MessageComposer extends React.Component {
 MessageComposer.propTypes = {
     // a callback which is called when the height of the composer is
     // changed due to a change in content.
-    onResize: React.PropTypes.func,
+    onResize: PropTypes.func,
 
     // js-sdk Room object
-    room: React.PropTypes.object.isRequired,
+    room: PropTypes.object.isRequired,
 
     // string representing the current voip call state
-    callState: React.PropTypes.string,
+    callState: PropTypes.string,
 
     // callback when a file to upload is chosen
-    uploadFile: React.PropTypes.func.isRequired,
+    uploadFile: PropTypes.func.isRequired,
 
     // string representing the current room app drawer state
-    showApps: React.PropTypes.bool,
+    showApps: PropTypes.bool,
 };
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 1ffbfafbc5..bfcc14a7b4 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import PropTypes from 'prop-types';
 import type SyntheticKeyboardEvent from 'react/lib/SyntheticKeyboardEvent';
 
 import {Editor, EditorState, RichUtils, CompositeDecorator, Modifier,
@@ -86,15 +87,15 @@ export default class MessageComposerInput extends React.Component {
     static propTypes = {
         // a callback which is called when the height of the composer is
         // changed due to a change in content.
-        onResize: React.PropTypes.func,
+        onResize: PropTypes.func,
 
         // js-sdk Room object
-        room: React.PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
 
         // called with current plaintext content (as a string) whenever it changes
-        onContentChanged: React.PropTypes.func,
+        onContentChanged: PropTypes.func,
 
-        onInputStateChanged: React.PropTypes.func,
+        onInputStateChanged: PropTypes.func,
     };
 
     static getKeyBinding(ev: SyntheticKeyboardEvent): string {
@@ -1177,15 +1178,15 @@ export default class MessageComposerInput extends React.Component {
 MessageComposerInput.propTypes = {
     // a callback which is called when the height of the composer is
     // changed due to a change in content.
-    onResize: React.PropTypes.func,
+    onResize: PropTypes.func,
 
     // js-sdk Room object
-    room: React.PropTypes.object.isRequired,
+    room: PropTypes.object.isRequired,
 
     // called with current plaintext content (as a string) whenever it changes
-    onContentChanged: React.PropTypes.func,
+    onContentChanged: PropTypes.func,
 
-    onFilesPasted: React.PropTypes.func,
+    onFilesPasted: PropTypes.func,
 
-    onInputStateChanged: React.PropTypes.func,
+    onInputStateChanged: PropTypes.func,
 };
diff --git a/src/components/views/rooms/PinnedEventTile.js b/src/components/views/rooms/PinnedEventTile.js
index 65b41d946a..b63fdde0a8 100644
--- a/src/components/views/rooms/PinnedEventTile.js
+++ b/src/components/views/rooms/PinnedEventTile.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+import PropTypes from 'prop-types';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher";
 import AccessibleButton from "../elements/AccessibleButton";
@@ -25,9 +26,9 @@ import { _t } from '../../../languageHandler';
 module.exports = React.createClass({
     displayName: 'PinnedEventTile',
     propTypes: {
-        mxRoom: React.PropTypes.object.isRequired,
-        mxEvent: React.PropTypes.object.isRequired,
-        onUnpinned: React.PropTypes.func,
+        mxRoom: PropTypes.object.isRequired,
+        mxEvent: PropTypes.object.isRequired,
+        onUnpinned: PropTypes.func,
     },
     onTileClicked: function() {
         dis.dispatch({
diff --git a/src/components/views/rooms/PinnedEventsPanel.js b/src/components/views/rooms/PinnedEventsPanel.js
index a8fb35fcd5..4624b3c051 100644
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from "react";
+import PropTypes from 'prop-types';
 import MatrixClientPeg from "../../../MatrixClientPeg";
 import AccessibleButton from "../elements/AccessibleButton";
 import PinnedEventTile from "./PinnedEventTile";
@@ -25,9 +26,9 @@ module.exports = React.createClass({
     displayName: 'PinnedEventsPanel',
     propTypes: {
         // The Room from the js-sdk we're going to show pinned events for
-        room: React.PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
 
-        onCancelClick: React.PropTypes.func,
+        onCancelClick: PropTypes.func,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/PresenceLabel.js b/src/components/views/rooms/PresenceLabel.js
index b6e171100b..22a597b42b 100644
--- a/src/components/views/rooms/PresenceLabel.js
+++ b/src/components/views/rooms/PresenceLabel.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import { _t } from '../../../languageHandler';
 
@@ -27,14 +28,14 @@ module.exports = React.createClass({
     propTypes: {
         // number of milliseconds ago this user was last active.
         // zero = unknown
-        activeAgo: React.PropTypes.number,
+        activeAgo: PropTypes.number,
 
         // if true, activeAgo is an approximation and "Now" should
         // be shown instead
-        currentlyActive: React.PropTypes.bool,
+        currentlyActive: PropTypes.bool,
 
         // offline, online, etc
-        presenceState: React.PropTypes.string,
+        presenceState: PropTypes.string,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 69ea81cdfa..ea38d07dea 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -18,6 +18,7 @@ limitations under the License.
 
 const React = require('react');
 const ReactDOM = require('react-dom');
+import PropTypes from 'prop-types';
 
 const sdk = require('../../../index');
 
@@ -40,35 +41,35 @@ module.exports = React.createClass({
 
     propTypes: {
         // the RoomMember to show the RR for
-        member: React.PropTypes.object.isRequired,
+        member: PropTypes.object.isRequired,
 
         // number of pixels to offset the avatar from the right of its parent;
         // typically a negative value.
-        leftOffset: React.PropTypes.number,
+        leftOffset: PropTypes.number,
 
         // true to hide the avatar (it will still be animated)
-        hidden: React.PropTypes.bool,
+        hidden: PropTypes.bool,
 
         // don't animate this RR into position
-        suppressAnimation: React.PropTypes.bool,
+        suppressAnimation: PropTypes.bool,
 
         // an opaque object for storing information about this user's RR in
         // this room
-        readReceiptInfo: React.PropTypes.object,
+        readReceiptInfo: PropTypes.object,
 
         // A function which is used to check if the parent panel is being
         // unmounted, to avoid unnecessary work. Should return true if we
         // are being unmounted.
-        checkUnmounting: React.PropTypes.func,
+        checkUnmounting: PropTypes.func,
 
         // callback for clicks on this RR
-        onClick: React.PropTypes.func,
+        onClick: PropTypes.func,
 
         // Timestamp when the receipt was read
-        timestamp: React.PropTypes.number,
+        timestamp: PropTypes.number,
 
         // True to show twelve hour format, false otherwise
-        showTwelveHour: React.PropTypes.bool,
+        showTwelveHour: PropTypes.bool,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index aee229c5da..c0644baef7 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';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
@@ -39,18 +40,18 @@ module.exports = React.createClass({
     displayName: 'RoomHeader',
 
     propTypes: {
-        room: React.PropTypes.object,
-        oobData: React.PropTypes.object,
-        editing: React.PropTypes.bool,
-        saving: React.PropTypes.bool,
-        inRoom: React.PropTypes.bool,
-        collapsedRhs: React.PropTypes.bool,
-        onSettingsClick: React.PropTypes.func,
-        onPinnedClick: React.PropTypes.func,
-        onSaveClick: React.PropTypes.func,
-        onSearchClick: React.PropTypes.func,
-        onLeaveClick: React.PropTypes.func,
-        onCancelClick: React.PropTypes.func,
+        room: PropTypes.object,
+        oobData: PropTypes.object,
+        editing: PropTypes.bool,
+        saving: PropTypes.bool,
+        inRoom: PropTypes.bool,
+        collapsedRhs: PropTypes.bool,
+        onSettingsClick: PropTypes.func,
+        onPinnedClick: PropTypes.func,
+        onSaveClick: PropTypes.func,
+        onSearchClick: PropTypes.func,
+        onLeaveClick: PropTypes.func,
+        onCancelClick: PropTypes.func,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index b305b04fd0..8318486ca2 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -18,6 +18,7 @@ limitations under the License.
 'use strict';
 const React = require("react");
 const ReactDOM = require("react-dom");
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 const GeminiScrollbar = require('react-gemini-scrollbar');
 const MatrixClientPeg = require("../../../MatrixClientPeg");
@@ -52,9 +53,9 @@ module.exports = React.createClass({
     displayName: 'RoomList',
 
     propTypes: {
-        ConferenceHandler: React.PropTypes.any,
-        collapsed: React.PropTypes.bool.isRequired,
-        searchFilter: React.PropTypes.string,
+        ConferenceHandler: PropTypes.any,
+        collapsed: PropTypes.bool.isRequired,
+        searchFilter: PropTypes.string,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index c6ebea864e..5c224d79c0 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const sdk = require('../../../index');
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 import { _t } from '../../../languageHandler';
@@ -25,7 +26,7 @@ module.exports = React.createClass({
     displayName: 'RoomNameEditor',
 
     propTypes: {
-        room: React.PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
     },
 
     componentWillMount: function() {
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index 175a3ea552..536093807a 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -18,6 +18,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const sdk = require('../../../index');
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 
@@ -27,29 +28,29 @@ module.exports = React.createClass({
     displayName: 'RoomPreviewBar',
 
     propTypes: {
-        onJoinClick: React.PropTypes.func,
-        onRejectClick: React.PropTypes.func,
-        onForgetClick: React.PropTypes.func,
+        onJoinClick: PropTypes.func,
+        onRejectClick: PropTypes.func,
+        onForgetClick: PropTypes.func,
 
         // if inviterName is specified, the preview bar will shown an invite to the room.
         // You should also specify onRejectClick if specifiying inviterName
-        inviterName: React.PropTypes.string,
+        inviterName: PropTypes.string,
 
         // If invited by 3rd party invite, the email address the invite was sent to
-        invitedEmail: React.PropTypes.string,
+        invitedEmail: PropTypes.string,
 
         // A standard client/server API error object. If supplied, indicates that the
         // caller was unable to fetch details about the room for the given reason.
-        error: React.PropTypes.object,
+        error: PropTypes.object,
 
-        canPreview: React.PropTypes.bool,
-        spinner: React.PropTypes.bool,
-        room: React.PropTypes.object,
+        canPreview: PropTypes.bool,
+        spinner: PropTypes.bool,
+        room: PropTypes.object,
 
         // 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.string,
+        roomAlias: PropTypes.string,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 4ac2da2030..0bbf33478d 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 import Promise from 'bluebird';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t, _td } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import sdk from '../../../index';
@@ -60,10 +61,10 @@ const plEventsToShow = {
 
 const BannedUser = React.createClass({
     propTypes: {
-        canUnban: React.PropTypes.bool,
-        member: React.PropTypes.object.isRequired, // js-sdk RoomMember
-        by: React.PropTypes.string.isRequired,
-        reason: React.PropTypes.string,
+        canUnban: PropTypes.bool,
+        member: PropTypes.object.isRequired, // js-sdk RoomMember
+        by: PropTypes.string.isRequired,
+        reason: PropTypes.string,
     },
 
     _onUnbanClick: function() {
@@ -115,8 +116,8 @@ module.exports = React.createClass({
     displayName: 'RoomSettings',
 
     propTypes: {
-        room: React.PropTypes.object.isRequired,
-        onSaveClick: React.PropTypes.func,
+        room: PropTypes.object.isRequired,
+        onSaveClick: PropTypes.func,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 743ec93da9..30cc64ef7a 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -19,6 +19,7 @@ limitations under the License.
 
 const React = require('react');
 const ReactDOM = require("react-dom");
+import PropTypes from 'prop-types';
 const classNames = require('classnames');
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 import DMRoomMap from '../../../utils/DMRoomMap';
@@ -34,17 +35,17 @@ module.exports = React.createClass({
     displayName: 'RoomTile',
 
     propTypes: {
-        connectDragSource: React.PropTypes.func,
-        connectDropTarget: React.PropTypes.func,
-        onClick: React.PropTypes.func,
-        isDragging: React.PropTypes.bool,
+        connectDragSource: PropTypes.func,
+        connectDropTarget: PropTypes.func,
+        onClick: PropTypes.func,
+        isDragging: PropTypes.bool,
 
-        room: React.PropTypes.object.isRequired,
-        collapsed: React.PropTypes.bool.isRequired,
-        unread: React.PropTypes.bool.isRequired,
-        highlight: React.PropTypes.bool.isRequired,
-        isInvite: React.PropTypes.bool.isRequired,
-        incomingCall: React.PropTypes.object,
+        room: PropTypes.object.isRequired,
+        collapsed: PropTypes.bool.isRequired,
+        unread: PropTypes.bool.isRequired,
+        highlight: PropTypes.bool.isRequired,
+        isInvite: PropTypes.bool.isRequired,
+        incomingCall: PropTypes.object,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
index 320730f341..8f950d625c 100644
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const sdk = require('../../../index');
 import { _t } from "../../../languageHandler";
 
@@ -24,7 +25,7 @@ module.exports = React.createClass({
     displayName: 'RoomTopicEditor',
 
     propTypes: {
-        room: React.PropTypes.object.isRequired,
+        room: PropTypes.object.isRequired,
     },
 
     componentWillMount: function() {
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index 1c5cc175ae..9514cc94d2 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const sdk = require('../../../index');
 
 module.exports = React.createClass({
@@ -24,15 +25,15 @@ module.exports = React.createClass({
 
     propTypes: {
         // a matrix-js-sdk SearchResult containing the details of this result
-        searchResult: React.PropTypes.object.isRequired,
+        searchResult: PropTypes.object.isRequired,
 
         // a list of strings to be highlighted in the results
-        searchHighlights: React.PropTypes.array,
+        searchHighlights: PropTypes.array,
 
         // href for the highlights in this result
-        resultLink: React.PropTypes.string,
+        resultLink: PropTypes.string,
 
-        onWidgetLoad: React.PropTypes.func,
+        onWidgetLoad: PropTypes.func,
     },
 
     render: function() {
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index c71acdb454..ff75524a5d 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 const React = require('react');
+import PropTypes from 'prop-types';
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const Modal = require("../../../Modal");
 const sdk = require("../../../index");
@@ -26,12 +27,12 @@ const SearchableEntityList = React.createClass({
     displayName: 'SearchableEntityList',
 
     propTypes: {
-        emptyQueryShowsAll: React.PropTypes.bool,
-        showInputBox: React.PropTypes.bool,
-        onQueryChanged: React.PropTypes.func, // fn(inputText)
-        onSubmit: React.PropTypes.func, // fn(inputText)
-        entities: React.PropTypes.array,
-        truncateAt: React.PropTypes.number,
+        emptyQueryShowsAll: PropTypes.bool,
+        showInputBox: PropTypes.bool,
+        onQueryChanged: PropTypes.func, // fn(inputText)
+        onSubmit: PropTypes.func, // fn(inputText)
+        entities: PropTypes.array,
+        truncateAt: PropTypes.number,
     },
 
     getDefaultProps: function() {
diff --git a/src/components/views/rooms/SimpleRoomHeader.js b/src/components/views/rooms/SimpleRoomHeader.js
index c47d219624..249ba8b93a 100644
--- a/src/components/views/rooms/SimpleRoomHeader.js
+++ b/src/components/views/rooms/SimpleRoomHeader.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import AccessibleButton from '../elements/AccessibleButton';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
@@ -39,11 +40,11 @@ export default React.createClass({
     displayName: 'SimpleRoomHeader',
 
     propTypes: {
-        title: React.PropTypes.string,
-        onCancelClick: React.PropTypes.func,
+        title: PropTypes.string,
+        onCancelClick: PropTypes.func,
 
         // `src` to a TintableSvg. Optional.
-        icon: React.PropTypes.string,
+        icon: PropTypes.string,
     },
 
     render: function() {
diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index c32777abad..85a5d3863e 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';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 const sdk = require('../../../index');
 
@@ -25,8 +26,8 @@ module.exports = React.createClass({
     displayName: 'TopUnreadMessagesBar',
 
     propTypes: {
-        onScrollUpClick: React.PropTypes.func,
-        onCloseClick: React.PropTypes.func,
+        onScrollUpClick: PropTypes.func,
+        onCloseClick: PropTypes.func,
     },
 
     render: function() {
diff --git a/src/components/views/rooms/UserTile.js b/src/components/views/rooms/UserTile.js
index 0acc71cf48..07a9c00917 100644
--- a/src/components/views/rooms/UserTile.js
+++ b/src/components/views/rooms/UserTile.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 
 const Avatar = require("../../../Avatar");
 const MatrixClientPeg = require('../../../MatrixClientPeg');
@@ -28,7 +29,7 @@ module.exports = React.createClass({
     displayName: 'UserTile',
 
     propTypes: {
-        user: React.PropTypes.any.isRequired, // User
+        user: PropTypes.any.isRequired, // User
     },
 
     render: function() {
diff --git a/src/components/views/settings/AddPhoneNumber.js b/src/components/views/settings/AddPhoneNumber.js
index 10264c0d75..64822ace5f 100644
--- a/src/components/views/settings/AddPhoneNumber.js
+++ b/src/components/views/settings/AddPhoneNumber.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 
 import sdk from '../../../index';
@@ -26,8 +27,8 @@ export default withMatrixClient(React.createClass({
     displayName: 'AddPhoneNumber',
 
     propTypes: {
-        matrixClient: React.PropTypes.object.isRequired,
-        onThreepidAdded: React.PropTypes.func,
+        matrixClient: PropTypes.object.isRequired,
+        onThreepidAdded: PropTypes.func,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/settings/ChangeAvatar.js b/src/components/views/settings/ChangeAvatar.js
index a363dc2c60..7164aa4bbe 100644
--- a/src/components/views/settings/ChangeAvatar.js
+++ b/src/components/views/settings/ChangeAvatar.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const sdk = require('../../../index');
 import { _t } from '../../../languageHandler';
@@ -22,13 +23,13 @@ import { _t } from '../../../languageHandler';
 module.exports = React.createClass({
     displayName: 'ChangeAvatar',
     propTypes: {
-        initialAvatarUrl: React.PropTypes.string,
-        room: React.PropTypes.object,
+        initialAvatarUrl: PropTypes.string,
+        room: PropTypes.object,
         // if false, you need to call changeAvatar.onFileSelected yourself.
-        showUploadSection: React.PropTypes.bool,
-        width: React.PropTypes.number,
-        height: React.PropTypes.number,
-        className: React.PropTypes.string,
+        showUploadSection: PropTypes.bool,
+        width: PropTypes.number,
+        height: PropTypes.number,
+        className: PropTypes.string,
     },
 
     Phases: {
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 9d8b51c7e8..9cac25e6cc 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -17,6 +17,7 @@ limitations under the License.
 'use strict';
 
 const React = require('react');
+import PropTypes from 'prop-types';
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const Modal = require("../../../Modal");
 const sdk = require("../../../index");
@@ -30,16 +31,16 @@ import sessionStore from '../../../stores/SessionStore';
 module.exports = React.createClass({
     displayName: 'ChangePassword',
     propTypes: {
-        onFinished: React.PropTypes.func,
-        onError: React.PropTypes.func,
-        onCheckPassword: React.PropTypes.func,
-        rowClassName: React.PropTypes.string,
-        rowLabelClassName: React.PropTypes.string,
-        rowInputClassName: React.PropTypes.string,
-        buttonClassName: React.PropTypes.string,
-        confirm: React.PropTypes.bool,
+        onFinished: PropTypes.func,
+        onError: PropTypes.func,
+        onCheckPassword: PropTypes.func,
+        rowClassName: PropTypes.string,
+        rowLabelClassName: PropTypes.string,
+        rowInputClassName: PropTypes.string,
+        buttonClassName: PropTypes.string,
+        confirm: PropTypes.bool,
         // Whether to autoFocus the new password input
-        autoFocusNewPasswordInput: React.PropTypes.bool,
+        autoFocusNewPasswordInput: PropTypes.bool,
     },
 
     Phases: {
diff --git a/src/components/views/settings/DevicesPanel.js b/src/components/views/settings/DevicesPanel.js
index 413594d698..f0fec2cf63 100644
--- a/src/components/views/settings/DevicesPanel.js
+++ b/src/components/views/settings/DevicesPanel.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import sdk from '../../../index';
@@ -207,5 +208,5 @@ export default class DevicesPanel extends React.Component {
 
 DevicesPanel.displayName = 'MemberDeviceInfo';
 DevicesPanel.propTypes = {
-    className: React.PropTypes.string,
+    className: PropTypes.string,
 };
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index e5f9dcac46..4c08a938c7 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
@@ -88,8 +89,8 @@ export default class DevicesPanelEntry extends React.Component {
 }
 
 DevicesPanelEntry.propTypes = {
-    device: React.PropTypes.object.isRequired,
-    onDeviceToggled: React.PropTypes.func,
+    device: PropTypes.object.isRequired,
+    onDeviceToggled: PropTypes.func,
 };
 
 DevicesPanelEntry.defaultProps = {
diff --git a/src/components/views/voip/CallPreview.js b/src/components/views/voip/CallPreview.js
index 132e29bd34..272e6feb37 100644
--- a/src/components/views/voip/CallPreview.js
+++ b/src/components/views/voip/CallPreview.js
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+import PropTypes from 'prop-types';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import CallHandler from '../../../CallHandler';
 import dis from '../../../dispatcher';
@@ -27,7 +28,7 @@ module.exports = React.createClass({
         // A Conference Handler implementation
         // Must have a function signature:
         //  getConferenceCallForRoom(roomId: string): MatrixCall
-        ConferenceHandler: React.PropTypes.object,
+        ConferenceHandler: PropTypes.object,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/voip/CallView.js b/src/components/views/voip/CallView.js
index 37d111be93..47e8ae22db 100644
--- a/src/components/views/voip/CallView.js
+++ b/src/components/views/voip/CallView.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import PropTypes from 'prop-types';
 import dis from '../../../dispatcher';
 import CallHandler from '../../../CallHandler';
 import sdk from '../../../index';
@@ -26,25 +27,25 @@ module.exports = React.createClass({
     propTypes: {
         // js-sdk room object. If set, we will only show calls for the given
         // room; if not, we will show any active call.
-        room: React.PropTypes.object,
+        room: PropTypes.object,
 
         // A Conference Handler implementation
         // Must have a function signature:
         //  getConferenceCallForRoom(roomId: string): MatrixCall
-        ConferenceHandler: React.PropTypes.object,
+        ConferenceHandler: PropTypes.object,
 
         // maxHeight style attribute for the video panel
-        maxVideoHeight: React.PropTypes.number,
+        maxVideoHeight: PropTypes.number,
 
         // a callback which is called when the user clicks on the video div
-        onClick: React.PropTypes.func,
+        onClick: PropTypes.func,
 
         // a callback which is called when the content in the callview changes
         // in a way that is likely to cause a resize.
-        onResize: React.PropTypes.func,
+        onResize: PropTypes.func,
 
         // render ongoing audio call details - useful when in LeftPanel
-        showVoice: React.PropTypes.bool,
+        showVoice: PropTypes.bool,
     },
 
     getInitialState: function() {
diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index c12924791a..8d75029baa 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import React from 'react';
+import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
@@ -22,7 +23,7 @@ module.exports = React.createClass({
     displayName: 'IncomingCallBox',
 
     propTypes: {
-        incomingCall: React.PropTypes.object,
+        incomingCall: PropTypes.object,
     },
 
     onAnswerClick: function() {
diff --git a/src/components/views/voip/VideoFeed.js b/src/components/views/voip/VideoFeed.js
index f955df62d9..23dc236d62 100644
--- a/src/components/views/voip/VideoFeed.js
+++ b/src/components/views/voip/VideoFeed.js
@@ -17,17 +17,18 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
+import PropTypes from 'prop-types';
 
 module.exports = React.createClass({
     displayName: 'VideoFeed',
 
     propTypes: {
         // maxHeight style attribute for the video element
-        maxHeight: React.PropTypes.number,
+        maxHeight: PropTypes.number,
 
         // a callback which is called when the video element is resized
         // due to a change in video metadata
-        onResize: React.PropTypes.func,
+        onResize: PropTypes.func,
     },
 
     componentDidMount() {
diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 44e7a47f02..1820514129 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -18,6 +18,7 @@ limitations under the License.
 
 import React from 'react';
 import ReactDOM from 'react-dom';
+import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import sdk from '../../../index';
@@ -30,14 +31,14 @@ module.exports = React.createClass({
 
     propTypes: {
         // maxHeight style attribute for the video element
-        maxHeight: React.PropTypes.number,
+        maxHeight: PropTypes.number,
 
         // a callback which is called when the user clicks on the video div
-        onClick: React.PropTypes.func,
+        onClick: PropTypes.func,
 
         // a callback which is called when the video element is resized due to
         // a change in video metadata
-        onResize: React.PropTypes.func,
+        onResize: PropTypes.func,
     },
 
     componentDidMount: function() {
diff --git a/src/wrappers/withMatrixClient.js b/src/wrappers/withMatrixClient.js
index 2333358817..7be3b0561d 100644
--- a/src/wrappers/withMatrixClient.js
+++ b/src/wrappers/withMatrixClient.js
@@ -17,6 +17,7 @@ limitations under the License.
 
 import * as Matrix from 'matrix-js-sdk';
 import React from 'react';
+import PropTypes from 'prop-types';
 
 /**
  * Wraps a react class, pulling the MatrixClient from the context and adding it
@@ -30,7 +31,7 @@ export default function(WrappedComponent) {
         displayName: "withMatrixClient<" + WrappedComponent.displayName + ">",
 
         contextTypes: {
-            matrixClient: React.PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
+            matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired,
         },
 
         render: function() {

From 7b59774b34b18b8a3f029f9c7d811cb3aa9536cc Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 28 Dec 2017 17:08:50 +0000
Subject: [PATCH 178/927] Update comment.

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

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 2ca8589b54..37dd6b8be4 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -132,7 +132,7 @@ screenshot
 ----------
 
 Request a screenshot from the widget (if supported).
-This can only be supported by widgets that have access to all of their DOM tree.
+This can currently only be supported by widgets that have access to all of their DOM tree.
 For example, widgets that nest further levels of iframes can not support this.
 
 The screenshot is returned as a Blob object.

From 76601760793b577706016354ecd7b11a5e831143 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 28 Dec 2017 22:27:12 +0000
Subject: [PATCH 179/927] Fix comment linting errors. Stop listening and
 cleanup endpoints correctly.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 07a24cba5b..8032b9d76b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -72,8 +72,8 @@ export default React.createClass({
         const widgetPermissionId = [newProps.room.roomId, encodeURIComponent(newProps.url)].join('_');
         const hasPermissionToLoad = localStorage.getItem(widgetPermissionId);
         return {
-            initialising: true,   // True while we are mangling the widget URL
-            loading: this.props.waitForIframeLoad,        // True while the iframe content is loading
+            initialising: true, // True while we are mangling the widget URL
+            loading: this.props.waitForIframeLoad, // True while the iframe content is loading
             widgetUrl: this._addWurlParams(newProps.url),
             widgetPermissionId: widgetPermissionId,
             // Assume that widget has permission to load if we are the user who
@@ -227,8 +227,8 @@ export default React.createClass({
     },
 
     componentWillUnmount() {
-        WidgetMessaging.stopListening();
-        WidgetMessaging.removeEndpoint(this.props.id, this.props.url);
+        this.widgetMessaging.stopListening();
+        this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
         window.removeEventListener('message', this._onMessage);
     },
 

From a408b985049a7f7ce816dd423dfa60d3fa240c19 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 29 Dec 2017 14:34:52 +0000
Subject: [PATCH 180/927] Set widget ID on WidgetMessaging instance.

---
 src/WidgetMessaging.js                   | 3 ++-
 src/components/views/elements/AppTile.js | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 37dd6b8be4..7918e435cb 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -170,8 +170,9 @@ if (!global.mxWidgetMessagingMessageEndpoints) {
 }
 
 export default class WidgetMessaging extends MatrixPostMessageApi {
-    constructor(targetWindow) {
+    constructor(widgetId, targetWindow) {
         super(targetWindow);
+        this.widgetId = widgetId;
     }
 
     exec(action) {
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 8032b9d76b..2fbb30ff90 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -334,11 +334,11 @@ export default React.createClass({
      */
     _onLoaded() {
         // console.warn("App frame", this.refs.appFrame.contentWindow);
-        this.widgetMessaging = new WidgetMessaging(this.refs.appFrame.contentWindow);
+        this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
         this.widgetMessaging.getCapabilities().then((capabilities) => {
-            console.log("Got widget capabilities", this.widgetId, capabilities);
+            console.log("Got widget capabilities", this.props.id, capabilities);
             capabilities = capabilities || [];
             this.setState({capabilities});
         }).catch((err) => {

From 97918e2f1d239b4e3ce8a3247743178594b5f657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Koreck=C3=BD?= <milan.korecky@gmail.com>
Date: Sat, 30 Dec 2017 14:28:48 +0000
Subject: [PATCH 181/927] Translated using Weblate (Czech)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 860b50b8d9..5c400b791b 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -979,5 +979,22 @@
     "Claimed Ed25519 fingerprint key": "Údajný klíč s otiskem prstu Ed25519",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Tento proces vás provede importem šifrovacích klíčů, které jste si stáhli z jiného Matrix klienta. Po úspěšném naimportování budete v tomto klientovi moci dešifrovat všechny zprávy, které jste mohli dešifrovat v původním klientovi.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Stažený soubor je chráněn heslem. Soubor můžete naimportovat pouze pokud zadáte odpovídající heslo.",
-    "Tag Panel": "Připnout panel"
+    "Tag Panel": "Připnout panel",
+    "Call Failed": "Hovor selhal",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V této místnosti jsou neznámá zařízení: Pokud budete pokračovat bez jejich ověření, někdo může Váš hovor odposlouchávat.",
+    "Review Devices": "Ověřit zařízení",
+    "Call Anyway": "Přesto zavolat",
+    "Answer Anyway": "Přesto přijmout",
+    "Call": "Hovor",
+    "Answer": "Přijmout",
+    "Send": "Odeslat",
+    "Addresses": "Adresy",
+    "collapse": "sbalit",
+    "expand": "rozbalit",
+    "Cryptography data migrated": "Šifrovaná data byla převedena",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Jednorázová migrace šifrovaných údajů dokončena. E2E šifrovaní vám nebude fungovat jakmile se vrátíte ke starší verzi programu Riot. Pokud plánujete používat šifrovaní ve starší verzi Riot, doporučujeme vám se nejdříve odhlásit. Aby jste si zachovali historii šifrovaných konverzací, exportujte a znovu importujte klíče místností.",
+    "Old cryptography data detected": "Nalezeny starší šifrované datové zprávy",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nalezeny datové zprávy ze starší verze Riot. Důsledkem bude, že E2E šifrování nebude ve starší verzi Riot správně fungovat. Šifrované zprávy ze starší verze nemusí být čitelné v nové verzi. Může dojít i k selhání zasílaní zpráv s touto verzí Riot. Pokud zaznamenáte některý z uvedených problému, odhlaste se a přihlaste znovu. Pro zachování historie zpráv exportujte a znovu importujte vaše klíče.",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Zobrazit zařízení</showDevicesText> anebo <cancelText>Zrušit vše</cancelText>.",
+    "Warning": "Upozornění"
 }

From 6bbe3c420bc8db2841233505f87c1a1db0e37e41 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 1 Jan 2018 10:06:59 +0000
Subject: [PATCH 182/927] Translated using Weblate (Basque)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 4ca09d5d71..a7c0a249e1 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -142,7 +142,7 @@
     "Hangup": "Eseki",
     "Homeserver is": "Hasiera zerbitzaria:",
     "Identity Server is": "Identitate zerbitzaria:",
-    "Mobile phone number (optional)": "Mugikorraren telefono zenbakia (aukerazkoa)",
+    "Mobile phone number (optional)": "Mugikor zenbakia (aukerazkoa)",
     "Moderator": "Moderatzailea",
     "Must be viewing a room": "Gela bat ikusten egon behar da",
     "Account": "Kontua",
@@ -151,7 +151,7 @@
     "Add": "Gehitu",
     "Add a topic": "Gehitu gai bat",
     "Admin": "Kudeatzailea",
-    "Admin Tools": "Kudeaketa tresnak",
+    "Admin Tools": "Administrazio-tresnak",
     "VoIP": "VoIP",
     "Missing Media Permissions, click here to request.": "Media baimenak falta dira, egin klik eskatzeko.",
     "No Microphones detected": "Ez da mikrofonorik atzeman",
@@ -325,7 +325,7 @@
     "Message not sent due to unknown devices being present": "Ez da mezua bidali gailu ezezagunak daudelako",
     "Missing room_id in request": "Gelaren ID-a falta da eskaeran",
     "Missing user_id in request": "Erabiltzailearen ID-a falta da eskaeran",
-    "Mobile phone number": "Mugikorraren telefono zenbakia",
+    "Mobile phone number": "Mugikor zenbakia",
     "Never send encrypted messages to unverified devices in this room from this device": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gela honetan gailu honetatik",
     "New address (e.g. #foo:%(localDomain)s)": "Helbide berria (adib. #foo:%(localDomain)s)",
     "New passwords don't match": "Pasahitz berriak ez datoz bat",
@@ -806,5 +806,241 @@
     "Answer Anyway": "Erantzun hala ere",
     "Call": "Deitu",
     "Answer": "Erantzun",
-    "Who would you like to add to this community?": "Nor gehitu nahi duzu komunitate honetara?"
+    "Who would you like to add to this community?": "Nor gehitu nahi duzu komunitate honetara?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Abisua: komunitate batera gehitzen duzun edozein pertsona publikoki ikusgai egongo da komunitatearen ID-a dakien edonorentzat",
+    "Invite new community members": "Gonbidatu kide berriak komunitatera",
+    "Name or matrix ID": "Izena edo matrix ID-a",
+    "Invite to Community": "Gonbidatu komunitatera",
+    "Which rooms would you like to add to this community?": "Zeintzuk gela gehitu nahi dituzu komunitate honetara?",
+    "Show these rooms to non-members on the community page and room list?": "Erakutsi gela hauek kide ez direnei komunitatearen orrian eta gelen zerrendan?",
+    "Add rooms to the community": "Gehitu gelak komunitatera",
+    "Room name or alias": "Gelaren izena edo ezizena",
+    "Add to community": "Gehitu komunitatera",
+    "Failed to invite the following users to %(groupId)s:": "Huts egin du honako erabiltzaile hauek %(groupId)s komunitatera gonbidatzean:",
+    "Failed to invite users to community": "Huts egin du erabiltzaileak komunitatera gonbidatzean",
+    "Failed to invite users to %(groupId)s": "Huts egin du erabiltzaileak %(groupId)s komunitatera gonbidatzean",
+    "Failed to add the following rooms to %(groupId)s:": "Huts egin du honako gela hauek %(groupId)s komunitatera gehitzean:",
+    "Restricted": "Mugatua",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s erabiltzaileak gelan finkatutako mezuak aldatu ditu.",
+    "%(names)s and %(count)s others are typing|other": "%(names)s eta beste %(count)s idazten ari dira",
+    "%(names)s and %(count)s others are typing|one": "%(names)s eta beste bat idazten ari dira",
+    "Send": "Bidali",
+    "Message Pinning": "Mezuak finkatzea",
+    "Presence Management": "Presentzia-kudeaketa",
+    "Tag Panel": "Etiketen panela",
+    "Hide avatar changes": "Ezkutatu abatar aldaketak",
+    "Hide display name changes": "Ezkutatu pantaila izenen aldaketak",
+    "Disable big emoji in chat": "Desgaitu emoji handiak txatean",
+    "Mirror local video feed": "Bikoiztu tokiko bideo jarioa",
+    "Enable inline URL previews by default": "Gailu URL-en aurrebista lehenetsita",
+    "Enable URL previews for this room (only affects you)": "Gaitu URLen aurrebista gela honetan (zuretzat bakarrik aldatuko duzu)",
+    "Enable URL previews by default for participants in this room": "Gaitu URLen aurrebista lehenetsita gela honetako partaideentzat",
+    "Delete %(count)s devices|other": "Ezabatu %(count)s gailu",
+    "Delete %(count)s devices|one": "Ezabatu gailua",
+    "Select devices": "Hautatu gailuak",
+    "%(senderName)s sent an image": "%(senderName)s erabiltzaileak irudi bat bidali du",
+    "%(senderName)s sent a video": "%(senderName)s erabiltzaileak bideo bat bidali du",
+    "%(senderName)s uploaded a file": "%(senderName)s erabiltzaileak fitxategi bat bidali du",
+    "Disinvite this user?": "Kendu gonbidapena erabiltzaile honi?",
+    "Kick this user?": "Kanporatu erabiltzaile hau?",
+    "Unban this user?": "Kendu debekua erabiltzaile honi?",
+    "Ban this user?": "Debekatu erabiltzaile hau?",
+    "Mention": "Aipatu",
+    "Invite": "Gonbidatu",
+    "Jump to message": "Saltatu mezura",
+    "No pinned messages.": "Finkatutako mezurik ez.",
+    "Loading...": "Kargatzen...",
+    "Pinned Messages": "Finkatutako mezuak",
+    "%(duration)ss": "%(duration)s s",
+    "%(duration)sm": "%(duration)s m",
+    "%(duration)sh": "%(duration)s h",
+    "%(duration)sd": "%(duration)s e",
+    "Online for %(duration)s": "Konektatua %(duration)s",
+    "Offline for %(duration)s": "Deskonektatuta %(duration)s",
+    "Unknown for %(duration)s": "Ezezaguna %(duration)s",
+    "Unknown": "Ezezaguna",
+    "Unnamed room": "Izen gabeko gela",
+    "World readable": "Munduak irakurgarria",
+    "Guests can join": "Bisitariak elkartu daitezke",
+    "No rooms to show": "Ez dago gelarik erakusteko",
+    "Remove avatar": "Kendu abatarra",
+    "Drop here to favourite": "Bota hona gogoko egiteko",
+    "Drop here to tag direct chat": "Bota hona txat zuzena etiketatzeko",
+    "Drop here to restore": "Boto hona berrezartzeko",
+    "Community Invites": "Komunitate gonbidapenak",
+    "You have been kicked from this room by %(userName)s.": "Gela honetatik bota zaitu %(userName)s erabiltzaileak.",
+    "You have been banned from this room by %(userName)s.": "Gela honetatik debekatu zaitu %(userName)s erabiltzaileak.",
+    "You are trying to access a room.": "Gela bat atzitzen saiatzen ari zara.",
+    "To change the room's avatar, you must be a": "Gelaren abatara aldatzeko, hau izan behar zara:",
+    "To change the room's name, you must be a": "Gelaren izena aldatzeko, hau izan behar zara:",
+    "To change the room's main address, you must be a": "Gelaren helbide nagusia aldatzeko, hau izan behar zara:",
+    "To change the room's history visibility, you must be a": "Gelaren ikusgaitasuna aldatzeko, hau izan behar zara:",
+    "To change the permissions in the room, you must be a": "Gelaren baimenak aldatzeko, hau izan behar zara:",
+    "To change the topic, you must be a": "Gaia aldatzeko, hau izan behar zara:",
+    "To modify widgets in the room, you must be a": "Gelaren trepetak aldatzeko, hau izan behar zara:",
+    "Members only (since the point in time of selecting this option)": "Kideak besterik ez (aukera hau hautatzen den unetik)",
+    "Members only (since they were invited)": "Kideak besterik ez (gonbidatu zaienetik)",
+    "Members only (since they joined)": "Kideak besterik ez (elkartu zirenetik)",
+    "To send events of type <eventType/>, you must be a": "<eventType/> motako gertaerak bidaltzeko, hau izan behar zara:",
+    "Addresses": "Helbideak",
+    "Invalid community ID": "Komunitate ID baliogabea",
+    "'%(groupId)s' is not a valid community ID": "%(groupId)s ez da baliozko komunitate ID bat",
+    "Community Name": "Komunitatearen izena",
+    "Community ID": "Komunitate IDa",
+    "example": "adibidea",
+    "Add rooms to the community summary": "Gehitu gelak komunitatearen laburpenera",
+    "Which rooms would you like to add to this summary?": "Zeintzuk gela gehitu nahi dituzu laburpenera?",
+    "Add to summary": "Gehitu laburpenera",
+    "Add a Room": "Gehitu gela bat",
+    "The room '%(roomName)s' could not be removed from the summary.": "%(roomName)s gela ezin izan da laburpenetik kendu.",
+    "Add users to the community summary": "Gehitu erabiltzaileak komunitatearen laburpeneara",
+    "Who would you like to add to this summary?": "Nor gehitu nahi duzu laburpen honetara?",
+    "Add a User": "Gehitu erabiltzaile bat",
+    "Failed to update community": "Komunitatea eguneratzean huts egin du",
+    "Unable to accept invite": "Ezin izan da gonbidapena onartu",
+    "Unable to reject invite": "Ezin izan da gonbidapena ukatu",
+    "Leave Community": "Utzi komunitatea",
+    "Leave %(groupName)s?": "Utzi %(groupName)s?",
+    "Leave": "Utzi",
+    "Unable to leave room": "Ezin izan da gela utzi",
+    "Community Settings": "Komunitatearen ezarpenak",
+    "You are an administrator of this community": "Komunitate honen administratzailea zara",
+    "You are a member of this community": "Komunitate honetako kidea zara",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Zure komunitateak ez du deskripzio luzerik, komunitateko kideei erakusteko HTML orri bat, <br />Egin klik hemen ezarpenak ireki eta bat sortzeko!",
+    "Long Description (HTML)": "Deskripzio luzea (HTML)",
+    "Description": "Deskripzioa",
+    "Community %(groupId)s not found": "Ez da %(groupId)s komunitatea aurkitu",
+    "Cryptography data migrated": "Kriptografia datuak migratuta",
+    "Old cryptography data detected": "Kriptografia datu zaharrak atzeman dira",
+    "Your Communities": "Zure komunitateak",
+    "Create a new community": "Sortu komunitate berria",
+    "Join an existing community": "Elkartu badagoen komunitate batetara",
+    "Warning": "Abisua",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Kontuan izan %(hs)s zerbitzarira elkartu zarela, ez matrix.org.",
+    "Sign in to get started": "Hasi saioa hasteko",
+    "Notify the whole room": "Jakinarazi gela osoari",
+    "Room Notification": "Gela jakinarazpena",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Komunitatearen ID berria (adib +izena:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "URLen aurrebistak gaituta daude gela honetako partaideentzat.",
+    "URL previews are disabled by default for participants in this room.": "URLen aurrebistak desgaituta daude gela honetako partaideentzat.",
+    "Message removed": "Mezua kendu da",
+    "An email has been sent to %(emailAddress)s": "e-maila bidali da hona: %(emailAddress)s",
+    "A text message has been sent to %(msisdn)s": "Testu mezu bat bidali da hona: %(msisdn)s",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix IDa",
+    "Remove from community": "Kendu komunitatetik",
+    "Disinvite this user from community?": "Desgonbidatu erabiltzailea komunitatetik?",
+    "Remove this user from community?": "Kendu erabiltzailea komunitatetik?",
+    "Failed to withdraw invitation": "Huts egin du gonbidapena indargabetzean",
+    "Failed to remove user from community": "Huts egin du erabiltzailea komunitatetik kentzean",
+    "Filter community members": "Iragazi komunitateko kideak",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Ziur '%(roomName)s' kendu nahi duzula %(groupId)s komunitatetik?",
+    "Removing a room from the community will also remove it from the community page.": "Gela bat komunitate batetik kentzean komunitatearen orritik kenduko da ere.",
+    "Failed to remove room from community": "Huts egin du gela komunitatetik kentzean",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Huts egin du '%(roomName)s' %(groupId)s komunitatetik kentzean",
+    "Jump to read receipt": "Saltatu irakurragirira",
+    "Username on %(hs)s": "%(hs)s(e)ko erabiltzaile izena",
+    "was banned %(count)s times|one": "debekatua izan da",
+    "were invited %(count)s times|other": "%(count)s aldiz gonbidatuak izan dira",
+    "were invited %(count)s times|one": "gonbidatuak izan dira",
+    "was invited %(count)s times|other": "%(count)s aldiz gonbidatua izan da",
+    "was invited %(count)s times|one": "gonbidatua izan da",
+    "were banned %(count)s times|other": "%(count)s aldiz debekatuak izan dira",
+    "were banned %(count)s times|one": "debekatuak izan dira",
+    "was banned %(count)s times|other": "%(count)s aldi debekatuak izan dira",
+    "were unbanned %(count)s times|other": "%(count)s aldiz kendu zaie debekua",
+    "were unbanned %(count)s times|one": "debekua kendu zaie",
+    "was unbanned %(count)s times|other": "%(count)s aldiz kendu zaio debekua",
+    "was unbanned %(count)s times|one": "debekua kendu zaio",
+    "were kicked %(count)s times|other": "%(count)s kanporatu zaie",
+    "were kicked %(count)s times|one": "kanporatu zaie",
+    "was kicked %(count)s times|other": "%(count)s aldiz kanporatu zaio",
+    "was kicked %(count)s times|one": "kanporatu zaio",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s erabiltzaileek bere izena aldatu dute %(count)s aldiz",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s erabiltzaileek bere izena aldatu dute",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s erabiltzaileak bere izena aldatu du %(count)s aldiz",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s erabiltzaileak bere izena aldatu du",
+    "collapse": "tolestu",
+    "expand": "hedatu",
+    "And %(count)s more...|other": "Eta %(count)s gehiago...",
+    "Matrix ID": "Matrix IDa",
+    "Matrix Room ID": "Matrix gela IDa",
+    "email address": "e-mail helbidea",
+    "You have entered an invalid address.": "E-mail helbide baliogabea sartu duzu.",
+    "Something went wrong whilst creating your community": "Zerbait ez da behar bezala joan zure komunitatea sortzean",
+    "Create Community": "Sortu komunitatea",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Zure komunitate orriaren HTMLa</h1>\n<p>\n    Erabili deskripzio luzea kide berriei komunitatea aurkezteko edo <a href=\"foo\">esteka</a> garrantzitsuetarako\n</p>\n<p>\n    'img' etiketak ere erabili ditzakezu\n</p>\n",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Huts egin du honako gela hauek %(groupId)s komunitatearen laburpenera gehitzean:",
+    "Failed to remove the room from the summary of %(groupId)s": "Huts egin du gela %(groupId)s komunitatearen laburpenetik kentzean",
+    "Failed to add the following users to the summary of %(groupId)s:": "Huts egin du honako erabiltzaile hauek %(groupId)s komunitatearen laburpenera gehitzean:",
+    "Failed to remove a user from the summary of %(groupId)s": "Huts egin du erabiltzaile bat %(groupId)s komunitatearen laburpenetik kentzean",
+    "The user '%(displayName)s' could not be removed from the summary.": "'%(displayName)s' erabiltzailea ezin izan da laburpenetik kendu.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Gela hauek komunitateko kideei erakusten zaie komunitatearen orrian. komunitateko kideak geletara sartu daitezke hauetan klik eginez.",
+    "%(inviter)s has invited you to join this community": "%(inviter)s erabiltzaileak komunitate honetara elkartzera gonbidatu zaitu",
+    "This Home server does not support communities": "Hasiera zerbitzari honek ez ditu komunitateak onartzen",
+    "Failed to load %(groupId)s": "Huts egin du %(groupId)s kargatzean",
+    "Communities": "Komunitateak",
+    "Error whilst fetching joined communities": "Errorea elkartutako komunitateak eskuratzean",
+    "Idle for %(duration)s": "Inaktibo %(duration)s",
+    "Drop here to demote": "Bota hona beheratzeko",
+    "Flair": "Ikurra",
+    "Showing flair for these communities:": "Komunitate hauetako ikurrak erakusten:",
+    "This room is not showing flair for any communities": "Gela honek ez du komunitate ikurrik erakusten",
+    "Flair will appear if enabled in room settings": "Ikurra agertuko da gelaren ezarpenetan gaituta badago",
+    "Flair will not appear": "Ikurra ez da agertuko",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Ezin izan da aldatu '%(roomName)s' gelaren ikusgaitasuna '%(groupId)s' komunitatean.",
+    "Visibility in Room List": "Ikusgaitasuna gelaren zerrendan",
+    "Visible to everyone": "Edonorentzat ikusgai",
+    "Only visible to community members": "Komunitateko kideentzat ikusgai",
+    "Filter community rooms": "Iragazi komunitateko gelak",
+    "Something went wrong when trying to get your communities.": "Zerbait ez da behar bezala joan zure komunitateak eskuratzea saiatzean.",
+    "Display your community flair in rooms configured to show it.": "Zure komunitate ikurrak bistaratu erakusteko konfiguratuta dauden gelatan.",
+    "You're not currently a member of any communities.": "Ez zara inolako komunitateko kide.",
+    "Delete Widget": "Ezabatu trepeta",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Trepeta ezabatzean gelako kide guztientzat kentzen da. Ziur trepeta ezabatu nahi duzula?",
+    "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s %(count)s aldiz elkartu dira",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s elkartu da",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s%(count)s aldiz elkartu da",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s elkartu da",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s%(count)s aldiz atera dira",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s atera da",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s%(count)s aldiz atera da",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s atera da",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s elkartu eta atera dira %(count)s aldiz",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s elkartu eta atera da",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s elkartu eta atera da %(count)s aldiz",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s elkartu eta atera da",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s atera eta berriz elkartu da %(count)s aldiz",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s atera eta berriz elkartu da",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s atera eta berriz elkartu da %(count)s aldiz",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s atera eta berriz elkartu da",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s erabiltzaileek bere gonbidapenak ukatu dituzte %(count)s aldiz",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s erabiltzaileek bere gonbidapenak ukatu dituzte",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s erabiltzaileak bere gonbidapena ukatu du %(count)s aldiz",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s erabiltzaileak bere gonbidapena ukatu du",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s erabiltzaileei gonbidapena indargabetu zaie %(count)s aldiz",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s erabiltzaileei gonbidapena indargabetu zaie",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s erabiltzaileari gonbidapena indargabetu zaio %(count)s aldiz",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s erabiltzaileari gonbidapena indargabetu zaio",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s erabiltzaileek bere abatarra aldatu dute %(count)s aldiz",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s erabiltzaileek bere abatarra aldatu dute",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s erabiltzaileak bere abatarra aldatu du %(count)s aldiz",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s erabiltzaileak bere abatarra aldatu du",
+    "%(items)s and %(count)s others|other": "%(items)s eta beste %(count)s",
+    "%(items)s and %(count)s others|one": "%(items)s eta beste bat",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Saiatu baliozko helbide mota hauetako bat erabiltzen: %(validTypesList)s.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Komunitate IDak a-z, 0-9, edo '=_-./' karaktereak besterik ez ditu onartzen",
+    "Custom of %(powerLevel)s": "%(powerLevel)s pertsonalizatua",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Kriptografia datuen migrazio bat egon da. Muturretik muturrerako zifratzeak ez du funtzionatuko Riot bertsio zaharrago bat erabiltzen baduzu. Muturretik muturrerako zifratzea erabili behar baduzu bertsio zaharrago batean amaitu saioa Rioten lehenbizi. Mezuen historiala gordetzeko esportatu eta berriro inportatu zure gakoak.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du <i>+adibidea:matrix.org</i>.",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText> edo <cancelText>baztertu guztia</cancelText>.",
+    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Birbidali guztia</resendText> edo <cancelText>baztertu guztia</cancelText> orain. Banakako mezuak aukeratu ditzakezu ere birbidali edo baztertzeko.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
+    "Light theme": "Gai argia",
+    "Dark theme": "Gai iluna",
+    "Status.im theme": "Status.im gaia",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s helbidera e-mail bat bidali da. Behin dakarren esteka jarraituta, egin klik behean.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Hasiera zerbitzari honek ez du bezero honek onartzen duen fluxurik eskaintzen."
 }

From 875eb3d34f6bc96830b2790c761ce683f4d2b35a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 1 Jan 2018 21:15:26 +0000
Subject: [PATCH 183/927] Hide status bar on visible->hidden transition

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

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 77d506d9af..cf3f392a7e 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -169,8 +169,10 @@ module.exports = React.createClass({
 
     // Check whether current size is greater than 0, if yes call props.onVisible
     _checkSize: function() {
-        if (this.props.onVisible && this._getSize()) {
-            this.props.onVisible();
+        if (this._getSize()) {
+            if (this.props.onVisible) this.props.onVisible();
+        } else {
+            if (this.props.onHidden) this.props.onHidden();
         }
     },
 

From 3947a72d1b1380bea77d3cbaaad3e23690476161 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 10:22:34 +0000
Subject: [PATCH 184/927] Fix to allow subsequent group profile requests if one
 fails

Also, delete the groupProfilePromise immediately after setting
the group profile (the first if-statement will prevent a new
request from being started).
---
 src/stores/FlairStore.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index e9e84e9aa1..7ffa1a4c30 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -157,17 +157,25 @@ class FlairStore {
             this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId);
         }
 
-        const profile = await this._groupProfilesPromise[groupId];
+        let profile;
+        try {
+            profile = await this._groupProfilesPromise[groupId];
+        } catch (e) {
+            // Don't retry, but allow a retry when the profile is next requested
+            delete this._groupProfilesPromise[groupId];
+            return;
+        }
+
         this._groupProfiles[groupId] = {
             groupId,
             avatarUrl: profile.avatar_url,
             name: profile.name,
             shortDescription: profile.short_description,
         };
+        delete this._groupProfilesPromise[groupId];
 
         setTimeout(() => {
             delete this._groupProfiles[groupId];
-            delete this._groupProfilesPromise[groupId];
         }, GROUP_PROFILES_CACHE_BUST_MS);
 
         return this._groupProfiles[groupId];

From 80f11e5c77f91c676ca7b3ef1e29910d0db1519b Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 13:34:47 +0000
Subject: [PATCH 185/927] Comment tag PropType

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

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 9bad02e37d..b5dfce72c0 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -28,6 +28,7 @@ export default React.createClass({
     displayName: 'TagTile',
 
     propTypes: {
+        // A string tag such as "m.favourite" or a group ID such as "+groupid:domain.bla"
         tag: PropTypes.string,
     },
 

From 3cb128094d42703cfea68656fc5021d022a2ab49 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 13:44:22 +0000
Subject: [PATCH 186/927] Add more comments to TagTile to explain what it is

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

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index b5dfce72c0..a8d4e514ae 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -24,11 +24,17 @@ import { isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
 
 import FlairStore from '../../../stores/FlairStore';
 
+// A class for a child of TagPanel (possibly wrapped in a DNDTagTile) that represents
+// a thing to click on for the user to filter the visible rooms in the RoomList to:
+//  - Rooms that are part of the group
+//  - Direct messages with members of the group
+// with the intention that this could be expanded to arbitrary tags in future.
 export default React.createClass({
     displayName: 'TagTile',
 
     propTypes: {
         // A string tag such as "m.favourite" or a group ID such as "+groupid:domain.bla"
+        // For now, only group IDs are handled.
         tag: PropTypes.string,
     },
 

From 2cb4c897ce55a7e113b58ec803b022e093158a2e Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 13:45:19 +0000
Subject: [PATCH 187/927] Move `getInitialState` before `componentWillMount`

---
 src/components/views/elements/TagTile.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index a8d4e514ae..7bb047504e 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -42,6 +42,12 @@ export default React.createClass({
         matrixClient: React.PropTypes.instanceOf(MatrixClient).isRequired,
     },
 
+    getInitialState() {
+        return {
+            hover: false,
+        };
+    },
+
     componentWillMount() {
         this.unmounted = false;
         if (this.props.tag[0] === '+') {
@@ -59,12 +65,6 @@ export default React.createClass({
         this.unmounted = true;
     },
 
-    getInitialState() {
-        return {
-            hover: false,
-        };
-    },
-
     onClick: function(e) {
         e.preventDefault();
         e.stopPropagation();

From 31855f18f8c2ee380052ac23e8a486987f767455 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 15:56:32 +0000
Subject: [PATCH 188/927] Initialise profile state

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

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 7bb047504e..057ec4921b 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -45,6 +45,7 @@ export default React.createClass({
     getInitialState() {
         return {
             hover: false,
+            profile: null,
         };
     },
 

From 833cd321f3d3519f73b4c7b23a1bee006fd532bf Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 15:58:24 +0000
Subject: [PATCH 189/927] Log warning in case of failed group profile fetch

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

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 057ec4921b..00aea1efd3 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -58,6 +58,8 @@ export default React.createClass({
             ).then((profile) => {
                 if (this.unmounted) return;
                 this.setState({profile});
+            }).catch((err) => {
+                console.warn('Could not fetch group profile for ' + this.props.tag, err);
             });
         }
     },

From 133837cdbed146b0b2adec13f739aed2f67adbe9 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 15:59:10 +0000
Subject: [PATCH 190/927] Document initial state

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

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 00aea1efd3..eb9a5cbdd9 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -44,7 +44,9 @@ export default React.createClass({
 
     getInitialState() {
         return {
+            // Whether the mouse is over the tile
             hover: false,
+            // The profile data of the group if this.props.tag is a group ID
             profile: null,
         };
     },

From 45e860de7a8c91d41e9d3a81656d91c2aad03a03 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 18:12:08 +0000
Subject: [PATCH 191/927] Document GroupStore.registerListener

---
 src/stores/GroupStore.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 483eed96a5..9dce15fb53 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -103,6 +103,22 @@ export default class GroupStore extends EventEmitter {
         this.emit('update');
     }
 
+    /**
+     * Register a listener to recieve updates from the store. This also
+     * immediately triggers an update to send the current state of the
+     * store (which could be the initial state).
+     *
+     * XXX: This also causes a fetch of all group data, which effectively
+     * causes 4 separate HTTP requests. This is bad, we should at least
+     * deduplicate these in order to fix:
+     *  https://github.com/vector-im/riot-web/issues/5901
+     *
+     * @param {function} fn the function to call when the store updates.
+     * @return {Object} tok a registration "token" with a single
+     *                      property `unregister`, a function that can
+     *                      be called to unregister the listener such
+     *                      that it won't be called any more.
+     */
     registerListener(fn) {
         this.on('update', fn);
         // Call to set initial state (before fetching starts)
@@ -111,6 +127,8 @@ export default class GroupStore extends EventEmitter {
         this._fetchRooms();
         this._fetchMembers();
 
+        // Similar to the Store of flux/utils, we return a "token" that
+        // can be used to unregister the listener.
         return {
             unregister: () => {
                 this.unregisterListener(fn);

From 479e88cff7dbd39a5859a908e078482681dabb27 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 18:55:50 +0000
Subject: [PATCH 192/927] Log an error to get group profile data

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

diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 7ffa1a4c30..7a3aa31e4e 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -161,6 +161,7 @@ class FlairStore {
         try {
             profile = await this._groupProfilesPromise[groupId];
         } catch (e) {
+            console.log('Failed to get group profile for ' + groupId, e);
             // Don't retry, but allow a retry when the profile is next requested
             delete this._groupProfilesPromise[groupId];
             return;

From fb76d5fa522454af718504bfaf34e60b1175e1d8 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 1 Jan 2018 10:35:57 +0000
Subject: [PATCH 193/927] Translated using Weblate (Basque)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index a7c0a249e1..304c415e14 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -168,7 +168,7 @@
     "An email has been sent to": "E-mail bat bidali da hona:",
     "An error has occurred.": "Errore bat gertatu da.",
     "Are you sure?": "Ziur zaude?",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Ziur '%(roomName)s' gela utzi nahi duzula?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Ziur '%(roomName)s' gelatik atera nahi duzula?",
     "Are you sure you want to reject the invitation?": "Ziur gonbidapena baztertu nahi duzula?",
     "Are you sure you want to upload the following files?": "Ziur hurrengo fitxategiak igo nahi dituzula?",
     "Attachment": "Eranskina",
@@ -741,7 +741,7 @@
     "Edit": "Editatu",
     "Enable automatic language detection for syntax highlighting": "Gaitu hizkuntza antzemate automatikoa sintaxia nabarmentzeko",
     "Hide Apps": "Ezkutatu aplikazioak",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Ezkutatu elkartze/irtete mezuak (gonbidapenak/ateratzeak/debekuak ez dira aldatzen)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Ezkutatu elkartze/ateratze mezuak (gonbidapenak/kanporatzeak/debekuak ez dira aldatzen)",
     "Hide avatar and display name changes": "Ezkutatu abatarra eta pantaila-izen aldaketak",
     "Integrations Error": "Integrazio errorea",
     "Publish this room to the public in %(domain)s's room directory?": "Argitaratu gela hau publikora %(domain)s domeinuko gelen direktorioan?",
@@ -868,7 +868,7 @@
     "Drop here to tag direct chat": "Bota hona txat zuzena etiketatzeko",
     "Drop here to restore": "Boto hona berrezartzeko",
     "Community Invites": "Komunitate gonbidapenak",
-    "You have been kicked from this room by %(userName)s.": "Gela honetatik bota zaitu %(userName)s erabiltzaileak.",
+    "You have been kicked from this room by %(userName)s.": "Gela honetatik kanporatu zaitu %(userName)s erabiltzaileak.",
     "You have been banned from this room by %(userName)s.": "Gela honetatik debekatu zaitu %(userName)s erabiltzaileak.",
     "You are trying to access a room.": "Gela bat atzitzen saiatzen ari zara.",
     "To change the room's avatar, you must be a": "Gelaren abatara aldatzeko, hau izan behar zara:",
@@ -899,10 +899,10 @@
     "Failed to update community": "Komunitatea eguneratzean huts egin du",
     "Unable to accept invite": "Ezin izan da gonbidapena onartu",
     "Unable to reject invite": "Ezin izan da gonbidapena ukatu",
-    "Leave Community": "Utzi komunitatea",
-    "Leave %(groupName)s?": "Utzi %(groupName)s?",
-    "Leave": "Utzi",
-    "Unable to leave room": "Ezin izan da gela utzi",
+    "Leave Community": "Atera komunitatetik",
+    "Leave %(groupName)s?": "Atera %(groupName)s komunitatetik?",
+    "Leave": "Atera",
+    "Unable to leave room": "Ezin izan da gelatik atera",
     "Community Settings": "Komunitatearen ezarpenak",
     "You are an administrator of this community": "Komunitate honen administratzailea zara",
     "You are a member of this community": "Komunitate honetako kidea zara",

From 2eafdff2c1d5e8dc445fb96ba595da22685da261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20Koreck=C3=BD?= <milan.korecky@gmail.com>
Date: Sat, 30 Dec 2017 14:36:22 +0000
Subject: [PATCH 194/927] Translated using Weblate (Czech)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 5c400b791b..662f79e620 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -334,7 +334,7 @@
     "Success": "Úspěch",
     "The main address for this room is": "Hlavní adresa této místnosti je",
     "The phone number entered looks invalid": "Zadané telefonní číslo se zdá být neplatné",
-    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Zadaný podepisovací klíč se shoduje s klíčem obdrženým od uživatele %(userId)s ze zařízení %(deviceId)s. Zařízení je označeno jako ověřené.",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Zadaný podepisovaný klíč se shoduje s klíčem obdrženým od uživatele %(userId)s ze zařízení %(deviceId)s. Zařízení je označeno jako ověřené.",
     "This email address is already in use": "Tato e-mailová adresa je již používaná",
     "This email address was not found": "Tato e-mailová adresa nebyla nalezena",
     "%(actionVerb)s this person?": "%(actionVerb)s tuto osobu?",
@@ -368,7 +368,7 @@
     "Offline": "Offline",
     "Updates": "Aktualizace",
     "Check for update": "Zkontrolovat aktualizace",
-    "Start chatting": "Začít chatovat",
+    "Start chatting": "Zahájit rozhovor",
     "Start Chatting": "Začít chatovat",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Textová zpráva byla odeslána na +%(msisdn)s. Prosím vložte ověřovací kód z dané zprávy",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijal/a pozvánku pro %(displayName)s.",
@@ -524,7 +524,7 @@
     "Delete Widget": "Smazat widget",
     "Error decrypting image": "Chyba při dešifrování obrázku",
     "Image '%(Body)s' cannot be displayed.": "Obrázek '%(Body)s' nemůže být zobrazen.",
-    "This image cannot be displayed.": "Tento obrázek nemůže být zobrazen.",
+    "This image cannot be displayed.": "Tento obrázek nelze zobrazit.",
     "Error decrypting video": "Chyba při dešifrování videa",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s odstranil/a avatar místnosti.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s změnil/a avatar místnosti na <img/>",
@@ -653,7 +653,7 @@
     "Drop here to favourite": "Oblibte přetažením zde",
     "Drop here to tag direct chat": "Přímý chat oštítkujte přetažením zde",
     "Drop here to restore": "Obnovte přetažením zde",
-    "Drop here to demote": "Upozaďte přetažením zde",
+    "Drop here to demote": "Přetažením zde přesunete do pozadí",
     "Community Invites": "Komunitní pozvánky",
     "You have been kicked from this room by %(userName)s.": "%(userName)s vás vykopl/a z této místnosti.",
     "You have been banned from this room by %(userName)s.": "%(userName)s vás vykázal/a z této místnosti.",
@@ -760,7 +760,7 @@
     "Only visible to community members": "Zobrazuje se pouze pro členy skupiny",
     "Filter community rooms": "Filtrovat místnosti skupiny",
     "Something went wrong when trying to get your communities.": "Při pokusu o nahrání vašich skupin se něco pokazilo.",
-    "Display your community flair in rooms configured to show it.": "Zobrazit zájmy skupiny v místnostech s povolených zobrazováním.",
+    "Display your community flair in rooms configured to show it.": "Zobrazit zájmy skupiny v místnostech s povoleným zobrazováním.",
     "You're not currently a member of any communities.": "V současnosti nejste členem žádné skupiny.",
     "Unknown Address": "Neznámá adresa",
     "NOTE: Apps are not end-to-end encrypted": "VAROVÁNÍ: Aplikace nejsou end-to-end šifrované",
@@ -933,7 +933,7 @@
     "Light theme": "Světlý motiv",
     "Dark theme": "Tmavý motiv",
     "Status.im theme": "Status.im motivu",
-    "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.": "S cílem posílit zabezpečení se všechny E2E šifrovací klíče při odhlášení odstraní z tohoto prohlížeče. Pokud chcete dostupnou historii šifrovaných konverzací i při opětovném přihlášení, prosím stáhněte si a bezpečně uložte klíče vašich místností.",
+    "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.": "S cílem posílit zabezpečení se všechny end-to-end šifrovací klíče při odhlášení odstraní z tohoto prohlížeče. Pokud chcete dostupnou historii šifrovaných konverzací i při opětovném přihlášení, prosím stáhněte si a bezpečně uložte klíče vašich místností.",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Vaše heslo bylo úspěšně změněno. Na ostatních zařízeních se vám již nebudou zobrazovat okamžitá oznámení do té chvíle než se na nich znovu přihlásíte",
     "Remove Contact Information?": "Odstranit kontaktní informace?",
     "Remove %(threePid)s?": "Odstranit %(threePid)s?",

From 4c00f3f59c40f43a039d140c029d4f89f788f7ae Mon Sep 17 00:00:00 2001
From: Joachim Nielandt <joachim.nielandt@gmail.com>
Date: Fri, 22 Dec 2017 19:01:53 +0000
Subject: [PATCH 195/927] Translated using Weblate (Dutch)

Currently translated at 75.6% (725 of 958 strings)

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

room wordt momenteel meestal vertaald in 'ruimte'. Ik weet niet of dat de beste vertaling is, maar om consistent te zijn kunnen we misschien best 1 keuze maken en evt achteraf nog wijzigen.
---
 src/i18n/strings/nl.json | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index ac41825e58..f04bd7747d 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -44,9 +44,9 @@
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de kamernaam van %(roomName)s gewijzigd.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar \"%(topic)s\".",
-    "Changes to who can read history will only apply to future messages in this room": "Veranderingen aan wie de geschiedenis kan lezen worden alleen maar toegepast op toekomstige berichten in deze kamer",
+    "Changes to who can read history will only apply to future messages in this room": "Veranderingen aan wie de geschiedenis kan lezen worden alleen maar toegepast op toekomstige berichten in deze ruimte",
     "Changes your display nickname": "Verandert jouw weergavenaam",
-    "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.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde chat geschiedenis onleesbaar zou maken, behalve als je eerst je kamer sleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
+    "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.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde chat geschiedenis onleesbaar zou maken, behalve als je eerst je ruimtesleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
     "Clear Cache and Reload": "Legen cache en herlaad",
     "Clear Cache": "Legen cache",
     "Click here to fix": "Klik hier om op te lossen",
@@ -89,7 +89,7 @@
     "<a>Click here</a> to join the discussion!": "<a>Klik hier</a> om mee te doen aan de discussie!",
     "Close": "Sluiten",
     "%(count)s new messages|one": "%(count)s nieuw bericht",
-    "Create new room": "Een nieuwe kamer maken",
+    "Create new room": "Een nieuwe ruimte maken",
     "Custom Server Options": "Aangepaste serverinstellingen",
     "Dismiss": "Afwijzen",
     "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen",
@@ -186,7 +186,7 @@
     "Current password": "Huidig wachtwoord",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de naam van de ruimte verwijderd.",
     "Create a new chat or reuse an existing one": "Maak een nieuwe chat aan of ga verder met een bestaande",
-    "Create Room": "Maak een kamer aan",
+    "Create Room": "Maak een ruimte aan",
     "Curve25519 identity key": "Curve25519-identiteitssleutel",
     "/ddg is not a command": "/ddg is geen commando",
     "Deactivate Account": "Account Deactiveren",
@@ -341,7 +341,7 @@
     "New address (e.g. #foo:%(localDomain)s)": "Nieuw adres (bijv. #foo:%(localDomain)s)",
     "New passwords don't match": "Nieuwe wachtwoorden komen niet overeen",
     "New passwords must match each other.": "Nieuwe wachtwoorden moeten overeenkomen.",
-    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Zodra versleuteling in een kamer is ingeschakeld kan het niet meer worden uitgeschakeld (voor nu)",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Zodra versleuteling in een ruimte is ingeschakeld kan het niet meer worden uitgeschakeld (kan later wijzigen)",
     "Once you've followed the link it contains, click below": "Zodra je de link dat het bevat hebt gevolgd, klik hieronder",
     "Only people who have been invited": "Alleen personen die zijn uitgenodigd",
     "Otherwise, <a>click here</a> to send a bug report.": "Klik anders <a>hier</a> om een foutmelding te versturen.",
@@ -795,5 +795,20 @@
     "Invite to Community": "Nodig uit in deze community",
     "Show these rooms to non-members on the community page and room list?": "Toon deze ruimtes aan niet-leden op de community pagina en lijst van ruimtes?",
     "Add rooms to the community": "Voeg ruimtes toe aan de community",
-    "Room name or alias": "Ruimte naam of alias"
+    "Room name or alias": "Ruimte naam of alias",
+    "Add to community": "Voeg toe aan community",
+    "Failed to invite the following users to %(groupId)s:": "Inviteren gefaald van de volgende gebruikers in %(groupId)s:",
+    "Failed to invite users to community": "Uitnodigen van gebruikers in community mislukt",
+    "Failed to invite users to %(groupId)s": "Niet gelukt om gebruikers uit te nodigen in %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Niet gelukt om de volgende ruimtes toe te voegen aan %(groupId)s:",
+    "Restricted": "Beperkte toegang",
+    "Ignored user": "Genegeerde gebruiker",
+    "You are now ignoring %(userId)s": "Je bent nu %(userId)s aan het negeren",
+    "Unignored user": "Niet genegeerde gebruiker",
+    "You are no longer ignoring %(userId)s": "Je bent %(userId)s niet meer aan het negeren",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s heeft de gepinde boodschappen voor de ruimte gewijzigd.",
+    "%(names)s and %(count)s others are typing|other": "%(names)s en %(count)s andere gebruikers zijn aan het typen",
+    "%(names)s and %(count)s others are typing|one": "%(names)s en iemand anders is aan het typen",
+    "Send": "Verstuur",
+    "Message Pinning": "Boodschap vastpinnen"
 }

From c2cc0ffa1c4e92e010b51b6e8a90eff075ad3115 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 20 Dec 2017 16:42:19 +0000
Subject: [PATCH 196/927] Translated using Weblate (Esperanto)

Currently translated at 99.3% (952 of 958 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index e464a991b7..7511594b4d 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -179,7 +179,7 @@
     "Always show message timestamps": "Ĉiam montri mesaĝajn tempindikojn",
     "Autoplay GIFs and videos": "Aŭtomate ludi GIF-bildojn kaj videojn",
     "Call Failed": "Voko malsukcesis",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "En la ĉambro estas nekonataj aparatoj. Se vi pluigos sen ilia kontrolo, iu povos subaŭskulti vian vokon.",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "En la ĉambro estas nekonataj aparatoj. Se vi daŭrigos ne kontrolinte ilin, iu povos subaŭskulti vian vokon.",
     "Review Devices": "Kontroli aparatojn",
     "Call Anyway": "Tamen voki",
     "Answer Anyway": "Tamen respondi",

From 7d2a637bd989773ad3dd8db60372f08a4577616f Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Thu, 28 Dec 2017 06:51:04 +0000
Subject: [PATCH 197/927] Translated using Weblate (Galician)

Currently translated at 24.6% (236 of 958 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index c3a103c4e5..4800e9e34e 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -14,5 +14,225 @@
     "Warning!": "Aviso!",
     "Conference calling is in development and may not be reliable.": "As chamadas de Reunión poderían non ser totalmente estables xa que están en desenvolvemento.",
     "Failed to set up conference call": "Fallo ao establecer a chamada de reunión",
-    "Conference call failed.": "Fallo na chamada de reunión."
+    "Conference call failed.": "Fallo na chamada de reunión.",
+    "Call Failed": "Fallou a chamada",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hai dispositivos descoñecidos en esta sala: si sigue adiante sen verificalos, pode ser posible que alguén bote un ollo a súa chamada.",
+    "Review Devices": "Revisar dispositivos",
+    "Call Anyway": "Chamar igualmente",
+    "Answer Anyway": "Respostar igualmente",
+    "Call": "Chamar",
+    "Answer": "Respostar",
+    "Call Timeout": "Finou a chamada",
+    "The file '%(fileName)s' failed to upload": "O ficheiro '%(fileName)s' non se puido subir",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "O ficheiro '%(fileName)s' excede o límite establecido polo servidor para subidas",
+    "Upload Failed": "Fallou a subida",
+    "Sun": "Dom",
+    "Mon": "Lun",
+    "Tue": "Mar",
+    "Wed": "Mér",
+    "Thu": "Xov",
+    "Fri": "Ven",
+    "Sat": "Sáb",
+    "Jan": "Xan",
+    "Feb": "Feb",
+    "Mar": "Mar",
+    "Apr": "Abr",
+    "May": "Mai",
+    "Jun": "Xuñ",
+    "Jul": "Xul",
+    "Aug": "Ago",
+    "Sep": "Set",
+    "Oct": "Out",
+    "Nov": "Nov",
+    "Dec": "Dec",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
+    "Who would you like to add to this community?": "A quén lle gustaría engadir a esta comunidade?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: calquer persoa que vostede engada a unha comunidade será públicamente visible para calquera que coñeza o ID da comunidade",
+    "Invite new community members": "Convidar a novos membros da comunidade",
+    "Name or matrix ID": "Nome ou ID matrix",
+    "Invite to Community": "Convide a comunidade",
+    "Which rooms would you like to add to this community?": "Qué salas desexaría engadir a esta comunidade?",
+    "Show these rooms to non-members on the community page and room list?": "Mostrar estas salas a non-membros na páxina da comunidade e lista de salas?",
+    "Add rooms to the community": "Engadir salas a comunidade",
+    "Room name or alias": "Nome da sala ou alcume",
+    "Add to community": "Engadir a comunidade",
+    "Failed to invite the following users to %(groupId)s:": "Fallo ao convidar as seguintes usuarias a %(groupId)s:",
+    "Failed to invite users to community": "Fallou o convite de usuarias a comunidade",
+    "Failed to invite users to %(groupId)s": "Fallou o convite de usuarias a %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Fallo ao engadir as seguintes salas a %(groupId)s:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ten permiso para enviarlle notificacións - por favor comprobe os axustes do navegador",
+    "Riot was not given permission to send notifications - please try again": "Riot non ten permiso para enviar notificacións - inténteo de novo",
+    "Unable to enable Notifications": "Non se puideron habilitar as notificacións",
+    "This email address was not found": "Non se atopou este enderezo de correo",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "O seu enderezo de correo semella non estar asociado a un ID Matrix en este servidor.",
+    "Default": "Por omisión",
+    "Restricted": "Restrinxido",
+    "Moderator": "Moderador",
+    "Admin": "Administrador",
+    "Start a chat": "Iniciar unha conversa",
+    "Who would you like to communicate with?": "Con quén desexa comunicarse?",
+    "Email, name or matrix ID": "Correo, nome ou ID matrix",
+    "Start Chat": "Iniciar conversa",
+    "Invite new room members": "Convidar a sala a novos membros",
+    "Who would you like to add to this room?": "A quén desexaría engadir a esta sala?",
+    "Send Invites": "Enviar convites",
+    "Failed to invite user": "Fallo ao convidar usuaria",
+    "Operation failed": "Fallou a operación",
+    "Failed to invite": "Fallou o convite",
+    "Failed to invite the following users to the %(roomName)s room:": "Non se puideron convidar as seguintes usuarias a sala %(roomName)s:",
+    "You need to be logged in.": "Precisa estar conectada.",
+    "You need to be able to invite users to do that.": "Vostede precisa estar autorizada a convidar usuarias para facer iso.",
+    "Unable to create widget.": "Non se puido crear o widget.",
+    "Failed to send request.": "Fallo ao enviar a petición.",
+    "This room is not recognised.": "Non se recoñece esta sala.",
+    "Power level must be positive integer.": "O nivel de poder ten que ser un enteiro positivo.",
+    "You are not in this room.": "Vostede non está en esta sala.",
+    "You do not have permission to do that in this room.": "Non ten permiso para facer eso en esta sala.",
+    "Missing room_id in request": "Falta o room_id na petición",
+    "Must be viewing a room": "Debería estar vendo unha sala",
+    "Room %(roomId)s not visible": "A sala %(roomId)s non é visible",
+    "Missing user_id in request": "Falata o user_id na petición",
+    "Usage": "Uso",
+    "/ddg is not a command": "/ddg non é unha orde",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Para  utilizala, agarde que carguen os resultados de autocompletado e escolla entre eles.",
+    "Unrecognised room alias:": "Alcumes de sala non recoñecidos:",
+    "Ignored user": "Usuaria ignorada",
+    "You are now ignoring %(userId)s": "Agora está a ignorar %(userId)s",
+    "Unignored user": "Usuarias non ignorada",
+    "You are no longer ignoring %(userId)s": "Xa non está a ignorar a %(userId)s",
+    "Unknown (user, device) pair:": "Parella descoñecida (dispositivo, usuaria):",
+    "Device already verified!": "Dispositivo xa verificado!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "AVISO: o dispositivo xa está verificado, que as chaves NON CONCORDAN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVISO: FALLOU A VERIFICACIÓN DE CHAVES! A chave de firma para %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\" que non concorda coa chave proporcionada \"%(fingerprint)s\". Esto podería significar que as súas comunicacións están a ser interceptadas!",
+    "Verified key": "Chave verificada",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "A chave de firma que proporcionou concorda coa chave de firma que recibeu do dispositivo %(deviceId)s de %(userId)s. Dispositivo marcado como verificado.",
+    "Unrecognised command:": "Orde non recoñecida:",
+    "Reason": "Razón",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s aceptou o convite para %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s aceptou o convite.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitou unha conferencia VoIP.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou a %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s bloqueou a %(targetName)s.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s mudou o seu nome público de %(oldDisplayName)s a %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableceu o seu nome público a %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminou o seu nome público (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s eliminou a súa imaxe de perfil.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s cambiou a súa imaxe de perfil.",
+    "%(senderName)s set a profile picture.": "%(senderName)s estableceu a imaxe de perfil.",
+    "VoIP conference started.": "Comezou a conferencia VoIP.",
+    "%(targetName)s joined the room.": "%(targetName)s uneuse a sala.",
+    "VoIP conference finished.": "Rematou a conferencia VoIP.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s rexeitou a invitación.",
+    "%(targetName)s left the room.": "%(targetName)s deixou a sala.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s desbloqueou a %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s expulsou a %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s rexeitou o convite de %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s cambiou o asunto a \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s eliminou o nome da sala.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s cambiou o nome da sala a %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s enviou unha imaxe.",
+    "Someone": "Alguén",
+    "(not supported by this browser)": "(non soportado por este navegador)",
+    "%(senderName)s answered the call.": "%(senderName)s respondeu a chamada.",
+    "(could not connect media)": "(non puido conectar os medios)",
+    "(no answer)": "(sen resposta)",
+    "(unknown failure: %(reason)s)": "(fallo descoñecido: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s rematou a chamada.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s estableceu unha chamada %(callType)s.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s enviou un convite a %(targetDisplayName)s para unirse a sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s fixo o historial da sala visible para toda a membresía, desde o punto en que foron convidadas.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s estableceu o historial futuro visible a toda a membresía, desde o punto en que se uniron.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s fixo visible para toda a membresía o historial futuro da sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s fixo visible para calquera o historial futuro da sala.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s fixo visible o historial futuro da sala para descoñecidos (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s activou o cifrado extremo-a-extremo (algoritmo %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s desde %(fromPowerLevel)s a %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s cambiou o nivel de autoridade a %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s cambiou as mensaxes fixadas para a sala.",
+    "%(widgetName)s widget modified by %(senderName)s": "O engadido %(widgetName)s modificado por %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "O %(widgetName)s engadido por %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s eliminado por %(senderName)s",
+    "%(displayName)s is typing": "%(displayName)s está a escribir",
+    "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras están a escribir",
+    "%(names)s and %(count)s others are typing|one": "%(names)s e outra está a escribir",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s están a escribir",
+    "Failure to create room": "Fallo ao crear a sala",
+    "Server may be unavailable, overloaded, or you hit a bug.": "O servidor podería non estar dispoñible, con sobrecarga ou ter un fallo.",
+    "Send anyway": "Enviar de todos xeitos",
+    "Send": "Enviar",
+    "Unnamed Room": "Sala sen nome",
+    "Your browser does not support the required cryptography extensions": "O seu navegador non soporta as extensións de criptografía necesarias",
+    "Not a valid Riot keyfile": "Non é un ficheiro de chaves Riot válido",
+    "Authentication check failed: incorrect password?": "Fallou a comprobación de autenticación: contrasinal incorrecto?",
+    "Failed to join room": "Non se puido unir a sala",
+    "Message Pinning": "Fixando mensaxe",
+    "Presence Management": "Xestión da presenza",
+    "Tag Panel": "Panel de etiquetas",
+    "Disable Emoji suggestions while typing": "Deshabilitar a suxestión de Emoji mentras escribe",
+    "Use compact timeline layout": "Utilizar a disposición compacta da liña temporal",
+    "Hide removed messages": "Ocultar mensaxes eliminadas",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensaxes de unión/saída (convites/expulsións/bloqueos non afectados)",
+    "Hide avatar changes": "Ocultar cambios no avatar",
+    "Hide display name changes": "Ocultar cambios no nome público",
+    "Hide read receipts": "Ocultar avisos de recepción",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostrar marcas  de tempo con formato 12 horas (ex. 2:30pm)",
+    "Always show message timestamps": "Mostar sempre marcas de tempo",
+    "Autoplay GIFs and videos": "Reprodución automática de GIFs e vídeos",
+    "Enable automatic language detection for syntax highlighting": "Habilitar a detección automática de idioma para o resalte da sintaxe",
+    "Hide avatars in user and room mentions": "Ocultar avatares nas mencións de usuarios e salas",
+    "Disable big emoji in chat": "Deshabilitar emojis grandes nas conversas",
+    "Don't send typing notifications": "Non enviar notificacións de escritura",
+    "Automatically replace plain text Emoji": "Substituír automaticamente Emoji en texto plano",
+    "Disable Peer-to-Peer for 1:1 calls": "Deshabilitar Peer-to-Peer  para chamadas 1:1",
+    "Never send encrypted messages to unverified devices from this device": "Non enviar mensaxes cifradas a dispositivos non verificados desde este dispositivo",
+    "Never send encrypted messages to unverified devices in this room from this device": "Non enviar mensaxes cifradas a dispositivos non verificados en esta sala desde este dispositivo",
+    "Enable inline URL previews by default": "Habilitar por omisión vistas previas en liña de URL",
+    "Enable URL previews for this room (only affects you)": "Habilitar vista previa de URL en esta sala (só lle afecta a vostede)",
+    "Enable URL previews by default for participants in this room": "Habilitar vista previa de URL por omisión para as participantes en esta sala",
+    "Room Colour": "Cor da sala",
+    "Active call (%(roomName)s)": "Chamada activa (%(roomName)s)",
+    "unknown caller": "interlocutora descoñecida",
+    "Incoming voice call from %(name)s": "Chamada de voz entrante de %(name)s",
+    "Incoming video call from %(name)s": "Chamada de vídeo entrante de %(name)s",
+    "Incoming call from %(name)s": "Chamada entrante de %(name)s",
+    "Decline": "Rexeitar",
+    "Accept": "Aceptar",
+    "Error": "Fallo",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Enviouse unha mensaxe de texto a +%(msisdn)s. Por favor, introduza o código de verificación que contén",
+    "Incorrect verification code": "Código de verificación incorrecto",
+    "Enter Code": "Introduza o código",
+    "Submit": "Enviar",
+    "Phone": "Teléfono",
+    "Add phone number": "Engada número de teléfono",
+    "Add": "Engadir",
+    "Failed to upload profile picture!": "Fallo ao subir a imaxe de perfil!",
+    "Upload new:": "Subir nova:",
+    "No display name": "Sen nome público",
+    "New passwords don't match": "Os contrasinais novos non coinciden",
+    "Passwords can't be empty": "Os contranais non poden estar baldeiros",
+    "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.": "Ao cambiar o contrasinal restablecerá todas as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo ilexible o historial da conversa a menos que primeiro exporte as chaves da sala e posteriormente as importe. No futuro melloraremos esto.",
+    "Continue": "Continuar",
+    "Export E2E room keys": "Exportar chaves E2E da sala",
+    "Do you want to set an email address?": "Quere establecer un enderezo de correo electrónico?",
+    "Current password": "Contrasinal actual",
+    "Password": "Contrasinal",
+    "New Password": "Novo contrasinal",
+    "Confirm password": "Confirme o contrasinal",
+    "Change Password": "Cambiar contrasinal",
+    "Your home server does not support device management.": "O seu servidor non soporta a xestión de dispositivos.",
+    "Unable to load device list": "Non se puido cargar a lista de dispositivos",
+    "Authentication": "Autenticación",
+    "Delete %(count)s devices|other": "Eliminar %(count)s dispositivos",
+    "Delete %(count)s devices|one": "Eliminar dispositivo",
+    "Device ID": "ID de dispositivo",
+    "Device Name": "Nome do dispositivo",
+    "Last seen": "Visto por última vez",
+    "Select devices": "Escolla dispositivos",
+    "Failed to set display name": "Fallo ao establecer o nome público",
+    "Disable Notifications": "Deshabilitar notificacións",
+    "Enable Notifications": "Habilitar notificacións"
 }

From f44f5aac5380789d18f1c490d4e48f85e5c542be Mon Sep 17 00:00:00 2001
From: Klaus Marx <km@slsx.de>
Date: Sat, 23 Dec 2017 11:00:56 +0000
Subject: [PATCH 198/927] Translated using Weblate (German)

Currently translated at 99.8% (957 of 958 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 91c75ff975..24231884e7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -798,7 +798,7 @@
     "Unignore": "Ignorieren aufheben",
     "User Options": "Benutzer-Optionen",
     "Unignored user": "Benutzer nicht mehr ignoriert",
-    "Ignored user": "Benutzer ignoriert",
+    "Ignored user": "Ignorierter Benutzer",
     "Stops ignoring a user, showing their messages going forward": "Beendet das Ignorieren eines Benutzers, nachfolgende Nachrichten werden wieder angezeigt",
     "Ignores a user, hiding their messages from you": "Ignoriert einen Benutzer und verbirgt dessen Nachrichten",
     "Disable Emoji suggestions while typing": "Emoji-Vorschläge während des Schreibens deaktivieren",
@@ -859,7 +859,7 @@
     "Community Settings": "Community-Einstellungen",
     "Community Member Settings": "Community-Mitglieder-Einstellungen",
     "Who would you like to add to this community?": "Wen möchtest du zu dieser Community hinzufügen?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warnung: Jede Person, die du einer Community hinzufügst, wird für alle, die die Community-ID kennen, öffentlich sichtbar sein",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warnung: Jede Person die du einer Community hinzufügst, wird für alle die die Community-ID kennen öffentlich sichtbar sein",
     "Invite new community members": "Neue Community-Mitglieder einladen",
     "Invite to Community": "In die Community einladen",
     "Which rooms would you like to add to this community?": "Welche Räume möchtest du zu dieser Community hinzufügen?",

From c9ef14219267a466dce03bb058a22c038a66bee9 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Sun, 24 Dec 2017 07:16:54 +0000
Subject: [PATCH 199/927] Translated using Weblate (Russian)

Currently translated at 99.3% (952 of 958 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1550d3d133..b749b470bc 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -252,7 +252,7 @@
     "VoIP is unsupported": "VoIP не поддерживается",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Текстовое сообщение было отправлено на +%(msisdn)s. Введите проверочный код, который оно содержит",
     "and %(count)s others...|other": "и %(count)s других...",
-    "and %(count)s others...|one": "и ещё один...",
+    "and %(count)s others...|one": "и еще один...",
     "Are you sure?": "Вы уверены?",
     "Autoplay GIFs and videos": "Автовоспроизведение GIF и видео",
     "Click to mute audio": "Щелкните, чтобы выключить звук",

From 9a9c309253a9033af3ff10467bf5ba0522450765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Wed, 27 Dec 2017 06:31:19 +0000
Subject: [PATCH 200/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 2be5c49474..847433d37e 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -942,5 +942,42 @@
     "URL previews are enabled by default for participants in this room.": "Náhľady URL adries sú predvolene povolené pre členov tejto miestnosti.",
     "URL previews are disabled by default for participants in this room.": "Náhľady URL adries sú predvolene zakázané pre členov tejto miestnosti.",
     "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Znovu odoslať všetky</resendText> alebo <cancelText>Zrušiť všetky</cancelText> teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <inviteText>Pozvať ďalších</inviteText> alebo <nowarnText>Prestať upozorňovať na prázdnu miestnosť</nowarnText>?"
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <inviteText>Pozvať ďalších</inviteText> alebo <nowarnText>Prestať upozorňovať na prázdnu miestnosť</nowarnText>?",
+    "Call Failed": "Zlyhanie hovoru",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V tejto miestnosti sú neznáme zariadenia: Ak budete pokračovať bez ich overenia, niekto získa možnosť odpočúvať váš hovor.",
+    "Review Devices": "Prezrieť zariadenia",
+    "Call Anyway": "Napriek tomu zavolať",
+    "Answer Anyway": "Napriek tomu prijať",
+    "Call": "Hovor",
+    "Answer": "Prijať",
+    "Send": "Odoslať",
+    "Tag Panel": "Panel so značkami",
+    "Delete %(count)s devices|other": "Vymazať %(count)s zariadení",
+    "Delete %(count)s devices|one": "Vymazať zariadenie",
+    "Select devices": "Vybrať zariadenia",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "Prítomný %(duration)s",
+    "Idle for %(duration)s": "Nečinný %(duration)s",
+    "Offline for %(duration)s": "Nedostupný %(duration)s",
+    "Unknown for %(duration)s": "Neznámy %(duration)s",
+    "Addresses": "Adresy",
+    "Something went wrong when trying to get your communities.": "Niečo sa pokazilo pri získavaní vašich komunít.",
+    "collapse": "zbaliť",
+    "expand": "rozbaliť",
+    "Cryptography data migrated": "Kryptografické údaje zmigrované",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Práve bola vykonaná jednorázová migrácia kryptografických údajov. E2E šifrovanie vám nebude fungovať, ak sa vrátite k staršej verzii programu Riot. Ak plánujete použiť šifrovanie v staršej verzii Riot, mali by ste sa pred tým odhlásiť. Aby ste si zachovali históriu šifrovaných konverzácií, exportujte a znovu importujte kľúče miestností.",
+    "Old cryptography data detected": "Nájdené zastaralé kryptografické údaje",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Boli nájdené údaje zo staršej verzie Riot. Toto spôsobí, že E2E šifrovanie nebude v staršej verzii Riot fungovať. Zašifrované správy prijaté a odoslané v poslednom čase cez staršiu verziu Riot nemusia byť čitateľné v tejto verzii Riot. Môže to tiež spôsobiť, že šifrované konverzácie nebudú s touto verziou Riot čitateľné. Ak spozorujete niektoré s týchto problémov, odhláste sa a opätovne sa prihláste prosím. Históriu šifrovaných konverzácií zachováte tak, že si exportujete a znovu importujete kľúče miestností.",
+    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText> alebo <cancelText>Zrušiť všetko</cancelText>.",
+    "Warning": "Upozornenie",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Tento domovský server neponúka žiadny prihlasovací mechanizmus podporovaný vašim klientom.",
+    "Flair": "Príslušnosť ku komunitám",
+    "Showing flair for these communities:": "Zobrazuje sa príslušnosť k týmto komunitám:",
+    "This room is not showing flair for any communities": "V tejto miestnosti nie je zobrazená príslušnosť k žiadnym komunitám",
+    "Flair will appear if enabled in room settings": "Príslušnosť ku komunite sa zobrazí ak je to povolené v nastaveniach miestnosti",
+    "Flair will not appear": "Príslušnosť ku komunite nebude zobrazená",
+    "Display your community flair in rooms configured to show it.": "Zobrazovať vašu príslušnosť ku komunite v miestnostiach, ktoré sú nastavené na zobrazovanie tejto príslušnosti."
 }

From 57fc2eab7ac0a82255fc3ea5cfd9f4ecd2c028eb Mon Sep 17 00:00:00 2001
From: Sejo <sejo@eccs.world>
Date: Fri, 29 Dec 2017 06:58:58 +0000
Subject: [PATCH 201/927] Translated using Weblate (Spanish)

Currently translated at 59.8% (573 of 958 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 6a8bc3ccee..c639f76eba 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -403,7 +403,7 @@
     "Reason: %(reasonText)s": "Razón: %(reasonText)s",
     "Revoke Moderator": "Eliminar Moderador",
     "Refer a friend to Riot:": "Informar a un amigo sobre Riot:",
-    "Register": "Registrarse",
+    "Register": "Registro",
     "%(targetName)s rejected the invitation.": "%(targetName)s ha rechazado la invitación.",
     "Reject invitation": "Rechazar invitación",
     "Rejoin": "Volver a unirse",
@@ -606,5 +606,16 @@
     "May": "May",
     "Jun": "Jun",
     "Jul": "Jul",
-    "Aug": "August"
+    "Aug": "August",
+    "Add rooms to this community": "Agrega salas a esta comunidad",
+    "Call Failed": "La llamada falló",
+    "Review Devices": "Revisar Dispositivos",
+    "Call Anyway": "Llamar de todas formas",
+    "Answer Anyway": "Contestar de todas formas",
+    "Call": "Llamar",
+    "Answer": "Contestar",
+    "Sep": "Sep",
+    "Oct": "Oct",
+    "Nov": "Nov",
+    "Dec": "Dic"
 }

From 57fb09dfb706653403d6d2fe1baccf7c19d63f43 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 2 Jan 2018 19:26:56 +0000
Subject: [PATCH 202/927] Fix dodgy merge done in 874a7bf

where develop branch should have been used for a chunk of code
---
 src/components/views/rooms/RoomList.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 45e76da839..f14ba5529d 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -104,7 +104,8 @@ module.exports = React.createClass({
                 this._groupStoreTokens.push(
                     this._groupStores[tag].registerListener(() => {
                         // This group's rooms or members may have updated, update rooms for its tag
-                        this.updateSelectedTagsRooms(dmRoomMap, [tag]);
+                        this.updateVisibleRoomsForTag(dmRoomMap, tag);
+                        this.updateVisibleRooms();
                     }),
                 );
             });

From 03f88df66ed72852a61586213c26550b1685af56 Mon Sep 17 00:00:00 2001
From: nostradamos <n0stradamos@mail.ru>
Date: Tue, 2 Jan 2018 22:44:18 +0100
Subject: [PATCH 203/927] Make the scrolling compatible with our riot-web fix
 for https://github.com/vector-im/riot-web/issues/4821

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

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index aa019de091..01432a06eb 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -525,7 +525,8 @@ export default class MessageComposerInput extends React.Component {
             // composer. For some reason the editor won't scroll automatically if we paste
             // blocks of text in or insert newlines.
             if (textContent.slice(selection.start).indexOf("\n") === -1) {
-                this.refs.editor.refs.editor.scrollTop = this.refs.editor.refs.editor.scrollHeight;
+                this.refs.editor.refs.editor.parentNode.parentNode.scrollTop = this.
+                    refs.editor.refs.editor.parentNode.parentNode.scrollHeight;
             }
         });
     }

From f67d405732f4a93b8da493a49947e501a0809ddb Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 2 Jan 2018 23:15:36 +0000
Subject: [PATCH 204/927] small refactor && warn on self-demotion

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MemberInfo.js | 50 +++++++++++++++---------
 src/i18n/strings/en_EN.json              |  1 +
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index cb6cb6c0f3..9ea749c98e 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -440,20 +440,35 @@ module.exports = withMatrixClient(React.createClass({
         const roomId = this.props.member.roomId;
         const target = this.props.member.userId;
         const room = this.props.matrixClient.getRoom(roomId);
-        const self = this;
-        if (!room) {
-            return;
-        }
-        const powerLevelEvent = room.currentState.getStateEvents(
-            "m.room.power_levels", "",
-        );
-        if (!powerLevelEvent) {
-            return;
-        }
+        if (!room) return;
+
+        const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
+        if (!powerLevelEvent) return;
+
         if (powerLevelEvent.getContent().users) {
-            const myPower = powerLevelEvent.getContent().users[this.props.matrixClient.credentials.userId];
+            const myUserId = this.props.matrixClient.getUserId();
+            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+
+            if (myUserId === target) {
+                Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
+                    title: _t("Warning!"),
+                    description:
+                        <div>
+                            { _t("You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.") }<br />
+                            { _t("Are you sure?") }
+                        </div>,
+                    button: _t("Continue"),
+                    onFinished: (confirmed) => {
+                        if (confirmed) {
+                            this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+                        }
+                    },
+                });
+                return;
+            }
+
+            const myPower = powerLevelEvent.getContent().users[myUserId];
             if (parseInt(myPower) === parseInt(powerLevel)) {
-                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
                 Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
                     title: _t("Warning!"),
                     description:
@@ -462,18 +477,17 @@ module.exports = withMatrixClient(React.createClass({
                             { _t("Are you sure?") }
                         </div>,
                     button: _t("Continue"),
-                    onFinished: function(confirmed) {
+                    onFinished: (confirmed) => {
                         if (confirmed) {
-                            self._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+                            this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
                         }
                     },
                 });
-            } else {
-                this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+                return;
             }
-        } else {
-            this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+
         }
+        this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
     },
 
     onNewDMClick: function() {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f28322398c..9cf60461cc 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -273,6 +273,7 @@
     "Failed to toggle moderator status": "Failed to toggle moderator status",
     "Failed to change power level": "Failed to change power level",
     "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.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
     "Are you sure?": "Are you sure?",
     "No devices with registered encryption keys": "No devices with registered encryption keys",
     "Devices": "Devices",

From e543f5557235e748bbc2414efcec6a875322d645 Mon Sep 17 00:00:00 2001
From: nostradamos <n0stradamos@mail.ru>
Date: Wed, 3 Jan 2018 01:50:03 +0100
Subject: [PATCH 205/927] refactored code

---
 src/components/views/rooms/MessageComposerInput.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 23e8d807c7..300d25b589 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -512,8 +512,9 @@ export default class MessageComposerInput extends React.Component {
             // composer. For some reason the editor won't scroll automatically if we paste
             // blocks of text in or insert newlines.
             if (textContent.slice(selection.start).indexOf("\n") === -1) {
-                this.refs.editor.refs.editor.parentNode.parentNode.scrollTop = this.
-                    refs.editor.refs.editor.parentNode.parentNode.scrollHeight;
+                let editorRoot = this.refs.editor.refs.editor.parentNode.parentNode;
+                console.log(editorRoot, editorRoot.scrollHeight);
+                editorRoot.scrollTop = editorRoot.scrollHeight;
             }
         });
     }

From 2189fe92564028997238139d9719980e62deb169 Mon Sep 17 00:00:00 2001
From: nostradamos <n0stradamos@mail.ru>
Date: Wed, 3 Jan 2018 01:52:02 +0100
Subject: [PATCH 206/927] removed console.log

---
 src/components/views/rooms/MessageComposerInput.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 300d25b589..005a63607d 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -513,7 +513,6 @@ export default class MessageComposerInput extends React.Component {
             // blocks of text in or insert newlines.
             if (textContent.slice(selection.start).indexOf("\n") === -1) {
                 let editorRoot = this.refs.editor.refs.editor.parentNode.parentNode;
-                console.log(editorRoot, editorRoot.scrollHeight);
                 editorRoot.scrollTop = editorRoot.scrollHeight;
             }
         });

From 85cdd888e81c2dbe0217970f65691a188d4e22df Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 3 Jan 2018 11:33:59 +0000
Subject: [PATCH 207/927] Combine TagOrderStore and FilterStore

so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
---
 src/components/structures/TagPanel.js  |  10 +--
 src/components/views/rooms/RoomList.js |  16 ++--
 src/stores/FilterStore.js              | 115 -------------------------
 src/stores/TagOrderStore.js            |  63 ++++++++++++++
 4 files changed, 72 insertions(+), 132 deletions(-)
 delete mode 100644 src/stores/FilterStore.js

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index aa35101197..531c247ea6 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
-import FilterStore from '../../stores/FilterStore';
 import TagOrderStore from '../../stores/TagOrderStore';
 
 import GroupActions from '../../actions/GroupActions';
@@ -44,20 +43,13 @@ const TagPanel = React.createClass({
         this.unmounted = false;
         this.context.matrixClient.on("Group.myMembership", this._onGroupMyMembership);
 
-        this._filterStoreToken = FilterStore.addListener(() => {
-            if (this.unmounted) {
-                return;
-            }
-            this.setState({
-                selectedTags: FilterStore.getSelectedTags(),
-            });
-        });
         this._tagOrderStoreToken = TagOrderStore.addListener(() => {
             if (this.unmounted) {
                 return;
             }
             this.setState({
                 orderedTags: TagOrderStore.getOrderedTags() || [],
+                selectedTags: TagOrderStore.getSelectedTags(),
             });
         });
         // This could be done by anything with a matrix client
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index f14ba5529d..82516cc218 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -28,7 +28,7 @@ const rate_limited_func = require('../../../ratelimitedfunc');
 const Rooms = require('../../../Rooms');
 import DMRoomMap from '../../../utils/DMRoomMap';
 const Receipt = require('../../../utils/Receipt');
-import FilterStore from '../../../stores/FilterStore';
+import TagOrderStore from '../../../stores/TagOrderStore';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
 
 const HIDE_CONFERENCE_CHANS = true;
@@ -95,8 +95,8 @@ module.exports = React.createClass({
         // All rooms that should be kept in the room list when filtering
         this._visibleRooms = [];
         // When the selected tags are changed, initialise a group store if necessary
-        this._filterStoreToken = FilterStore.addListener(() => {
-            FilterStore.getSelectedTags().forEach((tag) => {
+        this._tagStoreToken = TagOrderStore.addListener(() => {
+            TagOrderStore.getSelectedTags().forEach((tag) => {
                 if (tag[0] !== '+' || this._groupStores[tag]) {
                     return;
                 }
@@ -182,8 +182,8 @@ module.exports = React.createClass({
             MatrixClientPeg.get().removeListener("Group.myMembership", this._onGroupMyMembership);
         }
 
-        if (this._filterStoreToken) {
-            this._filterStoreToken.remove();
+        if (this._tagStoreToken) {
+            this._tagStoreToken.remove();
         }
 
         if (this._groupStoreTokens.length > 0) {
@@ -298,14 +298,14 @@ module.exports = React.createClass({
     // Update which rooms and users should appear according to which tags are selected
     updateVisibleRooms: function() {
         this._visibleRooms = [];
-        FilterStore.getSelectedTags().forEach((tag) => {
+        TagOrderStore.getSelectedTags().forEach((tag) => {
             (this._visibleRoomsForGroup[tag] || []).forEach(
                 (roomId) => this._visibleRooms.push(roomId),
             );
         });
 
         this.setState({
-            selectedTags: FilterStore.getSelectedTags(),
+            selectedTags: TagOrderStore.getSelectedTags(),
         }, () => {
             this.refreshRoomList();
         });
@@ -362,7 +362,7 @@ module.exports = React.createClass({
                 // Used to split rooms via tags
                 const tagNames = Object.keys(room.tags);
 
-                // Apply TagPanel filtering, derived from FilterStore
+                // Apply TagPanel filtering, derived from TagOrderStore
                 if (!this.isRoomInSelectedTags(room)) {
                     return;
                 }
diff --git a/src/stores/FilterStore.js b/src/stores/FilterStore.js
deleted file mode 100644
index 8078a13ffd..0000000000
--- a/src/stores/FilterStore.js
+++ /dev/null
@@ -1,115 +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 {Store} from 'flux/utils';
-import dis from '../dispatcher';
-import Analytics from '../Analytics';
-
-const INITIAL_STATE = {
-    allTags: [],
-    selectedTags: [],
-    // Last selected tag when shift was not being pressed
-    anchorTag: null,
-};
-
-/**
- * A class for storing application state for filtering via TagPanel.
- */
-class FilterStore extends Store {
-    constructor() {
-        super(dis);
-
-        // Initialise state
-        this._state = INITIAL_STATE;
-    }
-
-    _setState(newState) {
-        this._state = Object.assign(this._state, newState);
-        this.__emitChange();
-    }
-
-    __onDispatch(payload) {
-        switch (payload.action) {
-            case 'all_tags' :
-                this._setState({
-                    allTags: payload.tags,
-                });
-            break;
-            case 'select_tag': {
-                let newTags = [];
-                // Shift-click semantics
-                if (payload.shiftKey) {
-                    // Select range of tags
-                    let start = this._state.allTags.indexOf(this._state.anchorTag);
-                    let end = this._state.allTags.indexOf(payload.tag);
-
-                    if (start === -1) {
-                        start = end;
-                    }
-                    if (start > end) {
-                        const temp = start;
-                        start = end;
-                        end = temp;
-                    }
-                    newTags = payload.ctrlOrCmdKey ? this._state.selectedTags : [];
-                    newTags = [...new Set(
-                        this._state.allTags.slice(start, end + 1).concat(newTags),
-                    )];
-                } else {
-                    if (payload.ctrlOrCmdKey) {
-                        // Toggle individual tag
-                        if (this._state.selectedTags.includes(payload.tag)) {
-                            newTags = this._state.selectedTags.filter((t) => t !== payload.tag);
-                        } else {
-                            newTags = [...this._state.selectedTags, payload.tag];
-                        }
-                    } else {
-                        // Select individual tag
-                        newTags = [payload.tag];
-                    }
-                    // Only set the anchor tag if the tag was previously unselected, otherwise
-                    // the next range starts with an unselected tag.
-                    if (!this._state.selectedTags.includes(payload.tag)) {
-                        this._setState({
-                            anchorTag: payload.tag,
-                        });
-                    }
-                }
-
-                this._setState({
-                    selectedTags: newTags,
-                });
-
-                Analytics.trackEvent('FilterStore', 'select_tag');
-            }
-            break;
-            case 'deselect_tags':
-                this._setState({
-                    selectedTags: [],
-                });
-                Analytics.trackEvent('FilterStore', 'deselect_tags');
-            break;
-        }
-    }
-
-    getSelectedTags() {
-        return this._state.selectedTags;
-    }
-}
-
-if (global.singletonFilterStore === undefined) {
-    global.singletonFilterStore = new FilterStore();
-}
-export default global.singletonFilterStore;
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 633ffc7e9c..9c9427284e 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -15,12 +15,17 @@ limitations under the License.
 */
 import {Store} from 'flux/utils';
 import dis from '../dispatcher';
+import Analytics from '../Analytics';
 
 const INITIAL_STATE = {
     orderedTags: null,
     orderedTagsAccountData: null,
     hasSynced: false,
     joinedGroupIds: null,
+
+    selectedTags: [],
+    // Last selected tag when shift was not being pressed
+    anchorTag: null,
 };
 
 /**
@@ -93,6 +98,60 @@ class TagOrderStore extends Store {
                 this._setState({orderedTags});
                 break;
             }
+            case 'select_tag': {
+                let newTags = [];
+                // Shift-click semantics
+                if (payload.shiftKey) {
+                    // Select range of tags
+                    let start = this._state.orderedTags.indexOf(this._state.anchorTag);
+                    let end = this._state.orderedTags.indexOf(payload.tag);
+
+                    if (start === -1) {
+                        start = end;
+                    }
+                    if (start > end) {
+                        const temp = start;
+                        start = end;
+                        end = temp;
+                    }
+                    newTags = payload.ctrlOrCmdKey ? this._state.selectedTags : [];
+                    newTags = [...new Set(
+                        this._state.orderedTags.slice(start, end + 1).concat(newTags),
+                    )];
+                } else {
+                    if (payload.ctrlOrCmdKey) {
+                        // Toggle individual tag
+                        if (this._state.selectedTags.includes(payload.tag)) {
+                            newTags = this._state.selectedTags.filter((t) => t !== payload.tag);
+                        } else {
+                            newTags = [...this._state.selectedTags, payload.tag];
+                        }
+                    } else {
+                        // Select individual tag
+                        newTags = [payload.tag];
+                    }
+                    // Only set the anchor tag if the tag was previously unselected, otherwise
+                    // the next range starts with an unselected tag.
+                    if (!this._state.selectedTags.includes(payload.tag)) {
+                        this._setState({
+                            anchorTag: payload.tag,
+                        });
+                    }
+                }
+
+                this._setState({
+                    selectedTags: newTags,
+                });
+
+                Analytics.trackEvent('FilterStore', 'select_tag');
+            }
+            break;
+            case 'deselect_tags':
+                this._setState({
+                    selectedTags: [],
+                });
+                Analytics.trackEvent('FilterStore', 'deselect_tags');
+            break;
             case 'on_logged_out': {
                 // Reset state without pushing an update to the view, which generally assumes that
                 // the matrix client isn't `null` and so causing a re-render will cause NPEs.
@@ -129,6 +188,10 @@ class TagOrderStore extends Store {
     getOrderedTags() {
         return this._state.orderedTags;
     }
+
+    getSelectedTags() {
+        return this._state.selectedTags;
+    }
 }
 
 if (global.singletonTagOrderStore === undefined) {

From d49551998659b9287adf07afb49f73667eb776b7 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 3 Jan 2018 11:39:15 +0000
Subject: [PATCH 208/927] Fix shift-ctrl-click

isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys
---
 src/Keyboard.js                          | 9 +++++++++
 src/components/views/elements/TagTile.js | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/Keyboard.js b/src/Keyboard.js
index 9c872e1c66..8e6983fae5 100644
--- a/src/Keyboard.js
+++ b/src/Keyboard.js
@@ -68,3 +68,12 @@ export function isOnlyCtrlOrCmdKeyEvent(ev) {
         return ev.ctrlKey && !ev.altKey && !ev.metaKey && !ev.shiftKey;
     }
 }
+
+export function isCtrlOrCmdKeyEvent(ev) {
+    const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+    if (isMac) {
+        return ev.metaKey && !ev.ctrlKey;
+    } else {
+        return ev.ctrlKey && !ev.metaKey;
+    }
+}
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index eb9a5cbdd9..2457bb1760 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -20,7 +20,7 @@ import classNames from 'classnames';
 import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
-import { isOnlyCtrlOrCmdKeyEvent } from '../../../Keyboard';
+import { isCtrlOrCmdKeyEvent } from '../../../Keyboard';
 
 import FlairStore from '../../../stores/FlairStore';
 
@@ -76,7 +76,7 @@ export default React.createClass({
         dis.dispatch({
             action: 'select_tag',
             tag: this.props.tag,
-            ctrlOrCmdKey: isOnlyCtrlOrCmdKeyEvent(e),
+            ctrlOrCmdKey: isCtrlOrCmdKeyEvent(e),
             shiftKey: e.shiftKey,
         });
     },

From 613e3b7ac1bdee64461b35e03fcf93d9c8ec2cda Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 3 Jan 2018 11:57:49 +0000
Subject: [PATCH 209/927] Remove extra full stop

---
 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 09844c3d63..087b96c509 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -375,7 +375,7 @@ module.exports = React.createClass({
              { _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.") }.
+                  "please export your room keys for safe-keeping.") }
                 </div>,
             button: _t("Sign out"),
             extraButtons: [

From 08e6d123a2b218f37c90dc7caed498e77f392c89 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 3 Jan 2018 11:53:58 +0000
Subject: [PATCH 210/927] Translated using Weblate (Basque)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 304c415e14..3db786cfc1 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -312,11 +312,11 @@
     "Local addresses for this room:": "Gela honen tokiko helbideak:",
     "Logged in as:": "Saioa hasteko erabiltzailea:",
     "Login as guest": "Hasi saioa bisitari gisa",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du hauentzat gelako kide guztiak, gonbidapena egiten zaienetik.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du hauentzat gelako kide guztiak, elkartzen direnetik.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du hauentzat gelako kide guztiak.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du hauentzat edonor.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du hauentzat ezezaguna (%(visibility)s).",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, gonbidapena egiten zaienetik.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat, elkartzen direnetik.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du gelako kide guztientzat.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du edonorentzat.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s erabiltzaileak etorkizuneko gelaren historiala ikusgai jarri du ezezagunentzat (%(visibility)s).",
     "Manage Integrations": "Kudeatu interakzioak",
     "Markdown is disabled": "Markdown desgaituta dago",
     "Markdown is enabled": "Markdown gaituta dago",
@@ -448,7 +448,7 @@
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu da, baina ezin izan da aurkitu.",
     "Turn Markdown off": "Desaktibatu Markdown",
     "Turn Markdown on": "Aktibatu Markdown",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrerako (algorithm %(algorithm)s) zifratzea aktibatu du.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s erabiltzaileak muturretik muturrerako (%(algorithm)s algoritmoa) zifratzea aktibatu du.",
     "Unable to add email address": "Ezin izan da e-mail helbidea gehitu",
     "Unable to remove contact information": "Ezin izan da kontaktuaren informazioa kendu",
     "Unable to verify email address.": "Ezin izan da e-mail helbidea egiaztatu.",

From a2bb240dcb71c16f756184a5bacb586522ba8472 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 3 Jan 2018 14:04:53 +0000
Subject: [PATCH 211/927] Fetch group data for all tags instead of those
 selected

so that tag switching is not delayed by fetching group data, i.e group members and rooms.
---
 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 82516cc218..2dc36d5700 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -96,7 +96,7 @@ module.exports = React.createClass({
         this._visibleRooms = [];
         // When the selected tags are changed, initialise a group store if necessary
         this._tagStoreToken = TagOrderStore.addListener(() => {
-            TagOrderStore.getSelectedTags().forEach((tag) => {
+            TagOrderStore.getOrderedTags().forEach((tag) => {
                 if (tag[0] !== '+' || this._groupStores[tag]) {
                     return;
                 }

From 2baacfa56222a3697076af3fc9c120b7d877956a Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 3 Jan 2018 14:12:28 +0000
Subject: [PATCH 212/927] Handle case where ordering is not yet known

---
 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 2dc36d5700..0339ce738d 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -96,7 +96,7 @@ module.exports = React.createClass({
         this._visibleRooms = [];
         // When the selected tags are changed, initialise a group store if necessary
         this._tagStoreToken = TagOrderStore.addListener(() => {
-            TagOrderStore.getOrderedTags().forEach((tag) => {
+            (TagOrderStore.getOrderedTags() || []).forEach((tag) => {
                 if (tag[0] !== '+' || this._groupStores[tag]) {
                     return;
                 }

From 77132bc7bdb6058c2ba59568b772ced1aa4ce721 Mon Sep 17 00:00:00 2001
From: pincopallopino <federico.serale@gmail.com>
Date: Wed, 3 Jan 2018 14:23:26 +0000
Subject: [PATCH 213/927] Translated using Weblate (Italian)

Currently translated at 8.9% (86 of 958 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index a81bcfb666..40dbad8177 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -84,5 +84,8 @@
     "Register": "Registrati",
     "Rooms": "Stanze",
     "The remote side failed to pick up": "Il destinatario non ha risposto",
-    "Unable to capture screen": "Impossibile acquisire lo schermo"
+    "Unable to capture screen": "Impossibile acquisire lo schermo",
+    "Call": "Chiama",
+    "Answer": "Rispondi",
+    "Invite to Community": "Invita alla community"
 }

From 5c5307c6650b7fb51b031c7a9f05b49748a6b096 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 3 Jan 2018 17:12:31 +0000
Subject: [PATCH 214/927] Improve performance of tag panel selection (when tags
 are selected)

Deselecting all tags is now slightly less performant than selecting a tag
but mostly due to the number of RoomTiles being rendered.

Swapping between different tags (a supposed common use-case) feels much
more spritely!
---
 src/components/views/rooms/RoomList.js | 31 +++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index f14ba5529d..9fc3a5f231 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -311,11 +311,6 @@ module.exports = React.createClass({
         });
     },
 
-    isRoomInSelectedTags: function(room) {
-        // No selected tags = every room is visible in the list
-        return this.state.selectedTags.length === 0 || this._visibleRooms.includes(room.roomId);
-    },
-
     refreshRoomList: function() {
         // TODO: ideally we'd calculate this once at start, and then maintain
         // any changes to it incrementally, updating the appropriate sublists
@@ -344,7 +339,26 @@ module.exports = React.createClass({
         lists["im.vector.fake.archived"] = [];
 
         const dmRoomMap = DMRoomMap.shared();
-        MatrixClientPeg.get().getRooms().forEach((room) => {
+
+        // If there are any tags selected, constrain the rooms listed to the
+        // visible rooms as determined by this._visibleRooms. Here, we
+        // de-duplicate and filter out rooms that the client doesn't know
+        // about (hence the Set and the null-guard on `room`).
+        let rooms = [];
+        if (this.state.selectedTags.length > 0) {
+            const roomSet = new Set();
+            this._visibleRooms.forEach((roomId) => {
+                const room = MatrixClientPeg.get().getRoom(roomId);
+                if (room) {
+                    roomSet.add(room);
+                }
+            });
+            rooms = Array.from(roomSet);
+        } else {
+            rooms = MatrixClientPeg.get().getRooms();
+        }
+
+        rooms.forEach((room, index) => {
             const me = room.getMember(MatrixClientPeg.get().credentials.userId);
             if (!me) return;
 
@@ -362,11 +376,6 @@ module.exports = React.createClass({
                 // Used to split rooms via tags
                 const tagNames = Object.keys(room.tags);
 
-                // Apply TagPanel filtering, derived from FilterStore
-                if (!this.isRoomInSelectedTags(room)) {
-                    return;
-                }
-
                 if (tagNames.length) {
                     for (let i = 0; i < tagNames.length; i++) {
                         const tagName = tagNames[i];

From e96d199b282fdd875d26761a327dcaba23eade72 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 09:53:26 +0000
Subject: [PATCH 215/927] Inject stickers

---
 src/ContentMessages.js                |  6 ++++++
 src/WidgetMessaging.js                | 21 +++++++++++++--------
 src/components/structures/RoomView.js | 18 ++++++++++++++++++
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 8d40b65124..a173a9f727 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -275,6 +275,12 @@ class ContentMessages {
         this.nextId = 0;
     }
 
+    sendURLContentToRoom(url, roomId, info, text, matrixClient) {
+      return MatrixClientPeg.get().sendImageMessage(roomId, url, info, text).catch((e) => {
+        console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
+      });
+    }
+
     sendContentToRoom(file, roomId, matrixClient) {
         const content = {
             body: file.name || 'Attachment',
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 37dd6b8be4..9db88ae441 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -15,6 +15,9 @@ limitations under the License.
 */
 
 /*
+POSTMESSAGE API
+===============
+
 Listens for incoming postMessage requests from embedded widgets. The following API is exposed:
 {
     api: "widget",
@@ -38,7 +41,7 @@ The "api" field is required to use this API, and must be set to "widget" in all
 
 The "action" determines the format of the request and response. All actions can return an error response.
 
-Additional data can be sent as additional, abritrary fields. However, typically the data object should be used.
+Additional data can be sent as abritrary fields. However, typically the data object should be used.
 
 A success response is an object with zero or more keys.
 
@@ -52,8 +55,8 @@ They look like:
 }
 The "message" key should be a human-friendly string.
 
-INBOUND ACTIONS
-===============
+ACTIONS
+=======
 ** All actions must include an "api" field with value of "widget".**
 All actions can return an error response instead of the response outlined below.
 
@@ -110,11 +113,13 @@ Example:
 }
 
 
-OUTBOUND ACTIONS
-================
+OUTBOUND POSTMESSAGE API
+========================
 
-In addition to listening for inbound requests, the API can be used to initiate
-actions in the widget iframe, and request data from the widget instance.
+This API can be used to initiate actions in remote widget instances.
+
+ACTIONS
+=======
 
 Outbound actions use the "widget_client" API key / name, which must be included
 on all requests.
@@ -133,7 +138,7 @@ screenshot
 
 Request a screenshot from the widget (if supported).
 This can currently only be supported by widgets that have access to all of their DOM tree.
-For example, widgets that nest further levels of iframes can not support this.
+For example, widgets that nest further levels of iframes can not support this capability.
 
 The screenshot is returned as a Blob object.
 
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f68348c13d..a5e5273b82 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -459,6 +459,9 @@ module.exports = React.createClass({
             case 'message_sent':
                 this._checkIfAlone(this.state.room);
                 break;
+            case 'inject_sticker':
+              this.injectSticker(payload.url, payload.info, payload.text);
+              break;
             case 'picture_snapshot':
                 this.uploadFile(payload.file);
                 break;
@@ -904,6 +907,21 @@ module.exports = React.createClass({
         });
     },
 
+    injectSticker: function(url, info, text) {
+        if (MatrixClientPeg.get().isGuest()) {
+            dis.dispatch({action: 'view_set_mxid'});
+            return;
+        }
+
+        ContentMessages.sendURLContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
+          .done(undefined, (error) => {
+              if (error.name === "UnknownDeviceError") {
+                  // Let the staus bar handle this
+                  return;
+              }
+          });
+    },
+
     onSearch: function(term, scope) {
         this.setState({
             searchTerm: term,

From cdd1a57569a03f0dfbecf90466e5a7500273f307 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 4 Jan 2018 11:50:33 +0000
Subject: [PATCH 216/927] Calculate visible rooms when tags change

instead of every time we getRoomLists
---
 src/components/views/rooms/RoomList.js | 53 ++++++++++++++------------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 9fc3a5f231..c32811e57f 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -93,7 +93,8 @@ module.exports = React.createClass({
             // $groupId: [$roomId1, $roomId2, ...],
         };
         // All rooms that should be kept in the room list when filtering
-        this._visibleRooms = [];
+        // By default, set to `null` meaning "all rooms visible"
+        this._visibleRooms = null;
         // When the selected tags are changed, initialise a group store if necessary
         this._filterStoreToken = FilterStore.addListener(() => {
             FilterStore.getSelectedTags().forEach((tag) => {
@@ -297,15 +298,35 @@ module.exports = React.createClass({
 
     // Update which rooms and users should appear according to which tags are selected
     updateVisibleRooms: function() {
-        this._visibleRooms = [];
-        FilterStore.getSelectedTags().forEach((tag) => {
-            (this._visibleRoomsForGroup[tag] || []).forEach(
-                (roomId) => this._visibleRooms.push(roomId),
+        const selectedTags = FilterStore.getSelectedTags();
+
+        let visibleGroupRooms = [];
+        selectedTags.forEach((tag) => {
+            visibleGroupRooms = visibleGroupRooms.concat(
+                this._visibleRoomsForGroup[tag] || [],
             );
         });
 
+        // If there are any tags selected, constrain the rooms listed to the
+        // visible rooms as determined by visibleGroupRooms. Here, we
+        // de-duplicate and filter out rooms that the client doesn't know
+        // about (hence the Set and the null-guard on `room`).
+        if (selectedTags.length > 0) {
+            const roomSet = new Set();
+            visibleGroupRooms.forEach((roomId) => {
+                const room = MatrixClientPeg.get().getRoom(roomId);
+                if (room) {
+                    roomSet.add(room);
+                }
+            });
+            this._visibleRooms = Array.from(roomSet);
+        } else {
+            // Show all rooms
+            this._visibleRooms = null;
+        }
+
         this.setState({
-            selectedTags: FilterStore.getSelectedTags(),
+            selectedTags,
         }, () => {
             this.refreshRoomList();
         });
@@ -340,25 +361,7 @@ module.exports = React.createClass({
 
         const dmRoomMap = DMRoomMap.shared();
 
-        // If there are any tags selected, constrain the rooms listed to the
-        // visible rooms as determined by this._visibleRooms. Here, we
-        // de-duplicate and filter out rooms that the client doesn't know
-        // about (hence the Set and the null-guard on `room`).
-        let rooms = [];
-        if (this.state.selectedTags.length > 0) {
-            const roomSet = new Set();
-            this._visibleRooms.forEach((roomId) => {
-                const room = MatrixClientPeg.get().getRoom(roomId);
-                if (room) {
-                    roomSet.add(room);
-                }
-            });
-            rooms = Array.from(roomSet);
-        } else {
-            rooms = MatrixClientPeg.get().getRooms();
-        }
-
-        rooms.forEach((room, index) => {
+        (this._visibleRooms || MatrixClientPeg.get().getRooms()).forEach((room, index) => {
             const me = room.getMember(MatrixClientPeg.get().credentials.userId);
             if (!me) return;
 

From d5e2a73d99df1ac74d319294edea335b684ae967 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 4 Jan 2018 12:06:13 +0000
Subject: [PATCH 217/927] Add alt condition back in, rename to specify igorance
 of shift

because this is really what this function is for - we want to
ignore specifically shift but not necessarily alt (despite
this probably not having any real impact).
---
 src/Keyboard.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Keyboard.js b/src/Keyboard.js
index 8e6983fae5..bf83a1a05f 100644
--- a/src/Keyboard.js
+++ b/src/Keyboard.js
@@ -69,11 +69,11 @@ export function isOnlyCtrlOrCmdKeyEvent(ev) {
     }
 }
 
-export function isCtrlOrCmdKeyEvent(ev) {
+export function isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) {
     const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
     if (isMac) {
-        return ev.metaKey && !ev.ctrlKey;
+        return ev.metaKey && !ev.altKey && !ev.ctrlKey;
     } else {
-        return ev.ctrlKey && !ev.metaKey;
+        return ev.ctrlKey && !ev.altKey && !ev.metaKey;
     }
 }

From 2282f5c26f7fdae2d2b6d9c8c860fd41424f6a04 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 4 Jan 2018 14:19:10 +0000
Subject: [PATCH 218/927] Remove unused selectedRoom prop

---
 src/components/structures/LoggedInView.js | 1 -
 src/components/views/rooms/RoomList.js    | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 38b7634edb..6f40aa559a 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -333,7 +333,6 @@ const LoggedInView = React.createClass({
                 <div className={bodyClasses}>
                     { SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> }
                     <LeftPanel
-                        selectedRoom={this.props.currentRoomId}
                         collapsed={this.props.collapseLhs || false}
                         disabled={this.props.leftDisabled}
                     />
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index f14ba5529d..40b2851dbd 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -660,7 +660,6 @@ module.exports = React.createClass({
                              editable={false}
                              order="recent"
                              isInvite={true}
-                             selectedRoom={self.props.selectedRoom}
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
@@ -674,7 +673,6 @@ module.exports = React.createClass({
                              emptyContent={this._getEmptyContent('m.favourite')}
                              editable={true}
                              order="manual"
-                             selectedRoom={self.props.selectedRoom}
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
@@ -688,7 +686,6 @@ module.exports = React.createClass({
                              headerItems={this._getHeaderItems('im.vector.fake.direct')}
                              editable={true}
                              order="recent"
-                             selectedRoom={self.props.selectedRoom}
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
                              alwaysShowHeader={true}
@@ -702,7 +699,6 @@ module.exports = React.createClass({
                              emptyContent={this._getEmptyContent('im.vector.fake.recent')}
                              headerItems={this._getHeaderItems('im.vector.fake.recent')}
                              order="recent"
-                             selectedRoom={self.props.selectedRoom}
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
@@ -718,7 +714,6 @@ module.exports = React.createClass({
                              emptyContent={this._getEmptyContent(tagName)}
                              editable={true}
                              order="manual"
-                             selectedRoom={self.props.selectedRoom}
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
@@ -733,7 +728,6 @@ module.exports = React.createClass({
                              emptyContent={this._getEmptyContent('m.lowpriority')}
                              editable={true}
                              order="recent"
-                             selectedRoom={self.props.selectedRoom}
                              incomingCall={self.state.incomingCall}
                              collapsed={self.props.collapsed}
                              searchFilter={self.props.searchFilter}
@@ -744,7 +738,6 @@ module.exports = React.createClass({
                              label={_t('Historical')}
                              editable={false}
                              order="recent"
-                             selectedRoom={self.props.selectedRoom}
                              collapsed={self.props.collapsed}
                              alwaysShowHeader={true}
                              startAsHidden={true}

From f5f3c894d718cab93706174f412594f980442ea7 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 Jan 2018 14:24:13 +0000
Subject: [PATCH 219/927] only save RelatedGroupSettings if it was modified.
 Otherwise perms issue

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

diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index 5b2810d837..f84f1d91cb 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -45,11 +45,14 @@ module.exports = React.createClass({
         return {
             newGroupsList: this.props.relatedGroupsEvent ?
                 (this.props.relatedGroupsEvent.getContent().groups || []) : [],
+            hasChanged: false,
             newGroupId: null,
         };
     },
 
     saveSettings: function() {
+        if (!this.state.hasChanged) return Promise.resolve();
+
         return this.context.matrixClient.sendStateEvent(
             this.props.roomId,
             'm.room.related_groups',
@@ -82,6 +85,7 @@ module.exports = React.createClass({
         }
         this.setState({
             newGroupsList: this.state.newGroupsList.concat([groupId]),
+            hasChanged: true,
             newGroupId: '',
         });
     },
@@ -92,13 +96,14 @@ module.exports = React.createClass({
         }
         this.setState({
             newGroupsList: Object.assign(this.state.newGroupsList, {[index]: groupId}),
+            hasChanged: true,
         });
     },
 
     onGroupDeleted: function(index) {
         const newGroupsList = this.state.newGroupsList.slice();
-        newGroupsList.splice(index, 1),
-        this.setState({ newGroupsList });
+        newGroupsList.splice(index, 1);
+        this.setState({ newGroupsList, hasChanged: true });
     },
 
     render: function() {

From be48460595525c5c895fc6ae98e873c3abb344c5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 Jan 2018 15:05:08 +0000
Subject: [PATCH 220/927] Singularise unsent message prompt, if applicable

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/RoomStatusBar.js | 6 +++---
 src/i18n/strings/en_EN.json                | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 77d506d9af..8be0f2c941 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -302,11 +302,11 @@ module.exports = React.createClass({
             ) {
                 title = unsentMessages[0].error.data.error;
             } else {
-                title = _t("Some of your messages have not been sent.");
+                title = _t('%(count)s of your messages have not been sent.', { count: unsentMessages.length });
             }
-            content = _t("<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. " +
+            content = _t("%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. " +
                "You can also select individual messages to resend or cancel.",
-                {},
+                { count: unsentMessages.length },
                 {
                     'resendText': (sub) =>
                         <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onResendAllClick}>{ sub }</a>,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index f28322398c..82ecb304d2 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -774,8 +774,10 @@
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.",
-    "Some of your messages have not been sent.": "Some of your messages have not been sent.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",
+    "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
+    "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Resend message</resendText> or <cancelText>cancel message</cancelText> now.",
     "Warning": "Warning",
     "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.",

From e99477d48652a77da356d3f7cb0d1b3760ed0267 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 4 Jan 2018 15:13:54 +0000
Subject: [PATCH 221/927] naive translation rescue post-pluralisation

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/cs.json      | 2 +-
 src/i18n/strings/de_DE.json   | 4 ++--
 src/i18n/strings/el.json      | 4 ++--
 src/i18n/strings/en_US.json   | 4 ++--
 src/i18n/strings/es.json      | 2 +-
 src/i18n/strings/eu.json      | 4 ++--
 src/i18n/strings/fi.json      | 4 ++--
 src/i18n/strings/fr.json      | 4 ++--
 src/i18n/strings/hu.json      | 4 ++--
 src/i18n/strings/ko.json      | 4 ++--
 src/i18n/strings/lv.json      | 4 ++--
 src/i18n/strings/nl.json      | 4 ++--
 src/i18n/strings/pl.json      | 4 ++--
 src/i18n/strings/pt.json      | 4 ++--
 src/i18n/strings/pt_BR.json   | 4 ++--
 src/i18n/strings/ru.json      | 4 ++--
 src/i18n/strings/sk.json      | 4 ++--
 src/i18n/strings/sv.json      | 2 +-
 src/i18n/strings/te.json      | 2 +-
 src/i18n/strings/tr.json      | 4 ++--
 src/i18n/strings/zh_Hans.json | 4 ++--
 src/i18n/strings/zh_Hant.json | 4 ++--
 22 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index c797044693..6e1c22142a 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -326,7 +326,7 @@
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Zobrazovat časové značky v 12hodinovém formátu (např. 2:30 odp.)",
     "Sign in": "Přihlásit",
     "Sign out": "Odhlásit",
-    "Some of your messages have not been sent.": "Některé z vašich zpráv nebyly odeslány.",
+    "%(count)s of your messages have not been sent.|other": "Některé z vašich zpráv nebyly odeslány.",
     "Someone": "Někdo",
     "Start a chat": "Začít chat",
     "Start authentication": "Začít ověření",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index db12a69657..258a8d787c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -378,7 +378,7 @@
     "Server may be unavailable, overloaded, or search timed out :(": "Der Server ist entweder nicht verfügbar, überlastet oder die Suche wurde wegen Zeitüberschreitung abgebrochen :(",
     "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 nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.",
-    "Some of your messages have not been sent.": "Einige deiner Nachrichten wurden nicht gesendet.",
+    "%(count)s of your messages have not been sent.|other": "Einige deiner Nachrichten wurden nicht gesendet.",
     "Submit": "Absenden",
     "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?",
     "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
@@ -640,7 +640,7 @@
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Alle erneut senden</a> oder <a>alle verwerfen</a>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Alle erneut senden</a> oder <a>alle verwerfen</a>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
     "Create new room": "Neuen Raum erstellen",
     "Room directory": "Raum-Verzeichnis",
     "Start chat": "Chat starten",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index e8362b5181..84f56f4502 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -531,7 +531,7 @@
     "Server unavailable, overloaded, or something else went wrong.": "Ο διακομιστής μπορεί να είναι μη διαθέσιμος, υπερφορτωμένος, ή κάτι άλλο να πήγε στραβά.",
     "Show panel": "Εμφάνιση καρτέλας",
     "Show Text Formatting Toolbar": "Εμφάνιση της εργαλειοθήκης μορφοποίησης κειμένου",
-    "Some of your messages have not been sent.": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.",
+    "%(count)s of your messages have not been sent.|other": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.",
     "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
     "to favourite": "στα αγαπημένα",
     "Unable to capture screen": "Αδυναμία σύλληψης οθόνης",
@@ -673,7 +673,7 @@
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ο κωδικός πρόσβασής σας άλλαξε επιτυχώς. Δεν θα λάβετε ειδοποιήσεις push σε άλλες συσκευές μέχρι να συνδεθείτε ξανά σε αυτές",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Δεν θα μπορέσετε να αναιρέσετε αυτήν την αλλαγή καθώς προωθείτε τον χρήστη να έχει το ίδιο επίπεδο δύναμης με τον εαυτό σας.",
     "Sent messages will be stored until your connection has returned.": "Τα απεσταλμένα μηνύματα θα αποθηκευτούν μέχρι να αακτηθεί η σύνδεσή σας.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Αποστολή ξανά όλων</a> ή <a>ακύρωση όλων</a> τώρα. Μπορείτε επίσης να επιλέξετε μεμονωμένα μηνύματα για να τα στείλετε ξανά ή να ακυρώσετε.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Αποστολή ξανά όλων</a> ή <a>ακύρωση όλων</a> τώρα. Μπορείτε επίσης να επιλέξετε μεμονωμένα μηνύματα για να τα στείλετε ξανά ή να ακυρώσετε.",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Είστε βέβαιοι ότι θέλετε να καταργήσετε (διαγράψετε) αυτό το συμβάν; Σημειώστε ότι αν διαγράψετε το όνομα δωματίου ή αλλάξετε το θέμα, θα μπορούσε να αναιρέσει την αλλαγή.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή με έναν υπάρχον λογαριασμό Matrix σε έναν διαφορετικό διακομιστή.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης, αλλά αυτό συνήθως θα αποτρέψει την αλληλεπίδραση με τους χρήστες που βασίζονται στην ηλεκτρονική διεύθυνση αλληλογραφίας.",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 3783a42ddc..ce2458f8a0 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -340,7 +340,7 @@
     "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.",
+    "%(count)s of your messages have not been sent.|other": "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 recognized ",
     "Start a chat": "Start a chat",
@@ -736,7 +736,7 @@
     "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
     "Your home server does not support device management.": "Your home server does not support device management.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
     "(~%(count)s results)|one": "(~%(count)s result)",
     "(~%(count)s results)|other": "(~%(count)s results)",
     "New Password": "New Password",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 261700a916..dad7c97fe9 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -321,7 +321,7 @@
     "since the point in time of selecting this option": "a partir del momento en que seleccione esta opción",
     "since they joined": "desde que se conectaron",
     "since they were invited": "desde que fueron invitados",
-    "Some of your messages have not been sent.": "Algunos de sus mensajes no han sido enviados.",
+    "%(count)s of your messages have not been sent.|other": "Algunos de sus mensajes no han sido enviados.",
     "Someone": "Alguien",
     "Sorry, this homeserver is using a login which is not recognised ": "Lo siento, este servidor está usando un usuario no reconocido. ",
     "Start a chat": "Iniciar una conversación",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 486991d350..db18597752 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -415,7 +415,7 @@
     "since the point in time of selecting this option": "aukera hau hautatu denetik",
     "since they joined": "elkartu direnetik",
     "since they were invited": "gonbidatu zaienetik",
-    "Some of your messages have not been sent.": "Zure mezu batzuk ez dira bidali.",
+    "%(count)s of your messages have not been sent.|other": "Zure mezu batzuk ez dira bidali.",
     "Sorry, this homeserver is using a login which is not recognised ": "Hasiera zerbitzari honek ezagutzen ez den saio bat erabiltzen du ",
     "Tagged as: ": "Jarritako etiketa: ",
     "The default role for new room members is": "Gelako kide berrien lehenetsitako rola:",
@@ -571,7 +571,7 @@
     "Encrypt room": "Zifratu gela",
     "There are no visible files in this room": "Ez dago fitxategi ikusgairik gela honetan",
     "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Birbidali guztiak</a> edo <a>baztertu guztiak</a> orain. Mezuak banaka aukeratu ditzakezu ere birbidali ala baztertzeko.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Birbidali guztiak</a> edo <a>baztertu guztiak</a> orain. Mezuak banaka aukeratu ditzakezu ere birbidali ala baztertzeko.",
     "(~%(count)s results)|one": "(~%(count)s emaitza)",
     "(~%(count)s results)|other": "(~%(count)s emaitza)",
     "bold": "lodia",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index aeca03c48d..4a861011f0 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -286,7 +286,7 @@
     "Sign out": "Kirjaudu ulos",
     "since they joined": "liittymisestä lähtien",
     "since they were invited": "kutsusta lähtien",
-    "Some of your messages have not been sent.": "Jotkut viesteistäsi ei ole lähetetty.",
+    "%(count)s of your messages have not been sent.|other": "Jotkut viesteistäsi ei ole lähetetty.",
     "Someone": "Joku",
     "Start a chat": "Aloita keskustelu",
     "Start Chat": "Aloita keskustelu",
@@ -419,7 +419,7 @@
     "Failed to copy": "Kopiointi epäonnistui",
     "Connectivity to the server has been lost.": "Yhteys palvelimeen menetettiin.",
     "Sent messages will be stored until your connection has returned.": "Lähetetyt viestit tallennetaan kunnes yhteys on taas muodostettu.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Uudelleenlähetä kaikki</a> tai <a>hylkää kaikki</a> nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai hylättäväksi.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Uudelleenlähetä kaikki</a> tai <a>hylkää kaikki</a> nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai hylättäväksi.",
     "(~%(count)s results)|one": "(~%(count)s tulos)",
     "(~%(count)s results)|other": "(~%(count)s tulosta)",
     "Active call": "Aktiivinen puhelu",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index a9b7232e29..13fb3c96b5 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -297,7 +297,7 @@
     "since the point in time of selecting this option": "depuis le moment où cette option a été sélectionnée",
     "since they joined": "depuis qu’ils ont rejoint le salon",
     "since they were invited": "depuis qu’ils ont été invités",
-    "Some of your messages have not been sent.": "Certains de vos messages n’ont pas été envoyés.",
+    "%(count)s of your messages have not been sent.|other": "Certains de vos messages n’ont pas été envoyés.",
     "Someone": "Quelqu'un",
     "Sorry, this homeserver is using a login which is not recognised ": "Désolé, ce serveur d'accueil utilise un identifiant qui n’est pas reconnu ",
     "Start a chat": "Commencer une discussion",
@@ -637,7 +637,7 @@
     "Uploading %(filename)s and %(count)s others|one": "Envoi de %(filename)s et %(count)s autre",
     "Uploading %(filename)s and %(count)s others|other": "Envoi de %(filename)s et %(count)s autres",
     "You must <a>register</a> to use this functionality": "Vous devez vous <a>inscrire</a> pour utiliser cette fonctionnalité",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Tout renvoyer</a> ou <a>tout annuler</a> maintenant. Vous pouvez aussi sélectionner des messages individuels à renvoyer ou annuler.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Tout renvoyer</a> ou <a>tout annuler</a> maintenant. Vous pouvez aussi sélectionner des messages individuels à renvoyer ou annuler.",
     "Create new room": "Créer un nouveau salon",
     "Room directory": "Répertoire des salons",
     "Start chat": "Commencer une discussion",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index b316e994a1..aefed5fb51 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -370,7 +370,7 @@
     "since the point in time of selecting this option": "onnantól, hogy ez az opció kiválasztásra került",
     "since they joined": "onnantól, hogy csatlakozott",
     "since they were invited": "onnantól, hogy meg lett hívva",
-    "Some of your messages have not been sent.": "Néhány üzeneted nem lett elküldve.",
+    "%(count)s of your messages have not been sent.|other": "Néhány üzeneted nem lett elküldve.",
     "Someone": "Valaki",
     "Sorry, this homeserver is using a login which is not recognised ": "Bocs, ez a saját szerver olyan beléptetést használ ami nem ismert ",
     "Start a chat": "Csevegés indítása",
@@ -550,7 +550,7 @@
     "Room": "Szoba",
     "Connectivity to the server has been lost.": "A szerverrel a kapcsolat megszakadt.",
     "Sent messages will be stored until your connection has returned.": "Az elküldött üzenetek addig lesznek tárolva amíg a kapcsolatod újra elérhető lesz.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "Most <a>újraküldöd mind</a> vagy <a>eldobod mind</a>. Újraküldésre vagy eldobásra egyenként is kiválaszthatod az üzeneteket.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "Most <a>újraküldöd mind</a> vagy <a>eldobod mind</a>. Újraküldésre vagy eldobásra egyenként is kiválaszthatod az üzeneteket.",
     "(~%(count)s results)|one": "(~%(count)s db eredmény)",
     "(~%(count)s results)|other": "(~%(count)s db eredmény)",
     "Active call": "Folyamatban lévő hívás",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index f3d54e9449..a46bc90687 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -375,7 +375,7 @@
     "since the point in time of selecting this option": "이 선택을 하는 시점부터",
     "since they joined": "들어온 이후",
     "since they were invited": "초대받은 이후",
-    "Some of your messages have not been sent.": "일부 메시지는 보내지 못했어요.",
+    "%(count)s of your messages have not been sent.|other": "일부 메시지는 보내지 못했어요.",
     "Someone": "다른 사람",
     "Sorry, this homeserver is using a login which is not recognised ": "죄송해요, 이 홈 서버는 인식할 수 없는 로그인을 쓰고 있네요 ",
     "Start a chat": "이야기하기",
@@ -553,7 +553,7 @@
     "Room": "방",
     "Connectivity to the server has been lost.": "서버 연결이 끊어졌어요.",
     "Sent messages will be stored until your connection has returned.": "보내신 메시지는 다시 연결될 때까지 저장할 거에요.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>전부 다시 보내거나</a> <a>취소하세요</a>. 다시 보내거나 취소할 메시지를 하나씩 고르실 수도 있어요.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>전부 다시 보내거나</a> <a>취소하세요</a>. 다시 보내거나 취소할 메시지를 하나씩 고르실 수도 있어요.",
     "(~%(count)s results)|one": "(~%(count)s 결과)",
     "(~%(count)s results)|other": "(~%(count)s 결과)",
     "Active call": "전화 중",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 63a504d71e..854454ab24 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -456,7 +456,7 @@
     "since the point in time of selecting this option": "kopš šī uzstādījuma izvēles brīža",
     "since they joined": "kopš tie pievienojās",
     "since they were invited": "kopš tie tika uzaicināti",
-    "Some of your messages have not been sent.": "Dažas no tavām ziņām netika nosūtītas.",
+    "%(count)s of your messages have not been sent.|other": "Dažas no tavām ziņām netika nosūtītas.",
     "Someone": "Kāds",
     "Sorry, this homeserver is using a login which is not recognised ": "Atvaino, šis serveris izmanto neatpazītu pierakstīšanās veidu ",
     "Start a chat": "Sākt čatu",
@@ -614,7 +614,7 @@
     "Room": "Istaba",
     "Connectivity to the server has been lost.": "Savienojums ar serveri tika zaudēts.",
     "Sent messages will be stored until your connection has returned.": "Nosūtītās ziņas tiks saglabātas tiklīdz savienojums tiks atjaunots.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Sūtīt vēlreiz visas</a> vai <a>atcelt visas</a>. Tu vari arī atlasīt atsevišķas ziņas, kuras sūtīt vai atcelt.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Sūtīt vēlreiz visas</a> vai <a>atcelt visas</a>. Tu vari arī atlasīt atsevišķas ziņas, kuras sūtīt vai atcelt.",
     "Active call": "Aktīvs zvans",
     "bold": "trekns",
     "italic": "itāļu",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 357ab92026..b364bdadb1 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -404,7 +404,7 @@
     "since the point in time of selecting this option": "sinds het punt in tijd dat deze optie geselecteerd wordt",
     "since they joined": "sinds ze zijn toegetreden",
     "since they were invited": "sinds ze zijn uitgenodigd",
-    "Some of your messages have not been sent.": "Een paar van je berichten zijn niet verstuurd.",
+    "%(count)s of your messages have not been sent.|other": "Een paar van je berichten zijn niet verstuurd.",
     "Someone": "Iemand",
     "Sorry, this homeserver is using a login which is not recognised ": "Sorry, deze thuisserver gebruikt een inlogmethode die niet wordt herkend. ",
     "The default role for new room members is": "De standaardrol voor nieuwe ruimteleden is",
@@ -553,7 +553,7 @@
     "Room": "Ruimte",
     "Connectivity to the server has been lost.": "De connectiviteit naar de server is verloren.",
     "Sent messages will be stored until your connection has returned.": "Verstuurde berichten zullen opgeslagen worden tot je connectie weer terug is.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Verstuur alle</a> of <a>annuleer alle</a> nu. Je kan ook individuele berichten selecteren om te versturen of te annuleren.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Verstuur alle</a> of <a>annuleer alle</a> nu. Je kan ook individuele berichten selecteren om te versturen of te annuleren.",
     "(~%(count)s results)|one": "(~%(count)s resultaat)",
     "(~%(count)s results)|other": "(~%(count)s resultaten)",
     "Active call": "Actief gesprek",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 4e7aa2fd55..0990fec856 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -451,7 +451,7 @@
     "since the point in time of selecting this option": "od momentu zaznaczenia tej opcji",
     "since they joined": "od momentu dołączenia",
     "since they were invited": "od momentu zaproszenia",
-    "Some of your messages have not been sent.": "Niektóre z twoich wiadomości nie zostały wysłane.",
+    "%(count)s of your messages have not been sent.|other": "Niektóre z twoich wiadomości nie zostały wysłane.",
     "Someone": "Ktoś",
     "Sorry, this homeserver is using a login which is not recognised ": "Przepraszamy, ten serwer używa loginu który nie jest rozpoznawany ",
     "Start a chat": "Rozpocznij rozmowę",
@@ -613,7 +613,7 @@
     "Make Moderator": "Nadaj uprawnienia moderatora",
     "Make this room private": "Nadaj temu pokojowi charakter prywatny",
     "Sent messages will be stored until your connection has returned.": "Wysłane wiadomości będą przechowywane aż do momentu odzyskania połączenia.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Wyślij ponownie wszystkie</a> lub <a>anuluj wszystkie</a> teraz. Możesz też wybrać poszczególne wiadomości aby wysłać je ponownie lub anulować.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Wyślij ponownie wszystkie</a> lub <a>anuluj wszystkie</a> teraz. Możesz też wybrać poszczególne wiadomości aby wysłać je ponownie lub anulować.",
     "(~%(count)s results)|one": "(~%(count)s wynik)",
     "(~%(count)s results)|other": "(~%(count)s wyników)",
     "Active call": "Aktywna rozmowa",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 8ef4e6f6a0..3ebf23c1ee 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -393,7 +393,7 @@
     "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.",
+    "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "The main address for this room is": "O endereço principal desta sala é",
     "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?",
@@ -702,7 +702,7 @@
     "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido",
     "Rejoin": "Voltar a participar da sala",
     "Create a new chat or reuse an existing one": "Criar uma nova conversa ou reutilizar alguma já existente",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Reenviar todas</a> ou <a>cancelar todas</a> agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Reenviar todas</a> ou <a>cancelar todas</a> agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.",
     "Reason: %(reasonText)s": "Justificativa: %(reasonText)s",
     "Home": "Início",
     "Something went wrong!": "Algo deu errado!",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index fee6bcba31..67f6c5d7ab 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -395,7 +395,7 @@
     "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.",
+    "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "The main address for this room is": "O endereço principal desta sala é",
     "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?",
@@ -642,7 +642,7 @@
     "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Username invalid: %(errMessage)s": "Nome de usuária(o) inválido: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Reenviar todas</a> ou <a>cancelar todas</a> agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Reenviar todas</a> ou <a>cancelar todas</a> agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.",
     "Create new room": "Criar nova sala",
     "Room directory": "Lista pública de salas",
     "Start chat": "Iniciar conversa",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8ca50ec72f..9a5e77da1a 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -358,7 +358,7 @@
     "since the point in time of selecting this option": "с момента выбора этой настройки",
     "since they joined": "с момента входа",
     "since they were invited": "с момента приглашения",
-    "Some of your messages have not been sent.": "Некоторые сообщения не были отправлены.",
+    "%(count)s of your messages have not been sent.|other": "Некоторые сообщения не были отправлены.",
     "Someone": "Кто-то",
     "Submit": "Отправить",
     "Success": "Успех",
@@ -641,7 +641,7 @@
     "Uploading %(filename)s and %(count)s others|other": "Отправка %(filename)s и %(count)s других",
     "Username invalid: %(errMessage)s": "Неверное имя пользователя: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "Вы должны <a>зарегистрироваться</a>, чтобы использовать эту функцию",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Отправить все</a> или <a>отменить отправку</a>. Также можно выбрать отдельные сообщения для повторной отправки или отмены.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Отправить все</a> или <a>отменить отправку</a>. Также можно выбрать отдельные сообщения для повторной отправки или отмены.",
     "New Password": "Новый пароль",
     "Start chatting": "Начать общение",
     "Start Chatting": "Начать общение",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 837a55e380..264d011be8 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -728,14 +728,14 @@
     "Scroll to bottom of page": "Posunúť na spodok stránky",
     "Connectivity to the server has been lost.": "Spojenie so serverom bolo prerušené.",
     "Sent messages will be stored until your connection has returned.": "Odoslané správy ostanú uložené, kým sa spojenie nenadviaže znovu.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>Znovu odoslať všetky</a> alebo <a>zrušiť všetky</a> teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Znovu odoslať všetky</a> alebo <a>zrušiť všetky</a> teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.",
     "%(count)s new messages|other": "%(count)s nových správ",
     "%(count)s new messages|one": "%(count)s nová správa",
     "Active call": "Aktívny hovor",
     "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <a>pozvať ďalších</a> alebo <a>prestať upozorňovať na prázdnu miestnosť</a>?",
     "You seem to be uploading files, are you sure you want to quit?": "Zdá sa, že práve nahrávate súbory, ste si istí, že chcete skončiť?",
     "You seem to be in a call, are you sure you want to quit?": "Zdá sa, že máte prebiehajúci hovor, ste si istí, že chcete skončiť?",
-    "Some of your messages have not been sent.": "Niektoré vaše správy ešte neboli odoslané.",
+    "%(count)s of your messages have not been sent.|other": "Niektoré vaše správy ešte neboli odoslané.",
     "Message not sent due to unknown devices being present": "Neodoslaná správa kvôli nájdeným neznámym zariadeniam",
     "Failed to upload file": "Nepodarilo sa nahrať súbor",
     "Server may be unavailable, overloaded, or the file too big": "Server môže byť nedostupný, preťažený, alebo je súbor príliš veľký",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index f14a563117..d091ae9d77 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -365,7 +365,7 @@
     "since the point in time of selecting this option": "från och med att det här alternativet valdes",
     "since they joined": "från och med att de gick med",
     "since they were invited": "från och med att de bjöds in",
-    "Some of your messages have not been sent.": "Vissa av dina meddelanden har inte skickats.",
+    "%(count)s of your messages have not been sent.|other": "Vissa av dina meddelanden har inte skickats.",
     "Someone": "Någon",
     "Sorry, this homeserver is using a login which is not recognised ": "Den här hemsevern använder en login-metod som inte stöds ",
     "Start a chat": "Starta en chatt",
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index d542f8140c..0ad3c0fd15 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -161,7 +161,7 @@
     "Connectivity to the server has been lost.": "సెర్వెర్ కనెక్టివిటీని కోల్పోయారు.",
     "Sent messages will be stored until your connection has returned.": "మీ కనెక్షన్ తిరిగి వచ్చే వరకు పంపిన సందేశాలు నిల్వ చేయబడతాయి.",
     "Cancel": "రద్దు",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a>అన్నీ మళ్లీ పంపు</a>లేదా<a>అన్నింటినీ రద్దు చేయండి</a>ప్పుడు.వ్యక్తిగత సందేశాలను మీరు మళ్ళీ చేసుకోవచ్చు లేదా రద్దు చేసుకోవచ్చు.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>అన్నీ మళ్లీ పంపు</a>లేదా<a>అన్నింటినీ రద్దు చేయండి</a>ప్పుడు.వ్యక్తిగత సందేశాలను మీరు మళ్ళీ చేసుకోవచ్చు లేదా రద్దు చేసుకోవచ్చు.",
     "bold": "బోల్డ్",
     "italic": "ఇటాలిక్",
     "strike": "సమ్మె",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 5f1e8256ac..9964606e93 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -365,7 +365,7 @@
     "since the point in time of selecting this option": "Bu seçenek seçildiğinden beri",
     "since they joined": "Katıldıklarından beri",
     "since they were invited": "davet edildiklerinden beri",
-    "Some of your messages have not been sent.": "Bazı mesajlarınız gönderilemedi.",
+    "%(count)s of your messages have not been sent.|other": "Bazı mesajlarınız gönderilemedi.",
     "Someone": "Birisi",
     "Sorry, this homeserver is using a login which is not recognised ": "Maalesef , bu Ana Sunucu tanımlanmamış bir Giriş kullanıyor ",
     "Start a chat": "Bir Sohbet Başlat",
@@ -545,7 +545,7 @@
     "Room": "Oda",
     "Connectivity to the server has been lost.": "Sunucuyla olan bağlantı kesildi.",
     "Sent messages will be stored until your connection has returned.": "Gönderilen iletiler bağlantınız geri gelene kadar saklanacak.",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "<a> Hepsini yeniden gönderin </a> veya <a> Hepsini iptal edin </a> şimdi . Ayrıca yeniden göndermek veya iptal etmek için özel iletiler seçebilirsin.",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a> Hepsini yeniden gönderin </a> veya <a> Hepsini iptal edin </a> şimdi . Ayrıca yeniden göndermek veya iptal etmek için özel iletiler seçebilirsin.",
     "(~%(count)s results)|one": "(~%(count)s sonuç)",
     "(~%(count)s results)|other": "(~%(count)s sonuçlar)",
     "Cancel": "İptal Et",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 474233909f..160e6c4e86 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -128,7 +128,7 @@
     "since the point in time of selecting this option": "从选择此选项起",
     "since they joined": "从他们加入时起",
     "since they were invited": "从他们被邀请时起",
-    "Some of your messages have not been sent.": "部分消息未发送。",
+    "%(count)s of your messages have not been sent.|other": "部分消息未发送。",
     "Someone": "某个用户",
     "Sorry, this homeserver is using a login which is not recognised ": "很抱歉，无法识别此主服务器使用的登录方式 ",
     "Start a chat": "创建聊天",
@@ -679,7 +679,7 @@
     "The visibility of existing history will be unchanged": "现有历史记录的可见性不会被改变",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
     "Unable to remove contact information": "无法移除联系人信息",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "现在 <a>重发全部</a> 或者 <a>取消全部</a>。你也可以选择重发或取消单独的消息。",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "现在 <a>重发全部</a> 或者 <a>取消全部</a>。你也可以选择重发或取消单独的消息。",
     "were invited %(repeats)s times": "被邀请 %(repeats)s 次",
     "was invited %(repeats)s times": "被邀请 %(repeats)s 次",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 6e0cfd3892..1669b1ce48 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -176,7 +176,7 @@
     "since the point in time of selecting this option": "從選擇此選項起",
     "since they joined": "從他們加入時起",
     "since they were invited": "從他們被邀請時起",
-    "Some of your messages have not been sent.": "部分訊息未送出。",
+    "%(count)s of your messages have not been sent.|other": "部分訊息未送出。",
     "Someone": "某個用戶",
     "Sorry, this homeserver is using a login which is not recognised ": "很抱歉，無法識別此主伺服器使用的登錄方式 ",
     "Start a chat": "創建聊天",
@@ -583,7 +583,7 @@
     "Room": "房間",
     "Connectivity to the server has been lost.": "至伺服器的連線已遺失。",
     "Sent messages will be stored until your connection has returned.": "傳送的訊息會在您的連線恢復前先儲存起來。",
-    "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.": "現在<a>重新傳送全部</a>或是<a>取消全部</a>。您也可以單獨選擇訊息來重新傳送或取消。",
+    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "現在<a>重新傳送全部</a>或是<a>取消全部</a>。您也可以單獨選擇訊息來重新傳送或取消。",
     "(~%(count)s results)|one": "（~%(count)s 結果）",
     "(~%(count)s results)|other": "（~%(count)s 結果）",
     "Active call": "活躍的通話",

From 55bfff24c4c4e7cd345b57c61713701be6c24d25 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 4 Jan 2018 17:46:44 +0000
Subject: [PATCH 222/927] Fix forgotten rename during
 d5e2a73d99df1ac74d319294edea335b684ae967

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

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 2457bb1760..a98cca9609 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -20,7 +20,7 @@ import classNames from 'classnames';
 import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
-import { isCtrlOrCmdKeyEvent } from '../../../Keyboard';
+import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
 
 import FlairStore from '../../../stores/FlairStore';
 
@@ -76,7 +76,7 @@ export default React.createClass({
         dis.dispatch({
             action: 'select_tag',
             tag: this.props.tag,
-            ctrlOrCmdKey: isCtrlOrCmdKeyEvent(e),
+            ctrlOrCmdKey: isOnlyCtrlOrCmdIgnoreShiftKeyEvent(e),
             shiftKey: e.shiftKey,
         });
     },

From eb4053bc9945690a489b86ce2fa8df5456267320 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 18:41:47 +0000
Subject: [PATCH 223/927] Handle sticker message payloads

---
 src/WidgetMessaging.js                   |  7 ++++++-
 src/components/structures/RoomView.js    |  7 +++++--
 src/components/views/elements/AppTile.js | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 4b50b21626..43d72e9ba0 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -253,8 +253,10 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
                 // Message endpoint already registered
                 console.warn("Endpoint already registered");
                 return;
+            } else {
+                console.warn(`Adding widget messaging endpoint for ${widgetId}`);
+                global.mxWidgetMessagingMessageEndpoints.push(endpoint);
             }
-            global.mxWidgetMessagingMessageEndpoints.push(endpoint);
         }
     }
 
@@ -322,6 +324,9 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
                 api: "widget",
                 version: WIDGET_API_VERSION,
             });
+        } else if (action === 'sticker_message') {
+            console.warn('got widget sticker message', widgetId);
+            dis.dispatch({action: 'sticker_message', data: event.data.data});
         } else {
             console.warn("Widget postMessage event unhandled");
             this.sendError(event, {message: "The postMessage was unhandled"});
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index a5e5273b82..7980e100ba 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -459,8 +459,11 @@ module.exports = React.createClass({
             case 'message_sent':
                 this._checkIfAlone(this.state.room);
                 break;
-            case 'inject_sticker':
-              this.injectSticker(payload.url, payload.info, payload.text);
+            case 'post_sticker_message':
+              this.injectSticker(
+                  payload.data.content.url,
+                  payload.data.content.info,
+                  payload.data.description || payload.data.name);
               break;
             case 'picture_snapshot':
                 this.uploadFile(payload.file);
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 2fbb30ff90..9e24c12cd5 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -333,7 +333,7 @@ export default React.createClass({
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
-        // console.warn("App frame", this.refs.appFrame.contentWindow);
+        console.warn("App frame loaded", this.props.id);
         this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
@@ -345,8 +345,22 @@ export default React.createClass({
             console.log("Failed to get widget capabilities", this.widgetId, err);
         });
         this.setState({loading: false});
+
+        dis.register(this._onAction);
     },
 
+    _onAction(payload) {
+      switch (payload) {
+        case payload.action === 'sticker_message':
+          if (this._hasCapability('sticker_message')) {
+            dis.dispatch({action: 'post_sticker_message', data: payload.data});
+          } else {
+            console.warn('Ignoring sticker message. Invalid capability');
+          }
+          break;
+      }
+  },
+
     /**
      * Set remote content title on AppTile
      * @param {string} url Url to check for title

From 32aecd06304ccac283eba35b6c9a77233508888e Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 18:43:08 +0000
Subject: [PATCH 224/927] Fix event call

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

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 4b50b21626..934f9bc3f2 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -208,7 +208,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
     startListening() {
         this.start();
         if (global.mxWidgetMessagingListenerCount === 0) {
-            window.addEventListener("message", () => this.onMessage, false);
+            window.addEventListener("message", (evt) => this.onMessage(evt), false);
         }
         global.mxWidgetMessagingListenerCount += 1;
     }

From d20aebfbd76ef038d3c96322ffe3b9d52b56bdeb Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 18:58:55 +0000
Subject: [PATCH 225/927] Correctly handle sticker message events.

---
 src/WidgetMessaging.js                   |  3 +--
 src/components/views/elements/AppTile.js | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 1b66dd89dd..4e64cedbc1 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -325,8 +325,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
                 version: WIDGET_API_VERSION,
             });
         } else if (action === 'sticker_message') {
-            console.warn('got widget sticker message', widgetId);
-            dis.dispatch({action: 'sticker_message', data: event.data.data});
+            dis.dispatch({action: 'sticker_message', data: event.data.widgetData, widgetId: event.data.widgetId});
         } else {
             console.warn("Widget postMessage event unhandled");
             this.sendError(event, {message: "The postMessage was unhandled"});
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 9e24c12cd5..49e747b05e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -350,16 +350,18 @@ export default React.createClass({
     },
 
     _onAction(payload) {
-      switch (payload) {
-        case payload.action === 'sticker_message':
-          if (this._hasCapability('sticker_message')) {
-            dis.dispatch({action: 'post_sticker_message', data: payload.data});
-          } else {
-            console.warn('Ignoring sticker message. Invalid capability');
-          }
-          break;
-      }
-  },
+        if (payload.widgetId === this.props.id) {
+            switch (payload.action) {
+                case 'sticker_message':
+                if (this._hasCapability('sticker_message')) {
+                    dis.dispatch({action: 'post_sticker_message', data: payload.data});
+                } else {
+                    console.warn('Ignoring sticker message. Invalid capability');
+                }
+                break;
+            }
+        }
+    },
 
     /**
      * Set remote content title on AppTile

From a7aa0a3b276cd8c40c29924802d0b7990792cbdf Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Thu, 4 Jan 2018 21:28:06 +0000
Subject: [PATCH 226/927] Translated using Weblate (Russian)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index b749b470bc..253436e7ae 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1047,5 +1047,11 @@
     "Old cryptography data detected": "Обнаружены старые криптографические данные",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Обнаружены данные из более старой версии Riot. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText> или <cancelText>отменить все</cancelText>.",
-    "Warning": "Предупреждение"
+    "Warning": "Предупреждение",
+    "Showing flair for these communities:": "Показ таланта этим сообществам",
+    "This room is not showing flair for any communities": "Эта комната не показывает талант любым сообществам",
+    "Flair will appear if enabled in room settings": "Талант появится, если включено в настройках комнаты",
+    "Flair": "Талант",
+    "Flair will not appear": "Талант не появится",
+    "Display your community flair in rooms configured to show it.": "Покажите свое чутье в комнатах, настроенных для показа."
 }

From 54671ab67ed65f31ba5bc9e74a4f57ff9c6f6f79 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 21:57:24 +0000
Subject: [PATCH 227/927] Send m.sticker messages

---
 src/ContentMessages.js                | 4 ++--
 src/components/structures/RoomView.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index a173a9f727..47ad87a8d7 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -275,8 +275,8 @@ class ContentMessages {
         this.nextId = 0;
     }
 
-    sendURLContentToRoom(url, roomId, info, text, matrixClient) {
-      return MatrixClientPeg.get().sendImageMessage(roomId, url, info, text).catch((e) => {
+    sendStickerContentToRoom(url, roomId, info, text, matrixClient) {
+      return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
         console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
       });
     }
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 7980e100ba..60987fe26e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -916,7 +916,7 @@ module.exports = React.createClass({
             return;
         }
 
-        ContentMessages.sendURLContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
+        ContentMessages.sendStickerContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
           .done(undefined, (error) => {
               if (error.name === "UnknownDeviceError") {
                   // Let the staus bar handle this

From 1c8586e80294ba1e281b13dee5074356873235f2 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 22:21:38 +0000
Subject: [PATCH 228/927] Add sticker message rendering.

---
 src/components/views/messages/MStickerBody.js | 253 ++++++++++++++++++
 src/components/views/messages/MessageEvent.js |  13 +-
 2 files changed, 261 insertions(+), 5 deletions(-)
 create mode 100644 src/components/views/messages/MStickerBody.js

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
new file mode 100644
index 0000000000..8424bbca22
--- /dev/null
+++ b/src/components/views/messages/MStickerBody.js
@@ -0,0 +1,253 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'use strict';
+
+import React from 'react';
+import MFileBody from './MFileBody';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import ImageUtils from '../../../ImageUtils';
+import Modal from '../../../Modal';
+import sdk from '../../../index';
+import dis from '../../../dispatcher';
+import { decryptFile, readBlobAsDataUri } from '../../../utils/DecryptFile';
+import Promise from 'bluebird';
+import { _t } from '../../../languageHandler';
+import SettingsStore from "../../../settings/SettingsStore";
+
+module.exports = React.createClass({
+    displayName: 'MStickerBody',
+
+    propTypes: {
+        /* the MatrixEvent to show */
+        mxEvent: React.PropTypes.object.isRequired,
+
+        /* called when the image has loaded */
+        onWidgetLoad: React.PropTypes.func.isRequired,
+    },
+
+    getInitialState: function() {
+        return {
+            decryptedUrl: null,
+            decryptedThumbnailUrl: null,
+            decryptedBlob: null,
+            error: null,
+        };
+    },
+
+
+    onClick: function onClick(ev) {
+        if (ev.button == 0 && !ev.metaKey) {
+            ev.preventDefault();
+            const content = this.props.mxEvent.getContent();
+            const httpUrl = this._getContentUrl();
+            const ImageView = sdk.getComponent("elements.ImageView");
+            const params = {
+                src: httpUrl,
+                name: content.body && content.body.length > 0 ? content.body : _t('Attachment'),
+                mxEvent: this.props.mxEvent,
+            };
+
+            if (content.info) {
+                params.width = content.info.w;
+                params.height = content.info.h;
+                params.fileSize = content.info.size;
+            }
+
+            Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
+        }
+    },
+
+    _isGif: function() {
+        const content = this.props.mxEvent.getContent();
+        return (
+          content &&
+          content.info &&
+          content.info.mimetype === "image/gif"
+        );
+    },
+
+    onImageEnter: function(e) {
+        if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
+            return;
+        }
+        const imgElement = e.target;
+        imgElement.src = this._getContentUrl();
+    },
+
+    onImageLeave: function(e) {
+        if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
+            return;
+        }
+        const imgElement = e.target;
+        imgElement.src = this._getThumbUrl();
+    },
+
+    _getContentUrl: function() {
+        const content = this.props.mxEvent.getContent();
+        if (content.file !== undefined) {
+            return this.state.decryptedUrl;
+        } else {
+            return MatrixClientPeg.get().mxcUrlToHttp(content.url);
+        }
+    },
+
+    _getThumbUrl: function() {
+        const content = this.props.mxEvent.getContent();
+        if (content.file !== undefined) {
+            // Don't use the thumbnail for clients wishing to autoplay gifs.
+            if (this.state.decryptedThumbnailUrl) {
+                return this.state.decryptedThumbnailUrl;
+            }
+            return this.state.decryptedUrl;
+        } else {
+            return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600);
+        }
+    },
+
+    componentDidMount: function() {
+        this.dispatcherRef = dis.register(this.onAction);
+        this.fixupHeight();
+        const content = this.props.mxEvent.getContent();
+        if (content.file !== undefined && this.state.decryptedUrl === null) {
+            let thumbnailPromise = Promise.resolve(null);
+            if (content.info.thumbnail_file) {
+                thumbnailPromise = decryptFile(
+                    content.info.thumbnail_file,
+                ).then(function(blob) {
+                    return readBlobAsDataUri(blob);
+                });
+            }
+            let decryptedBlob;
+            thumbnailPromise.then((thumbnailUrl) => {
+                return decryptFile(content.file).then(function(blob) {
+                    decryptedBlob = blob;
+                    return readBlobAsDataUri(blob);
+                }).then((contentUrl) => {
+                    this.setState({
+                        decryptedUrl: contentUrl,
+                        decryptedThumbnailUrl: thumbnailUrl,
+                        decryptedBlob: decryptedBlob,
+                    });
+                    this.props.onWidgetLoad();
+                });
+            }).catch((err) => {
+                console.warn("Unable to decrypt attachment: ", err);
+                // Set a placeholder image when we can't decrypt the image.
+                this.setState({
+                    error: err,
+                });
+            }).done();
+        }
+    },
+
+    componentWillUnmount: function() {
+        dis.unregister(this.dispatcherRef);
+    },
+
+    onAction: function(payload) {
+        if (payload.action === "timeline_resize") {
+            this.fixupHeight();
+        }
+    },
+
+    fixupHeight: function() {
+        if (!this.refs.image) {
+            console.warn("Refusing to fix up height on MStickerBody with no image element");
+            return;
+        }
+
+        const content = this.props.mxEvent.getContent();
+        const timelineWidth = this.refs.body.offsetWidth;
+        const maxHeight = 600; // let images take up as much width as they can so long as the height doesn't exceed 600px.
+        // the alternative here would be 600*timelineWidth/800; to scale them down to fit inside a 4:3 bounding box
+
+        //console.log("trying to fit image into timelineWidth of " + this.refs.body.offsetWidth + " or " + this.refs.body.clientWidth);
+        let thumbHeight = null;
+        if (content.info) {
+            thumbHeight = ImageUtils.thumbHeight(content.info.w, content.info.h, timelineWidth, maxHeight);
+        }
+        this.refs.image.style.height = thumbHeight + "px";
+        // console.log("Image height now", thumbHeight);
+    },
+
+    render: function() {
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const content = this.props.mxEvent.getContent();
+
+        if (this.state.error !== null) {
+            return (
+                <span className="mx_MImageBody" ref="body">
+                    <img src="img/warning.svg" width="16" height="16" />
+                    { _t("Error decrypting image") }
+                </span>
+            );
+        }
+
+        if (content.file !== undefined && this.state.decryptedUrl === null) {
+            // Need to decrypt the attachment
+            // The attachment is decrypted in componentDidMount.
+            // For now add an img tag with a spinner.
+            return (
+                <span className="mx_MImageBody" ref="body">
+                    <div className="mx_MImageBody_thumbnail" ref="image" style={{
+                        "display": "flex",
+                        "alignItems": "center",
+                        "width": "100%",
+                    }}>
+                        <img src="img/spinner.gif" alt={content.body} width="32" height="32" style={{
+                            "margin": "auto",
+                        }} />
+                    </div>
+                </span>
+            );
+        }
+
+        const contentUrl = this._getContentUrl();
+        let thumbUrl;
+        if (this._isGif() && SettingsStore.getValue("autoplayGifsAndVideos")) {
+          thumbUrl = contentUrl;
+        } else {
+          thumbUrl = this._getThumbUrl();
+        }
+
+        if (thumbUrl) {
+            return (
+                <span className="mx_MImageBody" ref="body">
+                    <a href={contentUrl} onClick={this.onClick}>
+                        <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+                            alt={content.body}
+                            onLoad={this.props.onWidgetLoad}
+                            onMouseEnter={this.onImageEnter}
+                            onMouseLeave={this.onImageLeave} />
+                    </a>
+                </span>
+            );
+        } else if (content.body) {
+            return (
+                <span className="mx_MImageBody">
+                    { _t("Image '%(Body)s' cannot be displayed.", {Body: content.body}) }
+                </span>
+            );
+        } else {
+            return (
+                <span className="mx_MImageBody">
+                    { _t("This image cannot be displayed.") }
+                </span>
+            );
+        }
+    },
+});
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index deda1d8d20..7dd5661bb8 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -54,6 +54,7 @@ module.exports = React.createClass({
             'm.notice': sdk.getComponent('messages.TextualBody'),
             'm.emote': sdk.getComponent('messages.TextualBody'),
             'm.image': sdk.getComponent('messages.MImageBody'),
+            'm.sticker': sdk.getComponent('messages.MStickerBody'),
             'm.file': sdk.getComponent('messages.MFileBody'),
             'm.audio': sdk.getComponent('messages.MAudioBody'),
             'm.video': sdk.getComponent('messages.MVideoBody'),
@@ -69,10 +70,12 @@ module.exports = React.createClass({
             BodyType = bodyTypes['m.file'];
         }
 
-        return <BodyType ref="body" mxEvent={this.props.mxEvent} highlights={this.props.highlights}
-                    highlightLink={this.props.highlightLink}
-                    showUrlPreview={this.props.showUrlPreview}
-                    tileShape={this.props.tileShape}
-                    onWidgetLoad={this.props.onWidgetLoad} />;
+        return <BodyType
+            ref="body" mxEvent={this.props.mxEvent}
+            highlights={this.props.highlights}
+            highlightLink={this.props.highlightLink}
+            showUrlPreview={this.props.showUrlPreview}
+            tileShape={this.props.tileShape}
+            onWidgetLoad={this.props.onWidgetLoad} />;
     },
 });

From d652f117fb350c6de7fe5ccd309b356f32ed7521 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 22:36:29 +0000
Subject: [PATCH 229/927] Remove click handlers etc.

---
 src/components/views/messages/MStickerBody.js | 37 +++----------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 8424bbca22..38b45e4789 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -17,7 +17,6 @@ limitations under the License.
 'use strict';
 
 import React from 'react';
-import MFileBody from './MFileBody';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import ImageUtils from '../../../ImageUtils';
 import Modal from '../../../Modal';
@@ -48,29 +47,6 @@ module.exports = React.createClass({
         };
     },
 
-
-    onClick: function onClick(ev) {
-        if (ev.button == 0 && !ev.metaKey) {
-            ev.preventDefault();
-            const content = this.props.mxEvent.getContent();
-            const httpUrl = this._getContentUrl();
-            const ImageView = sdk.getComponent("elements.ImageView");
-            const params = {
-                src: httpUrl,
-                name: content.body && content.body.length > 0 ? content.body : _t('Attachment'),
-                mxEvent: this.props.mxEvent,
-            };
-
-            if (content.info) {
-                params.width = content.info.w;
-                params.height = content.info.h;
-                params.fileSize = content.info.size;
-            }
-
-            Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
-        }
-    },
-
     _isGif: function() {
         const content = this.props.mxEvent.getContent();
         return (
@@ -185,7 +161,6 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
         const content = this.props.mxEvent.getContent();
 
         if (this.state.error !== null) {
@@ -227,13 +202,11 @@ module.exports = React.createClass({
         if (thumbUrl) {
             return (
                 <span className="mx_MImageBody" ref="body">
-                    <a href={contentUrl} onClick={this.onClick}>
-                        <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
-                            alt={content.body}
-                            onLoad={this.props.onWidgetLoad}
-                            onMouseEnter={this.onImageEnter}
-                            onMouseLeave={this.onImageLeave} />
-                    </a>
+                    <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+                        alt={content.body}
+                        onLoad={this.props.onWidgetLoad}
+                        onMouseEnter={this.onImageEnter}
+                        onMouseLeave={this.onImageLeave} />
                 </span>
             );
         } else if (content.body) {

From 7b313b7acf31588d6018dc0b4669dab0269860c0 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 22:38:52 +0000
Subject: [PATCH 230/927] Comment logging.

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

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 4e64cedbc1..cd1e4a0996 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -254,7 +254,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
                 console.warn("Endpoint already registered");
                 return;
             } else {
-                console.warn(`Adding widget messaging endpoint for ${widgetId}`);
+                // console.warn(`Adding widget messaging endpoint for ${widgetId}`);
                 global.mxWidgetMessagingMessageEndpoints.push(endpoint);
             }
         }

From d256e473eb71b63dc2f9b18dbc2ceaeb7d1ac140 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 22:51:49 +0000
Subject: [PATCH 231/927] Fix header and remove unused deps.

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

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 38b45e4789..3fbd1b23e5 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 New Vector Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 57247493d9e9daedafdea78cb120df5448f8b71d Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 22:59:50 +0000
Subject: [PATCH 232/927] Remove unused deps.

---
 src/components/views/messages/MStickerBody.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 3fbd1b23e5..bd86eed568 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -19,8 +19,6 @@ limitations under the License.
 import React from 'react';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import ImageUtils from '../../../ImageUtils';
-import Modal from '../../../Modal';
-import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { decryptFile, readBlobAsDataUri } from '../../../utils/DecryptFile';
 import Promise from 'bluebird';

From 54d128658e5926eb095b3c5edc03d1b8b151aa0d Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 4 Jan 2018 23:00:10 +0000
Subject: [PATCH 233/927] Comment logging.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 49e747b05e..a9ea8c6cf9 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -333,7 +333,7 @@ export default React.createClass({
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
-        console.warn("App frame loaded", this.props.id);
+        // console.warn("App frame loaded", this.props.id);
         this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);

From 8731bfd0089e76b759b9b786fdd8c5410ed52517 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Thu, 4 Jan 2018 21:36:34 +0000
Subject: [PATCH 234/927] Translated using Weblate (Russian)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 253436e7ae..e3da0401bd 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1048,10 +1048,10 @@
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Обнаружены данные из более старой версии Riot. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText> или <cancelText>отменить все</cancelText>.",
     "Warning": "Предупреждение",
-    "Showing flair for these communities:": "Показ таланта этим сообществам",
+    "Showing flair for these communities:": "Показ таланта этим сообществам:",
     "This room is not showing flair for any communities": "Эта комната не показывает талант любым сообществам",
     "Flair will appear if enabled in room settings": "Талант появится, если включено в настройках комнаты",
-    "Flair": "Талант",
+    "Flair": "Чутье",
     "Flair will not appear": "Талант не появится",
     "Display your community flair in rooms configured to show it.": "Покажите свое чутье в комнатах, настроенных для показа."
 }

From cf472c791d580ccc0f5b3e419ec3f69e49ec50e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Fri, 5 Jan 2018 11:45:45 +0100
Subject: [PATCH 235/927] Consume all combinations of space / enter, keyDown /
 keyUp presses and try to explain this key handling inconsistency with some
 additional comments as per the review discussion.

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

diff --git a/src/components/views/elements/AccessibleButton.js b/src/components/views/elements/AccessibleButton.js
index f5254de490..ee8fd20d6f 100644
--- a/src/components/views/elements/AccessibleButton.js
+++ b/src/components/views/elements/AccessibleButton.js
@@ -32,12 +32,20 @@ export default function AccessibleButton(props) {
     // We need to consume enter onKeyDown and space onKeyUp
     // otherwise we are risking also activating other keyboard focusable elements
     // that might receive focus as a result of the AccessibleButtonClick action
+    // It's because we are using html buttons at a few places e.g. inside dialogs
+    // And divs which we report as role button to assistive technologies.
+    // Browsers handle space and enter keypresses differently and we are only adjusting to the
+    // inconsistencies here
     restProps.onKeyDown = function(e) {
         if (e.keyCode === KeyCode.ENTER) {
             e.stopPropagation();
             e.preventDefault();
             return onClick(e);
         }
+        if (e.keyCode === KeyCode.SPACE) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
     };
     restProps.onKeyUp = function(e) {
         if (e.keyCode === KeyCode.SPACE) {
@@ -45,6 +53,10 @@ export default function AccessibleButton(props) {
             e.preventDefault();
             return onClick(e);
         }
+        if (e.keyCode === KeyCode.ENTER) {
+            e.stopPropagation();
+            e.preventDefault();
+        }
     };
     restProps.tabIndex = restProps.tabIndex || "0";
     restProps.role = "button";

From 293bb15cccbcd26fc63e1ef739d41c39d5691a01 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 10:53:55 +0000
Subject: [PATCH 236/927] check PL and compare arrays rather than tracking
 changes

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

diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index f84f1d91cb..e1fc7cd80d 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -19,6 +19,7 @@ import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
+import isEqual from 'lodash/isEqual';
 
 const GROUP_ID_REGEX = /\+\S+\:\S+/;
 
@@ -43,15 +44,24 @@ module.exports = React.createClass({
 
     getInitialState: function() {
         return {
-            newGroupsList: this.props.relatedGroupsEvent ?
-                (this.props.relatedGroupsEvent.getContent().groups || []) : [],
-            hasChanged: false,
+            newGroupsList: this.getInitialGroupList(),
             newGroupId: null,
         };
     },
 
+    getInitialGroupList: function() {
+        return this.props.relatedGroupsEvent ? (this.props.relatedGroupsEvent.getContent().groups || []) : [];
+    },
+
+    needsSaving: function() {
+        const cli = this.context.matrixClient;
+        const room = cli.getRoom(this.props.roomId);
+        if (!room.currentState.maySendStateEvent('m.room.related_groups', cli.getUserId())) return false;
+        return isEqual(this.getInitialGroupList(), this.state.newGroupsList);
+    },
+
     saveSettings: function() {
-        if (!this.state.hasChanged) return Promise.resolve();
+        if (!this.needsSaving()) return Promise.resolve();
 
         return this.context.matrixClient.sendStateEvent(
             this.props.roomId,
@@ -85,7 +95,6 @@ module.exports = React.createClass({
         }
         this.setState({
             newGroupsList: this.state.newGroupsList.concat([groupId]),
-            hasChanged: true,
             newGroupId: '',
         });
     },
@@ -96,14 +105,13 @@ module.exports = React.createClass({
         }
         this.setState({
             newGroupsList: Object.assign(this.state.newGroupsList, {[index]: groupId}),
-            hasChanged: true,
         });
     },
 
     onGroupDeleted: function(index) {
         const newGroupsList = this.state.newGroupsList.slice();
         newGroupsList.splice(index, 1);
-        this.setState({ newGroupsList, hasChanged: true });
+        this.setState({ newGroupsList });
     },
 
     render: function() {

From a473971c7b6f84b8b16717883045b18248057265 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 11:11:20 +0000
Subject: [PATCH 237/927] negate for less indentation

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

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 9ea749c98e..5afd0a4a64 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -445,47 +445,49 @@ module.exports = withMatrixClient(React.createClass({
         const powerLevelEvent = room.currentState.getStateEvents("m.room.power_levels", "");
         if (!powerLevelEvent) return;
 
-        if (powerLevelEvent.getContent().users) {
-            const myUserId = this.props.matrixClient.getUserId();
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+        if (!powerLevelEvent.getContent().users) {
+            this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+            return;
+        }
 
-            if (myUserId === target) {
-                Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
-                    title: _t("Warning!"),
-                    description:
-                        <div>
-                            { _t("You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.") }<br />
-                            { _t("Are you sure?") }
-                        </div>,
-                    button: _t("Continue"),
-                    onFinished: (confirmed) => {
-                        if (confirmed) {
-                            this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-                        }
-                    },
-                });
-                return;
-            }
+        const myUserId = this.props.matrixClient.getUserId();
+        const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
-            const myPower = powerLevelEvent.getContent().users[myUserId];
-            if (parseInt(myPower) === parseInt(powerLevel)) {
-                Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
-                    title: _t("Warning!"),
-                    description:
-                        <div>
-                            { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }<br />
-                            { _t("Are you sure?") }
-                        </div>,
-                    button: _t("Continue"),
-                    onFinished: (confirmed) => {
-                        if (confirmed) {
-                            this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
-                        }
-                    },
-                });
-                return;
-            }
+        if (myUserId === target) {
+            Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
+                title: _t("Warning!"),
+                description:
+                    <div>
+                        { _t("You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.") }<br />
+                        { _t("Are you sure?") }
+                    </div>,
+                button: _t("Continue"),
+                onFinished: (confirmed) => {
+                    if (confirmed) {
+                        this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+                    }
+                },
+            });
+            return;
+        }
 
+        const myPower = powerLevelEvent.getContent().users[myUserId];
+        if (parseInt(myPower) === parseInt(powerLevel)) {
+            Modal.createTrackedDialog('Promote to PL100 Warning', '', QuestionDialog, {
+                title: _t("Warning!"),
+                description:
+                    <div>
+                        { _t("You will not be able to undo this change as you are promoting the user to have the same power level as yourself.") }<br />
+                        { _t("Are you sure?") }
+                    </div>,
+                button: _t("Continue"),
+                onFinished: (confirmed) => {
+                    if (confirmed) {
+                        this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
+                    }
+                },
+            });
+            return;
         }
         this._applyPowerChange(roomId, target, powerLevel, powerLevelEvent);
     },

From a8bd4bf858370f31d1f1193086ce66f3cac1352b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 11:55:43 +0000
Subject: [PATCH 238/927] add comment

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

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 5afd0a4a64..688f1084b6 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -453,6 +453,7 @@ module.exports = withMatrixClient(React.createClass({
         const myUserId = this.props.matrixClient.getUserId();
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
 
+        // If we are changing our own PL it can only ever be decreasing, which we cannot reverse.
         if (myUserId === target) {
             Modal.createTrackedDialog('Demoting Self', '', QuestionDialog, {
                 title: _t("Warning!"),

From 558a90a359ed5799509389a7185fad71996f0dec Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 11:58:42 +0000
Subject: [PATCH 239/927] comment out RoomView.onStatusBarHidden

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index e240ab38d5..c49831baa3 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1347,10 +1347,12 @@ module.exports = React.createClass({
     },
 
     onStatusBarHidden: function() {
-        if (this.unmounted) return;
+        // This is currently nor desired as it is annoying if it keeps expanding and collapsing
+        // TODO: Find a less annoying way of hiding the status bar
+        /*if (this.unmounted) return;
         this.setState({
             statusBarVisible: false,
-        });
+        });*/
     },
 
     showSettings: function(show) {

From 9f295b7a86f90c14e8297f9f955ed4cd5a8bd482 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 5 Jan 2018 12:03:46 +0000
Subject: [PATCH 240/927] fix typo

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 c49831baa3..f93c37f24d 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1347,7 +1347,7 @@ module.exports = React.createClass({
     },
 
     onStatusBarHidden: function() {
-        // This is currently nor desired as it is annoying if it keeps expanding and collapsing
+        // This is currently not desired as it is annoying if it keeps expanding and collapsing
         // TODO: Find a less annoying way of hiding the status bar
         /*if (this.unmounted) return;
         this.setState({

From d3624886a7d7c8f67a3ca1cc78e3db557353bfef Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 5 Jan 2018 12:09:17 +0000
Subject: [PATCH 241/927] Translated using Weblate (Russian)

Currently translated at 100.0% (958 of 958 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e3da0401bd..7a0fa54c22 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1048,10 +1048,10 @@
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Обнаружены данные из более старой версии Riot. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText> или <cancelText>отменить все</cancelText>.",
     "Warning": "Предупреждение",
-    "Showing flair for these communities:": "Показ таланта этим сообществам:",
-    "This room is not showing flair for any communities": "Эта комната не показывает талант любым сообществам",
-    "Flair will appear if enabled in room settings": "Талант появится, если включено в настройках комнаты",
-    "Flair": "Чутье",
-    "Flair will not appear": "Талант не появится",
-    "Display your community flair in rooms configured to show it.": "Покажите свое чутье в комнатах, настроенных для показа."
+    "Showing flair for these communities:": "Показ таланта в следующих сообществах:",
+    "This room is not showing flair for any communities": "В этой комнате не отображается талант для любых сообществ",
+    "Flair will appear if enabled in room settings": "Талант появится, если он активирован в настройках комнаты",
+    "Flair": "Талант",
+    "Flair will not appear": "Талант не отображается",
+    "Display your community flair in rooms configured to show it.": "Покажите свой талант в комнатах, которых это разрешено."
 }

From 44d920afc81cf8e5b530fa3fff517228005f480b Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Fri, 5 Jan 2018 12:26:31 +0000
Subject: [PATCH 242/927] Translated using Weblate (Russian)

Currently translated at 100.0% (961 of 961 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1eb0e0e73c..59f639d5e3 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1053,5 +1053,9 @@
     "Flair will appear if enabled in room settings": "Талант появится, если он активирован в настройках комнаты",
     "Flair": "Талант",
     "Flair will not appear": "Талант не отображается",
-    "Display your community flair in rooms configured to show it.": "Покажите свой талант в комнатах, которых это разрешено."
+    "Display your community flair in rooms configured to show it.": "Покажите свой талант в комнатах, которых это разрешено.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Вы не сможете отменить это изменение после понижения себя, в случае если вы являетесь последним привилегированным пользователем в этой комнате.",
+    "%(count)s of your messages have not been sent.|one": "Ваше сообщение не было отправлено.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Отправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для отправки или отмены.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Отправить</resendText> или <cancelText>отменить</cancelText> сообщение сейчас."
 }

From 8ade357349443334c265e0fcc016c0d4a10a63a9 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 5 Jan 2018 12:33:26 +0000
Subject: [PATCH 243/927] Handle newly added rooms and removed rooms.

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index e21f539d3f..1c548b3f72 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -92,9 +92,9 @@ module.exports = React.createClass({
         this._visibleRoomsForGroup = {
             // $groupId: [$roomId1, $roomId2, ...],
         };
-        // All rooms that should be kept in the room list when filtering
-        // By default, set to `null` meaning "all rooms visible"
-        this._visibleRooms = null;
+        // All rooms that should be kept in the room list when filtering.
+        // By default, show all rooms.
+        this._visibleRooms = MatrixClientPeg.get().getRooms();
         // When the selected tags are changed, initialise a group store if necessary
         this._tagStoreToken = TagOrderStore.addListener(() => {
             TagOrderStore.getSelectedTags().forEach((tag) => {
@@ -197,11 +197,11 @@ module.exports = React.createClass({
     },
 
     onRoom: function(room) {
-        this._delayedRefreshRoomList();
+        this.updateVisibleRooms();
     },
 
     onDeleteRoom: function(roomId) {
-        this._delayedRefreshRoomList();
+        this.updateVisibleRooms();
     },
 
     onArchivedHeaderClick: function(isHidden, scrollToPosition) {
@@ -321,7 +321,7 @@ module.exports = React.createClass({
             this._visibleRooms = Array.from(roomSet);
         } else {
             // Show all rooms
-            this._visibleRooms = null;
+            this._visibleRooms = MatrixClientPeg.get().getRooms();
         }
 
         this.setState({
@@ -360,7 +360,7 @@ module.exports = React.createClass({
 
         const dmRoomMap = DMRoomMap.shared();
 
-        (this._visibleRooms || MatrixClientPeg.get().getRooms()).forEach((room, index) => {
+        this._visibleRooms.forEach((room, index) => {
             const me = room.getMember(MatrixClientPeg.get().credentials.userId);
             if (!me) return;
 

From f1850d188ece109724c5d60bc79f03d4277f0717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 5 Jan 2018 13:17:02 +0000
Subject: [PATCH 244/927] Translated using Weblate (French)

Currently translated at 100.0% (961 of 961 strings)

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

Correction (Seul -> Seules)
---
 src/i18n/strings/fr.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 450fa424d3..7f7db6a0b2 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1050,5 +1050,9 @@
     "Old cryptography data detected": "Anciennes données de chiffrement détectées",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nous avons détecté des données d'une ancienne version de Riot. Le chiffrement de bout-en-bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText> ou <cancelText>tout annuler</cancelText>.",
-    "Warning": "Attention"
+    "Warning": "Attention",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Vous ne pourrez pas annuler cette modification car vous vous destituez. Si vous êtes le dernier utilisateur privilégié de ce salon, il sera impossible de récupérer les privilèges.",
+    "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant."
 }

From 1e66f4f0ed8c8d75b7626725c8cec4a88bfb9022 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 5 Jan 2018 14:31:01 +0000
Subject: [PATCH 245/927] Translated using Weblate (Basque)

Currently translated at 100.0% (961 of 961 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index cbdd6509cc..f34bee26ca 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1042,5 +1042,9 @@
     "Dark theme": "Gai iluna",
     "Status.im theme": "Status.im gaia",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s helbidera e-mail bat bidali da. Behin dakarren esteka jarraituta, egin klik behean.",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Hasiera zerbitzari honek ez du bezero honek onartzen duen fluxurik eskaintzen."
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Hasiera zerbitzari honek ez du bezero honek onartzen duen fluxurik eskaintzen.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu.",
+    "%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain."
 }

From 8509db1bda48a3853723a48f99082554501ba680 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 5 Jan 2018 14:53:04 +0000
Subject: [PATCH 246/927] Cache isConfCallRoom

This only needs to be calculated one per room
---
 src/Rooms.js | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/Rooms.js b/src/Rooms.js
index 6cc2d867a6..ffa39141ff 100644
--- a/src/Rooms.js
+++ b/src/Rooms.js
@@ -43,7 +43,7 @@ export function getOnlyOtherMember(room, me) {
     return null;
 }
 
-export function isConfCallRoom(room, me, conferenceHandler) {
+function _isConfCallRoom(room, me, conferenceHandler) {
     if (!conferenceHandler) return false;
 
     if (me.membership != "join") {
@@ -58,6 +58,26 @@ export function isConfCallRoom(room, me, conferenceHandler) {
     if (conferenceHandler.isConferenceUser(otherMember.userId)) {
         return true;
     }
+
+    return false;
+}
+
+// Cache whether a room is a conference call. Assumes that rooms will always
+// either will or will not be a conference call room.
+const isConfCallRoomCache = {
+    // $roomId: bool
+};
+
+export function isConfCallRoom(room, me, conferenceHandler) {
+    if (isConfCallRoomCache[room.roomId] !== undefined) {
+        return isConfCallRoomCache[room.roomId];
+    }
+
+    const result = _isConfCallRoom(room, me, conferenceHandler);
+
+    isConfCallRoomCache[room.roomId] = result;
+
+    return result;
 }
 
 export function looksLikeDirectMessageRoom(room, me) {

From f6b24b749fdf95552743e970bd4661c535ddc7b2 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 5 Jan 2018 14:49:38 +0000
Subject: [PATCH 247/927] Translated using Weblate (Basque)

Currently translated at 100.0% (961 of 961 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index f34bee26ca..9b93d88bc2 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -88,7 +88,7 @@
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Irakurri zure e-maila eta egin klik dakarren estekan. Behin eginda, egin klik Jarraitu botoian.",
     "This email address is already in use": "E-mail helbide hau erabilita dago",
     "This phone number is already in use": "Telefono zenbaki hau erabilita dago",
-    "Topic": "Gaia",
+    "Topic": "Mintzagaia",
     "none": "bat ere ez",
     "Who can read history?": "Nork irakurri dezake historiala?",
     "Who can access this room?": "Nor sartu daiteke gelara?",
@@ -149,7 +149,7 @@
     "Access Token:": "Sarbide tokena:",
     "Active call (%(roomName)s)": "Dei aktiboa (%(roomName)s)",
     "Add": "Gehitu",
-    "Add a topic": "Gehitu gai bat",
+    "Add a topic": "Gehitu mintzagai bat",
     "Admin": "Kudeatzailea",
     "Admin Tools": "Administrazio-tresnak",
     "VoIP": "VoIP",
@@ -222,7 +222,7 @@
     "%(senderName)s answered the call.": "%(senderName)s erabiltzaileak deia erantzun du.",
     "Can't load user settings": "Ezin izan dira erabiltzailearen ezarpenak kargatu",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s erabiltzaileak gelaren izena kendu du.",
-    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s erabiltzaileak gaia aldatu du beste honetara: \"%(topic)s\".",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s erabiltzaileak mintzagaia aldatu du beste honetara: \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Historiala irakurtzeko baimenen aldaketak gela honetara hemendik aurrera heldutako mezuei aplikatuko zaizkie",
     "Clear Cache and Reload": "Garbitu cachea eta birkargatu",
     "Devices will not yet be able to decrypt history from before they joined the room": "Gailuek ezin izango dute taldera elkartu aurretiko historiala deszifratu",
@@ -647,7 +647,7 @@
     "Failed to invite user": "Huts egin du erabiltzailea gonbidatzean",
     "Failed to invite the following users to the %(roomName)s room:": "Huts egin du honako erabiltzaile hauek %(roomName)s gelara gonbidatzean:",
     "Confirm Removal": "Berretsi kentzea",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Ziur gertaera hau kendu (ezabatu) nahi duzula? Jakin gelaren izenaren edo gaiaren aldaketa ezabatzen baduzu, desegitea dagoela.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Ziur gertaera hau kendu (ezabatu) nahi duzula? Jakin gelaren izenaren edo mintzagaiaren aldaketa ezabatzen baduzu, aldaketa desegin daitekeela.",
     "Unknown error": "Errore ezezaguna",
     "Incorrect password": "Pasahitz okerra",
     "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Honek zure kontua behin betiko erabilezin bihurtuko du. Ezin izango duzu ID honekin berriro erregistratu.",
@@ -749,7 +749,7 @@
     "PM": "PM",
     "NOTE: Apps are not end-to-end encrypted": "OHARRA: Aplikazioek ez dute muturretik muturrerako zifratzea",
     "Revoke widget access": "Indargabetu trepetaren sarbidea",
-    "Sets the room topic": "Gelaren gaia ezartzen du",
+    "Sets the room topic": "Gelaren mintzagaia ezartzen du",
     "Show Apps": "Erakutsi aplikazioak",
     "The maximum permitted number of widgets have already been added to this room.": "Gehienez onartzen diren trepeta kopurua gehitu da gela honetara.",
     "To get started, please pick a username!": "Hasteko, hautatu erabiltzaile-izen bat!",
@@ -876,7 +876,7 @@
     "To change the room's main address, you must be a": "Gelaren helbide nagusia aldatzeko, hau izan behar zara:",
     "To change the room's history visibility, you must be a": "Gelaren ikusgaitasuna aldatzeko, hau izan behar zara:",
     "To change the permissions in the room, you must be a": "Gelaren baimenak aldatzeko, hau izan behar zara:",
-    "To change the topic, you must be a": "Gaia aldatzeko, hau izan behar zara:",
+    "To change the topic, you must be a": "Mintzagaia aldatzeko, hau izan behar zara:",
     "To modify widgets in the room, you must be a": "Gelaren trepetak aldatzeko, hau izan behar zara:",
     "Members only (since the point in time of selecting this option)": "Kideak besterik ez (aukera hau hautatzen den unetik)",
     "Members only (since they were invited)": "Kideak besterik ez (gonbidatu zaienetik)",
@@ -1038,9 +1038,9 @@
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText> edo <cancelText>baztertu guztia</cancelText>.",
     "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Birbidali guztia</resendText> edo <cancelText>baztertu guztia</cancelText> orain. Banakako mezuak aukeratu ditzakezu ere birbidali edo baztertzeko.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
-    "Light theme": "Gai argia",
-    "Dark theme": "Gai iluna",
-    "Status.im theme": "Status.im gaia",
+    "Light theme": "Itxura argia",
+    "Dark theme": "Itxura iluna",
+    "Status.im theme": "Status.im itxura",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "%(emailAddress)s helbidera e-mail bat bidali da. Behin dakarren esteka jarraituta, egin klik behean.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Hasiera zerbitzari honek ez du bezero honek onartzen duen fluxurik eskaintzen.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu.",

From b49c5a4c161e7d6900efa7c11f719f243743832a Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 5 Jan 2018 17:26:53 +0000
Subject: [PATCH 248/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (961 of 961 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 45109d2a85..92f1005376 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1054,5 +1054,9 @@
     "Old cryptography data detected": "Régi titkosítási adatot találhatók",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Régebbi Riot verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Eszközök megmutatása</showDevicesText> vagy <cancelText>mind elutasítása</cancelText>.",
-    "Warning": "Figyelmeztetés"
+    "Warning": "Figyelmeztetés",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ahogy lefokozod magad a változás visszafordíthatatlan, ha te vagy az utolsó jogosultságokkal bíró felhasználó a szobában a jogok már nem szerezhetők vissza.",
+    "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Újraküldöd mind</resendText> vagy <cancelText>elveted mind</cancelText>. Az üzeneteket egyenként is elküldheted vagy elvetheted.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Üzenet újraküldése</resendText> vagy <cancelText>üzenet elvetése</cancelText> most."
 }

From a88f92c3e34404029bc888c1b747a219f4488711 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Sun, 7 Jan 2018 20:30:18 +0000
Subject: [PATCH 249/927] Revert "MD-escape URLs/alises/user IDs prior to
 parsing markdown"

---
 src/Markdown.js | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/Markdown.js b/src/Markdown.js
index e05f163ba5..aa1c7e45b1 100644
--- a/src/Markdown.js
+++ b/src/Markdown.js
@@ -55,25 +55,6 @@ function is_multi_line(node) {
     return par.firstChild != par.lastChild;
 }
 
-import linkifyMatrix from './linkify-matrix';
-import * as linkify from 'linkifyjs';
-linkifyMatrix(linkify);
-
-// Thieved from draft-js-export-markdown
-function escapeMarkdown(s) {
-    return s.replace(/[*_`]/g, '\\$&');
-}
-
-// Replace URLs, room aliases and user IDs with md-escaped URLs
-function linkifyMarkdown(s) {
-    const links = linkify.find(s);
-    links.forEach((l) => {
-        // This may replace several instances of `l.value` at once, but that's OK
-        s = s.replace(l.value, escapeMarkdown(l.value));
-    });
-    return s;
-}
-
 /**
  * Class that wraps commonmark, adding the ability to see whether
  * a given message actually uses any markdown syntax or whether
@@ -81,7 +62,7 @@ function linkifyMarkdown(s) {
  */
 export default class Markdown {
     constructor(input) {
-        this.input = linkifyMarkdown(input);
+        this.input = input;
 
         const parser = new commonmark.Parser();
         this.parsed = parser.parse(this.input);

From f6851101cc435597d44bceb425328dcd48119543 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sun, 7 Jan 2018 17:33:13 +0000
Subject: [PATCH 250/927] Translated using Weblate (Basque)

Currently translated at 100.0% (961 of 961 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 9b93d88bc2..2019c76dbc 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -300,7 +300,7 @@
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' ez da baliozko formatua helbide batentzat",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ez da baliozko formatua ezizen batentzat",
     "%(displayName)s is typing": "%(displayName)s idazten ari da",
-    "Sign in with": "Hasi saioa honekin:",
+    "Sign in with": "Hasi saioa hau erabilita:",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Elkartu <voiceText>ahotsa</voiceText> edo <videoText>bideoa</videoText> erabiliz.",
     "%(targetName)s joined the room.": "%(targetName)s erabiltzailea gelara elkartu da.",
     "Joins room with given alias": "Gelara emandako ezizenarekin elkartu da",
@@ -676,8 +676,8 @@
     "Please enter the code it contains:": "Sartu dakarren kodea:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ez baduzu e-mail helbide bat zehazten, ezin izango duzu zure pasahitza berrezarri. Ziur zaude?",
     "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s erabiliz erregistratzen ari zara",
-    "Default server": "Lehenetsitako zerbitzaria",
-    "Custom server": "Zerbitzari pertsonalizatua",
+    "Default server": "Zerbitzari lenetetsia",
+    "Custom server": "Zerbitzari aukeratua",
     "Home server URL": "Hasiera zerbitzariaren URLa",
     "Identity server URL": "Identitate zerbitzariaren URLa",
     "What does this mean?": "Zer esan nahi du honek?",

From 76ce40715d3a525df79bd8a9dc12817764a5c619 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 7 Jan 2018 20:32:41 +0000
Subject: [PATCH 251/927] bump commonmark dep to try to fix
 https://github.com/vector-im/riot-web/issues/3428 better

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

diff --git a/package.json b/package.json
index 943c443c59..eb2cabf854 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "browser-encrypt-attachment": "^0.3.0",
     "browser-request": "^0.3.3",
     "classnames": "^2.1.2",
-    "commonmark": "^0.27.0",
+    "commonmark": "^0.28.1",
     "counterpart": "^0.18.0",
     "draft-js": "^0.11.0-alpha",
     "draft-js-export-html": "^0.6.0",

From 275c960337a4930855f31557bb7b58ad7ac168a8 Mon Sep 17 00:00:00 2001
From: "Iru Cai (vimacs)" <mytbk920423@gmail.com>
Date: Mon, 8 Jan 2018 02:00:48 +0000
Subject: [PATCH 252/927] Translated using Weblate (Chinese (Simplified))

Currently translated at 76.8% (739 of 961 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 11aa4330ff..976b39a8bd 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -712,5 +712,102 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 移除",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小组建被 %(senderName)s 修改",
     "Unpin Message": "取消置顶消息",
-    "Add rooms to this community": "添加聊天室到此社区"
+    "Add rooms to this community": "添加聊天室到此社区",
+    "Call Failed": "呼叫失败",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "聊天室里有未知设备：如果你不检查它们而继续，可能有人窃听你的通话。",
+    "Review Devices": "复查设备",
+    "Call Anyway": "无论如何呼叫",
+    "Answer Anyway": "无论如何接听",
+    "Call": "呼叫",
+    "Answer": "接听",
+    "Invite new community members": "邀请新的社区成员",
+    "Invite to Community": "邀请到社区",
+    "Room name or alias": "聊天室名称或别名",
+    "Ignored user": "忽视用户",
+    "You are now ignoring %(userId)s": "你正在忽视 %(userId)s",
+    "Unignored user": "接触忽视用户",
+    "You are no longer ignoring %(userId)s": "你不再忽视 %(userId)s",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s 解除了 %(targetName)s 的封禁。",
+    "(could not connect media)": "（无法连接媒体）",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 更改了聊天室的置顶消息。",
+    "%(names)s and %(count)s others are typing|other": "%(names)s 和另外 %(count)s 个人正在打字",
+    "%(names)s and %(count)s others are typing|one": "%(names)s 和另一个人正在打字",
+    "Send": "发送",
+    "Message Pinning": "消息置顶",
+    "Disable Emoji suggestions while typing": "禁用打字时Emoji建议",
+    "Use compact timeline layout": "使用紧凑的时间线布局",
+    "Hide avatar changes": "隐藏头像修改",
+    "Hide display name changes": "隐藏显示名称的修改",
+    "Disable big emoji in chat": "禁用聊天中的大Emoji",
+    "Never send encrypted messages to unverified devices in this room from this device": "在这个聊天室永不从这个设备发送加密消息到未验证的设备",
+    "Enable URL previews for this room (only affects you)": "在这个聊天室启用 URL 预览（只影响你）",
+    "Enable URL previews by default for participants in this room": "对这个聊天室的参与者默认启用 URL 预览",
+    "Delete %(count)s devices|other": "删除了 %(count)s 个设备",
+    "Delete %(count)s devices|one": "删除设备",
+    "Select devices": "选择设备",
+    "%(senderName)s sent an image": "%(senderName)s 发送了一张图片",
+    "%(senderName)s sent a video": "%(senderName)s 发送了一个视频",
+    "%(senderName)s uploaded a file": "%(senderName)s 上传了一个文件",
+    "Unignore": "取消忽视",
+    "Ignore": "忽视",
+    "Jump to read receipt": "跳到阅读回执",
+    "Mention": "提及",
+    "Invite": "邀请",
+    "User Options": "用户选项",
+    "Jump to message": "跳到消息",
+    "No pinned messages.": "没有置顶消息。",
+    "Loading...": "正在加载...",
+    "Pinned Messages": "置顶的消息",
+    "Unknown": "未知的",
+    "Unnamed room": "未命名的聊天室",
+    "World readable": "公开可读",
+    "Guests can join": "访客可以加入",
+    "No rooms to show": "无聊天室",
+    "Addresses": "地址",
+    "Message removed": "消息已移除",
+    "An email has been sent to %(emailAddress)s": "一封邮件已发送到 %(emailAddress)s",
+    "A text message has been sent to %(msisdn)s": "一封短信已发送到 %(msisdn)s",
+    "Username on %(hs)s": "在 %(hs)s 上的用户名",
+    "Visible to everyone": "对所有人可见",
+    "Delete Widget": "删除小组件",
+    "were invited %(count)s times|other": "被邀请 %(count)s 次",
+    "were invited %(count)s times|one": "被邀请",
+    "was invited %(count)s times|other": "被邀请 %(count)s 次",
+    "was invited %(count)s times|one": "被邀请",
+    "were banned %(count)s times|other": "被封禁 %(count)s 次",
+    "were banned %(count)s times|one": "被封禁",
+    "was banned %(count)s times|other": "被封禁 %(count)s 次",
+    "was banned %(count)s times|one": "被封禁",
+    "were unbanned %(count)s times|other": "被解封 %(count)s 次",
+    "were unbanned %(count)s times|one": "被解封",
+    "was unbanned %(count)s times|other": "被解封 %(count)s 次",
+    "was unbanned %(count)s times|one": "被解封",
+    "were kicked %(count)s times|other": "被踢出 %(count)s 次",
+    "were kicked %(count)s times|one": "被踢出",
+    "was kicked %(count)s times|other": "被踢出 %(count)s 次",
+    "was kicked %(count)s times|one": "被踢出",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s 改了他们的名字 %(count)s 次",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s 改了他们的名字",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s 改了他们的名字 %(count)s 次",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s 改了他们的名字",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s 更换了他们的的头像 %(count)s 次",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s 更换了他们的头像",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s 更换了他们的头像 %(count)s 次",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s 更换了他们的头像",
+    "%(items)s and %(count)s others|other": "%(items)s 和其他 %(count)s 人",
+    "%(items)s and %(count)s others|one": "%(items)s 和另一个人",
+    "collapse": "折叠",
+    "expand": "展开",
+    "email address": "电子邮箱地址",
+    "You have entered an invalid address.": "你输入了一个无效地址。",
+    "Advanced options": "高级选项",
+    "Leave": "离开",
+    "Unable to leave room": "无法离开聊天室",
+    "Description": "描述",
+    "Warning": "警告",
+    "Light theme": "浅色主题",
+    "Dark theme": "深色主题",
+    "Status.im theme": "Status.im 主题",
+    "Ignored Users": "忽视用户",
+    "Room Notification": "聊天室通知"
 }

From dc1423052fc4fcceda6f7997e48e898ed93928ff Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 8 Jan 2018 11:32:23 +0000
Subject: [PATCH 253/927] De-register listener.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index a9ea8c6cf9..fa8696ea74 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -229,6 +229,7 @@ export default React.createClass({
     componentWillUnmount() {
         this.widgetMessaging.stopListening();
         this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+        dis.unregister(this._onAction);
         window.removeEventListener('message', this._onMessage);
     },
 

From 486b2cf10259170c7478726c089ecd1bf9b749e4 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 8 Jan 2018 11:32:38 +0000
Subject: [PATCH 254/927] Handle sticker message event.

---
 src/components/views/messages/MessageEvent.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 7dd5661bb8..53cbc3e5d3 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -54,7 +54,6 @@ module.exports = React.createClass({
             'm.notice': sdk.getComponent('messages.TextualBody'),
             'm.emote': sdk.getComponent('messages.TextualBody'),
             'm.image': sdk.getComponent('messages.MImageBody'),
-            'm.sticker': sdk.getComponent('messages.MStickerBody'),
             'm.file': sdk.getComponent('messages.MFileBody'),
             'm.audio': sdk.getComponent('messages.MAudioBody'),
             'm.video': sdk.getComponent('messages.MVideoBody'),
@@ -65,6 +64,8 @@ module.exports = React.createClass({
         let BodyType = UnknownBody;
         if (msgtype && bodyTypes[msgtype]) {
             BodyType = bodyTypes[msgtype];
+        } else if (this.props.mxEvent.getType() === 'm.room.sticker') {
+            BodyType = sdk.getComponent('messages.MStickerBody');
         } else if (content.url) {
             // Fallback to MFileBody if there's a content URL
             BodyType = bodyTypes['m.file'];

From 5df9a01e6488a7d58904988c0a81e59d81193281 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 8 Jan 2018 12:06:32 +0000
Subject: [PATCH 255/927] Use m.room.sticker event.

---
 src/components/structures/FilePanel.js  | 3 +++
 src/components/views/rooms/EventTile.js | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index ffa5e45249..6a8d0c5bdd 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -67,6 +67,9 @@ const FilePanel = React.createClass({
                     "room": {
                         "timeline": {
                             "contains_url": true,
+                            "not_types": [
+                                "m.room.sticker",
+                            ],
                         },
                     },
                 },
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 3407ea159d..46dc0d19db 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -33,6 +33,7 @@ const ObjectUtils = require('../../../ObjectUtils');
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
+    'm.room.sticker': 'messages.MessageEvent',
     'm.call.invite': 'messages.TextualEvent',
     'm.call.answer': 'messages.TextualEvent',
     'm.call.hangup': 'messages.TextualEvent',

From d0897dc8f3d41dca5d716eef2be3f500fceefd59 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 8 Jan 2018 13:29:27 +0000
Subject: [PATCH 256/927] update wording to not imply exhaustiveness

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/Analytics.js            | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 602728038e..5c39b48a35 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -197,7 +197,7 @@ class Analytics {
             title: _t('Analytics'),
             description: <div>
                 <div>
-                    { _t('The following information is sent to us to help make Riot.im better:') }
+                    { _t('The information being sent to us to help make Riot.im better includes:') }
                 </div>
                 <table>
                     { rows.map((row) => <tr key={row[0]}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index b45c2708be..d497d3c25e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -933,7 +933,7 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
     "Import": "Import",
-    "The following information is sent to us to help make Riot.im better:": "The following information is sent to us to help make Riot.im better:",
+    "The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
     "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
     "The platform you're on": "The platform you're on",

From 0577316c8680c2d24b47b9d4699395a35fcdc2d9 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 8 Jan 2018 13:40:33 +0000
Subject: [PATCH 257/927] Fix duplicate event registration.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index fa8696ea74..46cccde19f 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -171,6 +171,7 @@ export default React.createClass({
     componentDidMount() {
         // Legacy Jitsi widget messaging -- TODO replace this with standard widget
         // postMessaging API
+        dis.register(this._onAction);
         window.addEventListener('message', this._onMessage, false);
     },
 
@@ -346,8 +347,6 @@ export default React.createClass({
             console.log("Failed to get widget capabilities", this.widgetId, err);
         });
         this.setState({loading: false});
-
-        dis.register(this._onAction);
     },
 
     _onAction(payload) {

From adebf71a1d8b3d8bee237f6639fe7343314285d6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 8 Jan 2018 15:38:01 +0000
Subject: [PATCH 258/927] Set user widgets on application data.

---
 src/ScalarMessaging.js | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 7bde607451..7befee217a 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -291,6 +291,7 @@ function setWidget(event, roomId) {
     const widgetUrl = event.data.url;
     const widgetName = event.data.name; // optional
     const widgetData = event.data.data; // optional
+    const userWidget = event.data.userWidget;
 
     const client = MatrixClientPeg.get();
     if (!client) {
@@ -330,17 +331,32 @@ function setWidget(event, roomId) {
         name: widgetName,
         data: widgetData,
     };
-    if (widgetUrl === null) { // widget is being deleted
-        content = {};
-    }
 
-    client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).done(() => {
-        sendResponse(event, {
-            success: true,
+    if (userWidget) {
+        const client = MatrixClientPeg.get();
+        let userWidgets = client.getAccountData('m.widgets');
+
+        // Delete existing widget with ID
+        userWidgets = userWidgets.filter((widget) => widget.data.id === widgetId ? false : true);
+
+        // Add new widget / update
+        if (widgetUrl !== null) {
+            userWidgets.push(content);
+        }
+
+        client.setAccountData('m.widgets', userWidgets);
+    } else { // Room widget
+        if (widgetUrl === null) { // widget is being deleted
+            content = {};
+        }
+        client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).done(() => {
+            sendResponse(event, {
+                success: true,
+            });
+        }, (err) => {
+            sendError(event, _t('Failed to send request.'), err);
         });
-    }, (err) => {
-        sendError(event, _t('Failed to send request.'), err);
-    });
+    }
 }
 
 function getWidgets(event, roomId) {

From 60e7646f928e10845816b38810702f369ae15937 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 8 Jan 2018 16:47:49 +0000
Subject: [PATCH 259/927] Save user widgets in accountData

---
 src/ScalarMessaging.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 7befee217a..41c667be25 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -333,18 +333,27 @@ function setWidget(event, roomId) {
     };
 
     if (userWidget) {
+        console.warn('Adding user widget');
         const client = MatrixClientPeg.get();
-        let userWidgets = client.getAccountData('m.widgets');
+        let userWidgets = client.getAccountData('m.widgets') || {};
 
         // Delete existing widget with ID
-        userWidgets = userWidgets.filter((widget) => widget.data.id === widgetId ? false : true);
+        delete userWidgets[widgetId];
 
         // Add new widget / update
         if (widgetUrl !== null) {
-            userWidgets.push(content);
+            userWidgets[widgetId] = {
+                content: content,
+                sender: client.getUserId(),
+                stateKey: widgetId,
+                type: 'm.widget',
+            };
         }
 
-        client.setAccountData('m.widgets', userWidgets);
+        client.setAccountData('m.widgets', {widgets: userWidgets});
+        sendResponse(event, {
+            success: true,
+        });
     } else { // Room widget
         if (widgetUrl === null) { // widget is being deleted
             content = {};

From 9365860075b34e43e248bf4cd56147ec66e3d1f1 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidan@aidalbox14.lan>
Date: Tue, 9 Jan 2018 18:40:12 +1300
Subject: [PATCH 260/927] Update copyright line

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

diff --git a/src/components/views/elements/DialogButtons.js b/src/components/views/elements/DialogButtons.js
index 4f22d43ae0..c159324c1d 100644
--- a/src/components/views/elements/DialogButtons.js
+++ b/src/components/views/elements/DialogButtons.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Aidan Gauland
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 4c101628b53d04eaf918ed201c1782d9b94f79be Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 9 Jan 2018 13:52:37 +0000
Subject: [PATCH 261/927] Add 'send without verifying' to status bar

Fixes other part of https://github.com/vector-im/riot-web/issues/5936
---
 src/components/structures/RoomStatusBar.js       | 16 ++++++++++++++--
 .../views/dialogs/UnknownDeviceDialog.js         | 11 ++---------
 src/cryptodevices.js                             | 14 ++++++++++++++
 src/i18n/strings/en_EN.json                      |  7 ++++---
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 20451453fb..595074224e 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -24,7 +24,11 @@ import WhoIsTyping from '../../WhoIsTyping';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import MemberAvatar from '../views/avatars/MemberAvatar';
 import Resend from '../../Resend';
-import { showUnknownDeviceDialogForMessages } from '../../cryptodevices';
+import {
+    showUnknownDeviceDialogForMessages,
+    markAllDevicesKnown,
+    getUnknownDevicesForRoom,
+ } from '../../cryptodevices';
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -148,6 +152,13 @@ module.exports = React.createClass({
         });
     },
 
+    _onSendWithoutVerifyingClick: function() {
+        getUnknownDevicesForRoom(MatrixClientPeg.get(), this.props.room).then((devices) => {
+            markAllDevicesKnown(MatrixClientPeg.get(), devices);
+            Resend.resendUnsentEvents(this.props.room);
+        });
+    },
+
     _onResendAllClick: function() {
         Resend.resendUnsentEvents(this.props.room);
     },
@@ -289,10 +300,11 @@ module.exports = React.createClass({
         if (hasUDE) {
             title = _t("Message not sent due to unknown devices being present");
             content = _t(
-                "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.",
+                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send without verifying</sendAnywayText> or <cancelText>cancel all</cancelText>.",
                 {},
                 {
                     'showDevicesText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onShowDevicesClick}>{ sub }</a>,
+                    'sendAnywayText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="sendAnyway" onClick={this._onSendWithoutVerifyingClick}>{ sub }</a>,
                     'cancelText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="cancel" onClick={this._onCancelAllClick}>{ sub }</a>,
                 },
             );
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 9c19ee6eca..b1e9c390e6 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -23,14 +23,7 @@ import GeminiScrollbar from 'react-gemini-scrollbar';
 import Resend from '../../../Resend';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
-
-function markAllDevicesKnown(devices) {
-    Object.keys(devices).forEach((userId) => {
-        Object.keys(devices[userId]).map((deviceId) => {
-            MatrixClientPeg.get().setDeviceKnown(userId, deviceId, true);
-        });
-    });
-}
+import { markAllDevicesKnown } from '../../../cryptodevices';
 
 function DeviceListEntry(props) {
     const {userId, device} = props;
@@ -141,7 +134,7 @@ export default React.createClass({
     },
 
     _onSendAnywayClicked: function() {
-        markAllDevicesKnown(this.props.devices);
+        markAllDevicesKnown(MatrixClientPeg.get(), this.props.devices);
 
         this.props.onFinished();
         this.props.onSend();
diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index c93e04253f..8c16c96292 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -19,6 +19,20 @@ import sdk from './index';
 import Modal from './Modal';
 import { _t } from './languageHandler';
 
+/**
+ * Mark all given devices as 'known'
+ *
+ * @param {MatrixClient} matrixClient A MatrixClient
+ * @param {Object} map from userid -> deviceid -> deviceinfo
+ */
+export function markAllDevicesKnown(matrixClient, devices) {
+    Object.keys(devices).forEach((userId) => {
+        Object.keys(devices[userId]).map((deviceId) => {
+            matrixClient.setDeviceKnown(userId, deviceId, true);
+        });
+    });
+}
+
 /**
  * Gets all crypto devices in a room that are marked neither known
  * nor verified.
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ab503205f8..2f21d39e2f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -272,9 +272,9 @@
     "Failed to mute user": "Failed to mute user",
     "Failed to toggle moderator status": "Failed to toggle moderator status",
     "Failed to change power level": "Failed to change power level",
-    "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.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
     "Are you sure?": "Are you sure?",
+    "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.",
     "No devices with registered encryption keys": "No devices with registered encryption keys",
     "Devices": "Devices",
     "Unignore": "Unignore",
@@ -344,10 +344,10 @@
     "Offline": "Offline",
     "Unknown": "Unknown",
     "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
+    "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",
     "World readable": "World readable",
     "Guests can join": "Guests can join",
-    "No rooms to show": "No rooms to show",
     "Failed to set avatar.": "Failed to set avatar.",
     "Save": "Save",
     "(~%(count)s results)|other": "(~%(count)s results)",
@@ -558,6 +558,7 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
     "Delete widget": "Delete widget",
     "Revoke widget access": "Revoke widget access",
+    "Minimize apps": "Minimize apps",
     "Edit": "Edit",
     "Create new room": "Create new room",
     "Unblacklist": "Unblacklist",
@@ -774,7 +775,7 @@
     "You have no visible notifications": "You have no visible notifications",
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send without verifying</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send without verifying</sendAnywayText> or <cancelText>cancel all</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",

From 9e9de765dc3ffad4362bf5bc061a7f744149719a Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 9 Jan 2018 14:37:45 +0000
Subject: [PATCH 262/927] Handle user widgets.

---
 src/ScalarMessaging.js | 70 +++++++++++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 41c667be25..40e985a5aa 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -335,10 +335,15 @@ function setWidget(event, roomId) {
     if (userWidget) {
         console.warn('Adding user widget');
         const client = MatrixClientPeg.get();
-        let userWidgets = client.getAccountData('m.widgets') || {};
+        // client.setAccountData('m.widgets', {});
+        const userWidgets = client.getAccountData('m.widgets').getContent() || {};
 
         // Delete existing widget with ID
-        delete userWidgets[widgetId];
+        try {
+            delete userWidgets[widgetId];
+        } catch (e) {
+            console.error(`$widgetId is non-configurable`);
+        }
 
         // Add new widget / update
         if (widgetUrl !== null) {
@@ -346,15 +351,21 @@ function setWidget(event, roomId) {
                 content: content,
                 sender: client.getUserId(),
                 stateKey: widgetId,
-                type: 'm.widget',
+                type: 'im.vector.modular.widgets',
+                id: widgetId,
             };
         }
 
-        client.setAccountData('m.widgets', {widgets: userWidgets});
+        client.setAccountData('m.widgets', userWidgets);
+        console.warn(`Set user widgets to:`, client.getAccountData('m.widgets'));
         sendResponse(event, {
             success: true,
         });
     } else { // Room widget
+        if (!roomId) {
+            sendError(event, _t('Missing roomId.'), null);
+        }
+
         if (widgetUrl === null) { // widget is being deleted
             content = {};
         }
@@ -374,19 +385,30 @@ function getWidgets(event, roomId) {
         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.'));
-        return;
-    }
-    const stateEvents = room.currentState.getStateEvents("im.vector.modular.widgets");
-    // Only return widgets which have required fields
-    const widgetStateEvents = [];
-    stateEvents.forEach((ev) => {
-        if (ev.getContent().type && ev.getContent().url) {
-            widgetStateEvents.push(ev.event); // return the raw event
+    let widgetStateEvents = [];
+
+    if (roomId) {
+        const room = client.getRoom(roomId);
+        if (!room) {
+            sendError(event, _t('This room is not recognised.'));
+            return;
         }
-    });
+        const stateEvents = room.currentState.getStateEvents("im.vector.modular.widgets");
+        // Only return widgets which have required fields
+        if (room) {
+            stateEvents.forEach((ev) => {
+                if (ev.getContent().type && ev.getContent().url) {
+                    widgetStateEvents.push(ev.event); // return the raw event
+                }
+            });
+        }
+    }
+
+    // Add user widgets (not linked to a specific room)
+    const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+    const userWidgetArray = Object.keys(userWidgets).map((key) => userWidgets[key]);
+    widgetStateEvents = widgetStateEvents.concat(userWidgetArray);
+    console.warn('Sending user widgets', userWidgetArray);
 
     sendResponse(event, widgetStateEvents);
 }
@@ -595,6 +617,16 @@ const onMessage = function(event) {
 
     const roomId = event.data.room_id;
     const userId = event.data.user_id;
+
+    // These APIs don't require roomId
+    if (event.data.action === "get_widgets") {
+        getWidgets(event, roomId);
+        return;
+    } else if (event.data.action === "set_widget") {
+        setWidget(event, roomId);
+        return;
+    }
+
     if (!roomId) {
         sendError(event, _t('Missing room_id in request'));
         return;
@@ -628,12 +660,6 @@ const onMessage = function(event) {
         } else if (event.data.action === "get_membership_count") {
             getMembershipCount(event, roomId);
             return;
-        } else if (event.data.action === "set_widget") {
-            setWidget(event, roomId);
-            return;
-        } else if (event.data.action === "get_widgets") {
-            getWidgets(event, roomId);
-            return;
         } else if (event.data.action === "get_room_enc_state") {
             getRoomEncState(event, roomId);
             return;

From 6b0b25c2d26a34d7c4ba109ed25c268a7125134b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 9 Jan 2018 16:01:53 +0000
Subject: [PATCH 263/927] Translations

---
 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 f28322398c..41f1b75e43 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -304,6 +304,8 @@
     "Video call": "Video call",
     "Hide Apps": "Hide Apps",
     "Show Apps": "Show Apps",
+    "Hide Stickers": "Hide Stickers",
+    "Show Stickers": "Show Stickers",
     "Upload file": "Upload file",
     "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
     "Send an encrypted message": "Send an encrypted message",

From 9abb1601207c4b41c37b83e9e5e289f47d3bd72a Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 9 Jan 2018 16:02:17 +0000
Subject: [PATCH 264/927] Replace apps button with stickers button in message
 composer.

---
 src/components/views/rooms/MessageComposer.js | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 2841f30423..84091e8a68 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -31,8 +31,8 @@ export default class MessageComposer extends React.Component {
         this.onCallClick = this.onCallClick.bind(this);
         this.onHangupClick = this.onHangupClick.bind(this);
         this.onUploadClick = this.onUploadClick.bind(this);
-        this.onShowAppsClick = this.onShowAppsClick.bind(this);
-        this.onHideAppsClick = this.onHideAppsClick.bind(this);
+        this.onShowStickersClick = this.onShowStickersClick.bind(this);
+        this.onHideStickersClick = this.onHideStickersClick.bind(this);
         this.onUploadFileSelected = this.onUploadFileSelected.bind(this);
         this.uploadFiles = this.uploadFiles.bind(this);
         this.onVoiceCallClick = this.onVoiceCallClick.bind(this);
@@ -53,6 +53,7 @@ export default class MessageComposer extends React.Component {
                 wordCount: 0,
             },
             showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
+            showStickers: false,
         };
     }
 
@@ -189,18 +190,12 @@ export default class MessageComposer extends React.Component {
         // this._startCallApp(true);
     }
 
-    onShowAppsClick(ev) {
-        dis.dispatch({
-            action: 'appsDrawer',
-            show: true,
-        });
+    onShowStickersClick(ev) {
+        this.setState({showStickers: true});
     }
 
-    onHideAppsClick(ev) {
-        dis.dispatch({
-            action: 'appsDrawer',
-            show: false,
-        });
+    onHideStickersClick(ev) {
+        this.setState({showStickers: false});
     }
 
     onInputContentChanged(content: string, selection: {start: number, end: number}) {
@@ -268,7 +263,7 @@ export default class MessageComposer extends React.Component {
                 alt={e2eTitle} title={e2eTitle}
             />,
         );
-        let callButton, videoCallButton, hangupButton, showAppsButton, hideAppsButton;
+        let callButton, videoCallButton, hangupButton, showStickersButton, hideStickersButton;
         if (this.props.callState && this.props.callState !== 'ended') {
             hangupButton =
                 <div key="controls_hangup" className="mx_MessageComposer_hangup" onClick={this.onHangupClick}>
@@ -286,15 +281,23 @@ export default class MessageComposer extends React.Component {
         }
 
         // Apps
-        if (this.props.showApps) {
-            hideAppsButton =
-                <div key="controls_hide_apps" className="mx_MessageComposer_apps" onClick={this.onHideAppsClick} title={_t("Hide Apps")}>
-                    <TintableSvg src="img/icons-hide-apps.svg" width="35" height="35" />
+        if (this.state.showStickers) {
+            hideStickersButton =
+                <div
+                    key="controls_hide_stickers"
+                    className="mx_MessageComposer_stickers"
+                    onClick={this.onHideStickersClick}
+                    title={_t("Hide Stickers")}>
+                    <TintableSvg src="img/icons-hide-stickers.svg" width="35" height="35" />
                 </div>;
         } else {
-            showAppsButton =
-                <div key="show_apps" className="mx_MessageComposer_apps" onClick={this.onShowAppsClick} title={_t("Show Apps")}>
-                    <TintableSvg src="img/icons-show-apps.svg" width="35" height="35" />
+            showStickersButton =
+                <div
+                    key="constrols_show_stickers"
+                    className="mx_MessageComposer_stickers"
+                    onClick={this.onShowStickersClick}
+                    title={_t("Show Stickers")}>
+                    <TintableSvg src="img/icons-show-stickers.svg" width="35" height="35" />
                 </div>;
         }
 
@@ -343,8 +346,8 @@ export default class MessageComposer extends React.Component {
                 hangupButton,
                 callButton,
                 videoCallButton,
-                showAppsButton,
-                hideAppsButton,
+                showStickersButton,
+                hideStickersButton,
             );
         } else {
             controls.push(
@@ -409,7 +412,4 @@ MessageComposer.propTypes = {
 
     // callback when a file to upload is chosen
     uploadFile: React.PropTypes.func.isRequired,
-
-    // string representing the current room app drawer state
-    showApps: React.PropTypes.bool,
 };

From dbb8f878cbea7ecb53855294764ed7db6a916d45 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 9 Jan 2018 17:57:18 +0000
Subject: [PATCH 265/927] Tidy up imports

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

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 595074224e..88f42b8d2a 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -24,11 +24,7 @@ import WhoIsTyping from '../../WhoIsTyping';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import MemberAvatar from '../views/avatars/MemberAvatar';
 import Resend from '../../Resend';
-import {
-    showUnknownDeviceDialogForMessages,
-    markAllDevicesKnown,
-    getUnknownDevicesForRoom,
- } from '../../cryptodevices';
+import * as cryptodevices from '../../cryptodevices';
 
 const STATUS_BAR_HIDDEN = 0;
 const STATUS_BAR_EXPANDED = 1;
@@ -153,8 +149,8 @@ module.exports = React.createClass({
     },
 
     _onSendWithoutVerifyingClick: function() {
-        getUnknownDevicesForRoom(MatrixClientPeg.get(), this.props.room).then((devices) => {
-            markAllDevicesKnown(MatrixClientPeg.get(), devices);
+        cryptodevices.getUnknownDevicesForRoom(MatrixClientPeg.get(), this.props.room).then((devices) => {
+            cryptodevices.markAllDevicesKnown(MatrixClientPeg.get(), devices);
             Resend.resendUnsentEvents(this.props.room);
         });
     },
@@ -168,7 +164,7 @@ module.exports = React.createClass({
     },
 
     _onShowDevicesClick: function() {
-        showUnknownDeviceDialogForMessages(MatrixClientPeg.get(), this.props.room);
+        cryptodevices.showUnknownDeviceDialogForMessages(MatrixClientPeg.get(), this.props.room);
     },
 
     _onRoomLocalEchoUpdated: function(event, room, oldEventId, oldStatus) {

From 9dd9a5be4b18c0001c701ea31b9ee9628872cdfe Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 9 Jan 2018 17:59:49 +0000
Subject: [PATCH 266/927] Wording tweak

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

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 88f42b8d2a..47da4096c0 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -296,7 +296,7 @@ module.exports = React.createClass({
         if (hasUDE) {
             title = _t("Message not sent due to unknown devices being present");
             content = _t(
-                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send without verifying</sendAnywayText> or <cancelText>cancel all</cancelText>.",
+                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.",
                 {},
                 {
                     'showDevicesText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onShowDevicesClick}>{ sub }</a>,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2f21d39e2f..25b07751ae 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -775,7 +775,7 @@
     "You have no visible notifications": "You have no visible notifications",
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send without verifying</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send without verifying</sendAnywayText> or <cancelText>cancel all</cancelText>.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",

From a977ab9be4aec900fde1f4e197edcf680055ef91 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 11:51:23 +0000
Subject: [PATCH 268/927] change handler name to suit convention

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

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index 6a7e5d058f..e5b9e56949 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -67,7 +67,7 @@ export default class Quote extends React.Component {
             show: !this.props.isNested,
         };
 
-        this.onShowNested = this.onShowNested.bind(this);
+        this.onQuoteClick = this.onQuoteClick.bind(this);
     }
 
     getChildContext() {
@@ -117,7 +117,7 @@ export default class Quote extends React.Component {
         this.setState({room, event});
     }
 
-    onShowNested() {
+    onQuoteClick() {
         this.setState({
             show: true,
         });
@@ -141,7 +141,7 @@ export default class Quote extends React.Component {
             }
 
             return <div>
-                <a onClick={this.onShowNested} className="mx_Quote_show">{ _t('Quote') }</a>
+                <a onClick={this.onQuoteClick} className="mx_Quote_show">{ _t('Quote') }</a>
                 <br />
             </div>;
         }

From 454fd23f25539f899a96fb879fddf10db7cf6adc Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 11:51:48 +0000
Subject: [PATCH 269/927] fix typo shsape->shape

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

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index fc5f1cc5f8..74b7f5fd5c 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -58,7 +58,7 @@ module.exports = React.createClass({
         /* callback for when our widget has loaded */
         onWidgetLoad: React.PropTypes.func,
 
-        /* the shsape of the tile, used */
+        /* the shape of the tile, used */
         tileShape: React.PropTypes.string,
     },
 

From 9e2238e884abb23aaa5f4152687754fbc6e44016 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 11:56:36 +0000
Subject: [PATCH 270/927] remove unused imports

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

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 706bd28434..4f34a635dc 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -33,8 +33,6 @@ import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import ContextualMenu from '../../structures/ContextualMenu';
-import {RoomMember} from 'matrix-js-sdk';
-import classNames from 'classnames';
 import SettingsStore from "../../../settings/SettingsStore";
 import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
 

From e45fcf10c71dc4c9053fcc01ff1d83cd04ec6077 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 12:00:11 +0000
Subject: [PATCH 271/927] Refactor DateUtils to ES6

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/DateUtils.js                              | 77 +++++++++----------
 .../views/rooms/ReadReceiptMarker.js          |  4 +-
 .../views/settings/DevicesPanelEntry.js       |  4 +-
 3 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 77f3644f6f..38a6a3a36f 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
 import { _t } from './languageHandler';
 
 function getDaysArray() {
@@ -59,47 +58,45 @@ function twelveHourTime(date) {
     return `${hours}:${minutes}${ampm}`;
 }
 
-module.exports = {
-    formatDate: function(date, showTwelveHour=false) {
-        const now = new Date();
-        const days = getDaysArray();
-        const months = getMonthsArray();
-        if (date.toDateString() === now.toDateString()) {
-            return this.formatTime(date, showTwelveHour);
-        } else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
-            // TODO: use standard date localize function provided in counterpart
-            return _t('%(weekDayName)s %(time)s', {
-                weekDayName: days[date.getDay()],
-                time: this.formatTime(date, showTwelveHour),
-            });
-        } else if (now.getFullYear() === date.getFullYear()) {
-            // 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: this.formatTime(date, showTwelveHour),
-            });
-        }
-        return this.formatFullDate(date, showTwelveHour);
-    },
-
-    formatFullDate: function(date, showTwelveHour=false) {
-        const days = getDaysArray();
-        const months = getMonthsArray();
-        return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s', {
+export function formatDate(date, showTwelveHour=false) {
+    const now = new Date();
+    const days = getDaysArray();
+    const months = getMonthsArray();
+    if (date.toDateString() === now.toDateString()) {
+        return formatTime(date, showTwelveHour);
+    } else if (now.getTime() - date.getTime() < 6 * 24 * 60 * 60 * 1000) {
+        // TODO: use standard date localize function provided in counterpart
+        return _t('%(weekDayName)s %(time)s', {
+            weekDayName: days[date.getDay()],
+            time: formatTime(date, showTwelveHour),
+        });
+    } else if (now.getFullYear() === date.getFullYear()) {
+        // 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(),
-            fullYear: date.getFullYear(),
-            time: this.formatTime(date, showTwelveHour),
+            time: formatTime(date, showTwelveHour),
         });
-    },
+    }
+    return formatFullDate(date, showTwelveHour);
+}
 
-    formatTime: function(date, showTwelveHour=false) {
-        if (showTwelveHour) {
-            return twelveHourTime(date);
-        }
-        return pad(date.getHours()) + ':' + pad(date.getMinutes());
-    },
-};
+export function formatFullDate(date, showTwelveHour=false) {
+    const days = getDaysArray();
+    const months = getMonthsArray();
+    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: formatTime(date, showTwelveHour),
+    });
+}
+
+export function formatTime(date, showTwelveHour=false) {
+    if (showTwelveHour) {
+        return twelveHourTime(date);
+    }
+    return pad(date.getHours()) + ':' + pad(date.getMinutes());
+}
diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index ea38d07dea..5dd62ff6b7 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -26,7 +26,7 @@ const Velociraptor = require('../../../Velociraptor');
 require('../../../VelocityBounce');
 import { _t } from '../../../languageHandler';
 
-import DateUtils from '../../../DateUtils';
+import {formatDate} from '../../../DateUtils';
 
 let bounce = false;
 try {
@@ -187,7 +187,7 @@ module.exports = React.createClass({
         if (this.props.timestamp) {
             title = _t(
                 "Seen by %(userName)s at %(dateTime)s",
-                {userName: this.props.member.userId, dateTime: DateUtils.formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
+                {userName: this.props.member.userId, dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
             );
         }
 
diff --git a/src/components/views/settings/DevicesPanelEntry.js b/src/components/views/settings/DevicesPanelEntry.js
index 4c08a938c7..129b138929 100644
--- a/src/components/views/settings/DevicesPanelEntry.js
+++ b/src/components/views/settings/DevicesPanelEntry.js
@@ -20,7 +20,7 @@ import PropTypes from 'prop-types';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import DateUtils from '../../../DateUtils';
+import {formatDate} from '../../../DateUtils';
 
 export default class DevicesPanelEntry extends React.Component {
     constructor(props, context) {
@@ -56,7 +56,7 @@ export default class DevicesPanelEntry extends React.Component {
 
         let lastSeen = "";
         if (device.last_seen_ts) {
-            const lastSeenDate = DateUtils.formatDate(new Date(device.last_seen_ts));
+            const lastSeenDate = formatDate(new Date(device.last_seen_ts));
             lastSeen = device.last_seen_ip + " @ " +
                 lastSeenDate.toLocaleString();
         }

From 1a7dc22a8d324f70d69590dd757e04fd82be6681 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 12:06:24 +0000
Subject: [PATCH 272/927] make wantsDateSeparator generic and throw into
 DateUtils

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/DateUtils.js                          | 14 ++++++++++++++
 src/components/structures/MessagePanel.js | 15 ++-------------
 src/components/views/elements/Quote.js    | 23 +++++------------------
 3 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 38a6a3a36f..91df1e46d5 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -100,3 +100,17 @@ export function formatTime(date, showTwelveHour=false) {
     }
     return pad(date.getHours()) + ':' + pad(date.getMinutes());
 }
+
+const MILLIS_IN_DAY = 86400000;
+export function wantsDateSeparator(prevEventDate, nextEventDate) {
+    if (!nextEventDate || !prevEventDate) {
+        return false;
+    }
+    // Return early for events that are > 24h apart
+    if (Math.abs(prevEventDate.getTime() - nextEventDate.getTime()) > MILLIS_IN_DAY) {
+        return true;
+    }
+
+    // Compare weekdays
+    return prevEventDate.getDay() !== nextEventDate.getDay();
+}
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 84441e1317..5523fc27a0 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -19,13 +19,12 @@ import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import shouldHideEvent from '../../shouldHideEvent';
+import {wantsDateSeparator} from '../../DateUtils';
 import dis from "../../dispatcher";
 import sdk from '../../index';
 
 import MatrixClientPeg from '../../MatrixClientPeg';
 
-const MILLIS_IN_DAY = 86400000;
-
 /* (almost) stateless UI component which builds the event tiles in the room timeline.
  */
 module.exports = React.createClass({
@@ -523,17 +522,7 @@ module.exports = React.createClass({
             // here.
             return !this.props.suppressFirstDateSeparator;
         }
-        const prevEventDate = prevEvent.getDate();
-        if (!nextEventDate || !prevEventDate) {
-            return false;
-        }
-        // Return early for events that are > 24h apart
-        if (Math.abs(prevEvent.getTs() - nextEventDate.getTime()) > MILLIS_IN_DAY) {
-            return true;
-        }
-
-        // Compare weekdays
-        return prevEventDate.getDay() !== nextEventDate.getDay();
+        return wantsDateSeparator(prevEvent.getDate(), nextEventDate);
     },
 
     // get a list of read receipts that should be shown next to this event
diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index e5b9e56949..bceba0f536 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -18,28 +18,13 @@ import sdk from '../../../index';
 import {_t} from '../../../languageHandler';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import {wantsDateSeparator} from '../../../DateUtils';
 import {MatrixEvent} from 'matrix-js-sdk';
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
 const REGEX_LOCAL_MATRIXTO = /^#\/room\/(([\#\!])[^\/]*)\/(\$[^\/]*)$/;
 
-const MILLIS_IN_DAY = 86400000;
-function wantsDateSeparator(parentEvent, event) {
-    const parentEventDate = parentEvent.getDate();
-    const eventDate = event.getDate();
-    if (!eventDate || !parentEventDate) {
-        return false;
-    }
-    // Return early for events that are > 24h apart
-    if (Math.abs(parentEvent.getTs() - eventDate.getTime()) > MILLIS_IN_DAY) {
-        return true;
-    }
-
-    // Compare weekdays
-    return parentEventDate.getDay() !== eventDate.getDay();
-}
-
 export default class Quote extends React.Component {
     static isMessageUrl(url) {
         return !!REGEX_LOCAL_MATRIXTO.exec(url);
@@ -129,9 +114,11 @@ export default class Quote extends React.Component {
             if (this.state.show) {
                 const EventTile = sdk.getComponent('views.rooms.EventTile');
                 let dateSep = null;
-                if (wantsDateSeparator(this.props.parentEv, this.state.event)) {
+
+                const evDate = ev.getDate();
+                if (wantsDateSeparator(this.props.parentEv.getDate(), evDate)) {
                     const DateSeparator = sdk.getComponent('messages.DateSeparator');
-                    dateSep = <a href={this.props.url}><DateSeparator ts={this.state.event.getDate()} /></a>;
+                    dateSep = <a href={this.props.url}><DateSeparator ts={evDate} /></a>;
                 }
 
                 return <blockquote className="mx_Quote">

From f5bad8bb10ceb8a9d0ca392a64b4452b5a5956ef Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 12:50:12 +0000
Subject: [PATCH 273/927] Regenerate ESLintIgnore file

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .eslintignore.errorfiles | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.eslintignore.errorfiles b/.eslintignore.errorfiles
index f66d2c69d3..f501f373cd 100644
--- a/.eslintignore.errorfiles
+++ b/.eslintignore.errorfiles
@@ -8,7 +8,6 @@ src/CallHandler.js
 src/component-index.js
 src/components/structures/ContextualMenu.js
 src/components/structures/CreateRoom.js
-src/components/structures/FilePanel.js
 src/components/structures/LoggedInView.js
 src/components/structures/login/ForgotPassword.js
 src/components/structures/login/Login.js
@@ -27,16 +26,10 @@ src/components/views/dialogs/ChatCreateOrReuseDialog.js
 src/components/views/dialogs/DeactivateAccountDialog.js
 src/components/views/dialogs/UnknownDeviceDialog.js
 src/components/views/elements/AddressSelector.js
-src/components/views/elements/CreateRoomButton.js
 src/components/views/elements/DeviceVerifyButtons.js
 src/components/views/elements/DirectorySearchBox.js
 src/components/views/elements/EditableText.js
-src/components/views/elements/HomeButton.js
 src/components/views/elements/MemberEventListSummary.js
-src/components/views/elements/PowerSelector.js
-src/components/views/elements/RoomDirectoryButton.js
-src/components/views/elements/SettingsButton.js
-src/components/views/elements/StartChatButton.js
 src/components/views/elements/TintableSvg.js
 src/components/views/elements/UserSelector.js
 src/components/views/login/CountryDropdown.js
@@ -93,7 +86,6 @@ src/RichText.js
 src/Roles.js
 src/Rooms.js
 src/ScalarAuthClient.js
-src/Tinter.js
 src/UiEffects.js
 src/Unread.js
 src/utils/DecryptFile.js

From 94167e2b8b6bcb591118cde9eb5370dedb2d499e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 12:52:20 +0000
Subject: [PATCH 274/927] Run gen-i18n.js and embed the ellipsis into the base
 string

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/rooms/MessageComposer.js | 10 +++++-----
 src/i18n/strings/en_EN.json                   | 20 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index dde0d0ec26..6ad033fa0c 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -341,15 +341,15 @@ export default class MessageComposer extends React.Component {
             let placeholderText;
             if (this.state.isQuoting) {
                 if (roomIsEncrypted) {
-                    placeholderText = _t('Send an encrypted reply');
+                    placeholderText = _t('Send an encrypted reply…');
                 } else {
-                    placeholderText = _t('Send a reply (unencrypted)');
+                    placeholderText = _t('Send a reply (unencrypted)…');
                 }
             } else {
                 if (roomIsEncrypted) {
-                    placeholderText = _t('Send an encrypted message');
+                    placeholderText = _t('Send an encrypted message…');
                 } else {
-                    placeholderText = _t('Send a message (unencrypted)');
+                    placeholderText = _t('Send a message (unencrypted)…');
                 }
             }
 
@@ -359,7 +359,7 @@ export default class MessageComposer extends React.Component {
                     key="controls_input"
                     onResize={this.props.onResize}
                     room={this.props.room}
-                    placeholder={placeholderText + '…'}
+                    placeholder={placeholderText}
                     onFilesPasted={this.uploadFiles}
                     onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8738633e18..c759c18134 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -170,6 +170,7 @@
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
     "Failed to join room": "Failed to join room",
+    "Message Replies": "Message Replies",
     "Message Pinning": "Message Pinning",
     "Presence Management": "Presence Management",
     "Tag Panel": "Tag Panel",
@@ -272,9 +273,9 @@
     "Failed to mute user": "Failed to mute user",
     "Failed to toggle moderator status": "Failed to toggle moderator status",
     "Failed to change power level": "Failed to change power level",
-    "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.",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.",
     "Are you sure?": "Are you sure?",
+    "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.",
     "No devices with registered encryption keys": "No devices with registered encryption keys",
     "Devices": "Devices",
     "Unignore": "Unignore",
@@ -307,10 +308,10 @@
     "Show Apps": "Show Apps",
     "Upload file": "Upload file",
     "Show Text Formatting Toolbar": "Show Text Formatting Toolbar",
-    "Send an encrypted message": "Send an encrypted message",
-    "Send an encrypted reply": "Send an encrypted reply",
-    "Send a message (unencrypted)": "Send a message (unencrypted)",
-    "Send a reply (unencrypted)": "Send a reply (unencrypted)",
+    "Send an encrypted reply…": "Send an encrypted reply…",
+    "Send a reply (unencrypted)…": "Send a reply (unencrypted)…",
+    "Send an encrypted message…": "Send an encrypted message…",
+    "Send a message (unencrypted)…": "Send a message (unencrypted)…",
     "You do not have permission to post to this room": "You do not have permission to post to this room",
     "Turn Markdown on": "Turn Markdown on",
     "Turn Markdown off": "Turn Markdown off",
@@ -345,11 +346,12 @@
     "Idle": "Idle",
     "Offline": "Offline",
     "Unknown": "Unknown",
+    "Replying": "Replying",
     "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
+    "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",
     "World readable": "World readable",
     "Guests can join": "Guests can join",
-    "No rooms to show": "No rooms to show",
     "Failed to set avatar.": "Failed to set avatar.",
     "Save": "Save",
     "(~%(count)s results)|other": "(~%(count)s results)",
@@ -560,6 +562,7 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
     "Delete widget": "Delete widget",
     "Revoke widget access": "Revoke widget access",
+    "Minimize apps": "Minimize apps",
     "Edit": "Edit",
     "Create new room": "Create new room",
     "Unblacklist": "Unblacklist",
@@ -629,6 +632,7 @@
     "expand": "expand",
     "Custom of %(powerLevel)s": "Custom of %(powerLevel)s",
     "Custom level": "Custom level",
+    "Quote": "Quote",
     "Room directory": "Room directory",
     "Start chat": "Start chat",
     "And %(count)s more...|other": "And %(count)s more...",
@@ -961,7 +965,5 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
-    "Import": "Import",
-    "Message Replies": "Message Replies",
-    "Replying": "Replying"
+    "Import": "Import"
 }

From 007715aeaa0f4d9130ab6b67dea8eadfec7fa574 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 10 Jan 2018 12:54:00 +0000
Subject: [PATCH 275/927] Run prune-i18n.js

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/i18n/strings/ca.json      |   2 -
 src/i18n/strings/cs.json      |  43 ---------------
 src/i18n/strings/da.json      |   7 ---
 src/i18n/strings/de_DE.json   | 101 ----------------------------------
 src/i18n/strings/el.json      |  86 -----------------------------
 src/i18n/strings/en_US.json   |  88 -----------------------------
 src/i18n/strings/eo.json      |   4 --
 src/i18n/strings/es.json      |  47 ----------------
 src/i18n/strings/eu.json      |  89 ------------------------------
 src/i18n/strings/fi.json      |  68 -----------------------
 src/i18n/strings/fr.json      |  97 --------------------------------
 src/i18n/strings/hu.json      | 101 ----------------------------------
 src/i18n/strings/id.json      |  10 ----
 src/i18n/strings/it.json      |   2 -
 src/i18n/strings/ja.json      |   5 --
 src/i18n/strings/ko.json      |  86 -----------------------------
 src/i18n/strings/lv.json      |  88 -----------------------------
 src/i18n/strings/ml.json      |   1 -
 src/i18n/strings/nl.json      |  88 -----------------------------
 src/i18n/strings/pl.json      |  88 -----------------------------
 src/i18n/strings/pt.json      |  90 ------------------------------
 src/i18n/strings/pt_BR.json   |  86 -----------------------------
 src/i18n/strings/ru.json      | 100 ---------------------------------
 src/i18n/strings/sk.json      |  26 ---------
 src/i18n/strings/sv.json      |  23 --------
 src/i18n/strings/te.json      |  10 ----
 src/i18n/strings/th.json      |  36 ------------
 src/i18n/strings/tr.json      |  86 -----------------------------
 src/i18n/strings/uk.json      |   6 --
 src/i18n/strings/zh_Hans.json |  73 ------------------------
 src/i18n/strings/zh_Hant.json |  88 -----------------------------
 31 files changed, 1725 deletions(-)

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 88a8ced7b9..6af10bf907 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -12,7 +12,6 @@
     "Hide removed messages": "Amaga els missatges esborrats",
     "Always show message timestamps": "Mostra sempre la marca de temps del missatge",
     "Alias (optional)": "Àlies (opcional)",
-    "An email has been sent to": "S'ha enviat un correu electrònic a",
     "Cancel": "Cancel·la",
     "Close": "Tanca",
     "Create new room": "Crea una nova sala",
@@ -31,6 +30,5 @@
     "Remove": "Elimina",
     "unknown error code": "codi d'error desconegut",
     "OK": "D'acord",
-    "a room": "una sala",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "S'ha enviat un missatge de text a +%(msisdn)s. Entreu si us plau el codi de verificació que conté"
 }
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index 81d62793cd..b6b1aa8255 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -13,7 +13,6 @@
     "Rooms": "Místnosti",
     "Scroll to unread messages": "Přejít k nepřečteným zprávám",
     "Search": "Hledání",
-    "Send a message (unencrypted)": "Poslat zprávu (nešifrovanou)",
     "Settings": "Nastavení",
     "Start Chat": "Začít chat",
     "This room": "Tato místnost",
@@ -60,11 +59,7 @@
     "Dismiss": "Zahodit",
     "powered by Matrix": "poháněno Matrixem",
     "Custom Server Options": "Vlastní serverové volby",
-    "to favourite": "oblíbíte",
-    "to demote": "upozadíte",
-    "Drop here %(toAction)s": "Přetažením sem %(toAction)s",
     "Add a widget": "Přidat widget",
-    "a room": "místnost",
     "Accept": "Přijmout",
     "%(targetName)s accepted an invitation.": "%(targetName)s přijal/a pozvání.",
     "Account": "Účet",
@@ -151,7 +146,6 @@
     "Devices": "Zařízení",
     "Direct chats": "Přímé chaty",
     "Disable Notifications": "Vypnout upozornění",
-    "disabled": "vypnuto",
     "Disinvite": "Odvolat pozvání",
     "Display name": "Zobrazované jméno",
     "Don't send typing notifications": "Neupozorňovat ostatní, že píšu",
@@ -166,7 +160,6 @@
     "Enable automatic language detection for syntax highlighting": "Zapnout kvůli zvýrazňování syntaxe automatické rozpoznávání jazyka",
     "Enable encryption": "Zapnout šifrování",
     "Enable Notifications": "Zapnout upozornění",
-    "enabled": "zapnuto",
     "Encrypted by a verified device": "Zašifrováno ověřeným zařízením",
     "Encrypted by an unverified device": "Zašifrováno neověřeným zařízením",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Zašifrované zprávy nepůjde vidět v klientech, kteří šifrování ještě nezavedli",
@@ -185,7 +178,6 @@
     "Export": "Exportovat",
     "Export E2E room keys": "Exportovat E2E klíče místnosti",
     "Failed to ban user": "Nepodařilo se vykázat uživatele",
-    "Failed to delete device": "Nepodařilo se vymazat zařízení",
     "Failed to join room": "Vstup do místnosti se nezdařil",
     "Failed to kick": "Vykopnutí se nezdařilo",
     "Failed to leave room": "Odejití z místnosti se nezdařilo",
@@ -205,7 +197,6 @@
     "Forget room": "Zapomenout místnost",
     "Forgot your password?": "Zapomněl/a jste své heslo?",
     "For security, this session has been signed out. Please sign in again.": "Z bezpečnostních důvodů bylo toto přihlášení ukončeno. Přihlašte se prosím znovu.",
-    "%(names)s and one other are typing": "%(names)s a jeden další píší",
     "%(names)s and %(lastPerson)s are typing": "%(names)s a %(lastPerson)s píší",
     "and %(count)s others...|other": "a %(count)s další...",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s widget upravil/a %(senderName)s",
@@ -213,7 +204,6 @@
     "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s widget přidal/a %(senderName)s",
     "Automatically replace plain text Emoji": "Automaticky nahrazovat textové emodži",
     "Failed to upload image": "Obrázek se nepodařilo nahrát",
-    "Room creation failed": "Místnost se nepodařilo vytvořit",
     "%(senderName)s answered the call.": "%(senderName)s přijal/a hovor.",
     "Click to mute audio": "Kliknutím ztlumíte zvuk",
     "Failed to verify email address: make sure you clicked the link in the email": "E-mailovou adresu se nepodařilo ověřit. Přesvědčte se, že jste kliknul/a na zaslaný odkaz",
@@ -253,7 +243,6 @@
     "Logged in as:": "Přihlášen/a jako:",
     "Login as guest": "Přihlášen/a jako host",
     "matrix-react-sdk version:": "Verze matrix-react-sdk:",
-    "Members only": "Pouze pro členy",
     "Mobile phone number": "Číslo mobilního telefonu",
     "Mobile phone number (optional)": "Číslo mobilního telefonu (nepovinné)",
     "Moderator": "Moderátor",
@@ -291,7 +280,6 @@
     "Room name (optional)": "Název místnosti (nepovinný)",
     "Report it": "Nahlásit to",
     "Results from DuckDuckGo": "Výsledky z DuckDuckGo",
-    "Return to app": "Vrátit k aplikaci",
     "Return to login screen": "Vrátit k přihlašovací obrazovce",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot není oprávněn posílat vám upozornění – zkontrolujte prosím nastavení svého prohlížeče",
     "Riot was not given permission to send notifications - please try again": "Riot nebyl oprávněn k posílání upozornění – zkuste to prosím znovu",
@@ -303,14 +291,11 @@
     "%(roomName)s is not accessible at this time.": "Místnost %(roomName)s není v tuto chvíli dostupná.",
     "Save": "Uložit",
     "Scroll to bottom of page": "Přejít na konec stránky",
-    "Send an encrypted message": "Poslat šifrovanou zprávu",
     "Send anyway": "Přesto poslat",
     "Sender device information": "Informace o odesilatelově zařízení",
     "Send Reset Email": "Poslat resetovací e-mail",
-    "sent an image": "poslal/a obrázek",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s poslal/a obrázek.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s poslal/a %(targetDisplayName)s pozvánku ke vstupu do místnosti.",
-    "sent a video": "poslal/a video",
     "Server error": "Chyba serveru",
     "Server may be unavailable or overloaded": "Server může být nedostupný nebo přetížený",
     "Server may be unavailable, overloaded, or search timed out :(": "Server může být nedostupný, přetížený nebo vyhledávání vypršelo :(",
@@ -337,7 +322,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Zadaný podepisovaný klíč se shoduje s klíčem obdrženým od uživatele %(userId)s ze zařízení %(deviceId)s. Zařízení je označeno jako ověřené.",
     "This email address is already in use": "Tato e-mailová adresa je již používaná",
     "This email address was not found": "Tato e-mailová adresa nebyla nalezena",
-    "%(actionVerb)s this person?": "%(actionVerb)s tuto osobu?",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Soubor '%(fileName)s' překračuje maximální velikost povolenou na tomto domovském serveru",
     "The file '%(fileName)s' failed to upload": "Soubor '%(fileName)s' se nepodařilo nahrát",
     "This Home Server does not support login using email address.": "Tento domovský server nepodporuje přihlašování e-mailovou adresou.",
@@ -373,7 +357,6 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Textová zpráva byla odeslána na +%(msisdn)s. Prosím vložte ověřovací kód z dané zprávy",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s přijal/a pozvánku pro %(displayName)s.",
     "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
-    "An email has been sent to": "E-mail byl odeslán odeslán na",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s vykázal/a %(targetName)s.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nebezpečné scripty</a>.",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s změnil/a své zobrazované jméno z %(oldDisplayName)s na %(displayName)s.",
@@ -394,8 +377,6 @@
     "This room is not accessible by remote Matrix servers": "Tato místnost není přístupná vzdáleným Matrix serverům",
     "This room's internal ID is": "Vnitřní ID této místnosti je",
     "To reset your password, enter the email address linked to your account": "K resetování hesla vložte e-mailovou adresu spojenou s vaším účtem",
-    "to restore": "obnovíte",
-    "to tag direct chat": "oštítkujete přímý chat",
     "To use it, just wait for autocomplete results to load and tab through them.": "Použijte tak, že vyčkáte na načtení našeptávaných výsledků a ty pak projdete tabulátorem.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Nemáte práva k zobrazení zprávy v daném časovém úseku.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Zpráva v daném časovém úseku nenalezena.",
@@ -441,7 +422,6 @@
     "User name": "Uživatelské jméno",
     "Username invalid: %(errMessage)s": "Neplatné uživatelské jméno: %(errMessage)s",
     "Users": "Uživatelé",
-    "User": "Uživatel",
     "Verification Pending": "Čeká na ověření",
     "Verification": "Ověření",
     "verified": "ověreno",
@@ -457,14 +437,11 @@
     "Name or matrix ID": "Jméno nebo matrix ID",
     "Invite to Community": "Pozvat do skupiny",
     "Which rooms would you like to add to this community?": "Které místnosti chcete přidat do této skupiny?",
-    "Warning: any room you add to a community will be publicly visible to anyone who knows the community ID": "Varování: místnost, kterou přidáte do této komunity, bude veřejně viditelná každému, kdo zná ID komunity",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Varování: osoba, kterou přidáte do této skupiny, bude veřejně viditelná každému, kdo zná ID skupiny",
     "Add rooms to the community": "Přidat místnosti do skupiny",
     "Room name or alias": "Název nebo alias místnosti",
     "Add to community": "Přidat do skupiny",
     "Failed to invite the following users to %(groupId)s:": "Následující uživatele se nepodařilo přidat do %(groupId)s:",
-    "Invites sent": "Pozvánky odeslány",
-    "Your community invitations have been sent.": "Vaše komunitní pozvánky byly odeslány.",
     "Failed to invite users to community": "Nepodařilo se pozvat uživatele do skupiny",
     "Failed to invite users to %(groupId)s": "Nepodařilo se pozvat uživatele do %(groupId)s",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
@@ -539,7 +516,6 @@
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Smazáním widgetu jej odstraníte všem uživatelům v této místnosti. Určitě chcete tento widget smazat?",
     "The maximum permitted number of widgets have already been added to this room.": "V této místnosti již bylo dosaženo limitu pro maximální počet widgetů.",
     "Drop file here to upload": "Přetažením sem nahrajete",
-    "uploaded a file": "nahrál/a soubor",
     "Example": "Příklad",
     "Create Community": "Vytvořit komunitu",
     "Community Name": "Název skupiny",
@@ -583,19 +559,11 @@
     "Press <StartChatButton> to start a chat with someone": "Zmáčkněte <StartChatButton> a můžete začít chatovat",
     "This invitation was sent to an email address which is not associated with this account:": "Tato pozvánka byla odeslána na e-mailovou aresu, která není přidružená k tomuto účtu:",
     "Joins room with given alias": "Vstoupí do místnosti s daným aliasem",
-    "were unbanned": "byli přijati zpět",
-    "was unbanned": "byl/a přijat/a zpět",
-    "was unbanned %(repeats)s times": "byl/a přijat/a zpět %(repeats)skrát",
-    "were unbanned %(repeats)s times": "byli přijati zpět %(repeats)skrát",
     "Leave Community": "Odejít ze skupiny",
     "Leave %(groupName)s?": "Odejít z %(groupName)s?",
     "Leave": "Odejít",
     "Unable to leave room": "Nepodařilo se odejít z místnosti",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Skrýt zprávy o vstupu či odejití (pozvánky, vykopnutí a vykázání zůstanou)",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s vstoupilo a odešlo %(repeats)skrát",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s vstoupil/a a odešel/la %(repeats)skrát",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s vstoupilo a odešlo",
-    "%(oneUser)sjoined and left": "%(oneUser)s vstoupil/a a odešel/la",
     "Failed to remove user from community": "Nepodařilo se odebrat uživatele ze skupiny",
     "Failed to remove room from community": "Nepodařilo se odebrat místnost ze skupiny",
     "Failed to remove '%(roomName)s' from %(groupId)s": "'%(roomName)s' se nepodařilo odebrat z %(groupId)s",
@@ -623,9 +591,6 @@
     "Tagged as: ": "Oštítkováno jako: ",
     "To link to a room it must have <a>an address</a>.": "Aby šlo odkazovat na místnost, musí mít <a>adresu</a>.",
     "Publish this room to the public in %(domain)s's room directory?": "Zapsat tuto místnost do veřejného adresáře místností na %(domain)s?",
-    "since the point in time of selecting this option": "od chvíle aktivování této volby",
-    "since they were invited": "od chvíle jejich pozvání",
-    "since they joined": "od chvíle jejich vstupu",
     "The default role for new room members is": "Výchozí role nových členů místnosti je",
     "To send messages, you must be a": "Abyste mohl/a posílat zprávy, musíte být",
     "To invite users into the room, you must be a": "Abyste mohl/a zvát uživatele do této místnosti, musíte být",
@@ -638,9 +603,6 @@
     "Remote addresses for this room:": "Vzdálené adresy této místnosti:",
     "Invalid community ID": "Neplatné ID skupiny",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' není platné ID skupiny",
-    "Related Communities": "Související komunity",
-    "Related communities for this room:": "Komunity související s touto místností:",
-    "This room has no related communities": "Tato místnost nemá žádné související komunity",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID skupiny (např. +neco:%(localDomain)s)",
     "%(names)s and %(count)s others are typing|one": "%(names)s a jeden další píší",
     "%(senderName)s sent an image": "%(senderName)s poslal/a obrázek",
@@ -661,13 +623,9 @@
     "Members only (since the point in time of selecting this option)": "Pouze členové (od chvíle vybrání této volby)",
     "Members only (since they were invited)": "Pouze členové (od chvíle jejich pozvání)",
     "Members only (since they joined)": "Pouze členové (od chvíle jejich vstupu)",
-    "Disable URL previews by default for participants in this room": "Vypnout účastníkům v této místnosti automatické náhledy webových adres",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Automatické zobrazení náhledů webových adres je v této místnosti pro všechny účastníky %(globalDisableUrlPreview)s.",
     "You have <a>disabled</a> URL previews by default.": "<a>Vypnul/a</a> jste automatické náhledy webových adres.",
     "You have <a>enabled</a> URL previews by default.": "<a>Zapnul/a</a> jste automatické náhledy webových adres.",
     "URL Previews": "Náhledy webových adres",
-    "Enable URL previews for this room (affects only you)": "Zapnout náhledy webových adres (pouze vám)",
-    "Disable URL previews for this room (affects only you)": "Vypnout náhledy webových adres (pouze vám)",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s změnil/a avatar místnosti %(roomName)s",
     "Add an Integration": "Přidat začlenění",
     "Message removed": "Zpráva odstraněna",
@@ -924,7 +882,6 @@
     "You have no visible notifications": "Nejsou dostupná žádná oznámení",
     "Connectivity to the server has been lost.": "Spojení se serverem bylo přerušené.",
     "Sent messages will be stored until your connection has returned.": "Odeslané zprávy zůstanou uložené, dokud se spojení znovu neobnoví.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Znovu odeslat vše</resendText> nebo <cancelText>zrušit vše</cancelText> nyní. Můžete také znovu odeslat anebo zrušit odesílání jednotlivých zpráv zvlášť.",
     "Active call": "Aktivní hovor",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Kromě vás není v této místnosti nikdo jiný! Přejete si <inviteText>Pozvat další</inviteText> anebo <nowarnText>Přestat upozorňovat na prázdnou místnost</nowarnText>?",
     "Message not sent due to unknown devices being present": "Zpráva nebyla odeslána vzhledem k nalezeným neznámým zařízením",
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 8727eadfc6..67f00cdefb 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -39,19 +39,14 @@
     "Searches DuckDuckGo for results": "Søger DuckDuckGo for resultater",
     "Commands": "kommandoer",
     "Emoji": "Emoji",
-    "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",
-    "Send an encrypted message": "Send en krypteret meddelelse",
-    "Send a message (unencrypted)": "Send en meddelelse (ukrypteret)",
     "Warning!": "Advarsel!",
     "Account": "Konto",
     "Add email address": "Tilføj e-mail-adresse",
     "Add phone number": "Tilføj telefonnummer",
     "Admin": "Administrator",
     "Advanced": "Avanceret",
-    "An email has been sent to": "En e-mail blev sendt til",
     "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 reject the invitation?": "Er du sikker på du vil afvise invitationen?",
@@ -74,7 +69,6 @@
     "Deactivate my account": "Deaktiver min brugerkonto",
     "Default": "Standard",
     "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",
-    "Disable inline URL previews by default": "Deaktiver forrige weblinks forhåndsvisninger som standard",
     "Display name": "Visningsnavn",
     "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",
@@ -98,7 +92,6 @@
     "%(targetName)s accepted an invitation.": "%(targetName)s accepterede en invitation.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s accepterede 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",
     "%(senderName)s answered the call.": "%(senderName)s besvarede opkaldet.",
     "Add a widget": "Tilføj en widget",
     "OK": "OK",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 1710b2d3f3..ec2d43aed7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -40,17 +40,12 @@
     "Searches DuckDuckGo for results": "Verwendet DuckDuckGo für Suchergebnisse",
     "Commands": "Kommandos",
     "Emoji": "Emoji",
-    "Sorry, this homeserver is using a login which is not recognised ": "Entschuldigung, dieser Homeserver nutzt eine Anmeldetechnik, die nicht bekannt ist ",
     "Login as guest": "Als Gast anmelden",
-    "Return to app": "Zurück zur Anwendung",
     "Sign in": "Anmelden",
-    "Send an encrypted message": "Verschlüsselte Nachricht senden",
-    "Send a message (unencrypted)": "Nachricht senden (unverschlüsselt)",
     "Warning!": "Warnung!",
     "Error": "Fehler",
     "Add email address": "E-Mail-Adresse hinzufügen",
     "Advanced": "Erweitert",
-    "An email has been sent to": "Eine E-Mail wurde gesendet an",
     "Anyone who knows the room's link, apart from guests": "Alle, denen der Raum-Link bekannt ist (ausgenommen Gäste)",
     "Anyone who knows the room's link, including guests": "Alle, denen der Raum-Link bekannt ist (auch Gäste)",
     "Are you sure you want to reject the invitation?": "Bist du sicher, dass du die Einladung ablehnen willst?",
@@ -107,7 +102,6 @@
     "Leave room": "Raum verlassen",
     "Logout": "Abmelden",
     "Manage Integrations": "Integrationen verwalten",
-    "Members only": "Nur Mitglieder",
     "Mobile phone number": "Mobiltelefonnummer",
     "Moderator": "Moderator",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
@@ -127,7 +121,6 @@
     "Privileged Users": "Privilegierte Benutzer",
     "Profile": "Profil",
     "Refer a friend to Riot:": "Freunde zu Riot einladen:",
-    "Once you've followed the link it contains, click below": "Nachdem du dem darin enthaltenen Link gefolgt bist, klicke unten",
     "Reject invitation": "Einladung ablehnen",
     "Remove Contact Information?": "Kontakt-Informationen entfernen?",
     "Remove": "Entfernen",
@@ -138,15 +131,10 @@
     "Scroll to unread messages": "Zu den ungelesenen Nachrichten scrollen",
     "Send Invites": "Einladungen senden",
     "Send Reset Email": "E-Mail zum Zurücksetzen senden",
-    "sent an image": "hat ein Bild übermittelt",
-    "sent a video": "hat ein Video gesendet",
     "Server may be unavailable or overloaded": "Server ist eventuell nicht verfügbar oder überlastet",
     "Settings": "Einstellungen",
     "Signed Out": "Abgemeldet",
     "Sign out": "Abmelden",
-    "since the point in time of selecting this option": "ab dem Zeitpunkt, an dem diese Option gewählt wird",
-    "since they joined": "ab dem Zeitpunkt, an dem sie beigetreten sind",
-    "since they were invited": "ab dem Zeitpunkt, an dem sie eingeladen wurden",
     "Someone": "Jemand",
     "Start a chat": "Chat starten",
     "Start Chat": "Chat beginnen",
@@ -160,7 +148,6 @@
     "Admin": "Administrator",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server ist nicht verfügbar, überlastet oder du bist auf einen Softwarefehler gestoßen.",
     "Could not connect to the integration server": "Konnte keine Verbindung zum Integrations-Server herstellen",
-    "Disable inline URL previews by default": "URL-Vorschau im Chat standardmäßig deaktivieren",
     "Labs": "Labor",
     "Show panel": "Panel anzeigen",
     "To reset your password, enter the email address linked to your account": "Um dein Passwort zurückzusetzen, gib bitte die mit deinem Account verknüpfte E-Mail-Adresse ein",
@@ -171,23 +158,17 @@
     "Unencrypted room": "Unverschlüsselter Raum",
     "unknown error code": "Unbekannter Fehlercode",
     "Upload avatar": "Profilbild hochladen",
-    "uploaded a file": "hat eine Datei hochgeladen",
     "Upload Files": "Dateien hochladen",
     "Upload file": "Datei hochladen",
     "User Interface": "Benutzeroberfläche",
     "User name": "Nutzername",
     "Users": "Benutzer",
-    "User": "Nutzer",
     "Verification Pending": "Verifizierung ausstehend",
     "Video call": "Video-Anruf",
     "Voice call": "Sprachanruf",
     "VoIP conference finished.": "VoIP-Konferenz wurde beendet.",
     "VoIP conference started.": "VoIP-Konferenz gestartet.",
     "(warning: cannot be disabled again!)": "(Warnung: Kann anschließend nicht mehr deaktiviert werden!)",
-    "was banned": "wurde aus dem Raum verbannt",
-    "was invited": "wurde eingeladen",
-    "was kicked": "wurde gekickt",
-    "was unbanned": "wurde von der Verbannung aus dem Raum befreit",
     "Who can access this room?": "Wer hat Zugang zu diesem Raum?",
     "Who can read history?": "Wer kann den bisherigen Chatverlauf lesen?",
     "Who would you like to add to this room?": "Wen möchtest du zu diesem Raum hinzufügen?",
@@ -263,7 +244,6 @@
     "%(names)s and %(lastPerson)s are typing": "%(names)s und %(lastPerson)s schreiben",
     "%(targetName)s accepted an invitation.": "%(targetName)s hat eine Einladung angenommen.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hat die Einladung für %(displayName)s akzeptiert.",
-    "%(names)s and one other are typing": "%(names)s und ein weiteres Raum-Mitglied schreiben",
     "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s verbannt.",
     "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von %(oldDisplayName)s auf %(displayName)s geändert.",
@@ -316,12 +296,7 @@
     "Connectivity to the server has been lost.": "Verbindung zum Server wurde unterbrochen.",
     "Sent messages will be stored until your connection has returned.": "Gesendete Nachrichten werden gespeichert, bis die Internetverbindung wiederhergestellt wird.",
     "Active call": "Aktiver Anruf",
-    "Drop here %(toAction)s": "Hierher ziehen: %(toAction)s",
     "Drop here to tag %(section)s": "Hierher ziehen: %(section)s taggen",
-    "to demote": "um die Priorität herabzusetzen",
-    "to favourite": "zum Favorisieren",
-    "to restore": "zum wiederherstellen",
-    "to tag direct chat": "als Direkt-Chat markieren",
     "click to reveal": "anzeigen",
     "You are trying to access %(roomName)s.": "Du versuchst, auf den Raum \"%(roomName)s\" zuzugreifen.",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
@@ -344,7 +319,6 @@
     "Enter Code": "Code eingeben",
     "Failed to ban user": "Verbannen des Benutzers fehlgeschlagen",
     "Failed to change power level": "Ändern des Berechtigungslevels fehlgeschlagen",
-    "Failed to delete device": "Entfernen des Geräts fehlgeschlagen",
     "Failed to join room": "Betreten des Raumes ist fehlgeschlagen",
     "Failed to kick": "Kicken fehlgeschlagen",
     "Failed to mute user": "Stummschalten des Nutzers fehlgeschlagen",
@@ -380,7 +354,6 @@
     "Server unavailable, overloaded, or something else went wrong.": "Server ist nicht verfügbar, überlastet oder ein anderer Fehler ist aufgetreten.",
     "%(count)s of your messages have not been sent.|other": "Einige deiner Nachrichten wurden nicht gesendet.",
     "Submit": "Absenden",
-    "%(actionVerb)s this person?": "Diese Person %(actionVerb)s?",
     "This room has no local addresses": "Dieser Raum hat keine lokale Adresse",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden. Dir fehlt jedoch die Berechtigung, die betreffende Nachricht zu sehen.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Es wurde versucht, einen bestimmten Punkt im Chatverlauf dieses Raumes zu laden, der Punkt konnte jedoch nicht gefunden werden.",
@@ -411,54 +384,8 @@
     "Don't send typing notifications": "Schreibbenachrichtigungen unterdrücken",
     "Hide read receipts": "Lesebestätigungen verbergen",
     "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)sjoined %(repeats)s times": "%(severalUsers)shaben den Raum %(repeats)s-mal betreten",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s mal betreten",
-    "%(severalUsers)sjoined": "%(severalUsers)shaben den Raum betreten",
-    "%(oneUser)sjoined": "%(oneUser)shat den Raum betreten",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)shaben %(repeats)s-mal den Raum verlassen",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s mal verlassen",
-    "%(severalUsers)sleft": "%(severalUsers)shaben den Raum verlassen",
-    "%(oneUser)sleft": "%(oneUser)shat den Raum verlassen",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)shaben den Raum %(repeats)s mal betreten und wieder verlassen",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s-mal betreten und wieder verlassen",
-    "%(severalUsers)sjoined and left": "%(severalUsers)shaben den Raum betreten und wieder verlassen",
-    "%(oneUser)sjoined and left": "%(oneUser)shat den Raum betreten und wieder verlassen",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)shaben den Raum verlassen und %(repeats)s mal neu betreten",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)shat den Raum %(repeats)s mal verlassen und wieder neu betreten",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)shaben den Raum verlassen und wieder neu betreten",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)shaben ihre Einladung %(repeats)s-mal abgelehnt",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)shat die Einladung %(repeats)s mal abgelehnt",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)shaben ihre Einladungen abgelehnt",
-    "%(oneUser)srejected their invitation": "%(oneUser)shat die Einladung abgelehnt",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)swurden die ursprünglichen Einladungen %(repeats)s mal wieder entzogen",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)swurde die Einladung %(repeats)s mal wieder entzogen",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)szogen ihre Einladungen zurück",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)swurde die ursprüngliche Einladung wieder entzogen",
-    "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 aus dem Raum verbannt",
-    "was banned %(repeats)s times": "wurde %(repeats)s-mal aus dem Raum verbannt",
-    "were banned": "wurden aus dem Raum verbannt",
-    "were unbanned %(repeats)s times": "wurden %(repeats)s-mal von der Verbannung aus dem Raum befreit",
-    "was unbanned %(repeats)s times": "wurde %(repeats)s-mal von der Verbannung aus dem Raum befreit",
-    "were unbanned": "wurden von der Verbannung aus dem Raum befreit",
-    "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)schanged their name %(repeats)s times": "%(severalUsers)shaben ihren Namen %(repeats)s mal geändert",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)shat den Namen %(repeats)s-mal geändert",
-    "%(severalUsers)schanged their name": "%(severalUsers)shaben ihre Namen geändert",
-    "%(oneUser)schanged their name": "%(oneUser)shat den Namen geändert",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)shaben %(repeats)s mal ihr Profilbild geändert",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)shat %(repeats)s mal das Profilbild geändert",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)shaben ihr Profilbild geändert",
-    "%(oneUser)schanged their avatar": "%(oneUser)shat das Profilbild geändert",
     "%(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)shat den Raum verlassen und wieder neu betreten",
     "Access Token:": "Zugangs-Token:",
     "Always show message timestamps": "Nachrichten-Zeitstempel immer anzeigen",
     "Authentication": "Authentifizierung",
@@ -524,7 +451,6 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Du kannst auch einen angepassten Idantitätsserver angeben aber dies wird typischerweise Interaktionen mit anderen Nutzern auf Basis der E-Mail-Adresse verhindern.",
     "Please check your email to continue registration.": "Bitte prüfe deine E-Mails, um mit der Registrierung fortzufahren.",
     "Token incorrect": "Token inkorrekt",
-    "A text message has been sent to": "Eine Textnachricht wurde gesendet an",
     "Please enter the code it contains:": "Bitte gebe den Code ein, den sie enthält:",
     "powered by Matrix": "betrieben mit Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Wenn du keine E-Mail-Adresse angibst, wirst du nicht in der Lage sein, dein Passwort zurückzusetzen. Bist du sicher?",
@@ -550,10 +476,7 @@
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot sammelt anonymisierte Analysedaten, um die Anwendung kontinuierlich verbessern zu können.",
     "Add an Integration": "Eine Integration hinzufügen",
     "Removed or unknown message type": "Gelöschte Nachricht oder unbekannter Nachrichten-Typ",
-    "Disable URL previews by default for participants in this room": "URL-Vorschau für Teilnehmer dieses Raumes standardmäßig deaktivieren",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL-Vorschau ist standardmäßig %(globalDisableUrlPreview)s für Teilnehmer dieses Raumes.",
     "URL Previews": "URL-Vorschau",
-    "Enable URL previews for this room (affects only you)": "URL-Vorschau in diesem Raum aktivieren (betrifft nur dich)",
     "Offline": "Offline",
     "Online": "Online",
     " (unsupported)": " (nicht unterstützt)",
@@ -572,18 +495,11 @@
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Wir empfehlen dir, für jedes Gerät den Verifizierungsprozess durchzuführen, um sicherzustellen, dass sie tatsächlich ihrem rechtmäßigem Eigentümer gehören. Alternativ kannst du die Nachrichten auch ohne Verifizierung erneut senden.",
     "Ongoing conference call%(supportedText)s.": "Laufendes Konferenzgespräch%(supportedText)s.",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Du wirst jetzt auf die Website eines Drittanbieters weitergeleitet, damit du dein Benutzerkonto  für die Verwendung von %(integrationsUrl)s authentifizieren kannst. Möchtest du fortfahren?",
-    "Disable URL previews for this room (affects only you)": "URL-Vorschau für diesen Raum deaktivieren (betrifft nur dich)",
     "Start automatically after system login": "Nach System-Login automatisch starten",
     "Desktop specific": "Desktopspezifisch",
     "Jump to first unread message.": "Zur ersten ungelesenen Nachricht springen.",
     "Options": "Optionen",
-    "disabled": "deaktiviert",
-    "enabled": "aktiviert",
     "Invited": "Eingeladen",
-    "for %(amount)ss": "für %(amount)ss",
-    "for %(amount)sm": "seit %(amount)smin",
-    "for %(amount)sh": "für %(amount)sh",
-    "for %(amount)sd": "für %(amount)sd",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s hat das Raum-Bild entfernt.",
     "VoIP": "VoIP",
     "No Webcams detected": "Keine Webcam erkannt",
@@ -640,7 +556,6 @@
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s und %(count)s weitere Dateien werden hochgeladen",
     "You must <a>register</a> to use this functionality": "Du musst dich <a>registrieren</a>, um diese Funktionalität nutzen zu können",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Alle erneut senden</a> oder <a>alle verwerfen</a>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
     "Create new room": "Neuen Raum erstellen",
     "Room directory": "Raum-Verzeichnis",
     "Start chat": "Chat starten",
@@ -657,7 +572,6 @@
     "If you already have a Matrix account you can <a>log in</a> instead.": "Wenn du bereits ein Matrix-Benutzerkonto hast, kannst du dich stattdessen auch direkt <a>anmelden</a>.",
     "Home": "Startseite",
     "Username invalid: %(errMessage)s": "Ungültiger Benutzername: %(errMessage)s",
-    "a room": "einen Raum",
     "Accept": "Akzeptieren",
     "Active call (%(roomName)s)": "Aktiver Anruf (%(roomName)s)",
     "Admin Tools": "Admin-Werkzeuge",
@@ -743,7 +657,6 @@
     "Enable automatic language detection for syntax highlighting": "Automatische Spracherkennung für die Syntax-Hervorhebung aktivieren",
     "Hide Apps": "Apps verbergen",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Betreten-/Verlassen-Benachrichtigungen verbergen (gilt nicht für Einladungen/Kicks/Bans)",
-    "Hide avatar and display name changes": "Profilbild- und Anzeigenamen-Änderungen verbergen",
     "Revoke widget access": "Ziehe Widget-Zugriff zurück",
     "Sets the room topic": "Setzt das Raum-Thema",
     "Show Apps": "Apps anzeigen",
@@ -757,7 +670,6 @@
     "Loading device info...": "Lädt Geräte-Info...",
     "Example": "Beispiel",
     "Create": "Erstellen",
-    "Room creation failed": "Raum-Erstellung fehlgeschlagen",
     "Featured Rooms:": "Hervorgehobene Räume:",
     "Featured Users:": "Hervorgehobene Benutzer:",
     "Automatically replace plain text Emoji": "Klartext-Emoji automatisch ersetzen",
@@ -838,15 +750,12 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Bitte einen der folgenden gültigen Adresstypen verwenden: %(validTypesList)s.",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Entfernen von '%(roomName)s' aus %(groupId)s fehlgeschlagen",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Bist du sicher, dass du '%(roomName)s' aus '%(groupId)s' entfernen möchtest?",
-    "Invites sent": "Einladungen gesendet",
     "Remove avatar": "Profilbild entfernen",
     "Disable big emoji in chat": "Große Emojis im Chat deaktiveren",
-    "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "Sonst ist hier niemand! Möchtest Du <a>Benutzer einladen</a> oder die <a>Warnungen über den leeren Raum deaktivieren</a>?",
     "Pinned Messages": "Angeheftete Nachrichten",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s hat die angehefteten Nachrichten für diesen Raum geändert.",
     "Jump to read receipt": "Zur Lesebestätigung springen",
     "Message Pinning": "Anheften von Nachrichten",
-    "Publish this community on your profile": "Diese Community in deinem Profil veröffentlichen",
     "Long Description (HTML)": "Lange Beschreibung (HTML)",
     "Jump to message": "Zur Nachricht springen",
     "No pinned messages.": "Keine angehefteten Nachrichten vorhanden.",
@@ -857,23 +766,17 @@
     "Guests can join": "Gäste können beitreten",
     "No rooms to show": "Keine anzeigbaren Räume",
     "Community Settings": "Community-Einstellungen",
-    "Community Member Settings": "Community-Mitglieder-Einstellungen",
     "Who would you like to add to this community?": "Wen möchtest du zu dieser Community hinzufügen?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warnung: Jede Person die du einer Community hinzufügst, wird für alle die die Community-ID kennen öffentlich sichtbar sein",
     "Invite new community members": "Neue Community-Mitglieder einladen",
     "Invite to Community": "In die Community einladen",
     "Which rooms would you like to add to this community?": "Welche Räume möchtest du zu dieser Community hinzufügen?",
-    "Warning: any room you add to a community will be publicly visible to anyone who knows the community ID": "Warnung: Jeder Raum, den du zu einer Community hinzufügst, wird für alle, die die Community-ID kennen, öffentlich sichtbar sein",
     "Add rooms to the community": "Räume zur Community hinzufügen",
     "Add to community": "Zur Community hinzufügen",
-    "Your community invitations have been sent.": "Deine Community-Einladungen wurden gesendet.",
     "Failed to invite users to community": "Benutzer konnten nicht in die Community eingeladen werden",
     "Communities": "Communities",
     "Invalid community ID": "Ungültige Community-ID",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' ist keine gültige Community-ID",
-    "Related Communities": "Verknüpfte Communities",
-    "Related communities for this room:": "Verknüpfte Communities für diesen Raum:",
-    "This room has no related communities": "Dieser Raum hat keine verknüpften Communities",
     "New community ID (e.g. +foo:%(localDomain)s)": "Neue Community-ID (z. B. +foo:%(localDomain)s)",
     "Remove from community": "Aus Community entfernen",
     "Failed to remove user from community": "Entfernen des Benutzers aus der Community fehlgeschlagen",
@@ -881,7 +784,6 @@
     "Filter community rooms": "Community-Räume filtern",
     "Failed to remove room from community": "Entfernen des Raumes aus der Community fehlgeschlagen",
     "Removing a room from the community will also remove it from the community page.": "Das Entfernen eines Raumes aus der Community wird ihn auch von der Community-Seite entfernen.",
-    "Community IDs may only contain alphanumeric characters": "Community-IDs dürfen nur alphanumerische Zeichen enthalten",
     "Create Community": "Community erstellen",
     "Community Name": "Community-Name",
     "Community ID": "Community-ID",
@@ -899,7 +801,6 @@
     "Failed to load %(groupId)s": "'%(groupId)s' konnte nicht geladen werden",
     "Error whilst fetching joined communities": "Fehler beim Laden beigetretener Communities",
     "Create a new community": "Neue Community erstellen",
-    "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Erzeuge eine Community um deine Community zu repräsentieren! Definiere eine Menge von Räumen und deine eigene angepasste Startseite um dein Revier im Matrix-Universum zu markieren.",
     "Join an existing community": "Einer bestehenden Community beitreten",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Um einer bereits bestehenden Community beitreten zu können, musst dir deren Community-ID bekannt sein. Diese sieht z. B. aus wie <i>+example:matrix.org</i>.",
     "Your Communities": "Deine Communities",
@@ -912,7 +813,6 @@
     "Message removed": "Nachricht entfernt",
     "Mention": "Erwähnen",
     "Invite": "Einladen",
-    "Remove this room from the community": "Diesen Raum aus der Community entfernen",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Das Löschen eines Widgets entfernt das Widget für alle Benutzer in diesem Raum. Möchtest du dieses Widget wirklich löschen?",
     "Mirror local video feed": "Lokalen Video-Feed spiegeln",
     "Failed to withdraw invitation": "Die Einladung konnte nicht zurückgezogen werden",
@@ -1010,7 +910,6 @@
     "Enable URL previews for this room (only affects you)": "URL-Vorschau für diesen Raum aktivieren (betrifft nur dich)",
     "Enable URL previews by default for participants in this room": "URL-Vorschau standardmäßig für Mitglieder dieses Raumes aktivieren",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Hinweis: Du meldest dich auf dem %(hs)s-Server an, nicht auf matrix.org.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Alle erneut senden</resendText> oder <cancelText>alle verwerfen</cancelText>. Du kannst auch einzelne Nachrichten erneut senden oder verwerfen.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Sonst ist hier aktuell niemand. Möchtest du <inviteText>Benutzer einladen</inviteText> oder die <nowarnText>Warnmeldung bezüglich des leeren Raums deaktivieren</nowarnText>?",
     "Sign in to get started": "Melde dich an, um loszulegen",
     "URL previews are disabled by default for participants in this room.": "URL-Vorschau ist für Mitglieder dieses Raumes standardmäßig deaktiviert.",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 84f56f4502..4974268999 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -25,7 +25,6 @@
     "Algorithm": "Αλγόριθμος",
     "Hide removed messages": "Απόκρυψη διαγραμμένων μηνυμάτων",
     "Authentication": "Πιστοποίηση",
-    "An email has been sent to": "Ένα email στάλθηκε σε",
     "A new password must be entered.": "Ο νέος κωδικός πρόσβασης πρέπει να εισαχθεί.",
     "%(senderName)s answered the call.": "Ο χρήστης %(senderName)s απάντησε την κλήση.",
     "An error has occurred.": "Παρουσιάστηκε ένα σφάλμα.",
@@ -43,12 +42,9 @@
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Ένα μήνυμα στάλθηκε στο +%(msisdn)s. Παρακαλώ γράψε τον κωδικό επαλήθευσης που περιέχει",
     "Access Token:": "Κωδικός πρόσβασης:",
     "Always show message timestamps": "Εμφάνιση πάντα της ένδειξης ώρας στα μηνύματα",
-    "%(items)s and %(remaining)s others": "%(items)s και %(remaining)s ακόμα",
-    "%(items)s and one other": "%(items)s και ένας ακόμα",
     "and %(count)s others...|one": "και ένας ακόμα...",
     "and %(count)s others...|other": "και %(count)s άλλοι...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s και %(lastPerson)s γράφουν",
-    "%(names)s and one other are typing": "%(names)s και ένας ακόμα γράφουν",
     "Anyone who knows the room's link, including guests": "Οποιοσδήποτε γνωρίζει τον σύνδεσμο του δωματίου, συμπεριλαμβανομένων των επισκεπτών",
     "Blacklisted": "Στη μαύρη λίστα",
     "Can't load user settings": "Δεν είναι δυνατή η φόρτωση των ρυθμίσεων χρήστη",
@@ -62,7 +58,6 @@
     "Bans user with given id": "Αποκλεισμός χρήστη με το συγκεκριμένο αναγνωριστικό",
     "%(senderDisplayName)s removed the room name.": "Ο %(senderDisplayName)s διέγραψε το όνομα του δωματίου.",
     "Changes your display nickname": "Αλλάζει το ψευδώνυμο χρήστη",
-    "Drop here %(toAction)s": "Αποθέστε εδώ %(toAction)s",
     "Conference call failed.": "Η κλήση συνδιάσκεψης απέτυχε.",
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
     "Confirm password": "Επιβεβαίωση κωδικού πρόσβασης",
@@ -88,7 +83,6 @@
     "Device key:": "Κλειδί συσκευής:",
     "Devices": "Συσκευές",
     "Direct chats": "Απευθείας συνομιλίες",
-    "disabled": "ανενεργό",
     "Disinvite": "Ανάκληση πρόσκλησης",
     "Display name": "Όνομα χρήστη",
     "Download %(text)s": "Λήψη %(text)s",
@@ -98,7 +92,6 @@
     "Email address (optional)": "Ηλεκτρονική διεύθυνση (προαιρετικό)",
     "Email, name or matrix ID": "Ηλεκτρονική διεύθυνση, όνομα ή matrix ID",
     "Emoji": "Εικονίδια",
-    "enabled": "ενεργή",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Τα κρυπτογραφημένα μηνύματα δεν θα είναι ορατά σε εφαρμογές που δεν παρέχουν τη δυνατότητα κρυπτογράφησης",
     "Encrypted room": "Κρυπτογραφημένο δωμάτιο",
     "%(senderName)s ended the call.": "%(senderName)s τερμάτισε την κλήση.",
@@ -109,7 +102,6 @@
     "Export": "Εξαγωγή",
     "Export E2E room keys": "Εξαγωγή κλειδιών κρυπτογράφησης για το δωμάτιο",
     "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;",
-    "Failed to delete device": "Δεν ήταν δυνατή η διαγραφή της συσκευής",
     "Failed to join room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
     "Failed to leave room": "Δεν ήταν δυνατή η αποχώρηση από το δωμάτιο",
     "Failed to mute user": "Δεν ήταν δυνατή η σίγαση του χρήστη",
@@ -157,7 +149,6 @@
     "Logout": "Αποσύνδεση",
     "Low priority": "Χαμηλής προτεραιότητας",
     "matrix-react-sdk version:": "Έκδοση matrix-react-sdk:",
-    "Members only": "Μόνο μέλη",
     "Message not sent due to unknown devices being present": "Το μήνυμα δεν στάλθηκε γιατί υπάρχουν άγνωστες συσκευές",
     "Mobile phone number": "Αριθμός κινητού τηλεφώνου",
     "Click here to fix": "Κάνε κλικ εδώ για διόρθωση",
@@ -196,16 +187,10 @@
     "Rooms": "Δωμάτια",
     "Save": "Αποθήκευση",
     "Search failed": "Η αναζήτηση απέτυχε",
-    "Send an encrypted message": "Στείλτε ένα κρυπτογραφημένο μήνυμα",
-    "Send a message (unencrypted)": "Στείλτε ένα μήνυμα (μη κρυπτογραφημένο)",
-    "sent an image": "έστειλε μια εικόνα",
-    "sent a video": "έστειλε ένα βίντεο",
     "Server error": "Σφάλμα διακομιστή",
     "Signed Out": "Αποσυνδέθηκε",
     "Sign in": "Συνδέση",
     "Sign out": "Αποσύνδεση",
-    "since they joined": "από τη στιγμή που συνδέθηκαν",
-    "since they were invited": "από τη στιγμή που προσκλήθηκαν",
     "Someone": "Κάποιος",
     "Start a chat": "Έναρξη συνομιλίας",
     "This email address is already in use": "Η διεύθυνση ηλ. αλληλογραφίας χρησιμοποιείται ήδη",
@@ -220,18 +205,10 @@
     "underline": "υπογράμμιση",
     "code": "κώδικας",
     "quote": "παράθεση",
-    "%(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 συνδέθηκε και έφυγε",
     "Close": "Κλείσιμο",
     "Create new room": "Δημιουργία νέου δωματίου",
     "Room directory": "Ευρετήριο",
     "Start chat": "Έναρξη συνομιλίας",
-    "a room": "ένα δωμάτιο",
     "Accept": "Αποδοχή",
     "Active call (%(roomName)s)": "Ενεργή κλήση (%(roomName)s)",
     "Add": "Προσθήκη",
@@ -288,7 +265,6 @@
     "Remove %(threePid)s?": "Αφαίρεση %(threePid)s;",
     "Report it": "Αναφορά",
     "Results from DuckDuckGo": "Αποτελέσματα από DuckDuckGo",
-    "Return to app": "Επιστροφή στην εφαρμογή",
     "Return to login screen": "Επιστροφή στην οθόνη σύνδεσης",
     "Room %(roomId)s not visible": "Το δωμάτιο %(roomId)s δεν είναι ορατό",
     "%(roomName)s does not exist.": "Το %(roomName)s δεν υπάρχει.",
@@ -306,14 +282,12 @@
     "Tagged as: ": "Με ετικέτα: ",
     "The default role for new room members is": "Ο προεπιλεγμένος ρόλος για νέα μέλη είναι",
     "The main address for this room is": "Η κύρια διεύθυνση για το δωμάτιο είναι",
-    "%(actionVerb)s this person?": "%(actionVerb)s αυτού του ατόμου;",
     "The file '%(fileName)s' failed to upload": "Απέτυχε η αποστολή του αρχείου '%(fileName)s'",
     "This room has no local addresses": "Αυτό το δωμάτιο δεν έχει τοπικές διευθύνσεις",
     "This doesn't appear to be a valid email address": "Δεν μοιάζει με μια έγκυρη διεύθυνση ηλεκτρονικής αλληλογραφίας",
     "This phone number is already in use": "Αυτός ο αριθμός τηλεφώνου είναι ήδη σε χρήση",
     "This room": "Αυτό το δωμάτιο",
     "This room's internal ID is": "Το εσωτερικό αναγνωριστικό του δωματίου είναι",
-    "to restore": "για επαναφορά",
     "Turn Markdown off": "Απενεργοποίηση Markdown",
     "Turn Markdown on": "Ενεργοποίηση Markdown",
     "Unable to add email address": "Αδυναμία προσθήκης διεύθυνσης ηλ. αλληλογραφίας",
@@ -347,7 +321,6 @@
     "User name": "Όνομα χρήστη",
     "Username invalid: %(errMessage)s": "Μη έγκυρο όνομα χρήστη: %(errMessage)s",
     "Users": "Χρήστες",
-    "User": "Χρήστης",
     "Video call": "Βιντεοκλήση",
     "Voice call": "Φωνητική κλήση",
     "Warning!": "Προειδοποίηση!",
@@ -397,16 +370,6 @@
     "Active call": "Ενεργή κλήση",
     "strike": "επιγράμμιση",
     "bullet": "κουκκίδα",
-    "%(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 συνδέθηκε",
-    "were invited": "προσκλήθηκαν",
-    "was invited": "προσκλήθηκε",
-    "were banned": "αποκλείστηκαν",
-    "was banned": "αποκλείστηκε",
-    "were kicked": "διώχτηκαν",
-    "was kicked": "διώχτηκε",
     "New Password": "Νέος κωδικός πρόσβασης",
     "Start automatically after system login": "Αυτόματη έναρξη μετά τη σύνδεση",
     "Options": "Επιλογές",
@@ -436,7 +399,6 @@
     "Sign in with CAS": "Σύνδεση με CAS",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας μια διαφορετική διεύθυνση για το διακομιστή.",
     "Token incorrect": "Εσφαλμένο διακριτικό",
-    "A text message has been sent to": "Ένα μήνυμα στάλθηκε στο",
     "Please enter the code it contains:": "Παρακαλούμε εισάγετε τον κωδικό που περιέχει:",
     "Default server": "Προεπιλεγμένος διακομιστής",
     "Custom server": "Προσαρμοσμένος διακομιστής",
@@ -450,12 +412,7 @@
     "Error decrypting video": "Σφάλμα κατά την αποκρυπτογράφηση του βίντεο",
     "Add an Integration": "Προσθήκη ενσωμάτωσης",
     "URL Previews": "Προεπισκόπηση συνδέσμων",
-    "Enable URL previews for this room (affects only you)": "Ενεργοποίηση της προεπισκόπησης συνδέσμων για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
     "Drop file here to upload": "Αποθέστε εδώ για αποστολή",
-    "for %(amount)ss": "για %(amount)ss",
-    "for %(amount)sm": "για %(amount)sm",
-    "for %(amount)sh": "για %(amount)sh",
-    "for %(amount)sd": "για %(amount)sd",
     "Online": "Σε σύνδεση",
     "Idle": "Αδρανής",
     "Offline": "Εκτός σύνδεσης",
@@ -509,7 +466,6 @@
     "No display name": "Χωρίς όνομα",
     "No users have specific privileges in this room": "Κανένας χρήστης δεν έχει συγκεκριμένα δικαιώματα σε αυτό το δωμάτιο",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Μόλις ενεργοποιηθεί η κρυπτογράφηση για ένα δωμάτιο, δεν μπορεί να απενεργοποιηθεί ξανά (για τώρα)",
-    "Once you've followed the link it contains, click below": "Μόλις ακολουθήσετε τον σύνδεσμο που περιέχει, κάντε κλικ παρακάτω",
     "Only people who have been invited": "Μόνο άτομα που έχουν προσκληθεί",
     "Otherwise, <a>click here</a> to send a bug report.": "Διαφορετικά, κάντε <a>κλικ εδώ</a> για να αποστείλετε μια αναφορά σφάλματος.",
     "%(senderName)s placed a %(callType)s call.": "Ο %(senderName)s πραγματοποίησε μια %(callType)s κλήση.",
@@ -533,12 +489,10 @@
     "Show Text Formatting Toolbar": "Εμφάνιση της εργαλειοθήκης μορφοποίησης κειμένου",
     "%(count)s of your messages have not been sent.|other": "Μερικά από τα μηνύματα σας δεν έχουν αποσταλεί.",
     "This room is not recognised.": "Αυτό το δωμάτιο δεν αναγνωρίζεται.",
-    "to favourite": "στα αγαπημένα",
     "Unable to capture screen": "Αδυναμία σύλληψης οθόνης",
     "Unknown (user, device) pair:": "Άγνωστο ζεύγος (χρήστη, συσκευής):",
     "Uploading %(filename)s and %(count)s others|zero": "Γίνεται αποστολή του %(filename)s",
     "Uploading %(filename)s and %(count)s others|other": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπων",
-    "uploaded a file": "ανέβασε ένα αρχείο",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (δύναμη %(powerLevelNumber)s)",
     "Verification Pending": "Εκκρεμεί επιβεβαίωση",
     "Verification": "Επιβεβαίωση",
@@ -565,25 +519,6 @@
     "Make this room private": "Κάντε το δωμάτιο ιδιωτικό",
     "There are no visible files in this room": "Δεν υπάρχουν ορατά αρχεία σε αυτό το δωμάτιο",
     "Connectivity to the server has been lost.": "Χάθηκε η συνδεσιμότητα στον διακομιστή.",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)s έφυγαν %(repeats)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 banned %(repeats)s times": "αποκλείστηκαν %(repeats)s φορές",
-    "was banned %(repeats)s times": "αποκλείστηκε %(repeats)s φορές",
-    "were kicked %(repeats)s times": "διώχθηκαν %(repeats)s φορές",
-    "was kicked %(repeats)s times": "διώχθηκε %(repeats)s φορές",
-    "%(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 άλλαξε την προσωπική του εικόνα",
     "Please select the destination room for this message": "Παρακαλούμε επιλέξτε ένα δωμάτιο προορισμού για αυτό το μήνυμα",
     "Desktop specific": "Μόνο για επιφάνεια εργασίας",
     "Analytics": "Αναλυτικά δεδομένα",
@@ -600,8 +535,6 @@
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Αν δεν ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας, δεν θα θα μπορείτε να επαναφέρετε τον κωδικό πρόσβασης σας. Είστε σίγουροι;",
     "You are registering with %(SelectedTeamName)s": "Εγγραφείτε με %(SelectedTeamName)s",
     "Removed or unknown message type": "Αφαιρέθηκε ή άγνωστος τύπος μηνύματος",
-    "Disable URL previews by default for participants in this room": "Απενεργοποίηση της προεπισκόπησης συνδέσμων για όλους τους συμμετέχοντες στο δωμάτιο",
-    "Disable URL previews for this room (affects only you)": "Απενεργοποίηση της προεπισκόπησης συνδέσμων για αυτό το δωμάτιο (επηρεάζει μόνο εσάς)",
     " (unsupported)": " (μη υποστηριζόμενο)",
     "%(senderDisplayName)s changed the room avatar to <img/>": "Ο %(senderDisplayName)s άλλαξε την εικόνα του δωματίου σε <img/>",
     "Missing Media Permissions, click here to request.": "Λείπουν τα δικαιώματα πολύμεσων, κάντε κλικ για να ζητήσετε.",
@@ -616,7 +549,6 @@
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "Ο %(senderName)s αφαίρεσε το όνομα εμφάνισης του (%(oldDisplayName)s).",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Ο %(senderName)s έστειλε μια πρόσκληση στον %(targetDisplayName)s για να συνδεθεί στο δωμάτιο.",
     "%(senderName)s set their display name to %(displayName)s.": "Ο %(senderName)s όρισε το όνομα του σε %(displayName)s.",
-    "Sorry, this homeserver is using a login which is not recognised ": "Συγγνώμη, ο διακομιστής χρησιμοποιεί έναν τρόπο σύνδεσης που δεν αναγνωρίζεται ",
     "The phone number entered looks invalid": "Ο αριθμός που καταχωρίσατε δεν είναι έγκυρος",
     "The email address linked to your account must be entered.": "Πρέπει να εισηχθεί η διεύθυνση ηλ. αλληλογραφίας που είναι συνδεδεμένη με τον λογαριασμό σας.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Το αρχείο '%(fileName)s' υπερβαίνει το όριο μεγέθους του διακομιστή για αποστολές",
@@ -627,9 +559,7 @@
     "The visibility of existing history will be unchanged": "Η ορατότητα του υπάρχοντος ιστορικού θα παραμείνει αμετάβλητη",
     "This is a preview of this room. Room interactions have been disabled": "Αυτή είναι μια προεπισκόπηση του δωματίου. Οι αλληλεπιδράσεις δωματίου έχουν απενεργοποιηθεί",
     "This room is not accessible by remote Matrix servers": "Αυτό το δωμάτιο δεν είναι προσβάσιμο από απομακρυσμένους διακομιστές Matrix",
-    "to demote": "για υποβίβαση",
     "To reset your password, enter the email address linked to your account": "Για να επαναφέρετε τον κωδικό πρόσβασης σας, πληκτρολογήστε τη διεύθυνση ηλ. αλληλογραφίας όπου είναι συνδεδεμένη με τον λογαριασμό σας",
-    "to tag direct chat": "για να οριστεί ετικέτα σε απευθείας συνομιλία",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Ο %(senderName)s ενεργοποίησε την από άκρο σε άκρο κρυπτογράφηση (algorithm %(algorithm)s).",
     "Undecryptable": "Μη αποκρυπτογραφημένο",
     "Uploading %(filename)s and %(count)s others|one": "Γίνεται αποστολή του %(filename)s και %(count)s υπολοίπα",
@@ -649,35 +579,23 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Τα ονόματα μπορεί να περιέχουν μόνο γράμματα, αριθμούς, τελείες, πάνω και κάτω παύλα.",
     "Share message history with new users": "Διαμοιρασμός ιστορικού μηνυμάτων με τους νέους χρήστες",
     "numbullet": "απαρίθμηση",
-    "%(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)shad their invitations withdrawn %(repeats)s times": "Οι %(severalUsers)s απέσυραν τις προσκλήσεις τους %(repeats)s φορές",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "Ο %(oneUser)s απέσυρε την πρόσκληση του %(repeats)s φορές",
-    "%(severalUsers)shad their invitations withdrawn": "Οι %(severalUsers)s απέσυραν τις προσκλήσεις τους",
-    "%(oneUser)shad their invitation withdrawn": "Ο %(oneUser)s απέσυρε την πρόσκληση του",
     "You must join the room to see its files": "Πρέπει να συνδεθείτε στο δωμάτιο για να δείτε τα αρχεία του",
     "Reject all %(invitedRooms)s invites": "Απόρριψη όλων των προσκλήσεων %(invitedRooms)s",
     "Failed to invite the following users to the %(roomName)s room:": "Δεν ήταν δυνατή η πρόσκληση των χρηστών στο δωμάτιο %(roomName)s:",
     "Deops user with given id": "Deop χρήστη με το συγκεκριμένο αναγνωριστικό",
-    "Disable inline URL previews by default": "Απενεργοποίηση προεπισκόπησης συνδέσμων από προεπιλογή",
     "Drop here to tag %(section)s": "Απόθεση εδώ για ορισμό ετικέτας στο %(section)s",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Συμμετάσχετε με <voiceText>φωνή</voiceText> ή <videoText>βίντεο</videoText>.",
     "Joins room with given alias": "Συνδέεστε στο δωμάτιο με δοσμένο ψευδώνυμο",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Εμφάνιση χρονικών σημάνσεων σε 12ωρη μορφή ώρας (π.χ. 2:30 μ.μ.)",
-    "since the point in time of selecting this option": "από το χρονικό σημείο επιλογής αυτής της ρύθμισης",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Το κλειδί υπογραφής που δώσατε αντιστοιχεί στο κλειδί υπογραφής που λάβατε από τη συσκευή %(userId)s %(deviceId)s. Η συσκευή έχει επισημανθεί ως επιβεβαιωμένη.",
     "To link to a room it must have <a>an address</a>.": "Για να συνδεθείτε σε ένα δωμάτιο πρέπει να έχετε <a>μια διεύθυνση</a>.",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Η διεύθυνση ηλεκτρονικής αλληλογραφίας σας δεν φαίνεται να συσχετίζεται με Matrix ID σε αυτόν τον διακομιστή.",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ο κωδικός πρόσβασής σας άλλαξε επιτυχώς. Δεν θα λάβετε ειδοποιήσεις push σε άλλες συσκευές μέχρι να συνδεθείτε ξανά σε αυτές",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Δεν θα μπορέσετε να αναιρέσετε αυτήν την αλλαγή καθώς προωθείτε τον χρήστη να έχει το ίδιο επίπεδο δύναμης με τον εαυτό σας.",
     "Sent messages will be stored until your connection has returned.": "Τα απεσταλμένα μηνύματα θα αποθηκευτούν μέχρι να αακτηθεί η σύνδεσή σας.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Αποστολή ξανά όλων</a> ή <a>ακύρωση όλων</a> τώρα. Μπορείτε επίσης να επιλέξετε μεμονωμένα μηνύματα για να τα στείλετε ξανά ή να ακυρώσετε.",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Είστε βέβαιοι ότι θέλετε να καταργήσετε (διαγράψετε) αυτό το συμβάν; Σημειώστε ότι αν διαγράψετε το όνομα δωματίου ή αλλάξετε το θέμα, θα μπορούσε να αναιρέσει την αλλαγή.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή με έναν υπάρχον λογαριασμό Matrix σε έναν διαφορετικό διακομιστή.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Μπορείτε επίσης να ορίσετε έναν προσαρμοσμένο διακομιστή ταυτοποίησης, αλλά αυτό συνήθως θα αποτρέψει την αλληλεπίδραση με τους χρήστες που βασίζονται στην ηλεκτρονική διεύθυνση αλληλογραφίας.",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Η προεπισκόπηση συνδέσμων είναι %(globalDisableUrlPreview)s από προεπιλογή για τους συμμετέχοντες του δωματίου.",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Αυτό θα είναι το όνομα του λογαριασμού σας στον διακομιστή <span></span>, ή μπορείτε να επιλέξετε <a>διαφορετικό διακομιστή</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Αν έχετε ήδη λογαριασμό Matrix μπορείτε να <a>συνδεθείτε</a>.",
     "Failed to load timeline position": "Δεν ήταν δυνατή η φόρτωση της θέσης του χρονολόγιου",
@@ -716,10 +634,6 @@
     "Disable Peer-to-Peer for 1:1 calls": "Απενεργοποίηση του ομότιμου (Peer-to-Peer) για κλήσεις έναν προς έναν",
     "Do you want to set an email address?": "Θέλετε να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας;",
     "This will allow you to reset your password and receive notifications.": "Αυτό θα σας επιτρέψει να επαναφέρετε τον κωδικό πρόσβαση σας και θα μπορείτε να λαμβάνετε ειδοποιήσεις.",
-    "were unbanned %(repeats)s times": "ξεμπλοκαρίστηκαν %(repeats)s φορές",
-    "was unbanned %(repeats)s times": "ξεμπλοκαρίστηκε %(repeats)s φορές",
-    "were unbanned": "ξεμπλοκαρίστηκαν",
-    "was unbanned": "ξεμπλοκαρίστηκε",
     "Press <StartChatButton> to start a chat with someone": "Πατήστε <StartChatButton> για να ξεκινήσετε μια συνομιλία",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Δεν είστε σε κανένα δωμάτιο! Πατήστε <CreateRoomButton> για να δημιουργήσετε ένα δωμάτιο  ή <RoomDirectoryButton> για να δείτε το ευρετήριο",
     "To return to your account in future you need to set a password": "Για να επιστρέψετε στον λογαριασμό σας μελλοντικα πρέπει να ορίσετε έναν κωδικό πρόσβασης",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index ce2458f8a0..ce606d3907 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -25,14 +25,10 @@
     "Hide removed messages": "Hide removed messages",
     "Always show message timestamps": "Always show message timestamps",
     "Authentication": "Authentication",
-    "%(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 %(count)s others...|other": "and %(count)s others...",
     "and %(count)s others...|one": "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",
-    "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.",
     "An error has occurred.": "An error has occurred.",
@@ -107,14 +103,11 @@
     "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",
     "Direct chats": "Direct chats",
-    "disabled": "disabled",
-    "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",
     "Edit": "Edit",
@@ -124,7 +117,6 @@
     "Email, name or matrix ID": "Email, name or matrix ID",
     "Emoji": "Emoji",
     "Enable encryption": "Enable encryption",
-    "enabled": "enabled",
     "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.",
@@ -140,7 +132,6 @@
     "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 kick": "Failed to kick",
@@ -234,7 +225,6 @@
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
     "matrix-react-sdk version:": "matrix-react-sdk version:",
-    "Members only": "Members only",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
     "Missing room_id in request": "Missing room_id in request",
@@ -265,7 +255,6 @@
     "OK": "OK",
     "olm version:": "olm version:",
     "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've followed the link it contains, click below": "Once you've followed the link it contains, click below",
     "Only people who have been invited": "Only people who have been invited",
     "Operation failed": "Operation failed",
     "Password": "Password",
@@ -297,7 +286,6 @@
     "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.",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
-    "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",
@@ -312,15 +300,11 @@
     "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",
-    "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",
     "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 :(",
@@ -337,12 +321,8 @@
     "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",
     "%(count)s of your messages have not been sent.|other": "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 recognized ",
     "Start a chat": "Start a chat",
     "Start Chat": "Start Chat",
     "Submit": "Submit",
@@ -353,7 +333,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.",
     "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",
@@ -368,11 +347,7 @@
     "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",
-    "to demote": "to demote",
-    "to favourite": "to favorite",
     "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 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.",
@@ -396,7 +371,6 @@
     "Unmute": "Unmute",
     "Unrecognised command:": "Unrecognized command:",
     "Unrecognised room alias:": "Unrecognized room alias:",
-    "uploaded a file": "uploaded a file",
     "Upload avatar": "Upload avatar",
     "Upload Failed": "Upload Failed",
     "Upload Files": "Upload Files",
@@ -408,7 +382,6 @@
     "User Interface": "User Interface",
     "User name": "User name",
     "Users": "Users",
-    "User": "User",
     "Verification Pending": "Verification Pending",
     "Verification": "Verification",
     "verified": "verified",
@@ -503,54 +476,6 @@
     "quote": "quote",
     "bullet": "bullet",
     "numbullet": "numbullet",
-    "%(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",
-    "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)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",
     "Please select the destination room for this message": "Please select the destination room for this message",
     "Start automatically after system login": "Start automatically after system login",
     "Desktop specific": "Desktop specific",
@@ -628,7 +553,6 @@
     "Dismiss": "Dismiss",
     "Please check your email to continue registration.": "Please check your email to continue registration.",
     "Token incorrect": "Token incorrect",
-    "A text message has been sent to": "A text message has been sent to",
     "Please enter the code it contains:": "Please enter the code it contains:",
     "powered by Matrix": "powered by Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?",
@@ -646,27 +570,18 @@
     "Add an Integration": "Add an Integration",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?",
     "Removed or unknown message type": "Removed or unknown message type",
-    "Disable URL previews by default for participants in this room": "Disable URL previews by default for participants in this room",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.",
     "URL Previews": "URL Previews",
-    "Enable URL previews for this room (affects only you)": "Enable URL previews for this room (affects only you)",
     "Drop file here to upload": "Drop file here to upload",
     " (unsupported)": " (unsupported)",
     "Ongoing conference call%(supportedText)s.": "Ongoing conference call%(supportedText)s.",
-    "for %(amount)ss": "for %(amount)ss",
-    "for %(amount)sm": "for %(amount)sm",
-    "for %(amount)sh": "for %(amount)sh",
-    "for %(amount)sd": "for %(amount)sd",
     "Online": "Online",
     "Idle": "Idle",
     "Offline": "Offline",
-    "Disable URL previews for this room (affects only you)": "Disable URL previews for this room (affects only you)",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "Active call (%(roomName)s)": "Active call (%(roomName)s)",
     "Accept": "Accept",
-    "a room": "a room",
     "Add": "Add",
     "Admin Tools": "Admin tools",
     "Alias (optional)": "Alias (optional)",
@@ -736,7 +651,6 @@
     "You may wish to login with a different account, or add this email to this account.": "You may wish to login with a different account, or add this email to this account.",
     "You must <a>register</a> to use this functionality": "You must <a>register</a> to use this functionality",
     "Your home server does not support device management.": "Your home server does not support device management.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.",
     "(~%(count)s results)|one": "(~%(count)s result)",
     "(~%(count)s results)|other": "(~%(count)s results)",
     "New Password": "New Password",
@@ -774,7 +688,6 @@
     "Do you want to load widget from URL:": "Do you want to load widget from URL:",
     "Enable automatic language detection for syntax highlighting": "Enable automatic language detection for syntax highlighting",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Hide join/leave messages (invites/kicks/bans unaffected)",
-    "Hide avatar and display name changes": "Hide avatar and display name changes",
     "Integrations Error": "Integrations Error",
     "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
     "Sets the room topic": "Sets the room topic",
@@ -789,7 +702,6 @@
     "Message removed by %(userId)s": "Message removed by %(userId)s",
     "Example": "Example",
     "Create": "Create",
-    "Room creation failed": "Room creation failed",
     "Pinned Messages": "Pinned Messages",
     "Featured Rooms:": "Featured Rooms:",
     "Featured Users:": "Featured Users:",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 7511594b4d..409c2054cb 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -312,8 +312,6 @@
     "Show Apps": "Montri aplikaĵojn",
     "Upload file": "Alŝuti dosieron",
     "Show Text Formatting Toolbar": "Montri tekstaranĝan breton",
-    "Send an encrypted message": "Sendi ĉirfitan mesaĝon",
-    "Send a message (unencrypted)": "Sendi mesaĝon (neĉifritan)",
     "You do not have permission to post to this room": "Mankas al vi permeso afiŝi en la ĉambro",
     "Turn Markdown on": "Ŝalti Marksubon",
     "Turn Markdown off": "Malŝalti Marksubon",
@@ -770,8 +768,6 @@
     "Scroll to bottom of page": "Rulumi al susbo de la paĝo",
     "Message not sent due to unknown devices being present": "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj aparatoj",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Montri aparatojn</showDevicesText> aŭ <cancelText>nuligi ĉiujn</cancelText>.",
-    "Some of your messages have not been sent.": "Iuj viaj mesaĝoj ne sendiĝis.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Resendi ĉion</resendText> aŭ <cancelText>nuligi ĉion</cancelText> nun. Vi ankaŭ povas elekti unuopajn mesaĝojn por resendo aŭ nuligo.",
     "Connectivity to the server has been lost.": "Konekto al la servilo perdiĝis.",
     "Sent messages will be stored until your connection has returned.": "Senditaj mesaĝoj konserviĝos ĝis via konekto refunkcios.",
     "%(count)s new messages|other": "%(count)s novaj mesaĝoj",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 9bb62477be..ff28d339d0 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -11,14 +11,10 @@
     "Algorithm": "Algoritmo",
     "Always show message timestamps": "Siempre mostrar la hora del mensaje",
     "Authentication": "Autenticación",
-    "%(items)s and %(remaining)s others": "%(items)s y %(remaining)s otros",
-    "%(items)s and one other": "%(items)s y otro",
     "%(items)s and %(lastItem)s": "%(items)s y %(lastItem)s",
     "and %(count)s others...|other": "y %(count)s otros...",
     "and %(count)s others...|one": "y otro...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s y %(lastPerson)s están escribiendo",
-    "%(names)s and one other are typing": "%(names)s y otro están escribiendo",
-    "An email has been sent to": "Un correo ha sido enviado a",
     "A new password must be entered.": "Una nueva clave debe ser ingresada.",
     "%(senderName)s answered the call.": "%(senderName)s atendió la llamada.",
     "An error has occurred.": "Un error ha ocurrido.",
@@ -83,13 +79,11 @@
     "Devices": "Dispositivos",
     "Devices will not yet be able to decrypt history from before they joined the room": "Los dispositivos aun no serán capaces de descifrar el historial antes de haberse unido a la sala",
     "Direct chats": "Conversaciones directas",
-    "Disable inline URL previews by default": "Desactivar previsualización de enlaces por defecto",
     "Disinvite": "Deshacer invitación",
     "Display name": "Nombre para mostrar",
     "Displays action": "Mostrar acción",
     "Don't send typing notifications": "No enviar notificaciones cuando se escribe",
     "Download %(text)s": "Descargar %(text)s",
-    "Drop here %(toAction)s": "Suelta aquí %(toAction)s",
     "Drop here to tag %(section)s": "Suelta aquí para etiquetar %(section)s",
     "Ed25519 fingerprint": "Clave de cifrado Ed25519",
     "Email": "Correo electrónico",
@@ -111,7 +105,6 @@
     "Failed to ban user": "Bloqueo del usuario falló",
     "Failed to change password. Is your password correct?": "No se pudo cambiar la contraseña. ¿Está usando la correcta?",
     "Failed to change power level": "Falló al cambiar de nivel de acceso",
-    "Failed to delete device": "Falló al borrar el dispositivo",
     "Failed to forget room %(errCode)s": "Falló al olvidar la sala %(errCode)s",
     "Failed to join room": "Falló al unirse a la sala",
     "Failed to kick": "Falló al expulsar",
@@ -203,10 +196,8 @@
     "Device ID:": "ID del dispositivo:",
     "device id: ": "id del dispositvo: ",
     "Disable Notifications": "Desactivar notificaciones",
-    "disabled": "desactivado",
     "Email address (optional)": "Dirección e-mail (opcional)",
     "Enable Notifications": "Activar notificaciones",
-    "enabled": "activado",
     "Encrypted by a verified device": "Cifrado por un dispositivo verificado",
     "Encrypted by an unverified device": "Cifrado por un dispositivo sin verificar",
     "Encryption is enabled in this room": "Cifrado activo en esta sala",
@@ -231,26 +222,7 @@
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha configurado el historial de la sala visible para Todos los miembros de la sala.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha configurado el historial de la sala visible para nadie.",
     "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha configurado el historial de la sala visible para desconocido (%(visibility)s).",
-    "a room": "una sala",
     "Something went wrong!": "¡Algo ha fallado!",
-    "were banned": "fueron expulsados",
-    "was banned": "fue expulsado",
-    "were unbanned %(repeats)s times": "fueron readmitidos %(repeats)s veces",
-    "was unbanned %(repeats)s times": "fue readmitido %(repeats)s veces",
-    "were unbanned": "fueron readmitidos",
-    "was unbanned": "fue readmitido",
-    "were kicked %(repeats)s times": "fueron pateados %(repeats)s veces",
-    "was kicked %(repeats)s times": "fue pateado %(repeats)s veces",
-    "were kicked": "fueron pateados",
-    "was kicked": "fue pateado",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)s cambiaron su nombre %(repeats)s veces",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)s cambió su nombre %(repeats)s veces",
-    "%(severalUsers)schanged their name": "%(severalUsers)s cambiaron su nombre",
-    "%(oneUser)schanged their name": "%(oneUser)s cambió su nombre",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)s cambiaron su avatar %(repeats)s veces",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)s cambió su avatar %(repeats)s veces",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)s cambiaron su avatar",
-    "%(oneUser)schanged their avatar": "%(oneUser)s cambió su avatar",
     "Please select the destination room for this message": "Por favor, seleccione la sala destino para este mensaje",
     "Create new room": "Crear nueva sala",
     "Start chat": "Comenzar chat",
@@ -294,16 +266,12 @@
     "Search": "Búsqueda",
     "Search failed": "Falló la búsqueda",
     "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s el %(dateTime)s",
-    "Send a message (unencrypted)": "Enviar un mensaje (sin cifrar)",
-    "Send an encrypted message": "Enviar un mensaje cifrado",
     "Send anyway": "Enviar igualmente",
     "Sender device information": "Información del dispositivo del remitente",
     "Send Invites": "Enviar invitaciones",
     "Send Reset Email": "Enviar e-mail de reinicio",
-    "sent an image": "envió una imagen",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s envió una imagen.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s invitó a %(targetDisplayName)s a unirse a la sala.",
-    "sent a video": "envió un vídeo",
     "Server error": "Error del servidor",
     "Server may be unavailable, overloaded, or search timed out :(": "El servidor podría estar saturado o desconectado, o la búsqueda caducó :(",
     "Server may be unavailable, overloaded, or the file too big": "El servidor podría estar saturado o desconectado, o el fichero ser demasiado grande",
@@ -318,12 +286,8 @@
     "Signed Out": "Desconectado",
     "Sign in": "Conectar",
     "Sign out": "Desconectar",
-    "since the point in time of selecting this option": "a partir del momento en que seleccione esta opción",
-    "since they joined": "desde que se conectaron",
-    "since they were invited": "desde que fueron invitados",
     "%(count)s of your messages have not been sent.|other": "Algunos de sus mensajes no han sido enviados.",
     "Someone": "Alguien",
-    "Sorry, this homeserver is using a login which is not recognised ": "Lo siento, este servidor está usando un usuario no reconocido. ",
     "Start a chat": "Iniciar una conversación",
     "Start authentication": "Comenzar la identificación",
     "Start Chat": "Comenzar la conversación",
@@ -350,7 +314,6 @@
     "Markdown is disabled": "Markdown está desactivado",
     "Markdown is enabled": "Markdown está activado",
     "matrix-react-sdk version:": "Versión de matrix-react-sdk:",
-    "Members only": "Sólo para miembros",
     "Message not sent due to unknown devices being present": "Mensaje no enviado debido a la presencia de dispositivos desconocidos",
     "Missing room_id in request": "Falta el ID de sala en la petición",
     "Missing user_id in request": "Falta el ID de usuario en la petición",
@@ -417,7 +380,6 @@
     "Report it": "Informar",
     "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.": "Reiniciar la contraseña también reiniciará las claves de cifrado extremo-a-extremo, haciendo ilegible el historial de las conversaciones, salvo que exporte previamente las claves de sala, y las importe posteriormente. Esto será mejorado en futuras versiones.",
     "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
-    "Return to app": "Volver a la aplicación",
     "Return to login screen": "Volver a la pantalla de inicio de sesión",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot no tiene permisos para enviarle notificaciones - por favor, revise la configuración del navegador",
     "Riot was not given permission to send notifications - please try again": "Riot no pudo obtener permisos para enviar notificaciones - por favor, inténtelo de nuevo",
@@ -429,7 +391,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clave de firma que usted ha proporcionado coincide con la recibida del dispositivo %(deviceId)s de %(userId)s. Dispositivo verificado.",
     "This email address is already in use": "Dirección e-mail en uso",
     "This email address was not found": "Dirección e-mail no encontrada",
-    "%(actionVerb)s this person?": "¿%(actionVerb)s a esta persona?",
     "The email address linked to your account must be entered.": "Debe introducir el e-mail asociado a su cuenta.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "El fichero '%(fileName)s' excede el tamaño máximo permitido en este servidor",
     "The file '%(fileName)s' failed to upload": "Se produjo un fallo al enviar '%(fileName)s'",
@@ -446,11 +407,8 @@
     "This room": "Esta sala",
     "This room is not accessible by remote Matrix servers": "Esta sala no es accesible por otros servidores Matrix",
     "This room's internal ID is": "El ID interno de la sala es",
-    "to demote": "degradar",
-    "to favourite": "marcar como favorito",
     "To link to a room it must have <a>an address</a>.": "Para enlazar una sala, debe tener <a>una dirección</a>.",
     "To reset your password, enter the email address linked to your account": "Para reiniciar su contraseña, introduzca el e-mail asociado a su cuenta",
-    "to restore": "restaurar",
     "Cancel": "Cancelar",
     "Dismiss": "Omitir",
     "powered by Matrix": "con el poder de Matrix",
@@ -466,7 +424,6 @@
     "This will allow you to reset your password and receive notifications.": "Esto te permitirá reiniciar tu contraseña y recibir notificaciones.",
     "Authentication check failed: incorrect password?": "La verificación de la autentificación ha fallado: ¿El password es el correcto?",
     "Press <StartChatButton> to start a chat with someone": "Pulsa <StartChatButton> para empezar a charlar con alguien",
-    "to tag direct chat": "para etiquetar como charla directa",
     "Add a widget": "Añadir widget",
     "Allow": "Permitir",
     "Changes colour scheme of current room": "Cambia el esquema de colores de esta sala",
@@ -476,8 +433,6 @@
     "Enable automatic language detection for syntax highlighting": "Activar la detección automática del lenguaje para resaltar la sintaxis",
     "Hide Apps": "Ocultar aplicaciones",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensajes de entrada/salida (no afecta invitaciones/kicks/bans)",
-    "Hide avatar and display name changes": "Ocultar cambios de avatar y nombre visible",
-    "Once you've followed the link it contains, click below": "Cuando haya seguido el enlace que contiene, haga click debajo",
     "Sets the room topic": "Configura el tema de la sala",
     "Show Apps": "Mostrar aplicaciones",
     "To get started, please pick a username!": "Para empezar, ¡por favor elija un nombre de usuario!",
@@ -522,7 +477,6 @@
     "User name": "Nombre de usuario",
     "Username invalid: %(errMessage)s": "Nombre de usuario no válido: %(errMessage)s",
     "Users": "Usuarios",
-    "User": "Usuario",
     "Verification Pending": "Verificación pendiente",
     "Verification": "Verificación",
     "verified": "verificado",
@@ -567,7 +521,6 @@
     "Unmute": "desactivar el silencio",
     "Unrecognised command:": "comando no reconocido:",
     "Unrecognised room alias:": "alias de sala no reconocido:",
-    "uploaded a file": "cargo un archivo",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nivel de permisos %(powerLevelNumber)s)",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "Atención: VERIFICACIÓN DE CLAVE FALLO\" La clave de firma para %(userId)s y el dispositivo %(deviceId)s es \"%(fprint)s\" la cual no concuerda con la clave provista por \"%(fingerprint)s\". Esto puede significar que sus comunicaciones están siendo interceptadas!",
     "You cannot place VoIP calls in this browser.": "no puede realizar llamadas de voz en este navegador.",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index cbdd6509cc..ebf755ef7d 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1,12 +1,10 @@
 {
-    "a room": "gela bat",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Mezu bat bidali da +%(msisdn)s zenbakira. Sartu hemen mezuko egiaztaketa kodea",
     "Accept": "Onartu",
     "%(targetName)s accepted an invitation.": "%(targetName)s erabiltzaileak gonbidapena onartu du.",
     "Close": "Itxi",
     "Create new room": "Sortu gela berria",
     "Continue": "Jarraitu",
-    "Drop here %(toAction)s": "Jaregin hona %(toAction)s",
     "Error": "Errorea",
     "Failed to change password. Is your password correct?": "Pasahitza aldatzean huts egin du. Zuzena da pasahitza?",
     "Failed to forget room %(errCode)s": "Huts egin du %(errCode)s gela ahaztean",
@@ -164,8 +162,6 @@
     "Hide removed messages": "Ezkutatu kendutako mezuak",
     "Alias (optional)": "Ezizena (aukerazkoa)",
     "%(names)s and %(lastPerson)s are typing": "%(names)s eta %(lastPerson)s idazten ari dira",
-    "%(names)s and one other are typing": "%(names)s eta beste inor idazten ari dira",
-    "An email has been sent to": "E-mail bat bidali da hona:",
     "An error has occurred.": "Errore bat gertatu da.",
     "Are you sure?": "Ziur zaude?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Ziur '%(roomName)s' gelatik atera nahi duzula?",
@@ -213,11 +209,9 @@
     "Device key:": "Gailuaren gakoa:",
     "Direct chats": "Txat zuzenak",
     "Disable Notifications": "Desgaitu jakinarazpenak",
-    "disabled": "desgaituta",
     "Display name": "Pantaila izena",
     "Displays action": "Ekintza bistaratzen du",
     "Drop File Here": "Jaregin fitxategia hona",
-    "%(items)s and one other": "%(items)s eta beste bat",
     "%(items)s and %(lastItem)s": "%(items)s eta %(lastItem)s",
     "%(senderName)s answered the call.": "%(senderName)s erabiltzaileak deia erantzun du.",
     "Can't load user settings": "Ezin izan dira erabiltzailearen ezarpenak kargatu",
@@ -226,14 +220,12 @@
     "Changes to who can read history will only apply to future messages in this room": "Historiala irakurtzeko baimenen aldaketak gela honetara hemendik aurrera heldutako mezuei aplikatuko zaizkie",
     "Clear Cache and Reload": "Garbitu cachea eta birkargatu",
     "Devices will not yet be able to decrypt history from before they joined the room": "Gailuek ezin izango dute taldera elkartu aurretiko historiala deszifratu",
-    "Disable inline URL previews by default": "Desgaitu URLen aurrebista lehenetsita",
     "Disinvite": "Kendu gonbidapena",
     "Download %(text)s": "Deskargatu %(text)s",
     "Email, name or matrix ID": "E-mail, izena edo Matrix ID-a",
     "Emoji": "Emoji",
     "Enable encryption": "Gaitu zifratzea",
     "Enable Notifications": "Gaitu jakinarazpenak",
-    "enabled": "gaituta",
     "Encrypted by a verified device": "Egiaztatutako gailu batek zifratuta",
     "Encrypted by an unverified device": "Egiaztatu gabeko gailu batek zifratuta",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Zifratutako mezuak ez dira ikusgai izango oraindik zifratzea onartzen ez duten bezeroetan",
@@ -248,7 +240,6 @@
     "Existing Call": "Badagoen deia",
     "Failed to ban user": "Huts egin du erabiltzailea debekatzean",
     "Failed to change power level": "Huts egin du botere maila aldatzean",
-    "Failed to delete device": "Huts egin du gailua ezabatzean",
     "Failed to fetch avatar URL": "Huts egin du abatarraren URLa jasotzean",
     "Failed to join room": "Huts egin du gelara elkartzean",
     "Failed to kick": "Huts egin du kanporatzean",
@@ -277,7 +268,6 @@
     "Hide Text Formatting Toolbar": "Ezkutatu testu-formatuaren tresna-barra",
     "Incoming call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
     "Incoming video call from %(name)s": "%(name)s erabiltzailearen bideo deia jasotzen",
-    "%(items)s and %(remaining)s others": "%(items)s eta beste %(remaining)s",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s erabiltzaileak %(displayName)s erabiltzailearen gonbidapena onartu du.",
     "Bulk Options": "Aukera masiboak",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ezin da hasiera zerbitzarira konektatu, egiaztatu zure konexioa, ziurtatu zure <a>hasiera zerbitzariaren SSL ziurtagiria</a> fidagarritzat jotzen duela zure gailuak, eta nabigatzailearen pluginen batek ez dituela eskaerak blokeatzen.",
@@ -321,7 +311,6 @@
     "Markdown is disabled": "Markdown desgaituta dago",
     "Markdown is enabled": "Markdown gaituta dago",
     "matrix-react-sdk version:": "matrix-react-sdk bertsioa:",
-    "Members only": "Kideak besterik ez",
     "Message not sent due to unknown devices being present": "Ez da mezua bidali gailu ezezagunak daudelako",
     "Missing room_id in request": "Gelaren ID-a falta da eskaeran",
     "Missing user_id in request": "Erabiltzailearen ID-a falta da eskaeran",
@@ -341,7 +330,6 @@
     "No users have specific privileges in this room": "Ez dago gela honetan baimen zehatzik duen erabiltzailerik",
     "olm version:": "olm bertsioa:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Behin gela batean zifratzea gaituta ezin da gero desgaitu (oraingoz)",
-    "Once you've followed the link it contains, click below": "Behin dakarren esteka jarraitu duzula, egin klik azpian",
     "Otherwise, <a>click here</a> to send a bug report.": "Bestela, <a>bidali arazte-txosten bat</a>.",
     "Server may be unavailable, overloaded, or you hit a bug.": "Agian zerbitzaria ez dago eskuragarri, edo gainezka dago, edo akats bat aurkitu duzu.",
     "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.": "Oraingoz pasahitza aldatzeak gailu guztietako muturretik muturrerako zifratze-gakoak berrezarriko ditu, eta ezin izango dituzu zifratutako txatetako historialak irakurri ez badituzu aurretik zure gelako gakoak esportatzen eta aldaketa eta gero berriro inportatzen. Etorkizunean hau hobetuko da.",
@@ -362,10 +350,6 @@
     "Refer a friend to Riot:": "Aipatu Riot lagun bati:",
     "%(targetName)s rejected the invitation.": "%(targetName)s erabiltzaileak gonbidapena baztertu du.",
     "Reject invitation": "Baztertu gonbidapena",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s erabiltzailek bere gonbidapenak baztertu dituzte %(repeats)s aldiz",
-    "%(oneUser)srejected their invitation %(repeats)s times": "Erabiltzaile %(oneUser)sek bere gonbidapenak baztertu ditu %(repeats)s aldiz",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)s erabiltzailek bere gonbidapenak baztertu dituzte",
-    "%(oneUser)srejected their invitation": "Erabiltzaile %(oneUser)sek bere gonbidapena baztertu du",
     "Reject all %(invitedRooms)s invites": "Baztertu %(invitedRooms)s gelarako gonbidapen guztiak",
     "Rejoin": "Berriro elkartu",
     "Remote addresses for this room:": "Gela honen urruneko helbideak:",
@@ -378,7 +362,6 @@
     "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.": "Oraingoz pasahitza aldatzeak gailu guztietako muturretik muturrerako zifratze-gakoak berrezarriko ditu, eta ezin izango dituzu zifratutako txatetako historialak irakurri ez badituzu aurretik zure gelako gakoak esportatzen eta aldaketa eta gero berriro inportatzen.",
     "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Une honetan egiaztatu gabeko gailuak blokeatzen ari zara, gailu hauetara mezuak bidali ahal izateko egiaztatu behar dituzu.",
     "Results from DuckDuckGo": "DuckDuckGo bilatzaileko emaitzak",
-    "Return to app": "Itzuli aplikaziora",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotek ez du zuri jakinarazpenak bidaltzeko baimenik,  egiaztatu nabigatzailearen ezarpenak",
     "Riot was not given permission to send notifications - please try again": "Ez zaio jakinarazpenak bidaltzeko baimena eman Rioti, saiatu berriro",
     "riot-web version:": "riot-web bertsioa:",
@@ -392,14 +375,10 @@
     "Search failed": "Bilaketak huts egin du",
     "Searches DuckDuckGo for results": "DuckDuckGo-n bilatzen ditu emaitzak",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s erabiltzaileak ikusia %(dateTime)s(e)an",
-    "Send a message (unencrypted)": "Bidali mezua (zifratu gabea)",
-    "Send an encrypted message": "Bidali mezu zifratua",
     "Send anyway": "Bidali hala ere",
     "Send Invites": "Bidali gonbidapenak",
-    "sent an image": "irudi bat bidali du",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s erabiltzaileak irudi bat bidali du.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s erabiltzaileak gelara elkartzeko gonbidapen bat bidali dio %(targetDisplayName)s erbiltzaileari.",
-    "sent a video": "bideo bat bidali du",
     "Server error": "Zerbitzari-errorea",
     "Server may be unavailable or overloaded": "Zerbitzaria eskuraezin edo gainezka egon daiteke",
     "Server may be unavailable, overloaded, or search timed out :(": "Zerbitzaria eskuraezin edo gainezka egon daiteke, edo bilaketaren denbora muga gainditu da :(",
@@ -412,18 +391,13 @@
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Erakutsi denbora-zigiluak 12 ordutako formatuan (adib. 2:30pm)",
     "Signed Out": "Saioa amaituta",
     "Sign in": "Hasi saioa",
-    "since the point in time of selecting this option": "aukera hau hautatu denetik",
-    "since they joined": "elkartu direnetik",
-    "since they were invited": "gonbidatu zaienetik",
     "%(count)s of your messages have not been sent.|other": "Zure mezu batzuk ez dira bidali.",
-    "Sorry, this homeserver is using a login which is not recognised ": "Hasiera zerbitzari honek ezagutzen ez den saio bat erabiltzen du ",
     "Tagged as: ": "Jarritako etiketa: ",
     "The default role for new room members is": "Gelako kide berrien lehenetsitako rola:",
     "The main address for this room is": "Gela honen helbide nagusia:",
     "The phone number entered looks invalid": "Sartutako telefono zenbakia ez dirudi baliozkoa",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Eman duzun sinadura-gakoa %(userId)s erabiltzailearen %(deviceId)s gailutik jasotako bera da. Gailua egiaztatuta gisa markatu da.",
     "This email address was not found": "Ez da e-mail helbide hau aurkitu",
-    "%(actionVerb)s this person?": "%(actionVerb)s pertsona hau?",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' fitxategiak hasiera zerbitzarian igoerei ezarritako tamaina-muga gainditzen du",
     "The file '%(fileName)s' failed to upload": "'%(fileName)s' igotzean huts egin du",
     "The remote side failed to pick up": "Urruneko aldeak hartzean huts egin du",
@@ -437,12 +411,8 @@
     "This room": "Gela hau",
     "This room is not accessible by remote Matrix servers": "Gela hau ez dago eskuragarri urruneko zerbitzarietan",
     "This room's internal ID is": "Gela honen barne ID-a:",
-    "to demote": "mailaz jaistea",
-    "to favourite": "gogoko egitea",
     "To link to a room it must have <a>an address</a>.": "Gelara estekatzeko honek <a>helbide bat</a> izan behar du.",
     "To reset your password, enter the email address linked to your account": "Zure pasahitza berrezartzeko, sartu zure kontuarekin lotutako e-mail helbidea",
-    "to restore": "berreskuratzea",
-    "to tag direct chat": "txat zuzena etiketatzea",
     "To use it, just wait for autocomplete results to load and tab through them.": "Erabiltzeko, itxaron osatze automatikoaren emaitzak kargatu arte eta gero tabuladorearekin hautatu.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu zara, baina ez duzu mezu zehatz hori ikusteko baimenik.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Gela honen denbora-lerroko puntu zehatz bat kargatzen saiatu da, baina ezin izan da aurkitu.",
@@ -472,7 +442,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s igotzen",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s eta beste %(count)s igotzen",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s eta beste %(count)s igotzen",
-    "uploaded a file": "fitxategi bat igo du",
     "Upload avatar": "Igo abatarra",
     "Upload Failed": "Igoerak huts egin du",
     "Upload Files": "Igo fitxategiak",
@@ -487,7 +456,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Erabiltzaile-izen baliogabea: %(errMessage)s",
     "Users": "Erabiltzaileak",
-    "User": "Erabiltzailea",
     "verified": "egiaztatuta",
     "Verified key": "Egiaztatutako gakoa",
     "Video call": "Bideo-deia",
@@ -571,7 +539,6 @@
     "Encrypt room": "Zifratu gela",
     "There are no visible files in this room": "Ez dago fitxategi ikusgairik gela honetan",
     "Sent messages will be stored until your connection has returned.": "Bidalitako mezuak zure konexioa berreskuratu arte gordeko dira.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Birbidali guztiak</a> edo <a>baztertu guztiak</a> orain. Mezuak banaka aukeratu ditzakezu ere birbidali ala baztertzeko.",
     "(~%(count)s results)|one": "(~%(count)s emaitza)",
     "(~%(count)s results)|other": "(~%(count)s emaitza)",
     "bold": "lodia",
@@ -582,50 +549,6 @@
     "quote": "aipua",
     "bullet": "buleta",
     "numbullet": "numerazioa",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s erabiltzaile %(repeats)s aldiz elkartu dira",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)s erabiltzailea %(repeats)s aldiz elkartu da",
-    "%(severalUsers)sjoined": "%(severalUsers)s elkartu dira",
-    "%(oneUser)sjoined": "%(oneUser)s elkartu da",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)s erabiltzaile %(repeats)s aldiz atera dira",
-    "%(oneUser)sleft %(repeats)s times": "Erabiltzaile %(oneUser)s %(repeats)s aldiz atera da",
-    "%(severalUsers)sleft": "%(severalUsers)s atera dira",
-    "%(oneUser)sleft": "%(oneUser)s atera da",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s erabiltzaile %(repeats)s aldiz elkartu eta atera dira",
-    "%(oneUser)sjoined and left %(repeats)s times": "Erabiltzaile %(oneUser)s %(repeats)s aldiz elkartu eta atera da",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s elkartu eta atera dira",
-    "%(oneUser)sjoined and left": "%(oneUser)s elkartu eta atera da",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)s erabiltzaile %(repeats)s aldiz atera eta berriro elkartu dira",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "Erabiltzaile %(oneUser)s %(repeats)s aldiz atera eta berriro elkartu da",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)s erabiltzaile atera eta berriro elkartu dira",
-    "%(oneUser)sleft and rejoined": "Erabiltzaile %(oneUser)s atera eta berriro sartu da",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s erabiltzaileen gonbidapenak %(repeats)s aldiz atzera bota dira",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "Erabiltzaile %(oneUser)sen gonbidapena %(repeats)s aldiz bota da atzera",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s erabiltzaileen gonbidapena atzera bota da",
-    "%(oneUser)shad their invitation withdrawn": "Erabiltzaile %(oneUser)sen gonbidapena atzera bota da",
-    "were invited %(repeats)s times": "%(repeats)s aldiz gonbidatu zaie",
-    "was invited %(repeats)s times": "%(repeats)s aldiz gonbidatu zaio",
-    "were invited": "gonbidatu zaie",
-    "was invited": "gonbidatu zaio",
-    "were banned %(repeats)s times": "%(repeats)s aldiz debekatu zaie",
-    "was banned %(repeats)s times": "%(repeats)s aldiz debekatu zaio",
-    "were banned": "debekatu zaie",
-    "was banned": "debekatu zaio",
-    "were unbanned %(repeats)s times": "debekua %(repeats)s aldiz kendu zaie",
-    "was unbanned %(repeats)s times": "debekua %(repeats)s aldiz kendu zaio",
-    "were unbanned": "debekua kendu zaie",
-    "was unbanned": "debekua kendu zaio",
-    "were kicked %(repeats)s times": "%(repeats)s aldiz kaleratu zaie",
-    "was kicked %(repeats)s times": "%(repeats)s aldiz kaleratu zaio",
-    "were kicked": "kaleratu zaie",
-    "was kicked": "kaleratu zaio",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)s erabiltzailek izena %(repeats)s aldiz aldatu dute",
-    "%(oneUser)schanged their name %(repeats)s times": "Erabiltzaile %(oneUser)sek izena %(repeats)s aldiz aldatu du",
-    "%(severalUsers)schanged their name": "%(severalUsers)s erabiltzailek izena aldatu dute",
-    "%(oneUser)schanged their name": "Erabiltzaile %(oneUser)sek izena aldatu du",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)s erabiltzailek abatarra %(repeats)s aldiz aldatu dute",
-    "%(oneUser)schanged their avatar %(repeats)s times": "Erabiltzaile %(oneUser)sek abatarra %(repeats)s aldiz aldatu du",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)s erabiltzailek abatarra aldatu dute",
-    "%(oneUser)schanged their avatar": "Erabiltzaile %(oneUser)sek abatarra aldatu du",
     "Please select the destination room for this message": "Hautatu mezu hau bidaltzeko gela",
     "New Password": "Pasahitz berria",
     "Start automatically after system login": "Hasi automatikoki sisteman saioa hasi eta gero",
@@ -672,7 +595,6 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Identitate erabiltzaile pertsonalizatu bat ezarri dezakezu ere, baina honek maiz erabiltzaileekin e-mail helbidea erabiliz elkar aritzea eragozten du maiz.",
     "Please check your email to continue registration.": "Egiaztatu zure e-maila erregistroarekin jarraitzeko.",
     "Token incorrect": "Token okerra",
-    "A text message has been sent to": "Testu mezua bidali zaio honi:",
     "Please enter the code it contains:": "Sartu dakarren kodea:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ez baduzu e-mail helbide bat zehazten, ezin izango duzu zure pasahitza berrezarri. Ziur zaude?",
     "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s erabiliz erregistratzen ari zara",
@@ -688,18 +610,10 @@
     "Error decrypting video": "Errorea bideoa deszifratzean",
     "Add an Integration": "Gehitu integrazioa",
     "Removed or unknown message type": "Kenduta edo mezu mota ezezaguna",
-    "Disable URL previews by default for participants in this room": "Desgaitu URLen aurrebista gela honetako parte-hartzaileentzat",
-    "Disable URL previews for this room (affects only you)": "Desgaitu URLen aurrebista gela honetan (zuretzat besterik ez)",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URLen aurrebista lehenetsita %(globalDisableUrlPreview)s daude gela honetako parte-hartzaileentzat.",
     "URL Previews": "URL-en aurrebistak",
-    "Enable URL previews for this room (affects only you)": "Gaitu URL-en aurrebistak gela honetan (zuretzat besterik ez)",
     "Drop file here to upload": "Jaregin fitxategia hona igotzeko",
     " (unsupported)": " (euskarririk gabe)",
     "Ongoing conference call%(supportedText)s.": "%(supportedText)s konferentzia deia abian.",
-    "for %(amount)ss": "%(amount)ss",
-    "for %(amount)sm": "%(amount)sm",
-    "for %(amount)sh": "%(amount)sh",
-    "for %(amount)sd": "%(amount)se",
     "Updates": "Eguneraketak",
     "Check for update": "Bilatu ekuneraketa",
     "Start chatting": "Hasi txateatzen",
@@ -742,7 +656,6 @@
     "Enable automatic language detection for syntax highlighting": "Gaitu hizkuntza antzemate automatikoa sintaxia nabarmentzeko",
     "Hide Apps": "Ezkutatu aplikazioak",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ezkutatu elkartze/ateratze mezuak (gonbidapenak/kanporatzeak/debekuak ez dira aldatzen)",
-    "Hide avatar and display name changes": "Ezkutatu abatarra eta pantaila-izen aldaketak",
     "Integrations Error": "Integrazio errorea",
     "Publish this room to the public in %(domain)s's room directory?": "Argitaratu gela hau publikora %(domain)s domeinuko gelen direktorioan?",
     "AM": "AM",
@@ -761,7 +674,6 @@
     "Loading device info...": "Gailuaren informazioa kargatzen...",
     "Example": "Adibidea",
     "Create": "Sortu",
-    "Room creation failed": "Taldea sortzeak huts egin du",
     "Featured Rooms:": "Nabarmendutako gelak:",
     "Featured Users:": "Nabarmendutako erabiltzaileak:",
     "Automatically replace plain text Emoji": "Automatikoki ordezkatu Emoji testu soila",
@@ -1036,7 +948,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du <i>+adibidea:matrix.org</i>.",
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText> edo <cancelText>baztertu guztia</cancelText>.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Birbidali guztia</resendText> edo <cancelText>baztertu guztia</cancelText> orain. Banakako mezuak aukeratu ditzakezu ere birbidali edo baztertzeko.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
     "Light theme": "Gai argia",
     "Dark theme": "Gai iluna",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index c8d8c53480..0ae3379ed7 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1,5 +1,4 @@
 {
-    "a room": "huone",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Numeroon +%(msisdn)s on lähetetty tekstiviesti. Ole hyvä ja syötä sen sisältämä varmennuskoodi",
     "Accept": "Hyväksy",
     "Cancel": "Peruuta",
@@ -7,7 +6,6 @@
     "Create new room": "Luo uusi huone",
     "Custom Server Options": "Palvelinasetukset",
     "Dismiss": "Hylkää",
-    "Drop here %(toAction)s": "Pudota tänne %(toAction)s",
     "Error": "Virhe",
     "Failed to forget room %(errCode)s": "Huoneen unohtaminen epäonnistui %(errCode)s",
     "Favourite": "Suosikki",
@@ -45,12 +43,8 @@
     "Always show message timestamps": "Näytä aina viestien aikaleimat",
     "Authentication": "Autentikointi",
     "Alias (optional)": "Alias (valinnainen)",
-    "%(items)s and %(remaining)s others": "%(items)s ja %(remaining)s lisää",
-    "%(items)s and one other": "%(items)s ja yksi lisää",
     "%(items)s and %(lastItem)s": "%(items)s ja %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s ja %(lastPerson)s kirjoittavat",
-    "%(names)s and one other are typing": "%(names)s ja yksi muu kirjoittavat",
-    "An email has been sent to": "Sähköposti on lähetetty osoitteeseen",
     "A new password must be entered.": "Sinun täytyy syöttää uusi salasana.",
     "%(senderName)s answered the call.": "%(senderName)s vastasi puheluun.",
     "An error has occurred.": "Virhe.",
@@ -121,7 +115,6 @@
     "Devices": "Laitteet",
     "Direct chats": "Suorat viestittelyt",
     "Disable Notifications": "Ota ilmoitukset pois käytöstä",
-    "disabled": "pois käytöstä",
     "Disinvite": "Peru kutsu",
     "Display name": "Näyttönimi",
     "Download %(text)s": "Lataa %(text)s",
@@ -135,7 +128,6 @@
     "Emoji": "Emoji",
     "Enable encryption": "Ota salaus käyttöön",
     "Enable Notifications": "Ota ilmoitukset käyttöön",
-    "enabled": "käytössä",
     "Encrypted by a verified device": "Varmennetun laitteen salaama",
     "Encrypted by an unverified device": "Varmentamattoman laiteen salaama",
     "Encrypted room": "Salattu huone",
@@ -149,7 +141,6 @@
     "Export": "Vie",
     "Export E2E room keys": "Vie huoneen päästä päähän-salauksen (E2E) avaimet",
     "Failed to ban user": "Porttikiellon antaminen epäonnistui",
-    "Failed to delete device": "Laitten poistamine  epäonnistui",
     "Failed to fetch avatar URL": "Avatar URL:n haku epäonnistui",
     "Failed to join room": "Huoneeseen liittyminen epäonnistui",
     "Failed to kick": "Huoneesta poistaminen epäonnistui",
@@ -218,7 +209,6 @@
     "Markdown is disabled": "Markdown on pois päältä",
     "Markdown is enabled": "Mardown on päällä",
     "matrix-react-sdk version:": "Matrix-react-sdk versio:",
-    "Members only": "Vain jäsenet",
     "Message not sent due to unknown devices being present": "Viestiä ei lähetetty koska paikalla on tuntemattomia laitteita",
     "Mobile phone number": "Puhelinnumero",
     "Mobile phone number (optional)": "Puhelinnumero (valinnainen)",
@@ -271,21 +261,15 @@
     "Scroll to unread messages": "Vieritä lukemattomiin viesteihin",
     "Search failed": "Haku epäonnistui",
     "Searches DuckDuckGo for results": "Hakee DuckDuckGo:n avulla",
-    "Send a message (unencrypted)": "Lähetä viesti (salaamaton)",
-    "Send an encrypted message": "Lähetä salattu viesti",
     "Send anyway": "Lähetä kuitenkin",
     "Sender device information": "Lähettäjän laitteen tiedot",
     "Send Invites": "Lähetä kutsu",
-    "sent an image": "lähetti kuvan",
-    "sent a video": "lähetti videon",
     "Server error": "Palvelinvirhe",
     "Session ID": "Istuntotunniste",
     "Sets the room topic": "Asettaa huoneen aiheen",
     "Show panel": "Näytä paneeli",
     "Sign in": "Kirjaudu sisään",
     "Sign out": "Kirjaudu ulos",
-    "since they joined": "liittymisestä lähtien",
-    "since they were invited": "kutsusta lähtien",
     "%(count)s of your messages have not been sent.|other": "Jotkut viesteistäsi ei ole lähetetty.",
     "Someone": "Joku",
     "Start a chat": "Aloita keskustelu",
@@ -351,7 +335,6 @@
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s otti päästä päähän-salauksen käyttöön (algoritmi %(algorithm)s).",
     "Username invalid: %(errMessage)s": "Virheellinen käyttäjänimi: %(errMessage)s",
     "Users": "Käyttäjät",
-    "User": "Käyttäjä",
     "Verification": "Varmennus",
     "verified": "varmennettu",
     "Verified": "Varmennettu",
@@ -419,7 +402,6 @@
     "Failed to copy": "Kopiointi epäonnistui",
     "Connectivity to the server has been lost.": "Yhteys palvelimeen menetettiin.",
     "Sent messages will be stored until your connection has returned.": "Lähetetyt viestit tallennetaan kunnes yhteys on taas muodostettu.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Uudelleenlähetä kaikki</a> tai <a>hylkää kaikki</a> nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai hylättäväksi.",
     "(~%(count)s results)|one": "(~%(count)s tulos)",
     "(~%(count)s results)|other": "(~%(count)s tulosta)",
     "Active call": "Aktiivinen puhelu",
@@ -431,8 +413,6 @@
     "quote": "sitaatti",
     "bullet": "lista",
     "numbullet": "numeroitu lista",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sliittyivät %(repeats)s kertaa",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)shylkäsi kutsunsa %(repeats)s kertaa",
     "Please select the destination room for this message": "Ole hyvä ja valitse vastaanottava huone tälle viestille",
     "New Password": "Uusi salasana",
     "Start automatically after system login": "Käynnistä automaattisesti käyttöjärjestelmään kirjautumisen jälkeen",
@@ -473,7 +453,6 @@
     "Curve25519 identity key": "Curve25519 tunnistusavain",
     "Decrypt %(text)s": "Pura %(text)s",
     "Devices will not yet be able to decrypt history from before they joined the room": "Laitteet eivät vielä pysty purkamaan viestejä ajalta ennen kun ne liittyivät huoneseen",
-    "Disable inline URL previews by default": "Ota oletusarvoisesti pois käytöstä URL esikatselut",
     "Displays action": "Näyttää toiminnan",
     "Don't send typing notifications": "Älä lähetä kirjoitusilmoituksia",
     "End-to-end encryption is in beta and may not be reliable": "Päästä päähän salaus on vielä testausvaiheessa ja saattaa toimia epävarmasti",
@@ -498,7 +477,6 @@
     "Remote addresses for this room:": "Tämän huoneen etäosoitteet:",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s poisti näyttönimensä (%(oldDisplayName)s).",
     "Report it": "Ilmoita siitä",
-    "Return to app": "Palaa ohjelmaan",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotilla ei ole oikeuksia lähettää sinulle ilmoituksia. Ole hyvä ja tarkista selaimen asetukset",
     "Riot was not given permission to send notifications - please try again": "Riotilla ei saannut oikeuksia lähettää ilmoituksia. Ole hyvä ja yritä uudelleen",
     "Room %(roomId)s not visible": "Huone %(roomId)s ei ole näkyvissä",
@@ -512,7 +490,6 @@
     "Show Text Formatting Toolbar": "Näytä tekstinmuotoilupalkki",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Näytä aikaleimat 12h muodossa (esim. 2:30pm)",
     "Signed Out": "Uloskirjautunut",
-    "since the point in time of selecting this option": "tämän asetuksen valitsemisesta",
     "Start authentication": "Aloita tunnistus",
     "Success": "Onnistuminen",
     "Tagged as: ": "Tägit: ",
@@ -529,7 +506,6 @@
     "Unable to enable Notifications": "Ilmoitusten käyttöönotto epäonnistui",
     "Unable to load device list": "Laitelistan lataaminen epäonnistui",
     "Uploading %(filename)s and %(count)s others|other": "Ladataan %(filename)s ja %(count)s muuta",
-    "uploaded a file": "lattaa tiedosto",
     "Upload Failed": "Lataus epäonnistui",
     "Upload Files": "Lataa tiedostoja",
     "Upload file": "Lataa tiedosto",
@@ -541,47 +517,12 @@
     "User Interface": "Käyttöliittymä",
     "%(user)s is a": "%(user)s on",
     "User name": "Käyttäjänimi",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sliittyi %(repeats)s kertaa",
-    "%(severalUsers)sjoined": "%(severalUsers)sliittyivät",
-    "%(oneUser)sjoined": "%(oneUser)sliittyi",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)spoistuivat %(repeats)s kertaa",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)spoistui %(repeats)s kertaa",
-    "%(severalUsers)sleft": "%(severalUsers)sspoistuivat",
-    "%(oneUser)sleft": "%(oneUser)spoistui",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)sliittyivät ja poistuivat %(repeats)s kertaa",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sliittyi ja poistui %(repeats)s kertaa",
-    "%(severalUsers)sjoined and left": "%(severalUsers)sliittyivät ja poistuivat",
-    "%(oneUser)sjoined and left": "%(oneUser)sliittyi ja poistui",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)spoistuivat ja liittyivät uudelleen %(repeats)s kertaa",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)spoistui ja liittyi uudelleen %(repeats)s kertaa",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)spoistuivat ja liittyivät uudelleen",
-    "%(oneUser)sleft and rejoined": "%(oneUser)spoistui ja liittyi uudelleen",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)shylkäsivät kutsunsa %(repeats)s kertaa'",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)shylkäsivät kutsunsa",
-    "%(oneUser)srejected their invitation": "%(oneUser)shylkäsi kutsunsa",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)skutsut vedettiin takaisin %(repeats)s kertaa",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)skutsu vedettiin takaisin %(repeats)s kertaa",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)skutsut vedettiin takaisin",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)skutsu vedettiin takaisin",
-    "were invited %(repeats)s times": "kutsuttiin %(repeats)s kertaa",
-    "was invited %(repeats)s times": "kutsuttiin %(repeats)s kertaa",
-    "were invited": "kutsuttiin",
-    "was invited": "kutsuttiin",
-    "were kicked %(repeats)s times": "poistettiin huoneesta %(repeats)s kertaa",
-    "was kicked %(repeats)s times": "poistettiin huoneesta %(repeats)s kertaa",
-    "were kicked": "poistettiin huoneesta",
-    "was kicked": "poistettiin huoneesta",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)smuuttivat nimensä %(repeats)s kertaa",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)smuutti nimensä %(repeats)s kertaa",
-    "%(severalUsers)schanged their name": "%(severalUsers)smuuttivat nimensä",
-    "%(oneUser)schanged their name": "%(oneUser)smuutti nimensä",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s asetti aiheeksi \"%(topic)s\".",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Salasanan muuttaminen uudelleenalustaa myös päästä päähän-salausavaimet kaikilla laitteilla, jolloin vanhojen viestien lukeminen ei ole enään mahdollista, ellet ensin vie huoneavaimet ja tuo ne takaisin jälkeenpäin. Tämä tulee muuttumaan tulevaisuudessa.",
     "Define the power level of a user": "Määritä käyttäjän oikeustaso",
     "Failed to change power level": "Oikeustason muuttaminen epäonnistui",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' ei ole oikean muotoinen osoitteelle",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' ei ole oikean muotoinen aliakselle",
-    "Once you've followed the link it contains, click below": "Klikkaa alla kun olet seuruannut sen sisältämää linkkiä",
     "Otherwise, <a>click here</a> to send a bug report.": "Paina muutoin <a>tästä</a> lähettääksesi virheraportin.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Ole hyvä ja tarkista sähköpostisi ja seuraa sen sisältämää linkkiä. Kun olet valmis, paina jatka.",
     "Power level must be positive integer.": "Oikeustason pitää olla positiivinen kokonaisluku.",
@@ -590,7 +531,6 @@
     "Server may be unavailable, overloaded, or the file too big": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu, tai tiedosto on liian suuri",
     "Server may be unavailable, overloaded, or you hit a bug.": "Palvelin saattaa olla saavuttamattomissa, ylikuormitettu tai olet törmännyt virheeseen.",
     "Server unavailable, overloaded, or something else went wrong.": "Palvelin on saavuttamattomissa, ylikuormitettu tai jokin muu meni vikaan.",
-    "Sorry, this homeserver is using a login which is not recognised ": "Valitettavasti tämä palvelin käyttää kirjautumista joka ei ole tuettu ",
     "The email address linked to your account must be entered.": "Sinun pitää syöttää tiliisi liitetty sähköpostiosoite.",
     "The visibility of existing history will be unchanged": "Olemassaolevan viestihistorian näkyvyys ei muutu",
     "To get started, please pick a username!": "Valitse käyttäjänimi aloittaaksesi!",
@@ -634,7 +574,6 @@
     "ex. @bob:example.com": "esim. @bob:example.com",
     "Add User": "Lisää käyttäjä",
     "This Home Server would like to make sure you are not a robot": "Tämä kotipalvelin haluaa varmistaa että et ole robotti",
-    "A text message has been sent to": "Tekstiviesti on lähetetty numeroon",
     "Please enter the code it contains:": "Ole hyvä ja syötä sen sisältämä koodi:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Jos et syötä sähköpostiosoitetta et voi uudelleenalustaa salasanasi myöhemmin. Oletko varma?",
     "Default server": "Oletuspalvelin",
@@ -677,7 +616,6 @@
     "Loading device info...": "Ladataan laitetiedot...",
     "Example": "Esimerkki",
     "Create": "Luo",
-    "Room creation failed": "Huoneen luonti epäonnistui",
     "Failed to upload image": "Kuvan lataaminen epäonnistui",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robottitarkistus ei tällä hetkellä toimi työpöytäversiossa. Ole hyvä ja käytä <a>nettiselainta</a>",
     "Add a widget": "Lisää sovelma",
@@ -779,9 +717,6 @@
     "To send events of type <eventType/>, you must be a": "Voidaksesi lähettää <eventType/>-tyypin viestejä sinun tulee olla",
     "Invalid community ID": "Virheellinen yhteistötunniste",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' on virheellinen yhteisötunniste",
-    "Related Communities": "Liittyvät yhteisöt",
-    "Related communities for this room:": "Tähän huoneeseen liittyvät yhteisöt:",
-    "This room has no related communities": "Tähän huoneseen ei liity yhtään yhteisöä",
     "New community ID (e.g. +foo:%(localDomain)s)": "Uusi yhteisötunniste (esim. +foo:%(localDomain)s)",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s muutti huoneen %(roomName)s avatarin",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s poisti huoneen avatarin.",
@@ -860,8 +795,6 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s on kutsunut sinut tähän yhteisöön",
     "You are an administrator of this community": "Olet tämän yhteisön ylläpitäjä",
     "You are a member of this community": "Olet tämän yhteisön jäsen",
-    "Community Member Settings": "Yhteisöjäsenasetukset",
-    "Publish this community on your profile": "Julkaise tämä yhteisö profiilissasi",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Sinun yhteistöltäsi puuttuu pitkä kuvaus, HTML sivu joka  näytetään yhteistön jäsenille. <br />Klikkaa tästä avataksesi asetukset luodaksesi sivun!",
     "Long Description (HTML)": "Pitkä kuvaus (HTML)",
     "Description": "Kuvaus",
@@ -1004,7 +937,6 @@
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Jos avain täsmää, valitse painike alla. Jos avain ei täsmää, niin joku muu salakuuntelee laitetta ja haluat todennäköisesti painaa estopainiketta.",
     "Cryptography data migrated": "Salaustiedot siirretty",
     "Old cryptography data detected": "Vanhat salaustiedot havaittu",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Lähetä kaikki uudelleen</resendText> tai <cancelText>peruuta kaikki</cancelText> nyt. Voit myös valita yksittäisiä viestejä uudelleenlähetettäväksi tai peruttavaksi.",
     "Warning": "Varoitus",
     "Access Token:": "Pääsykoodi:"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 450fa424d3..125f7ad79e 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1,12 +1,10 @@
 {
     "Direct chats": "Discussions directes",
-    "Disable inline URL previews by default": "Désactiver l’aperçu des liens",
     "Disinvite": "Désinviter",
     "Display name": "Nom affiché",
     "Displays action": "Affiche l'action",
     "Don't send typing notifications": "Ne pas envoyer les notifications de saisie",
     "Download %(text)s": "Télécharger %(text)s",
-    "Drop here %(toAction)s": "Déposer ici %(toAction)s",
     "Drop here to tag %(section)s": "Déposer ici pour étiqueter comme %(section)s",
     "Ed25519 fingerprint": "Empreinte Ed25519",
     "Email, name or matrix ID": "E-mail, nom ou identifiant Matrix",
@@ -25,13 +23,8 @@
     "Failed to ban user": "Échec du bannissement de l'utilisateur",
     "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
     "Failed to change power level": "Échec du changement de rang",
-    "Failed to delete device": "Échec de la suppression de l'appareil",
     "Failed to forget room %(errCode)s": "Échec de l'oubli du salon %(errCode)s",
     "Remove": "Supprimer",
-    "was banned": "a été banni(e)",
-    "was invited": "a été invité(e)",
-    "was kicked": "a été exclu(e)",
-    "was unbanned": "a vu son bannissement révoqué",
     "bold": "gras",
     "italic": "italique",
     "strike": "barré",
@@ -47,14 +40,10 @@
     "Admin": "Administrateur",
     "Advanced": "Avancé",
     "Algorithm": "Algorithme",
-    "%(items)s and %(remaining)s others": "%(items)s et %(remaining)s autres",
-    "%(items)s and one other": "%(items)s et un autre",
     "%(items)s and %(lastItem)s": "%(items)s et %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s et %(lastPerson)s écrivent",
-    "%(names)s and one other are typing": "%(names)s et un autre écrivent",
     "and %(count)s others...|other": "et %(count)s autres...",
     "and %(count)s others...|one": "et un autre...",
-    "An email has been sent to": "Un e-mail a été envoyé à",
     "A new password must be entered.": "Un nouveau mot de passe doit être saisi.",
     "Anyone who knows the room's link, apart from guests": "Tous ceux qui connaissent le lien du salon, à part les visiteurs",
     "Anyone who knows the room's link, including guests": "Tous ceux qui connaissent le lien du salon, y compris les visiteurs",
@@ -192,7 +181,6 @@
     "Markdown is disabled": "Le formatage Markdown est désactivé",
     "Markdown is enabled": "Le formatage Markdown est activé",
     "matrix-react-sdk version:": "Version de matrix-react-sdk :",
-    "Members only": "Membres uniquement",
     "Message not sent due to unknown devices being present": "Message non envoyé à cause de la présence d’appareils inconnus",
     "Missing room_id in request": "Absence du room_id dans la requête",
     "Missing user_id in request": "Absence du user_id dans la requête",
@@ -238,7 +226,6 @@
     "Mute": "Mettre en sourdine",
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
     "olm version:": "version de olm :",
-    "Once you've followed the link it contains, click below": "Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s a passé un appel %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
     "Power level must be positive integer.": "Le niveau d'autorité doit être un entier positif.",
@@ -257,7 +244,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s a demandé une téléconférence audio.",
     "Report it": "Le signaler",
     "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Pour le moment, réinitialiser le mot de passe va réinitialiser les clés de chiffrement sur tous les appareils, rendant l’historique des salons chiffrés illisible, à moins que vous exportiez d'abord les clés de salon puis que vous les ré-importiez après. Cela sera amélioré prochainement.",
-    "Return to app": "Retourner à l’application",
     "Return to login screen": "Retourner à l’écran de connexion",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot n’a pas la permission de vous envoyer des notifications - merci de vérifier les paramètres de votre navigateur",
     "Riot was not given permission to send notifications - please try again": "Riot n’a pas reçu la permission de vous envoyer des notifications - veuillez réessayer",
@@ -271,15 +257,11 @@
     "Search": "Rechercher",
     "Search failed": "Échec de la recherche",
     "Searches DuckDuckGo for results": "Recherche des résultats dans DuckDuckGo",
-    "Send a message (unencrypted)": "Envoyer un message (non chiffré)",
-    "Send an encrypted message": "Envoyer un message chiffré",
     "Sender device information": "Informations de l'appareil de l'expéditeur",
     "Send Invites": "Envoyer des invitations",
     "Send Reset Email": "Envoyer l'e-mail de réinitialisation",
-    "sent an image": "a envoyé une image",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s a envoyé une image.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s a invité %(targetDisplayName)s à rejoindre le salon.",
-    "sent a video": "a envoyé une vidéo",
     "Server error": "Erreur du serveur",
     "Server may be unavailable or overloaded": "Le serveur semble être inaccessible ou surchargé",
     "Server may be unavailable, overloaded, or search timed out :(": "Le serveur semble être inaccessible, surchargé ou la recherche a expiré :(",
@@ -294,12 +276,8 @@
     "Signed Out": "Déconnecté",
     "Sign in": "Se connecter",
     "Sign out": "Se déconnecter",
-    "since the point in time of selecting this option": "depuis le moment où cette option a été sélectionnée",
-    "since they joined": "depuis qu’ils ont rejoint le salon",
-    "since they were invited": "depuis qu’ils ont été invités",
     "%(count)s of your messages have not been sent.|other": "Certains de vos messages n’ont pas été envoyés.",
     "Someone": "Quelqu'un",
-    "Sorry, this homeserver is using a login which is not recognised ": "Désolé, ce serveur d'accueil utilise un identifiant qui n’est pas reconnu ",
     "Start a chat": "Commencer une discussion",
     "Start Chat": "Commencer une discussion",
     "Submit": "Soumettre",
@@ -308,7 +286,6 @@
     "The main address for this room is": "L'adresse principale pour ce salon est",
     "This email address is already in use": "Cette adresse e-mail est déjà utilisée",
     "This email address was not found": "Cette adresse e-mail n’a pas été trouvée",
-    "%(actionVerb)s this person?": "%(actionVerb)s cette personne ?",
     "The email address linked to your account must be entered.": "L’adresse e-mail liée à votre compte doit être renseignée.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Le fichier '%(fileName)s' dépasse la taille limite autorisée pour les envois sur ce serveur d'accueil",
     "The file '%(fileName)s' failed to upload": "Le fichier '%(fileName)s' n’a pas pu être envoyé",
@@ -322,11 +299,7 @@
     "This phone number is already in use": "Ce numéro de téléphone est déjà utilisé",
     "This room is not accessible by remote Matrix servers": "Ce salon n’est pas accessible par les serveurs Matrix distants",
     "This room's internal ID is": "L'identifiant interne de ce salon est",
-    "to demote": "pour réduire la priorité",
-    "to favourite": "pour marquer comme favori",
     "To reset your password, enter the email address linked to your account": "Pour réinitialiser votre mot de passe, merci d’entrer l’adresse e-mail liée à votre compte",
-    "to restore": "pour restaurer",
-    "to tag direct chat": "pour marquer comme conversation directe",
     "To use it, just wait for autocomplete results to load and tab through them.": "Pour l’utiliser, attendez simplement que les résultats de l’auto-complétion s’affichent et défilez avec la touche Tab.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Un instant donné de la chronologie n’a pu être chargé car vous n’avez pas la permission de le visualiser.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Un instant donné de la chronologie n’a pu être chargé car il n’a pas pu être trouvé.",
@@ -346,7 +319,6 @@
     "unknown device": "appareil inconnu",
     "Unknown room %(roomId)s": "Salon inconnu %(roomId)s",
     "Unmute": "Activer le son",
-    "uploaded a file": "téléchargé un fichier",
     "Upload avatar": "Télécharger une photo de profil",
     "Upload Failed": "Erreur lors du téléchargement",
     "Upload Files": "Télécharger les fichiers",
@@ -357,7 +329,6 @@
     "User Interface": "Interface utilisateur",
     "User name": "Nom d'utilisateur",
     "Users": "Utilisateurs",
-    "User": "Utilisateur",
     "Verification Pending": "Vérification en attente",
     "Verification": "Vérification",
     "verified": "vérifié",
@@ -440,50 +411,6 @@
     "quote": "citer",
     "bullet": "liste à puces",
     "numbullet": "liste numérotée",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)sont rejoint le salon %(repeats)s fois",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)sa rejoint le salon %(repeats)s fois",
-    "%(severalUsers)sjoined": "%(severalUsers)sont rejoint le salon",
-    "%(oneUser)sjoined": "%(oneUser)sa rejoint le salon",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)sont quitté le salon %(repeats)s fois",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)sa quitté le salon %(repeats)s fois",
-    "%(severalUsers)sleft": "%(severalUsers)sont quitté le salon",
-    "%(oneUser)sleft": "%(oneUser)sa quitté le salon",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)sont rejoint et quitté le salon %(repeats)s fois",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)sa rejoint et quitté le salon%(repeats)s fois",
-    "%(severalUsers)sjoined and left": "%(severalUsers)sont rejoint et quitté le salon",
-    "%(oneUser)sjoined and left": "%(oneUser)sa rejoint et quitté le salon",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)sont quitté et sont revenus dans le salon %(repeats)s fois",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)sa quitté et est revenu dans le salon %(repeats)s fois",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)sont quitté et sont revenus dans le salon",
-    "%(oneUser)sleft and rejoined": "%(oneUser)sa quitté et est revenu dans le salon",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)sont rejeté leur invitation %(repeats)s fois",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)sa rejeté son invitation %(repeats)s fois",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)sont rejeté leur invitation",
-    "%(oneUser)srejected their invitation": "%(oneUser)sa rejeté son invitation",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)sont vu leur invitation révoquée %(repeats)s fois",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)sa vu son invitation révoquée %(repeats)s fois",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)sont vu leur invitation révoquée",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)sa vu son invitation révoquée",
-    "were invited %(repeats)s times": "ont été invité(e)s %(repeats)s fois",
-    "was invited %(repeats)s times": "a été invité(e) %(repeats)s fois",
-    "were invited": "ont été invité(e)s",
-    "were banned %(repeats)s times": "ont été banni(e)s %(repeats)s fois",
-    "was banned %(repeats)s times": "a été banni(e) %(repeats)s fois",
-    "were banned": "ont été banni(e)s",
-    "were unbanned %(repeats)s times": "ont vu leur bannissement révoqué %(repeats)s fois",
-    "was unbanned %(repeats)s times": "a vu son bannissement révoqué %(repeats)s fois",
-    "were unbanned": "ont vu leur bannissement révoqué",
-    "were kicked %(repeats)s times": "ont été exclu(e)s %(repeats)s fois",
-    "was kicked %(repeats)s times": "a été exclu(e) %(repeats)s fois",
-    "were kicked": "ont été exclu(e)s",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)sont changé leur nom %(repeats)s fois",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)sa changé son nom %(repeats)s fois",
-    "%(severalUsers)schanged their name": "%(severalUsers)sont changé leur nom",
-    "%(oneUser)schanged their name": "%(oneUser)sa changé son nom",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)sont changé leur avatar %(repeats)s fois",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)sa changé son avatar %(repeats)s fois",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)sont changé leur avatar",
-    "%(oneUser)schanged their avatar": "%(oneUser)sa changé son avatar",
     "Please select the destination room for this message": "Merci de sélectionner le salon de destination pour ce message",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s a supprimé le nom du salon.",
     "Analytics": "Collecte de données",
@@ -544,7 +471,6 @@
     "Dismiss": "Ignorer",
     "Please check your email to continue registration.": "Merci de vérifier votre e-mail afin de continuer votre inscription.",
     "Token incorrect": "Jeton incorrect",
-    "A text message has been sent to": "Un SMS a été envoyé au",
     "Please enter the code it contains:": "Merci de saisir le code qu'il contient :",
     "powered by Matrix": "propulsé par Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si vous ne renseignez pas d’adresse e-mail, vous ne pourrez pas réinitialiser votre mot de passe. En êtes vous sûr(e) ?",
@@ -561,15 +487,11 @@
     "Error decrypting video": "Erreur lors du déchiffrement de la vidéo",
     "Add an Integration": "Ajouter une intégration",
     "URL Previews": "Aperçus des liens",
-    "Disable URL previews by default for participants in this room": "Désactiver les aperçus des liens par défaut pour les participants de ce salon",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Les aperçus des liens sont %(globalDisableUrlPreview)s par défaut pour les participants de ce salon.",
-    "Enable URL previews for this room (affects only you)": "Activer les aperçus des liens pour ce salon (n'affecte que vous)",
     "Drop file here to upload": "Déposer le fichier ici pour l'envoyer",
     " (unsupported)": " (pas pris en charge)",
     "Ongoing conference call%(supportedText)s.": "Téléconférence en cours%(supportedText)s.",
     "Online": "En ligne",
     "Offline": "Hors ligne",
-    "Disable URL previews for this room (affects only you)": "Désactiver les aperçus des liens pour ce salon (n'affecte que vous)",
     "Desktop specific": "Spécifique à l'application de bureau",
     "Start automatically after system login": "Démarrer automatiquement après la phase d'authentification du système",
     "Idle": "Inactif",
@@ -577,12 +499,6 @@
     "Options": "Options",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vous êtes sur le point d’accéder à un site tiers afin de pouvoir vous identifier pour utiliser %(integrationsUrl)s. Voulez-vous continuer ?",
     "Removed or unknown message type": "Type de message inconnu ou supprimé",
-    "disabled": "désactivé",
-    "enabled": "activé",
-    "for %(amount)ss": "depuis %(amount)ss",
-    "for %(amount)sm": "depuis %(amount)sm",
-    "for %(amount)sh": "depuis %(amount)sh",
-    "for %(amount)sd": "depuis %(amount)sj",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s a changé l’avatar du salon en <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s a supprimé l'avatar du salon.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s a changé l’avatar de %(roomName)s",
@@ -637,7 +553,6 @@
     "Uploading %(filename)s and %(count)s others|one": "Envoi de %(filename)s et %(count)s autre",
     "Uploading %(filename)s and %(count)s others|other": "Envoi de %(filename)s et %(count)s autres",
     "You must <a>register</a> to use this functionality": "Vous devez vous <a>inscrire</a> pour utiliser cette fonctionnalité",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Tout renvoyer</a> ou <a>tout annuler</a> maintenant. Vous pouvez aussi sélectionner des messages individuels à renvoyer ou annuler.",
     "Create new room": "Créer un nouveau salon",
     "Room directory": "Répertoire des salons",
     "Start chat": "Commencer une discussion",
@@ -652,7 +567,6 @@
     "Something went wrong!": "Quelque chose s’est mal passé !",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Cela sera le nom de votre compte sur le serveur d'accueil  <span></span>, ou vous pouvez sélectionner un <a>autre serveur</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Si vous avez déjà un compte Matrix vous pouvez vous <a>connecter</a> à la place.",
-    "a room": "un salon",
     "Accept": "Accepter",
     "Active call (%(roomName)s)": "Appel en cours (%(roomName)s)",
     "Alias (optional)": "Alias (facultatif)",
@@ -741,7 +655,6 @@
     "Enable automatic language detection for syntax highlighting": "Activer la détection automatique de la langue pour la correction orthographique",
     "Hide Apps": "Masquer les applications",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Masquer les messages d'arrivée/départ (n'affecte pas les invitations/exclusions/bannissements)",
-    "Hide avatar and display name changes": "Masquer les changements d'avatar et de nom affiché",
     "Revoke widget access": "Révoquer les accès du widget",
     "Sets the room topic": "Défini le sujet du salon",
     "Show Apps": "Afficher les applications",
@@ -754,7 +667,6 @@
     "Loading device info...": "Chargement des informations de l'appareil...",
     "Example": "Exemple",
     "Create": "Créer",
-    "Room creation failed": "Échec de création du salon",
     "Featured Rooms:": "Salons mis en avant :",
     "Featured Users:": "Utilisateurs mis en avant :",
     "Automatically replace plain text Emoji": "Remplacer automatiquement le texte par des Émoticônes",
@@ -780,7 +692,6 @@
     "Invite new community members": "Inviter de nouveaux membres dans cette communauté",
     "Name or matrix ID": "Nom ou identifiant matrix",
     "Which rooms would you like to add to this community?": "Quels salons souhaitez-vous ajouter à cette communauté ?",
-    "Warning: any room you add to a community will be publicly visible to anyone who knows the community ID": "Attention : tout salon ajouté à une communauté est visible par quiconque connaissant l'identifiant de la communauté",
     "Add rooms to the community": "Ajouter des salons à la communauté",
     "Room name or alias": "Nom du salon ou alias",
     "Add to community": "Ajouter à la communauté",
@@ -832,9 +743,6 @@
     "To send events of type <eventType/>, you must be a": "Pour envoyer des évènements du type <eventType/>, vous devez être un",
     "Invalid community ID": "Identifiant de communauté non valide",
     "'%(groupId)s' is not a valid community ID": "\"%(groupId)s\" n'est pas un identifiant de communauté valide",
-    "Related Communities": "Communautés associées",
-    "Related communities for this room:": "Communautés associées à ce salon :",
-    "This room has no related communities": "Ce salon n'est associé à aucune communauté",
     "%(names)s and %(count)s others are typing|one": "%(names)s et un autre écrivent",
     "%(senderName)s sent an image": "%(senderName)s a envoyé une image",
     "%(senderName)s sent a video": "%(senderName)s a envoyé une vidéo",
@@ -869,7 +777,6 @@
     "Failed to remove '%(roomName)s' from %(groupId)s": "Échec de la suppression de \"%(roomName)s\" de %(groupId)s",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Voulez-vous vraiment supprimer \"%(roomName)s\" de %(groupId)s ?",
     "Removing a room from the community will also remove it from the community page.": "Supprimer un salon de la communauté le supprimera aussi de la page de la communauté.",
-    "Remove this room from the community": "Supprimer ce salon de la communauté",
     "Delete Widget": "Supprimer le widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Supprimer un widget le supprime pour tous les utilisateurs du salon. Voulez-vous vraiment supprimer ce widget ?",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
@@ -963,8 +870,6 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s vous a invité à rejoindre cette communauté",
     "You are an administrator of this community": "Vous êtes un(e) administrateur(trice) de cette communauté",
     "You are a member of this community": "Vous êtes un membre de cette communauté",
-    "Community Member Settings": "Paramètres de membre de la communauté",
-    "Publish this community on your profile": "Publier cette communauté sur votre profil",
     "Long Description (HTML)": "Description longue (HTML)",
     "Description": "Description",
     "Community %(groupId)s not found": "Communauté %(groupId)s non trouvée",
@@ -977,7 +882,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Créez une communauté pour grouper des utilisateurs et des salons ! Construisez une page d'accueil personnalisée pour distinguer votre espace dans l'univers Matrix.",
     "Join an existing community": "Rejoindre une communauté existante",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Pour rejoindre une communauté existante, vous devrez connaître son identifiant. Cela ressemblera à <i>+exemple:matrix.org</i>.",
-    "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "Il n'y a personne d'autre ici ! Voulez-vous <a>inviter d'autres personnes</a> ou <a>ne plus être notifié de ce salon vide</a> ?",
     "Disable Emoji suggestions while typing": "Désactiver les suggestions d'emojis lors de la saisie",
     "Disable big emoji in chat": "Désactiver les gros emojis dans les discussions",
     "Mirror local video feed": "Refléter le flux vidéo local",
@@ -1012,7 +916,6 @@
     "Enable URL previews by default for participants in this room": "Activer l'aperçu des URL par défaut pour les participants de ce salon",
     "URL previews are enabled by default for participants in this room.": "Les aperçus d'URL sont activés par défaut pour les participants de ce salon.",
     "URL previews are disabled by default for participants in this room.": "Les aperçus d'URL sont désactivés par défaut pour les participants de ce salon.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez également sélectionner des messages individuels à renvoyer ou annuler.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Il n'y a personne d'autre ici ! Souhaitez-vous <inviteText>inviter d'autres personnes</inviteText> ou <nowarnText>ne plus être notifié à propos du salon vide</nowarnText> ?",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 45109d2a85..b03f47c875 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -4,7 +4,6 @@
     "OK": "Rendben",
     "Custom Server Options": "Egyedi szerver beállítások",
     "Dismiss": "Eltűntet",
-    "Drop here %(toAction)s": "%(toAction)s -t húzd ide",
     "Error": "Hiba",
     "Failed to forget room %(errCode)s": "Nem lehet eltávolítani a szobát: %(errCode)s",
     "Favourite": "Kedvenc",
@@ -15,7 +14,6 @@
     "Remove": "Törlés",
     "Settings": "Beállítások",
     "unknown error code": "ismeretlen hiba kód",
-    "a room": "egy szoba",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Elküldtük a szöveges üzenetet ide: +%(msisdn)s. Kérlek add meg az ellenőrző kódot ami benne van",
     "Accept": "Elfogad",
     "%(targetName)s accepted an invitation.": "%(targetName)s elfogadta a meghívást.",
@@ -50,14 +48,10 @@
     "Close": "Bezár",
     "Room directory": "Szobák listája",
     "Start chat": "Csevegés indítása",
-    "%(items)s and %(remaining)s others": "%(items)s és még: %(remaining)s",
-    "%(items)s and one other": "%(items)s és még egy",
     "%(items)s and %(lastItem)s": "%(items)s és %(lastItem)s",
     "and %(count)s others...|other": "és még: %(count)s ...",
     "and %(count)s others...|one": "és még egy...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s és %(lastPerson)s írnak",
-    "%(names)s and one other are typing": "%(names)s és még valaki ír",
-    "An email has been sent to": "Az e-mail ide lett küldve:",
     "A new password must be entered.": "Új jelszót kell megadni.",
     "%(senderName)s answered the call.": "%(senderName)s felvette a telefont.",
     "An error has occurred.": "Hiba történt.",
@@ -137,8 +131,6 @@
     "Devices will not yet be able to decrypt history from before they joined the room": "A készülékek nem tudják egyenlőre visszafejteni a régebbi üzeneteket mint mikor csatlakoztak a szobához",
     "Direct chats": "Közvetlen csevegés",
     "Disable Notifications": "Értesítések tiltása",
-    "disabled": "letiltva",
-    "Disable inline URL previews by default": "Beágyazott URL előnézet alapértelmezetten tiltva",
     "Disinvite": "Meghívás visszavonása",
     "Display name": "Megjelenített név",
     "Displays action": "Tevékenységek megjelenítése",
@@ -154,7 +146,6 @@
     "Emoji": "Emoji",
     "Enable encryption": "Titkosítás bekapcsolása",
     "Enable Notifications": "Értesítések bekapcsolása",
-    "enabled": "bekapcsolva",
     "Encrypted by a verified device": "Ellenőrzött eszköz által titkosítva",
     "Encrypted by an unverified device": "Nem ellenőrzött eszköz által titkosítva",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "A titkosított üzenetek nem láthatók azokon a klienseken amik még nem támogatják a titkosítást",
@@ -174,7 +165,6 @@
     "Export E2E room keys": "E2E szoba kulcsok mentése",
     "Failed to ban user": "A felhasználót nem sikerült kizárni",
     "Failed to change power level": "A hozzáférési szintet nem sikerült megváltoztatni",
-    "Failed to delete device": "Eszközt nem sikerült törölni",
     "Failed to fetch avatar URL": "Avatar képet nem sikerült letölteni",
     "Failed to join room": "A szobába nem sikerült belépni",
     "Failed to kick": "Kirúgás nem sikerült",
@@ -263,7 +253,6 @@
     "Markdown is disabled": "Markdown kikapcsolva",
     "Markdown is enabled": "Markdown engedélyezett",
     "matrix-react-sdk version:": "matrix-react-sdk verzió:",
-    "Members only": "Csak tagoknak",
     "Message not sent due to unknown devices being present": "Ismeretlen eszköz miatt az üzenet nem küldhető el",
     "Missing room_id in request": "Hiányzó room_id a kérésben",
     "Missing user_id in request": "Hiányzó user_id a kérésben",
@@ -292,7 +281,6 @@
     "No users have specific privileges in this room": "Egy felhasználónak sincsenek specifikus jogosultságai ebben a szobában",
     "olm version:": "olm verzió:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Ha egyszer bekapcsolod a titkosítást a szobába utána nem lehet kikapcsolni (egyenlőre)",
-    "Once you've followed the link it contains, click below": "Miután a linket követted, kattints alulra",
     "Only people who have been invited": "Csak akiket meghívtak",
     "Otherwise, <a>click here</a> to send a bug report.": "Különben hiba jelentés küldéséhez <a>kattints ide</a>.",
     "Password": "Jelszó",
@@ -324,7 +312,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s VoIP konferenciát kezdeményez.",
     "Report it": "Jelent",
     "Results from DuckDuckGo": "Eredmények a DuckDuckGo-ból",
-    "Return to app": "Vissza az alkalmazáshoz",
     "Return to login screen": "Vissza a bejelentkezési képernyőre",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riotnak nincs jogosultsága értesítést küldeni neked - ellenőrizd  a böngésző beállításait",
     "Riot was not given permission to send notifications - please try again": "Riotnak nincs jogosultsága értesítést küldeni neked - próbáld újra",
@@ -342,16 +329,12 @@
     "Search failed": "Keresés sikertelen",
     "Searches DuckDuckGo for results": "Keresés DuckDuckGo-val",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s %(dateTime)s időpontban látta",
-    "Send a message (unencrypted)": "Üzenet küldése (titkosítás nélkül)",
-    "Send an encrypted message": "Titkosított üzenet küldése",
     "Send anyway": "Küld mindenképpen",
     "Sender device information": "Küldő eszközének információja",
     "Send Invites": "Meghívók elküldése",
     "Send Reset Email": "Visszaállítási e-mail küldése",
-    "sent an image": "kép küldése",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s képet küldött.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s meghívót küldött %(targetDisplayName)s felhasználónak, hogy lépjen be a szobába.",
-    "sent a video": "videó küldve",
     "Server error": "Szerver hiba",
     "Server may be unavailable or overloaded": "A szerver elérhetetlen vagy túlterhelt",
     "Server may be unavailable, overloaded, or search timed out :(": "A szerver elérhetetlen, túlterhelt vagy a keresés túllépte az időkorlátot :(",
@@ -367,12 +350,8 @@
     "Signed Out": "Kijelentkezett",
     "Sign in": "Bejelentkezett",
     "Sign out": "Kijelentkezés",
-    "since the point in time of selecting this option": "onnantól, hogy ez az opció kiválasztásra került",
-    "since they joined": "onnantól, hogy csatlakozott",
-    "since they were invited": "onnantól, hogy meg lett hívva",
     "%(count)s of your messages have not been sent.|other": "Néhány üzeneted nem lett elküldve.",
     "Someone": "Valaki",
-    "Sorry, this homeserver is using a login which is not recognised ": "Bocs, ez a saját szerver olyan beléptetést használ ami nem ismert ",
     "Start a chat": "Csevegés indítása",
     "Start authentication": "Azonosítás indítása",
     "Start Chat": "Csevegés indítása",
@@ -385,7 +364,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Az általad megadott aláíró kulcs megegyezik %(userId)s felhasználótól kapott kulccsal amit %(deviceId)s eszközhöz használ. Az eszköz ellenőrzöttnek jelölve.",
     "This email address is already in use": "Ez az e-mail cím már használatban van",
     "This email address was not found": "Az e-mail cím nem található",
-    "%(actionVerb)s this person?": "Ezt a felhasználót %(actionVerb)s?",
     "The email address linked to your account must be entered.": "A fiókodhoz kötött e-mail címet add meg.",
     "Press <StartChatButton> to start a chat with someone": "Nyomd meg a <StartChatButton> gombot  ha szeretnél csevegni valakivel",
     "Privacy warning": "Magánéleti figyelmeztetés",
@@ -404,11 +382,8 @@
     "This room": "Ebben a szobában",
     "This room is not accessible by remote Matrix servers": "Ez a szoba távoli Matrix szerverről nem érhető el",
     "This room's internal ID is": "A szoba belső azonosítója:",
-    "to favourite": "kedvencekhez",
     "To link to a room it must have <a>an address</a>.": "Szobához való kötéshez szükséges <a>egy cím</a>.",
     "To reset your password, enter the email address linked to your account": "A jelszó alaphelyzetbe állításához add meg a fiókodhoz kötött e-mail címet",
-    "to restore": "visszaállításhoz",
-    "to tag direct chat": "megjelölni közvetlen csevegésnek",
     "To use it, just wait for autocomplete results to load and tab through them.": "A használatához csak várd meg az automatikus kiegészítéshez a találatok betöltését és TAB-bal választhatsz közülük.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nincs jogod a kérdéses üzenetek megjelenítéséhez.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Megpróbáltam betölteni a szoba megadott időpontjának megfelelő  adatait, de nem találom.",
@@ -439,7 +414,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s feltöltése",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s és még %(count)s db másik feltöltése",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s és még %(count)s db másik feltöltése",
-    "uploaded a file": "fájl feltöltése",
     "Upload avatar": "Avatar kép feltöltése",
     "Upload Failed": "Feltöltés sikertelen",
     "Upload Files": "Fájlok feltöltése",
@@ -455,7 +429,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (szint: %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Felhasználói név érvénytelen: %(errMessage)s",
     "Users": "Felhasználók",
-    "User": "Felhasználó",
     "Verification Pending": "Ellenőrzés függőben",
     "Verification": "Ellenőrzés",
     "verified": "ellenőrizve",
@@ -500,7 +473,6 @@
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ez az e-mail cím, úgy néz ki, nincs összekötve a Matrix azonosítóval ezen a saját szerveren.",
     "Your password has been reset": "A jelszavad visszaállítottuk",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "A jelszavadat sikeresen megváltoztattuk. Nem kapsz \"push\" értesítéseket amíg a többi eszközön vissza nem jelentkezel",
-    "to demote": "a hozzáférési szint csökkentéséhez",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "A címről amire a meghívót elküldtük nem állapítható meg, hogy a fiókoddal összeköttetésben áll-e.",
     "You seem to be in a call, are you sure you want to quit?": "Úgy tűnik hívásban vagy, biztosan kilépsz?",
     "You seem to be uploading files, are you sure you want to quit?": "Úgy tűnik fájlokat töltesz fel, biztosan kilépsz?",
@@ -550,7 +522,6 @@
     "Room": "Szoba",
     "Connectivity to the server has been lost.": "A szerverrel a kapcsolat megszakadt.",
     "Sent messages will be stored until your connection has returned.": "Az elküldött üzenetek addig lesznek tárolva amíg a kapcsolatod újra elérhető lesz.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "Most <a>újraküldöd mind</a> vagy <a>eldobod mind</a>. Újraküldésre vagy eldobásra egyenként is kiválaszthatod az üzeneteket.",
     "(~%(count)s results)|one": "(~%(count)s db eredmény)",
     "(~%(count)s results)|other": "(~%(count)s db eredmény)",
     "Active call": "Folyamatban lévő hívás",
@@ -562,54 +533,6 @@
     "quote": "idézet",
     "bullet": "lista",
     "numbullet": "számozott lista",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s%(repeats)s alkalommal léptek be",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal lépett be",
-    "%(severalUsers)sjoined": "%(severalUsers)s csatlakozott",
-    "%(oneUser)sjoined": "%(oneUser)s csatlakozott",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)s %(repeats)s alkalommal lépett ki",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal lépett ki",
-    "%(severalUsers)sleft": "%(severalUsers)s kilépett",
-    "%(oneUser)sleft": "%(oneUser)s kilépett",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s %(repeats)s alkalommal lépett be és ki",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal lépett be és ki",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s be-, és kilépett",
-    "%(oneUser)sjoined and left": "%(oneUser)s be-, és kilépett",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)s %(repeats)s alkalommal ki-, és belépett",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal ki-, és belépett",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)s ki-, és belépett",
-    "%(oneUser)sleft and rejoined": "%(oneUser)s ki-, és belépett",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s %(repeats)s alkalommal utasította el a meghívót",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal utasította el a meghívót",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)s elutasította a meghívót",
-    "%(oneUser)srejected their invitation": "%(oneUser)s  elutasította a meghívót",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s %(repeats)s alkalommal visszavonta a meghívókat",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal visszavonta a meghívót",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s visszavonták a meghívókat",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)s visszavonta a meghívót",
-    "were invited %(repeats)s times": "%(repeats)s alkalommal lettek meghívva",
-    "was invited %(repeats)s times": "%(repeats)s alkalommal lett meghívva",
-    "were invited": "lettek meghívva",
-    "was invited": "lett meghívva",
-    "were banned %(repeats)s times": "%(repeats)s alkalommal lettek kitiltva",
-    "was banned %(repeats)s times": "%(repeats)s alkalommal lett kitiltva",
-    "were banned": "lettek kitiltva",
-    "was banned": "lett kitiltva",
-    "were unbanned %(repeats)s times": "%(repeats)s alkalommal lettek visszaengedve",
-    "was unbanned %(repeats)s times": "%(repeats)s alkalommal lett visszaengedve",
-    "were unbanned": "lettek visszaengedve",
-    "was unbanned": "lett visszaengedve",
-    "were kicked %(repeats)s times": "%(repeats)s alkalommal lettek kirúgva",
-    "was kicked %(repeats)s times": "%(repeats)s alkalommal lett kirúgva",
-    "were kicked": "lettek kirúgva",
-    "was kicked": "lett kirúgva",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)s %(repeats)s alkalommal változtatták meg a nevüket",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal változtatta meg a nevét",
-    "%(severalUsers)schanged their name": "%(severalUsers)s változtatták meg a nevüket",
-    "%(oneUser)schanged their name": "%(oneUser)s megváltoztatta a nevét",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)s %(repeats)s alkalommal változtatták meg az avatar képüket",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)s %(repeats)s alkalommal változtatta meg az avatar képét",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)s változtatták meg az avatar képüket",
-    "%(oneUser)schanged their avatar": "%(oneUser)s megváltoztatta az avatar képét",
     "Please select the destination room for this message": "Kérlek add meg az üzenet cél szobáját",
     "New Password": "Új jelszó",
     "Start automatically after system login": "Rendszerindításkor automatikus elindítás",
@@ -658,7 +581,6 @@
     "Sign in with CAS": "Belépés CAS-sal",
     "Please check your email to continue registration.": "Ellenőrizd az e-mailedet a regisztráció folytatásához.",
     "Token incorrect": "Helytelen token",
-    "A text message has been sent to": "A szöveg üzenetet elküldtük ide:",
     "Please enter the code it contains:": "Add meg a benne lévő kódot:",
     "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s névvel regisztrálsz",
     "Default server": "Alapértelmezett szerver",
@@ -673,17 +595,10 @@
     "Error decrypting video": "Hiba a videó visszafejtésénél",
     "Add an Integration": "Integráció hozzáadása",
     "Removed or unknown message type": "Eltávolított üzenet vagy ismeretlen üzenet típus",
-    "Disable URL previews by default for participants in this room": "URL előnézet alapértelmezett tiltása a szoba résztvevőinek",
-    "Disable URL previews for this room (affects only you)": "URL előnézet tiltása ebben a szobában (csak téged érint)",
     "URL Previews": "URL előnézet",
-    "Enable URL previews for this room (affects only you)": "URL előnézet engedélyezése ebben a szobában (csak téged érint)",
     "Drop file here to upload": "Feltöltéshez húzz ide egy fájlt",
     " (unsupported)": " (nem támogatott)",
     "Ongoing conference call%(supportedText)s.": "Folyamatban lévő konferencia hívás %(supportedText)s.",
-    "for %(amount)ss": "%(amount)s mperce",
-    "for %(amount)sm": "%(amount)s perce",
-    "for %(amount)sh": "%(amount)s órája",
-    "for %(amount)sd": "%(amount)s napja",
     "Online": "Elérhető",
     "Idle": "Várakozik",
     "Offline": "Nem érhető el",
@@ -720,7 +635,6 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Beállíthatsz egy egyedi azonosító szervert is de ez tulajdonképpen meggátolja az együttműködést e-mail címmel azonosított felhasználókkal.",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ha nem állítasz be e-mail címet nem fogod tudni a jelszavadat alaphelyzetbe állítani. Biztos vagy benne?",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Azonosítás céljából egy harmadik félhez leszel irányítva (%(integrationsUrl)s). Folytatod?",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL előnézet alapból %(globalDisableUrlPreview)s van a szoba résztvevői számára.",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ez lesz a felhasználói neved a <span></span> saját szerveren, vagy választhatsz egy <a>másik szervert</a>.",
     "Disable Peer-to-Peer for 1:1 calls": "Közvetlen kapcsolat tiltása az 1:1 hívásoknál",
     "To return to your account in future you need to set a password": "Ahhoz hogy később visszatérj a fiókodba be kell állítanod egy jelszót",
@@ -742,7 +656,6 @@
     "Enable automatic language detection for syntax highlighting": "Nyelv automatikus felismerése szintaxis kiemeléshez",
     "Hide Apps": "Alkalmazások elrejtése",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Belép/kilép üzenetek elrejtése (meghívók, kirúgások, kitiltások nem érintettek)",
-    "Hide avatar and display name changes": "Profilkép és megjelenítési név változás üzenetek elrejtése",
     "AM": "de",
     "PM": "du",
     "Revoke widget access": "Kisalkalmazás hozzáférésének visszavonása",
@@ -758,7 +671,6 @@
     "Loading device info...": "Eszköz információk betöltése...",
     "Example": "Példa",
     "Create": "Létrehoz",
-    "Room creation failed": "Szoba létrehozás sikertelen",
     "Featured Rooms:": "Kiemelt szobák:",
     "Featured Users:": "Kiemelt felhasználók:",
     "Automatically replace plain text Emoji": "Egyszerű szöveg automatikus cseréje Emoji-ra",
@@ -838,10 +750,8 @@
     "You have entered an invalid address.": "Érvénytelen címet adtál meg.",
     "Failed to remove '%(roomName)s' from %(groupId)s": "A(z) %(groupId)s csoportból nem sikerült törölni: %(roomName)s",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Biztos, hogy törlöd a(z) %(roomName)s szobát a(z) %(groupId)s csoportból?",
-    "Invites sent": "Meghívó elküldve",
     "Jump to read receipt": "Olvasási visszaigazolásra ugrás",
     "Disable big emoji in chat": "Nagy emoji-k tiltása a csevegésben",
-    "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "Itt nincs senki más! Szeretnél <a>meghívni másokat</a> vagy <a>ne figyelmeztessünk az üres szobával kapcsolatban</a>?",
     "Message Pinning": "Üzenet kitűzése",
     "Remove avatar": "Avatar törlése",
     "Pinned Messages": "Kitűzött üzenetek",
@@ -851,10 +761,8 @@
     "Invite new community members": "Új tagok meghívása a közösségbe",
     "Invite to Community": "Meghívás a közösségbe",
     "Which rooms would you like to add to this community?": "Melyik szobákat szeretnéd hozzáadni a közösséghez?",
-    "Warning: any room you add to a community will be publicly visible to anyone who knows the community ID": "Figyelem: minden szoba amit a közösséghez adsz látható lesz bárki számára aki ismeri a közösség azonosítóját",
     "Add rooms to the community": "Szobák hozzáadása a közösséghez",
     "Add to community": "Hozzáadás a közösséghez",
-    "Your community invitations have been sent.": "Elküldtük a közösségi meghívókat.",
     "Failed to invite users to community": "Nem sikerült tagokat meghívni a közösségbe",
     "Communities": "Közösségek",
     "Unpin Message": "Üzenet levétele",
@@ -867,9 +775,6 @@
     "No rooms to show": "Nincsenek megjelenítendő szobák",
     "Invalid community ID": "Érvénytelen közösségi azonosító",
     "'%(groupId)s' is not a valid community ID": "%(groupId)s nem egy érvényes közösségi azonosító",
-    "Related Communities": "Kapcsolódó közösségek",
-    "Related communities for this room:": "Kapcsolódó közösségek ehhez a szobához:",
-    "This room has no related communities": "Ebben a szobában nincsenek kapcsolódó közösségek",
     "New community ID (e.g. +foo:%(localDomain)s)": "Új közösségi azonosító (pl.: +foo:%(localDomain)s)",
     "Remove from community": "Elküldés a közösségből",
     "Failed to remove user from community": "Nem sikerült elküldeni felhasználót a közösségből",
@@ -877,7 +782,6 @@
     "Filter community rooms": "Közösségi szobák szűrése",
     "Failed to remove room from community": "Nem sikerült kivenni a szobát a közösségből",
     "Removing a room from the community will also remove it from the community page.": "A szoba kivétele a közösségből törölni fogja a közösség oldaláról is.",
-    "Community IDs may only contain alphanumeric characters": "A közösségi azonosító csak alfanumerikus karaktereket tartalmazhat",
     "Create Community": "Új közösség",
     "Community Name": "Közösség neve",
     "Community ID": "Közösség azonosító",
@@ -889,15 +793,12 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s meghívott ebbe a közösségbe",
     "You are a member of this community": "Tagja vagy ennek a közösségnek",
     "You are an administrator of this community": "Adminisztrátora vagy ennek a közösségnek",
-    "Community Member Settings": "Közösségi tag beállítások",
-    "Publish this community on your profile": "Közösség publikálása a profilodon",
     "Long Description (HTML)": "Hosszú leírás (HTML)",
     "Community Settings": "Közösségi beállítások",
     "Community %(groupId)s not found": "%(groupId)s közösség nem található",
     "This Home server does not support communities": "Ez a saját szerver nem támogatja a közösségeket",
     "Error whilst fetching joined communities": "Hiba a csatlakozott közösségek betöltésénél",
     "Create a new community": "Új közösség létrehozása",
-    "Create a community to represent your community! Define a set of rooms and your own custom homepage to mark out your space in the Matrix universe.": "Közösséged megjelenítéséhez hozz létre egy közösséget! Add meg a szobákat és az egyedi kezdő oldaladat amivel kijelölheted a helyed a Matrix univerzumban.",
     "Join an existing community": "Meglévő közösséghez csatlakozás",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Ahhoz hogy csatlakozni tudj egy meglévő közösséghez ismerned kell a közösségi azonosítót ami például így nézhet ki: <i>+pelda:matrix.org</i>.",
     "example": "példa",
@@ -911,7 +812,6 @@
     "Mention": "Említ",
     "Invite": "Meghív",
     "Message removed": "Üzenet eltávolítva",
-    "Remove this room from the community": "A szoba törlése a közösségből",
     "Delete Widget": "Kisalkalmazás törlése",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "A kisalkalmazás törlése minden felhasználót érint a szobában. Tényleg törölni szeretnéd?",
     "Mirror local video feed": "Helyi videó folyam tükrözése",
@@ -1016,7 +916,6 @@
     "Enable URL previews by default for participants in this room": "URL előnézet alapértelmezett engedélyezése a szoba tagságának",
     "URL previews are enabled by default for participants in this room.": "Az URL előnézetek alapértelmezetten engedélyezve vannak a szobában jelenlévőknek.",
     "URL previews are disabled by default for participants in this room.": "Az URL előnézet alapértelmezetten tiltva van a szobában jelenlévőknek.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Mindet újraküldöd</resendText> vagy <cancelText>mindet megszakítod</cancelText>. De egyenként is kijelölheted az üzenetet elküldésre vagy megszakításra.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Senki más nincs itt! Szeretnél <inviteText>meghívni másokat</inviteText> vagy <nowarnText>leállítod a figyelmeztetést az üres szobára</nowarnText>?",
     "%(duration)ss": "%(duration)s mp",
     "%(duration)sm": "%(duration)s p",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 5ec9252dd2..2c45314a6e 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -29,7 +29,6 @@
     "Delete": "Hapus",
     "Device ID": "ID Perangkat",
     "Devices": "Perangkat",
-    "disabled": "Nonaktif",
     "Don't send typing notifications": "Jangan kirim notifikasi pengetikan",
     "Email": "Email",
     "Email address": "Alamat email",
@@ -50,7 +49,6 @@
     "Enter Code": "Masukkan Kode",
     "Event information": "Informasi Event",
     "Export": "Ekspor",
-    "Failed to delete device": "Gagal menghapus perangkat",
     "Failed to join room": "Gagal gabung ruang",
     "Failed to leave room": "Gagal meninggalkan ruang",
     "Failed to reject invitation": "Gagal menolak undangan",
@@ -71,7 +69,6 @@
     "Low priority": "Prioritas rendah",
     "Markdown is disabled": "Markdown dinonaktifkan",
     "Markdown is enabled": "Markdown diaktifkan",
-    "Members only": "Hanya anggota",
     "Mobile phone number": "Nomor telpon seluler",
     "Mute": "Bisu",
     "Name": "Nama",
@@ -92,7 +89,6 @@
     "Reason": "Alasan",
     "Register": "Registrasi",
     "Report it": "Laporkan",
-    "Return to app": "Kembali ke aplikasi",
     "riot-web version:": "riot-web versi:",
     "Return to login screen": "Kembali ke halaman masuk",
     "Room Colour": "Warna Ruang",
@@ -101,7 +97,6 @@
     "Save": "Simpan",
     "Search": "Cari",
     "Search failed": "Pencarian gagal",
-    "Send an encrypted message": "Kirim pesan terenkripsi",
     "Send anyway": "Kirim saja",
     "Send Reset Email": "Kirim Email Atur Ulang",
     "Server error": "Server bermasalah",
@@ -154,7 +149,6 @@
     "Oct": "Okt",
     "Nov": "Nov",
     "Dec": "Des",
-    "a room": "ruang",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Sebuah pesan sudah dikirim ke +%(msisdn)s. Mohon masukkan kode verifikasi pada pesan tersebut",
     "%(targetName)s accepted an invitation.": "%(targetName)s telah menerima undangan.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s menerima undangan untuk %(displayName)s.",
@@ -171,14 +165,10 @@
     "Hide removed messages": "Sembunyikan pesan yang dihapus",
     "Always show message timestamps": "Selalu tampilkan cap waktu dari pesan",
     "Authentication": "Autentikasi",
-    "An email has been sent to": "Sebuah email telah dikirim ke",
     "Are you sure you want to leave the room '%(roomName)s'?": "Anda yakin ingin meninggalkan ruang '%(roomName)s'?",
     "A new password must be entered.": "Password baru harus diisi.",
-    "%(names)s and one other are typing": "%(names)s dan satu lagi sedang mengetik",
     "%(items)s and %(lastItem)s": "%(items)s dan %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s dan %(lastPerson)s sedang mengetik",
-    "%(items)s and %(remaining)s others": "%(items)s dan %(remaining)s lainnya",
-    "%(items)s and one other": "%(items)s dan satu lainnya",
     "%(senderName)s answered the call.": "%(senderName)s telah menjawab panggilan.",
     "Anyone who knows the room's link, including guests": "Siapa pun yang tahu tautan ruang, termasuk tamu",
     "Anyone who knows the room's link, apart from guests": "Siapa pun yang tahu tautan ruang, selain tamu",
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 40dbad8177..0da7cf704b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -18,10 +18,8 @@
     "Error": "Errore",
     "Favourite": "Preferito",
     "OK": "OK",
-    "Drop here %(toAction)s": "Rilascia qui %(toAction)s",
     "Failed to change password. Is your password correct?": "Modifica password fallita. La tua password è corretta?",
     "Continue": "Continua",
-    "a room": "una stanza",
     "%(targetName)s accepted an invitation.": "%(targetName)s ha accettato un invito.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha accettato l'invito per %(displayName)s.",
     "Account": "Account",
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
index 295d42d5fe..032dacd1aa 100644
--- a/src/i18n/strings/ja.json
+++ b/src/i18n/strings/ja.json
@@ -37,12 +37,7 @@
     "%(count)s new messages|other": "新しい発言 %(count)s",
     "Don't send typing notifications": "文字入力中であることを公表しない",
     "Filter room members": "参加者検索",
-    "Send a message (unencrypted)": "ここに送信文を入力 (暗号化なし)",
-    "Send an encrypted message": "暗号文を送る",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "発言時刻を12時間形式で表示 (例 2:30PM)",
-    "since the point in time of selecting this option": "この設定を選択した時点から",
-    "since they joined": "参加した時点から",
-    "since they were invited": "招待を送った時点から",
     "Upload avatar": "アイコン画像を変更",
     "Upload file": "添付ファイル送信",
     "Use compact timeline layout": "会話表示の行間を狭くする",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index eaed03ef25..8a92e0f496 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -16,7 +16,6 @@
     "unknown error code": "알 수 없는 오류 코드",
     "OK": "알았어요",
     "Continue": "게속하기",
-    "a room": "방",
     "Accept": "수락",
     "Account": "계정",
     "Add": "추가하기",
@@ -66,13 +65,11 @@
     "Devices": "장치",
     "Direct chats": "직접 여러 명에게 이야기하기",
     "Disable Notifications": "알림 끄기",
-    "disabled": "끄기",
     "Display name": "별명",
     "Don't send typing notifications": "입력 중이라는 알림 보내지 않기",
     "Email": "이메일",
     "Email address": "이메일 주소",
     "Email, name or matrix ID": "이메일, 이름 혹은 매트릭스 ID",
-    "Drop here %(toAction)s": "여기에 놓아주세요 %(toAction)s",
     "Failed to forget room %(errCode)s": "방 %(errCode)s를 잊지 못했어요",
     "Favourite": "즐겨찾기",
     "Operation failed": "작업 실패",
@@ -85,14 +82,10 @@
     "Add a topic": "주제 추가",
     "Missing Media Permissions, click here to request.": "저장소 권한을 잃었어요, 여기를 눌러 다시 요청해주세요.",
     "You may need to manually permit Riot to access your microphone/webcam": "수동으로 라이엇에 마이크와 카메라를 허용해야 할 수도 있어요",
-    "%(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 %(count)s others...|one": "그리고 다른 하나...",
     "and %(count)s others...|other": "그리고 %(count)s...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s님과 %(lastPerson)s님이 입력중",
-    "%(names)s and one other are typing": "%(names)s님과 다른 분이 입력중",
-    "An email has been sent to": "이메일을 보냈어요",
     "%(senderName)s answered the call.": "%(senderName)s님이 전화를 받았어요.",
     "Anyone who knows the room's link, apart from guests": "손님을 제외하고, 방의 주소를 아는 누구나",
     "Anyone who knows the room's link, including guests": "손님을 포함하여, 방의 주소를 아는 누구나",
@@ -144,7 +137,6 @@
     "Device ID:": "장치 ID:",
     "Device key:": "장치 키:",
     "Devices will not yet be able to decrypt history from before they joined the room": "방에 들어가기 전에는 장치에서 기록을 해독할 수 없어요",
-    "Disable inline URL previews by default": "기본적으로 인라인 URL 미리보기를 끄기",
     "Disinvite": "초대 취소",
     "Displays action": "활동 보이기",
     "Download %(text)s": "%(text)s 받기",
@@ -155,7 +147,6 @@
     "Emoji": "이모지",
     "Enable encryption": "암호화 켜기",
     "Enable Notifications": "알림 켜기",
-    "enabled": "사용",
     "Encrypted by a verified device": "인증한 장치로 암호화했어요",
     "Encrypted by an unverified device": "인증하지 않은 장치로 암호화했어요",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "암호화한 메시지는 아직 암호화를 구현하지 않은 클라이언트에서는 볼 수 없어요",
@@ -175,7 +166,6 @@
     "Export E2E room keys": "종단간 암호화 방 키 내보내기",
     "Failed to ban user": "사용자를 차단하지 못했어요",
     "Failed to change power level": "권한 등급을 바꾸지 못했어요",
-    "Failed to delete device": "장치를 지우지 못했어요",
     "Failed to fetch avatar URL": "아바타 URL을 불러오지 못했어요",
     "Failed to join room": "방에 들어가지 못했어요",
     "Failed to kick": "내쫓지 못했어요",
@@ -265,7 +255,6 @@
     "Markdown is disabled": "마크다운이 꺼져있어요",
     "Markdown is enabled": "마크다운이 켜져있어요",
     "matrix-react-sdk version:": "matrix-react-sdk 버전:",
-    "Members only": "구성원만",
     "Message not sent due to unknown devices being present": "알 수 없는 장치가 있어 메시지를 보내지 못했어요",
     "Missing room_id in request": "요청에서 방_id가 빠졌어요",
     "Missing user_id in request": "요청에서 사용자_id가 빠졌어요",
@@ -299,7 +288,6 @@
     "People": "사람들",
     "Phone": "전화",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "방을 암호화하면 암호화를 도중에 끌 수 없어요. (현재로서는)",
-    "Once you've followed the link it contains, click below": "포함된 주소를 따라가서, 아래를 누르세요",
     "Only people who have been invited": "초대받은 사람만",
     "Otherwise, <a>click here</a> to send a bug report.": "그 밖에는, <a>여기를 눌러</a> 오류 보고서를 보내주세요.",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었어요.",
@@ -330,7 +318,6 @@
     "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.": "비밀번호를 다시 설정하면 현재 모든 장치의 종단간 암호화 키가 다시 설정되고, 먼저 방의 키를 내보내고 나중에 다시 불러오지 않는 한, 암호화한 이야기 기록을 읽을 수 없게 되어요. 앞으로는 이 기능을 더 좋게 만들 거에요.",
     "Results from DuckDuckGo": "덕덕고에서 검색한 결과",
-    "Return to app": "앱으로 돌아가기",
     "Return to login screen": "로그인 화면으로 돌아가기",
     "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": "라이엇이 알릴 권한을 받지 못했어요 - 다시 해주세요",
@@ -348,16 +335,12 @@
     "Search failed": "찾지 못함",
     "Searches DuckDuckGo for results": "덕덕고에서 검색",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s님이 %(dateTime)s에 확인",
-    "Send a message (unencrypted)": "메시지 보내기 (비암호화)",
-    "Send an encrypted message": "암호화한 메시지 보내기",
     "Send anyway": "그래도 보내기",
     "Sender device information": "보낸 장치의 정보",
     "Send Invites": "초대 보내기",
     "Send Reset Email": "재설정 이메일 보내기",
-    "sent an image": "사진을 보냈어요",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s님이 사진을 보냈어요.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s님이 %(targetDisplayName)s님에게 들어오라는 초대를 보냈어요.",
-    "sent a video": "동영상을 보냈어요",
     "Server error": "서버 오류",
     "Server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
     "Server may be unavailable, overloaded, or search timed out :(": "서버를 쓸 수 없거나 과부하거나, 검색 시간을 초과했어요 :(",
@@ -372,12 +355,8 @@
     "Signed Out": "로그아웃함",
     "Sign in": "로그인",
     "Sign out": "로그아웃",
-    "since the point in time of selecting this option": "이 선택을 하는 시점부터",
-    "since they joined": "들어온 이후",
-    "since they were invited": "초대받은 이후",
     "%(count)s of your messages have not been sent.|other": "일부 메시지는 보내지 못했어요.",
     "Someone": "다른 사람",
-    "Sorry, this homeserver is using a login which is not recognised ": "죄송해요, 이 홈 서버는 인식할 수 없는 로그인을 쓰고 있네요 ",
     "Start a chat": "이야기하기",
     "Start authentication": "인증하기",
     "Start Chat": "이야기하기",
@@ -390,7 +369,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "입력한 서명 키는 %(userId)s님의 장치 %(deviceId)s에서 받은 서명 키와 일치하네요. 인증한 장치로 표시할게요.",
     "This email address is already in use": "이 이메일 주소는 사용중이에요",
     "This email address was not found": "이 이메일 주소를 찾지 못했어요",
-    "%(actionVerb)s this person?": "이 사용자에게 %(actionVerb)s?",
     "The email address linked to your account must be entered.": "계정에 연결한 이메일 주소를 입력해야 해요.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' 파일이 홈 서버에 올릴 수 있는 한계 크기를 초과했어요",
     "The file '%(fileName)s' failed to upload": "'%(fileName)s' 파일을 올리지 못했어요",
@@ -407,12 +385,8 @@
     "This room": "이 방",
     "This room is not accessible by remote Matrix servers": "이 방은 원격 매트릭스 서버에 접근할 수 없어요",
     "This room's internal ID is": "방의 내부 ID",
-    "to demote": "우선순위 낮추기",
-    "to favourite": "즐겨찾기",
     "To link to a room it must have <a>an address</a>.": "방에 연결하려면 <a>주소</a>가 있어야 해요.",
     "To reset your password, enter the email address linked to your account": "비밀번호을 다시 설정하려면, 계정과 연결한 이메일 주소를 입력해주세요",
-    "to restore": "복구하려면",
-    "to tag direct chat": "직접 이야기를 지정하려면",
     "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 was unable to find it.": "이 방의 타임라인에서 특정 시점을 불러오려고 했지만, 찾을 수 없었어요.",
@@ -444,7 +418,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s 올리는 중",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s 외 %(count)s 올리는 중",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s 외 %(count)s 올리는 중",
-    "uploaded a file": "파일을 올렸어요",
     "Upload avatar": "아바타 올리기",
     "Upload Failed": "파일을 올리지 못했어요",
     "Upload Files": "파일 올리기",
@@ -459,7 +432,6 @@
     "User name": "사용자 이름",
     "Username invalid: %(errMessage)s": "사용자 이름을 인식할 수 없어요: %(errMessage)s",
     "Users": "사용자들",
-    "User": "사용자",
     "Verification Pending": "인증을 기다리는 중",
     "Verification": "인증",
     "verified": "인증함",
@@ -553,7 +525,6 @@
     "Room": "방",
     "Connectivity to the server has been lost.": "서버 연결이 끊어졌어요.",
     "Sent messages will be stored until your connection has returned.": "보내신 메시지는 다시 연결될 때까지 저장할 거에요.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>전부 다시 보내거나</a> <a>취소하세요</a>. 다시 보내거나 취소할 메시지를 하나씩 고르실 수도 있어요.",
     "(~%(count)s results)|one": "(~%(count)s 결과)",
     "(~%(count)s results)|other": "(~%(count)s 결과)",
     "Active call": "전화 중",
@@ -565,54 +536,6 @@
     "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님이 초대를 거절하셨어요",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s님이 %(repeats)s 번 초대를 취소하셨어요",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)s님이 %(repeats)s 번 초대를 취소하셨어요",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s님이 초대를 취소하셨어요",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)s님이 초대를 취소하셨어요",
-    "were invited %(repeats)s times": "%(repeats)s 번 초대받으셨어요",
-    "was invited %(repeats)s times": "%(repeats)s 번 초대받으셨어요",
-    "were invited": "초대받으셨어요",
-    "was invited": "초대받으셨어요",
-    "were banned %(repeats)s times": "%(repeats)s 번 차단당하셨어요",
-    "was banned %(repeats)s times": "%(repeats)s 번 차단당하셨어요",
-    "were banned": "차단당하셨어요",
-    "was banned": "차단당하셨어요",
-    "were unbanned %(repeats)s times": "%(repeats)s 번 차단이 풀리셨어요",
-    "was unbanned %(repeats)s times": "%(repeats)s 번 차단의 풀리셨어요",
-    "were unbanned": "차단이 풀리셨어요",
-    "was unbanned": "차단이 풀리셨어요",
-    "were kicked %(repeats)s times": "%(repeats)s 번 내쫓기셨어요",
-    "was kicked %(repeats)s times": "%(repeats)s 번 내쫓기셨어요",
-    "were kicked": "내쫓기셨어요",
-    "was kicked": "내쫓기셨어요",
-    "%(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님이 아바타를 바꾸셨어요",
     "Please select the destination room for this message": "이 메시지를 보낼 방을 골라주세요",
     "New Password": "새 비밀번호",
     "Start automatically after system login": "컴퓨터를 시작할 때 자동으로 실행하기",
@@ -670,7 +593,6 @@
     "Sign in with CAS": "CAS로 로그인 하기",
     "Please check your email to continue registration.": "등록하시려면 이메일을 확인해주세요.",
     "Token incorrect": "토큰이 안 맞아요",
-    "A text message has been sent to": "문자 메시지를 보냈어요",
     "Please enter the code it contains:": "들어있던 코드를 입력해주세요:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "이메일 주소를 정하지 않으시면, 비밀번호를 다시 설정하실 수 없어요. 괜찮으신가요?",
     "You are registering with %(SelectedTeamName)s": "%(SelectedTeamName)s로 등록할게요",
@@ -690,18 +612,10 @@
     "Add an Integration": "통합 추가",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "타사 사이트로 이동하는데 %(integrationsUrl)s에서 쓰도록 계정을 인증할 수 있어요. 계속하시겠어요?",
     "Removed or unknown message type": "지웠거나 알 수 없는 메시지 유형",
-    "Disable URL previews by default for participants in this room": "이 방에 있는 사용자의 URL 미리보기를 기본적으로 끄기",
-    "Disable URL previews for this room (affects only you)": "이 방의 URL 미리보기를 기본적으로 끄기 (자신만)",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "이 방에 있는 사용자의 URL 미리보기는 기본적으로 %(globalDisableUrlPreview)s.",
     "URL Previews": "URL 미리보기",
-    "Enable URL previews for this room (affects only you)": "이 방의 URL 미리보기를 켜기 (자신만)",
     "Drop file here to upload": "올릴 파일을 여기에 놓으세요",
     " (unsupported)": " (지원하지 않음)",
     "Ongoing conference call%(supportedText)s.": "진행중인 전화 회의%(supportedText)s.",
-    "for %(amount)ss": "%(amount)ss 동안",
-    "for %(amount)sm": "%(amount)sm 동안",
-    "for %(amount)sh": "%(amount)sh 동안",
-    "for %(amount)sd": "%(amount)sd 동안",
     "Online": "접속 중",
     "Idle": "쉬는 중",
     "Offline": "미접속",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 854454ab24..71cfdc5110 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1,5 +1,4 @@
 {
-    "a room": "istaba",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Teksta ziņa tika nosūtīta +%(msisdn)s. Lūdzu ievadi tajā atrodamo verifikācijas kodu",
     "Accept": "Apstiprināt",
     "%(targetName)s accepted an invitation.": "%(targetName)s apstiprināja uzaicinājumu.",
@@ -28,12 +27,8 @@
     "Always show message timestamps": "Vienmēr rādīt ziņojumu laika zīmogu",
     "Authentication": "Autentifikācija",
     "Alias (optional)": "Aizstājējvārds (neobligāts)",
-    "%(items)s and %(remaining)s others": "%(items)s un %(remaining)s citi",
-    "%(items)s and one other": "%(items)s un viens cits",
     "%(items)s and %(lastItem)s": "%(items)s un %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s un %(lastPerson)s raksta",
-    "%(names)s and one other are typing": "%(names)s un viens cits raksta",
-    "An email has been sent to": "Epasts tika nosūtīts",
     "A new password must be entered.": "Nepieciešams ievadīt jauno paroli.",
     "%(senderName)s answered the call.": "%(senderName)s atbildēja zvanam.",
     "An error has occurred.": "Notikusi kļūda.",
@@ -116,15 +111,12 @@
     "Devices will not yet be able to decrypt history from before they joined the room": "Ierīces nevarēs atšifrēt to ziņu vēsturi, kuras ir tikušas pievienotas, pirms ierīce pieslēdzās istabai",
     "Direct chats": "Tiešie čati",
     "Disable Notifications": "Atslēgt paziņojumus",
-    "disabled": "atslēgts",
-    "Disable inline URL previews by default": "Pēc noklusējuma atslēgt saišu priekšskatījumu",
     "Disinvite": "Atsaukt",
     "Display name": "Redzamais vārds",
     "Displays action": "Parāda darbību",
     "Don't send typing notifications": "Nesūtīt paziņojumus",
     "Download %(text)s": "Lejupielādēt tekstu: %(text)s",
     "Drop File Here": "Ievelc failu šeit",
-    "Drop here %(toAction)s": "Ievelc šeit %(toAction)s",
     "Drop here to tag %(section)s": "Ievelc šeit uz birkas %(section)s",
     "Ed25519 fingerprint": "Ed25519 identificējošā zīmju virkne",
     "Email": "Epasts",
@@ -134,7 +126,6 @@
     "Emoji": "Emocijzīmes (Emoji)",
     "Enable encryption": "Iespējot šifrēšanu",
     "Enable Notifications": "Iespējot paziņojumus",
-    "enabled": "iespējots",
     "Encrypted by a verified device": "Šifrēts ar verificētu ierīci",
     "Encrypted by an unverified device": "Šifrēts ar neverificētu ierīci",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Šifrētas ziņas nebūs redzamas tajās klienta programmās, kuras neatbalsta šifrēšanu",
@@ -158,7 +149,6 @@
     "Failed to change power level": "Neizdevās mainīt statusa līmeni",
     "Power level must be positive integer.": "Statusa līmenim ir jābūt pozitīvam skaitlim.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tu nevarēsi atcelt šo darbību, jo šim lietotājam piešķir tādu pašu statusa līmeni, kāds ir Tev.",
-    "Failed to delete device": "Neizdevās dzēst ierīci",
     "Failed to fetch avatar URL": "Neizdevās noteikt avatara URL adresi",
     "Failed to forget room %(errCode)s": "Neizdevās \"aizmirst\" istabu %(errCode)s",
     "Failed to join room": "Neizdevās pievienoties istabai",
@@ -251,7 +241,6 @@
     "Turn Markdown off": "Izslēgt formatēšanas iespēju",
     "Turn Markdown on": "Ieslēgt formatēšanas iespēju",
     "matrix-react-sdk version:": "matrix-react-sdk versija:",
-    "Members only": "Tikai biedriem",
     "The default role for new room members is": "Noklusējuma loma jaunam istabas biedram ir",
     "Message not sent due to unknown devices being present": "Ziņa nav nosūtīta, jo tika konstatēta nezināmu ierīču klātbūtne",
     "Missing room_id in request": "Iztrūkstošs room_id pieprasījumā",
@@ -284,7 +273,6 @@
     "OK": "LABI",
     "olm version:": "olm versija:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Tiklīdz istabai tiks iespējota šifrēšana, tā vairs nebūs atslēdzama (pašlaik)",
-    "Once you've followed the link it contains, click below": "Tiklīdz sekoji saturā esošajai saitei, noklikšķini zemāk",
     "Only people who have been invited": "Vienīgi personas, kuras ir tikušas uzaicinātas",
     "Operation failed": "Darbība neizdevās",
     "Otherwise, <a>click here</a> to send a bug report.": "pretējā gadījumā, <a>klikšķini šeit</a>, lai nosūtītu paziņojumu par kļūdu.",
@@ -320,7 +308,6 @@
     "Report it": "Ziņot par to",
     "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.": "Paroles atiestatīšana atiestatīs visas ierīce-ierīce šifrēšanas atslēgas visās ierīcēs, padarot čata šifrēto ziņu vēsturi nelasāmu, ja vien Tu pirms tam neesi eksportējis savas istabas atslēgas un atkārtoti importējis tās atpakaļ. Nākotnē šo ir plānots uzlabot.",
     "Results from DuckDuckGo": "Rezultāti no DuckDuckGo",
-    "Return to app": "Atgriezties aplikācijā",
     "Return to login screen": "Atgriezties uz pierakstīšanās lapu",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot nav atļauts nosūtīt Tev paziņojumus. Lūdzu pārbaudi sava pārlūka uzstādījumus",
     "Riot was not given permission to send notifications - please try again": "Riot nav atļauts nosūtīt paziņojumus. Lūdzu mēģini vēlreiz.",
@@ -339,7 +326,6 @@
     "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s uzstādīja redzamo vārdu uz: %(displayName)s.",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Tevis uzdotā pierakstīšanās atslēga sakrīt ar atslēgu, kuru Tu saņēmi no %(userId)s ierīces %(deviceId)s. Ierīce tika atzīmēta kā verificēta.",
-    "%(actionVerb)s this person?": "%(actionVerb)s šo personu?",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Faila '%(fileName)s' izmērs pārsniedz šī mājas servera augšupielādes lieluma ierobežojumu",
     "The file '%(fileName)s' failed to upload": "Failu '%(fileName)s' neizdevās augšuplādēt",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza ierīce-ierīce šifrēšanu (algorithm %(algorithm)s).",
@@ -365,58 +351,13 @@
     "An error occurred: %(error_string)s": "Notikusi kļūda: %(error_string)s",
     "(~%(count)s results)|one": "(~%(count)s rezultāts)",
     "(~%(count)s results)|other": "(~%(count)s rezultāti)",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s pievienojās %(repeats)s reizes",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)s pievienojās %(repeats)s reizes",
-    "%(severalUsers)sjoined": "%(severalUsers)s pievienojās",
-    "%(oneUser)sjoined": "%(oneUser)s pievienojās",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)s atstāja %(repeats)s reizes",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)s atstāja %(repeats)s reizes",
-    "%(severalUsers)sleft": "%(severalUsers)s atstāja",
-    "%(oneUser)sleft": "%(oneUser)s atstāja",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s pievienojās un atstāja %(repeats)s reizes",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s pievienojās un atstāja %(repeats)s reizes",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s pievienojās un atstāja",
-    "%(oneUser)sjoined and left": "%(oneUser)s pievienojās un atstāja",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)s atstāja un atkārtoti pievienojās %(repeats)s reizes",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)s atstāja un atkārtoti pievienojās %(repeats)s reizes",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)s atstāja un atkārtoti pievienojās",
-    "%(oneUser)sleft and rejoined": "%(oneUser)s atstāja un atkārtoti pievienojās",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s noraidīja uzaicinājumus %(repeats)s reizes",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)s noraidīja uzaicinājumu %(repeats)s reizes",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)s noraidīja uzaicinājumus",
-    "%(oneUser)srejected their invitation": "%(oneUser)s noraidīja uzaicinājumu",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s atsauca uzaicinājumus %(repeats)s reizes",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)s atsauca uzaicinājumus %(repeats)s reizes",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s atsauca uzaicinājumus",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)s atsauca uzaicinājumus",
-    "were invited %(repeats)s times": "tika uzaicināts/a %(repeats)s reizes",
-    "was invited %(repeats)s times": "tika uzaicināts/a %(repeats)s reizes",
-    "were banned %(repeats)s times": "tika liegta pieeja (bans) %(repeats)s reizes",
-    "was banned %(repeats)s times": "tika liegta pieeja (bans) %(repeats)s reizes",
-    "were unbanned %(repeats)s times": "tika atcelts pieejas liegums (atbanošana) %(repeats)s reizes",
-    "was unbanned %(repeats)s times": "tika atcelts pieejas liegums (atbanošana) %(repeats)s reizes",
-    "were kicked %(repeats)s times": "tika izmests/a (kick) %(repeats)s reizes",
-    "was kicked %(repeats)s times": "tika izmests/a (kick) %(repeats)s reizes",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)s nomainīja vārdu %(repeats)s reizes",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)s nomainīja vārdu %(repeats)s reizes",
-    "%(severalUsers)schanged their name": "%(severalUsers)s nomainīja vārdu",
-    "%(oneUser)schanged their name": "%(oneUser)s nomainīja vārdu",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)s nomainīja profila attēlu %(repeats)s reizes",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)s nomainīja profila attēlu %(repeats)s reizes",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)s nomainīja profila attēlu",
-    "%(oneUser)schanged their avatar": "%(oneUser)s nomainīja profila attēlu",
     "Reject all %(invitedRooms)s invites": "Noraidīt visus %(invitedRooms)s uzaicinājumus",
     "Failed to invite the following users to the %(roomName)s room:": "Neizdevās uzaicināt sekojošos lietotājus uz %(roomName)s istabu:",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" atrodas ierīces, kuras Tu neesi iepriekš redzējis/usi.",
     "You are registering with %(SelectedTeamName)s": "Tu reģistrējies ar %(SelectedTeamName)s",
     "Image '%(Body)s' cannot be displayed.": "Attēlu '%(Body)s' nav iespējams parādīt.",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL adrešu priekškatījums %(globalDisableUrlPreview)s pēc noklusējuma šīs istabas dalībniekiem.",
     "Ongoing conference call%(supportedText)s.": "Ienākošs konferences zvans %(supportedText)s.",
-    "for %(amount)ss": "priekš %(amount)ss",
-    "for %(amount)sm": "priekš %(amount)sm",
-    "for %(amount)sh": "priekš %(amount)sh",
-    "for %(amount)sd": "priekš %(amount)sd",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas attēlu.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas attēlu %(roomName)s",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "Tu pievienoji jaunu ierīci '%(displayName)s', kas prasa šifrēšanas atslēgas.",
@@ -431,14 +372,10 @@
     "Search": "Meklēt",
     "Search failed": "Meklēšana neizdevās",
     "Searches DuckDuckGo for results": "Meklē DuckDuckGo rezultātus",
-    "Send a message (unencrypted)": "Nosūtīt ziņu (netiek šifrēta)",
-    "Send an encrypted message": "Nosūtīt šifrētu ziņu",
     "Send anyway": "Nosūtīt jebkurā gadījumā",
     "Sender device information": "Nosūtītāja ierīces informācija",
     "Send Invites": "Nosūtīt uzaicinājumus",
     "Send Reset Email": "Nosūtīt atiestatīšanas epastu",
-    "sent an image": "nosūtīja attēlu",
-    "sent a video": "nosūtīja video",
     "Server error": "Servera kļūda",
     "Server may be unavailable or overloaded": "Serveris var nebūt pieejams vai ir pārslogots",
     "Server may be unavailable, overloaded, or search timed out :(": "Serveris var nebūt pieejams, ir pārslogots, vai arī meklēšana beidzās ar savienojuma noilgumu :(",
@@ -453,12 +390,8 @@
     "Signed Out": "Izrakstījās",
     "Sign in": "Pierakstīties",
     "Sign out": "Izrakstīties",
-    "since the point in time of selecting this option": "kopš šī uzstādījuma izvēles brīža",
-    "since they joined": "kopš tie pievienojās",
-    "since they were invited": "kopš tie tika uzaicināti",
     "%(count)s of your messages have not been sent.|other": "Dažas no tavām ziņām netika nosūtītas.",
     "Someone": "Kāds",
-    "Sorry, this homeserver is using a login which is not recognised ": "Atvaino, šis serveris izmanto neatpazītu pierakstīšanās veidu ",
     "Start a chat": "Sākt čatu",
     "Start authentication": "Sākt autentifikāciju",
     "Start Chat": "Sākt čatu",
@@ -483,12 +416,8 @@
     "This room": "Šī istaba",
     "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no attālinātajiem Matrix serveriem",
     "This room's internal ID is": "Šīs istabas iekšējais ID ir",
-    "to demote": "lai samazinātu",
-    "to favourite": "lai pievienotu favorītiem",
     "To link to a room it must have <a>an address</a>.": "Lai ieliktu saiti uz istabu, tai ir jābūt piešķirtai <a>adresei</a>.",
     "To reset your password, enter the email address linked to your account": "Lai atiestatītu savu paroli, ievadi tavam kontam piesaistīto epasta adresi",
-    "to restore": "lai atjaunotu",
-    "to tag direct chat": "lai pieliktu birku tiešajam čatam",
     "To use it, just wait for autocomplete results to load and tab through them.": "Lai to izmantotu, vienkārši gaidi, kamēr ielādējas automātiski ieteiktie rezultāti, un pārvietojies caur tiem.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Notika mēģinājums ielādēt šīs istabas specifisku laikpaziņojumu sadaļu, bet Tev nav atļaujas skatīt šo ziņu.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Notika mēģinājums ielādēt šīs istabas specifisku laikpaziņojumu sadaļu, bet tā netika atrasta.",
@@ -514,11 +443,9 @@
     "Custom Server Options": "Īpaši servera uzstādījumi",
     "Dismiss": "Noņemt",
     "You have <a>enabled</a> URL previews by default.": "Tev ir pēc noklusējuma <a>iespējots</a> URL adrešu priekšskatījums.",
-    "Enable URL previews for this room (affects only you)": "Iespējo URL priekšskatījumu šai istabai (attieksies tikai uz Tevi)",
     "Unrecognised command:": "Neatpazīta komanda:",
     "Unrecognised room alias:": "Neatpazīts istabas aizstājējvārds:",
     "Unverified": "Neverificēts",
-    "uploaded a file": "augšuplādēja failu",
     "Upload avatar": "Augšuplādē profila attēlu",
     "Upload Failed": "Augšupielāde neizdevās",
     "Upload Files": "Augšuplādē failus",
@@ -531,7 +458,6 @@
     "User Interface": "Lietotāja saskarne",
     "User name": "Lietotāja vārds",
     "Users": "Lietotāji",
-    "User": "Lietotājs",
     "Verification Pending": "Gaida verifikāciju",
     "Verification": "Verifikācija",
     "verified": "verificēts",
@@ -614,7 +540,6 @@
     "Room": "Istaba",
     "Connectivity to the server has been lost.": "Savienojums ar serveri tika zaudēts.",
     "Sent messages will be stored until your connection has returned.": "Nosūtītās ziņas tiks saglabātas tiklīdz savienojums tiks atjaunots.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Sūtīt vēlreiz visas</a> vai <a>atcelt visas</a>. Tu vari arī atlasīt atsevišķas ziņas, kuras sūtīt vai atcelt.",
     "Active call": "Aktīvs zvans",
     "bold": "trekns",
     "italic": "itāļu",
@@ -624,14 +549,6 @@
     "quote": "citāts",
     "bullet": "lode",
     "numbullet": "lode ar numuru",
-    "were invited": "kur uzaicināts/a",
-    "was invited": "tika uzaicināts/a",
-    "were banned": "kur liegta pieeja (bans)",
-    "was banned": "tika liegta pieeja (banots)",
-    "were unbanned": "kur atcelts pieejas liegums (atbanots)",
-    "was unbanned": "tika atcelts pieejas liegums (atbanots)",
-    "were kicked": "kur tika \"izsperts\" (kick)",
-    "was kicked": "tika izsperts/a (kick)",
     "Please select the destination room for this message": "Lūdzu izvēlies šīs ziņas mērķa istabu",
     "Room directory": "Istabu katalogs",
     "Start chat": "Uzsākt čatu",
@@ -689,7 +606,6 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tu vari arī iestatīt īpašu identitātes serveri, bet tas parasti liedz iespēju mijiedarboties ar lietotājiem, kuri izmanto epasta adresi.",
     "Please check your email to continue registration.": "Lūdzu pārbaudi savu epastu lai turpinātu reģistrāciju.",
     "Token incorrect": "Nepareizs autentifikācijas kods",
-    "A text message has been sent to": "Teksta ziņa tika nosūtīta",
     "Please enter the code it contains:": "Lūdzu ievadi tajā ietverto kodu:",
     "powered by Matrix": "spēcināts ar Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ja Tu nenorādīsi epasta adresi, tev nebūs iespējams izmantot paroles atiestatīšanu. Vai esi pārliecināts/a?",
@@ -703,8 +619,6 @@
     "Error decrypting video": "Kļūda atšifrējot video",
     "Add an Integration": "Pievienot integrāciju",
     "Removed or unknown message type": "Dzēsts vai nezināms ziņas veids",
-    "Disable URL previews by default for participants in this room": "Atspējot pēc noklusējuma URL adrešu priekšskatījumu istabas dalībniekiem",
-    "Disable URL previews for this room (affects only you)": "Atspējot URL adrešu priekšskatījumu šajā istabā (attiecas vienīgi uz tevi)",
     "URL Previews": "URL adrešu priekšskatījumi",
     "Drop file here to upload": "Ievelc failu šeit lai augšuplādētu",
     " (unsupported)": " (netiek atbalstīts)",
@@ -744,7 +658,6 @@
     "Enable automatic language detection for syntax highlighting": "Iespējot automātisko valodas noteikšanu sintakses iezīmējumiem",
     "Hide Apps": "Slēpt aplikācijas",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Slēpt pievienoties/pamest ziņas (tas neietekmē uzaicinājumus, vai kick/bana darbības)",
-    "Hide avatar and display name changes": "Slēpt profila attēlu un rādīt redzamā vārda izmaiņas",
     "Integrations Error": "Integrācijas kļūda",
     "Publish this room to the public in %(domain)s's room directory?": "Publicēt šo istabu publiskajā %(domain)s katalogā?",
     "AM": "AM",
@@ -763,7 +676,6 @@
     "Loading device info...": "Ielādē ierīces informāciju...",
     "Example": "Piemērs",
     "Create": "Izveidot",
-    "Room creation failed": "Neizdevās izveidot istabu",
     "Featured Rooms:": "Ieteiktās istabas:",
     "Featured Users:": "Ieteiktie lietotāji:",
     "Automatically replace plain text Emoji": "Automātiski aizvieto tekstu ar emocijikonu (emoji)",
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 586f145642..2deda25ee0 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -4,7 +4,6 @@
     "Create new room": "പുതിയ റൂം സൃഷ്ടിക്കുക",
     "Custom Server Options": "കസ്റ്റം സെര്‍വര്‍ ഓപ്ഷനുകള്‍",
     "Dismiss": "ഒഴിവാക്കുക",
-    "Drop here %(toAction)s": "ഇവിടെ നിക്ഷേപിക്കുക %(toAction)s",
     "Error": "എറര്‍",
     "Failed to forget room %(errCode)s": "%(errCode)s റൂം ഫോര്‍ഗെറ്റ് ചെയ്യുവാന്‍ സാധിച്ചില്ല",
     "Favourite": "പ്രിയപ്പെട്ടവ",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 2d0aa65c4c..f440e128cb 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -11,14 +11,10 @@
     "Algorithm": "Algoritme",
     "Always show message timestamps": "Laat altijd tijdstempels van berichten zien",
     "Authentication": "Authenticatie",
-    "%(items)s and %(remaining)s others": "%(items)s en %(remaining)s andere",
-    "%(items)s and one other": "%(items)s en één andere",
     "%(items)s and %(lastItem)s": "%(items)s en %(lastItem)s",
     "and %(count)s others...|other": "en %(count)s andere...",
     "and %(count)s others...|one": "en één andere...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s en %(lastPerson)s zijn aan het typen",
-    "%(names)s and one other are typing": "%(names)s en één andere zijn aan het typen",
-    "An email has been sent to": "Er is een e-mail verzonden naar",
     "A new password must be entered.": "Er moet een nieuw wachtwoord worden ingevoerd.",
     "%(senderName)s answered the call.": "%(senderName)s heeft deelgenomen aan het audiogesprek.",
     "An error has occurred.": "Er is een fout opgetreden.",
@@ -66,7 +62,6 @@
     "Continue": "Doorgaan",
     "Could not connect to the integration server": "Mislukt om te verbinden met de integratieserver",
     "Cancel": "Annuleren",
-    "a room": "een ruimte",
     "Accept": "Accepteren",
     "Active call (%(roomName)s)": "Actief gesprek (%(roomName)s)",
     "Add": "Toevoegen",
@@ -92,7 +87,6 @@
     "Create new room": "Een nieuwe ruimte maken",
     "Custom Server Options": "Aangepaste serverinstellingen",
     "Dismiss": "Afwijzen",
-    "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen",
     "Error": "Fout",
     "Failed to forget room %(errCode)s": "Ruimte vergeten mislukt %(errCode)s",
     "Favourite": "Favoriet",
@@ -108,7 +102,6 @@
     "Search": "Zoeken",
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Wachtwoord wijzigen mislukt. Is uw wachtwoord juist?",
-    "disabled": "uitgeschakeld",
     "Moderator": "Moderator",
     "Must be viewing a room": "Moet een ruimte weergeven",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix-ID",
@@ -218,14 +211,12 @@
     "Custom level": "Aangepast niveau",
     "Deops user with given id": "Ontmachtigd gebruiker met het gegeven ID",
     "Default": "Standaard",
-    "Disable inline URL previews by default": "URL-voorvertoningen standaard uitschakelen",
     "Displays action": "Geeft actie weer",
     "Drop here to tag %(section)s": "Hiernaartoe verplaatsen om %(section)s te etiketteren",
     "Email, name or matrix ID": "E-mail, naam of matrix-ID",
     "Emoji": "Emoji",
     "Enable encryption": "Versleuteling inschakelen",
     "Enable Notifications": "Notificaties inschakelen",
-    "enabled": "ingeschakeld",
     "Encrypted by a verified device": "Versleuteld door een geverifieerd apparaat",
     "Encrypted by an unverified device": "Versleuteld door een niet-geverifieerd apparaat",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Versleutelde berichten zullen nog niet zichtbaar zijn op applicaties die geen versleuteling ondersteunen",
@@ -245,7 +236,6 @@
     "Export E2E room keys": "Exporteer E2E-ruimte-sleutels",
     "Failed to ban user": "Niet gelukt om de gebruiker te verbannen",
     "Failed to change power level": "Niet gelukt om het machtsniveau te wijzigen",
-    "Failed to delete device": "Niet gelukt om het apparaat te verwijderen",
     "Failed to fetch avatar URL": "Niet gelukt om de avatar-URL op te halen",
     "Failed to join room": "Niet gelukt om tot de ruimte toe te treden",
     "Failed to leave room": "Niet gelukt om de ruimte te verlaten",
@@ -330,7 +320,6 @@
     "Markdown is disabled": "Markdown is uitgeschakeld",
     "Markdown is enabled": "Markdown ingeschakeld",
     "matrix-react-sdk version:": "matrix-react-sdk-versie:",
-    "Members only": "Alleen leden",
     "Message not sent due to unknown devices being present": "Bericht niet verzonden doordat er een onbekende apparaten aanwezig zijn",
     "Missing room_id in request": "Het room_id mist in het verzoek",
     "Missing user_id in request": "De user_id mist in het verzoek",
@@ -342,7 +331,6 @@
     "New passwords don't match": "Nieuwe wachtwoorden komen niet overeen",
     "New passwords must match each other.": "Nieuwe wachtwoorden moeten overeenkomen.",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Zodra versleuteling in een ruimte is ingeschakeld kan het niet meer worden uitgeschakeld (kan later wijzigen)",
-    "Once you've followed the link it contains, click below": "Zodra je de link dat het bevat hebt gevolgd, klik hieronder",
     "Only people who have been invited": "Alleen personen die zijn uitgenodigd",
     "Otherwise, <a>click here</a> to send a bug report.": "Klik anders <a>hier</a> om een foutmelding te versturen.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bekijk je e-mail en klik op de link die het bevat. Zodra dit klaar is, klik op verder gaan.",
@@ -356,7 +344,6 @@
     "Report it": "Melden",
     "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.": "Het wachtwoord veranderen betekent momenteel dat alle end-to-endbeveiligingssleutels op alle apparaten veranderen waardoor versleutelde gespreksgeschiedenis onleesbaar wordt, behalve als je eerst de ruimte sleutels exporteert en daarna opnieuw importeert. Dit zal in de toekomst verbeterd worden.",
     "Results from DuckDuckGo": "Resultaten van DuckDuckGo",
-    "Return to app": "Naar de app terugkeren",
     "Return to login screen": "Naar het inlogscherm terugkeren",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot heeft geen permissie om je notificaties te versturen - controleer je browserinstellingen",
     "Riot was not given permission to send notifications - please try again": "Riot heeft geen permissie gekregen om notificaties te versturen - probeer het opnieuw",
@@ -374,15 +361,11 @@
     "Search failed": "Zoeken mislukt",
     "Searches DuckDuckGo for results": "Zoekt op DuckDuckGo voor resultaten",
     "Seen by %(userName)s at %(dateTime)s": "Gezien bij %(userName)s op %(dateTime)s",
-    "Send a message (unencrypted)": "Stuur een bericht (onversleuteld)",
-    "Send an encrypted message": "Stuur een versleuteld bericht",
     "Send anyway": "Alsnog versturen",
     "Sender device information": "Afzenderapparaatinformatie",
     "Send Reset Email": "Stuur Reset-E-mail",
-    "sent an image": "stuurde een afbeelding",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s stuurde een afbeelding.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s stuurde een uitnodiging naar %(targetDisplayName)s om tot de ruimte toe te treden.",
-    "sent a video": "stuurde een video",
     "Server error": "Serverfout",
     "Server may be unavailable or overloaded": "De server kan onbereikbaar of overbelast zijn",
     "Server may be unavailable, overloaded, or search timed out :(": "De server is misschien onbereikbaar, overbelast of het zoeken duurde te lang :(",
@@ -401,19 +384,14 @@
     "Signed Out": "Uitgelogd",
     "Sign in": "Inloggen",
     "Sign out": "Uitloggen",
-    "since the point in time of selecting this option": "sinds het punt in tijd dat deze optie geselecteerd wordt",
-    "since they joined": "sinds ze zijn toegetreden",
-    "since they were invited": "sinds ze zijn uitgenodigd",
     "%(count)s of your messages have not been sent.|other": "Een paar van je berichten zijn niet verstuurd.",
     "Someone": "Iemand",
-    "Sorry, this homeserver is using a login which is not recognised ": "Sorry, deze thuisserver gebruikt een inlogmethode die niet wordt herkend. ",
     "The default role for new room members is": "De standaardrol voor nieuwe ruimteleden is",
     "The main address for this room is": "Het hoofdadres voor deze ruimte is",
     "The phone number entered looks invalid": "Het telefoonnummer dat ingevoerd is ziet er ongeldig uit",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "De versleutelingssleutel die je hebt verstrekt komt overeen met de versleutelingssleutel die je hebt ontvangen van %(userId)s's apparaat %(deviceId)s. Apparaat is gemarkeerd als geverifieerd.",
     "This email address is already in use": "Dit e-mailadres is al in gebruik",
     "This email address was not found": "Dit e-mailadres was niet gevonden",
-    "%(actionVerb)s this person?": "%(actionVerb)s deze persoon?",
     "The email address linked to your account must be entered.": "Het e-mailadres dat met je account verbonden is moet worden ingevoerd.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Het bestand '%(fileName)s' overtreft de maximale bestandsgrootte voor uploads van deze thuisserver",
     "The file '%(fileName)s' failed to upload": "Het is niet gelukt om het bestand '%(fileName)s' te uploaden",
@@ -430,12 +408,8 @@
     "This room": "Deze ruimte",
     "This room is not accessible by remote Matrix servers": "Deze ruimte is niet toegankelijk voor afgelegen Matrix-servers",
     "This room's internal ID is": "Het interne ID van deze ruimte is",
-    "to demote": "om te degraderen",
-    "to favourite": "om aan favorieten toe te voegen",
     "To link to a room it must have <a>an address</a>.": "Om naar een ruimte te linken moet het <a>een adres</a> hebben.",
     "To reset your password, enter the email address linked to your account": "Voer het e-mailadres dat met je account verbonden is in om je wachtwoord opnieuw in te stellen",
-    "to restore": "om te herstellen",
-    "to tag direct chat": "als directe chat etiketteren",
     "To use it, just wait for autocomplete results to load and tab through them.": "Om het te gebruiken, wacht tot de automatisch aangevulde resultaten geladen zijn en tab er doorheen.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Je probeerde een specifiek punt in de tijdlijn van deze ruimte te laden maar je hebt niet de permissie om de desbetreffende berichten te zien.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Het is niet gelukt om een specifiek punt in de tijdlijn van deze ruimte te laden.",
@@ -467,7 +441,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "Aan het uploaden %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s en %(count)s andere aan het uploaden",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s en %(count)s anderen aan het uploaden",
-    "uploaded a file": "Bestand geüpload",
     "Upload avatar": "Avatar uploaden",
     "Upload Failed": "Uploaden Mislukt",
     "Upload Files": "Bestanden Uploaden",
@@ -483,7 +456,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (macht %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Gebruikersnaam ongeldig: %(errMessage)s",
     "Users": "Gebruikers",
-    "User": "Gebruiker",
     "Verification Pending": "Verificatie Uitstaand",
     "Verification": "Verificatie",
     "verified": "geverifieerd",
@@ -553,7 +525,6 @@
     "Room": "Ruimte",
     "Connectivity to the server has been lost.": "De connectiviteit naar de server is verloren.",
     "Sent messages will be stored until your connection has returned.": "Verstuurde berichten zullen opgeslagen worden tot je connectie weer terug is.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Verstuur alle</a> of <a>annuleer alle</a> nu. Je kan ook individuele berichten selecteren om te versturen of te annuleren.",
     "(~%(count)s results)|one": "(~%(count)s resultaat)",
     "(~%(count)s results)|other": "(~%(count)s resultaten)",
     "Active call": "Actief gesprek",
@@ -565,54 +536,6 @@
     "quote": "citaat",
     "bullet": "opsommingsteken",
     "numbullet": "genummerd opsommingsteken",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s zijn %(repeats)s keer toegetreden",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)s is %(repeats)s keer toegetreden",
-    "%(severalUsers)sjoined": "%(severalUsers)s zijn toegretreden",
-    "%(oneUser)sjoined": "%(oneUser)s is toegetreden",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)s zijn %(repeats)s vertrokken",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)s is %(repeats)s vertrokken",
-    "%(severalUsers)sleft": "%(severalUsers)s zijn vertrokken",
-    "%(oneUser)sleft": "%(oneUser)s is vertrokken",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)szijn %(repeats)s toegetreden en weer vertrokken",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s is %(repeats)s keer toegetreden en vertrokken",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s zijn toegetreden en vertrokken",
-    "%(oneUser)sjoined and left": "%(oneUser)s is toegetreden en weer vertrokken",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)s zijn %(repeats)s keer vertrokken en opnieuw toegetreden",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)s is %(repeats)s keer vertrokken en opnieuw toegetreden",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)s zijn vertrokken en opnieuw toegetreden",
-    "%(oneUser)sleft and rejoined": "%(oneUser)s is vertrokken en opnieuw toegetreden",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s hebben hun uitnodiging %(repeats)s keer afgewezen",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)s heeft zijn of haar uitnodiging %(repeats)s keer afgewezen",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)s hebben hun uitnodiging afgewezen",
-    "%(oneUser)srejected their invitation": "%(oneUser)s heeft zijn of haar uitnodiging afgewezen",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)shun uitnodiging is %(repeats)s keer terug getrokken",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)s zijn of haar uitnodiging is %(repeats)s keer terug getrokken",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s hun uitnodiging is terug getrokken",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)szijn of haar uitnodiging is terug getrokken",
-    "were invited %(repeats)s times": "is %(repeats)s keer uitgenodigd",
-    "was invited %(repeats)s times": "was %(repeats)s keer uitgenodigd",
-    "were invited": "waren uitgenodigd",
-    "was invited": "was uitgenodigd",
-    "were banned %(repeats)s times": "waren %(repeats)s keer verbannen",
-    "was banned %(repeats)s times": "was %(repeats)s keer verbannen",
-    "were banned": "waren verbannen",
-    "was banned": "was verbannen",
-    "were unbanned %(repeats)s times": "waren %(repeats)s keer ontbannen",
-    "was unbanned %(repeats)s times": "was %(repeats)s keer ontbannen",
-    "were unbanned": "waren ontbannen",
-    "was unbanned": "was ontbannen",
-    "were kicked %(repeats)s times": "waren er %(repeats)s keer uitgezet",
-    "was kicked %(repeats)s times": "was er %(repeats)s keer uitgezet",
-    "were kicked": "waren er uitgezet",
-    "was kicked": "was er uitgezet",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)s hebben hun naam %(repeats)s keer aangepast",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)s heeft zijn of haar naam %(repeats)s keer aangepast",
-    "%(severalUsers)schanged their name": "%(severalUsers)s hebben hun naam aangepast",
-    "%(oneUser)schanged their name": "%(oneUser)s heeft zijn of haar naam aangepast",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)shebben hun avatar %(repeats)s keer aangepast",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)s heeft zijn of haar avatar %(repeats)s keer aangepast",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)s hebben hun avatar aangepast",
-    "%(oneUser)schanged their avatar": "%(oneUser)s heeft zijn of haar avatar aangepast",
     "Please select the destination room for this message": "Selecteer de destinatie-ruimte voor dit bericht",
     "New Password": "Nieuw wachtwoord",
     "Start automatically after system login": "Start automatisch na systeem-aanmelding",
@@ -674,7 +597,6 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Je kan ook een aangepaste identiteitsserver instellen maar dit zal waarschijnlijk interactie met gebruikers gebaseerd op een e-mailadres voorkomen.",
     "Please check your email to continue registration.": "Bekijk je e-mail om door te gaan met de registratie.",
     "Token incorrect": "Bewijs incorrect",
-    "A text message has been sent to": "Een tekstbericht is verstuurd naar",
     "Please enter the code it contains:": "Voer de code in die het bevat:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Als je geen e-mailadres specificeert zal je niet je wachtwoord kunnen resetten. Weet je het zeker?",
     "You are registering with %(SelectedTeamName)s": "Je registreert je met %(SelectedTeamName)s",
@@ -691,18 +613,10 @@
     "Add an Integration": "Voeg een integratie toe",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Je wordt zo naar een derde-partij-website verbonden zodat je het account kan legitimeren voor gebruik met %(integrationsUrl)s. Wil je doorgaan?",
     "Removed or unknown message type": "Verwijderd of onbekend berichttype",
-    "Disable URL previews by default for participants in this room": "Zet URL-voorvertoningen standaard uit voor deelnemers aan deze ruimte",
-    "Disable URL previews for this room (affects only you)": "Zet URL-voorvertoningen uit voor deze ruimte (heeft alleen effect op jou)",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL-voorvertoningen staan standaard %(globalDisableUrlPreview)s voor deelnemers aan deze ruimte.",
     "URL Previews": "URL-Voorvertoningen",
-    "Enable URL previews for this room (affects only you)": "URL-voorvertoningen in deze ruimte aanzetten (heeft alleen effect op jou)",
     "Drop file here to upload": "Bestand hier laten vallen om te uploaden",
     " (unsupported)": " (niet ondersteund)",
     "Ongoing conference call%(supportedText)s.": "Lopend vergaderingsgesprek %(supportedText)s.",
-    "for %(amount)ss": "voor %(amount)ss",
-    "for %(amount)sm": "voor %(amount)sm",
-    "for %(amount)sh": "voor %(amount)su",
-    "for %(amount)sd": "for %(amount)sd",
     "Online": "Online",
     "Idle": "Afwezig",
     "Offline": "Offline",
@@ -744,7 +658,6 @@
     "Enable automatic language detection for syntax highlighting": "Automatische taaldetectie voor zinsbouwmarkeringen aanzetten",
     "Hide Apps": "Apps verbergen",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Toetreed/verlaat berichten verbergen (uitnodigingen/verwijderingen/verbanningen zullen ongeschonden blijven)",
-    "Hide avatar and display name changes": "Avatar en weergavenaam wijzigingen verbergen",
     "Integrations Error": "Integratiesfout",
     "Publish this room to the public in %(domain)s's room directory?": "Deze ruimte publiekelijk maken in %(domain)s's ruimte catalogus?",
     "AM": "AM",
@@ -764,7 +677,6 @@
     "Loading device info...": "Apparaat info aan het laden...",
     "Example": "Voorbeeld",
     "Create": "Creëer",
-    "Room creation failed": "Het aanmaken van de ruimte is niet gelukt",
     "Featured Rooms:": "Prominente Ruimtes:",
     "Featured Users:": "Prominente Gebruikers:",
     "Automatically replace plain text Emoji": "Automatisch normale tekst vervangen met Emoji",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index b35ab0201d..2ddbf47ce6 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -13,7 +13,6 @@
     "Updates": "Aktualizacje",
     "This image cannot be displayed.": "Ten obrazek nie może zostać wyświetlony.",
     "Default server": "Domyślny serwer",
-    "A text message has been sent to": "Wiadomość tekstowa została wysłana do",
     "Add User": "Dodaj użytkownika",
     "Verify...": "Zweryfikuj...",
     "Unknown Address": "Nieznany adres",
@@ -55,7 +54,6 @@
     "Sun": "Nd",
     "Who can read history?": "Kto może czytać historię?",
     "Warning!": "Uwaga!",
-    "User": "Użytkownik",
     "Users": "Użytkownicy",
     "User name": "Nazwa użytkownika",
     "User ID": "ID użytkownika",
@@ -85,7 +83,6 @@
     "Create an account": "Stwórz konto",
     "Delete": "Usuń",
     "Devices": "Urządzenia",
-    "Drop here %(toAction)s": "Upuść tutaj %(toAction)s",
     "Error": "Błąd",
     "Notifications": "Powiadomienia",
     "Operation failed": "Operacja nieudana",
@@ -102,7 +99,6 @@
     "powered by Matrix": "napędzany przez Matrix",
     "Failed to change password. Is your password correct?": "Zmiana hasła nie powiodła się. Czy Twoje hasło jest poprawne?",
     "Add a topic": "Dodaj temat",
-    "a room": "pokój",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Wysłano wiadomość tekstową do +%(msisdn)s. Proszę wprowadzić kod w niej zawarty",
     "%(targetName)s accepted an invitation.": "%(targetName)s zaakceptował(a) zaproszenie.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s zaakceptował(a) zaproszenie dla %(displayName)s.",
@@ -121,12 +117,8 @@
     "Always show message timestamps": "Zawsze pokazuj znaczniki czasu wiadomości",
     "Authentication": "Uwierzytelnienie",
     "Alias (optional)": "Alias (opcjonalnie)",
-    "%(items)s and %(remaining)s others": "%(items)s i %(remaining)s innych",
-    "%(items)s and one other": "%(items)s i jeszcze jeden",
     "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
     "%(names)s and %(lastPerson)s are typing": "%(names)s i %(lastPerson)s piszą",
-    "%(names)s and one other are typing": "%(names)s i jeszcze ktoś piszą",
-    "An email has been sent to": "Wysłano wiadomość e-mail do",
     "A new password must be entered.": "Musisz wprowadzić nowe hasło.",
     "%(senderName)s answered the call.": "%(senderName)s odebrał połączenie.",
     "An error has occurred.": "Wystąpił błąd.",
@@ -201,8 +193,6 @@
     "Devices will not yet be able to decrypt history from before they joined the room": "Urządzenia nie będą mogły odszyfrowywać historii sprzed dołączenia do pokoju",
     "Direct chats": "Rozmowy bezpośrednie",
     "Disable Notifications": "Wyłącz powiadomienia",
-    "disabled": "wyłączone",
-    "Disable inline URL previews by default": "Domyślnie wyłącz podgląd linków",
     "Disinvite": "Anuluj zaproszenie",
     "Display name": "Wyświetlana nazwa",
     "Displays action": "Wyświetlane akcje",
@@ -221,7 +211,6 @@
     "Enable automatic language detection for syntax highlighting": "Włącz automatyczne rozpoznawanie języka dla podświetlania składni",
     "Enable encryption": "Włącz szyfrowanie",
     "Enable Notifications": "Włącz powiadomienia",
-    "enabled": "włączone",
     "Encrypted by a verified device": "Zaszyfrowane przez zweryfikowane urządzenie",
     "Encrypted by an unverified device": "Zaszyfrowane przez niezweryfikowane urządzenie",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Szyfrowane wiadomości nie są widoczne w programach, które nie implementują szyfrowania",
@@ -241,7 +230,6 @@
     "Export E2E room keys": "Eksportuj klucze E2E pokojów",
     "Failed to ban user": "Nie udało się zbanować użytkownika",
     "Failed to change power level": "Nie udało się zmienić poziomu mocy",
-    "Failed to delete device": "Nie udało się usunąć urządzenia",
     "Failed to fetch avatar URL": "Nie udało się pobrać awatara",
     "Failed to join room": "Nie udało się dołączyć do pokoju",
     "Failed to kick": "Nie udało się wykopać użytkownika",
@@ -276,7 +264,6 @@
     "Deops user with given id": "Usuwa prawa administratora użytkownikowi o danym ID",
     "Guests cannot join this room even if explicitly invited.": "Goście nie mogą dołączać do tego pokoju, nawet jeśli zostali specjalnie zaproszeni.",
     "Hangup": "Rozłącz się",
-    "Hide avatar and display name changes": "Ukryj zmiany awatarów i nazw ekranowych",
     "Hide Text Formatting Toolbar": "Ukryj pasek formatowania tekstu",
     "Home": "Strona startowa",
     "Homeserver is": "Serwer domowy to",
@@ -332,7 +319,6 @@
     "Markdown is disabled": "Markdown jest wyłączony",
     "Markdown is enabled": "Markdown jest włączony",
     "matrix-react-sdk version:": "Wersja matrix-react-sdk:",
-    "Members only": "Tylko dla członków",
     "Message not sent due to unknown devices being present": "Wiadomość nie została wysłana z powodu obecności nieznanych urządzeń",
     "Missing room_id in request": "Brakujące room_id w żądaniu",
     "Missing user_id in request": "Brakujące user_id w żądaniu",
@@ -363,7 +349,6 @@
     "No users have specific privileges in this room": "Żadni użytkownicy w tym pokoju nie mają specyficznych uprawnień",
     "olm version:": "wersja olm:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Po włączeniu szyfrowania w pokoju nie można go ponownie wyłączyć (póki co)",
-    "Once you've followed the link it contains, click below": "Po kliknięciu łącza, które jest tam zawarte kliknij poniżej",
     "Only people who have been invited": "Tylko ludzie, którzy zostali zaproszeni",
     "Otherwise, <a>click here</a> to send a bug report.": "W przeciwnym razie, <a>kliknij tutaj</a> by wysłać raport o błędzie.",
     "Password": "Hasło",
@@ -399,7 +384,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s zażądał grupowego połączenia głosowego VoIP.",
     "Report it": "Zgłoś",
     "Results from DuckDuckGo": "Wyniki z DuckDuckGo",
-    "Return to app": "Wróć do aplikacji",
     "Return to login screen": "Wróć do ekranu logowania",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot nie ma uprawnień, by wysyłać ci powiadomienia - sprawdź ustawienia swojej przeglądarki",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ukryj wiadomości o dołączeniu/opuszczeniu (nie obejmuje zaproszeń/wyrzuceń/banów)",
@@ -421,16 +405,12 @@
     "Search failed": "Wyszukiwanie nie powiodło się",
     "Searches DuckDuckGo for results": "Przeszukaj DuckDuckGo dla wyników",
     "Seen by %(userName)s at %(dateTime)s": "Widziane przez %(userName)s o %(dateTime)s",
-    "Send a message (unencrypted)": "Wyślij wiadomość (nieszyfrowaną)",
-    "Send an encrypted message": "Wyślij szyfrowaną wiadomość",
     "Send anyway": "Wyślij mimo to",
     "Sender device information": "Informacja o urządzeniu nadawcy",
     "Send Invites": "Wyślij zaproszenie",
     "Send Reset Email": "Wyślij e-mail resetujący hasło",
-    "sent an image": "wysłano obraz",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s wysłał obraz.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s wysłał zaproszenie do %(targetDisplayName)s do dołączenia do pokoju.",
-    "sent a video": "wysłał wideo",
     "Server error": "Błąd serwera",
     "Server may be unavailable or overloaded": "Serwer może być niedostępny lub przeciążony",
     "Server may be unavailable, overloaded, or search timed out :(": "Serwer może być niedostępny, przeciążony, lub upłynął czas wyszukiwania :(",
@@ -448,12 +428,8 @@
     "Signed Out": "Wylogowano",
     "Sign in": "Zaloguj",
     "Sign out": "Wyloguj",
-    "since the point in time of selecting this option": "od momentu zaznaczenia tej opcji",
-    "since they joined": "od momentu dołączenia",
-    "since they were invited": "od momentu zaproszenia",
     "%(count)s of your messages have not been sent.|other": "Niektóre z twoich wiadomości nie zostały wysłane.",
     "Someone": "Ktoś",
-    "Sorry, this homeserver is using a login which is not recognised ": "Przepraszamy, ten serwer używa loginu który nie jest rozpoznawany ",
     "Start a chat": "Rozpocznij rozmowę",
     "Start authentication": "Rozpocznij uwierzytelnienie",
     "Start Chat": "Rozpocznij rozmowę",
@@ -467,7 +443,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Podany klucz podpisu odpowiada kluczowi podpisania otrzymanemu z urządzenia %(userId)s %(deviceId)s. Urządzenie oznaczone jako zweryfikowane.",
     "This email address is already in use": "Podany adres e-mail jest już w użyciu",
     "This email address was not found": "Podany adres e-mail nie został znaleziony",
-    "%(actionVerb)s this person?": "%(actionVerb)s tą osobę?",
     "Must be viewing a room": "Musi być w trakcie wyświetlania pokoju",
     "The email address linked to your account must be entered.": "Musisz wpisać adres e-mail połączony z twoim kontem.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Rozmiar folderu '%(fileName)s' przekracza możliwy limit do przesłania na serwer domowy",
@@ -483,11 +458,8 @@
     "This room": "Ten pokój",
     "This room is not accessible by remote Matrix servers": "Ten pokój nie jest dostępny na zdalnych serwerach Matrix",
     "This room's internal ID is": "Wewnętrzne ID tego pokoju to",
-    "to demote": "żeby zmniejszyć priorytet",
     "To get started, please pick a username!": "Aby rozpocząć, wybierz nazwę użytkownika!",
     "To reset your password, enter the email address linked to your account": "Aby zresetować swoje hasło, wpisz adres e-mail powiązany z twoim kontem",
-    "to restore": "żeby przywrócić",
-    "to tag direct chat": "żeby oznaczyć rozmowę bezpośrednią",
     "Turn Markdown off": "Wyłącz Markdown",
     "Turn Markdown on": "Włącz Markdown",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s włączył szyfrowanie użytkownik-użytkownik (algorithm %(algorithm)s).",
@@ -503,7 +475,6 @@
     "Unencrypted room": "Pokój nieszyfrowany",
     "This Home Server does not support login using email address.": "Ten serwer domowy nie obsługuje logowania się poprzez adres e-mail.",
     "This invitation was sent to an email address which is not associated with this account:": "To zaproszenie zostało wysłane na adres e-mail, który nie jest połączony z tym kontem:",
-    "to favourite": "żeby dodać do ulubionych",
     "To use it, just wait for autocomplete results to load and tab through them.": "Żeby z niego skorzystać, należy poczekać na załadowanie się wyników autouzupełnienia i naciskać przycisk \"Tab\", by je przewijać.",
     "Unencrypted message": "Niezaszyfrowana wiadomość",
     "unknown caller": "nieznany dzwoniący",
@@ -517,7 +488,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "Przesyłanie %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Przesyłanie %(filename)s oraz %(count)s innych",
     "Uploading %(filename)s and %(count)s others|other": "Przesyłanie %(filename)s oraz %(count)s innych",
-    "uploaded a file": "przesłał plik",
     "Upload avatar": "Prześlij awatar",
     "Upload Failed": "Błąd przesyłania",
     "Upload Files": "Prześlij pliki",
@@ -613,61 +583,12 @@
     "Make Moderator": "Nadaj uprawnienia moderatora",
     "Make this room private": "Nadaj temu pokojowi charakter prywatny",
     "Sent messages will be stored until your connection has returned.": "Wysłane wiadomości będą przechowywane aż do momentu odzyskania połączenia.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Wyślij ponownie wszystkie</a> lub <a>anuluj wszystkie</a> teraz. Możesz też wybrać poszczególne wiadomości aby wysłać je ponownie lub anulować.",
     "(~%(count)s results)|one": "(~%(count)s wynik)",
     "(~%(count)s results)|other": "(~%(count)s wyników)",
     "Active call": "Aktywna rozmowa",
     "strike": "przekreślenie",
     "bullet": "lista",
     "numbullet": "lista numerowana",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s dołączyli do pokoju %(repeats)s razy",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)s dołączył(a) do pokoju %(repeats)s razy",
-    "%(severalUsers)sjoined": "%(severalUsers)s dołączyli",
-    "%(oneUser)sjoined": "%(oneUser)s dołączył(a)",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)s opuścili pokój %(repeats)s razy",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)s opuścił(a) pokój %(repeats)s razy",
-    "%(severalUsers)sleft": "%(severalUsers)s opuścili pokój",
-    "%(oneUser)sleft": "%(oneUser)s opuścił(a) pokój",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s dołączyli i opuścili pokój %(repeats)s razy",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s dołączył(a) i opuścił(a) pokój %(repeats)s razy",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s dołączyli i opuścili pokój",
-    "%(oneUser)sjoined and left": "%(oneUser)s dołączył(a) i opuścił(a) pokój",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)s opuścili i ponownie dołączyli do pokoju %(repeats)s razy",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)s opuścił(a) i ponownie dołączył(a) do pokoju %(repeats)s razy",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)s opuścili i ponownie dołączyli do pokoju",
-    "%(oneUser)sleft and rejoined": "%(oneUser)s opuścił(a) i dołączył(a) ponownie do pokoju",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s odrzucili swoje zaproszenia %(repeats)s razy",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)sodrzucił swoje zaproszenie %(repeats)s razy",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)sodrzucili swoje zaproszenia",
-    "%(oneUser)srejected their invitation": "%(oneUser)sodrzucił swoje zaproszenie",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)swycofali swoje zaproszenia %(repeats)s razy",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)swycofał swoje zaproszenie %(repeats)s razy",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)swycofali swoje zaproszenia",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)swycofał swoje zaproszenie",
-    "were invited %(repeats)s times": "zostali zaproszeni %(repeats)s razy",
-    "was invited %(repeats)s times": "został(a) zaproszony/a %(repeats)s razy",
-    "were invited": "zostali zaproszeni",
-    "was invited": "został(a) zaproszony/a",
-    "were banned %(repeats)s times": "zostali zablokowani %(repeats)s times",
-    "was banned %(repeats)s times": "został(a) zablokowany/a %(repeats)s razy",
-    "were banned": "zostali zablokowani",
-    "was banned": "został(a) zablokowany/a",
-    "were unbanned %(repeats)s times": "zostali odblokowani %(repeats)s razy",
-    "was unbanned %(repeats)s times": "został(a) odblokowany/a %(repeats)s razy",
-    "were unbanned": "zostali odblokowani",
-    "was unbanned": "został odblokowany",
-    "were kicked %(repeats)s times": "zostali usunięci %(repeats)s razy",
-    "was kicked %(repeats)s times": "został usunięty %(repeats)s razy",
-    "were kicked": "zostali usunięci",
-    "was kicked": "został usunięty",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)s zmienili swoją nazwę %(repeats)s razy",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)s zmienił(a) swoją nazwę %(repeats)s razy",
-    "%(severalUsers)schanged their name": "%(severalUsers)szmienili swoje nazwy",
-    "%(oneUser)schanged their name": "%(oneUser)s zmienił(a) swoją nazwę",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)s zmienili swoje zdjęcia profilowe %(repeats)s razy",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)s zmienił(a) swoje zdjęcie profilowe %(repeats)s razy",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)s zmienili swoje zdjęcia profilowe",
-    "%(oneUser)schanged their avatar": "%(oneUser)s zmienił(a) swoje zdjęcie profilowe",
     "Please select the destination room for this message": "Wybierz pokój docelowy dla tej wiadomości",
     "Start automatically after system login": "Uruchom automatycznie po zalogowaniu się do systemu",
     "Desktop specific": "Specyficzne dla desktopowej aplikacji klienckiej",
@@ -721,14 +642,9 @@
     "Image '%(Body)s' cannot be displayed.": "Obraz '%(Body)s' nie może zostać wyświetlony.",
     "Error decrypting video": "Błąd deszyfrowania wideo",
     "Removed or unknown message type": "Usunięto lub nieznany typ wiadomości",
-    "Disable URL previews by default for participants in this room": "Ustaw podglądy linków na domyślnie wyłączone dla uczestników w tym pokoju",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Próbowano załadować konkretny punkt na osi czasu w tym pokoju, ale nie nie można go znaleźć.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Wyeksportowany plik pozwoli każdej osobie będącej w stanie go odczytać na deszyfrację jakichkolwiek zaszyfrowanych wiadomości, które możesz zobaczyć, tak więc zalecane jest zachowanie ostrożności. Aby w tym pomóc, powinieneś/aś wpisać hasło poniżej; hasło to będzie użyte do zaszyfrowania wyeksportowanych danych. Późniejsze zaimportowanie tych danych będzie możliwe tylko po uprzednim podaniu owego hasła.",
     " (unsupported)": " (niewspierany)",
-    "for %(amount)ss": "za %(amount)s sek",
-    "for %(amount)sm": "%(amount)s min",
-    "for %(amount)sh": "%(amount)s godz",
-    "for %(amount)sd": "%(amount)s dni",
     "Idle": "Bezczynny",
     "Check for update": "Sprawdź aktualizacje",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s zmienił awatar pokoju na <img/>",
@@ -748,7 +664,6 @@
     "Autocomplete Delay (ms):": "Opóźnienie autouzupełniania (ms):",
     "Loading device info...": "Wczytywanie informacji o urządzeniu...",
     "Example": "Przykład",
-    "Room creation failed": "Nie udało się utworzyć pokoju",
     "Drop file here to upload": "Upuść plik tutaj, aby go przesłać",
     "Automatically replace plain text Emoji": "Automatycznie zastępuj tekstowe emotikony",
     "Failed to upload image": "Przesyłanie obrazka nie powiodło się",
@@ -762,10 +677,7 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Możesz również ustawić niestandardowy serwer Identity, ale to z reguły nie pozwala na interakcję z użytkowniki w oparciu o ich adres e-mail.",
     "Identity server URL": "URL serwera Identity",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Za chwilę zostaniesz przekierowany/a na zewnętrzną stronę w celu powiązania Twojego konta z %(integrationsUrl)s. Czy chcesz kontynuować?",
-    "Disable URL previews for this room (affects only you)": "Wyłącz podglądy linków w tym pokoju (dotyczy tylko Ciebie)",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Podglądy linków są domyślnie %(globalDisableUrlPreview)s dla uczestników tego pokoju.",
     "URL Previews": "Podglądy linków",
-    "Enable URL previews for this room (affects only you)": "Włącz podglądy linków w tym pokoju (dotyczy tylko Ciebie)",
     "Ongoing conference call%(supportedText)s.": "Połączenie grupowe %(supportedText)s w toku.",
     "Featured Rooms:": "Wyróżnione pokoje:",
     "Featured Users:": "Wyróżnieni użytkownicy:",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 3ebf23c1ee..5c55b1eddb 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -5,7 +5,6 @@
     "Admin": "Administrador",
     "Advanced": "Avançado",
     "Algorithm": "Algoritmo",
-    "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.",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
@@ -42,7 +41,6 @@
     "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
     "Device ID": "Identificador do dispositivo",
     "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",
-    "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",
@@ -91,7 +89,6 @@
     "Logout": "Sair",
     "Low priority": "Baixa prioridade",
     "Manage Integrations": "Gerenciar integrações",
-    "Members only": "Apenas integrantes da sala",
     "Mobile phone number": "Telefone celular",
     "Moderator": "Moderador/a",
     "Name": "Nome",
@@ -105,7 +102,6 @@
     "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",
     "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'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",
     "Password": "Senha",
     "Passwords can't be empty": "As senhas não podem estar em branco",
@@ -121,7 +117,6 @@
     "Remove Contact Information?": "Remover informação de contato?",
     "Remove": "Remover",
     "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.",
-    "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)",
@@ -129,13 +124,9 @@
     "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 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.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
     "Session ID": "Identificador de sessão",
@@ -144,11 +135,7 @@
     "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",
@@ -169,14 +156,12 @@
     "unknown device": "dispositivo desconhecido",
     "unknown error code": "código de erro 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",
     "User name": "Nome de usuária/o",
     "Users": "Usuários",
-    "User": "Usuária/o",
     "Verification Pending": "Verificação pendente",
     "Verification": "Verificação",
     "verified": "verificado",
@@ -185,10 +170,6 @@
     "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!)",
-    "was banned": "banida/o",
-    "was invited": "convidada/o",
-    "was kicked": "retirada/o da sala",
-    "was unbanned": "des-banida/o",
     "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?",
@@ -223,7 +204,6 @@
     "%(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.",
     "%(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",
     "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
@@ -237,7 +217,6 @@
     "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 para %(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",
@@ -284,10 +263,6 @@
     "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 demote": "para reduzir prioridade",
-    "to favourite": "para favoritar",
-    "to restore": "para restaurar",
-    "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 unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
@@ -326,10 +301,7 @@
     "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
     "Active call": "Chamada ativa",
     "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s",
-    "%(oneUser)schanged their avatar": "%(oneUser)salterou sua imagem pública",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Uma mensagem de texto foi enviada para +%(msisdn)s. Introduza o código de verificação nela contido",
-    "%(items)s and %(remaining)s others": "%(items)s e %(remaining)s outros",
-    "%(items)s and one other": "%(items)s e um outro",
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
     "and %(count)s others...|other": "e %(count)s outros...",
     "and %(count)s others...|one": "e um outro...",
@@ -355,7 +327,6 @@
     "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",
@@ -396,7 +367,6 @@
     "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "The main address for this room is": "O endereço principal desta sala é",
-    "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?",
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "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.",
@@ -419,49 +389,6 @@
     "quote": "citação",
     "bullet": "marcador de lista",
     "numbullet": "marcador de numeração",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s entraram %(repeats)s vezes",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)singressou %(repeats)s vezes",
-    "%(severalUsers)sjoined": "%(severalUsers)singressaram",
-    "%(oneUser)sjoined": "%(oneUser)singressou",
-    "%(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)",
-    "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)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",
     "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
@@ -544,7 +471,6 @@
     "Dismiss": "Descartar",
     "Please check your email to continue registration.": "Por favor, verifique o seu e-mail para continuar o processo de registro.",
     "Token incorrect": "Token incorreto",
-    "A text message has been sent to": "Uma mensagem de texto foi enviada para",
     "Please enter the code it contains:": "Por favor, entre com o código que está na mensagem:",
     "powered by Matrix": "rodando a partir do Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se não especificar um endereço de e-mail, você não poderá redefinir sua senha. Tem certeza?",
@@ -561,10 +487,7 @@
     "Error decrypting video": "Erro ao descriptografar o vídeo",
     "Add an Integration": "Adicionar uma integração",
     "Removed or unknown message type": "Mensagem removida ou de tipo desconhecido",
-    "Disable URL previews by default for participants in this room": "Desabilitar as pré-visualizações de links por padrão para participantes desta sala",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "As pré-visualizações estão %(globalDisableUrlPreview)s por padrão para integrantes desta sala.",
     "URL Previews": "Pré-visualização de links",
-    "Enable URL previews for this room (affects only you)": "Habilitar pré-visualizações de links para esta sala (afeta somente a você)",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
     " (unsupported)": " (não suportado)",
     "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.",
@@ -576,10 +499,7 @@
     "Start automatically after system login": "Iniciar automaticamente ao iniciar o sistema",
     "Desktop specific": "Específico para o app de computadores desktop",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Você será levado agora a um site de terceiros para poder autenticar a sua conta para uso com o serviço %(integrationsUrl)s. Você quer continuar?",
-    "Disable URL previews for this room (affects only you)": "Desabilitar as pré-visualizações de sites para esta sala (afeta apenas a você)",
     "Device already verified!": "Dispositivo já verificado!",
-    "disabled": "desabilitado",
-    "enabled": "habilitado",
     "Export": "Exportar",
     "Guest access is disabled on this Home Server.": "O acesso para visitantes está desabilitado neste Servidor de Base.",
     "Import": "Importar",
@@ -595,10 +515,6 @@
     "Verified key": "Chave verificada",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
-    "for %(amount)ss": "por %(amount)ss",
-    "for %(amount)sm": "por %(amount)sm",
-    "for %(amount)sh": "por %(amount)sh",
-    "for %(amount)sd": "por %(amount)sd",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
@@ -650,7 +566,6 @@
     "Incoming video call from %(name)s": "Chamada de vídeo de %(name)s recebida",
     "Otherwise, <a>click here</a> to send a bug report.": "Caso contrário, <a>clique aqui</a> para enviar um relatório de erros.",
     "To link to a room it must have <a>an address</a>.": "Para produzir um link para uma sala, ela necessita ter <a>um endereço</a>.",
-    "a room": "uma sala",
     "Your home server does not support device management.": "O seu Servidor de Base não suporta o gerenciamento de dispositivos.",
     "Alias (optional)": "Apelido (opcional)",
     "Active call (%(roomName)s)": "Chamada ativa (%(roomName)s)",
@@ -702,7 +617,6 @@
     "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido",
     "Rejoin": "Voltar a participar da sala",
     "Create a new chat or reuse an existing one": "Criar uma nova conversa ou reutilizar alguma já existente",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Reenviar todas</a> ou <a>cancelar todas</a> agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.",
     "Reason: %(reasonText)s": "Justificativa: %(reasonText)s",
     "Home": "Início",
     "Something went wrong!": "Algo deu errado!",
@@ -722,7 +636,6 @@
     "Enable automatic language detection for syntax highlighting": "Ativar deteção automática da linguagem para o destaque da sintaxe",
     "Hide Apps": "Ocultar apps",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada/saída (não afeta convites/expulsões/proibições)",
-    "Hide avatar and display name changes": "Ocultar mudanças de avatar e de nome público",
     "Integrations Error": "Erro de integrações",
     "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala ao público no diretório de salas de %(domain)s's?",
     "AM": "AM",
@@ -765,7 +678,6 @@
     "Loading device info...": "A carregar as informações do dispositivo...",
     "Example": "Exemplo",
     "Create": "Criar",
-    "Room creation failed": "Criação de sala falhou",
     "Featured Rooms:": "Salas em destaque:",
     "Featured Users:": "Utilizadores em destaque:",
     "Automatically replace plain text Emoji": "Substituir Emoji em texto automaticamente",
@@ -788,7 +700,6 @@
     "Add a User": "Adicionar um utilizador",
     "Unknown": "Desconhecido",
     "email address": "endereço de email",
-    "Invites sent": "Convites enviados",
     "Block users on other matrix homeservers from joining this room": "Impede utilizadores de outros servidores base matrix de se juntar a esta sala",
     "Unignore": "Deixar de ignorar",
     "You are now ignoring %(userId)s": "Está agora a ignorar %(userId)s",
@@ -798,7 +709,6 @@
     "Ignores a user, hiding their messages from you": "Ignora um utilizador, deixando de mostrar as mensagens dele",
     "Disable big emoji in chat": "Desativar emojis grandes no chat",
     "Disable Emoji suggestions while typing": "Desativar sugestões de Emoji durante a escrita",
-    "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "Não há ninguém aqui! Gostarias de <a>convidar alguém</a> ou <a>parar avisos sobre a sala vazia</a>?",
     "Remove avatar": "Remover avatar",
     "Banned by %(displayName)s": "Banido por %(displayName)s",
     "Message removed by %(userId)s": "Mensagem removida por %(userId)s",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 557e6fb4d2..817d094422 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -5,7 +5,6 @@
     "Admin": "Administrador/a",
     "Advanced": "Avançado",
     "Algorithm": "Algoritmo",
-    "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.",
     "Anyone who knows the room's link, apart from guests": "Qualquer pessoa que tenha o link da sala, exceto visitantes",
@@ -42,7 +41,6 @@
     "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado",
     "Device ID": "Identificador do dispositivo",
     "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",
-    "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",
@@ -91,7 +89,6 @@
     "Logout": "Sair",
     "Low priority": "Baixa prioridade",
     "Manage Integrations": "Gerenciar integrações",
-    "Members only": "Apenas integrantes da sala",
     "Mobile phone number": "Telefone celular",
     "Moderator": "Moderador/a",
     "Name": "Nome",
@@ -105,7 +102,6 @@
     "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",
     "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'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",
     "Password": "Senha",
     "Passwords can't be empty": "As senhas não podem estar em branco",
@@ -121,7 +117,6 @@
     "Remove Contact Information?": "Remover informação de contato?",
     "Remove": "Remover",
     "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.",
-    "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)",
@@ -129,13 +124,9 @@
     "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 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.": "O servidor pode estar indisponível ou sobrecarregado, ou então você encontrou uma falha no sistema.",
     "Session ID": "Identificador de sessão",
@@ -144,11 +135,7 @@
     "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",
@@ -169,14 +156,12 @@
     "unknown device": "dispositivo desconhecido",
     "unknown error code": "código de erro 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",
     "User name": "Nome de usuária/o",
     "Users": "Usuários",
-    "User": "Usuária/o",
     "Verification Pending": "Verificação pendente",
     "Verification": "Verificação",
     "verified": "verificado",
@@ -185,10 +170,6 @@
     "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!)",
-    "was banned": "banida/o",
-    "was invited": "convidada/o",
-    "was kicked": "retirada/o da sala",
-    "was unbanned": "des-banida/o",
     "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?",
@@ -223,7 +204,6 @@
     "%(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.",
     "%(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",
     "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s removeu %(targetName)s da sala.",
     "Call Timeout": "Tempo esgotado. Chamada encerrada",
@@ -237,7 +217,6 @@
     "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",
@@ -285,10 +264,6 @@
     "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 demote": "para reduzir prioridade",
-    "to favourite": "para favoritar",
-    "to restore": "para restaurar",
-    "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 unbanned %(targetName)s.": "%(senderName)s desfez o banimento de %(targetName)s.",
@@ -328,10 +303,7 @@
     "Sent messages will be stored until your connection has returned.": "Imagens enviadas ficarão armazenadas até que sua conexão seja reestabelecida.",
     "Active call": "Chamada ativa",
     "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
-    "%(oneUser)schanged their avatar": "%(oneUser)salterou sua imagem pública",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Uma mensagem de texto foi enviada para +%(msisdn)s. Gentileza entrar com o código de verificação que contém",
-    "%(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 %(count)s others...|one": "e um outro...",
     "and %(count)s others...|other": "e %(count)s outros...",
@@ -357,7 +329,6 @@
     "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",
@@ -398,7 +369,6 @@
     "%(count)s of your messages have not been sent.|other": "Algumas das suas mensagens não foram enviadas.",
     "Submit": "Enviar",
     "The main address for this room is": "O endereço principal desta sala é",
-    "%(actionVerb)s this person?": "%(actionVerb)s esta pessoa?",
     "This room has no local addresses": "Esta sala não tem endereços locais",
     "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.",
@@ -421,49 +391,6 @@
     "quote": "citação",
     "bullet": "marcador de lista",
     "numbullet": "marcador de numeração",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s ingressaram %(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)",
-    "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)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",
     "Access Token:": "Token de acesso:",
     "Always show message timestamps": "Sempre mostrar as datas das mensagens",
@@ -546,7 +473,6 @@
     "Dismiss": "Descartar",
     "Please check your email to continue registration.": "Por favor, verifique o seu e-mail para continuar o processo de registro.",
     "Token incorrect": "Token incorreto",
-    "A text message has been sent to": "Uma mensagem de texto foi enviada para",
     "Please enter the code it contains:": "Por favor, entre com o código que está na mensagem:",
     "powered by Matrix": "rodando a partir do Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se não especificar um endereço de e-mail, você não poderá redefinir sua senha. Tem certeza?",
@@ -563,10 +489,7 @@
     "Error decrypting video": "Erro ao descriptografar o vídeo",
     "Add an Integration": "Adicionar uma integração",
     "Removed or unknown message type": "Mensagem removida ou de tipo desconhecido",
-    "Disable URL previews by default for participants in this room": "Desabilitar as pré-visualizações de links por padrão para participantes desta sala",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "As pré-visualizações estão %(globalDisableUrlPreview)s por padrão para integrantes desta sala.",
     "URL Previews": "Pré-visualização de links",
-    "Enable URL previews for this room (affects only you)": "Habilitar pré-visualizações de links para esta sala (afeta somente a você)",
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
     " (unsupported)": " (não suportado)",
     "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.",
@@ -578,10 +501,7 @@
     "Start automatically after system login": "Iniciar automaticamente ao iniciar o sistema",
     "Desktop specific": "Específico para o app de computadores desktop",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Você será levado agora a um site de terceiros para poder autenticar a sua conta para uso com o serviço %(integrationsUrl)s. Você quer continuar?",
-    "Disable URL previews for this room (affects only you)": "Desabilitar as pré-visualizações de sites para esta sala (afeta apenas a você)",
     "Device already verified!": "Dispositivo já verificado!",
-    "disabled": "desabilitado",
-    "enabled": "habilitado",
     "Export": "Exportar",
     "Guest access is disabled on this Home Server.": "O acesso para visitantes está desabilitado neste Servidor de Base.",
     "Import": "Importar",
@@ -597,10 +517,6 @@
     "Verified key": "Chave verificada",
     "WARNING: Device already verified, but keys do NOT MATCH!": "ATENÇÃO: O dispositivo já foi verificado, mas as chaves NÃO SÃO IGUAIS!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATENÇÃO: VERIFICAÇÃO DE CHAVE FALHOU! A chave de assinatura para a(o) usuária(o) %(userId)s e dispositivo %(deviceId)s é \"%(fprint)s\", que não é igual à chave fornecida \"%(fingerprint)s\". Isso pode significar que suas comunicações estão sendo interceptadas!",
-    "for %(amount)ss": "por %(amount)ss",
-    "for %(amount)sm": "por %(amount)sm",
-    "for %(amount)sh": "por %(amount)sh",
-    "for %(amount)sd": "por %(amount)sd",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removeu a imagem da sala.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s alterou a imagem da sala %(roomName)s",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s alterou a imagem da sala para <img/>",
@@ -642,7 +558,6 @@
     "Uploading %(filename)s and %(count)s others|other": "Enviando o arquivo %(filename)s e %(count)s outros arquivos",
     "Username invalid: %(errMessage)s": "Nome de usuária(o) inválido: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "Você deve <a>se registrar</a> para poder usar esta funcionalidade",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Reenviar todas</a> ou <a>cancelar todas</a> agora. Você também pode selecionar mensagens individuais que queira reenviar ou cancelar.",
     "Create new room": "Criar nova sala",
     "Room directory": "Lista pública de salas",
     "Start chat": "Iniciar conversa",
@@ -657,7 +572,6 @@
     "Something went wrong!": "Algo deu errado!",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será seu nome de conta no Servidor de Base <span></span>, ou então você pode escolher um <a>servidor diferente</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Se você já tem uma conta Matrix, pode também fazer <a>login</a>.",
-    "a room": "uma sala",
     "Accept": "Aceitar",
     "Active call (%(roomName)s)": "Chamada ativa (%(roomName)s)",
     "Admin Tools": "Ferramentas de administração",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index ae7bd8babe..199dc5cbd4 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -5,7 +5,6 @@
     "Admin": "Администратор",
     "Advanced": "Дополнительно",
     "Algorithm": "Алгоритм",
-    "An email has been sent to": "Email был отправлен",
     "A new password must be entered.": "Введите новый пароль.",
     "Anyone who knows the room's link, apart from guests": "Любой, кто знает ссылку на комнату, кроме гостей",
     "Anyone who knows the room's link, including guests": "Любой, кто знает ссылку на комнату, включая гостей",
@@ -38,7 +37,6 @@
     "Deops user with given id": "Снимает полномочия оператора с пользователя с заданным ID",
     "Device ID": "ID устройства",
     "Devices will not yet be able to decrypt history from before they joined the room": "Устройства пока не могут дешифровать историю до их входа в комнату",
-    "Disable inline URL previews by default": "Отключить предпросмотр URL-адресов по умолчанию",
     "Display name": "Отображаемое имя",
     "Displays action": "Отображение действий",
     "Ed25519 fingerprint": "Ed25519 отпечаток",
@@ -83,7 +81,6 @@
     "Logout": "Выйти",
     "Low priority": "Низкий приоритет",
     "Manage Integrations": "Управление интеграциями",
-    "Members only": "Только участники",
     "Mobile phone number": "Номер мобильного телефона",
     "Moderator": "Модератор",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
@@ -105,7 +102,6 @@
     "Remove": "Удалить",
     "Return to login screen": "Вернуться к экрану входа",
     "Send Reset Email": "Отправить письмо со ссылкой для сброса пароля",
-    "sent an image": "отправил изображение",
     "Settings": "Настройки",
     "Start a chat": "Начать чат",
     "Start Chat": "Начать чат",
@@ -118,14 +114,12 @@
     "unknown device": "неизвестное устройство",
     "unknown error code": "неизвестный код ошибки",
     "Upload avatar": "Загрузить аватар",
-    "uploaded a file": "отправил(а) файл",
     "Upload Files": "Отправка файлов",
     "Upload file": "Отправка файла",
     "User ID": "ID пользователя",
     "User Interface": "Пользовательский интерфейс",
     "User name": "Имя пользователя",
     "Users": "Пользователи",
-    "User": "Пользователь",
     "Verification Pending": "В ожидании подтверждения",
     "Verification": "Проверка",
     "verified": "проверенный",
@@ -135,10 +129,6 @@
     "VoIP conference started.": "VoIP-конференция началась.",
     "(warning: cannot be disabled again!)": "(предупреждение: отключить будет невозможно!)",
     "Warning!": "Внимание!",
-    "was banned": "был(а) заблокирован(а)",
-    "was invited": "был приглашен",
-    "was kicked": "был выгнан",
-    "was unbanned": "был(а) разблокирован(а)",
     "Who can access this room?": "Кто может получить доступ к этой комнате?",
     "Who can read history?": "Кто может читать историю?",
     "Who would you like to add to this room?": "Кого бы вы хотели добавить в эту комнату?",
@@ -153,7 +143,6 @@
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s принял приглашение от %(displayName)s.",
     "Active call": "Активный вызов",
     "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s печатает",
-    "%(names)s and one other are typing": "%(names)s и другой печатают",
     "%(senderName)s answered the call.": "%(senderName)s ответил на звонок.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s заблокировал(а) %(targetName)s.",
     "Call Timeout": "Время ожидания вызова",
@@ -167,7 +156,6 @@
     "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": "Текущий вызов",
@@ -240,7 +228,6 @@
     "Fri": "Пт",
     "Sat": "Сб",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Ваш адрес email, кажется, не связан с Matrix ID на этом домашнем сервере.",
-    "to tag direct chat": "отметить прямой чат",
     "To use it, just wait for autocomplete results to load and tab through them.": "Для того, чтобы использовать эту функцию, просто подождите автозаполнения результатов, а затем используйте клавишу TAB для прокрутки.",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включено сквозное шифрование (algorithm %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s разблокировал(а) %(targetName)s.",
@@ -270,15 +257,12 @@
     "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": "Не удалось войти в комнату",
     "Access Token:": "Токен доступа:",
     "Always show message timestamps": "Всегда показывать временные метки сообщений",
     "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",
     "An error has occurred.": "Произошла ошибка.",
     "Attachment": "Вложение",
@@ -333,7 +317,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s хочет начать VoIP-конференцию.",
     "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.": "Сброс пароля на данный момент сбрасывает ключи шифрования на всех устройствах, делая зашифрованную историю чатов нечитаемой. Чтобы избежать этого, экспортируйте ключи комнат и импортируйте их после сброса пароля. В будущем это будет исправлено.",
-    "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:",
@@ -345,19 +328,13 @@
     "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.": "%(senderName)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": "с момента приглашения",
     "%(count)s of your messages have not been sent.|other": "Некоторые сообщения не были отправлены.",
     "Someone": "Кто-то",
     "Submit": "Отправить",
@@ -376,9 +353,6 @@
     "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 этой комнаты",
-    "to demote": "для понижения уровня доступа",
-    "to favourite": "для избранного",
-    "to restore": "восстановить",
     "Turn Markdown off": "Выключить Markdown",
     "Turn Markdown on": "Включить Markdown",
     "Unknown room %(roomId)s": "Неизвестная комната %(roomId)s",
@@ -396,46 +370,6 @@
     "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 изменил свой ававтар",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не удается подключиться к домашнему серверу через HTTP, так как в адресной строке браузера указан URL HTTPS. Используйте HTTPS или <a>либо включите небезопасные сценарии</a>.",
     "Dismiss": "Отклонить",
     "Custom Server Options": "Настраиваемые параметры сервера",
@@ -474,10 +408,8 @@
     "Device ID:": "ID устройства:",
     "device id: ": "ID устройства: ",
     "Device key:": "Ключ устройства:",
-    "disabled": "отключено",
     "Email address": "Адрес email",
     "Email address (optional)": "Адрес email (необязательно)",
-    "enabled": "включено",
     "Error decrypting attachment": "Ошибка при расшифровке вложения",
     "Export": "Экспорт",
     "Failed to set avatar.": "Не удалось установить аватар.",
@@ -488,7 +420,6 @@
     "Jump to first unread message.": "Перейти к первому непрочитанному сообщению.",
     "Message not sent due to unknown devices being present": "Сообщение не отправлено из-за присутствия неизвестных устройств",
     "Mobile phone number (optional)": "Номер мобильного телефона (не обязательно)",
-    "Once you've followed the link it contains, click below": "После перехода по ссылке, нажмите на кнопку ниже",
     "Password:": "Пароль:",
     "Privacy warning": "Предупреждение о конфиденциальности",
     "Privileged Users": "Привилегированные пользователи",
@@ -510,10 +441,8 @@
     "%(senderName)s set a profile picture.": "%(senderName)s установил изображение профиля.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s изменил отображаемое имя на %(displayName)s.",
     "Signed Out": "Выполнен выход",
-    "Sorry, this homeserver is using a login which is not recognised ": "К сожалению, этот домашний сервер использует неизвестный метод авторизации ",
     "Tagged as: ": "Теги: ",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Предоставленный ключ подписи соответствует ключу, полученному от %(userId)s с устройства %(deviceId)s. Устройство помечено как проверенное.",
-    "%(actionVerb)s this person?": "%(actionVerb)s этот человек?",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файл '%(fileName)s' превышает предельный размер, допустимый к отправке на этом домашнем сервере",
     "This Home Server does not support login using email address.": "Этот домашний сервер не поддерживает авторизацию с использованием адреса электронной почты.",
     "The visibility of existing history will be unchanged": "Видимость существующей истории не изменится",
@@ -534,10 +463,6 @@
     "You need to enter a user name.": "Необходимо ввести имя пользователя.",
     "You seem to be in a call, are you sure you want to quit?": "Звонок не завершен, вы уверены, что хотите выйти?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Вы не сможете отменить это изменение, так как этот пользователь получит уровень доступа, аналогичный вашему.",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s отозвали свои приглашения %(repeats)s раз",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)s отозвал свои приглашения %(repeats)s раз",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s отозвали свои приглашения",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)s отозвал свое приглашение",
     "Please select the destination room for this message": "Выберите комнату для отправки этого сообщения",
     "Options": "Настройки",
     "Passphrases must match": "Пароли должны совпадать",
@@ -592,7 +517,6 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Вы также можете установить другой сервер идентификации, но это, как правило, будет препятствовать взаимодействию с пользователями на основе адреса email.",
     "Please check your email to continue registration.": "Проверьте электронную почту, чтобы продолжить регистрацию.",
     "Token incorrect": "Неверный токен",
-    "A text message has been sent to": "Текстовое сообщение отправлено",
     "Please enter the code it contains:": "Введите полученный код:",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Если адрес email не указан, сброс пароля будет невозможным. Уверены?",
     "You are registering with %(SelectedTeamName)s": "Вы регистрируетесь на %(SelectedTeamName)s",
@@ -609,21 +533,13 @@
     "Add an Integration": "Добавить интеграцию",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Вы будете пернаправлены на внешний сайт, где сможете аутентифицировать свою учетную запись для использования с %(integrationsUrl)s. Продолжить?",
     "Removed or unknown message type": "Удалено или неизвестный тип сообщения",
-    "Disable URL previews by default for participants in this room": "Отключить предпросмотр URL-адресов по умолчанию для участников этой комнаты",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Предварительный просмотр URL-адресов %(globalDisableUrlPreview)s по умолчанию для участников этой комнаты.",
     "URL Previews": "Предварительный просмотр URL-адресов",
-    "Enable URL previews for this room (affects only you)": "Включить предпросмотр URL-адресов для этой комнаты (касается только вас)",
     "Drop file here to upload": "Перетащите файл сюда для отправки",
     " (unsupported)": " (не поддерживается)",
     "Ongoing conference call%(supportedText)s.": "Установлен групповой вызов %(supportedText)s.",
-    "for %(amount)ss": "уже %(amount)sсек",
-    "for %(amount)sm": "уже %(amount)sмин",
-    "for %(amount)sh": "уже %(amount)sчас",
-    "for %(amount)sd": "уже %(amount)sдн",
     "Online": "В сети",
     "Idle": "Неактивен",
     "Offline": "Не в сети",
-    "Disable URL previews for this room (affects only you)": "Отключить предпросмотр URL-адресов для этой комнаты (касается только вас)",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s сменил аватар комнаты на <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s удалил аватар комнаты.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s сменил аватар для %(roomName)s",
@@ -641,7 +557,6 @@
     "Uploading %(filename)s and %(count)s others|other": "Отправка %(filename)s и %(count)s других",
     "Username invalid: %(errMessage)s": "Неверное имя пользователя: %(errMessage)s",
     "You must <a>register</a> to use this functionality": "Вы должны <a>зарегистрироваться</a>, чтобы использовать эту функцию",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Отправить все</a> или <a>отменить отправку</a>. Также можно выбрать отдельные сообщения для повторной отправки или отмены.",
     "New Password": "Новый пароль",
     "Start chatting": "Начать общение",
     "Start Chatting": "Начать общение",
@@ -654,7 +569,6 @@
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Это будет имя вашей учетной записи на  <span></span> домашнем сервере, или вы можете выбрать <a>другой сервер</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Если у вас уже есть учетная запись Matrix, вы можете <a>войти</a>.",
     "Home": "Старт",
-    "a room": "комната",
     "Accept": "Принять",
     "Active call (%(roomName)s)": "Активный вызов (%(roomName)s)",
     "Admin Tools": "Инструменты администратора",
@@ -744,7 +658,6 @@
     "Enable automatic language detection for syntax highlighting": "Включить автоматическое определение языка для подсветки синтаксиса",
     "Hide Apps": "Скрыть приложения",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Скрыть сообщения о входе/выходе (не применяется к приглашениям/выкидываниям/банам)",
-    "Hide avatar and display name changes": "Скрыть сообщения об изменении аватаров и отображаемых имен",
     "Integrations Error": "Ошибка интеграции",
     "AM": "AM",
     "PM": "PM",
@@ -763,7 +676,6 @@
     "Loading device info...": "Загрузка информации об устройстве...",
     "Example": "Пример",
     "Create": "Создать",
-    "Room creation failed": "Не удалось создать комнату",
     "Featured Rooms:": "Рекомендуемые комнаты:",
     "Featured Users:": "Избранные пользователи:",
     "Automatically replace plain text Emoji": "Автоматически заменять обычный текст на Emoji",
@@ -814,10 +726,8 @@
     "Failed to invite the following users to %(groupId)s:": "Не удалось пригласить следующих пользователей в %(groupId)s:",
     "Failed to remove '%(roomName)s' from %(groupId)s": "Не удалось удалить '%(roomName)s' из %(groupId)s",
     "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Вы действительно хотите удалить '%(roomName)s' из %(groupId)s?",
-    "Invites sent": "Приглашение отправлено",
     "Jump to read receipt": "Перейти к подтверждению о прочтении",
     "Disable big emoji in chat": "Отключить большие emoji в чате",
-    "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "Больше никого нет! Хотите <a>пригласить кого-нибудь</a> или <a>отключить уведомление о пустой комнате</a>?",
     "Message Pinning": "Закрепление сообщений",
     "Remove avatar": "Удалить аватар",
     "Failed to invite users to %(groupId)s": "Не удалось пригласить пользователей в %(groupId)s",
@@ -854,8 +764,6 @@
     "World readable": "Доступно всем",
     "Guests can join": "Гости могут присоединиться",
     "No rooms to show": "Нет комнат для отображения",
-    "Community Member Settings": "Настройки участников сообщества",
-    "Publish this community on your profile": "Опубликовать это сообщество в вашем профиле",
     "Long Description (HTML)": "Длинное описание (HTML)",
     "Community Settings": "Настройки сообщества",
     "Invite to Community": "Пригласить в сообщество",
@@ -865,16 +773,11 @@
     "Who would you like to add to this community?": "Кого бы вы хотели добавить в это сообщество?",
     "Invite new community members": "Пригласить новых членов сообщества",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Предупреждение: любой, кого вы добавляете в сообщество, будет виден всем, кто знает ID сообщества",
-    "Warning: any room you add to a community will be publicly visible to anyone who knows the community ID": "Предупреждение: любая комната, добавляемая в сообщество, будет видна всем, кто знает ID сообщества",
     "Add rooms to this community": "Добавить комнаты в это сообщество",
-    "Your community invitations have been sent.": "Ваши приглашения в сообщество были отправлены.",
     "Failed to invite users to community": "Не удалось пригласить пользователей в сообщество",
     "Communities": "Сообщества",
     "Invalid community ID": "Недопустимый ID сообщества",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' - недействительный ID сообщества",
-    "Related Communities": "Связанные сообщества",
-    "Related communities for this room:": "Связанные сообщества для этой комнаты:",
-    "This room has no related communities": "Эта комната не имеет связанных сообществ",
     "New community ID (e.g. +foo:%(localDomain)s)": "Новый ID сообщества (напр. +foo:%(localDomain)s)",
     "Remove from community": "Удалить из сообщества",
     "Failed to remove user from community": "Не удалось удалить пользователя из сообщества",
@@ -882,7 +785,6 @@
     "Filter community rooms": "Фильтр комнат сообщества",
     "Failed to remove room from community": "Не удалось удалить комнату из сообщества",
     "Removing a room from the community will also remove it from the community page.": "Удаление комнаты из сообщества также удалит ее со страницы сообщества.",
-    "Community IDs may only contain alphanumeric characters": "ID сообщества могут содержать только буквенно-цифровые символы",
     "Create Community": "Создать сообщество",
     "Community Name": "Имя сообщества",
     "Community ID": "ID сообщества",
@@ -912,7 +814,6 @@
     "Message removed": "Сообщение удалено",
     "Mirror local video feed": "Зеркальное отображение видео",
     "Invite": "Пригласить",
-    "Remove this room from the community": "Удалить эту комнату из сообщества",
     "Mention": "Упоминание",
     "Failed to withdraw invitation": "Не удалось отозвать приглашение",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ID сообществ могут содержать только символы a-z, 0-9, или '=_-./'",
@@ -1019,7 +920,6 @@
     "%(duration)sh": "%(duration)sчас",
     "%(duration)sd": "%(duration)sдн",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "У вашего сообщества нет подробного описания HTML-страницы для показа участникам.<br />Щелкните здесь, чтобы открыть параметры и добавить его!",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Переотправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для повторной отправки или отмены.",
     "Online for %(duration)s": "В сети %(duration)s",
     "Offline for %(duration)s": "Не в сети %(duration)s",
     "Idle for %(duration)s": "Неактивен %(duration)s",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 810e9bc911..0126299f9f 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -62,7 +62,6 @@
     "This email address was not found": "Túto emailovú adresu sa nepodarilo nájsť",
     "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Zdá sa, že vaša emailová adresa nie je priradená k žiadnemu Matrix ID na tomto domovskom servery.",
     "Default": "Predvolené",
-    "User": "Používateľ",
     "Moderator": "Moderátor",
     "Admin": "Správca",
     "Start a chat": "Začať konverzáciu",
@@ -198,7 +197,6 @@
     "Last seen": "Naposledy aktívne",
     "Failed to set display name": "Nepodarilo sa nastaviť zobrazované meno",
     "Authentication": "Overenie",
-    "Failed to delete device": "Nepodarilo sa vymazať zariadenie",
     "Delete": "Vymazať",
     "Disable Notifications": "Zakázať oznámenia",
     "Enable Notifications": "Povoliť oznámenia",
@@ -270,8 +268,6 @@
     "Show Apps": "Zobraziť aplikácie",
     "Upload file": "Nahrať súbor",
     "Show Text Formatting Toolbar": "Zobraziť lištu formátovania textu",
-    "Send an encrypted message": "Odoslať šifrovanú správu",
-    "Send a message (unencrypted)": "Odoslať správu (nešifrovanú)",
     "You do not have permission to post to this room": "Nemáte udelené právo posielať do tejto miestnosti",
     "Turn Markdown on": "Povoliť Markdown",
     "Turn Markdown off": "Zakázať Markdown",
@@ -294,10 +290,6 @@
     "No pinned messages.": "Žiadne pripnuté správy.",
     "Loading...": "Načítanie...",
     "Pinned Messages": "Pripnuté správy",
-    "for %(amount)ss": "na %(amount)ss",
-    "for %(amount)sm": "na %(amount)sm",
-    "for %(amount)sh": "na %(amount)sh",
-    "for %(amount)sd": "na %(amount)sd",
     "Online": "Prítomný",
     "Idle": "Nečinný",
     "Offline": "Nedostupný",
@@ -425,19 +417,10 @@
     "New address (e.g. #foo:%(localDomain)s)": "Nová adresa (napr. #foo:%(localDomain)s)",
     "Invalid community ID": "Nesprávne ID komunity",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nie je platným ID komunity",
-    "Related Communities": "Súvisiace komunity",
-    "Related communities for this room:": "Komunity spojené s touto miestnosťou:",
-    "This room has no related communities": "Pre túto miestnosť nie sú žiadne súvisiace komunity",
     "New community ID (e.g. +foo:%(localDomain)s)": "Nové ID komunity (napr. +foo:%(localDomain)s)",
-    "Disable URL previews by default for participants in this room": "Predvolene zakázať náhľady URL adries pre členov tejto miestnosti",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "Náhľady URL adries sú predvolene %(globalDisableUrlPreview)s pre členov tejto miestnosti.",
-    "disabled": "zakázané",
-    "enabled": "povolené",
     "You have <a>disabled</a> URL previews by default.": "Predvolene máte <a>zakázané</a> náhľady URL adries.",
     "You have <a>enabled</a> URL previews by default.": "Predvolene máte <a>povolené</a> náhľady URL adries.",
     "URL Previews": "Náhľady URL adries",
-    "Enable URL previews for this room (affects only you)": "Povoliť náhľady URL adries pre túto miestnosť (ovplyvňuje len vás)",
-    "Disable URL previews for this room (affects only you)": "Zakázať náhľady URL adries pre túto miestnosť (ovplyvňuje len vás)",
     "Error decrypting audio": "Chyba pri dešifrovaní zvuku",
     "Error decrypting attachment": "Chyba pri dešifrovaní prílohy",
     "Decrypt %(text)s": "Dešifrovať %(text)s",
@@ -701,8 +684,6 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s vás pozval vstúpiť do tejto komunity",
     "You are an administrator of this community": "Ste správcom tejto komunity",
     "You are a member of this community": "Ste členom tejto komunity",
-    "Community Member Settings": "Nastavenia členstva v komunite",
-    "Publish this community on your profile": "Uverejniť túto komunitu vo vašom profile",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Vaša komunita nemá vyplnený dlhý popis, ktorý tvorí stránku komunity viditeľnú jej členom.<br />Kliknutím sem otvoríte nastavenia, kde ho môžete vyplniť!",
     "Long Description (HTML)": "Dlhý popis (HTML)",
     "Description": "Popis",
@@ -728,11 +709,9 @@
     "Scroll to bottom of page": "Posunúť na spodok stránky",
     "Connectivity to the server has been lost.": "Spojenie so serverom bolo prerušené.",
     "Sent messages will be stored until your connection has returned.": "Odoslané správy ostanú uložené, kým sa spojenie nenadviaže znovu.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>Znovu odoslať všetky</a> alebo <a>zrušiť všetky</a> teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.",
     "%(count)s new messages|other": "%(count)s nových správ",
     "%(count)s new messages|one": "%(count)s nová správa",
     "Active call": "Aktívny hovor",
-    "There's no one else here! Would you like to <a>invite others</a> or <a>stop warning about the empty room</a>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <a>pozvať ďalších</a> alebo <a>prestať upozorňovať na prázdnu miestnosť</a>?",
     "You seem to be uploading files, are you sure you want to quit?": "Zdá sa, že práve nahrávate súbory, ste si istí, že chcete skončiť?",
     "You seem to be in a call, are you sure you want to quit?": "Zdá sa, že máte prebiehajúci hovor, ste si istí, že chcete skončiť?",
     "%(count)s of your messages have not been sent.|other": "Niektoré vaše správy ešte neboli odoslané.",
@@ -763,7 +742,6 @@
     "Always show message timestamps": "Vždy zobrazovať časovú značku správ",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Pri zobrazovaní časových značiek používať 12 hodinový formát (napr. 2:30pm)",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Skryť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykopnutí/zákazov vstupu)",
-    "Hide avatar and display name changes": "Skriť zmeny zobrazovaného mena a avatara",
     "Use compact timeline layout": "Použiť kompaktné rozloženie časovej osy",
     "Hide removed messages": "Skryť odstránené správy",
     "Enable automatic language detection for syntax highlighting": "Povoliť automatickú detegciu jazyka pre zvýrazňovanie syntaxe",
@@ -791,7 +769,6 @@
     "Interface Language": "Jazyk rozhrania",
     "User Interface": "Používateľské rozhranie",
     "Autocomplete Delay (ms):": "Oneskorenie automatického dokončovania (ms):",
-    "Disable inline URL previews by default": "Predvolene zakázať náhľady URL adries",
     "<not supported>": "<nepodporované>",
     "Import E2E room keys": "Importovať E2E kľúče miestností",
     "Cryptography": "Kryptografia",
@@ -861,9 +838,7 @@
     "Error: Problem communicating with the given homeserver.": "Chyba: Nie je možné komunikovať so zadaným domovským serverom.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "K domovskému serveru nie je možné pripojiť sa použitím protokolu HTTP keďže v adresnom riadku prehliadača máte HTTPS adresu. Použite protokol HTTPS alebo <a>povolte nezabezpečené skripty</a>.",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Nie je možné pripojiť sa k domovskému serveru - skontrolujte prosím funkčnosť vašeho pripojenia na internet, uistite sa že <a>certifikát  domovského servera</a> je dôverihodný, a že žiaden doplnok nainštalovaný v prehliadači nemôže blokovať požiadavky.",
-    "Sorry, this homeserver is using a login which is not recognised ": "Prepáčte, tento domovský server používa neznámy spôsob prihlasovania ",
     "Login as guest": "Prihlásiť sa ako hosť",
-    "Return to app": "Vrátiť sa do aplikácie",
     "Failed to fetch avatar URL": "Nepodarilo sa získať URL adresu avatara",
     "Set a display name:": "Nastaviť zobrazované meno:",
     "Upload an avatar:": "Nahrať avatara:",
@@ -941,7 +916,6 @@
     "Custom of %(powerLevel)s": "Vlastná úroveň %(powerLevel)s",
     "URL previews are enabled by default for participants in this room.": "Náhľady URL adries sú predvolene povolené pre členov tejto miestnosti.",
     "URL previews are disabled by default for participants in this room.": "Náhľady URL adries sú predvolene zakázané pre členov tejto miestnosti.",
-    "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.": "<resendText>Znovu odoslať všetky</resendText> alebo <cancelText>Zrušiť všetky</cancelText> teraz. Môžete tiež znovu poslať alebo zrušiť odosielanie jednotlivých správ zvlášť.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Okrem vás v tejto miestnosti nie je nik iný! Želáte si <inviteText>Pozvať ďalších</inviteText> alebo <nowarnText>Prestať upozorňovať na prázdnu miestnosť</nowarnText>?",
     "Call Failed": "Zlyhanie hovoru",
     "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "V tejto miestnosti sú neznáme zariadenia: Ak budete pokračovať bez ich overenia, niekto získa možnosť odpočúvať váš hovor.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index d091ae9d77..59e9d2a899 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -21,14 +21,10 @@
     "Always show message timestamps": "Visa alltid tidsstämpel för meddelanden",
     "Hide removed messages": "Göm raderade meddelanden",
     "Authentication": "Autentisering",
-    "%(items)s and %(remaining)s others": "%(items)s och %(remaining)s andra",
-    "%(items)s and one other": "%(items)s och en annan",
     "%(items)s and %(lastItem)s": "%(items)s och %(lastItem)s",
     "and %(count)s others...|other": "och %(count)s andra...",
     "and %(count)s others...|one": "och en annan...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s och %(lastPerson)s skriver",
-    "%(names)s and one other are typing": "%(names)s och en annan skriver",
-    "An email has been sent to": "Ett epostmeddelande har sänts till",
     "A new password must be entered.": "Ett nytt lösenord måste anges.",
     "%(senderName)s answered the call.": "%(senderName)s svarade på samtalet.",
     "Anyone who knows the room's link, including guests": "Alla som har rummets adress, inklusive gäster",
@@ -101,14 +97,11 @@
     "Devices": "Enheter",
     "Devices will not yet be able to decrypt history from before they joined the room": "Enheter kan inte ännu dekryptera meddelandehistorik från före de gick med i rummet",
     "Direct chats": "Direkta chattar",
-    "disabled": "avstängd",
-    "Disable inline URL previews by default": "Stäng av inline-URL-förhandsvisningar som standard",
     "Disinvite": "Häv inbjudan",
     "Display name": "Namn",
     "Displays action": "Visar handling",
     "Don't send typing notifications": "Sänd inte \"skriver\"-status",
     "Download %(text)s": "Ladda ner %(text)s",
-    "Drop here %(toAction)s": "Dra hit för att %(toAction)s",
     "Drop here to tag %(section)s": "Dra hit för att tagga %(section)s",
     "Ed25519 fingerprint": "Ed25519-fingeravtryck",
     "Email": "Epost",
@@ -117,7 +110,6 @@
     "Email, name or matrix ID": "Epostadress, namn, eller Matrix-ID",
     "Emoji": "Emoji",
     "Enable encryption": "Sätt på kryptering",
-    "enabled": "aktiverat",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Krypterade meddelanden syns inte på klienter som inte ännu stöder kryptering",
     "Encrypted room": "Krypterat rum",
     "%(senderName)s ended the call.": "%(senderName)s avslutade samtalet.",
@@ -133,7 +125,6 @@
     "Failed to ban user": "Det gick inte att banna användaren",
     "Failed to change password. Is your password correct?": "Det gick inte att byta lösenord. Är lösenordet rätt?",
     "Failed to change power level": "Det gick inte att ändra maktnivå",
-    "Failed to delete device": "Det gick inte att radera enhet",
     "Failed to forget room %(errCode)s": "Det gick inte att glömma bort rummet %(errCode)s",
     "Failed to join room": "Det gick inte att gå med i rummet",
     "Failed to kick": "Det gick inte att kicka",
@@ -154,7 +145,6 @@
     "Failed to upload file": "Det gick inte att ladda upp filen",
     "Failed to verify email address: make sure you clicked the link in the email": "Det gick inte att bekräfta epostadressen, klicka på länken i epostmeddelandet",
     "Favourite": "Favorit",
-    "a room": "ett rum",
     "Accept": "Godkänn",
     "Access Token:": "Åtkomsttoken:",
     "Active call (%(roomName)s)": "Aktiv samtal (%(roomName)s)",
@@ -248,7 +238,6 @@
     "Markdown is disabled": "Markdown är inaktiverat",
     "Markdown is enabled": "Markdown är aktiverat",
     "matrix-react-sdk version:": "matrix-react-sdk -version:",
-    "Members only": "Endast medlemmar",
     "Message not sent due to unknown devices being present": "Meddelandet skickades inte eftersom det finns okända enheter i rummet",
     "Missing room_id in request": "room_id saknas i förfrågan",
     "Missing user_id in request": "user_id saknas i förfrågan",
@@ -280,7 +269,6 @@
     "OK": "OK",
     "olm version:": "olm-version:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "När kryptering aktiveras i ett rum kan det inte deaktiveras (tills vidare)",
-    "Once you've followed the link it contains, click below": "När du har följt länken i meddelandet, klicka här",
     "Only people who have been invited": "Endast inbjudna",
     "Operation failed": "Handlingen misslyckades",
     "Otherwise, <a>click here</a> to send a bug report.": "Annars kan du <a>klicka här</a> för att skicka en buggrapport.",
@@ -317,7 +305,6 @@
     "Report it": "Rapportera det",
     "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.": "Om du återställer ditt lösenord kommer alla krypteringsnycklar på alla enheter att återställas, vilket gör krypterad meddelandehistorik oläsbar om du inte först exporterar dina rumsnycklar och sedan importerar dem igen. I framtiden kommer det här att förbättras.",
     "Results from DuckDuckGo": "Resultat från DuckDuckGo",
-    "Return to app": "Tillbaka till appen",
     "Return to login screen": "TIllbaka till login-skärmen",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot har inte tillstånd att skicka aviseringar - kontrollera webbläsarens inställningar",
     "Riot was not given permission to send notifications - please try again": "Riot fick inte tillstånd att skicka aviseringar - försök igen",
@@ -336,16 +323,12 @@
     "Search failed": "Sökning misslyckades",
     "Searches DuckDuckGo for results": "Söker efter resultat på DuckDuckGo",
     "Seen by %(userName)s at %(dateTime)s": "Sedd av %(userName)s %(dateTime)s",
-    "Send a message (unencrypted)": "Skicka ett meddelande (okrypterat)",
-    "Send an encrypted message": "Skicka ett krypterad meddelande",
     "Send anyway": "Skicka ändå",
     "Sender device information": "Sändarens enhetsinformation",
     "Send Invites": "Skicka inbjudningar",
     "Send Reset Email": "Skicka återställningsmeddelande",
-    "sent an image": "skickade en bild",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s skickade en bild.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s bjöd in %(targetDisplayName)s med i rummet.",
-    "sent a video": "skickade en video",
     "Server error": "Serverfel",
     "Server may be unavailable or overloaded": "Servern kan vara otillgänglig eller överbelastad",
     "Server may be unavailable, overloaded, or search timed out :(": "Servern kan vara otillgänglig, överbelastad, eller så timade sökningen ut :(",
@@ -362,12 +345,8 @@
     "Signed Out": "Loggade ut",
     "Sign in": "Logga in",
     "Sign out": "Logga ut",
-    "since the point in time of selecting this option": "från och med att det här alternativet valdes",
-    "since they joined": "från och med att de gick med",
-    "since they were invited": "från och med att de bjöds in",
     "%(count)s of your messages have not been sent.|other": "Vissa av dina meddelanden har inte skickats.",
     "Someone": "Någon",
-    "Sorry, this homeserver is using a login which is not recognised ": "Den här hemsevern använder en login-metod som inte stöds ",
     "Start a chat": "Starta en chatt",
     "Start authentication": "Starta autentisering",
     "Start Chat": "Starta en chatt",
@@ -389,7 +368,6 @@
     "Edit": "Redigera",
     "Enable automatic language detection for syntax highlighting": "Aktivera automatisk språkdetektering för syntaxmarkering",
     "Hide Apps": "Dölj Appar",
-    "Hide avatar and display name changes": "Dölj avatar och visningsnamns ändringar",
     "Integrations Error": "Integrationsfel",
     "Publish this room to the public in %(domain)s's room directory?": "Publicera rummet i den offentliga rumskatalogen på %(domain)s?",
     "AM": "a.m.",
@@ -406,7 +384,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnyckeln du angav matchar signeringsnyckeln som mottogs från enheten %(deviceId)s som tillhör %(userId)s. Enheten är markerad som verifierad.",
     "This email address is already in use": "Den här epostadressen är redan i bruk",
     "This email address was not found": "Den här epostadressen fanns inte",
-    "%(actionVerb)s this person?": "%(actionVerb)s den här personen?",
     "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek",
     "The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunde inte laddas upp"
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index 0ad3c0fd15..ec45eefadf 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -1,6 +1,4 @@
 {
-    "was invited": "తనని ఆహ్వానించారు",
-    "a room": "ఓ గది",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "ఒక టెక్స్ట్ సందేశం +%(msisdn)s కు పంపబడింది. దయచేసి దీనిలో ఉన్న ధృవీకరణ కోడ్ను నమోదు చేయండి",
     "Accept": "అంగీకరించు",
     "%(targetName)s accepted an invitation.": "%(targetName)s ఆహ్వానాన్ని అంగీకరించింది.",
@@ -30,8 +28,6 @@
     "You do not have permission to post to this room": "మీకు ఈ గదికి పోస్ట్ చేయడానికి అనుమతి లేదు",
     "You have been invited to join this room by %(inviterName)s": "%(inviterName)s ఈ గదిలో చేరడానికి మీరు ఆహ్వానించబడ్డారు",
     "Active call (%(roomName)s)": "క్రియాశీల కాల్ల్ (%(roomName)s)",
-    "%(names)s and one other are typing": "%(names)s మరియు మరొకటి టైప్ చేస్తున్నారు",
-    "An email has been sent to": "ఒక ఇమెయిల్ పంపబడింది",
     "A new password must be entered.": "కొత్త పాస్ వర్డ్ ను తప్పక నమోదు చేయాలి.",
     "%(senderName)s answered the call.": "%(senderName)s కు సమాధానం ఇచ్చారు.",
     "An error has occurred.": "ఒక లోపము సంభవించినది.",
@@ -161,7 +157,6 @@
     "Connectivity to the server has been lost.": "సెర్వెర్ కనెక్టివిటీని కోల్పోయారు.",
     "Sent messages will be stored until your connection has returned.": "మీ కనెక్షన్ తిరిగి వచ్చే వరకు పంపిన సందేశాలు నిల్వ చేయబడతాయి.",
     "Cancel": "రద్దు",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a>అన్నీ మళ్లీ పంపు</a>లేదా<a>అన్నింటినీ రద్దు చేయండి</a>ప్పుడు.వ్యక్తిగత సందేశాలను మీరు మళ్ళీ చేసుకోవచ్చు లేదా రద్దు చేసుకోవచ్చు.",
     "bold": "బోల్డ్",
     "italic": "ఇటాలిక్",
     "strike": "సమ్మె",
@@ -172,12 +167,8 @@
     "unknown error code": "తెలియని కోడ్ లోపం",
     "code": "కోడ్",
     "Please enter the code it contains:": "దయచేసి దాన్ని కలిగి ఉన్న కోడ్ను నమోదు చేయండి:",
-    "was unbanned %(repeats)s times": "%(repeats)s అన్ని సార్లు నిషేదించబడలేదు",
-    "was unbanned": "నిషేదించబడలేదు",
     "riot-web version:": "రయట్-వెబ్ సంస్కరణ:",
     "Riot was not given permission to send notifications - please try again": "రయట్ కు ప్రకటనలను పంపడానికి అనుమతి లేదు - దయచేసి మళ్ళీ ప్రయత్నించండి",
-    "Return to app": "అనువర్తనానికి తిరిగి వెళ్ళు",
-    "to restore": "పునరుద్ధరించడానికి",
     "Unable to restore session": "సెషన్ను పునరుద్ధరించడానికి సాధ్యపడలేదు",
     "Report it": "దానిని నివేదించండి",
     "Remove": "తొలగించు",
@@ -185,7 +176,6 @@
     "Create new room": "క్రొత్త గది సృష్టించండి",
     "Custom Server Options": "మలచిన  సేవిక ఎంపికలు",
     "Dismiss": "రద్దుచేసే",
-    "Drop here %(toAction)s": "ఇక్కడ వదలండి %(toAction)s",
     "Error": "లోపం",
     "Favourite": "గుర్తుంచు",
     "Mute": "నిశబ్ధము",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 2cdf7f20a8..9e9e606826 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -22,14 +22,12 @@
     "Download %(text)s": "ดาวน์โหลด %(text)s",
     "Emoji": "อีโมจิ",
     "Enable encryption": "เปิดใช้งานการเข้ารหัส",
-    "enabled": "เปิดใช้งานแล้ว",
     "Error": "ข้อผิดพลาด",
     "Found a bug?": "พบจุดบกพร่อง?",
     "%(displayName)s is typing": "%(displayName)s กำลังพิมพ์",
     "Kick": "เตะ",
     "Low priority": "ความสำคัญต่ำ",
     "matrix-react-sdk version:": "เวอร์ชัน matrix-react-sdk:",
-    "Members only": "สมาชิกเท่านั้น",
     "Mobile phone number": "หมายเลขโทรศัพท์",
     "Mobile phone number (optional)": "หมายเลขโทรศัพท์ (ไม่ใส่ก็ได้)",
     "Name": "ชื่อ",
@@ -40,7 +38,6 @@
     "Reason": "เหตุผล",
     "Register": "ลงทะเบียน",
     "Results from DuckDuckGo": "ผลจาก DuckDuckGo",
-    "Return to app": "กลับไปยังแอป",
     "riot-web version:": "เวอร์ชัน riot-web:",
     "Cancel": "ยกเลิก",
     "Dismiss": "ไม่สนใจ",
@@ -55,7 +52,6 @@
     "Report it": "รายงานเลย",
     "Remove": "ลบ",
     "Custom Server Options": "กำหนดเซิร์ฟเวอร์เอง",
-    "Drop here %(toAction)s": "ปล่อยที่นี่%(toAction)s",
     "Favourite": "รายการโปรด",
     "Failed to forget room %(errCode)s": "การลืมห้องล้มเหลว %(errCode)s",
     "%(targetName)s accepted an invitation.": "%(targetName)s ตอบรับคำเชิญแล้ว",
@@ -69,13 +65,10 @@
     "Algorithm": "อัลกอริทึม",
     "Hide removed messages": "ซ่อนข้อความที่ถูกลบแล้ว",
     "Authentication": "การยืนยันตัวตน",
-    "%(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 %(count)s others...|one": "และอีกหนึ่งผู้ใช้...",
     "and %(count)s others...|other": "และอีก %(count)s ผู้ใช้...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s และ %(lastPerson)s กำลังพิมพ์",
-    "%(names)s and one other are typing": "%(names)s และอีกหนึ่งคนกำลังพิมพ์",
     "%(senderName)s answered the call.": "%(senderName)s รับสายแล้ว",
     "An error has occurred.": "เกิดข้อผิดพลาด",
     "Anyone": "ทุกคน",
@@ -124,7 +117,6 @@
     "Device key:": "Key อุปกรณ์:",
     "Devices will not yet be able to decrypt history from before they joined the room": "อุปกรณ์จะยังไม่สามารถถอดรหัสประวัติแชทก่อนจะเข้าร่วมห้องได้",
     "Direct chats": "แชทตรง",
-    "disabled": "ถูกปิดใช้งาน",
     "Disinvite": "ถอนคำเชิญ",
     "Display name": "ชื่อที่แสดง",
     "Don't send typing notifications": "ไม่แจ้งว่ากำลังพิมพ์",
@@ -141,7 +133,6 @@
     "Export": "ส่งออก",
     "Failed to ban user": "การแบนผู้ใช้ล้มเหลว",
     "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?",
-    "Failed to delete device": "การลบอุปกรณ์ล้มเหลว",
     "Failed to join room": "การเข้าร่วมห้องล้มเหลว",
     "Failed to kick": "การเตะล้มเหลว",
     "Failed to leave room": "การออกจากห้องล้มเหลว",
@@ -209,7 +200,6 @@
     "NOT verified": "ยังไม่ได้ยืนยัน",
     "No more results": "ไม่มีผลลัพธ์อื่น",
     "No results": "ไม่มีผลลัพธ์",
-    "Once you've followed the link it contains, click below": "หลังจากคุณเปิดลิงก์ข้างในแล้ว คลิกข้างล่าง",
     "Passwords can't be empty": "รหัสผ่านต้องไม่ว่าง",
     "People": "บุคคล",
     "Permissions": "สิทธิ์",
@@ -236,13 +226,9 @@
     "Scroll to unread messages": "เลี่ยนไปที่ข้อความที่ยังไม่ได้อ่าน",
     "Search failed": "การค้นหาล้มเหลว",
     "Searches DuckDuckGo for results": "ค้นหาบน DuckDuckGo",
-    "Send a message (unencrypted)": "ส่งข้อความ (ไม่เข้ารหัส)",
-    "Send an encrypted message": "ส่งข้อความที่เข้ารหัสแล้ว",
     "Send Invites": "ส่งคำเชิญ",
-    "sent an image": "ส่งรูป",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ได้ส่งรูป",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ได้ส่งคำเชิญให้ %(targetDisplayName)s เข้าร่วมห้อง",
-    "sent a video": "ส่งวิดิโอ",
     "Server error": "เซิร์ฟเวอร์ผิดพลาด",
     "Server may be unavailable or overloaded": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งานหรือทำงานหนักเกินไป",
     "Server may be unavailable, overloaded, or search timed out :(": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งาน ทำงานหนักเกินไป หรือการค้นหาหมดเวลา :(",
@@ -266,36 +252,27 @@
     "The main address for this room is": "ที่อยู่หลักของห้องนี้คือ",
     "This email address is already in use": "ที่อยู่อีเมลถูกใช้แล้ว",
     "This email address was not found": "ไม่พบที่อยู่อีเมล",
-    "%(actionVerb)s this person?": "%(actionVerb)s บุคคลนี้?",
     "The file '%(fileName)s' failed to upload": "การอัปโหลดไฟล์ '%(fileName)s' ล้มเหลว",
     "This Home Server does not support login using 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 ภายในของห้องนี้คือ",
-    "%(oneUser)schanged their name": "%(oneUser)sเปลี่ยนชื่อของเขาแล้ว",
-    "%(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เปลี่ยนชื่อของพวกเขาแล้ว",
     "Create new room": "สร้างห้องใหม่",
     "Room directory": "ไดเรกทอรีห้อง",
     "Start chat": "เริ่มแชท",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์บ้านผ่านทาง HTTP ได้เนื่องจาก URL ที่อยู่บนเบราว์เซอร์เป็น HTTPS กรุณาใช้ HTTPS หรือ<a>เปิดใช้งานสคริปต์ที่ไม่ปลอดภัย</a>.",
     "%(count)s new messages|one": "มี %(count)s ข้อความใหม่",
     "%(count)s new messages|other": "มี %(count)s ข้อความใหม่",
-    "Disable inline URL previews by default": "ตั้งค่าเริ่มต้นให้ไม่แสดงตัวอย่าง URL ในแชท",
     "End-to-end encryption information": "ข้อมูลการเข้ารหัสจากปลายทางถึงปลายทาง",
     "End-to-end encryption is in beta and may not be reliable": "การเข้ารหัสจากปลายทางถึงปลายทางยังอยู่ในเบต้า และอาจพึ่งพาไม่ได้",
     "Error: Problem communicating with the given homeserver.": "ข้อผิดพลาด: มีปัญหาในการติดต่อกับเซิร์ฟเวอร์บ้านที่กำหนด",
     "Export E2E room keys": "ส่งออกกุญแจถอดรหัส E2E",
     "Failed to change power level": "การเปลี่ยนระดับอำนาจล้มเหลว",
     "Import E2E room keys": "นำเข้ากุญแจถอดรหัส E2E",
-    "to favourite": "เพื่อเพิ่มไปยังรายการโปรด",
-    "to demote": "เพื่อลดขั้น",
     "The default role for new room members is": "บทบาทเริ่มต้นของสมาชิกใหม่คือ",
     "The phone number entered looks invalid": "ดูเหมือนว่าหมายเลขโทรศัพท์ที่กรอกรมาไม่ถูกต้อง",
     "The email address linked to your account must be entered.": "กรุณากรอกที่อยู่อีเมลที่เชื่อมกับบัญชีของคุณ",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "ไฟล์ '%(fileName)s' มีขนาดใหญ่เกินจำกัดของเซิร์ฟเวอร์บ้าน",
-    "to tag direct chat": "เพื่อแทกว่าแชทตรง",
     "Turn Markdown off": "ปิด markdown",
     "Turn Markdown on": "เปิด markdown",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ได้เปิดใช้งานการเข้ารหัสจากปลายทางถึงปลายทาง (อัลกอริทึม%(algorithm)s).",
@@ -316,7 +293,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "กำลังอัปโหลด %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
     "Uploading %(filename)s and %(count)s others|other": "กำลังอัปโหลด %(filename)s และอีก %(count)s ไฟล์",
-    "uploaded a file": "อัปโหลดไฟล์",
     "Upload Failed": "การอัปโหลดล้มเหลว",
     "Upload Files": "อัปโหลดไฟล์",
     "Upload file": "อัปโหลดไฟล์",
@@ -324,7 +300,6 @@
     "User ID": "ID ผู้ใช้",
     "User Interface": "อินเตอร์เฟสผู้ใช้",
     "User name": "ชื่อผู้ใช้",
-    "User": "ผู้ใช้",
     "Warning!": "คำเตือน!",
     "Who can access this room?": "ใครสามารถเข้าถึงห้องนี้ได้?",
     "Who can read history?": "ใครสามารถอ่านประวัติแชทได้?",
@@ -377,10 +352,6 @@
     "underline": "ขีดเส้นใต้",
     "code": "โค๊ด",
     "quote": "อ้างอิง",
-    "were kicked %(repeats)s times": "ถูกเตะ %(repeats)s ครั้ง",
-    "was kicked %(repeats)s times": "ถูกเตะ %(repeats)s ครั้ง",
-    "were kicked": "ถูกเตะ",
-    "was kicked": "ถูกเตะ",
     "New Password": "รหัสผ่านใหม่",
     "Options": "ตัวเลือก",
     "Export room keys": "ส่งออกกุณแจห้อง",
@@ -411,12 +382,7 @@
     "Custom server": "กำหนดเซิร์ฟเวอร์เอง",
     "Home server URL": "URL เซิร์ฟเวอร์บ้าน",
     "Identity server URL": "URL เซิร์ฟเวอร์ระบุตัวตน",
-    "%(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ออกจากห้องแล้ว",
     "Add": "เพิ่ม",
-    "a room": "ห้อง",
     "Accept": "ยอมรับ",
     "VoIP": "VoIP",
     "Close": "ปิด",
@@ -432,7 +398,6 @@
     "(~%(count)s results)|other": "(~%(count)s ผลลัพท์)",
     "Missing Media Permissions, click here to request.": "ไม่มีสิทธิ์เข้าถึงสื่อ, คลิกที่นี่เพื่อขอสิทธิ์",
     "Alias (optional)": "นามแฝง (ไม่ใส่ก็ได้)",
-    "An email has been sent to": "ส่งอีเมลไปแล้วถึง",
     "A new password must be entered.": "กรุณากรอกรหัสผ่านใหม่",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "ไม่สามารถเฃื่อมต่อไปหาเซิร์ฟเวอร์บ้านได้ - กรุณาตรวจสอบคุณภาพการเชื่อมต่อ, ตรวจสอบว่า<a>SSL certificate ของเซิร์ฟเวอร์บ้าน</a>ของคุณเชื่อถือได้, และวไม่มีส่วนขยายเบราว์เซอร์ใดบล๊อคการเชื่อมต่ออยู่",
     "Drop File Here": "วางไฟล์ที่นี่",
@@ -453,7 +418,6 @@
     "To link to a room it must have <a>an address</a>.": "ห้องต้องมี<a>ที่อยู่</a>ก่อน ถึงจะลิงก์ได้",
     "Enter passphrase": "กรอกรหัสผ่าน",
     "Seen by %(userName)s at %(dateTime)s": "%(userName)s เห็นแล้วเมื่อเวลา %(dateTime)s",
-    "to restore": "เพื่อกู้คืน",
     "Undecryptable": "ไม่สามารถถอดรหัสได้",
     "Unencrypted message": "ข้อความไม่ได้เข้ารหัส",
     "unknown caller": "ไม่ทราบผู้โทร",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 9964606e93..4067de767e 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1,5 +1,4 @@
 {
-    "a room": "bir oda",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "+%(msisdn)s 'ye bir kısa mesaj gönderildi . Lütfen içerdiği doğrulama kodunu girin",
     "Accept": "Kabul Et",
     "%(targetName)s accepted an invitation.": "%(targetName)s bir davetiyeyi kabul etti.",
@@ -28,14 +27,10 @@
     "Always show message timestamps": "Her zaman mesaj zaman dalgalarını (timestamps) gösterin",
     "Authentication": "Doğrulama",
     "Alias (optional)": "Diğer ad (isteğe bağlı)",
-    "%(items)s and %(remaining)s others": "%(items)s ve %(remaining)s diğerleri",
-    "%(items)s and one other": "%(items)s ve bir başkası",
     "%(items)s and %(lastItem)s": "%(items)s ve %(lastItem)s",
     "and %(count)s others...|one": "ve bir diğeri...",
     "and %(count)s others...|other": "ve %(count)s diğerleri...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s ve %(lastPerson)s yazıyorlar",
-    "%(names)s and one other are typing": "%(names)s ve birisi yazıyor",
-    "An email has been sent to": "Bir e-posta gönderildi",
     "A new password must be entered.": "Yeni bir şifre girilmelidir.",
     "%(senderName)s answered the call.": "%(senderName)s aramayı cevapladı.",
     "An error has occurred.": "Bir hata oluştu.",
@@ -118,15 +113,12 @@
     "Devices will not yet be able to decrypt history from before they joined the room": "Cihazlar odaya girdiğinden önceki geçmişin şifresini çözemez",
     "Direct chats": "Doğrudan Sohbetler",
     "Disable Notifications": "Bildirimleri Devre Dışı Bırak",
-    "disabled": "Devre Dışı Bırakıldı",
-    "Disable inline URL previews by default": "Satır için URL önizlemelerini varsayılan olarak devre dışı bırak",
     "Disinvite": "Daveti İptal Et",
     "Display name": "Görünür İsim",
     "Displays action": "Görünür eylem",
     "Don't send typing notifications": "Yazarken bildirim gönderme",
     "Download %(text)s": "%(text)s metnini indir",
     "Drop File Here": "Dosyayı Buraya Bırak",
-    "Drop here %(toAction)s": "%(toAction)s'ı buraya bırak",
     "Drop here to tag %(section)s": "Etiket %(section)s ' ı buraya bırak",
     "Ed25519 fingerprint": "Ed25519 parmak izi",
     "Email": "E-posta",
@@ -136,7 +128,6 @@
     "Emoji": "Emoji (Karakter)",
     "Enable encryption": "Şifrelemeyi Etkinleştir",
     "Enable Notifications": "Bildirimleri Etkinleştir",
-    "enabled": "etkinleştirildi",
     "Encrypted by a verified device": "Doğrulanmış bir cihaz tarafından şifrelendi",
     "Encrypted by an unverified device": "Doğrulanmamış bir cihaz tarafından şifrelendi",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Şifrelenmiş mesajlar , henüz şifreleme sağlamayan istemcilerde görünür olmayacaktır",
@@ -158,7 +149,6 @@
     "Failed to ban user": "Kullanıcı yasaklama(Ban) başarısız",
     "Failed to change password. Is your password correct?": "Şifreniz değiştirilemedi . Şifreniz doğru mu ?",
     "Failed to change power level": "Güç seviyesini değiştirme başarısız oldu",
-    "Failed to delete device": "Cihazı silmek başarısız oldu",
     "Failed to fetch avatar URL": "Avatar URL'i alınamadı",
     "Failed to forget room %(errCode)s": "Oda unutulması başarısız oldu %(errCode)s",
     "Failed to join room": "Odaya girme hatası",
@@ -249,7 +239,6 @@
     "Markdown is disabled": "Markdown devre dışı",
     "Markdown is enabled": "Markdown aktif",
     "matrix-react-sdk version:": "matrix-react-sdk versiyon:",
-    "Members only": "Sadece üyeler",
     "Message not sent due to unknown devices being present": "Bilinmeyen cihazlar bulunduğundan mesaj gönderilemedi",
     "Missing room_id in request": "İstekte eksik room_id",
     "Missing user_id in request": "İstekte user_id eksik",
@@ -280,7 +269,6 @@
     "OK": "Tamam",
     "olm version:": "olm versiyon:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Bu oda için şifreleme etkinleştirildikten sonra tekrar kapatılamaz (şimdilik)",
-    "Once you've followed the link it contains, click below": "Bir kere ' içerdiği bağlantıyı takip ettikten sonra , aşağıya tıklayın",
     "Only people who have been invited": "Sadece davet edilmiş insanlar",
     "Operation failed": "Operasyon başarısız oldu",
     "Otherwise, <a>click here</a> to send a bug report.": "Aksi taktirde , bir hata raporu göndermek için <a> buraya tıklayın </a>.",
@@ -317,7 +305,6 @@
     "Report it": "Bunu rapor et",
     "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.": "Şifrenizi sıfırlamak , eğer Oda Anahtarlarınızı dışa aktarmaz ve daha sonra içe aktarmaz iseniz , şu anda tüm cihazlarda uçtan uca şifreleme anahtarlarını sıfırlayarak şifreli sohbetleri okunamaz hale getirecek . Gelecekte bu iyileştirilecek.",
     "Results from DuckDuckGo": "DuckDuckGo Sonuçları",
-    "Return to app": "Uygulamaya dön",
     "Return to login screen": "Giriş ekranına dön",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot size bildirim gönderme iznine sahip değil - lütfen tarayıcı ayarlarınızı kontrol edin",
     "Riot was not given permission to send notifications - please try again": "Riot'a bildirim gönderme izni verilmedi - lütfen tekrar deneyin",
@@ -336,16 +323,12 @@
     "Search failed": "Arama başarısız",
     "Searches DuckDuckGo for results": "Sonuçlar için DuckDuckGo'yu arar",
     "Seen by %(userName)s at %(dateTime)s": "%(dateTime)s ' de %(userName)s tarafından görüldü",
-    "Send a message (unencrypted)": "Bir mesaj gönder (Şifrelenmemiş)",
-    "Send an encrypted message": "Şifrelenmiş bir mesaj gönder",
     "Send anyway": "Her durumda gönder",
     "Sender device information": "Gönderen cihaz bilgileri",
     "Send Invites": "Davetiye Gönder",
     "Send Reset Email": "E-posta Sıfırlama Gönder",
-    "sent an image": "bir resim gönderildi",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s bir resim gönderdi.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s %(targetDisplayName)s' a odaya katılması için bir davet gönderdi.",
-    "sent a video": "bir video gönderildi",
     "Server error": "Sunucu Hatası",
     "Server may be unavailable or overloaded": "Sunucu kullanılamıyor veya aşırı yüklenmiş olabilir",
     "Server may be unavailable, overloaded, or search timed out :(": "Sunucu kullanılamıyor , aşırı yüklenmiş veya arama zaman aşımına uğramış olabilir :(",
@@ -362,12 +345,8 @@
     "Signed Out": "Oturum Kapatıldı",
     "Sign in": "Giriş Yap",
     "Sign out": "Çıkış Yap",
-    "since the point in time of selecting this option": "Bu seçenek seçildiğinden beri",
-    "since they joined": "Katıldıklarından beri",
-    "since they were invited": "davet edildiklerinden beri",
     "%(count)s of your messages have not been sent.|other": "Bazı mesajlarınız gönderilemedi.",
     "Someone": "Birisi",
-    "Sorry, this homeserver is using a login which is not recognised ": "Maalesef , bu Ana Sunucu tanımlanmamış bir Giriş kullanıyor ",
     "Start a chat": "Bir Sohbet Başlat",
     "Start authentication": "Kimlik Doğrulamayı başlatın",
     "Start Chat": "Sohbet Başlat",
@@ -380,7 +359,6 @@
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Sağladığınız imza anahtarı %(userId)s aygıtından %(deviceId)s ile eşleşiyor . Aygıt doğrulanmış olarak işaretlendi.",
     "This email address is already in use": "Bu e-posta adresi zaten kullanımda",
     "This email address was not found": "Bu e-posta adresi bulunamadı",
-    "%(actionVerb)s this person?": "Bu kişi %(actionVerb)s yapılsın mı ?",
     "The email address linked to your account must be entered.": "Hesabınıza bağlı e-posta adresi girilmelidir.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "'%(fileName)s' dosyası bu Ana Sunucu'nun yükleme için boyutunu aşıyor",
     "The file '%(fileName)s' failed to upload": "'%(fileName)s' dosyası yüklenemedi",
@@ -397,12 +375,8 @@
     "This room": "Bu oda",
     "This room is not accessible by remote Matrix servers": "Bu oda uzak Matrix Sunucuları tarafından erişilebilir değil",
     "This room's internal ID is": "Bu odanın Dahili ID'si",
-    "to demote": "indirgemek için",
-    "to favourite": "favorilemek",
     "To link to a room it must have <a>an address</a>.": "Bir odaya bağlanmak için oda <a> bir adrese </a> sahip olmalı.",
     "To reset your password, enter the email address linked to your account": "Parolanızı sıfırlamak için hesabınıza bağlı e-posta adresinizi girin",
-    "to restore": "yenilemek için",
-    "to tag direct chat": "doğrudan sohbeti etiketlemek için",
     "To use it, just wait for autocomplete results to load and tab through them.": "Kullanmak için , otomatik tamamlama sonuçlarının yüklenmesini ve bitmesini bekleyin.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Bu odanın zaman çizelgesinde belirli bir nokta yüklemeye çalışıldı , ama geçerli mesajı görüntülemeye izniniz yok.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "Bu odanın akışında belirli bir noktaya yüklemeye çalışıldı , ancak bulunamadı.",
@@ -435,7 +409,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "%(filename)s yükleniyor",
     "Uploading %(filename)s and %(count)s others|one": "%(filename)s ve %(count)s kadarı yükleniyor",
     "Uploading %(filename)s and %(count)s others|other": "%(filename)s ve %(count)s kadarları yükleniyor",
-    "uploaded a file": "bir dosya yüklendi",
     "Upload avatar": "Avatar yükle",
     "Upload Failed": "Yükleme Başarısız",
     "Upload Files": "Dosyaları Yükle",
@@ -451,7 +424,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (güç %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Kullanıcı ismi geçersiz : %(errMessage)s",
     "Users": "Kullanıcılar",
-    "User": "Kullanıcı",
     "Verification Pending": "Bekleyen doğrulama",
     "Verification": "Doğrulama",
     "verified": "doğrulanmış",
@@ -545,7 +517,6 @@
     "Room": "Oda",
     "Connectivity to the server has been lost.": "Sunucuyla olan bağlantı kesildi.",
     "Sent messages will be stored until your connection has returned.": "Gönderilen iletiler bağlantınız geri gelene kadar saklanacak.",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "<a> Hepsini yeniden gönderin </a> veya <a> Hepsini iptal edin </a> şimdi . Ayrıca yeniden göndermek veya iptal etmek için özel iletiler seçebilirsin.",
     "(~%(count)s results)|one": "(~%(count)s sonuç)",
     "(~%(count)s results)|other": "(~%(count)s sonuçlar)",
     "Cancel": "İptal Et",
@@ -558,54 +529,6 @@
     "quote": "alıntı",
     "bullet": "Madde (bullet)",
     "numbullet": "Sayı madde işareti (numbullet)",
-    "%(severalUsers)sjoined %(repeats)s times": "%(severalUsers)s %(repeats)s kere katıldı",
-    "%(oneUser)sjoined %(repeats)s times": "%(oneUser)s  %(repeats)s kez katıldı",
-    "%(severalUsers)sjoined": "%(severalUsers)s katıldı",
-    "%(oneUser)sjoined": "%(oneUser)s katıldı",
-    "%(severalUsers)sleft %(repeats)s times": "%(severalUsers)s  %(repeats)s kez ayrıldı",
-    "%(oneUser)sleft %(repeats)s times": "%(oneUser)s  %(repeats)s kez ayrıldı",
-    "%(severalUsers)sleft": "%(severalUsers)s ayrıldı",
-    "%(oneUser)sleft": "%(oneUser)s ayrıldı",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s  %(repeats)s kere katıldı ve ayrıldı",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s %(repeats)s kez katıldı ve ayrıldı",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s katıldı ve ayrıldı",
-    "%(oneUser)sjoined and left": "%(oneUser)s katıldı ve ayrıldı",
-    "%(severalUsers)sleft and rejoined %(repeats)s times": "%(severalUsers)s %(repeats)s kere ayrıldı ve tekrar katıldı",
-    "%(oneUser)sleft and rejoined %(repeats)s times": "%(oneUser)s ayrıldı ve %(repeats)s kere yeniden katıldı",
-    "%(severalUsers)sleft and rejoined": "%(severalUsers)s ayrıldı ve yeniden katıldı",
-    "%(oneUser)sleft and rejoined": "%(oneUser)s ayrıldı ve tekrar katıldı",
-    "%(severalUsers)srejected their invitations %(repeats)s times": "%(severalUsers)s  %(repeats)s kere davetiyelerini reddetti",
-    "%(oneUser)srejected their invitation %(repeats)s times": "%(oneUser)s %(repeats)s kere davetiyeleri reddetti",
-    "%(severalUsers)srejected their invitations": "%(severalUsers)s davetiyelerini reddetti",
-    "%(oneUser)srejected their invitation": "%(oneUser)s davetiyeyi reddetti",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s %(repeats)s kere davetiyelerinden çekildi",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)s %(repeats)s kere davetiyesinden çekildi",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s davetiyelerinden çekildi",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)s davetiyesini geri çekti",
-    "were invited %(repeats)s times": "%(repeats)s kere davet edildi/edildiler",
-    "was invited %(repeats)s times": "%(repeats)s kere davet edildi",
-    "were invited": "davet edildi",
-    "was invited": "davet edildi",
-    "were banned %(repeats)s times": "%(repeats)s kere engellendi (banlandı)",
-    "was banned %(repeats)s times": "%(repeats)s kere engellendi (banlandı)",
-    "were banned": "engellendi (banlandı)",
-    "was banned": "engellendi (banlandı)",
-    "were unbanned %(repeats)s times": "%(repeats)s kere engelleri kaldırıldı",
-    "was unbanned %(repeats)s times": "%(repeats)s kere engelleri kaldırıldı",
-    "were unbanned": "engeli kaldırıldı",
-    "was unbanned": "engeli kaldırıldı",
-    "were kicked %(repeats)s times": "%(repeats)s kere atıldı",
-    "was kicked %(repeats)s times": "%(repeats)s kere atıldı",
-    "were kicked": "atıldı",
-    "was kicked": "atıldı",
-    "%(severalUsers)schanged their name %(repeats)s times": "%(severalUsers)s %(repeats)s kere isimlerini değiştirdi",
-    "%(oneUser)schanged their name %(repeats)s times": "%(oneUser)s %(repeats)s kere ismini değiştirdi",
-    "%(severalUsers)schanged their name": "%(severalUsers)s isminlerini değiştirdi",
-    "%(oneUser)schanged their name": "%(oneUser)s ismini değiştirdi",
-    "%(severalUsers)schanged their avatar %(repeats)s times": "%(severalUsers)s %(repeats)s kere Avatarlarını değiştirdi",
-    "%(oneUser)schanged their avatar %(repeats)s times": "%(oneUser)s  %(repeats)s kere Avatarını değiştirdi",
-    "%(severalUsers)schanged their avatar": "%(severalUsers)s Avatarını değiştirdi",
-    "%(oneUser)schanged their avatar": "%(oneUser)s Avatarını değiştirdi",
     "Please select the destination room for this message": "Bu ileti için lütfen hedef oda seçin",
     "Create new room": "Yeni Oda Oluştur",
     "Room directory": "Oda Rehberi",
@@ -672,7 +595,6 @@
     "Dismiss": "Uzaklaştır",
     "Please check your email to continue registration.": "Kayıt işlemine devam etmek için lütfen e-postanızı kontrol edin.",
     "Token incorrect": "Belirteç(Token) hatalı",
-    "A text message has been sent to": "Kısa mesaj gönderildi",
     "Please enter the code it contains:": "Lütfen içerdiği kodu girin:",
     "powered by Matrix": "Matrix tarafından desteklenmektedir",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Eğer bir e-posta adresi belirtmezseniz , şifrenizi sıfırlayamazsınız . Emin misiniz ?",
@@ -690,18 +612,10 @@
     "Add an Integration": "Entegrasyon ekleyin",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Hesabınızı %(integrationsUrl)s ile kullanmak üzere doğrulayabilmeniz için üçüncü taraf bir siteye götürülmek üzeresiniz. Devam etmek istiyor musunuz ?",
     "Removed or unknown message type": "Kaldırılmış veya bilinmeyen ileti tipi",
-    "Disable URL previews by default for participants in this room": "Bu odadaki katılımcılar için varsayılan olarak URL önizlemelerini devre dışı bırak",
-    "Disable URL previews for this room (affects only you)": "Bu oda için URL önizlemelerini devre dışı bırak (sadece sizi etkiler)",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "URL önizlemeleri , bu odadaki katılımcılar için varsayılan olarak %(globalDisableUrlPreview)s dir.",
     "URL Previews": "URL önizlemeleri",
-    "Enable URL previews for this room (affects only you)": "URL önizlemelerini bu oda için etkinleştirin (sadece sizi etkiler)",
     "Drop file here to upload": "Yüklemek için dosyaları buraya bırakın",
     " (unsupported)": " (desteklenmeyen)",
     "Ongoing conference call%(supportedText)s.": "Devam eden konferans görüşmesi %(supportedText)s.",
-    "for %(amount)ss": "%(amount)s",
-    "for %(amount)sm": "%(amount)s",
-    "for %(amount)sh": "%(amount)s",
-    "for %(amount)sd": "%(amount)s",
     "Online": "Çevrimiçi",
     "Idle": "Boş",
     "Offline": "Çevrimdışı",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 078147640a..7d292a4bbe 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -4,7 +4,6 @@
     "Create new room": "Створити нову кімнату",
     "Custom Server Options": "Нетипові параметри сервера",
     "Dismiss": "Відхилити",
-    "Drop here %(toAction)s": "Кидайте сюди %(toAction)s",
     "Error": "Помилка",
     "Failed to forget room %(errCode)s": "Не вдалось видалити кімнату %(errCode)s",
     "Favourite": "Вибране",
@@ -21,7 +20,6 @@
     "OK": "Гаразд",
     "Failed to change password. Is your password correct?": "Не вдалось змінити пароль. Ви впевнені, що пароль введено правильно?",
     "Continue": "Продовжити",
-    "a room": "кімната",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Текстове повідомлення було надіслано +%(msisdn)s. Введіть, будь ласка, код підтвердження з цього повідомлення",
     "Accept": "Прийняти",
     "Account": "Обліковка",
@@ -52,14 +50,10 @@
     "Always show message timestamps": "Завжди показувати часові позначки повідомлень",
     "Authentication": "Впізнавання",
     "Alias (optional)": "Псевдонім (необов'язково)",
-    "%(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 %(count)s others...|one": "і інше...",
     "and %(count)s others...|other": "та %(count)s інші...",
     "%(names)s and %(lastPerson)s are typing": "%(names)s та %(lastPerson)s пишуть",
-    "%(names)s and one other are typing": "%(names)s та інші пишуть",
-    "An email has been sent to": "Лист було надіслано",
     "A new password must be entered.": "Має бути введений новий пароль.",
     "Add a widget": "Добавити віджет",
     "Allow": "Принюти",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 11aa4330ff..d27ef2a48a 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -14,13 +14,11 @@
     "Devices": "设备列表",
     "Devices will not yet be able to decrypt history from before they joined the room": "新加入聊天室的设备不能解密加入之前的聊天记录",
     "Direct chats": "私聊",
-    "Disable inline URL previews by default": "默认禁用自动网址预览",
     "Disinvite": "取消邀请",
     "Display name": "显示名称",
     "Displays action": "显示操作",
     "Don't send typing notifications": "不要发送我的打字状态",
     "Download %(text)s": "下载 %(text)s",
-    "Drop here %(toAction)s": "拖拽到这里 %(toAction)s",
     "Email": "电子邮箱",
     "Email address": "电子邮箱地址",
     "Email, name or matrix ID": "电子邮箱，姓名或者matrix ID",
@@ -39,7 +37,6 @@
     "Export E2E room keys": "导出聊天室的端到端加密密钥",
     "Failed to ban user": "封禁用户失败",
     "Failed to change password. Is your password correct?": "修改密码失败。确认原密码输入正确吗？",
-    "Failed to delete device": "删除设备失败",
     "Failed to forget room %(errCode)s": "无法忘记聊天室 %(errCode)s",
     "Failed to join room": "无法加入聊天室",
     "Failed to kick": "踢人失败",
@@ -87,7 +84,6 @@
     "Invalid file%(extra)s": "非法文件%(extra)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.": "重设密码会导致所有设备上的端到端加密密钥被重置，使得加密的聊天记录不可读，除非你事先导出密钥，修改密码后再导入。此问题将来会得到改善。.",
-    "Return to app": "返回 App",
     "Return to login screen": "返回登录页面",
     "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 未被允许推送消息通知 - 请重试",
@@ -101,15 +97,11 @@
     "Search": "搜索",
     "Search failed": "搜索失败",
     "Searches DuckDuckGo for results": "搜索 DuckDuckGo",
-    "Send a message (unencrypted)": "发送消息 （非加密）",
-    "Send an encrypted message": "发送加密消息",
     "Sender device information": "发送者的设备信息",
     "Send Invites": "发送邀请",
     "Send Reset Email": "发送密码重设邮件",
-    "sent an image": "发了一张图片",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 发了一张图片。.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 发了加入聊天室的邀请。.",
-    "sent a video": "发了一个视频",
     "Server error": "服务器错误",
     "Server may be unavailable or overloaded": "服务器可能不可用或者超载",
     "Server may be unavailable, overloaded, or search timed out :(": "服务器可能不可用、超载，或者搜索超时 :(",
@@ -125,12 +117,8 @@
     "Signed Out": "已退出登录",
     "Sign in": "登录",
     "Sign out": "注销",
-    "since the point in time of selecting this option": "从选择此选项起",
-    "since they joined": "从他们加入时起",
-    "since they were invited": "从他们被邀请时起",
     "%(count)s of your messages have not been sent.|other": "部分消息未发送。",
     "Someone": "某个用户",
-    "Sorry, this homeserver is using a login which is not recognised ": "很抱歉，无法识别此主服务器使用的登录方式 ",
     "Start a chat": "创建聊天",
     "Start Chat": "开始聊天",
     "Submit": "提交",
@@ -139,18 +127,15 @@
     "The main address for this room is": "此聊天室的主要地址是",
     "This email address is already in use": "此邮箱地址已经被使用",
     "This email address was not found": "未找到此邮箱地址",
-    "%(actionVerb)s this person?": "%(actionVerb)s 这个用户？",
     "The email address linked to your account must be entered.": "必须输入和你账号关联的邮箱地址。",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "文件 '%(fileName)s' 超过了此主服务器的上传大小限制",
     "The file '%(fileName)s' failed to upload": "文件 '%(fileName)s' 上传失败",
-    "Disable URL previews for this room (affects only you)": "在这个房间禁止URL预览（只影响你）",
     "Add email address": "添加邮件地址",
     "Add phone number": "添加电话号码",
     "Advanced": "高级",
     "Algorithm": "算法",
     "Always show message timestamps": "总是显示消息时间戳",
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在打字",
-    "An email has been sent to": "一封邮件已经被发送到",
     "A new password must be entered.": "一个新的密码必须被输入。.",
     "%(senderName)s answered the call.": "%(senderName)s 接了通话。.",
     "An error has occurred.": "一个错误出现了。",
@@ -187,12 +172,9 @@
     "Hide removed messages": "隐藏被删除的消息",
     "Authentication": "认证",
     "Alias (optional)": "别名 (可选)",
-    "%(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 %(count)s others...|other": "和其它 %(count)s 个...",
     "and %(count)s others...|one": "和其它一个...",
-    "%(names)s and one other are typing": "%(names)s 和另一个人正在打字",
     "Anyone": "任何人",
     "Anyone who knows the room's link, apart from guests": "任何知道聊天室链接的人，游客除外",
     "Anyone who knows the room's link, including guests": "任何知道聊天室链接的人，包括游客",
@@ -243,11 +225,9 @@
     "device id: ": "设备 ID: ",
     "Device key:": "设备密钥 :",
     "Disable Notifications": "关闭消息通知",
-    "disabled": "已禁用",
     "Drop File Here": "把文件拖拽到这里",
     "Email address (optional)": "电子邮件地址 (可选)",
     "Enable Notifications": "启用消息通知",
-    "enabled": "已启用",
     "Encrypted by a verified device": "由一个已验证的设备加密",
     "Encrypted by an unverified device": "由一个未经验证的设备加密",
     "Encryption is enabled in this room": "此聊天室启用了加密",
@@ -338,7 +318,6 @@
     "Reject invitation": "拒绝邀请",
     "Rejoin": "重新加入",
     "Users": "用户",
-    "User": "用户",
     "Verification": "验证",
     "verified": "已验证",
     "Verified": "已验证",
@@ -365,12 +344,6 @@
     "quote": "引用",
     "bullet": "项目符号",
     "numbullet": "数字项目符号",
-    "were invited": "被邀请",
-    "was invited": "被邀请",
-    "were banned %(repeats)s times": "被封禁 %(repeats)s 次",
-    "was banned %(repeats)s times": "被封禁 %(repeats)s 次",
-    "were banned": "被封禁",
-    "was banned": "被封禁",
     "New Password": "新密码",
     "Options": "选项",
     "Passphrases must match": "密码必须匹配",
@@ -419,7 +392,6 @@
     "Create": "创建",
     "Failed to upload image": "上传图像失败",
     "Add a widget": "添加一个小部件",
-    "a room": "一个聊天室",
     "Accept": "接受",
     "Access Token:": "访问令牌：",
     "Cannot add any more widgets": "无法添加更多小组件",
@@ -428,7 +400,6 @@
     "Drop here to tag %(section)s": "拖拽到这里标记 %(section)s",
     "Enable automatic language detection for syntax highlighting": "启用自动语言检测用于语法高亮",
     "Failed to change power level": "修改特权级别失败",
-    "Hide avatar and display name changes": "隐藏头像和显示名称的修改",
     "Kick": "踢出",
     "Kicks user with given id": "踢出指定 ID 的用户",
     "Last seen": "上次看见",
@@ -471,7 +442,6 @@
     "unknown device": "未知设备",
     "Unnamed Room": "未命名的聊天室",
     "Unverified": "未验证",
-    "uploaded a file": "上传一个文件",
     "Upload avatar": "上传头像",
     "Upload Failed": "上传失败",
     "Upload Files": "上传文件",
@@ -491,7 +461,6 @@
     "Integrations Error": "集成错误",
     "Publish this room to the public in %(domain)s's room directory?": "把这个聊天室发布到 %(domain)s 的聊天室目录吗？",
     "Manage Integrations": "管理集成",
-    "Members only": "只有成员",
     "No users have specific privileges in this room": "没有用户在这个聊天室有特殊权限",
     "%(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.": "请检查你的电子邮箱并点击里面包含的链接。完成时请点击继续。",
@@ -576,7 +545,6 @@
     "Something went wrong!": "出了点问题！",
     "If you already have a Matrix account you can <a>log in</a> instead.": "如果你已经有一个 Matrix 帐号，你可以<a>登录</a>。",
     "Do you want to set an email address?": "你要设置一个电子邮箱地址吗？",
-    "Room creation failed": "创建聊天室失败",
     "New address (e.g. #foo:%(localDomain)s)": "新的地址（例如 #foo:%(localDomain)s）",
     "Upload new:": "上传新的：",
     "User ID": "用户 ID",
@@ -604,33 +572,6 @@
     "Sent messages will be stored until your connection has returned.": "已发送的消息会被保存直到你的连接回来。",
     "(~%(count)s results)|one": "（~%(count)s 个结果）",
     "(~%(count)s results)|other": "（~%(count)s 个结果）",
-    "%(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 离开了",
-    "%(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 拒绝了他们的邀请",
-    "%(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 更换了他们的头像",
     "Please select the destination room for this message": "请选择这条消息的目标聊天室",
     "Start automatically after system login": "在系统登录后自动启动",
     "Analytics": "分析",
@@ -655,15 +596,6 @@
     "Oct": "十月",
     "Nov": "十一月",
     "Dec": "十二月",
-    "%(severalUsers)sjoined and left %(repeats)s times": "%(severalUsers)s 加入并离开了 %(repeats)s 次",
-    "were unbanned %(repeats)s times": "被解封 %(repeats)s 次",
-    "was unbanned %(repeats)s times": "被解封 %(repeats)s 次",
-    "were unbanned": "被解封",
-    "was unbanned": "被解封",
-    "were kicked %(repeats)s times": "被踢出 %(repeats)s 次",
-    "was kicked %(repeats)s times": "被踢出 %(repeats)s 次",
-    "were kicked": "被踢出",
-    "was kicked": "被踢出",
     "Desktop specific": "桌面特有的",
     "You must join the room to see its files": "你必须加入聊天室以看到它的文件",
     "Failed to invite the following users to the %(roomName)s room:": "邀请以下用户到 %(roomName)s 聊天室失败：",
@@ -679,9 +611,6 @@
     "The visibility of existing history will be unchanged": "现有历史记录的可见性不会被改变",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s 打开了端到端加密 (算法 %(algorithm)s).",
     "Unable to remove contact information": "无法移除联系人信息",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "现在 <a>重发全部</a> 或者 <a>取消全部</a>。你也可以选择重发或取消单独的消息。",
-    "were invited %(repeats)s times": "被邀请 %(repeats)s 次",
-    "was invited %(repeats)s times": "被邀请 %(repeats)s 次",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot 收集匿名的分析数据来允许我们改善这个应用。",
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" 包含你以前没见过的设备。",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "你可以使用自定义的服务器选项来通过指定一个不同的主服务器 URL 来登录其他 Matrix 服务器。",
@@ -695,8 +624,6 @@
     "This image cannot be displayed.": "图像无法显示。",
     "Add an Integration": "添加一个集成",
     "Removed or unknown message type": "被移除或未知的消息类型",
-    "Disable URL previews by default for participants in this room": "对这个聊天室的参与者默认禁用 URL 预览",
-    "Enable URL previews for this room (affects only you)": "在这个聊天室启用 URL 预览（只影响你）",
     "Ongoing conference call%(supportedText)s.": "正在进行的会议通话 %(supportedText)s.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 修改了 %(roomName)s 的头像",
     "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "这将会成为你在 <span></span> 主服务器上的账户名，或者你可以选择一个 <a>不同的服务器</a>。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 1669b1ce48..611f6db7ff 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1,5 +1,4 @@
 {
-    "An email has been sent to": "一封郵件已經被發送到",
     "A new password must be entered.": "一個新的密碼必須被輸入。.",
     "An error has occurred.": "一個錯誤出現了。",
     "Anyone who knows the room's link, apart from guests": "任何知道房間連結的人，但訪客除外",
@@ -28,8 +27,6 @@
     "Algorithm": "算法",
     "Always show message timestamps": "總是顯示訊息時間戳",
     "Authentication": "授權",
-    "%(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",
     "%(names)s and %(lastPerson)s are typing": "%(names)s 和 %(lastPerson)s 正在打字",
     "%(senderName)s answered the call.": "%(senderName)s 接了通話。.",
@@ -53,13 +50,11 @@
     "Devices": "裝置列表",
     "Devices will not yet be able to decrypt history from before they joined the room": "新加入聊天室的裝置不能解密加入之前的聊天記錄",
     "Direct chats": "私聊",
-    "Disable inline URL previews by default": "預設停用自動網址預覽",
     "Disinvite": "取消邀請",
     "Display name": "顯示名稱",
     "Displays action": "顯示操作",
     "Don't send typing notifications": "不要發送我的打字狀態",
     "Download %(text)s": "下載 %(text)s",
-    "Drop here %(toAction)s": "拖曳到這裡 %(toAction)s",
     "Ed25519 fingerprint": "Ed25519指紋",
     "Email": "電子郵件",
     "Email address": "電子郵件地址",
@@ -79,7 +74,6 @@
     "Export E2E room keys": "導出聊天室的端到端加密密鑰",
     "Failed to ban user": "封禁用戶失敗",
     "Failed to change password. Is your password correct?": "變更密碼失敗。您的密碼正確嗎？",
-    "Failed to delete device": "刪除裝置失敗",
     "Failed to forget room %(errCode)s": "無法忘記聊天室 %(errCode)s",
     "Failed to join room": "無法加入聊天室",
     "Failed to kick": "踢人失敗",
@@ -135,7 +129,6 @@
     "New password": "新密碼",
     "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.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。",
-    "Return to app": "返回 App",
     "Return to login screen": "返回登錄頁面",
     "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 未被允許向你推送通知 ── 請重試",
@@ -149,15 +142,11 @@
     "Search": "搜尋",
     "Search failed": "搜索失敗",
     "Searches DuckDuckGo for results": "搜索 DuckDuckGo",
-    "Send a message (unencrypted)": "傳送訊息（未加密）",
-    "Send an encrypted message": "傳送加密訊息",
     "Sender device information": "發送者的裝置信息",
     "Send Invites": "發送邀請",
     "Send Reset Email": "發送密碼重設郵件",
-    "sent an image": "發了一張圖片",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 發了一張圖片。.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s 向 %(targetDisplayName)s 發了加入聊天室的邀請。.",
-    "sent a video": "影片已傳送",
     "Server error": "伺服器錯誤",
     "Server may be unavailable or overloaded": "服務器可能不可用或者超載",
     "Server may be unavailable, overloaded, or search timed out :(": "服務器可能不可用、超載，或者搜索超時 :(",
@@ -173,12 +162,8 @@
     "Signed Out": "已退出登錄",
     "Sign in": "登錄",
     "Sign out": "登出",
-    "since the point in time of selecting this option": "從選擇此選項起",
-    "since they joined": "從他們加入時起",
-    "since they were invited": "從他們被邀請時起",
     "%(count)s of your messages have not been sent.|other": "部分訊息未送出。",
     "Someone": "某個用戶",
-    "Sorry, this homeserver is using a login which is not recognised ": "很抱歉，無法識別此主伺服器使用的登錄方式 ",
     "Start a chat": "創建聊天",
     "Start Chat": "開始聊天",
     "Submit": "提交",
@@ -187,7 +172,6 @@
     "The main address for this room is": "此聊天室的主要地址是",
     "This email address is already in use": "此電子郵件地址已經被使用",
     "This email address was not found": "未找到此電子郵件地址",
-    "%(actionVerb)s this person?": "%(actionVerb)s 這個用戶？",
     "The email address linked to your account must be entered.": "必須輸入和你帳號關聯的電子郵件地址。",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "文件 '%(fileName)s' 超過了此主伺服器的上傳大小限制",
     "The file '%(fileName)s' failed to upload": "文件 '%(fileName)s' 上傳失敗",
@@ -204,16 +188,9 @@
     "Sun": "星期日",
     "Mon": "星期一",
     "Tue": "星期二",
-    "%(severalUsers)sleft": "%(severalUsers)s離開",
-    "%(oneUser)sleft": "%(oneUser)s離開",
-    "%(severalUsers)sjoined and left": "%(severalUsers)s加入與離開",
-    "%(oneUser)sleft and rejoined": "%(oneUser)s離開再重新加入",
-    "for %(amount)sh": "給 %(amount)sh",
-    "for %(amount)sd": "給 %(amount)sd",
     "Online": "在線",
     "Idle": "閒置",
     "Offline": "下線",
-    "Disable URL previews for this room (affects only you)": "在這個房間禁止URL預覽（只影響你）",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s 更改了聊天室的圖像為 <img/>",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s 移除了聊天室圖片。",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s 更改了聊天室 %(roomName)s　圖像",
@@ -254,17 +231,13 @@
     "Ongoing conference call%(supportedText)s.": "%(supportedText)s 正在進行會議通話。",
     " (unsupported)": " (不支援)",
     "URL Previews": "網址預覽",
-    "Enable URL previews for this room (affects only you)": "啟用此房間的網址預覽（僅影響您）",
     "Drop file here to upload": "把文件放在這裡上傳",
-    "Disable URL previews by default for participants in this room": "預設情況下，此房間的參與者停用網址預覽",
-    "URL previews are %(globalDisableUrlPreview)s by default for participants in this room.": "預設情況下，這個房間的參與者的網址預覽是%(globalDisableUrlPreview)s。",
     "Removed or unknown message type": "已刪除或未知的信息類型",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "您即將被帶到第三方網站，以便您可以驗證您的帳戶以使用%(integrationsUrl)s。你想繼續嗎？",
     "Close": "關閉",
     "Create new room": "建立新聊天室",
     "Room directory": "聊天室目錄",
     "Start chat": "開始聊天",
-    "a room": "房間",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "文字訊息將會傳送到 +%(msisdn)s。請輸入其中包含的驗證碼",
     "Accept": "接受",
     "%(targetName)s accepted an invitation.": "%(targetName)s 已接受邀請。",
@@ -279,7 +252,6 @@
     "You may need to manually permit Riot to access your microphone/webcam": "您可能需要手動允許 Riot 存取您的麥克風／網路攝影機",
     "Hide removed messages": "隱藏已移除的訊息",
     "Alias (optional)": "別名（選擇性）",
-    "%(names)s and one other are typing": "%(names)s 與另外一個人正在輸入",
     "Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？",
     "Bans user with given id": "禁止有指定 ID 的使用者",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查您的連線，確保您的<a>家伺服器的 SSL 憑證</a>可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
@@ -316,12 +288,10 @@
     "Device already verified!": "裝置已驗證！",
     "Device key:": "裝置金鑰：",
     "Disable Notifications": "停用通知",
-    "disabled": "已停用",
     "Drop File Here": "在此放置檔案",
     "Drop here to tag %(section)s": "在此放置以標記 %(section)s",
     "Email address (optional)": "電子郵件地址（選擇性）",
     "Enable Notifications": "啟用通知",
-    "enabled": "已啟用",
     "Encrypted by a verified device": "已透過驗證過的裝置加密",
     "Encrypted by an unverified device": "已透過未驗證過的裝置加密",
     "Encryption is enabled in this room": "此房間的加密已啟用",
@@ -367,7 +337,6 @@
     "Markdown is disabled": "Markdown 已停用",
     "Markdown is enabled": "Markdown 已啟用",
     "matrix-react-sdk version:": "matrix-react-sdk 版本：",
-    "Members only": "僅成員",
     "Message not sent due to unknown devices being present": "因為未知的裝置存在而未傳送",
     "Missing room_id in request": "在請求中遺失房間 ID",
     "Missing user_id in request": "在請求中遺失使用者 ID",
@@ -394,7 +363,6 @@
     "No users have specific privileges in this room": "此房間中沒有使用者有指定的權限",
     "olm version:": "olm 版本：",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "這個房間只要啟用加密就不能再關掉了（從現在開始）",
-    "Once you've followed the link it contains, click below": "一旦您跟著它所包含的連結，點選下方",
     "Only people who have been invited": "僅有被邀請的夥伴",
     "Otherwise, <a>click here</a> to send a bug report.": "否則，請<a>點選此處</a>來傳送錯誤報告。",
     "Password": "密碼",
@@ -449,12 +417,8 @@
     "This room": "此房間",
     "This room is not accessible by remote Matrix servers": "此房間無法被遠端的 Matrix 伺服器存取",
     "This room's internal ID is": "此房間的內部 ID 為",
-    "to demote": "要降級",
-    "to favourite": "到喜歡",
     "To link to a room it must have <a>an address</a>.": "要連結到房間，它必須有<a>地址</a>。",
     "To reset your password, enter the email address linked to your account": "要重設您的密碼，輸入連結到您的帳號的電子郵件地址",
-    "to restore": "要復原",
-    "to tag direct chat": "要標記直接聊天",
     "To use it, just wait for autocomplete results to load and tab through them.": "要使用它，只要等待自動完成的結果載入並在它們上面按 Tab。",
     "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.": "嘗試載入此房間時間軸的特定時間點，但是找不到。",
@@ -480,7 +444,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "正在上傳 %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "正在上傳 %(filename)s 與另外 %(count)s 個",
     "Uploading %(filename)s and %(count)s others|other": "正在上傳 %(filename)s 與另外 %(count)s 個",
-    "uploaded a file": "已上傳檔案",
     "Upload avatar": "上傳大頭貼",
     "Upload Failed": "上傳失敗",
     "Upload Files": "上傳檔案",
@@ -496,7 +459,6 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（權限等級 %(powerLevelNumber)s）",
     "Username invalid: %(errMessage)s": "使用者名稱無效：%(errMessage)s",
     "Users": "使用者",
-    "User": "使用者",
     "Verification Pending": "擱置的驗證",
     "Verification": "驗證",
     "verified": "已驗證",
@@ -583,7 +545,6 @@
     "Room": "房間",
     "Connectivity to the server has been lost.": "至伺服器的連線已遺失。",
     "Sent messages will be stored until your connection has returned.": "傳送的訊息會在您的連線恢復前先儲存起來。",
-    "%(count)s <a>Resend all</a> or <a>cancel all</a> now. You can also select individual messages to resend or cancel.|other": "現在<a>重新傳送全部</a>或是<a>取消全部</a>。您也可以單獨選擇訊息來重新傳送或取消。",
     "(~%(count)s results)|one": "（~%(count)s 結果）",
     "(~%(count)s results)|other": "（~%(count)s 結果）",
     "Active call": "活躍的通話",
@@ -595,50 +556,6 @@
     "quote": "引言",
     "bullet": "子彈",
     "numbullet": "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)sjoined and left %(repeats)s times": "%(severalUsers)s 加入並離開了 %(repeats)s 次",
-    "%(oneUser)sjoined and left %(repeats)s times": "%(oneUser)s 加入並離開了 %(repeats)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 離開並重新加入了",
-    "%(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 拒絕了他／她的邀請",
-    "%(severalUsers)shad their invitations withdrawn %(repeats)s times": "%(severalUsers)s 將他們的邀請撤回 %(repeats)s 次",
-    "%(oneUser)shad their invitation withdrawn %(repeats)s times": "%(oneUser)s 將他／她的邀請撤回 %(repeats)s 次",
-    "%(severalUsers)shad their invitations withdrawn": "%(severalUsers)s 將他們的邀請撤回",
-    "%(oneUser)shad their invitation withdrawn": "%(oneUser)s 將他／她的邀請撤回",
-    "were invited %(repeats)s times": "被邀請了 %(repeats)s 次",
-    "was invited %(repeats)s times": "被邀請了 %(repeats)s 次",
-    "were invited": "被邀請了",
-    "was invited": "被邀請了",
-    "were banned %(repeats)s times": "被禁止了 %(repeats)s 次",
-    "was banned %(repeats)s times": "被禁止了 %(repeats)s 次",
-    "were banned": "被禁止了",
-    "was banned": "被禁止了",
-    "were unbanned %(repeats)s times": "被解禁 %(repeats)s 次",
-    "was unbanned %(repeats)s times": "被解禁 %(repeats)s 次",
-    "were unbanned": "被解禁",
-    "was unbanned": "被解禁",
-    "were kicked %(repeats)s times": "被踢出 %(repeats)s 次",
-    "was kicked %(repeats)s times": "被踢出 %(repeats)s 次",
-    "were kicked": "被踢出",
-    "was kicked": "被踢出",
-    "%(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 變更了他／她的大頭貼",
     "Please select the destination room for this message": "請選取此訊息的目標房間",
     "New Password": "新密碼",
     "Start automatically after system login": "在系統登入後自動開始",
@@ -700,12 +617,9 @@
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "您也可以設定自訂的身份伺服器，但其通常會阻止基於電子郵件的使用者互動。",
     "Please check your email to continue registration.": "請檢查您的電子郵件來繼續註冊。",
     "Token incorrect": "Token 不正確",
-    "A text message has been sent to": "文字訊息要被傳送到",
     "Please enter the code it contains:": "請輸入其包含的代碼：",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "若您不指定電子郵件，您將無法重設您的密碼。您確定嗎？",
     "You are registering with %(SelectedTeamName)s": "您正以 %(SelectedTeamName)s 註冊",
-    "for %(amount)ss": "給 %(amount)s",
-    "for %(amount)sm": "給 %(amount)sm",
     "Updates": "更新",
     "Check for update": "檢查更新",
     "Start chatting": "開始聊天",
@@ -743,7 +657,6 @@
     "Enable automatic language detection for syntax highlighting": "啟用語法突顯的自動語言偵測",
     "Hide Apps": "隱藏應用程式",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "隱藏加入／離開訊息（邀請／踢出／封禁不受影響）",
-    "Hide avatar and display name changes": "隱藏大頭貼與顯示名稱變更",
     "Integrations Error": "整合錯誤",
     "Publish this room to the public in %(domain)s's room directory?": "將這個聊天室公開到 %(domain)s 的聊天室目錄中？",
     "AM": "上午",
@@ -763,7 +676,6 @@
     "Loading device info...": "正在載入裝置資訊……",
     "Example": "範例",
     "Create": "建立",
-    "Room creation failed": "聊天室建立失敗",
     "Featured Rooms:": "特色聊天室：",
     "Featured Users:": "特色使用者：",
     "Automatically replace plain text Emoji": "自動取代純文字為顏文字",

From 53b590f55e57031abf7c006058146a0ab0ed382b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 10 Jan 2018 20:27:43 +0000
Subject: [PATCH 276/927] Add stickers popover.

---
 package.json                                  |  1 +
 src/components/views/rooms/MessageComposer.js | 24 +++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 943c443c59..24f5e3ef58 100644
--- a/package.json
+++ b/package.json
@@ -81,6 +81,7 @@
     "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^15.4.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
+    "react-simple-popover": "^0.2.2",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 84091e8a68..64dd6cf4ba 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -23,7 +23,7 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import Autocomplete from './Autocomplete';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-
+import Popover from 'react-simple-popover';
 
 export default class MessageComposer extends React.Component {
     constructor(props, context) {
@@ -42,6 +42,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.render = this.render.bind(this);
 
         this.state = {
             autocompleteQuery: '',
@@ -280,15 +281,27 @@ export default class MessageComposer extends React.Component {
                 </div>;
         }
 
-        // Apps
+        // Stickers
         if (this.state.showStickers) {
+            const children = <p>Stickers popover</p>;
             hideStickersButton =
                 <div
                     key="controls_hide_stickers"
                     className="mx_MessageComposer_stickers"
                     onClick={this.onHideStickersClick}
+                    ref='target'
                     title={_t("Hide Stickers")}>
                     <TintableSvg src="img/icons-hide-stickers.svg" width="35" height="35" />
+                    <Popover
+                        placement='top'
+                        container={this.refs.messageComposerInput}
+                        target={this.refs.stickersContainer}
+                        show={this.state.showStickers}
+                        onHide={this.onHideStickersClick}
+                        containerStyle={{}}
+                        style={{borderRadius: '5px'}}
+                        children={children}
+                    />
                 </div>;
         } else {
             showStickersButton =
@@ -300,6 +313,10 @@ export default class MessageComposer extends React.Component {
                     <TintableSvg src="img/icons-show-stickers.svg" width="35" height="35" />
                 </div>;
         }
+        const stickersContainer = <div ref='stickersContainer' key='stickers'>
+            { showStickersButton }
+            { hideStickersButton }
+        </div>;
 
         const canSendMessages = this.props.room.currentState.maySendMessage(
             MatrixClientPeg.get().credentials.userId);
@@ -346,8 +363,7 @@ export default class MessageComposer extends React.Component {
                 hangupButton,
                 callButton,
                 videoCallButton,
-                showStickersButton,
-                hideStickersButton,
+                stickersContainer,
             );
         } else {
             controls.push(

From 2bb51bafe1f865286749203aded16d460a7e11a1 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 10 Jan 2018 20:29:36 +0000
Subject: [PATCH 277/927] Content placeholder.

---
 src/components/views/rooms/MessageComposer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 64dd6cf4ba..5c131c8a20 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -283,7 +283,7 @@ export default class MessageComposer extends React.Component {
 
         // Stickers
         if (this.state.showStickers) {
-            const children = <p>Stickers popover</p>;
+            const stickersContent = <p>Click here to add your first sitckerpack</p>;
             hideStickersButton =
                 <div
                     key="controls_hide_stickers"
@@ -300,7 +300,7 @@ export default class MessageComposer extends React.Component {
                         onHide={this.onHideStickersClick}
                         containerStyle={{}}
                         style={{borderRadius: '5px'}}
-                        children={children}
+                        children={stickersContent}
                     />
                 </div>;
         } else {

From 52f28d09e0bdbac532b74f0763a56e65a4036d10 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 10 Jan 2018 20:44:14 +0000
Subject: [PATCH 278/927] Stickerpack styling

---
 src/components/views/rooms/MessageComposer.js | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 5c131c8a20..37e5e1f911 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -283,7 +283,15 @@ export default class MessageComposer extends React.Component {
 
         // Stickers
         if (this.state.showStickers) {
-            const stickersContent = <p>Click here to add your first sitckerpack</p>;
+            let stickerpackWidget = '';
+            let stickersContent = <p>Click here to add your first sitckerpack</p>;
+            if (true) {
+                stickersContent = <iframe src={stickerpackWidget} style={{
+                    borderRadius: '5px',
+                    border: 'none',
+                }}></iframe>;
+            }
+
             hideStickersButton =
                 <div
                     key="controls_hide_stickers"
@@ -298,8 +306,14 @@ export default class MessageComposer extends React.Component {
                         target={this.refs.stickersContainer}
                         show={this.state.showStickers}
                         onHide={this.onHideStickersClick}
-                        containerStyle={{}}
-                        style={{borderRadius: '5px'}}
+                        containerStyle={{
+                            zIndex: 100,
+                        }}
+                        style={{
+                            borderRadius: '5px',
+                            width: 'initial',
+                            padding: 0,
+                        }}
                         children={stickersContent}
                     />
                 </div>;

From 57e11cea1c06b908986605e6bcc72e43ed59d550 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 11 Jan 2018 10:27:15 +0000
Subject: [PATCH 279/927] Fix jsdoc

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

diff --git a/src/cryptodevices.js b/src/cryptodevices.js
index 8c16c96292..c0b7e3da6e 100644
--- a/src/cryptodevices.js
+++ b/src/cryptodevices.js
@@ -23,7 +23,7 @@ import { _t } from './languageHandler';
  * Mark all given devices as 'known'
  *
  * @param {MatrixClient} matrixClient A MatrixClient
- * @param {Object} map from userid -> deviceid -> deviceinfo
+ * @param {Object} devices Map from userid -> deviceid -> deviceinfo
  */
 export function markAllDevicesKnown(matrixClient, devices) {
     Object.keys(devices).forEach((userId) => {

From 1a994b88f52885350b75e0a825cbce90fca1f872 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 10:32:37 +0000
Subject: [PATCH 280/927] Move widget utility functions in to their own file.

---
 src/ScalarMessaging.js |  7 +++---
 src/utils/widgets.js   | 56 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 src/utils/widgets.js

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 40e985a5aa..9a57ab5bce 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -235,6 +235,7 @@ const SdkConfig = require('./SdkConfig');
 const MatrixClientPeg = require("./MatrixClientPeg");
 const MatrixEvent = require("matrix-js-sdk").MatrixEvent;
 const dis = require("./dispatcher");
+const Widgets = require('./utils/widgets');
 import { _t } from './languageHandler';
 
 function sendResponse(event, res) {
@@ -405,10 +406,8 @@ function getWidgets(event, roomId) {
     }
 
     // Add user widgets (not linked to a specific room)
-    const userWidgets = client.getAccountData('m.widgets').getContent() || {};
-    const userWidgetArray = Object.keys(userWidgets).map((key) => userWidgets[key]);
-    widgetStateEvents = widgetStateEvents.concat(userWidgetArray);
-    console.warn('Sending user widgets', userWidgetArray);
+    const userWidgets = Widgets.getUserWidgets();
+    widgetStateEvents = widgetStateEvents.concat(userWidgets);
 
     sendResponse(event, widgetStateEvents);
 }
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
new file mode 100644
index 0000000000..4e26fa6ceb
--- /dev/null
+++ b/src/utils/widgets.js
@@ -0,0 +1,56 @@
+import MatrixClientPeg from '../MatrixClientPeg';
+
+/**
+ * Get all widgets (user and room) for the current user
+ * @param  {object} room The room to get widgets for
+ * @return {[object]} Array containing current / active room and user widget state events
+ */
+function getWidgets(room) {
+    const widgets = getRoomWidgets(room);
+    widgets.concat(getUserWidgets());
+    return widgets;
+}
+
+/**
+ * Get room specific widgets
+ * @param  {object} room The room to get widgets force
+ * @return {[object]} Array containing current / active room widgets
+ */
+function getRoomWidgets(room) {
+    const appsStateEvents = room.currentState.getStateEvents('im.vector.modular.widgets');
+    if (!appsStateEvents) {
+        return [];
+    }
+
+    return appsStateEvents.filter((ev) => {
+        return ev.getContent().type && ev.getContent().url;
+    });
+}
+
+/**
+ * Get user specific widgets (not linked to a specific room)
+ * @return {[object]} Array containing current / active user widgets
+ */
+function getUserWidgets() {
+    const client = MatrixClientPeg.get();
+    if (!client) {
+        throw new Error('User not logged in');
+    }
+    const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+    return Object.keys(userWidgets).map((key) => userWidgets[key]);
+}
+
+/**
+ * Get active stickerpack widgets (stickerpacks are user widgets by nature)
+ * @return {[object]} Array containing current / active stickerpack widgets
+ */
+function getStickerpackWidgets() {
+    return getUserWidgets().filter((widget) => widget.type='stickerpack');
+}
+
+export default {
+    getWidgets,
+    getRoomWidgets,
+    getUserWidgets,
+    getStickerpackWidgets,
+};

From 5e7fab1e15cb01cea6c9ef4575db2de3642993ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 11 Jan 2018 10:39:19 +0000
Subject: [PATCH 281/927] Translated using Weblate (French)

Currently translated at 100.0% (967 of 967 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 3efb93b125..2929e0f3a3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -957,5 +957,14 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Vous ne pourrez pas annuler cette modification car vous vous destituez. Si vous êtes le dernier utilisateur privilégié de ce salon, il sera impossible de récupérer les privilèges.",
     "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Tout renvoyer</resendText> ou <cancelText>tout annuler</cancelText> maintenant. Vous pouvez aussi choisir des messages individuels à renvoyer ou annuler.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant."
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Renvoyer le message</resendText> ou <cancelText>annuler le message</cancelText> maintenant.",
+    "Message Replies": "Réponses",
+    "Send an encrypted reply…": "Envoyer une réponse chiffrée…",
+    "Send a reply (unencrypted)…": "Envoyer une réponse (non chiffrée)…",
+    "Send an encrypted message…": "Envoyer un message chiffré…",
+    "Send a message (unencrypted)…": "Envoyer un message (non chiffré)…",
+    "Replying": "Répond",
+    "Minimize apps": "Minimiser les applications",
+    "Quote": "Citer",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>marquer les appareils comme connus et envoyer</sendAnywayText> ou <cancelText>tout annuler</cancelText>."
 }

From 0ce043ab12b4075a58f9020c21836ba9ef43c4cb Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 11 Jan 2018 10:49:04 +0000
Subject: [PATCH 282/927] Translated using Weblate (Russian)

Currently translated at 99.5% (963 of 967 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index c56beebf7f..a060e1398b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -957,5 +957,10 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Вы не сможете отменить это изменение после понижения себя, в случае если вы являетесь последним привилегированным пользователем в этой комнате.",
     "%(count)s of your messages have not been sent.|one": "Ваше сообщение не было отправлено.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Отправить все</resendText> или <cancelText>отменить все</cancelText> сейчас. Можно также выбрать отдельные сообщения для отправки или отмены.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Отправить</resendText> или <cancelText>отменить</cancelText> сообщение сейчас."
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Отправить</resendText> или <cancelText>отменить</cancelText> сообщение сейчас.",
+    "Message Replies": "Ответы на сообщения",
+    "Send an encrypted reply…": "Отправить зашифрованный ответ…",
+    "Send a reply (unencrypted)…": "Отправить ответ (незашифрованный)…",
+    "Send an encrypted message…": "Отправить зашифрованное сообщение…",
+    "Send a message (unencrypted)…": "Отправить сообщение (незашифрованное)…"
 }

From 62ced91356c6eb8d3c2c08a9fc91a76fda192ecd Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 11 Jan 2018 10:51:03 +0000
Subject: [PATCH 283/927] Translated using Weblate (Russian)

Currently translated at 100.0% (967 of 967 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a060e1398b..33d1474c2b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -962,5 +962,9 @@
     "Send an encrypted reply…": "Отправить зашифрованный ответ…",
     "Send a reply (unencrypted)…": "Отправить ответ (незашифрованный)…",
     "Send an encrypted message…": "Отправить зашифрованное сообщение…",
-    "Send a message (unencrypted)…": "Отправить сообщение (незашифрованное)…"
+    "Send a message (unencrypted)…": "Отправить сообщение (незашифрованное)…",
+    "Replying": "Отвечая",
+    "Minimize apps": "Свернуть приложения",
+    "Quote": "Цитата",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отметить известные устройства и отправить</sendAnywayText> или <cancelText>отменить все</cancelText>."
 }

From 2cf9da8c954f85e20faea386a92936867332e748 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 11:12:46 +0000
Subject: [PATCH 284/927] Load user stickerpacks

---
 src/components/views/rooms/MessageComposer.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 37e5e1f911..b26a3b2c17 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -24,6 +24,7 @@ import dis from '../../../dispatcher';
 import Autocomplete from './Autocomplete';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import Popover from 'react-simple-popover';
+import Widgets from '../../../utils/widgets';
 
 export default class MessageComposer extends React.Component {
     constructor(props, context) {
@@ -283,10 +284,11 @@ export default class MessageComposer extends React.Component {
 
         // Stickers
         if (this.state.showStickers) {
-            let stickerpackWidget = '';
+            const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
+            console.warn('Stickerpack widgets', stickerpackWidget);
             let stickersContent = <p>Click here to add your first sitckerpack</p>;
-            if (true) {
-                stickersContent = <iframe src={stickerpackWidget} style={{
+            if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
+                stickersContent = <iframe src={stickerpackWidget.content.url} style={{
                     borderRadius: '5px',
                     border: 'none',
                 }}></iframe>;

From 8f26155c16678fd7ec7fc9d31e82ac3185153f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 11 Jan 2018 11:19:52 +0000
Subject: [PATCH 285/927] Translated using Weblate (French)

Currently translated at 100.0% (980 of 980 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 2929e0f3a3..c62e564d46 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -966,5 +966,18 @@
     "Replying": "Répond",
     "Minimize apps": "Minimiser les applications",
     "Quote": "Citer",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>marquer les appareils comme connus et envoyer</sendAnywayText> ou <cancelText>tout annuler</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>marquer les appareils comme connus et envoyer</sendAnywayText> ou <cancelText>tout annuler</cancelText>.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Le respect de votre vie privée est important pour nous, donc nous ne collectons aucune donnée personnelle ou permettant de vous identifier pour nos statistiques.",
+    "Learn more about how we use analytics.": "En savoir plus sur notre utilisation des statistiques.",
+    "The information being sent to us to help make Riot.im better includes:": "Les informations qui nous sont envoyées pour nous aider à améliorer Riot.im comprennent :",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Nous enregistrons aussi chaque page que vous utilisez dans l'application (en ce moment <CurrentPageHash>), votre User Agent (<CurrentUserAgent>) et la résolution de votre appareil (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si la page contient des informations permettant de vous identifier, comme un salon, un identifiant d'utilisateur ou de groupe, ces données sont enlevées avant qu'elle ne soit envoyée au serveur.",
+    "The platform you're on": "La plateforme que vous utilisez",
+    "The version of Riot.im": "La version de Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Si vous êtes connecté ou non (nous n'enregistrons pas votre nom d'utilisateur)",
+    "Your language of choice": "La langue que vous avez choisie",
+    "Which officially provided instance you are using, if any": "Quelle instance officielle vous utilisez, si c'est le cas",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si vous utilisez le mode de texte enrichi de l'éditeur de texte enrichi",
+    "Your homeserver's URL": "L'URL de votre serveur d'accueil",
+    "Your identity server's URL": "L'URL de votre serveur d'identité"
 }

From 78bd25eff0a75a2c6bacc41460085ec3651624f7 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 11:36:19 +0000
Subject: [PATCH 286/927] Sticker popover styling

---
 src/components/views/rooms/MessageComposer.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index b26a3b2c17..ba7b238bd3 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -289,8 +289,8 @@ export default class MessageComposer extends React.Component {
             let stickersContent = <p>Click here to add your first sitckerpack</p>;
             if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
                 stickersContent = <iframe src={stickerpackWidget.content.url} style={{
-                    borderRadius: '5px',
                     border: 'none',
+                    height: '160px',
                 }}></iframe>;
             }
 
@@ -309,12 +309,14 @@ export default class MessageComposer extends React.Component {
                         show={this.state.showStickers}
                         onHide={this.onHideStickersClick}
                         containerStyle={{
-                            zIndex: 100,
+                            zIndex: 1000,
                         }}
                         style={{
                             borderRadius: '5px',
                             width: 'initial',
                             padding: 0,
+                            overflow: 'hidden',
+                            height: '160px'
                         }}
                         children={stickersContent}
                     />

From d0c16fa7a1fa604425102d9e45768c494f7b2028 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 11:49:46 +0000
Subject: [PATCH 287/927] Convert to ES6 class.

---
 src/components/views/elements/AppTile.js | 104 +++++++++++------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 46cccde19f..4759537960 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -1,4 +1,4 @@
-/*
+/**
 Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,31 +36,8 @@ import dis from '../../../dispatcher';
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 
-export default React.createClass({
-    displayName: 'AppTile',
-
-    propTypes: {
-        id: React.PropTypes.string.isRequired,
-        url: React.PropTypes.string.isRequired,
-        name: React.PropTypes.string.isRequired,
-        room: React.PropTypes.object.isRequired,
-        type: React.PropTypes.string.isRequired,
-        // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
-        // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
-        fullWidth: React.PropTypes.bool,
-        // UserId of the current user
-        userId: React.PropTypes.string.isRequired,
-        // UserId of the entity that added / modified the widget
-        creatorUserId: React.PropTypes.string,
-        waitForIframeLoad: React.PropTypes.bool,
-    },
-
-    getDefaultProps() {
-        return {
-            url: "",
-            waitForIframeLoad: true,
-        };
-    },
+export default class AppTile extends React.Component {
+    static displayName ='AppTile';
 
     /**
      * Set initial component state when the App wUrl (widget URL) is being updated.
@@ -84,7 +61,7 @@ export default React.createClass({
             widgetPageTitle: newProps.widgetPageTitle,
             capabilities: [],
         };
-    },
+    }
 
 
     /**
@@ -94,7 +71,7 @@ export default React.createClass({
      */
     _hasCapability(capability) {
         return this.state.capabilities.some((c) => {return c === capability;});
-    },
+    }
 
     /**
      * Add widget instance specific parameters to pass in wUrl
@@ -122,11 +99,11 @@ export default React.createClass({
         u.query = params;
 
         return u.format();
-    },
+    }
 
     getInitialState() {
         return this._getNewState(this.props);
-    },
+    }
 
     /**
      * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
@@ -150,7 +127,7 @@ export default React.createClass({
             }
         }
         return false;
-    },
+    }
 
     isMixedContent() {
         const parentContentProtocol = window.location.protocol;
@@ -162,18 +139,18 @@ export default React.createClass({
             return true;
         }
         return false;
-    },
+    }
 
     componentWillMount() {
         this.setScalarToken();
-    },
+    }
 
     componentDidMount() {
         // Legacy Jitsi widget messaging -- TODO replace this with standard widget
         // postMessaging API
         dis.register(this._onAction);
         window.addEventListener('message', this._onMessage, false);
-    },
+    }
 
     /**
      * Adds a scalar token to the widget URL, if required
@@ -225,14 +202,14 @@ export default React.createClass({
                 initialising: false,
             });
         });
-    },
+    }
 
     componentWillUnmount() {
         this.widgetMessaging.stopListening();
         this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
         dis.unregister(this._onAction);
         window.removeEventListener('message', this._onMessage);
-    },
+    }
 
     componentWillReceiveProps(nextProps) {
         if (nextProps.url !== this.props.url) {
@@ -247,7 +224,7 @@ export default React.createClass({
                 widgetPageTitle: nextProps.widgetPageTitle,
             });
         }
-    },
+    }
 
     // Legacy Jitsi widget messaging
     // TODO -- This should be replaced with the new widget postMessaging API
@@ -268,11 +245,11 @@ export default React.createClass({
                 .document.querySelector('iframe[id^="jitsiConferenceFrame"]');
             PlatformPeg.get().setupScreenSharingForIframe(iframe);
         }
-    },
+    }
 
     _canUserModify() {
         return WidgetUtils.canUserModifyWidgets(this.props.room.roomId);
-    },
+    }
 
     _onEditClick(e) {
         console.log("Edit widget ID ", this.props.id);
@@ -282,7 +259,7 @@ export default React.createClass({
         Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
             src: src,
         }, "mx_IntegrationsManager");
-    },
+    }
 
     _onSnapshotClick(e) {
         console.warn("Requesting widget snapshot");
@@ -294,7 +271,7 @@ export default React.createClass({
         }).catch((err) => {
             console.error("Failed to get screenshot", err);
         });
-    },
+    }
 
     /* If user has permission to modify widgets, delete the widget,
      * otherwise revoke access for the widget to load in the user's browser
@@ -329,7 +306,7 @@ export default React.createClass({
             console.log("Revoke widget permissions - %s", this.props.id);
             this._revokeWidgetPermission();
         }
-    },
+    }
 
     /**
      * Called when widget iframe has finished loading
@@ -347,7 +324,7 @@ export default React.createClass({
             console.log("Failed to get widget capabilities", this.widgetId, err);
         });
         this.setState({loading: false});
-    },
+    }
 
     _onAction(payload) {
         if (payload.widgetId === this.props.id) {
@@ -361,7 +338,7 @@ export default React.createClass({
                 break;
             }
         }
-    },
+    }
 
     /**
      * Set remote content title on AppTile
@@ -375,7 +352,7 @@ export default React.createClass({
         }, (err) =>{
             console.error("Failed to get page title", err);
         });
-    },
+    }
 
     // Widget labels to render, depending upon user permissions
     // These strings are translated at the point that they are inserted in to the DOM, in the render method
@@ -384,20 +361,20 @@ export default React.createClass({
             return _td('Delete widget');
         }
         return _td('Revoke widget access');
-    },
+    }
 
     /* TODO -- Store permission in account data so that it is persisted across multiple devices */
     _grantWidgetPermission() {
         console.warn('Granting permission to load widget - ', this.state.widgetUrl);
         localStorage.setItem(this.state.widgetPermissionId, true);
         this.setState({hasPermissionToLoad: true});
-    },
+    }
 
     _revokeWidgetPermission() {
         console.warn('Revoking permission to load widget - ', this.state.widgetUrl);
         localStorage.removeItem(this.state.widgetPermissionId);
         this.setState({hasPermissionToLoad: false});
-    },
+    }
 
     formatAppTileName() {
         let appTileName = "No name";
@@ -405,7 +382,7 @@ export default React.createClass({
             appTileName = this.props.name.trim();
         }
         return appTileName;
-    },
+    }
 
     onClickMenuBar(ev) {
         ev.preventDefault();
@@ -420,7 +397,7 @@ export default React.createClass({
             action: 'appsDrawer',
             show: !this.props.show,
         });
-    },
+    }
 
     _getSafeUrl() {
         const parsedWidgetUrl = url.parse(this.state.widgetUrl);
@@ -429,7 +406,7 @@ export default React.createClass({
             safeWidgetUrl = url.format(parsedWidgetUrl);
         }
         return safeWidgetUrl;
-    },
+    }
 
     render() {
         let appTileBody;
@@ -556,5 +533,26 @@ export default React.createClass({
                 { appTileBody }
             </div>
         );
-    },
-});
+    }
+}
+
+AppTile.propTypes = {
+    id: React.PropTypes.string.isRequired,
+    url: React.PropTypes.string.isRequired,
+    name: React.PropTypes.string.isRequired,
+    room: React.PropTypes.object.isRequired,
+    type: React.PropTypes.string.isRequired,
+    // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
+    // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
+    fullWidth: React.PropTypes.bool,
+    // UserId of the current user
+    userId: React.PropTypes.string.isRequired,
+    // UserId of the entity that added / modified the widget
+    creatorUserId: React.PropTypes.string,
+    waitForIframeLoad: React.PropTypes.bool,
+};
+
+AppTile.defaultProps = {
+    url: "",
+    waitForIframeLoad: true,
+};

From 8ad4da54cb79543eb9f724f02d4ea8757cadc059 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Jan 2018 12:04:53 +0000
Subject: [PATCH 288/927] Fix missing negation

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

diff --git a/src/components/views/room_settings/RelatedGroupSettings.js b/src/components/views/room_settings/RelatedGroupSettings.js
index 4f02dc6c20..65132b9b74 100644
--- a/src/components/views/room_settings/RelatedGroupSettings.js
+++ b/src/components/views/room_settings/RelatedGroupSettings.js
@@ -58,7 +58,7 @@ module.exports = React.createClass({
         const cli = this.context.matrixClient;
         const room = cli.getRoom(this.props.roomId);
         if (!room.currentState.maySendStateEvent('m.room.related_groups', cli.getUserId())) return false;
-        return isEqual(this.getInitialGroupList(), this.state.newGroupsList);
+        return !isEqual(this.getInitialGroupList(), this.state.newGroupsList);
     },
 
     saveSettings: function() {

From da562e015cbef4df56e89c805c72e31037b97a01 Mon Sep 17 00:00:00 2001
From: Klaus Marx <km@slsx.de>
Date: Thu, 11 Jan 2018 11:16:26 +0000
Subject: [PATCH 289/927] Translated using Weblate (German)

Currently translated at 99.2% (973 of 980 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index ec2d43aed7..f60b4e582d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -952,5 +952,25 @@
     "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText> oder <cancelText>alle abbrechen</cancelText>.",
     "Warning": "Warnung",
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Eine tiefgreifende Migration im Kontext der Verschlüsselungsdaten wurde durchgeführt. Ende-zu-Ende-Verschlüsselung wird nicht mehr funktionieren, wenn du zu einer älteren Version von Riot zurückkehrst. Wenn du Ende-zu-Ende-Verschlüssung bei einer älteren Version von Riot brauchst, melde dich bitte vorher ab. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
-    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel."
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
+    "Send an encrypted reply…": "Verschlüsselte Antwort senden…",
+    "Send a reply (unencrypted)…": "Antwort senden (unverschlüsselt)…",
+    "Send an encrypted message…": "Verschlüsselte Nachricht senden…",
+    "Send a message (unencrypted)…": "Nachricht senden (unverschlüsselt)…",
+    "Replying": "Antwortet",
+    "Minimize apps": "Apps minimieren",
+    "Quote": "Zitat",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>Geräte als bekannt markieren und senden</sendAnywayText> oder <cancelText>alles abbrechen</cancelText>.",
+    "%(count)s of your messages have not been sent.|one": "Deine Nachricht wurde nicht gesendet.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Jetzt alle erneut senden</resendText> oder <cancelText>alle abbrechen</cancelText>. Du kannst auch einzelne Nachrichten auswählen und erneut senden oder abbrechen.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Nachricht jetzt erneut senden</resendText> oder <cancelText>senden abbrechen</cancelText> now.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privatsphäre ist uns wichtig, deshalb sammeln wir keine persönlichen oder identifizierbaren Daten für unsere Analysen.",
+    "The information being sent to us to help make Riot.im better includes:": "Die Informationen, die an uns gesendet werden um Riot.im zu verbessern enthalten:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Wir speichern auch jede Seite, die du in der App benutzt (currently <CurrentPageHash>), deinen User Agent (<CurrentUserAgent>) und die Bildschirmauflösung deines Gerätes (<CurrentDeviceResolution>).",
+    "The platform you're on": "Benutzte Plattform",
+    "The version of Riot.im": "Riot.im Version",
+    "Your language of choice": "Deine ausgewählte Sprache",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ob du den Richtext-Modus des Editors benutzt oder nicht",
+    "Your homeserver's URL": "Die URL deines Homeservers",
+    "Your identity server's URL": "Die URL deines Identitätsservers"
 }

From 0ad84f4ab5fe896d598c2061d3960a91f530046d Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 11 Jan 2018 11:24:36 +0000
Subject: [PATCH 290/927] Translated using Weblate (Russian)

Currently translated at 99.7% (978 of 980 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 33d1474c2b..6e8bbdb7a4 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -966,5 +966,16 @@
     "Replying": "Отвечая",
     "Minimize apps": "Свернуть приложения",
     "Quote": "Цитата",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отметить известные устройства и отправить</sendAnywayText> или <cancelText>отменить все</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отметить известные устройства и отправить</sendAnywayText> или <cancelText>отменить все</cancelText>.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Конфиденциальность важна для нас, поэтому мы не собираем никаких личных или идентифицируемых данных для нашей аналитики.",
+    "Learn more about how we use analytics.": "Подробнее о том, как мы используем аналитику.",
+    "The information being sent to us to help make Riot.im better includes:": "Информация направляемая нам, чтобы помочь сделать Riot.im лучше включает в себя:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Мы также записываем каждую страницу, которую вы используете в приложении (в данный момент <CurrentPageHash>), ваш пользовательский агент (<CurrentUserAgent>) и разрешение экрана вашего устройства (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Если на этой странице содержатся идентифицируемые сведения, например номер, идентификатор пользователя или группы, эти данные удаляются перед отправкой на сервер.",
+    "The platform you're on": "Используемая платформа",
+    "The version of Riot.im": "Версия Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Независимо от того, вошли вы или нет (мы не записываем ваше имя пользователя)",
+    "Your language of choice": "Выбранный вами язык",
+    "Your homeserver's URL": "URL-адрес домашнего сервера",
+    "Your identity server's URL": "URL-адрес вашего идентификационного сервера"
 }

From 3163673705dfafeb276d2806821bb230077f82eb Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 11 Jan 2018 12:30:29 +0000
Subject: [PATCH 291/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (980 of 980 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 936d152e3e..885d7a89b7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -957,5 +957,27 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ahogy lefokozod magad a változás visszafordíthatatlan, ha te vagy az utolsó jogosultságokkal bíró felhasználó a szobában a jogok már nem szerezhetők vissza.",
     "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Újraküldöd mind</resendText> vagy <cancelText>elveted mind</cancelText>. Az üzeneteket egyenként is elküldheted vagy elvetheted.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Üzenet újraküldése</resendText> vagy <cancelText>üzenet elvetése</cancelText> most."
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Üzenet újraküldése</resendText> vagy <cancelText>üzenet elvetése</cancelText> most.",
+    "Message Replies": "Üzenet válaszok",
+    "Send an encrypted reply…": "Titkosított válasz küldése…",
+    "Send a reply (unencrypted)…": "Válasz küldése (titkosítatlanul)…",
+    "Send an encrypted message…": "Titkosított üzenet küldése…",
+    "Send a message (unencrypted)…": "Üzenet küldése (titkosítás nélkül)…",
+    "Replying": "Válaszolni",
+    "Minimize apps": "Alkalmazás összecsukása",
+    "Quote": "Idézet",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Eszközök megjelenítése</showDevicesText>, <sendAnywayText>eszközök ismertnek jelölése és küldés</sendAnywayText> vagy <cancelText>mindent megszakít</cancelText>.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A személyes adatok védelme fontos számunkra, így mi nem gyűjtünk személyes és személyhez köthető adatokat az analitikánkhoz.",
+    "Learn more about how we use analytics.": "Tudj meg többet arról hogyan használjuk az analitikai adatokat.",
+    "The information being sent to us to help make Riot.im better includes:": "Az adatok amiket a Riot.im javításához felhasználunk az alábbiak:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Felvesszük az összes oldalt amit az alkalmazásban használsz (jelenleg <CurrentPageHash>), a \"User Agent\"-et (<CurrentUserAgent>) és az eszköz felbontását (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Minden azonosításra alkalmas adatot mint a szoba, felhasználó vagy csoport azonosítót mielőtt az adatokat elküldenénk eltávolításra kerülnek.",
+    "The platform you're on": "Ezt a platformot használod:",
+    "The version of Riot.im": "Riot.im verziója",
+    "Whether or not you're logged in (we don't record your user name)": "Be vagy-e jelentkezve vagy nem (a felhasználói nevedet nem tároljuk)",
+    "Your language of choice": "A használt nyelv",
+    "Which officially provided instance you are using, if any": "Milyen hivatalosan nyújtott verziót használsz",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Használod-e a Richtext módot a szerkesztőben vagy nem",
+    "Your homeserver's URL": "Az egyedi szerver URL-t",
+    "Your identity server's URL": "Az azonosítási szerver URL-t"
 }

From 4f3670941d187ecba0e2223543abfe824c718eca Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 12:33:02 +0000
Subject: [PATCH 292/927] Bind functions

---
 src/components/views/elements/AppTile.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 4759537960..4bbc06413d 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -39,6 +39,19 @@ const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 export default class AppTile extends React.Component {
     static displayName ='AppTile';
 
+    constructor(props) {
+        super(props);
+        this.state = this._getNewState(this.props);
+
+        this._onAction = this._onAction.bind(this);
+        this._onMessage = this._onMessage.bind(this);
+        this._onLoaded = this._onLoaded.bind(this);
+        this._onEditClick = this._onEditClick.bind(this);
+        this._onDeleteClick = this._onDeleteClick.bind(this);
+        this._onSnapshotClick = this._onSnapshotClick.bind(this);
+        this.onClickMenuBar = this.onClickMenuBar.bind(this);
+    }
+
     /**
      * Set initial component state when the App wUrl (widget URL) is being updated.
      * Component props *must* be passed (rather than relying on this.props).
@@ -101,9 +114,6 @@ export default class AppTile extends React.Component {
         return u.format();
     }
 
-    getInitialState() {
-        return this._getNewState(this.props);
-    }
 
     /**
      * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api

From 1ab71f6f50092aeafc4de44bc9f248c9e8a021d9 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 13:20:58 +0000
Subject: [PATCH 293/927] Load stickers in AppTile

---
 src/components/views/elements/AppTile.js      | 16 ++++++++++----
 src/components/views/rooms/MessageComposer.js | 22 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 4bbc06413d..60df6ade9b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -41,7 +41,8 @@ export default class AppTile extends React.Component {
 
     constructor(props) {
         super(props);
-        this.state = this._getNewState(this.props);
+        console.warn('AppTile constructor', props);
+        this.state = this._getNewState(props);
 
         this._onAction = this._onAction.bind(this);
         this._onMessage = this._onMessage.bind(this);
@@ -158,8 +159,10 @@ export default class AppTile extends React.Component {
     componentDidMount() {
         // Legacy Jitsi widget messaging -- TODO replace this with standard widget
         // postMessaging API
-        dis.register(this._onAction);
         window.addEventListener('message', this._onMessage, false);
+
+        // General event handler
+        dis.register(this._onAction);
     }
 
     /**
@@ -322,7 +325,7 @@ export default class AppTile extends React.Component {
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
-        // console.warn("App frame loaded", this.props.id);
+        console.warn("App frame loaded", this.props.id);
         this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
@@ -494,6 +497,7 @@ export default class AppTile extends React.Component {
 
         return (
             <div className={this.props.fullWidth ? "mx_AppTileFullWidth" : "mx_AppTile"} id={this.props.id}>
+                { this.props.showMenubar &&
                 <div ref="menu_bar" className="mx_AppTileMenuBar" onClick={this.onClickMenuBar}>
                     <span className="mx_AppTileMenuBarTitle">
                         <TintableSvgButton
@@ -539,7 +543,7 @@ export default class AppTile extends React.Component {
                             height="10"
                         />
                     </span>
-                </div>
+                </div> }
                 { appTileBody }
             </div>
         );
@@ -560,9 +564,13 @@ AppTile.propTypes = {
     // UserId of the entity that added / modified the widget
     creatorUserId: React.PropTypes.string,
     waitForIframeLoad: React.PropTypes.bool,
+    showMenubar: React.PropTypes.bool,
+    // Should the AppTile render itself
+    show: React.PropTypes.bool,
 };
 
 AppTile.defaultProps = {
     url: "",
     waitForIframeLoad: true,
+    showMenubar: true,
 };
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index ba7b238bd3..7e318c57d5 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -25,6 +25,7 @@ import Autocomplete from './Autocomplete';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
 import Popover from 'react-simple-popover';
 import Widgets from '../../../utils/widgets';
+import AppTile from '../elements/AppTile';
 
 export default class MessageComposer extends React.Component {
     constructor(props, context) {
@@ -285,13 +286,26 @@ export default class MessageComposer extends React.Component {
         // Stickers
         if (this.state.showStickers) {
             const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
-            console.warn('Stickerpack widgets', stickerpackWidget);
             let stickersContent = <p>Click here to add your first sitckerpack</p>;
             if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
-                stickersContent = <iframe src={stickerpackWidget.content.url} style={{
+                stickersContent = <div style={{
                     border: 'none',
                     height: '160px',
-                }}></iframe>;
+                }}>
+                    <AppTile
+                        id={stickerpackWidget.id}
+                        url={stickerpackWidget.content.url}
+                        name={stickerpackWidget.content.name}
+                        room={this.props.room}
+                        type={stickerpackWidget.content.type}
+                        fullWidth={true}
+                        userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
+                        creatorUserId={MatrixClientPeg.get().credentials.userId}
+                        waitForIframeLoad={true}
+                        show={true}
+                        showMenubar={false}
+                    />
+                </div>;
             }
 
             hideStickersButton =
@@ -316,7 +330,7 @@ export default class MessageComposer extends React.Component {
                             width: 'initial',
                             padding: 0,
                             overflow: 'hidden',
-                            height: '160px'
+                            height: '160px',
                         }}
                         children={stickersContent}
                     />

From 9df4dae9755c14619c4a55c283b58b5d14ef42fc Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 13:41:20 +0000
Subject: [PATCH 294/927] Used forked version of react-popover

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

diff --git a/package.json b/package.json
index 24f5e3ef58..43a5ebfcfd 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^15.4.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
-    "react-simple-popover": "^0.2.2",
+    "react-simple-popover": "matrix-org/react-popover",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From 90b7cb37607477a3a59253db5d0722db2caf1c70 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 11 Jan 2018 13:41:55 +0000
Subject: [PATCH 295/927] Consistent popover size

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 7e318c57d5..9f4a017689 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -285,12 +285,15 @@ export default class MessageComposer extends React.Component {
 
         // Stickers
         if (this.state.showStickers) {
+            const popoverWidth = '300px';
+            const popoverHeight = '300px';
             const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
             let stickersContent = <p>Click here to add your first sitckerpack</p>;
             if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
                 stickersContent = <div style={{
                     border: 'none',
-                    height: '160px',
+                    height: popoverHeight,
+                    width: popoverWidth,
                 }}>
                     <AppTile
                         id={stickerpackWidget.id}
@@ -327,10 +330,10 @@ export default class MessageComposer extends React.Component {
                         }}
                         style={{
                             borderRadius: '5px',
-                            width: 'initial',
                             padding: 0,
                             overflow: 'hidden',
-                            height: '160px',
+                            height: popoverHeight,
+                            width: popoverWidth,
                         }}
                         children={stickersContent}
                     />

From 192cba2b79bee1df48c731ae3fcb47887e693319 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Jan 2018 19:25:43 +0000
Subject: [PATCH 296/927] allow text&onSenderProfileClick for tileShape===quote

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index e412b4b4d3..937826b4fd 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -517,7 +517,7 @@ module.exports = withMatrixClient(React.createClass({
 
         if (needsSenderProfile) {
             let text = null;
-            if (!this.props.tileShape) {
+            if (!this.props.tileShape || this.props.tileShape === 'quote') {
                 if (msgtype === 'm.image') text = _td('%(senderName)s sent an image');
                 else if (msgtype === 'm.video') text = _td('%(senderName)s sent a video');
                 else if (msgtype === 'm.file') text = _td('%(senderName)s uploaded a file');

From 23bd61273003dad1415de75a8f66d78885ce44da Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 11 Jan 2018 19:29:00 +0000
Subject: [PATCH 297/927] Focus composer when clicking `Reply` (quote event)

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

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index f24a04dc6c..932ccf3446 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -273,6 +273,7 @@ export default class MessageComposerInput extends React.Component {
         let contentState = this.state.editorState.getCurrentContent();
 
         switch (payload.action) {
+            case 'quote_event':
             case 'focus_composer':
                 editor.focus();
                 break;

From 18098da94a10e04e162c03c4d56b9982def5f1b2 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 11 Jan 2018 12:57:54 +0000
Subject: [PATCH 298/927] Translated using Weblate (Basque)

Currently translated at 98.8% (969 of 980 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index c6d09f115a..c50ba9ed77 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -957,5 +957,16 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu.",
     "%(count)s of your messages have not been sent.|one": "Zure mezua ez da bidali.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Birbidali guztiak</resendText> edo <cancelText>baztertu guztiak</cancelText> orain. Mezuak banaka birbidali edo baztertu ditzakezu ere.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain."
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Birbidali mezua</resendText> edo <cancelText>baztertu mezua</cancelText> orain.",
+    "Message Replies": "Mezuei erantzunak",
+    "Send an encrypted reply…": "Bidali zifratutako erantzun bat…",
+    "Send a reply (unencrypted)…": "Bidali erantzun bat (zifratu gabea)…",
+    "Send an encrypted message…": "Bidali zifratutako mezu bat…",
+    "Send a message (unencrypted)…": "Bidali mezu bat (zifratu gabea)…",
+    "Replying": "Erantzuten",
+    "Minimize apps": "Minimizatu aplikazioak",
+    "Quote": "Aipua",
+    "The platform you're on": "Zauden plataforma",
+    "The version of Riot.im": "Riot.im bertsioa",
+    "Your language of choice": "Zure aukerako hizkuntza"
 }

From 7a324b4104fc3ca5a3cfde2f350e835aae91acec Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 11 Jan 2018 12:34:08 +0000
Subject: [PATCH 299/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (980 of 980 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 885d7a89b7..6384644925 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -972,7 +972,7 @@
     "The information being sent to us to help make Riot.im better includes:": "Az adatok amiket a Riot.im javításához felhasználunk az alábbiak:",
     "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Felvesszük az összes oldalt amit az alkalmazásban használsz (jelenleg <CurrentPageHash>), a \"User Agent\"-et (<CurrentUserAgent>) és az eszköz felbontását (<CurrentDeviceResolution>).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Minden azonosításra alkalmas adatot mint a szoba, felhasználó vagy csoport azonosítót mielőtt az adatokat elküldenénk eltávolításra kerülnek.",
-    "The platform you're on": "Ezt a platformot használod:",
+    "The platform you're on": "A platform amit használsz",
     "The version of Riot.im": "Riot.im verziója",
     "Whether or not you're logged in (we don't record your user name)": "Be vagy-e jelentkezve vagy nem (a felhasználói nevedet nem tároljuk)",
     "Your language of choice": "A használt nyelv",

From 23543614e1752be9c29ba5ad399ecb9b650cef9b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 12 Jan 2018 09:52:53 +0000
Subject: [PATCH 300/927] Add react-popover-tiny

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

diff --git a/package.json b/package.json
index 43a5ebfcfd..36f35556fc 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "react-dom": "^15.4.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "react-simple-popover": "matrix-org/react-popover",
+    "react-tiny-popover": "^3.2.5",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From aa5d42d04514ffc215e8d3848e163beb8f71022f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 12 Jan 2018 10:32:36 +0000
Subject: [PATCH 301/927] Remove spurious dot

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

diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index c783197f52..8814beace6 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -66,7 +66,7 @@ export default React.createClass({
             >
                 <div className="mx_Dialog_content">
                     { this.props.description }
-                </div>.
+                </div>
                 <DialogButtons primaryButton={this.props.button || _t('OK')}
                     onPrimaryButtonClick={this.onOk}
                     primaryButtonClass={primaryButtonClass}

From 99a72b5b2ba852a43a5f0a869b63b7104333db15 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 12 Jan 2018 10:52:51 +0000
Subject: [PATCH 302/927] Fix autofocus broken in
 https://github.com/matrix-org/matrix-react-sdk/pull/1674

'focus' attribute was on the wrong thing
---
 src/components/views/dialogs/QuestionDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/QuestionDialog.js b/src/components/views/dialogs/QuestionDialog.js
index 8814beace6..6cfe0babcb 100644
--- a/src/components/views/dialogs/QuestionDialog.js
+++ b/src/components/views/dialogs/QuestionDialog.js
@@ -62,7 +62,6 @@ export default React.createClass({
             <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished}
                 onEnterPressed={this.onOk}
                 title={this.props.title}
-                focus={this.props.focus}
             >
                 <div className="mx_Dialog_content">
                     { this.props.description }
@@ -70,6 +69,7 @@ export default React.createClass({
                 <DialogButtons primaryButton={this.props.button || _t('OK')}
                     onPrimaryButtonClick={this.onOk}
                     primaryButtonClass={primaryButtonClass}
+                    focus={this.props.focus}
                     onCancel={this.onCancel}
                 >
                     { this.props.extraButtons }

From a40dafd701d35346e02a900d86f8b0d63141bcce Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 12 Jan 2018 12:38:08 +0000
Subject: [PATCH 303/927] Translated using Weblate (Basque)

Currently translated at 100.0% (980 of 980 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index c50ba9ed77..5309a76148 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -968,5 +968,16 @@
     "Quote": "Aipua",
     "The platform you're on": "Zauden plataforma",
     "The version of Riot.im": "Riot.im bertsioa",
-    "Your language of choice": "Zure aukerako hizkuntza"
+    "Your language of choice": "Zure aukerako hizkuntza",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>markatu gailuak ezagun gisa eta bidali</sendAnywayText> edo <cancelText>ezeztatu guztia</cancelText>.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Pribatutasuna garrantzitsua da guretzat, beraz ez dugu datu pertsonalik edo identifikagarririk jasotzen gure estatistiketan.",
+    "Learn more about how we use analytics.": "Ikasi gehiago estatistikei ematen diegun erabileraz.",
+    "The information being sent to us to help make Riot.im better includes:": "Riot.im hobetzeko bidaltzen zaigun informazioan hau dago:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Aplikazioan erabiltzen duzun orri bakoitza jasotzen dugu (orain <CurrentPageHash>), erabiltzaile-agentea (<CurrentUserAgent>) eta gailuaren bereizmena (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Orri honek informazio identifikagarria badu ere, esaterako gela, erabiltzailea edo talde ID-a, datu hauek ezabatu egiten dira zerbitzarira bidali aurretik.",
+    "Whether or not you're logged in (we don't record your user name)": "Saioa hasita dagoen ala ez (ez dugu erabiltzaile-izena gordetzen)",
+    "Which officially provided instance you are using, if any": "Erabiltzen ari zaren instantzia ofiziala, balego",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Testu editorean testu aberatsa modua erabiltzen duzun",
+    "Your homeserver's URL": "Zure hasiera zerbitzariaren URL-a",
+    "Your identity server's URL": "Zure identitate zerbitzariaren URL-a"
 }

From 3cadb9b58736c5f27e42c74f80f0850ba2067024 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 12 Jan 2018 16:21:30 +0000
Subject: [PATCH 304/927] Fall back for missing i18n plurals

Counterpart doesn't do fallback if there is a translation for the
base string in the preferred language but not the required
pluralisation. This meant that if someone added some plurals to a
language or a string, but not all, you'd get completely empty
strings in the interface.

Work around this in the wrapper function.
---
 src/languageHandler.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/languageHandler.js b/src/languageHandler.js
index e732927a75..2d1fbc2f85 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -40,7 +40,7 @@ export function _td(s) {
 
 // Wrapper for counterpart's translation function so that it handles nulls and undefineds properly
 // Takes the same arguments as counterpart.translate()
-function safeCounterpartTranslate(...args) {
+function safeCounterpartTranslate(text, options) {
     // Horrible hack to avoid https://github.com/vector-im/riot-web/issues/4191
     // The interpolation library that counterpart uses does not support undefined/null
     // values and instead will throw an error. This is a problem since everywhere else
@@ -48,19 +48,29 @@ function safeCounterpartTranslate(...args) {
     // valid ES6 template strings to i18n strings it's extremely easy to pass undefined/null
     // if there are no existing null guards. To avoid this making the app completely inoperable,
     // we'll check all the values for undefined/null and stringify them here.
-    if (args[1] && typeof args[1] === 'object') {
-        Object.keys(args[1]).forEach((k) => {
-            if (args[1][k] === undefined) {
+    let count;
+
+    if (options && typeof options === 'object') {
+        count = options['count'];
+        Object.keys(options).forEach((k) => {
+            if (options[k] === undefined) {
                 console.warn("safeCounterpartTranslate called with undefined interpolation name: " + k);
-                args[1][k] = 'undefined';
+                options[k] = 'undefined';
             }
-            if (args[1][k] === null) {
+            if (options[k] === null) {
                 console.warn("safeCounterpartTranslate called with null interpolation name: " + k);
-                args[1][k] = 'null';
+                options[k] = 'null';
             }
         });
     }
-    return counterpart.translate(...args);
+    let translated = counterpart.translate(text, options);
+    if (translated === undefined && count !== undefined) {
+        // counterpart does not do fallback if no pluralisation exists
+        // in the preferred language, so do it here
+        options.locale = 'en';
+        translated = counterpart.translate(text, options);
+    }
+    return translated;
 }
 
 /*

From a3c6dd36eff90f386b553af96b45166a30dc3dc6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 12 Jan 2018 17:38:21 +0000
Subject: [PATCH 305/927] Stickers popover.

---
 src/components/views/rooms/MessageComposer.js | 129 +++++++++++-------
 1 file changed, 79 insertions(+), 50 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 9f4a017689..b17694011c 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -23,7 +23,7 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import Autocomplete from './Autocomplete';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import Popover from 'react-simple-popover';
+import Popover, {ArrowContainer} from 'react-tiny-popover';
 import Widgets from '../../../utils/widgets';
 import AppTile from '../elements/AppTile';
 
@@ -266,7 +266,13 @@ export default class MessageComposer extends React.Component {
                 alt={e2eTitle} title={e2eTitle}
             />,
         );
-        let callButton, videoCallButton, hangupButton, showStickersButton, hideStickersButton;
+
+        let callButton;
+        let videoCallButton;
+        let hangupButton;
+        let stickersButton;
+
+        // Call buttons
         if (this.props.callState && this.props.callState !== 'ended') {
             hangupButton =
                 <div key="controls_hangup" className="mx_MessageComposer_hangup" onClick={this.onHangupClick}>
@@ -284,63 +290,58 @@ export default class MessageComposer extends React.Component {
         }
 
         // Stickers
-        if (this.state.showStickers) {
-            const popoverWidth = '300px';
-            const popoverHeight = '300px';
-            const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
-            let stickersContent = <p>Click here to add your first sitckerpack</p>;
-            if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
-                stickersContent = <div style={{
+        const popoverWidth = '300px';
+        const popoverHeight = '300px';
+        const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
+
+        // Load stickerpack content
+        if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
+            this.state.stickersContent = <div
+                id='stickersContent'
+                className='mx_StickersContent'
+                style={{
                     border: 'none',
                     height: popoverHeight,
                     width: popoverWidth,
-                }}>
-                    <AppTile
-                        id={stickerpackWidget.id}
-                        url={stickerpackWidget.content.url}
-                        name={stickerpackWidget.content.name}
-                        room={this.props.room}
-                        type={stickerpackWidget.content.type}
-                        fullWidth={true}
-                        userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
-                        creatorUserId={MatrixClientPeg.get().credentials.userId}
-                        waitForIframeLoad={true}
-                        show={true}
-                        showMenubar={false}
-                    />
-                </div>;
-            }
+                }}
+            >
+                <AppTile
+                    id={stickerpackWidget.id}
+                    url={stickerpackWidget.content.url}
+                    name={stickerpackWidget.content.name}
+                    room={this.props.room}
+                    type={stickerpackWidget.content.type}
+                    fullWidth={true}
+                    userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
+                    creatorUserId={MatrixClientPeg.get().credentials.userId}
+                    waitForIframeLoad={true}
+                    show={true}
+                    showMenubar={false}
+                />
+            </div>;
+        } else {
+            // Default content to show if stickerpack widget not added
+            this.state.stickersContent = <p>Click here to add your first sitckerpack</p>;
+        }
 
-            hideStickersButton =
+
+        if (this.state.showStickers) {
+            // Show hide-stickers button
+            stickersButton =
                 <div
+                    id='stickersButton'
                     key="controls_hide_stickers"
                     className="mx_MessageComposer_stickers"
                     onClick={this.onHideStickersClick}
                     ref='target'
                     title={_t("Hide Stickers")}>
                     <TintableSvg src="img/icons-hide-stickers.svg" width="35" height="35" />
-                    <Popover
-                        placement='top'
-                        container={this.refs.messageComposerInput}
-                        target={this.refs.stickersContainer}
-                        show={this.state.showStickers}
-                        onHide={this.onHideStickersClick}
-                        containerStyle={{
-                            zIndex: 1000,
-                        }}
-                        style={{
-                            borderRadius: '5px',
-                            padding: 0,
-                            overflow: 'hidden',
-                            height: popoverHeight,
-                            width: popoverWidth,
-                        }}
-                        children={stickersContent}
-                    />
                 </div>;
         } else {
-            showStickersButton =
+            // Show show-stickers button
+            stickersButton =
                 <div
+                    id='stickersButton'
                     key="constrols_show_stickers"
                     className="mx_MessageComposer_stickers"
                     onClick={this.onShowStickersClick}
@@ -348,10 +349,38 @@ export default class MessageComposer extends React.Component {
                     <TintableSvg src="img/icons-show-stickers.svg" width="35" height="35" />
                 </div>;
         }
-        const stickersContainer = <div ref='stickersContainer' key='stickers'>
-            { showStickersButton }
-            { hideStickersButton }
-        </div>;
+
+        const stickers = <Popover
+            isOpen={this.state.showStickers}
+            position={'top'}
+            padding={1}
+            content={({ position, targetRect, popoverRect }) => (
+                <ArrowContainer
+                    position={position}
+                    targetRect={targetRect}
+                    popoverRect={popoverRect}
+                    arrowColor={'#76CFA6'}
+                    arrowSize={20}
+                    arrowStyle={{ opacity: 0.7 }}
+                >
+                    <div
+                        className='mx_PopoverOuterContainer'
+                        style={{
+                            backgroundColor: '#76CFA6', // '#d3efe1',
+                            opacity: 0.7,
+                            overflow: 'hidden',
+                            // border: '1px solid #666',
+                        }}
+                    >
+                        { this.state.stickersContent }
+                    </div>
+                </ArrowContainer>
+            )}
+        >
+            <div id='popoverTarget'>
+                { stickersButton }
+            </div>
+        </Popover>;
 
         const canSendMessages = this.props.room.currentState.maySendMessage(
             MatrixClientPeg.get().credentials.userId);
@@ -398,7 +427,7 @@ export default class MessageComposer extends React.Component {
                 hangupButton,
                 callButton,
                 videoCallButton,
-                stickersContainer,
+                stickers,
             );
         } else {
             controls.push(

From e42bea6277175e94bcd9ed92ee32c384e283a500 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 12 Jan 2018 18:17:03 +0000
Subject: [PATCH 306/927] Don't paginate whilst decrypting events

As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
---
 src/components/structures/TimelinePanel.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 3760bb37c5..4ade78af85 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -302,6 +302,8 @@ var TimelinePanel = React.createClass({
 
     // set off a pagination request.
     onMessageListFillRequest: function(backwards) {
+        if (!this._shouldPaginate()) return Promise.resolve(false);
+
         const dir = backwards ? EventTimeline.BACKWARDS : EventTimeline.FORWARDS;
         const canPaginateKey = backwards ? 'canBackPaginate' : 'canForwardPaginate';
         const paginatingKey = backwards ? 'backPaginating' : 'forwardPaginating';
@@ -1091,6 +1093,17 @@ var TimelinePanel = React.createClass({
         }, this.props.onReadMarkerUpdated);
     },
 
+    _shouldPaginate: function() {
+        // don't try to paginate while events in the timeline are
+        // still being decrypted. We don't render events while they're
+        // being decrypted, so they don't take up space in the timeline.
+        // This means we can pull quite a lot of events into the timeline
+        // and end up trying to render a lot of events.
+        return !this.state.events.some((e) => {
+            return e.isBeingDecrypted();
+        });
+    },
+
     render: function() {
         const MessagePanel = sdk.getComponent("structures.MessagePanel");
         const Loader = sdk.getComponent("elements.Spinner");

From ba5d92559b9b57bac455c0152cff379f0ce7eb5a Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 13 Jan 2018 12:58:50 +0000
Subject: [PATCH 307/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (980 of 980 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 611f6db7ff..40aa6b4905 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -687,5 +687,296 @@
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s 小工具已被 %(senderName)s 修改",
     "Copied!": "已複製！",
     "Failed to copy": "複製失敗",
-    "Add rooms to this community": "新增聊天室到此社群"
+    "Add rooms to this community": "新增聊天室到此社群",
+    "Call Failed": "通話失敗",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "此聊天室有未知的裝置：若您想要不驗證它們而繼續，可能會有其他人竊聽您的通話。",
+    "Review Devices": "審閱裝置",
+    "Call Anyway": "無論如何都通話",
+    "Answer Anyway": "無論如何都回覆",
+    "Call": "通話",
+    "Answer": "回覆",
+    "Who would you like to add to this community?": "您想要把誰新增到此社群內？",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：任何您新增到社群內的人都可以被任何知道社群 ID 的人公開看見",
+    "Invite new community members": "邀請新社群成員",
+    "Name or matrix ID": "名稱或 matrix ID",
+    "Invite to Community": "邀請到社群",
+    "Which rooms would you like to add to this community?": "您想要新增哪個聊天室到此社群？",
+    "Show these rooms to non-members on the community page and room list?": "在社群頁面與聊天室清單上顯示這些聊天室給非成員？",
+    "Add rooms to the community": "新增聊天室到社群",
+    "Room name or alias": "聊天室名稱或別名",
+    "Add to community": "新增到社群",
+    "Failed to invite the following users to %(groupId)s:": "邀請下列使用者到 %(groupId)s 失敗：",
+    "Failed to invite users to community": "邀請使用者到社群失敗",
+    "Failed to invite users to %(groupId)s": "邀請使用者到 %(groupId)s 失敗",
+    "Failed to add the following rooms to %(groupId)s:": "新增下列聊天室到 %(groupId)s 失敗：",
+    "Restricted": "限制",
+    "Ignored user": "已忽略的使用者",
+    "You are now ignoring %(userId)s": "您忽略了 %(userId)s",
+    "Unignored user": "未忽略的使用者",
+    "You are no longer ignoring %(userId)s": "您不再忽略 %(userId)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s 變更了聊天室的釘選訊息。",
+    "%(names)s and %(count)s others are typing|other": "%(names)s 與其他 %(count)s 個人正在輸入",
+    "%(names)s and %(count)s others are typing|one": "%(names)s 與另一個人正在輸入",
+    "Send": "傳送",
+    "Message Replies": "訊息回覆",
+    "Message Pinning": "訊息釘選",
+    "Presence Management": "出席管理",
+    "Tag Panel": "標籤面板",
+    "Disable Emoji suggestions while typing": "在輸入時停用繪文字建議",
+    "Hide avatar changes": "隱藏大頭貼變更",
+    "Hide display name changes": "隱藏顯示名稱變更",
+    "Disable big emoji in chat": "在聊天中停用大型繪文字",
+    "Mirror local video feed": "鏡射本機視訊 feed",
+    "Enable inline URL previews by default": "預設啟用內嵌 URL 預覽",
+    "Enable URL previews for this room (only affects you)": "對此聊天室啟用 URL 預覽（僅影響您）",
+    "Enable URL previews by default for participants in this room": "對此聊天室中的參與者預設啟用 URL 預覽",
+    "Delete %(count)s devices|other": "刪除 %(count)s 個裝置",
+    "Delete %(count)s devices|one": "刪除裝置",
+    "Select devices": "選取裝置",
+    "%(senderName)s sent an image": "%(senderName)s 傳送了一張圖片",
+    "%(senderName)s sent a video": "%(senderName)s 傳送了一則視訊",
+    "%(senderName)s uploaded a file": "%(senderName)s 上傳了一個檔案",
+    "Disinvite this user?": "取消邀請此使用者？",
+    "Kick this user?": "踢除此使用者？",
+    "Unban this user?": "取消阻擋此使用者？",
+    "Ban this user?": "阻擋此使用者？",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "如果您是聊天室中最後一位有特殊權限的使用者，您將無法復原此變更，因為無法再獲得特定權限。",
+    "Unignore": "取消忽略",
+    "Ignore": "忽略",
+    "Jump to read receipt": "跳到讀取回條",
+    "Mention": "提及",
+    "Invite": "邀請",
+    "User Options": "使用者選項",
+    "Send an encrypted reply…": "傳送加密的回覆……",
+    "Send a reply (unencrypted)…": "傳送回覆（未加密）……",
+    "Send an encrypted message…": "傳送加密的訊息……",
+    "Send a message (unencrypted)…": "傳送訊息（未加密）……",
+    "Unpin Message": "取消釘選訊息",
+    "Jump to message": "跳到訊息",
+    "No pinned messages.": "沒有已釘選的訊息。",
+    "Loading...": "正在載入……",
+    "Pinned Messages": "已釘選的訊息",
+    "%(duration)ss": "%(duration)s 秒",
+    "%(duration)sm": "%(duration)s 分鐘",
+    "%(duration)sh": "%(duration)s 小時",
+    "%(duration)sd": "%(duration)s 天",
+    "Online for %(duration)s": "已上線 %(duration)s",
+    "Idle for %(duration)s": "已閒置 %(duration)s",
+    "Offline for %(duration)s": "已離線 %(duration)s",
+    "Unknown for %(duration)s": "未知 %(duration)s",
+    "Unknown": "未知",
+    "Replying": "正在回覆",
+    "No rooms to show": "未顯示聊天室",
+    "Unnamed room": "未命名的聊天室",
+    "World readable": "所有人可讀",
+    "Guests can join": "訪客可加入",
+    "Remove avatar": "移除大頭貼",
+    "Drop here to favourite": "拖曳到這裡以加入到最愛",
+    "Drop here to tag direct chat": "拖曳到這裡以為聊天加上標籤",
+    "Drop here to restore": "拖曳到這裡以復原",
+    "Drop here to demote": "拖曳到這裡以降級",
+    "Community Invites": "社群邀請",
+    "You have been kicked from this room by %(userName)s.": "您已經被 %(userName)s 從此聊天室中踢除。",
+    "You have been banned from this room by %(userName)s.": "您已經被 %(userName)s 從此聊天室中阻擋。",
+    "You are trying to access a room.": "您正在嘗試存取聊天室。",
+    "To change the room's avatar, you must be a": "要變更聊天室的大頭貼，您必須是",
+    "To change the room's name, you must be a": "要變更聊天室的名稱，您必須是",
+    "To change the room's main address, you must be a": "要變更聊天室的主地址，您必須是",
+    "To change the room's history visibility, you must be a": "要變更聊天室的歷史紀錄可見度，您必須是",
+    "To change the permissions in the room, you must be a": "要變更聊天室中的權限，您必須是",
+    "To change the topic, you must be a": "要變更主題，您必須是",
+    "To modify widgets in the room, you must be a": "要修改聊天室中的小工具，您必須是",
+    "Banned by %(displayName)s": "被 %(displayName)s 阻擋",
+    "Members only (since the point in time of selecting this option)": "僅成員（自選取此選項開始）",
+    "Members only (since they were invited)": "僅成員（自他們被邀請開始）",
+    "Members only (since they joined)": "僅成員（自他們加入開始）",
+    "To send messages, you must be a": "要傳送訊息，您必須是",
+    "To invite users into the room, you must be a": "要邀請使用者到聊天室，您必須是",
+    "To configure the room, you must be a": "要設定聊天室，您必須是",
+    "To kick users, you must be a": "要踢除使用者，您必須是",
+    "To ban users, you must be a": "要阻擋使用者，您必須是",
+    "To remove other users' messages, you must be a": "要移除其他使用者的訊息，您必須是",
+    "To send events of type <eventType/>, you must be a": "要傳送 <eventType/> 類型的活動，您必須是",
+    "Addresses": "地址",
+    "Invalid community ID": "無效的社群 ID",
+    "'%(groupId)s' is not a valid community ID": "「%(groupId)s」不是有效的社群 ID",
+    "Flair": "特色",
+    "Showing flair for these communities:": "為這些社群顯示特色",
+    "This room is not showing flair for any communities": "此聊天室並未對任何社群顯示特色",
+    "New community ID (e.g. +foo:%(localDomain)s)": "新社群 ID（例子：+foo:%(localDomain)s）",
+    "URL previews are enabled by default for participants in this room.": "此聊天室已預設對參與者啟用 URL 預覽。",
+    "URL previews are disabled by default for participants in this room.": "此聊天室已預設對參與者停用 URL 預覽。",
+    "Message removed by %(userId)s": "訊息已被 %(userId)s 移除",
+    "Message removed": "訊息已移除",
+    "An email has been sent to %(emailAddress)s": "電子郵件已傳送給 %(emailAddress)s",
+    "A text message has been sent to %(msisdn)s": "文字訊息已傳送給 %(msisdn)s",
+    "Username on %(hs)s": "在 %(hs)s 上的使用者名稱",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
+    "Remove from community": "從社群中移除",
+    "Disinvite this user from community?": "從社群取消邀請此使用者？",
+    "Remove this user from community?": "從社群移除此使用者？",
+    "Failed to withdraw invitation": "撤回邀請失敗",
+    "Failed to remove user from community": "從社群移除使用者失敗",
+    "Filter community members": "過濾社群成員",
+    "Flair will appear if enabled in room settings": "若在聊天室設定內啟用將會顯示特色",
+    "Flair will not appear": "不會顯示特色",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "您確定您想要從 %(groupId)s 移除「%(roomName)s」嗎？",
+    "Removing a room from the community will also remove it from the community page.": "從社群移除聊天室同時也會將其從社群頁面中移除。",
+    "Failed to remove room from community": "從社群中移除聊天室失敗",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "從 %(groupId)s 移除「%(roomName)s」失敗",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "在 %(groupId)s 中的「%(roomName)s」能見度無法更新。",
+    "Visibility in Room List": "在聊天室清單中的能見度",
+    "Visible to everyone": "對所有人可見",
+    "Only visible to community members": "僅對社群成員可見",
+    "Filter community rooms": "過濾社群聊天室",
+    "Something went wrong when trying to get your communities.": "當嘗試取得您的社群時發生錯誤。",
+    "Display your community flair in rooms configured to show it.": "在設定了顯示特色的聊天室中顯示您的社群特色。",
+    "You're not currently a member of any communities.": "您目前不是任何社群的成員。",
+    "Delete Widget": "刪除小工具",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "刪除小工具會將它從此聊天室中所有使用者的收藏中移除。您確定您要刪除這個小工具嗎？",
+    "Minimize apps": "最小化應用程式",
+    "Communities": "社群",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s 加入了 %(count)s 次",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s 加入了",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s 加入了 %(count)s 次",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s 加入了",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s 離開了 %(count)s 次",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s 離開了",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s 離開了 %(count)s 次",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s 離開了",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s 加入並離開了 %(count)s 次",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s 加入並離開了",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s 加入並離開了 %(count)s 次",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s 加入並離開了",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s 離開並重新加入了 %(count)s 次",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s 離開並重新加入了",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s 離開並重新加入了 %(count)s 次",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s 離開並重新加入了",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s 回絕了他們的邀請 %(count)s 次",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s 回絕了他們的邀請",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s 回絕了他們的邀請 %(count)s 次",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s 回絕了他們的邀請",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s 撤回了他們的邀請 %(count)s 次",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s 撤回了他們的邀請",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s 撤回了他們的邀請 %(count)s 次",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s 撤回了他們的邀請",
+    "were invited %(count)s times|other": "被邀請了 %(count)s 次",
+    "were invited %(count)s times|one": "被邀請了",
+    "was invited %(count)s times|other": "被邀請了 %(count)s 次",
+    "was invited %(count)s times|one": "被邀請了",
+    "were banned %(count)s times|other": "被阻擋了 %(count)s 次",
+    "were banned %(count)s times|one": "被阻擋了",
+    "was banned %(count)s times|other": "被阻擋了 %(count)s 次",
+    "was banned %(count)s times|one": "被阻擋了",
+    "were unbanned %(count)s times|other": "被取消阻擋了 %(count)s 次",
+    "were unbanned %(count)s times|one": "被取消阻擋了",
+    "was unbanned %(count)s times|other": "被取消阻擋了 %(count)s 次",
+    "was unbanned %(count)s times|one": "被取消阻擋了",
+    "were kicked %(count)s times|other": "被踢除了 %(count)s 次",
+    "were kicked %(count)s times|one": "被踢除了",
+    "was kicked %(count)s times|other": "被踢除了 %(count)s 次",
+    "was kicked %(count)s times|one": "被踢除了",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s 變更了他們的名稱 %(count)s 次",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s 變更了他們的名稱",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s 變更了他們的名稱 %(count)s 次",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s 變更了他們的名稱",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s 變更了他們的大頭貼 %(count)s 次",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s 變更了他們的大頭貼",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s 變更了他們的大頭貼 %(count)s 次",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s 變更了他們的大頭貼",
+    "%(items)s and %(count)s others|other": "%(items)s 與其他 %(count)s 個",
+    "%(items)s and %(count)s others|one": "%(items)s 與其他一個",
+    "collapse": "摺疊",
+    "expand": "展開",
+    "Custom of %(powerLevel)s": "自訂 %(powerLevel)s",
+    "Quote": "引用",
+    "And %(count)s more...|other": "與更多 %(count)s 個……",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "Matrix 聊天室 ID",
+    "email address": "電子郵件地址",
+    "Try using one of the following valid address types: %(validTypesList)s.": "嘗試使用下列有效地地址格式中的其中一個：%(validTypesList)s。",
+    "You have entered an invalid address.": "您輸入了無效的地址。",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "社群 ID 只能包含 a-z, 0-9, or '=_-./' 等字元",
+    "Something went wrong whilst creating your community": "建立社群時發生問題",
+    "Create Community": "建立社群",
+    "Community Name": "社群名稱",
+    "Community ID": "社群 ID",
+    "example": "範例",
+    "Advanced options": "進階選項",
+    "Block users on other matrix homeservers from joining this room": "阻擋在其他 matrix 家伺服器的使用者加入此聊天室",
+    "This setting cannot be changed later!": "這個設定無法在之後變更！",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>您社群頁面的 HTML</h1>\n<p>\n    使用長描述來為社群的新成員簡介，或是散發\n    一些重要<a href=\"foo\">連結</a>\n</p>\n<p>\n    您甚至可以使用 'img' 標籤\n</p>\n",
+    "Add rooms to the community summary": "新增聊天室到社群摘要中",
+    "Which rooms would you like to add to this summary?": "您想要新增哪個聊天室到此摘要中？",
+    "Add to summary": "新增到摘要",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "新增以下聊天室到 %(groupId)s 的摘要中失敗：",
+    "Add a Room": "新增聊天室",
+    "Failed to remove the room from the summary of %(groupId)s": "從 %(groupId)s 的摘要中移除聊天室失敗",
+    "The room '%(roomName)s' could not be removed from the summary.": "聊天室「%(roomName)s」無法從摘要中移除。",
+    "Add users to the community summary": "新增使用者到社群摘要中",
+    "Who would you like to add to this summary?": "您想要新增誰到此摘要中？",
+    "Failed to add the following users to the summary of %(groupId)s:": "新增下列使用者到 %(groupId)s 的摘要中失敗：",
+    "Add a User": "新增使用者",
+    "Failed to remove a user from the summary of %(groupId)s": "從 %(groupId)s 的摘要中移除使用者失敗",
+    "The user '%(displayName)s' could not be removed from the summary.": "使用者「%(displayName)s」無法從摘要中移除。",
+    "Failed to update community": "更新社群失敗",
+    "Unable to accept invite": "無法接受邀請",
+    "Unable to reject invite": "無法回絕邀請",
+    "Leave Community": "離開社群",
+    "Leave %(groupName)s?": "離開 %(groupName)s？",
+    "Leave": "離開",
+    "Unable to leave room": "無法離開聊天室",
+    "Community Settings": "社群設定",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "這些聊天室在社群頁面上顯示給社群成員。社群成員可以透過點按它們來加入聊天室。",
+    "%(inviter)s has invited you to join this community": "%(inviter)s 已經邀請您加入此社群",
+    "You are an administrator of this community": "您是此社群的管理員",
+    "You are a member of this community": "您是此社群的成員",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "您的社群尚未有長描述，一個顯示給社群成員的 HTML 頁面。<br />點按這裡以開啟設並建立一個！",
+    "Long Description (HTML)": "長描述（HTML）",
+    "Description": "描述",
+    "Community %(groupId)s not found": "找不到社群 %(groupId)s",
+    "This Home server does not support communities": "這個家伺服器不支援社群",
+    "Failed to load %(groupId)s": "載入 %(groupId)s 失敗",
+    "Cryptography data migrated": "加密資料已遷移",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "加密資料的一次性遷移已經執行。若您回到舊版本的 Riot，端到端加密將不會運作。若您需要在舊版本上使用端到端加密，先登出 Riot。要保留訊息歷史，匯出再重新匯入您的金鑰。",
+    "Old cryptography data detected": "偵測到舊的加密資料",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "偵測到來自舊版 Riot 的資料。這將會造成舊版的端到端加密失敗。在此版本中使用最近在舊版本交換的金鑰可能無法解密訊息。這也會造成與此版本的訊息交換失敗。若您遇到問題，請登出並重新登入。要保留訊息歷史，請匯出並重新匯入您的金鑰。",
+    "Your Communities": "您的社群",
+    "Error whilst fetching joined communities": "擷取已加入的社群時發生錯誤",
+    "Create a new community": "建立新社群",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "建立社群以將使用者與聊天室湊成一組！建立自訂的首頁以在 Matrix 宇宙中標出您的空間。",
+    "Join an existing community": "加入既有的社群",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "要加入既有的社群，您必須知道它的社群標記符號；其看起來像是 <i>+example:matrix.org</i>.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>，<sendAnywayText>標記裝置為已知並傳送</sendAnywayText>或<cancelText>取消全部</cancelText>.",
+    "%(count)s of your messages have not been sent.|one": "您的訊息尚未傳送。",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "現在<resendText>重新傳送全部</resendText>或<cancelText>取消全部</cancelText>。您也可以選取單一訊息以重新傳送或取消。",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "現在<resendText>重新傳送訊息</resendText>或<cancelText>取消訊息</cancelText>。",
+    "Warning": "警告",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "沒有其他人了！您想要<inviteText>邀請其他人</inviteText>或<nowarnText>停止關於空聊天室的警告嗎</nowarnText>？",
+    "Light theme": "亮色主題",
+    "Dark theme": "暗色主題",
+    "Status.im theme": "Status.im 主題",
+    "Ignored Users": "已忽略的使用者",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "隱私對我們來說至關重要，所以我們不會收集任何私人或可辨識的資料供我們的分析使用。",
+    "Learn more about how we use analytics.": "得知更多關於我們如何使用分析資料的資訊。",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "電子郵件已傳送至 %(emailAddress)s。您必須跟隨其中包含了連結，點按下面的連結。",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "請注意，您正在登入 %(hs)s 伺服器，不是 matrix.org。",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "這個家伺服器不提供任何此客戶端支援的登入流程。",
+    "Sign in to get started": "登入以開始",
+    "Ignores a user, hiding their messages from you": "忽略使用者，從您這裡隱藏他們的訊息",
+    "Stops ignoring a user, showing their messages going forward": "停止忽略使用者，顯示他們的訊息",
+    "Notify the whole room": "通知整個聊天室",
+    "Room Notification": "聊天室通知",
+    "The information being sent to us to help make Riot.im better includes:": "協助讓 Riot.im 變得更好的傳送給我們的資訊包含了：",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "我們也紀錄了每個您在應用程式中使用的頁面（目前 <CurrentPageHash>），您的使用者代理（<CurrentUserAgent>）與您的裝置解析度（<CurrentDeviceResolution>）。",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "這個頁面包含了可識別的資訊，如聊天室、使用者或群組 ID，這些資料會在傳到伺服器前被刪除。",
+    "The platform you're on": "您使用的平臺是",
+    "The version of Riot.im": "Riot.im 的版本",
+    "Whether or not you're logged in (we don't record your user name)": "您是否登入（我們不會紀錄您的使用者名稱）",
+    "Your language of choice": "您選擇的語言",
+    "Which officially provided instance you are using, if any": "您正在使用的任何官方實體，如果有的話",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "您是否正在使用豐富文字編輯器的豐富文字模式",
+    "Your homeserver's URL": "您的家伺服器 URL",
+    "Your identity server's URL": "您的驗證伺服器 URL"
 }

From b526fc057cc79fc641b7c291a56e74fb8a0d87af Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 14 Jan 2018 18:32:17 +0000
Subject: [PATCH 308/927] Add formatFullDateNoTime to DateUtils and stop
 passing 12/24h to DateSep

---
 src/DateUtils.js                          | 11 +++++++++++
 src/components/structures/MessagePanel.js |  4 ++--
 src/i18n/strings/en_EN.json               |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 91df1e46d5..986525eec8 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -82,6 +82,17 @@ export function formatDate(date, showTwelveHour=false) {
     return formatFullDate(date, showTwelveHour);
 }
 
+export function formatFullDateNoTime(date) {
+    const days = getDaysArray();
+    const months = getMonthsArray();
+    return _t('%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s', {
+        weekDayName: days[date.getDay()],
+        monthName: months[date.getMonth()],
+        day: date.getDate(),
+        fullYear: date.getFullYear(),
+    });
+}
+
 export function formatFullDate(date, showTwelveHour=false) {
     const days = getDaysArray();
     const months = getMonthsArray();
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 5523fc27a0..6a8c2e9c2e 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -325,7 +325,7 @@ module.exports = React.createClass({
                 const key = "membereventlistsummary-" + (prevEvent ? mxEv.getId() : "initial");
 
                 if (this._wantsDateSeparator(prevEvent, mxEv.getDate())) {
-                    const dateSeparator = <li key={ts1+'~'}><DateSeparator key={ts1+'~'} ts={ts1} showTwelveHour={this.props.isTwelveHour} /></li>;
+                    const dateSeparator = <li key={ts1+'~'}><DateSeparator key={ts1+'~'} ts={ts1} /></li>;
                     ret.push(dateSeparator);
                 }
 
@@ -479,7 +479,7 @@ module.exports = React.createClass({
 
         // do we need a date separator since the last event?
         if (this._wantsDateSeparator(prevEvent, eventDate)) {
-            const dateSeparator = <li key={ts1}><DateSeparator key={ts1} ts={ts1} showTwelveHour={this.props.isTwelveHour} /></li>;
+            const dateSeparator = <li key={ts1}><DateSeparator key={ts1} ts={ts1} /></li>;
             ret.push(dateSeparator);
             continuation = false;
         }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 0d686ad490..73e3f3a014 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -49,6 +49,7 @@
     "AM": "AM",
     "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s",
     "Who would you like to add to this community?": "Who would you like to add to this community?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID",

From 351bbdfd4eba77a485e4315e48cd2dadff4f9b5c Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 15 Jan 2018 10:25:19 +0000
Subject: [PATCH 309/927] Styling

---
 src/components/views/rooms/MessageComposer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index b17694011c..531dc7aff1 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -366,10 +366,10 @@ export default class MessageComposer extends React.Component {
                     <div
                         className='mx_PopoverOuterContainer'
                         style={{
-                            backgroundColor: '#76CFA6', // '#d3efe1',
+                            backgroundColor: '#FFF',
                             opacity: 0.7,
                             overflow: 'hidden',
-                            // border: '1px solid #666',
+                            border: '1px solid #76CFA6',
                         }}
                     >
                         { this.state.stickersContent }

From 0fab905a2e5e90077719ed22f9830c0bf2771a35 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 15 Jan 2018 11:16:07 +0000
Subject: [PATCH 310/927] Cleanup styles.

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 531dc7aff1..39c51ebe3a 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -366,9 +366,6 @@ export default class MessageComposer extends React.Component {
                     <div
                         className='mx_PopoverOuterContainer'
                         style={{
-                            backgroundColor: '#FFF',
-                            opacity: 0.7,
-                            overflow: 'hidden',
                             border: '1px solid #76CFA6',
                         }}
                     >

From ab0c03369b72d28ba5353144c47a264d97e02540 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 13 Jan 2018 12:59:41 +0000
Subject: [PATCH 311/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (980 of 980 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 40aa6b4905..60a90516a4 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -801,7 +801,7 @@
     "Invalid community ID": "無效的社群 ID",
     "'%(groupId)s' is not a valid community ID": "「%(groupId)s」不是有效的社群 ID",
     "Flair": "特色",
-    "Showing flair for these communities:": "為這些社群顯示特色",
+    "Showing flair for these communities:": "為這些社群顯示特色：",
     "This room is not showing flair for any communities": "此聊天室並未對任何社群顯示特色",
     "New community ID (e.g. +foo:%(localDomain)s)": "新社群 ID（例子：+foo:%(localDomain)s）",
     "URL previews are enabled by default for participants in this room.": "此聊天室已預設對參與者啟用 URL 預覽。",

From 7fadd0f4acbe1e1404ac41b5a9a1a03fee884e69 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 15 Jan 2018 14:02:13 +0000
Subject: [PATCH 312/927] Translated using Weblate (Russian)

Currently translated at 100.0% (981 of 981 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 6e8bbdb7a4..8126f84799 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -977,5 +977,8 @@
     "Whether or not you're logged in (we don't record your user name)": "Независимо от того, вошли вы или нет (мы не записываем ваше имя пользователя)",
     "Your language of choice": "Выбранный вами язык",
     "Your homeserver's URL": "URL-адрес домашнего сервера",
-    "Your identity server's URL": "URL-адрес вашего идентификационного сервера"
+    "Your identity server's URL": "URL-адрес вашего идентификационного сервера",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "Which officially provided instance you are using, if any": "Какую официально выпущенную версию вы используете",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо от того, используете ли вы режим Richtext в редакторе Rich Text Editor"
 }

From 5e6da4d7583273c8f52dcea4fc2213ecd6e997ec Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 15 Jan 2018 14:22:41 +0000
Subject: [PATCH 313/927] * Fix key error * Remove redundant logging * Catch
 error

---
 src/components/views/elements/AppTile.js      | 9 ++++++---
 src/components/views/rooms/MessageComposer.js | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 60df6ade9b..1da344227e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -41,7 +41,6 @@ export default class AppTile extends React.Component {
 
     constructor(props) {
         super(props);
-        console.warn('AppTile constructor', props);
         this.state = this._getNewState(props);
 
         this._onAction = this._onAction.bind(this);
@@ -218,8 +217,12 @@ export default class AppTile extends React.Component {
     }
 
     componentWillUnmount() {
-        this.widgetMessaging.stopListening();
-        this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+        try {
+            this.widgetMessaging.stopListening();
+            this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+        } catch (e) {
+            console.error('Failed to stop listening for widgetMessaging events', e.message);
+        }
         dis.unregister(this._onAction);
         window.removeEventListener('message', this._onMessage);
     }
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 39c51ebe3a..f87ac02d05 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -354,6 +354,7 @@ export default class MessageComposer extends React.Component {
             isOpen={this.state.showStickers}
             position={'top'}
             padding={1}
+            key='stickersPopover'
             content={({ position, targetRect, popoverRect }) => (
                 <ArrowContainer
                     position={position}

From 5a9a4ead96bd154368fbe15445a05e7767ef1050 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 15 Jan 2018 14:25:56 +0000
Subject: [PATCH 314/927] Remove arrow opacity.

---
 src/components/views/rooms/MessageComposer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index f87ac02d05..3becd6e2fb 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -362,7 +362,6 @@ export default class MessageComposer extends React.Component {
                     popoverRect={popoverRect}
                     arrowColor={'#76CFA6'}
                     arrowSize={20}
-                    arrowStyle={{ opacity: 0.7 }}
                 >
                     <div
                         className='mx_PopoverOuterContainer'

From 408f13f68cd508a37a76931998b66cdb5f9aa1cc Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Mon, 15 Jan 2018 14:42:41 +0000
Subject: [PATCH 315/927] Only set selected tags state when updating rooms

instead of every time we get an update from a GroupStore/otherwise.

This was leading to many setStates and renders at startup when we
receive many group /members /rooms etc. responses.

Also, use the rate limited version of refreshRoomList.
---
 src/components/views/rooms/RoomList.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index d1e00bd302..d1ef6c2f2c 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -324,12 +324,7 @@ module.exports = React.createClass({
             // Show all rooms
             this._visibleRooms = MatrixClientPeg.get().getRooms();
         }
-
-        this.setState({
-            selectedTags,
-        }, () => {
-            this.refreshRoomList();
-        });
+        this._delayedRefreshRoomList();
     },
 
     refreshRoomList: function() {
@@ -345,6 +340,9 @@ module.exports = React.createClass({
         this.setState({
             lists: this.getRoomLists(),
             totalRoomCount: totalRooms,
+            // Do this here so as to not render every time the selected tags
+            // themselves change.
+            selectedTags: TagOrderStore.getSelectedTags(),
         });
 
         // this._lastRefreshRoomListTs = Date.now();

From e085632d8d6e3c27835dfd070019d21188bdf4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 11 Jan 2018 11:20:03 +0000
Subject: [PATCH 316/927] Translated using Weblate (French)

Currently translated at 100.0% (981 of 981 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c62e564d46..109697d750 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -979,5 +979,6 @@
     "Which officially provided instance you are using, if any": "Quelle instance officielle vous utilisez, si c'est le cas",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si vous utilisez le mode de texte enrichi de l'éditeur de texte enrichi",
     "Your homeserver's URL": "L'URL de votre serveur d'accueil",
-    "Your identity server's URL": "L'URL de votre serveur d'identité"
+    "Your identity server's URL": "L'URL de votre serveur d'identité",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s"
 }

From 16c13fb07960a59894887acbceadffec9ff1e56d Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Mon, 15 Jan 2018 18:12:27 +0000
Subject: [PATCH 317/927] Replace TagPanel react-dnd with react-beautiful-dnd

This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.

It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).

Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).

The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
---
 package.json                                |  1 +
 src/actions/TagOrderActions.js              | 20 +++--
 src/actions/actionCreators.js               | 11 ++-
 src/components/structures/TagPanel.js       | 42 ++++++++--
 src/components/views/elements/DNDTagTile.js | 88 ++++++---------------
 src/stores/TagOrderStore.js                 | 23 ++----
 6 files changed, 85 insertions(+), 100 deletions(-)

diff --git a/package.json b/package.json
index eb2cabf854..dbc27b5a08 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
     "querystring": "^0.2.0",
     "react": "^15.4.0",
     "react-addons-css-transition-group": "15.3.2",
+    "react-beautiful-dnd": "^4.0.0",
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^15.4.0",
diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
index 60946ea7f1..db9230e964 100644
--- a/src/actions/TagOrderActions.js
+++ b/src/actions/TagOrderActions.js
@@ -31,16 +31,22 @@ const TagOrderActions = {};
  *                     indicating the status of the request.
  * @see asyncAction
  */
-TagOrderActions.commitTagOrdering = function(matrixClient) {
-    return asyncAction('TagOrderActions.commitTagOrdering', () => {
-        // Only commit tags if the state is ready, i.e. not null
-        const tags = TagOrderStore.getOrderedTags();
-        if (!tags) {
-            return;
-        }
+TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
+    // Only commit tags if the state is ready, i.e. not null
+    let tags = TagOrderStore.getOrderedTags();
+    if (!tags) {
+        return;
+    }
 
+    tags = tags.filter((t) => t !== tag);
+    tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
+
+    return asyncAction('TagOrderActions.moveTag', () => {
         Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
         return matrixClient.setAccountData('im.vector.web.tag_ordering', {tags});
+    }, () => {
+        // For an optimistic update
+        return {tags};
     });
 };
 
diff --git a/src/actions/actionCreators.js b/src/actions/actionCreators.js
index bddfbc7c63..0238eee8c0 100644
--- a/src/actions/actionCreators.js
+++ b/src/actions/actionCreators.js
@@ -22,6 +22,9 @@ limitations under the License.
  *                    suffix determining whether it is pending, successful or
  *                    a failure.
  * @param {function} fn a function that returns a Promise.
+ * @param {function?} pendingFn a function that returns an object to assign
+ *                              to the `request` key of the ${id}.pending
+ *                              payload.
  * @returns {function} an action thunk - a function that uses its single
  *                     argument as a dispatch function to dispatch the
  *                     following actions:
@@ -29,9 +32,13 @@ limitations under the License.
  *                         `${id}.success` or
  *                         `${id}.failure`.
  */
-export function asyncAction(id, fn) {
+export function asyncAction(id, fn, pendingFn) {
     return (dispatch) => {
-        dispatch({action: id + '.pending'});
+        dispatch({
+            action: id + '.pending',
+            request:
+                typeof pendingFn === 'function' ? pendingFn() : undefined,
+        });
         fn().then((result) => {
             dispatch({action: id + '.success', result});
         }).catch((err) => {
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 531c247ea6..323528e1f1 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -25,6 +25,8 @@ import TagOrderActions from '../../actions/TagOrderActions';
 import sdk from '../../index';
 import dis from '../../dispatcher';
 
+import { DragDropContext, Droppable } from 'react-beautiful-dnd';
+
 const TagPanel = React.createClass({
     displayName: 'TagPanel',
 
@@ -69,7 +71,9 @@ const TagPanel = React.createClass({
         dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient));
     },
 
-    onClick() {
+    onClick(e) {
+        // Ignore clicks on children
+        if (e.target !== e.currentTarget) return;
         dis.dispatch({action: 'deselect_tags'});
     },
 
@@ -78,8 +82,20 @@ const TagPanel = React.createClass({
         dis.dispatch({action: 'view_create_group'});
     },
 
-    onTagTileEndDrag() {
-        dis.dispatch(TagOrderActions.commitTagOrdering(this.context.matrixClient));
+    onTagTileEndDrag(result) {
+        // Dragged to an invalid destination, not onto a droppable
+        if (!result.destination) {
+            return;
+        }
+
+        // Dispatch synchronously so that the TagPanel receives an
+        // optimistic update from TagOrderStore before the previous
+        // state is shown.
+        dis.dispatch(TagOrderActions.moveTag(
+            this.context.matrixClient,
+            result.draggableId,
+            result.destination.index,
+        ), true);
     },
 
     render() {
@@ -89,16 +105,26 @@ const TagPanel = React.createClass({
 
         const tags = this.state.orderedTags.map((tag, index) => {
             return <DNDTagTile
-                key={tag + '_' + index}
+                key={tag}
                 tag={tag}
+                index={index}
                 selected={this.state.selectedTags.includes(tag)}
-                onEndDrag={this.onTagTileEndDrag}
             />;
         });
         return <div className="mx_TagPanel" onClick={this.onClick}>
-            <div className="mx_TagPanel_tagTileContainer">
-                { tags }
-            </div>
+            <DragDropContext onDragEnd={this.onTagTileEndDrag}>
+                <Droppable droppableId="tag-panel-droppable">
+                    { (provided, snapshot) => (
+                        <div
+                            className="mx_TagPanel_tagTileContainer"
+                            ref={provided.innerRef}
+                        >
+                            { tags }
+                            { provided.placeholder }
+                        </div>
+                    ) }
+                </Droppable>
+            </DragDropContext>
             <AccessibleButton className="mx_TagPanel_createGroupButton" onClick={this.onCreateGroupClick}>
                 <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
             </AccessibleButton>
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index 539163d0dc..e17ea52976 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -15,71 +15,29 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { DragSource, DropTarget } from 'react-dnd';
-
 import TagTile from './TagTile';
-import dis from '../../../dispatcher';
-import { findDOMNode } from 'react-dom';
 
-const tagTileSource = {
-    canDrag: function(props, monitor) {
-        return true;
-    },
+import { Draggable } from 'react-beautiful-dnd';
 
-    beginDrag: function(props) {
-        // Return the data describing the dragged item
-        return {
-            tag: props.tag,
-        };
-    },
-
-    endDrag: function(props, monitor, component) {
-        const dropResult = monitor.getDropResult();
-        if (!monitor.didDrop() || !dropResult) {
-            return;
-        }
-        props.onEndDrag();
-    },
-};
-
-const tagTileTarget = {
-    canDrop(props, monitor) {
-        return true;
-    },
-
-    hover(props, monitor, component) {
-        if (!monitor.canDrop()) return;
-        const draggedY = monitor.getClientOffset().y;
-        const {top, bottom} = findDOMNode(component).getBoundingClientRect();
-        const targetY = (top + bottom) / 2;
-        dis.dispatch({
-            action: 'order_tag',
-            tag: monitor.getItem().tag,
-            targetTag: props.tag,
-            // Note: we indicate that the tag should be after the target when
-            // it's being dragged over the top half of the target.
-            after: draggedY < targetY,
-        });
-    },
-
-    drop(props) {
-        // Return the data to be returned by getDropResult
-        return {
-            tag: props.tag,
-        };
-    },
-};
-
-export default
-    DropTarget('TagTile', tagTileTarget, (connect, monitor) => ({
-        connectDropTarget: connect.dropTarget(),
-    }))(DragSource('TagTile', tagTileSource, (connect, monitor) => ({
-        connectDragSource: connect.dragSource(),
-    }))((props) => {
-        const { connectDropTarget, connectDragSource, ...otherProps } = props;
-        return connectDropTarget(connectDragSource(
-            <div>
-                <TagTile {...otherProps} />
-            </div>,
-        ));
-    }));
+export default function DNDTagTile(props) {
+    return <div>
+        <Draggable
+            key={props.tag}
+            draggableId={props.tag}
+            index={props.index}
+        >
+            { (provided, snapshot) => (
+                <div>
+                    <div
+                        ref={provided.innerRef}
+                        {...provided.draggableProps}
+                        {...provided.dragHandleProps}
+                    >
+                        <TagTile {...props} />
+                    </div>
+                    { provided.placeholder }
+                </div>
+            ) }
+        </Draggable>
+    </div>;
+}
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 9c9427284e..27ce6cbb73 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -78,24 +78,11 @@ class TagOrderStore extends Store {
                 this._updateOrderedTags();
                 break;
             }
-            // Puts payload.tag at payload.targetTag, placing the targetTag before or after the tag
-            case 'order_tag': {
-                if (!this._state.orderedTags ||
-                    !payload.tag ||
-                    !payload.targetTag ||
-                    payload.tag === payload.targetTag
-                ) return;
-
-                const tags = this._state.orderedTags;
-
-                let orderedTags = tags.filter((t) => t !== payload.tag);
-                const newIndex = orderedTags.indexOf(payload.targetTag) + (payload.after ? 1 : 0);
-                orderedTags = [
-                    ...orderedTags.slice(0, newIndex),
-                    payload.tag,
-                    ...orderedTags.slice(newIndex),
-                ];
-                this._setState({orderedTags});
+            case 'TagOrderActions.moveTag.pending': {
+                // Optimistic update of a moved tag
+                this._setState({
+                    orderedTags: payload.request.tags,
+                });
                 break;
             }
             case 'select_tag': {

From 82b9897986e2c471d78ca09a244d5a56cdd06134 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 15 Jan 2018 18:27:14 +0000
Subject: [PATCH 318/927] Select apropriate theme colour for popover.

---
 src/components/views/rooms/MessageComposer.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 3becd6e2fb..8b70b67a1e 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -350,6 +350,11 @@ export default class MessageComposer extends React.Component {
                 </div>;
         }
 
+        // Fall back to default highlight color if we can't compute one from the DOM
+        const highlightColor = document.getElementById('mx_theme_accentColor') ?
+          window.getComputedStyle(document.getElementById('mx_theme_accentColor')).color :
+          '#76CFA6';
+
         const stickers = <Popover
             isOpen={this.state.showStickers}
             position={'top'}
@@ -360,13 +365,13 @@ export default class MessageComposer extends React.Component {
                     position={position}
                     targetRect={targetRect}
                     popoverRect={popoverRect}
-                    arrowColor={'#76CFA6'}
+                    arrowColor={highlightColor}
                     arrowSize={20}
                 >
                     <div
                         className='mx_PopoverOuterContainer'
                         style={{
-                            border: '1px solid #76CFA6',
+                            border: `1px solid ${highlightColor}`,
                         }}
                     >
                         { this.state.stickersContent }

From 732950594d00041a3263f742cb428d6c8460e5d7 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 11 Jan 2018 12:34:08 +0000
Subject: [PATCH 319/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (981 of 981 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6384644925..a341d47795 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -979,5 +979,6 @@
     "Which officially provided instance you are using, if any": "Milyen hivatalosan nyújtott verziót használsz",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Használod-e a Richtext módot a szerkesztőben vagy nem",
     "Your homeserver's URL": "Az egyedi szerver URL-t",
-    "Your identity server's URL": "Az azonosítási szerver URL-t"
+    "Your identity server's URL": "Az azonosítási szerver URL-t",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s"
 }

From bc2448fa7c5ee6e5548ed7ba8d3cc304b293b6ad Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 13 Jan 2018 12:59:41 +0000
Subject: [PATCH 320/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (981 of 981 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 60a90516a4..f29debcf22 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -978,5 +978,6 @@
     "Which officially provided instance you are using, if any": "您正在使用的任何官方實體，如果有的話",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "您是否正在使用豐富文字編輯器的豐富文字模式",
     "Your homeserver's URL": "您的家伺服器 URL",
-    "Your identity server's URL": "您的驗證伺服器 URL"
+    "Your identity server's URL": "您的驗證伺服器 URL",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s"
 }

From f7e2e91df513c409c887f3ec893ef23c77f0bc94 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 16 Jan 2018 09:38:16 +0000
Subject: [PATCH 321/927] Workaround for travis-ci/travis-ci#8836

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4137d754bf..d2b5558b39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,9 @@ dist: trusty
 
 # we don't need sudo, so can run in a container, which makes startup much
 # quicker.
-sudo: false
+#
+# unfortunately we do require sudo as per https://github.com/travis-ci/travis-ci/issues/8836
+sudo: required
 
 language: node_js
 node_js:

From d2e5b122715bf89c1596a56eaffb1a9d3b0988d1 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 16 Jan 2018 09:46:48 +0000
Subject: [PATCH 322/927] Update jsdoc for moveTag

---
 src/actions/TagOrderActions.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
index db9230e964..608fd6c4c5 100644
--- a/src/actions/TagOrderActions.js
+++ b/src/actions/TagOrderActions.js
@@ -22,11 +22,12 @@ const TagOrderActions = {};
 
 /**
  * Creates an action thunk that will do an asynchronous request to
- * commit TagOrderStore.getOrderedTags() to account data and dispatch
- * actions to indicate the status of the request.
+ * move a tag in TagOrderStore to destinationIx.
  *
  * @param {MatrixClient} matrixClient the matrix client to set the
  *                                    account data on.
+ * @param {string} tag the tag to move.
+ * @param {number} destinationIx the new position of the tag.
  * @returns {function} an action thunk that will dispatch actions
  *                     indicating the status of the request.
  * @see asyncAction

From f391375deac0534c9d89863e15c2ffd643b7a6de Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 16 Jan 2018 10:09:11 +0000
Subject: [PATCH 323/927] Alter comment on travis-ci#8836 workaround

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d2b5558b39..954f14a4da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,8 @@ dist: trusty
 # we don't need sudo, so can run in a container, which makes startup much
 # quicker.
 #
-# unfortunately we do require sudo as per https://github.com/travis-ci/travis-ci/issues/8836
+# unfortunately we do temporarily require sudo as a workaround for
+# https://github.com/travis-ci/travis-ci/issues/8836
 sudo: required
 
 language: node_js

From bda2d6b0a66b4a50a1313e1aebd50c4f4555ec15 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 16 Jan 2018 10:44:11 +0000
Subject: [PATCH 324/927] Work around atlassian/react-beautiful-dnd#273

For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
---
 src/components/structures/TagPanel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 323528e1f1..a0a0e2d6e3 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -111,13 +111,14 @@ const TagPanel = React.createClass({
                 selected={this.state.selectedTags.includes(tag)}
             />;
         });
-        return <div className="mx_TagPanel" onClick={this.onClick}>
+        return <div className="mx_TagPanel">
             <DragDropContext onDragEnd={this.onTagTileEndDrag}>
                 <Droppable droppableId="tag-panel-droppable">
                     { (provided, snapshot) => (
                         <div
                             className="mx_TagPanel_tagTileContainer"
                             ref={provided.innerRef}
+                            onMouseDown={this.onClick}
                         >
                             { tags }
                             { provided.placeholder }

From f19dcd81149b6ae0f971c3b89098fa30c559b023 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 16 Jan 2018 11:07:25 +0000
Subject: [PATCH 325/927] Comment workaround to
 atlassian/react-beautiful-dnd#273

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index a0a0e2d6e3..1cd3f04f9d 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -118,6 +118,10 @@ const TagPanel = React.createClass({
                         <div
                             className="mx_TagPanel_tagTileContainer"
                             ref={provided.innerRef}
+                            // react-beautiful-dnd has a bug that emits a click to the parent
+                            // of draggables upon dropping
+                            //   https://github.com/atlassian/react-beautiful-dnd/issues/273
+                            // so we use onMouseDown here as a workaround.
                             onMouseDown={this.onClick}
                         >
                             { tags }

From 1155c1c85c26a7c5a88f2e6ea4a50a9ef577fb70 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 12 Jan 2018 12:38:21 +0000
Subject: [PATCH 326/927] Translated using Weblate (Basque)

Currently translated at 100.0% (981 of 981 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 5309a76148..e8fe9b2f20 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -979,5 +979,6 @@
     "Which officially provided instance you are using, if any": "Erabiltzen ari zaren instantzia ofiziala, balego",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Testu editorean testu aberatsa modua erabiltzen duzun",
     "Your homeserver's URL": "Zure hasiera zerbitzariaren URL-a",
-    "Your identity server's URL": "Zure identitate zerbitzariaren URL-a"
+    "Your identity server's URL": "Zure identitate zerbitzariaren URL-a",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa"
 }

From 5de8cf270c0f61285adb9693ce720a41cd4943fc Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Tue, 16 Jan 2018 11:01:01 +0000
Subject: [PATCH 327/927] Translated using Weblate (Galician)

Currently translated at 35.9% (353 of 981 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 4800e9e34e..1807ce96d8 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -234,5 +234,123 @@
     "Select devices": "Escolla dispositivos",
     "Failed to set display name": "Fallo ao establecer o nome público",
     "Disable Notifications": "Deshabilitar notificacións",
-    "Enable Notifications": "Habilitar notificacións"
+    "Enable Notifications": "Habilitar notificacións",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
+    "Message Replies": "Respostas a mensaxe",
+    "Mirror local video feed": "",
+    "Opt out of analytics": "Saírse de analytics",
+    "Cannot add any more widgets": "Non pode engadir máis widgets",
+    "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.",
+    "Add a widget": "Engadir widget",
+    "Drop File Here": "Solte aquí o ficheiro",
+    "Drop file here to upload": "Solte aquí o ficheiro para subilo",
+    " (unsupported)": " (non soportado)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Únase como <voiceText>voz</voiceText> ou <videoText>vídeo</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Chamada de conferencia en curso%(supportedText)s.",
+    "%(senderName)s sent an image": "%(senderName)s enviou unha imaxe",
+    "%(senderName)s sent a video": "%(senderName)s enviou un vídeo",
+    "%(senderName)s uploaded a file": "%(senderName)s subeu un ficheiro",
+    "Options": "Axustes",
+    "Undecryptable": "Non descifrable",
+    "Encrypted by a verified device": "Cifrado por un dispositivo verificado",
+    "Encrypted by an unverified device": "Cifrado por un dispositivo non verificado",
+    "Unencrypted message": "Mensaxe non cifrada",
+    "Please select the destination room for this message": "Escolla por favor a sala de destino para esta mensaxe",
+    "Blacklisted": "Omitidos",
+    "Verified": "Verificados",
+    "Unverified": "Non verificados",
+    "device id: ": "id dispositivo: ",
+    "Disinvite": "Retirar convite",
+    "Kick": "Expulsar",
+    "Disinvite this user?": "Retirar convite a este usuario?",
+    "Kick this user?": "Expulsar este usuario?",
+    "Failed to kick": "Fallo ao expulsar",
+    "Unban": "Non bloquear",
+    "Ban": "Bloquear",
+    "Unban this user?": "Non bloquear este usuario?",
+    "Ban this user?": "Bloquear a este usuario?",
+    "Failed to ban user": "Fallo ao bloquear usuario",
+    "Failed to mute user": "Fallo ao acalar usuario",
+    "Failed to toggle moderator status": "Fallo ao mudar a estado de moderador",
+    "Failed to change power level": "Fallo ao cambiar o nivel de permisos",
+    "Are you sure?": "Está segura?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non poderá desfacer este cambio xa que está promovendo a usaria a ter o mesmo nivel de permisos que vostede.",
+    "No devices with registered encryption keys": "Sen dispositivos con chaves de cifrado rexistradas",
+    "Devices": "Dispositivos",
+    "Unignore": "Non ignorar",
+    "Ignore": "Ignorar",
+    "Jump to read receipt": "Ir ao resgardo de lectura",
+    "Mention": "Mención",
+    "Invite": "Convidar",
+    "User Options": "Axustes de usuaria",
+    "Direct chats": "Conversa directa",
+    "Unmute": "Non acalar",
+    "Mute": "Acalar",
+    "Revoke Moderator": "Quitar Moderador",
+    "Make Moderator": "Facer Moderador",
+    "Admin Tools": "Ferramentas de administración",
+    "Level:": "Nivel:",
+    "and %(count)s others...|other": "e %(count)s outras...",
+    "and %(count)s others...|one": "e outra máis...",
+    "Invited": "Convidada",
+    "Filter room members": "Filtrar membros da conversa",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (permiso %(powerLevelNumber)s)",
+    "Attachment": "Anexo",
+    "Upload Files": "Subir ficheiros",
+    "Are you sure you want to upload the following files?": "Está segura de que quere subir os seguintes ficheiros?",
+    "Encrypted room": "Sala cifrada",
+    "Unencrypted room": "Sala non cifrada",
+    "Hangup": "Quedada",
+    "Voice call": "Chamada de voz",
+    "Video call": "Chamada de vídeo",
+    "Hide Apps": "Agochar Apps",
+    "Show Apps": "Mostrar Apps",
+    "Upload file": "Subir ficheiro",
+    "Show Text Formatting Toolbar": "Mostrar barra de formato de texto",
+    "Send an encrypted reply…": "Enviar unha resposta cifrada…",
+    "Send a reply (unencrypted)…": "Enviar unha resposta (non cifrada)…",
+    "Send an encrypted message…": "Enviar unha mensaxe cifrada…",
+    "Send a message (unencrypted)…": "Enviar unha mensaxe (non cifrada)…",
+    "You do not have permission to post to this room": "Non ten permiso para comentar en esta sala",
+    "Turn Markdown on": "Habilitar Markdown",
+    "Turn Markdown off": "Deshabilitar Markdown",
+    "Hide Text Formatting Toolbar": "Agochar barra de formato de texto",
+    "Server error": "Fallo no servidor",
+    "Server unavailable, overloaded, or something else went wrong.": "Servidor non dispoñible, sobrecargado, ou outra cousa puido fallar.",
+    "Command error": "Erro na orde",
+    "bold": "remarcado",
+    "italic": "cursiva",
+    "strike": "raiado",
+    "underline": "subliñado",
+    "code": "código",
+    "quote": "cita",
+    "bullet": "lista",
+    "numbullet": "lista numerada",
+    "Markdown is disabled": "Markdown deshabilitado",
+    "Markdown is enabled": "Markdown habilitado",
+    "Unpin Message": "Desfixar mensaxe",
+    "Jump to message": "Ir a mensaxe",
+    "No pinned messages.": "Sen mensaxes fixadas.",
+    "Loading...": "Cargando...",
+    "Pinned Messages": "Mensaxes fixadas",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "En liña desde %(duration)s",
+    "Idle for %(duration)s": "En pausa desde %(duration)s",
+    "Offline for %(duration)s": "Desconectado desde %(duration)s",
+    "Unknown for %(duration)s": "Descoñecido desde %(duration)s",
+    "Online": "En liña",
+    "Idle": "En pausa",
+    "Offline": "Fóra de liña",
+    "Unknown": "Descoñecido",
+    "Replying": "Respostando",
+    "Seen by %(userName)s at %(dateTime)s": "Visto por %(userName)s as %(dateTime)s",
+    "No rooms to show": "Sen salas que mostrar",
+    "Unnamed room": "Sala sen nome",
+    "World readable": "Visible por todos",
+    "Guests can join": "Convidados pódense unir",
+    "Failed to set avatar.": "Fallo ao establecer o avatar.",
+    "Save": "Gardar"
 }

From 87d8ed5af84507f4cd54960f6cfd602123b3f6cd Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 16 Jan 2018 17:01:25 +0000
Subject: [PATCH 328/927] Add comment

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 8b70b67a1e..aa27dc4ae4 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -292,6 +292,8 @@ export default class MessageComposer extends React.Component {
         // Stickers
         const popoverWidth = '300px';
         const popoverHeight = '300px';
+        // TODO - Add support for stickerpacks from multiple app stores.
+        // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
         const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
 
         // Load stickerpack content

From 0557737f8dcc4ea4e00e535cf3e0d30812b47305 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 16 Jan 2018 17:45:29 +0000
Subject: [PATCH 329/927] Don't modify original options arg

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

diff --git a/src/languageHandler.js b/src/languageHandler.js
index 2d1fbc2f85..4e24c04d36 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -67,8 +67,7 @@ function safeCounterpartTranslate(text, options) {
     if (translated === undefined && count !== undefined) {
         // counterpart does not do fallback if no pluralisation exists
         // in the preferred language, so do it here
-        options.locale = 'en';
-        translated = counterpart.translate(text, options);
+        translated = counterpart.translate(text, Object.assign({}, options, {locale: 'en'}));
     }
     return translated;
 }

From cb7f25f4defa33e63d21808a8c9c184f89611a4b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 16 Jan 2018 18:13:52 +0000
Subject: [PATCH 330/927] Remove rubbish lib.

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

diff --git a/package.json b/package.json
index 36f35556fc..43a5ebfcfd 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,6 @@
     "react-dom": "^15.4.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "react-simple-popover": "matrix-org/react-popover",
-    "react-tiny-popover": "^3.2.5",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From 86542d86e97be93cff49bea52378a7db13334395 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 16 Jan 2018 18:14:32 +0000
Subject: [PATCH 331/927] Move stickers into stand-alone component.

---
 src/components/views/rooms/MessageComposer.js | 117 +--------------
 src/components/views/rooms/Stickerpack.js     | 139 ++++++++++++++++++
 2 files changed, 143 insertions(+), 113 deletions(-)
 create mode 100644 src/components/views/rooms/Stickerpack.js

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index aa27dc4ae4..7e001165c0 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -23,9 +23,7 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import Autocomplete from './Autocomplete';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import Popover, {ArrowContainer} from 'react-tiny-popover';
-import Widgets from '../../../utils/widgets';
-import AppTile from '../elements/AppTile';
+import Stickerpack from './Stickerpack';
 
 export default class MessageComposer extends React.Component {
     constructor(props, context) {
@@ -33,8 +31,6 @@ export default class MessageComposer extends React.Component {
         this.onCallClick = this.onCallClick.bind(this);
         this.onHangupClick = this.onHangupClick.bind(this);
         this.onUploadClick = this.onUploadClick.bind(this);
-        this.onShowStickersClick = this.onShowStickersClick.bind(this);
-        this.onHideStickersClick = this.onHideStickersClick.bind(this);
         this.onUploadFileSelected = this.onUploadFileSelected.bind(this);
         this.uploadFiles = this.uploadFiles.bind(this);
         this.onVoiceCallClick = this.onVoiceCallClick.bind(this);
@@ -46,6 +42,8 @@ export default class MessageComposer extends React.Component {
         this.onEvent = this.onEvent.bind(this);
         this.render = this.render.bind(this);
 
+        //
+
         this.state = {
             autocompleteQuery: '',
             selection: null,
@@ -56,7 +54,6 @@ export default class MessageComposer extends React.Component {
                 wordCount: 0,
             },
             showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
-            showStickers: false,
         };
     }
 
@@ -193,14 +190,6 @@ export default class MessageComposer extends React.Component {
         // this._startCallApp(true);
     }
 
-    onShowStickersClick(ev) {
-        this.setState({showStickers: true});
-    }
-
-    onHideStickersClick(ev) {
-        this.setState({showStickers: false});
-    }
-
     onInputContentChanged(content: string, selection: {start: number, end: number}) {
         this.setState({
             autocompleteQuery: content,
@@ -270,7 +259,6 @@ export default class MessageComposer extends React.Component {
         let callButton;
         let videoCallButton;
         let hangupButton;
-        let stickersButton;
 
         // Call buttons
         if (this.props.callState && this.props.callState !== 'ended') {
@@ -289,103 +277,6 @@ export default class MessageComposer extends React.Component {
                 </div>;
         }
 
-        // Stickers
-        const popoverWidth = '300px';
-        const popoverHeight = '300px';
-        // TODO - Add support for stickerpacks from multiple app stores.
-        // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
-        const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
-
-        // Load stickerpack content
-        if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
-            this.state.stickersContent = <div
-                id='stickersContent'
-                className='mx_StickersContent'
-                style={{
-                    border: 'none',
-                    height: popoverHeight,
-                    width: popoverWidth,
-                }}
-            >
-                <AppTile
-                    id={stickerpackWidget.id}
-                    url={stickerpackWidget.content.url}
-                    name={stickerpackWidget.content.name}
-                    room={this.props.room}
-                    type={stickerpackWidget.content.type}
-                    fullWidth={true}
-                    userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
-                    creatorUserId={MatrixClientPeg.get().credentials.userId}
-                    waitForIframeLoad={true}
-                    show={true}
-                    showMenubar={false}
-                />
-            </div>;
-        } else {
-            // Default content to show if stickerpack widget not added
-            this.state.stickersContent = <p>Click here to add your first sitckerpack</p>;
-        }
-
-
-        if (this.state.showStickers) {
-            // Show hide-stickers button
-            stickersButton =
-                <div
-                    id='stickersButton'
-                    key="controls_hide_stickers"
-                    className="mx_MessageComposer_stickers"
-                    onClick={this.onHideStickersClick}
-                    ref='target'
-                    title={_t("Hide Stickers")}>
-                    <TintableSvg src="img/icons-hide-stickers.svg" width="35" height="35" />
-                </div>;
-        } else {
-            // Show show-stickers button
-            stickersButton =
-                <div
-                    id='stickersButton'
-                    key="constrols_show_stickers"
-                    className="mx_MessageComposer_stickers"
-                    onClick={this.onShowStickersClick}
-                    title={_t("Show Stickers")}>
-                    <TintableSvg src="img/icons-show-stickers.svg" width="35" height="35" />
-                </div>;
-        }
-
-        // Fall back to default highlight color if we can't compute one from the DOM
-        const highlightColor = document.getElementById('mx_theme_accentColor') ?
-          window.getComputedStyle(document.getElementById('mx_theme_accentColor')).color :
-          '#76CFA6';
-
-        const stickers = <Popover
-            isOpen={this.state.showStickers}
-            position={'top'}
-            padding={1}
-            key='stickersPopover'
-            content={({ position, targetRect, popoverRect }) => (
-                <ArrowContainer
-                    position={position}
-                    targetRect={targetRect}
-                    popoverRect={popoverRect}
-                    arrowColor={highlightColor}
-                    arrowSize={20}
-                >
-                    <div
-                        className='mx_PopoverOuterContainer'
-                        style={{
-                            border: `1px solid ${highlightColor}`,
-                        }}
-                    >
-                        { this.state.stickersContent }
-                    </div>
-                </ArrowContainer>
-            )}
-        >
-            <div id='popoverTarget'>
-                { stickersButton }
-            </div>
-        </Popover>;
-
         const canSendMessages = this.props.room.currentState.maySendMessage(
             MatrixClientPeg.get().credentials.userId);
 
@@ -431,7 +322,7 @@ export default class MessageComposer extends React.Component {
                 hangupButton,
                 callButton,
                 videoCallButton,
-                stickers,
+                <Stickerpack key='stickerpack_controls_button' />,
             );
         } else {
             controls.push(
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
new file mode 100644
index 0000000000..97b1aedb3c
--- /dev/null
+++ b/src/components/views/rooms/Stickerpack.js
@@ -0,0 +1,139 @@
+/*
+Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+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 { _t } from '../../../languageHandler';
+import Widgets from '../../../utils/widgets';
+import AppTile from '../elements/AppTile';
+import ContextualMenu from '../../structures/ContextualMenu';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import sdk from '../../../index';
+
+
+export default class Stickerpack extends React.Component {
+    constructor(props) {
+        super(props);
+        this.onShowStickersClick = this.onShowStickersClick.bind(this);
+        this.onHideStickersClick = this.onHideStickersClick.bind(this);
+
+        this.defaultStickersContent = (<div className='mx_StickersContentPlaceholder'>
+            <p>You don't currently have any stickerpacks enabled</p>
+            <p>Click <a href=''>here</a> to add some!</p>
+        </div>);
+        this.popoverWidth = 300;
+        this.popoverHeight = 300;
+
+        this.state = {
+            stickersContent: this.defaultStickersContent,
+            showStickers: false,
+        };
+    }
+
+    onComponentDidMount() {
+        // Stickers
+        // TODO - Add support for stickerpacks from multiple app stores.
+        // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
+        const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
+        let stickersContent;
+
+        // Load stickerpack content
+        if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
+            stickersContent = <div
+                id='stickersContent'
+                className='mx_StickersContent'
+                style={{
+                    border: 'none',
+                    height: this.popoverHeight,
+                    width: this.popoverWidth,
+                }}
+            >
+                <AppTile
+                    id={stickerpackWidget.id}
+                    url={stickerpackWidget.content.url}
+                    name={stickerpackWidget.content.name}
+                    room={this.props.room}
+                    type={stickerpackWidget.content.type}
+                    fullWidth={true}
+                    userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
+                    creatorUserId={MatrixClientPeg.get().credentials.userId}
+                    waitForIframeLoad={true}
+                    show={true}
+                    showMenubar={false}
+                />
+            </div>;
+        } else {
+            // Default content to show if stickerpack widget not added
+            stickersContent = <p>Click here to add your first sitckerpack</p>;
+        }
+        this.setState({stickersContent});
+    }
+
+    onShowStickersClick(e) {
+        const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
+        const buttonRect = e.target.getBoundingClientRect();
+
+        // The window X and Y offsets are to adjust position when zoomed in to page
+        const x = buttonRect.right + window.pageXOffset - 40;
+        const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
+        // const self = this;
+        ContextualMenu.createMenu(GenericElementContextMenu, {
+            chevronOffset: 10,
+            chevronFace: 'bottom',
+            left: x,
+            top: y,
+            menuWidth: this.popoverWidth,
+            menuHeight: this.popoverHeight,
+            element: this.state.stickersContent,
+        });
+
+
+        this.setState({showStickers: true});
+    }
+
+    onHideStickersClick(ev) {
+        this.setState({showStickers: false});
+    }
+
+    render() {
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+        let stickersButton;
+        if (this.state.showStickers) {
+            // Show hide-stickers button
+            stickersButton =
+                <div
+                    id='stickersButton'
+                    key="controls_hide_stickers"
+                    className="mx_MessageComposer_stickers"
+                    onClick={this.onHideStickersClick}
+                    ref='target'
+                    title={_t("Hide Stickers")}>
+                    <TintableSvg src="img/icons-hide-stickers.svg" width="35" height="35" />
+                </div>;
+        } else {
+            // Show show-stickers button
+            stickersButton =
+                <div
+                    id='stickersButton'
+                    key="constrols_show_stickers"
+                    className="mx_MessageComposer_stickers"
+                    onClick={this.onShowStickersClick}
+                    title={_t("Show Stickers")}>
+                    <TintableSvg src="img/icons-show-stickers.svg" width="35" height="35" />
+                </div>;
+        }
+        return stickersButton;
+    }
+}

From 933928409083c48f54621bcfbcc275cf6fe8b871 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 16 Jan 2018 21:06:57 +0000
Subject: [PATCH 332/927] Stickerpack content placeholder.

---
 src/components/views/rooms/Stickerpack.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 97b1aedb3c..52cd32ba4f 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -29,10 +29,13 @@ export default class Stickerpack extends React.Component {
         this.onShowStickersClick = this.onShowStickersClick.bind(this);
         this.onHideStickersClick = this.onHideStickersClick.bind(this);
 
-        this.defaultStickersContent = (<div className='mx_StickersContentPlaceholder'>
-            <p>You don't currently have any stickerpacks enabled</p>
-            <p>Click <a href=''>here</a> to add some!</p>
-        </div>);
+        this.defaultStickersContent = (
+            <div className='mx_StickersContentPlaceholder'>
+                <p>You don't currently have any stickerpacks enabled</p>
+                <p>Click <a href=''>here</a> to add some!</p>
+                <img src='img/stickerpack-placeholder.png' alt='Add a stickerpack' />
+            </div>
+        );
         this.popoverWidth = 300;
         this.popoverHeight = 300;
 
@@ -86,7 +89,7 @@ export default class Stickerpack extends React.Component {
         const buttonRect = e.target.getBoundingClientRect();
 
         // The window X and Y offsets are to adjust position when zoomed in to page
-        const x = buttonRect.right + window.pageXOffset - 40;
+        const x = buttonRect.right + window.pageXOffset - 37;
         const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
         // const self = this;
         ContextualMenu.createMenu(GenericElementContextMenu, {

From 7676fc0c10110336279d1d27c361b4c34581fef6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 16 Jan 2018 21:28:15 +0000
Subject: [PATCH 333/927] Handle stickerpack close.

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

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 52cd32ba4f..18ace9300c 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -28,6 +28,7 @@ export default class Stickerpack extends React.Component {
         super(props);
         this.onShowStickersClick = this.onShowStickersClick.bind(this);
         this.onHideStickersClick = this.onHideStickersClick.bind(this);
+        this.onFinished = this.onFinished.bind(this);
 
         this.defaultStickersContent = (
             <div className='mx_StickersContentPlaceholder'>
@@ -100,6 +101,7 @@ export default class Stickerpack extends React.Component {
             menuWidth: this.popoverWidth,
             menuHeight: this.popoverHeight,
             element: this.state.stickersContent,
+            onFinished: this.onFinished,
         });
 
 
@@ -110,6 +112,10 @@ export default class Stickerpack extends React.Component {
         this.setState({showStickers: false});
     }
 
+    onFinished() {
+        this.setState({showStickers: false});
+    }
+
     render() {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
         let stickersButton;

From 38ed01bebdc9334e43e55bc8f9641620efa7c92b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 16 Jan 2018 21:35:25 +0000
Subject: [PATCH 334/927] Pass room to stickerpack

---
 src/components/views/rooms/MessageComposer.js | 2 +-
 src/components/views/rooms/Stickerpack.js     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 7e001165c0..9dbfb994c7 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -322,7 +322,7 @@ export default class MessageComposer extends React.Component {
                 hangupButton,
                 callButton,
                 videoCallButton,
-                <Stickerpack key='stickerpack_controls_button' />,
+                <Stickerpack key='stickerpack_controls_button' room={this.props.room} />,
             );
         } else {
             controls.push(
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 18ace9300c..0553fbbdc6 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -46,11 +46,12 @@ export default class Stickerpack extends React.Component {
         };
     }
 
-    onComponentDidMount() {
+    componentDidMount() {
         // Stickers
         // TODO - Add support for stickerpacks from multiple app stores.
         // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
         const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
+        console.warn('Stickerpack widget', stickerpackWidget);
         let stickersContent;
 
         // Load stickerpack content

From 86da20416972b38cb839a617bb25ca1e39705708 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Tue, 16 Jan 2018 23:25:07 +0000
Subject: [PATCH 335/927] Add manage stickerpacks link

---
 src/components/views/rooms/Stickerpack.js | 67 +++++++++++++++--------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 0553fbbdc6..a12f1f359d 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -56,29 +56,50 @@ export default class Stickerpack extends React.Component {
 
         // Load stickerpack content
         if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
-            stickersContent = <div
-                id='stickersContent'
-                className='mx_StickersContent'
-                style={{
-                    border: 'none',
-                    height: this.popoverHeight,
-                    width: this.popoverWidth,
-                }}
-            >
-                <AppTile
-                    id={stickerpackWidget.id}
-                    url={stickerpackWidget.content.url}
-                    name={stickerpackWidget.content.name}
-                    room={this.props.room}
-                    type={stickerpackWidget.content.type}
-                    fullWidth={true}
-                    userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
-                    creatorUserId={MatrixClientPeg.get().credentials.userId}
-                    waitForIframeLoad={true}
-                    show={true}
-                    showMenubar={false}
-                />
-            </div>;
+            stickersContent = (
+                <div
+                    style={{
+                        overflow: 'hidden',
+                        height: '300px',
+                    }}
+                >
+                    <div
+                        id='stickersContent'
+                        className='mx_StickersContent'
+                        style={{
+                            border: 'none',
+                            height: this.popoverHeight - 30,
+                            width: this.popoverWidth,
+                        }}
+                    >
+                        <AppTile
+                            id={stickerpackWidget.id}
+                            url={stickerpackWidget.content.url}
+                            name={stickerpackWidget.content.name}
+                            room={this.props.room}
+                            type={stickerpackWidget.content.type}
+                            fullWidth={true}
+                            userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
+                            creatorUserId={MatrixClientPeg.get().credentials.userId}
+                            waitForIframeLoad={true}
+                            show={true}
+                            showMenubar={false}
+                        />
+                    </div>
+                    <div style={{
+                        height: '20px',
+                        position: 'absolute',
+                        bottom: '5px',
+                        right: '19px',
+                        width: '263px',
+                        textAlign: 'right',
+                        padding: '5px',
+                        borderTop: '1px solid #999',
+                    }}>
+                        Add sticker packs
+                    </div>
+                </div>
+            );
         } else {
             // Default content to show if stickerpack widget not added
             stickersContent = <p>Click here to add your first sitckerpack</p>;

From 614a10c6d397c794c2f93fc27b96355c89174ea4 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 17 Jan 2018 00:04:06 +0000
Subject: [PATCH 336/927] Add manage integration link.

---
 src/components/views/rooms/Stickerpack.js | 36 ++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index a12f1f359d..7afad74a4c 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -20,7 +20,10 @@ import Widgets from '../../../utils/widgets';
 import AppTile from '../elements/AppTile';
 import ContextualMenu from '../../structures/ContextualMenu';
 import MatrixClientPeg from '../../../MatrixClientPeg';
+import Modal from '../../../Modal';
 import sdk from '../../../index';
+import SdkConfig from '../../../SdkConfig';
+import ScalarAuthClient from '../../../ScalarAuthClient';
 
 
 export default class Stickerpack extends React.Component {
@@ -29,6 +32,7 @@ export default class Stickerpack extends React.Component {
         this.onShowStickersClick = this.onShowStickersClick.bind(this);
         this.onHideStickersClick = this.onHideStickersClick.bind(this);
         this.onFinished = this.onFinished.bind(this);
+        this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
 
         this.defaultStickersContent = (
             <div className='mx_StickersContentPlaceholder'>
@@ -47,6 +51,20 @@ export default class Stickerpack extends React.Component {
     }
 
     componentDidMount() {
+        this.scalarClient = null;
+        if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
+            this.scalarClient = new ScalarAuthClient();
+            this.scalarClient.connect().then(() => {
+                this.forceUpdate();
+            }).catch((e) => {
+                console.log("Failed to connect to integrations server");
+                // TODO -- Handle Scalar errors
+                //     this.setState({
+                //         scalar_error: err,
+                //     });
+            });
+        }
+
         // Stickers
         // TODO - Add support for stickerpacks from multiple app stores.
         // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
@@ -56,6 +74,7 @@ export default class Stickerpack extends React.Component {
 
         // Load stickerpack content
         if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
+            this.widgetId = stickerpackWidget.id;
             stickersContent = (
                 <div
                     style={{
@@ -96,7 +115,7 @@ export default class Stickerpack extends React.Component {
                         padding: '5px',
                         borderTop: '1px solid #999',
                     }}>
-                        Add sticker packs
+                        <span className='mx_Stickerpack_addLink' onClick={this._launchManageIntegrations} >Add sticker packs</span>
                     </div>
                 </div>
             );
@@ -138,6 +157,21 @@ export default class Stickerpack extends React.Component {
         this.setState({showStickers: false});
     }
 
+    _launchManageIntegrations() {
+        this.onFinished();
+        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+        const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
+                this.scalarClient.getScalarInterfaceUrlForRoom(
+                    this.props.room.roomId,
+                    'add_integ',
+                    // this.widgetId,
+                ) :
+                null;
+        Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+            src: src,
+        }, "mx_IntegrationsManager");
+    }
+
     render() {
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
         let stickersButton;

From 2a1f8bd394a5d9fa300062017437f02f93af2f6a Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 17 Jan 2018 10:45:49 +0000
Subject: [PATCH 337/927] Ignore remote echos caused by this client

by sending each tag_ordering with a _storeId and ignoring accout data
that has a matching _storeId.

This will tend to become out of sync with the server over time if
requests continually fail, but subsequent successful requests will
rectify any differences.
---
 src/actions/TagOrderActions.js |  7 ++++++-
 src/stores/TagOrderStore.js    | 12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
index 608fd6c4c5..dd4df6a9d4 100644
--- a/src/actions/TagOrderActions.js
+++ b/src/actions/TagOrderActions.js
@@ -42,9 +42,14 @@ TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
     tags = tags.filter((t) => t !== tag);
     tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
 
+    const storeId = TagOrderStore.getStoreId();
+
     return asyncAction('TagOrderActions.moveTag', () => {
         Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
-        return matrixClient.setAccountData('im.vector.web.tag_ordering', {tags});
+        return matrixClient.setAccountData(
+            'im.vector.web.tag_ordering',
+            {tags, _storeId: storeId},
+        );
     }, () => {
         // For an optimistic update
         return {tags};
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 27ce6cbb73..effd8287c7 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -63,6 +63,11 @@ class TagOrderStore extends Store {
             // Get ordering from account data
             case 'MatrixActions.accountData': {
                 if (payload.event_type !== 'im.vector.web.tag_ordering') break;
+
+                // Ignore remote echos caused by this store so as to avoid setting
+                // state back to old state.
+                if (payload.event_content._storeId === this.getStoreId()) break;
+
                 this._setState({
                     orderedTagsAccountData: payload.event_content ? payload.event_content.tags : null,
                 });
@@ -176,6 +181,13 @@ class TagOrderStore extends Store {
         return this._state.orderedTags;
     }
 
+    getStoreId() {
+        // Generate a random ID to prevent this store from clobbering its
+        // state with redundant remote echos.
+        if (!this._id) this._id = Math.random().toString(16).slice(2, 10);
+        return this._id;
+    }
+
     getSelectedTags() {
         return this._state.selectedTags;
     }

From 3331c8af273622c0c57e98ab56a51de1f504101f Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 17 Jan 2018 15:40:04 +0000
Subject: [PATCH 340/927] Use dispatcher ref for unregister call.

---
 src/components/views/elements/AppTile.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 1da344227e..fd88295122 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -43,7 +43,7 @@ export default class AppTile extends React.Component {
         super(props);
         this.state = this._getNewState(props);
 
-        this._onAction = this._onAction.bind(this);
+        this._onWidgetAction = this._onWidgetAction.bind(this);
         this._onMessage = this._onMessage.bind(this);
         this._onLoaded = this._onLoaded.bind(this);
         this._onEditClick = this._onEditClick.bind(this);
@@ -161,7 +161,7 @@ export default class AppTile extends React.Component {
         window.addEventListener('message', this._onMessage, false);
 
         // General event handler
-        dis.register(this._onAction);
+        this.dispatcherRef = dis.register(this._onWidgetAction);
     }
 
     /**
@@ -217,13 +217,19 @@ export default class AppTile extends React.Component {
     }
 
     componentWillUnmount() {
+        // Widget action listeners
+        dis.unregister(this.dispatcherRef);
+
+        // Widget postMessage listeners
         try {
-            this.widgetMessaging.stopListening();
-            this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+            if (this.widgetMessaging) {
+                this.widgetMessaging.stopListening();
+                this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+            }
         } catch (e) {
             console.error('Failed to stop listening for widgetMessaging events', e.message);
         }
-        dis.unregister(this._onAction);
+        // Jitsi listener
         window.removeEventListener('message', this._onMessage);
     }
 
@@ -342,7 +348,7 @@ export default class AppTile extends React.Component {
         this.setState({loading: false});
     }
 
-    _onAction(payload) {
+    _onWidgetAction(payload) {
         if (payload.widgetId === this.props.id) {
             switch (payload.action) {
                 case 'sticker_message':

From 5a4271268b72c1e878c224b7290474ed70d787cd Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 17 Jan 2018 15:40:47 +0000
Subject: [PATCH 341/927] Keep reference to stickers menu

---
 src/components/views/rooms/Stickerpack.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 7afad74a4c..4bcb426a35 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -134,7 +134,7 @@ export default class Stickerpack extends React.Component {
         const x = buttonRect.right + window.pageXOffset - 37;
         const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
         // const self = this;
-        ContextualMenu.createMenu(GenericElementContextMenu, {
+        this.stickersMenu = ContextualMenu.createMenu(GenericElementContextMenu, {
             chevronOffset: 10,
             chevronFace: 'bottom',
             left: x,
@@ -150,11 +150,12 @@ export default class Stickerpack extends React.Component {
     }
 
     onHideStickersClick(ev) {
-        this.setState({showStickers: false});
+        this.stickersMenu.close();
     }
 
     onFinished() {
         this.setState({showStickers: false});
+        this.stickersMenu = null;
     }
 
     _launchManageIntegrations() {

From fa336b7a99d1ae7564985dd05d47e21e92f32f9a Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 17 Jan 2018 15:41:15 +0000
Subject: [PATCH 342/927] Bring hide stickers icon to front when menu open.

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

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 4bcb426a35..84a7f4cbef 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -182,7 +182,7 @@ export default class Stickerpack extends React.Component {
                 <div
                     id='stickersButton'
                     key="controls_hide_stickers"
-                    className="mx_MessageComposer_stickers"
+                    className="mx_MessageComposer_stickers mx_MessageComposer_hideStickers"
                     onClick={this.onHideStickersClick}
                     ref='target'
                     title={_t("Hide Stickers")}>

From aa524c339d290560d32f7c2804f5a6ed4ef10e30 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 17 Jan 2018 15:49:36 +0000
Subject: [PATCH 343/927] Update class names.

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

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 84a7f4cbef..3c4a8f6425 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -35,7 +35,7 @@ export default class Stickerpack extends React.Component {
         this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
 
         this.defaultStickersContent = (
-            <div className='mx_StickersContentPlaceholder'>
+            <div className='mx_Stickers_contentPlaceholder'>
                 <p>You don't currently have any stickerpacks enabled</p>
                 <p>Click <a href=''>here</a> to add some!</p>
                 <img src='img/stickerpack-placeholder.png' alt='Add a stickerpack' />
@@ -84,7 +84,7 @@ export default class Stickerpack extends React.Component {
                 >
                     <div
                         id='stickersContent'
-                        className='mx_StickersContent'
+                        className='mx_Stickers_content'
                         style={{
                             border: 'none',
                             height: this.popoverHeight - 30,
@@ -115,7 +115,7 @@ export default class Stickerpack extends React.Component {
                         padding: '5px',
                         borderTop: '1px solid #999',
                     }}>
-                        <span className='mx_Stickerpack_addLink' onClick={this._launchManageIntegrations} >Add sticker packs</span>
+                        <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} >Add sticker packs</span>
                     </div>
                 </div>
             );
@@ -182,7 +182,7 @@ export default class Stickerpack extends React.Component {
                 <div
                     id='stickersButton'
                     key="controls_hide_stickers"
-                    className="mx_MessageComposer_stickers mx_MessageComposer_hideStickers"
+                    className="mx_MessageComposer_stickers mx_Stickers_hideStickers"
                     onClick={this.onHideStickersClick}
                     ref='target'
                     title={_t("Hide Stickers")}>

From b6f85fbf9251bb36e61335a23091b4534d353870 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 17 Jan 2018 16:52:10 +0000
Subject: [PATCH 344/927] Don't treat sticker messages as info messages.

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 46dc0d19db..a6750ac792 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -440,7 +440,7 @@ module.exports = withMatrixClient(React.createClass({
         const eventType = this.props.mxEvent.getType();
 
         // Info messages are basically information about commands processed on a room
-        const isInfoMessage = (eventType !== 'm.room.message');
+        const isInfoMessage = (eventType !== 'm.room.message' && eventType !== 'm.room.sticker');
 
         const EventTileType = sdk.getComponent(getHandlerTile(this.props.mxEvent));
         // This shouldn't happen: the caller should check we support this type

From 3ebf278cf3dc11d04d8b1240341e3a3af0e2b5ec Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 17 Jan 2018 16:59:13 +0000
Subject: [PATCH 345/927] Refactor GroupStore based on existing STATE_KEY
 concept

by factoring out a lot of repeated code.
---
 src/stores/GroupStore.js | 145 ++++++++++++++++++++-------------------
 1 file changed, 75 insertions(+), 70 deletions(-)

diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 9dce15fb53..d0040528a8 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -19,6 +19,14 @@ import { groupMemberFromApiObject, groupRoomFromApiObject } from '../groups';
 import FlairStore from './FlairStore';
 import MatrixClientPeg from '../MatrixClientPeg';
 
+function parseMembersResponse(response) {
+    return response.chunk.map((apiMember) => groupMemberFromApiObject(apiMember));
+}
+
+function parseRoomsResponse(response) {
+    return response.chunk.map((apiRoom) => groupRoomFromApiObject(apiRoom));
+}
+
 /**
  * Stores the group summary for a room and provides an API to change it and
  * other useful group APIs that may have an effect on the group summary.
@@ -38,65 +46,57 @@ export default class GroupStore extends EventEmitter {
             throw new Error('GroupStore needs a valid groupId to be created');
         }
         this.groupId = groupId;
-        this._summary = {};
-        this._rooms = [];
-        this._members = [];
-        this._invitedMembers = [];
+        this._state = {};
+        this._state[GroupStore.STATE_KEY.Summary] = {};
+        this._state[GroupStore.STATE_KEY.GroupRooms] = [];
+        this._state[GroupStore.STATE_KEY.GroupMembers] = [];
+        this._state[GroupStore.STATE_KEY.GroupInvitedMembers] = [];
         this._ready = {};
 
+        this._resourceFetcher = {
+            [GroupStore.STATE_KEY.Summary]: () => {
+                return MatrixClientPeg.get()
+                    .getGroupSummary(this.groupId);
+            },
+            [GroupStore.STATE_KEY.GroupRooms]: () => {
+                return MatrixClientPeg.get()
+                    .getGroupRooms(this.groupId)
+                    .then(parseRoomsResponse);
+            },
+            [GroupStore.STATE_KEY.GroupMembers]: () => {
+                return MatrixClientPeg.get()
+                    .getGroupUsers(this.groupId)
+                    .then(parseMembersResponse);
+            },
+            [GroupStore.STATE_KEY.GroupInvitedMembers]: () => {
+                return MatrixClientPeg.get()
+                    .getGroupInvitedUsers(this.groupId)
+                    .then(parseMembersResponse);
+            },
+        };
+
         this.on('error', (err) => {
             console.error(`GroupStore for ${this.groupId} encountered error`, err);
         });
     }
 
-    _fetchMembers() {
-        MatrixClientPeg.get().getGroupUsers(this.groupId).then((result) => {
-            this._members = result.chunk.map((apiMember) => {
-                return groupMemberFromApiObject(apiMember);
-            });
-            this._ready[GroupStore.STATE_KEY.GroupMembers] = true;
-            this._notifyListeners();
-        }).catch((err) => {
-            console.error("Failed to get group member list: " + err);
-            this.emit('error', err);
-        });
-
-        MatrixClientPeg.get().getGroupInvitedUsers(this.groupId).then((result) => {
-            this._invitedMembers = result.chunk.map((apiMember) => {
-                return groupMemberFromApiObject(apiMember);
-            });
-            this._ready[GroupStore.STATE_KEY.GroupInvitedMembers] = true;
+    _fetchResource(stateKey) {
+        const clientPromise = this._resourceFetcher[stateKey]();
+        clientPromise.then((result) => {
+            this._state[stateKey] = result;
+            this._ready[stateKey] = true;
             this._notifyListeners();
         }).catch((err) => {
             // Invited users not visible to non-members
-            if (err.httpStatus === 403) {
+            if (stateKey === GroupStore.STATE_KEY.GroupInvitedMembers && err.httpStatus === 403) {
                 return;
             }
-            console.error("Failed to get group invited member list: " + err);
-            this.emit('error', err);
-        });
-    }
 
-    _fetchSummary() {
-        MatrixClientPeg.get().getGroupSummary(this.groupId).then((resp) => {
-            this._summary = resp;
-            this._ready[GroupStore.STATE_KEY.Summary] = true;
-            this._notifyListeners();
-        }).catch((err) => {
+            console.error("Failed to get resource " + stateKey + ":" + err);
             this.emit('error', err);
         });
-    }
 
-    _fetchRooms() {
-        MatrixClientPeg.get().getGroupRooms(this.groupId).then((resp) => {
-            this._rooms = resp.chunk.map((apiRoom) => {
-                return groupRoomFromApiObject(apiRoom);
-            });
-            this._ready[GroupStore.STATE_KEY.GroupRooms] = true;
-            this._notifyListeners();
-        }).catch((err) => {
-            this.emit('error', err);
-        });
+        return clientPromise;
     }
 
     _notifyListeners() {
@@ -108,10 +108,9 @@ export default class GroupStore extends EventEmitter {
      * immediately triggers an update to send the current state of the
      * store (which could be the initial state).
      *
-     * XXX: This also causes a fetch of all group data, which effectively
-     * causes 4 separate HTTP requests. This is bad, we should at least
-     * deduplicate these in order to fix:
-     *  https://github.com/vector-im/riot-web/issues/5901
+     * This also causes a fetch of all group data, which might cause
+     * 4 separate HTTP requests, but only said requests aren't already
+     * ongoing.
      *
      * @param {function} fn the function to call when the store updates.
      * @return {Object} tok a registration "token" with a single
@@ -123,9 +122,11 @@ export default class GroupStore extends EventEmitter {
         this.on('update', fn);
         // Call to set initial state (before fetching starts)
         this.emit('update');
-        this._fetchSummary();
-        this._fetchRooms();
-        this._fetchMembers();
+
+        this._fetchResource(GroupStore.STATE_KEY.Summary);
+        this._fetchResource(GroupStore.STATE_KEY.GroupRooms);
+        this._fetchResource(GroupStore.STATE_KEY.GroupMembers);
+        this._fetchResource(GroupStore.STATE_KEY.GroupInvitedMembers);
 
         // Similar to the Store of flux/utils, we return a "token" that
         // can be used to unregister the listener.
@@ -145,90 +146,94 @@ export default class GroupStore extends EventEmitter {
     }
 
     getSummary() {
-        return this._summary;
+        return this._state[GroupStore.STATE_KEY.Summary];
     }
 
     getGroupRooms() {
-        return this._rooms;
+        return this._state[GroupStore.STATE_KEY.GroupRooms];
     }
 
-    getGroupMembers( ) {
-        return this._members;
+    getGroupMembers() {
+        return this._state[GroupStore.STATE_KEY.GroupMembers];
     }
 
-    getGroupInvitedMembers( ) {
-        return this._invitedMembers;
+    getGroupInvitedMembers() {
+        return this._state[GroupStore.STATE_KEY.GroupInvitedMembers];
     }
 
     getGroupPublicity() {
-        return this._summary.user ? this._summary.user.is_publicised : null;
+        return this._state[GroupStore.STATE_KEY.Summary].user ?
+            this._state[GroupStore.STATE_KEY.Summary].user.is_publicised : null;
     }
 
     isUserPrivileged() {
-        return this._summary.user ? this._summary.user.is_privileged : null;
+        return this._state[GroupStore.STATE_KEY.Summary].user ?
+            this._state[GroupStore.STATE_KEY.Summary].user.is_privileged : null;
     }
 
     addRoomToGroup(roomId, isPublic) {
         return MatrixClientPeg.get()
             .addRoomToGroup(this.groupId, roomId, isPublic)
-            .then(this._fetchRooms.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms));
     }
 
     updateGroupRoomVisibility(roomId, isPublic) {
         return MatrixClientPeg.get()
             .updateGroupRoomVisibility(this.groupId, roomId, isPublic)
-            .then(this._fetchRooms.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms));
     }
 
     removeRoomFromGroup(roomId) {
         return MatrixClientPeg.get()
             .removeRoomFromGroup(this.groupId, roomId)
             // Room might be in the summary, refresh just in case
-            .then(this._fetchSummary.bind(this))
-            .then(this._fetchRooms.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary))
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms));
     }
 
     inviteUserToGroup(userId) {
         return MatrixClientPeg.get().inviteUserToGroup(this.groupId, userId)
-            .then(this._fetchMembers.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupInvitedMembers));
     }
 
     acceptGroupInvite() {
         return MatrixClientPeg.get().acceptGroupInvite(this.groupId)
             // The user might be able to see more rooms now
-            .then(this._fetchRooms.bind(this))
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms))
             // The user should now appear as a member
-            .then(this._fetchMembers.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupMembers))
+            // The user should now not appear as an invited member
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupInvitedMembers));
     }
 
     addRoomToGroupSummary(roomId, categoryId) {
         return MatrixClientPeg.get()
             .addRoomToGroupSummary(this.groupId, roomId, categoryId)
-            .then(this._fetchSummary.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary));
     }
 
     addUserToGroupSummary(userId, roleId) {
         return MatrixClientPeg.get()
             .addUserToGroupSummary(this.groupId, userId, roleId)
-            .then(this._fetchSummary.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary));
     }
 
     removeRoomFromGroupSummary(roomId) {
         return MatrixClientPeg.get()
             .removeRoomFromGroupSummary(this.groupId, roomId)
-            .then(this._fetchSummary.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary));
     }
 
     removeUserFromGroupSummary(userId) {
         return MatrixClientPeg.get()
             .removeUserFromGroupSummary(this.groupId, userId)
-            .then(this._fetchSummary.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary));
     }
 
     setGroupPublicity(isPublished) {
         return MatrixClientPeg.get()
             .setGroupPublicity(this.groupId, isPublished)
             .then(() => { FlairStore.invalidatePublicisedGroups(MatrixClientPeg.get().credentials.userId); })
-            .then(this._fetchSummary.bind(this));
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary));
     }
 }

From 5f413ddf8bd3cc376eedf2664067ae3ecca2bac3 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 17 Jan 2018 17:01:42 +0000
Subject: [PATCH 346/927] Do not fetch GroupStore resources if already fetching

---
 src/stores/GroupStore.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index d0040528a8..c3465b684c 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -53,6 +53,7 @@ export default class GroupStore extends EventEmitter {
         this._state[GroupStore.STATE_KEY.GroupInvitedMembers] = [];
         this._ready = {};
 
+        this._fetchResourcePromise = {};
         this._resourceFetcher = {
             [GroupStore.STATE_KEY.Summary]: () => {
                 return MatrixClientPeg.get()
@@ -81,7 +82,14 @@ export default class GroupStore extends EventEmitter {
     }
 
     _fetchResource(stateKey) {
+        // Ongoing request, ignore
+        if (this._fetchResourcePromise[stateKey]) return;
+
         const clientPromise = this._resourceFetcher[stateKey]();
+
+        // Indicate ongoing request
+        this._fetchResourcePromise[stateKey] = clientPromise;
+
         clientPromise.then((result) => {
             this._state[stateKey] = result;
             this._ready[stateKey] = true;
@@ -94,6 +102,9 @@ export default class GroupStore extends EventEmitter {
 
             console.error("Failed to get resource " + stateKey + ":" + err);
             this.emit('error', err);
+        }).finally(() => {
+            // Indicate finished request, allow for future fetches
+            delete this._fetchResourcePromise[stateKey];
         });
 
         return clientPromise;

From f8d7ab10fab9c742f2351477e698d5f6b0e6a5d1 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 17 Jan 2018 17:19:20 +0000
Subject: [PATCH 347/927] Handle non-m.room.message event types.

---
 src/components/structures/MessagePanel.js | 2 +-
 src/components/views/rooms/EventTile.js   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 53cc660a9b..30ded948a4 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -450,7 +450,7 @@ module.exports = React.createClass({
         if (prevEvent !== null
                 && prevEvent.sender && mxEv.sender
                 && mxEv.sender.userId === prevEvent.sender.userId
-                && mxEv.getType() == prevEvent.getType()) {
+                 && Boolean(mxEv.getContent().body) == Boolean(prevEvent.getContent().body)) {
             continuation = true;
         }
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index a6750ac792..3245cf1ac3 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -440,7 +440,8 @@ module.exports = withMatrixClient(React.createClass({
         const eventType = this.props.mxEvent.getType();
 
         // Info messages are basically information about commands processed on a room
-        const isInfoMessage = (eventType !== 'm.room.message' && eventType !== 'm.room.sticker');
+        // For now assume that anything that doesn't have a content body is an isInfoMessage
+        const isInfoMessage = !content.body; // Boolean comparison of non-boolean content body
 
         const EventTileType = sdk.getComponent(getHandlerTile(this.props.mxEvent));
         // This shouldn't happen: the caller should check we support this type

From b90a98b5c1e46751dcd412ddd842d04c4d6d7171 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 17 Jan 2018 18:06:19 +0000
Subject: [PATCH 348/927] don't pass back {} when we have no
 `org.matrix.room.color_scheme`

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

diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index e946581807..72355b43be 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -24,7 +24,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
     getValue(settingName, roomId) {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls");
+            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
 
             // Check to make sure that we actually got a boolean
             if (typeof(content['disable']) !== "boolean") return null;
@@ -38,13 +38,14 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
             return this._getSettings(roomId, "org.matrix.room.color_scheme");
         }
 
-        return this._getSettings(roomId)[settingName];
+        const settings = this._getSettings(roomId) || {};
+        return settings[settingName];
     }
 
     setValue(settingName, roomId, newValue) {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls");
+            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
             content['disable'] = !newValue;
             return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.preview_urls", content);
         }
@@ -55,7 +56,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
             return MatrixClientPeg.get().setRoomAccountData(roomId, "org.matrix.room.color_scheme", newValue);
         }
 
-        const content = this._getSettings(roomId);
+        const content = this._getSettings(roomId) || {};
         content[settingName] = newValue;
         return MatrixClientPeg.get().setRoomAccountData(roomId, "im.vector.web.settings", content);
     }
@@ -74,10 +75,10 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
 
     _getSettings(roomId, eventType = "im.vector.settings") {
         const room = MatrixClientPeg.get().getRoom(roomId);
-        if (!room) return {};
+        if (!room) return null;
 
         const event = room.getAccountData(eventType);
-        if (!event || !event.getContent()) return {};
+        if (!event || !event.getContent()) return null;
         return event.getContent();
     }
 }

From 43bb8c561d3e70e7b19682bde727338d520d2164 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 17 Jan 2018 18:10:19 +0000
Subject: [PATCH 349/927] add comment

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

diff --git a/src/settings/handlers/RoomAccountSettingsHandler.js b/src/settings/handlers/RoomAccountSettingsHandler.js
index 72355b43be..74dbf9eed0 100644
--- a/src/settings/handlers/RoomAccountSettingsHandler.js
+++ b/src/settings/handlers/RoomAccountSettingsHandler.js
@@ -35,6 +35,7 @@ export default class RoomAccountSettingsHandler extends SettingsHandler {
         if (settingName === "roomColor") {
             // The event content should already be in an appropriate format, we just need
             // to get the right value.
+            // don't fallback to {} because thats truthy and would imply there is an event specifying tint
             return this._getSettings(roomId, "org.matrix.room.color_scheme");
         }
 

From b7204e79a7479dc1f1a2d429e4e9c55da7485dc0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 17 Jan 2018 18:17:26 +0000
Subject: [PATCH 350/927] fallback after receiving settings rather than {}
 because its truthy

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/settings/handlers/AccountSettingsHandler.js | 16 +++++++++-------
 src/settings/handlers/DeviceSettingsHandler.js  |  7 ++++---
 src/settings/handlers/RoomSettingsHandler.js    | 14 ++++++++------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/settings/handlers/AccountSettingsHandler.js b/src/settings/handlers/AccountSettingsHandler.js
index e50358a728..b822709573 100644
--- a/src/settings/handlers/AccountSettingsHandler.js
+++ b/src/settings/handlers/AccountSettingsHandler.js
@@ -25,19 +25,20 @@ export default class AccountSettingHandler extends SettingsHandler {
     getValue(settingName, roomId) {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings("org.matrix.preview_urls");
+            const content = this._getSettings("org.matrix.preview_urls") || {};
 
             // Check to make sure that we actually got a boolean
             if (typeof(content['disable']) !== "boolean") return null;
             return !content['disable'];
         }
 
-        let preferredValue = this._getSettings()[settingName];
+        const settings = this._getSettings() || {};
+        let preferredValue = settings[settingName];
 
         if (preferredValue === null || preferredValue === undefined) {
             // Honour the old setting on read only
             if (settingName === "hideAvatarChanges" || settingName === "hideDisplaynameChanges") {
-                preferredValue = this._getSettings()["hideAvatarDisplaynameChanges"];
+                preferredValue = settings["hideAvatarDisplaynameChanges"];
             }
         }
 
@@ -47,12 +48,12 @@ export default class AccountSettingHandler extends SettingsHandler {
     setValue(settingName, roomId, newValue) {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings("org.matrix.preview_urls");
+            const content = this._getSettings("org.matrix.preview_urls") || {};
             content['disable'] = !newValue;
             return MatrixClientPeg.get().setAccountData("org.matrix.preview_urls", content);
         }
 
-        const content = this._getSettings();
+        const content = this._getSettings() || {};
         content[settingName] = newValue;
         return MatrixClientPeg.get().setAccountData("im.vector.web.settings", content);
     }
@@ -68,9 +69,10 @@ export default class AccountSettingHandler extends SettingsHandler {
 
     _getSettings(eventType = "im.vector.web.settings") {
         const cli = MatrixClientPeg.get();
-        if (!cli) return {};
+        if (!cli) return null;
+
         const event = cli.getAccountData(eventType);
-        if (!event || !event.getContent()) return {};
+        if (!event || !event.getContent()) return null;
         return event.getContent();
     }
 }
diff --git a/src/settings/handlers/DeviceSettingsHandler.js b/src/settings/handlers/DeviceSettingsHandler.js
index 22f6140a80..13117f7498 100644
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.js
@@ -53,7 +53,8 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             return null; // wrong type or otherwise not set
         }
 
-        return this._getSettings()[settingName];
+        const settings = this._getSettings() || {};
+        return settings[settingName];
     }
 
     setValue(settingName, roomId, newValue) {
@@ -74,7 +75,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
             return Promise.resolve();
         }
 
-        const settings = this._getSettings();
+        const settings = this._getSettings() || {};
         settings[settingName] = newValue;
         localStorage.setItem("mx_local_settings", JSON.stringify(settings));
 
@@ -91,7 +92,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
 
     _getSettings() {
         const value = localStorage.getItem("mx_local_settings");
-        if (!value) return {};
+        if (!value) return null;
         return JSON.parse(value);
     }
 
diff --git a/src/settings/handlers/RoomSettingsHandler.js b/src/settings/handlers/RoomSettingsHandler.js
index cb3e836c7f..71abff94f6 100644
--- a/src/settings/handlers/RoomSettingsHandler.js
+++ b/src/settings/handlers/RoomSettingsHandler.js
@@ -24,25 +24,26 @@ export default class RoomSettingsHandler extends SettingsHandler {
     getValue(settingName, roomId) {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls");
+            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
 
             // Check to make sure that we actually got a boolean
             if (typeof(content['disable']) !== "boolean") return null;
             return !content['disable'];
         }
 
-        return this._getSettings(roomId)[settingName];
+        const settings = this._getSettings(roomId) || {};
+        return settings[settingName];
     }
 
     setValue(settingName, roomId, newValue) {
         // Special case URL previews
         if (settingName === "urlPreviewsEnabled") {
-            const content = this._getSettings(roomId, "org.matrix.room.preview_urls");
+            const content = this._getSettings(roomId, "org.matrix.room.preview_urls") || {};
             content['disable'] = !newValue;
             return MatrixClientPeg.get().sendStateEvent(roomId, "org.matrix.room.preview_urls", content);
         }
 
-        const content = this._getSettings(roomId);
+        const content = this._getSettings(roomId) || {};
         content[settingName] = newValue;
         return MatrixClientPeg.get().sendStateEvent(roomId, "im.vector.web.settings", content, "");
     }
@@ -65,9 +66,10 @@ export default class RoomSettingsHandler extends SettingsHandler {
 
     _getSettings(roomId, eventType = "im.vector.web.settings") {
         const room = MatrixClientPeg.get().getRoom(roomId);
-        if (!room) return {};
+        if (!room) return null;
+
         const event = room.currentState.getStateEvents(eventType, "");
-        if (!event || !event.getContent()) return {};
+        if (!event || !event.getContent()) return null;
         return event.getContent();
     }
 }

From d3292d93887e6834056a6b922bb6ab9cbb0e43d7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 17 Jan 2018 23:25:39 +0000
Subject: [PATCH 351/927] fix typos and NPE. fixes #5999

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

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 33d59e0467..816246a2de 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -857,8 +857,8 @@ module.exports = withMatrixClient(React.createClass({
         }
 
         const room = this.props.matrixClient.getRoom(this.props.member.roomId);
-        const poweLevelEvent = room ? room.currentState.getStateEvents("m.room.power_levels", "") : null;
-        const powerLevelUsersDefault = poweLevelEvent.getContent().users_default;
+        const powerLevelEvent = room ? room.currentState.getStateEvents("m.room.power_levels", "") : null;
+        const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
 
         let roomMemberDetails = null;
         if (this.props.member.roomId) { // is in room

From 80d3edfbb339ac5a90f5d6fd13a53b3f35aaa475 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 18 Jan 2018 09:57:29 +0000
Subject: [PATCH 352/927] simplify the 'send anyway' text, as 'mark devices
 known' is meaningless to users

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

diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js
index 47da4096c0..8034923158 100644
--- a/src/components/structures/RoomStatusBar.js
+++ b/src/components/structures/RoomStatusBar.js
@@ -296,7 +296,7 @@ module.exports = React.createClass({
         if (hasUDE) {
             title = _t("Message not sent due to unknown devices being present");
             content = _t(
-                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.",
+                "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
                 {},
                 {
                     'showDevicesText': (sub) => <a className="mx_RoomStatusBar_resend_link" key="resend" onClick={this._onShowDevicesClick}>{ sub }</a>,

From 1293c53c4bbb4d5a95503ab65c0d952bd5387fbf Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 18 Jan 2018 12:02:45 +0000
Subject: [PATCH 353/927] Cleanup

---
 src/components/views/elements/AppTile.js | 39 +++++++++++++-----------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index fd88295122..05ea8cfa0b 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -160,10 +160,30 @@ export default class AppTile extends React.Component {
         // postMessaging API
         window.addEventListener('message', this._onMessage, false);
 
-        // General event handler
+        // Widget action listeners
         this.dispatcherRef = dis.register(this._onWidgetAction);
     }
 
+    componentWillUnmount() {
+        // Widget action listeners
+        console.warn('Removing widget event listener', this.dispatcherRef);
+        dis.unregister(this.dispatcherRef);
+
+        // Widget postMessage listeners
+        try {
+            if (this.widgetMessaging) {
+                this.widgetMessaging.stopListening();
+                this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+            } else {
+                console.warn('WidgetMessaging not initialised. Not stopping.');
+            }
+        } catch (e) {
+            console.error('Failed to stop listening for widgetMessaging events', e.message);
+        }
+        // Jitsi listener
+        window.removeEventListener('message', this._onMessage);
+    }
+
     /**
      * Adds a scalar token to the widget URL, if required
      * Component initialisation is only complete when this function has resolved
@@ -216,23 +236,6 @@ export default class AppTile extends React.Component {
         });
     }
 
-    componentWillUnmount() {
-        // Widget action listeners
-        dis.unregister(this.dispatcherRef);
-
-        // Widget postMessage listeners
-        try {
-            if (this.widgetMessaging) {
-                this.widgetMessaging.stopListening();
-                this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
-            }
-        } catch (e) {
-            console.error('Failed to stop listening for widgetMessaging events', e.message);
-        }
-        // Jitsi listener
-        window.removeEventListener('message', this._onMessage);
-    }
-
     componentWillReceiveProps(nextProps) {
         if (nextProps.url !== this.props.url) {
             this._getNewState(nextProps);

From 917d85d603d071764e2ce7151e8fdbb3f72fc287 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 18 Jan 2018 12:03:24 +0000
Subject: [PATCH 354/927] Refer rest parameters

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

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 3c2308e6a7..f3189c2e4b 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -51,11 +51,11 @@ module.exports = {
     createMenu: function(Element, props) {
         const self = this;
 
-        const closeMenu = function() {
+        const closeMenu = function(...args) {
             ReactDOM.unmountComponentAtNode(self.getOrCreateContainer());
 
             if (props && props.onFinished) {
-                props.onFinished.apply(null, arguments);
+                props.onFinished.apply(null, args);
             }
         };
 

From 910623d287c131ec51ff3ec09091a91b5f85d6f2 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 18 Jan 2018 12:04:00 +0000
Subject: [PATCH 355/927] Close context menu on resize.

---
 src/components/structures/ContextualMenu.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index f3189c2e4b..7ec078f739 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -59,6 +59,11 @@ module.exports = {
             }
         };
 
+        // Close the menu on window resize
+        const windowResize = function() {
+            closeMenu();
+        };
+
         const position = {};
         let chevronFace = null;
 
@@ -135,7 +140,7 @@ module.exports = {
             <div className={className} style={position}>
                 <div className={menuClasses} style={menuStyle}>
                     { chevron }
-                    <Element {...props} onFinished={closeMenu} />
+                    <Element {...props} onFinished={closeMenu} onResize={windowResize} />
                 </div>
                 <div className="mx_ContextualMenu_background" onClick={closeMenu}></div>
                 <style>{ chevronCSS }</style>

From 23bef68a8f0a3f08ff3a5d22646c26c41a8dbffa Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 18 Jan 2018 13:16:06 +0000
Subject: [PATCH 356/927] Fix duplicate message listeners

---
 src/WidgetMessaging.js                   | 16 ++++++++++++----
 src/components/views/elements/AppTile.js |  8 ++------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index cd1e4a0996..c1af402e4d 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -178,6 +178,10 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
     constructor(widgetId, targetWindow) {
         super(targetWindow);
         this.widgetId = widgetId;
+
+        this.startListening = this.startListening.bind(this);
+        this.stopListening = this.stopListening.bind(this);
+        this.onMessage = this.onMessage.bind(this);
     }
 
     exec(action) {
@@ -206,9 +210,11 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      * Register widget message event listeners
      */
     startListening() {
-        this.start();
         if (global.mxWidgetMessagingListenerCount === 0) {
-            window.addEventListener("message", (evt) => this.onMessage(evt), false);
+            // Start postMessage API listener
+            this.start();
+            // Start widget specific listener
+            window.addEventListener("message", this.onMessage, false);
         }
         global.mxWidgetMessagingListenerCount += 1;
     }
@@ -217,10 +223,12 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      * De-register widget message event listeners
      */
     stopListening() {
-        this.stop();
         global.mxWidgetMessagingListenerCount -= 1;
         if (global.mxWidgetMessagingListenerCount === 0) {
-            window.removeEventListener("message", () => this.onMessage);
+            // Stop widget specific listener
+            window.removeEventListener("message", this.onMessage, false);
+            // Stop postMessage API listener
+            this.stop();
         }
         if (global.mxWidgetMessagingListenerCount < 0) {
             // Make an error so we get a stack trace
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 05ea8cfa0b..582cc01a57 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -171,12 +171,8 @@ export default class AppTile extends React.Component {
 
         // Widget postMessage listeners
         try {
-            if (this.widgetMessaging) {
-                this.widgetMessaging.stopListening();
-                this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
-            } else {
-                console.warn('WidgetMessaging not initialised. Not stopping.');
-            }
+            this.widgetMessaging.stopListening();
+            this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
         } catch (e) {
             console.error('Failed to stop listening for widgetMessaging events', e.message);
         }

From dfecad181a1a086c391e1cedd67e53c50b9c2b54 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 18 Jan 2018 17:52:50 +0000
Subject: [PATCH 357/927] Swap RoomList to react-beautiful-dnd

---
 src/components/views/rooms/RoomList.js | 97 ++++++++++++++++++++++++++
 src/components/views/rooms/RoomTile.js | 43 ++++--------
 2 files changed, 109 insertions(+), 31 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index d1ef6c2f2c..898dfbef8c 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -18,6 +18,7 @@ limitations under the License.
 'use strict';
 const React = require("react");
 const ReactDOM = require("react-dom");
+import { DragDropContext } from 'react-beautiful-dnd';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 const GeminiScrollbar = require('react-gemini-scrollbar');
@@ -32,6 +33,8 @@ const Receipt = require('../../../utils/Receipt');
 import TagOrderStore from '../../../stores/TagOrderStore';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
 
+import Modal from '../../../Modal';
+
 const HIDE_CONFERENCE_CHANS = true;
 
 function phraseForSection(section) {
@@ -275,6 +278,98 @@ module.exports = React.createClass({
         this.forceUpdate();
     },
 
+    onRoomTileEndDrag: function(result) {
+        if (!result.destination) return;
+
+        let newTag = result.destination.droppableId.split('_')[1];
+        let prevTag = result.source.droppableId.split('_')[1];
+        if (newTag === 'undefined') newTag = undefined;
+        if (prevTag === 'undefined') prevTag = undefined;
+
+        const roomId = result.draggableId.split('_')[1];
+        const room = MatrixClientPeg.get().getRoom(roomId);
+
+        const newIndex = result.destination.index;
+
+        // Evil hack to get DMs behaving
+        if ((prevTag === undefined && newTag === 'im.vector.fake.direct') ||
+            (prevTag === 'im.vector.fake.direct' && newTag === undefined)
+        ) {
+            Rooms.guessAndSetDMRoom(
+                room, newTag === 'im.vector.fake.direct',
+            ).catch((err) => {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                console.error("Failed to set direct chat tag " + err);
+                Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
+                    title: _t('Failed to set direct chat tag'),
+                    description: ((err && err.message) ? err.message : _t('Operation failed')),
+                });
+            });
+            return;
+        }
+
+        const hasChangedSubLists = result.source.droppableId !== result.destination.droppableId;
+
+        const newOrder = {};
+
+        // Is the tag ordered manually?
+        if (!newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+            const newList = Object.assign({}, this.state.lists[newTag]);
+
+            // If the room was moved "down" (increasing index) in the same list we
+            // need to use the orders of the tiles with indices shifted by +1
+            const offset = (
+                newTag === prevTag && result.source.index < result.destination.index
+            ) ? 1 : 0;
+
+            const prevOrder = newIndex === 0 ?
+                0 : newList[offset + newIndex - 1].tags[newTag].order;
+            const nextOrder = newIndex === newList.length ?
+                1 : newList[offset + newIndex].tags[newTag].order;
+
+            newOrder['order'] = (prevOrder + nextOrder) / 2.0;
+        }
+
+        // More evilness: We will still be dealing with moving to favourites/low prio,
+        // but we avoid ever doing a request with 'im.vector.fake.direct`.
+        //
+        // if we moved lists, remove the old tag
+        if (prevTag && prevTag !== 'im.vector.fake.direct' &&
+            hasChangedSubLists
+        ) {
+            // Optimistic update of what will happen to the room tags
+            delete room.tags[prevTag];
+
+            MatrixClientPeg.get().deleteRoomTag(roomId, prevTag).catch(function(err) {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                console.error("Failed to remove tag " + prevTag + " from room: " + err);
+                Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
+                    title: _t('Failed to remove tag %(tagName)s from room', {tagName: prevTag}),
+                    description: ((err && err.message) ? err.message : _t('Operation failed')),
+                });
+            });
+        }
+
+        // if we moved lists or the ordering changed, add the new tag
+        if (newTag && newTag !== 'im.vector.fake.direct' &&
+            (hasChangedSubLists || newOrder)
+        ) {
+            // Optimistic update of what will happen to the room tags
+            room.tags[newTag] = newOrder;
+
+            MatrixClientPeg.get().setRoomTag(roomId, newTag, newOrder).catch(function(err) {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                console.error("Failed to add tag " + newTag + " to room: " + err);
+                Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
+                    title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
+                    description: ((err && err.message) ? err.message : _t('Operation failed')),
+                });
+            });
+        }
+
+        this.refreshRoomList();
+    },
+
     _delayedRefreshRoomList: new rate_limited_func(function() {
         this.refreshRoomList();
     }, 500),
@@ -649,6 +744,7 @@ module.exports = React.createClass({
 
         const self = this;
         return (
+            <DragDropContext onDragEnd={this.onRoomTileEndDrag}>
             <GeminiScrollbar className="mx_RoomList_scrollbar"
                  autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
             <div className="mx_RoomList">
@@ -757,6 +853,7 @@ module.exports = React.createClass({
                              onShowMoreRooms={self.onShowMoreRooms} />
             </div>
             </GeminiScrollbar>
+            </DragDropContext>
         );
     },
 });
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 30cc64ef7a..43bc69dea2 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -35,10 +35,7 @@ module.exports = React.createClass({
     displayName: 'RoomTile',
 
     propTypes: {
-        connectDragSource: PropTypes.func,
-        connectDropTarget: PropTypes.func,
         onClick: PropTypes.func,
-        isDragging: PropTypes.bool,
 
         room: PropTypes.object.isRequired,
         collapsed: PropTypes.bool.isRequired,
@@ -256,35 +253,19 @@ module.exports = React.createClass({
          directMessageIndicator = <img src="img/icon_person.svg" className="mx_RoomTile_dm" width="11" height="13" alt="dm" />;
         }
 
-        // These props are injected by React DnD,
-        // as defined by your `collect` function above:
-        const isDragging = this.props.isDragging;
-        const connectDragSource = this.props.connectDragSource;
-        const connectDropTarget = this.props.connectDropTarget;
-
-
-        let ret = (
-            <div> { /* Only native elements can be wrapped in a DnD object. */ }
-            <AccessibleButton className={classes} tabIndex="0" onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
-                <div className={avatarClasses}>
-                    <div className="mx_RoomTile_avatar_container">
-                        <RoomAvatar room={this.props.room} width={24} height={24} />
-                        { directMessageIndicator }
-                    </div>
+        return <AccessibleButton className={classes} tabIndex="0" onClick={this.onClick} onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave}>
+            <div className={avatarClasses}>
+                <div className="mx_RoomTile_avatar_container">
+                    <RoomAvatar room={this.props.room} width={24} height={24} />
+                    { directMessageIndicator }
                 </div>
-                <div className="mx_RoomTile_nameContainer">
-                    { label }
-                    { badge }
-                </div>
-                { /* { incomingCallBox } */ }
-                { tooltip }
-            </AccessibleButton>
             </div>
-        );
-
-        if (connectDropTarget) ret = connectDropTarget(ret);
-        if (connectDragSource) ret = connectDragSource(ret);
-
-        return ret;
+            <div className="mx_RoomTile_nameContainer">
+                { label }
+                { badge }
+            </div>
+            { /* { incomingCallBox } */ }
+            { tooltip }
+        </AccessibleButton>;
     },
 });

From 59f4661bfdd50360b6688e67eec4f19d244e7079 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 18 Jan 2018 18:01:31 +0000
Subject: [PATCH 358/927] Add comment

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 898dfbef8c..6a7c86ab31 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -367,6 +367,9 @@ module.exports = React.createClass({
             });
         }
 
+        // Refresh to display the optimistic updates - this needs to be done in the
+        // same tick as the drag finishing otherwise the room will pop back to its
+        // previous position - hence no delayed refresh
         this.refreshRoomList();
     },
 

From 6f0d7999129f1413f5f11d424811b85d0137cd88 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 18 Jan 2018 18:15:34 +0000
Subject: [PATCH 359/927] Fix indentation

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 6a7c86ab31..9c66731b06 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -748,114 +748,114 @@ module.exports = React.createClass({
         const self = this;
         return (
             <DragDropContext onDragEnd={this.onRoomTileEndDrag}>
-            <GeminiScrollbar className="mx_RoomList_scrollbar"
-                 autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
-            <div className="mx_RoomList">
-                <RoomSubList list={[]}
-                             extraTiles={this._makeGroupInviteTiles()}
-                             label={_t('Community Invites')}
-                             editable={false}
-                             order="recent"
-                             isInvite={true}
-                             collapsed={self.props.collapsed}
-                             searchFilter={self.props.searchFilter}
-                             onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms}
-                />
+                <GeminiScrollbar className="mx_RoomList_scrollbar"
+                     autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
+                <div className="mx_RoomList">
+                    <RoomSubList list={[]}
+                                 extraTiles={this._makeGroupInviteTiles()}
+                                 label={_t('Community Invites')}
+                                 editable={false}
+                                 order="recent"
+                                 isInvite={true}
+                                 collapsed={self.props.collapsed}
+                                 searchFilter={self.props.searchFilter}
+                                 onHeaderClick={self.onSubListHeaderClick}
+                                 onShowMoreRooms={self.onShowMoreRooms}
+                    />
 
-                <RoomSubList list={self.state.lists['im.vector.fake.invite']}
-                             label={_t('Invites')}
-                             editable={false}
-                             order="recent"
-                             isInvite={true}
-                             incomingCall={self.state.incomingCall}
-                             collapsed={self.props.collapsed}
-                             searchFilter={self.props.searchFilter}
-                             onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms}
-                />
+                    <RoomSubList list={self.state.lists['im.vector.fake.invite']}
+                                 label={_t('Invites')}
+                                 editable={false}
+                                 order="recent"
+                                 isInvite={true}
+                                 incomingCall={self.state.incomingCall}
+                                 collapsed={self.props.collapsed}
+                                 searchFilter={self.props.searchFilter}
+                                 onHeaderClick={self.onSubListHeaderClick}
+                                 onShowMoreRooms={self.onShowMoreRooms}
+                    />
 
-                <RoomSubList list={self.state.lists['m.favourite']}
-                             label={_t('Favourites')}
-                             tagName="m.favourite"
-                             emptyContent={this._getEmptyContent('m.favourite')}
-                             editable={true}
-                             order="manual"
-                             incomingCall={self.state.incomingCall}
-                             collapsed={self.props.collapsed}
-                             searchFilter={self.props.searchFilter}
-                             onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                    <RoomSubList list={self.state.lists['m.favourite']}
+                                 label={_t('Favourites')}
+                                 tagName="m.favourite"
+                                 emptyContent={this._getEmptyContent('m.favourite')}
+                                 editable={true}
+                                 order="manual"
+                                 incomingCall={self.state.incomingCall}
+                                 collapsed={self.props.collapsed}
+                                 searchFilter={self.props.searchFilter}
+                                 onHeaderClick={self.onSubListHeaderClick}
+                                 onShowMoreRooms={self.onShowMoreRooms} />
 
-                <RoomSubList list={self.state.lists['im.vector.fake.direct']}
-                             label={_t('People')}
-                             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}
-                             collapsed={self.props.collapsed}
-                             alwaysShowHeader={true}
-                             searchFilter={self.props.searchFilter}
-                             onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                    <RoomSubList list={self.state.lists['im.vector.fake.direct']}
+                                 label={_t('People')}
+                                 tagName="im.vector.fake.direct"
+                                 emptyContent={this._getEmptyContent('im.vector.fake.direct')}
+                                 headerItems={this._getHeaderItems('im.vector.fake.direct')}
+                                 editable={true}
+                                 order="recent"
+                                 incomingCall={self.state.incomingCall}
+                                 collapsed={self.props.collapsed}
+                                 alwaysShowHeader={true}
+                                 searchFilter={self.props.searchFilter}
+                                 onHeaderClick={self.onSubListHeaderClick}
+                                 onShowMoreRooms={self.onShowMoreRooms} />
 
-                <RoomSubList list={self.state.lists['im.vector.fake.recent']}
-                             label={_t('Rooms')}
-                             editable={true}
-                             emptyContent={this._getEmptyContent('im.vector.fake.recent')}
-                             headerItems={this._getHeaderItems('im.vector.fake.recent')}
-                             order="recent"
-                             incomingCall={self.state.incomingCall}
-                             collapsed={self.props.collapsed}
-                             searchFilter={self.props.searchFilter}
-                             onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                    <RoomSubList list={self.state.lists['im.vector.fake.recent']}
+                                 label={_t('Rooms')}
+                                 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}
+                                 searchFilter={self.props.searchFilter}
+                                 onHeaderClick={self.onSubListHeaderClick}
+                                 onShowMoreRooms={self.onShowMoreRooms} />
 
-                { Object.keys(self.state.lists).map((tagName) => {
-                    if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-                        return <RoomSubList list={self.state.lists[tagName]}
-                             key={tagName}
-                             label={tagName}
-                             tagName={tagName}
-                             emptyContent={this._getEmptyContent(tagName)}
-                             editable={true}
-                             order="manual"
-                             incomingCall={self.state.incomingCall}
-                             collapsed={self.props.collapsed}
-                             searchFilter={self.props.searchFilter}
-                             onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />;
-                    }
-                }) }
+                    { Object.keys(self.state.lists).map((tagName) => {
+                        if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+                            return <RoomSubList list={self.state.lists[tagName]}
+                                 key={tagName}
+                                 label={tagName}
+                                 tagName={tagName}
+                                 emptyContent={this._getEmptyContent(tagName)}
+                                 editable={true}
+                                 order="manual"
+                                 incomingCall={self.state.incomingCall}
+                                 collapsed={self.props.collapsed}
+                                 searchFilter={self.props.searchFilter}
+                                 onHeaderClick={self.onSubListHeaderClick}
+                                 onShowMoreRooms={self.onShowMoreRooms} />;
+                        }
+                    }) }
 
-                <RoomSubList list={self.state.lists['m.lowpriority']}
-                             label={_t('Low priority')}
-                             tagName="m.lowpriority"
-                             emptyContent={this._getEmptyContent('m.lowpriority')}
-                             editable={true}
-                             order="recent"
-                             incomingCall={self.state.incomingCall}
-                             collapsed={self.props.collapsed}
-                             searchFilter={self.props.searchFilter}
-                             onHeaderClick={self.onSubListHeaderClick}
-                             onShowMoreRooms={self.onShowMoreRooms} />
+                    <RoomSubList list={self.state.lists['m.lowpriority']}
+                                 label={_t('Low priority')}
+                                 tagName="m.lowpriority"
+                                 emptyContent={this._getEmptyContent('m.lowpriority')}
+                                 editable={true}
+                                 order="recent"
+                                 incomingCall={self.state.incomingCall}
+                                 collapsed={self.props.collapsed}
+                                 searchFilter={self.props.searchFilter}
+                                 onHeaderClick={self.onSubListHeaderClick}
+                                 onShowMoreRooms={self.onShowMoreRooms} />
 
-                <RoomSubList list={self.state.lists['im.vector.fake.archived']}
-                             label={_t('Historical')}
-                             editable={false}
-                             order="recent"
-                             collapsed={self.props.collapsed}
-                             alwaysShowHeader={true}
-                             startAsHidden={true}
-                             showSpinner={self.state.isLoadingLeftRooms}
-                             onHeaderClick= {self.onArchivedHeaderClick}
-                             incomingCall={self.state.incomingCall}
-                             searchFilter={self.props.searchFilter}
-                             onShowMoreRooms={self.onShowMoreRooms} />
-            </div>
-            </GeminiScrollbar>
+                    <RoomSubList list={self.state.lists['im.vector.fake.archived']}
+                                 label={_t('Historical')}
+                                 editable={false}
+                                 order="recent"
+                                 collapsed={self.props.collapsed}
+                                 alwaysShowHeader={true}
+                                 startAsHidden={true}
+                                 showSpinner={self.state.isLoadingLeftRooms}
+                                 onHeaderClick= {self.onArchivedHeaderClick}
+                                 incomingCall={self.state.incomingCall}
+                                 searchFilter={self.props.searchFilter}
+                                 onShowMoreRooms={self.onShowMoreRooms} />
+                </div>
+                </GeminiScrollbar>
             </DragDropContext>
         );
     },

From 6c15bd859987b1d7698f55777fa90d0574e9ac04 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 19 Jan 2018 10:39:38 +0000
Subject: [PATCH 360/927] fix NPE when getGroupProfiles returns null

---
 src/components/views/elements/Flair.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index a487395a87..009817a340 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -107,7 +107,11 @@ export default class Flair extends React.Component {
         }
         const profiles = await this._getGroupProfiles(groups);
         if (!this.unmounted) {
-            this.setState({profiles: profiles.filter((profile) => {return profile.avatarUrl;})});
+            this.setState({
+                profiles: profiles.filter((profile) => {
+                    return profile ? profile.avatarUrl : false;
+                })
+            });
         }
     }
 

From fba5d339237bdd9e0014befe83b32dbe25c9e98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Thu, 18 Jan 2018 21:15:59 +0000
Subject: [PATCH 361/927] Translated using Weblate (Serbian)

Currently translated at 12.0% (118 of 981 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index b43afe6116..8e3768dd4b 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -87,5 +87,34 @@
     "Missing room_id in request": "Недостаје room_id у захтеву",
     "Must be viewing a room": "Морате гледати собу",
     "Room %(roomId)s not visible": "Соба %(roomId)s није видљива",
-    "Missing user_id in request": "Недостаје user_id у захтеву"
+    "Missing user_id in request": "Недостаје user_id у захтеву",
+    "Call Failed": "Позивање неуспешно",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Постоје непознати уређаји у овој соби: уколико наставите без проверавања, можда ће неко прислушкивати ваш позив.",
+    "Review Devices": "Испрегледај уређаје",
+    "Call Anyway": "Ипак позови",
+    "Answer Anyway": "Ипак одговори",
+    "Call": "Позови",
+    "Answer": "Одговори",
+    "Call Timeout": "Прекорачено време позивања",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Failed to lookup current room": "Неуспех при потраживању тренутне собе",
+    "Usage": "Коришћење",
+    "/ddg is not a command": "/ddg није наредба",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Да бисте је користили, само сачекајте да се исходи самодовршавања учитају и табом прођите кроз њих.",
+    "Unrecognised room alias:": "Непознати алијас собе:",
+    "Ignored user": "Занемарени корисник",
+    "You are now ignoring %(userId)s": "Сада занемарујете корисника %(userId)s",
+    "Unignored user": "Незанемарени корисник",
+    "You are no longer ignoring %(userId)s": "Више не занемарујете корисника %(userId)s",
+    "Unknown (user, device) pair:": "Непознати пар (корисника, уређаја):",
+    "Device already verified!": "Уређај је већ проверен!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "УПОЗОРЕЊЕ: Уређај је већ проверен али се кључеви НЕ ПОДУДАРАЈУ!",
+    "Verified key": "Проверени кључ",
+    "Unrecognised command:": "Непрепозната наредба:",
+    "Reason": "Разлог",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s је прихватио позивницу за %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s је прихватио позивницу.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s је затражио VoIP конференцију.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s је позвао %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s."
 }

From 00dc077271ef48d9275a690af1f41607d9a9bc7f Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 19 Jan 2018 13:34:56 +0000
Subject: [PATCH 362/927] Remove react-dnd, revert fa14bc9 as no longer needed

---
 package.json                              | 2 --
 src/components/structures/LoggedInView.js | 4 +---
 src/components/structures/MatrixChat.js   | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index dbc27b5a08..f81e72e556 100644
--- a/package.json
+++ b/package.json
@@ -78,8 +78,6 @@
     "react": "^15.4.0",
     "react-addons-css-transition-group": "15.3.2",
     "react-beautiful-dnd": "^4.0.0",
-    "react-dnd": "^2.1.4",
-    "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^15.4.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "sanitize-html": "^1.14.1",
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index bebc109806..e97d9dd0a1 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -19,8 +19,6 @@ limitations under the License.
 import * as Matrix from 'matrix-js-sdk';
 import React from 'react';
 import PropTypes from 'prop-types';
-import { DragDropContext } from 'react-dnd';
-import HTML5Backend from 'react-dnd-html5-backend';
 
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 import Notifier from '../../Notifier';
@@ -347,4 +345,4 @@ const LoggedInView = React.createClass({
     },
 });
 
-export default DragDropContext(HTML5Backend)(LoggedInView);
+export default LoggedInView;
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 733007677b..a5181b55a7 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1066,10 +1066,10 @@ export default React.createClass({
             // this if we are not scrolled up in the view. To find out, delegate to
             // the timeline panel. If the timeline panel doesn't exist, then we assume
             // it is safe to reset the timeline.
-            if (!self._loggedInView) {
+            if (!self._loggedInView || !self._loggedInView.child) {
                 return true;
             }
-            return self._loggedInView.getDecoratedComponentInstance().canResetTimelineInRoom(roomId);
+            return self._loggedInView.child.canResetTimelineInRoom(roomId);
         });
 
         cli.on('sync', function(state, prevState) {

From 75a19227314ced9de11d775a5f6c9b311f443996 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 19 Jan 2018 14:07:13 +0000
Subject: [PATCH 363/927] Fix linting

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

diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 009817a340..76566e8c4d 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -110,7 +110,7 @@ export default class Flair extends React.Component {
             this.setState({
                 profiles: profiles.filter((profile) => {
                     return profile ? profile.avatarUrl : false;
-                })
+                }),
             });
         }
     }

From 54f6d305d759c6911ba69e549a2cb55587951f64 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 19 Jan 2018 14:11:05 +0000
Subject: [PATCH 364/927] Null-guard for newTag

---
 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 9c66731b06..85b4b52380 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -313,7 +313,7 @@ module.exports = React.createClass({
         const newOrder = {};
 
         // Is the tag ordered manually?
-        if (!newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+        if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
             const newList = Object.assign({}, this.state.lists[newTag]);
 
             // If the room was moved "down" (increasing index) in the same list we

From 6106b3ce44122fc858f44eeec5bbbfc141a59286 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 19 Jan 2018 14:12:21 +0000
Subject: [PATCH 365/927] newOrder defaults `null`, allows check for `newOrder`
 on line 357

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 85b4b52380..ca1fccd1f5 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -310,7 +310,7 @@ module.exports = React.createClass({
 
         const hasChangedSubLists = result.source.droppableId !== result.destination.droppableId;
 
-        const newOrder = {};
+        let newOrder = null;
 
         // Is the tag ordered manually?
         if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
@@ -327,7 +327,9 @@ module.exports = React.createClass({
             const nextOrder = newIndex === newList.length ?
                 1 : newList[offset + newIndex].tags[newTag].order;
 
-            newOrder['order'] = (prevOrder + nextOrder) / 2.0;
+            newOrder = {
+                order: (prevOrder + nextOrder) / 2.0,
+            };
         }
 
         // More evilness: We will still be dealing with moving to favourites/low prio,

From 86e833424809988d5ce9d145dbd86fe49a26087e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 19 Jan 2018 18:04:42 +0000
Subject: [PATCH 366/927] Try upgrading eslint-plugin-react

Because 7.4.0 does not seem to be picking up the same set of
problems as 7.5.1
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f81e72e556..edf8ad03d4 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.0.1",
     "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-react": "^7.4.0",
+    "eslint-plugin-react": "^7.5.1",
     "estree-walker": "^0.5.0",
     "expect": "^1.16.0",
     "flow-parser": "^0.57.3",

From 5206c9d18b6d096ca4dc5dbfbd2363ac73b03a60 Mon Sep 17 00:00:00 2001
From: Will Hunt <will@half-shot.uk>
Date: Fri, 19 Jan 2018 22:27:48 +0000
Subject: [PATCH 367/927] Show a warning if the user attempts to leave a room
 that is invite only

---
 src/components/structures/MatrixChat.js | 22 +++++++++++++++++++++-
 src/i18n/strings/en_EN.json             |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a5181b55a7..d6d0b00c84 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -847,16 +847,36 @@ export default React.createClass({
         }).close;
     },
 
+    _leaveRoomWarnings: function(roomId) {
+        const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
+        // Show a warning if there are additional complications.
+        const joinRules = roomToLeave.currentState.getStateEvents('m.room.join_rules', '');
+        const warnings = [];
+        if (joinRules) {
+            const rule = joinRules.getContent().join_rule;
+            if (rule !== "public") {
+                warnings.push((
+                    <span className="warning" key="non_public_warning">
+                        { _t("This room is not public. You will not be able to rejoin without an invite.") }
+                    </span>
+                ));
+            }
+        }
+        return warnings;
+    },
+
     _leaveRoom: function(roomId) {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-
         const roomToLeave = MatrixClientPeg.get().getRoom(roomId);
+        const warnings = this._leaveRoomWarnings(roomId);
+
         Modal.createTrackedDialog('Leave room', '', QuestionDialog, {
             title: _t("Leave room"),
             description: (
                 <span>
                 { _t("Are you sure you want to leave the room '%(roomName)s'?", {roomName: roomToLeave.name}) }
+                { warnings }
                 </span>
             ),
             onFinished: (shouldLeave) => {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 73e3f3a014..7efc5ff38e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -979,5 +979,6 @@
     "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
     "Your homeserver's URL": "Your homeserver's URL",
-    "Your identity server's URL": "Your identity server's URL"
+    "Your identity server's URL": "Your identity server's URL",
+    "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite."
 }

From 67a4c6c487ee63830631d88dc5da5b0ce3fe9ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Sat, 20 Jan 2018 11:44:16 +0000
Subject: [PATCH 368/927] Translated using Weblate (Serbian)

Currently translated at 18.2% (179 of 981 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 8e3768dd4b..e355c56b9d 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -116,5 +116,66 @@
     "%(targetName)s accepted an invitation.": "%(targetName)s је прихватио позивницу.",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s је затражио VoIP конференцију.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s је позвао %(targetName)s.",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s."
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s.",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "УПОЗОРЕЊЕ: ПОТВРДА КЉУЧА НИЈЕ УСПЕЛА! Кључ потписивања за корисника %(userId)s и уређај %(deviceId)s је „%(fprint)s“ а то се не подудара са достављеним кључем „%(fingerprint)s“. Ово можда значи да се ваши разговори прате!",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Кључ за потписивање који сте доставили се подудара са кључем за потписивање од корисника %(userId)s и уређаја %(deviceId)s. Уређај је означен као проверен.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "Корисник %(senderName)s је променио приказно име из %(oldDisplayName)s у %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "Корисник %(senderName)s је себи поставио приказно име %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "Корисник %(senderName)s је себи уклонио приказно име %(oldDisplayName)s.",
+    "%(senderName)s removed their profile picture.": "Корисник %(senderName)s је себи уклонио профилну слику.",
+    "%(senderName)s changed their profile picture.": "Корисник %(senderName)s је себи променио профилну слику.",
+    "%(senderName)s set a profile picture.": "Корисник %(senderName)s је себи поставио профилну слику.",
+    "VoIP conference started.": "VoIP конференција је започета.",
+    "%(targetName)s joined the room.": "Корисник %(targetName)s је ушао у собу.",
+    "VoIP conference finished.": "VoIP конференција је завршена.",
+    "%(targetName)s rejected the invitation.": "Корисник %(targetName)s је одбацио позивницу.",
+    "%(targetName)s left the room.": "Корисник %(targetName)s је напустио собу.",
+    "%(senderName)s unbanned %(targetName)s.": "Корисник %(senderName)s је скинуо забрану приступа са %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "Корисник %(senderName)s је избацио %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "Пошиљалац %(senderName)s је повукао позивницу за %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "Корисник %(senderDisplayName)s је променио тему у „%(topic)s“.",
+    "%(senderDisplayName)s removed the room name.": "Корисник %(senderDisplayName)s је уклонио назив собе.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "Корисник %(senderDisplayName)s је променио назив собе у %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "Корисник %(senderDisplayName)s је послао слику.",
+    "Someone": "Неко",
+    "(not supported by this browser)": "(није подржано од стране овог прегледача)",
+    "%(senderName)s answered the call.": "Корисник %(senderName)s се јавио.",
+    "(could not connect media)": "(не могу да повежем медије)",
+    "(no answer)": "(нема одговора)",
+    "(unknown failure: %(reason)s)": "(непозната грешка: %(reason)s)",
+    "%(senderName)s ended the call.": "Корисник %(senderName)s је окончао позив.",
+    "%(senderName)s placed a %(callType)s call.": "Корисник %(senderName)s је направио %(callType)s позив.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "Корисник %(senderName)s је послао позивницу за приступ соби ка %(targetDisplayName)s.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка позивања у собу.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе, од тренутка приступања соби.",
+    "%(senderName)s made future room history visible to all room members.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свим члановима собе.",
+    "%(senderName)s made future room history visible to anyone.": "Корисник %(senderName)s је учинио будући историјат собе видљивим свима.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "Корисник %(senderName)s је учинио будући историјат собе непознатим (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "Корисник %(senderName)s је укључио шифровање с краја на крај (алгоритам %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s са %(fromPowerLevel)s на %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "Корисник %(senderName)s је променио ниво моћи од %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "Корисник %(senderName)s је променио закачене поруке у соби.",
+    "%(widgetName)s widget modified by %(senderName)s": "Корисник %(senderName)s је променио виџет %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Корисник %(senderName)s је додао виџет %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Корисник %(senderName)s је уклонио виџет %(widgetName)s",
+    "%(displayName)s is typing": "%(displayName)s куца",
+    "%(names)s and %(count)s others are typing|other": "%(names)s и %(count)s корисник(а) куцају",
+    "%(names)s and %(count)s others are typing|one": "%(names)s и још један куцају",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s куцају",
+    "Failure to create room": "Неуспех при прављењу собе",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Сервер је можда недоступан, преоптерећен или сте нашли грешку.",
+    "Send anyway": "Ипак пошаљи",
+    "Send": "Пошаљи",
+    "Unnamed Room": "Неименована соба",
+    "Your browser does not support the required cryptography extensions": "Ваш прегледач не подржава потребна криптографска проширења",
+    "Not a valid Riot keyfile": "Није исправана Riot кључ-датотека",
+    "Authentication check failed: incorrect password?": "Провера идентитета није успела: нетачна лозинка?",
+    "Failed to join room": "Нисам успео да уђем у собу",
+    "Message Replies": "Одговори",
+    "Message Pinning": "Закачене поруке",
+    "Presence Management": "Управљање присутношћу",
+    "Tag Panel": "Означи површ",
+    "Disable Emoji suggestions while typing": "Онемогући предлагање емоџија приликом куцања",
+    "Use compact timeline layout": "Користи збијени распоред временске линије",
+    "Hide removed messages": "Сакриј уклоњене поруке"
 }

From 2705397bf695988feebf6dedb720be49a1b67be2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 20 Jan 2018 13:16:33 +0000
Subject: [PATCH 369/927] Add local GID==='' check, because Synapse says Group
 rather than Community Reset createError when doing check because it is now
 stale

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/dialogs/CreateGroupDialog.js | 6 +++++-
 src/i18n/strings/en_EN.json                       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index d811dde09e..86a2b2498c 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -55,11 +55,15 @@ export default React.createClass({
 
     _checkGroupId: function(e) {
         let error = null;
-        if (!/^[a-z0-9=_\-\.\/]*$/.test(this.state.groupId)) {
+        if (!this.state.groupId) {
+            error = _t("Community IDs cannot not be empty.");
+        } else if (!/^[a-z0-9=_\-\.\/]*$/.test(this.state.groupId)) {
             error = _t("Community IDs may only contain characters a-z, 0-9, or '=_-./'");
         }
         this.setState({
             groupIdError: error,
+            // Reset createError to get rid of now stale error message
+            createError: null,
         });
         return error;
     },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 73e3f3a014..f8526fe6f3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -653,6 +653,7 @@
     "Confirm Removal": "Confirm Removal",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
+    "Community IDs cannot not be empty.": "Community IDs cannot not be empty.",
     "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
     "Create Community": "Create Community",
     "Community Name": "Community Name",

From 38c58f3b23a731e34d4023630a24015b2fb9c476 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 15 Jan 2018 19:01:37 +0000
Subject: [PATCH 370/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index a341d47795..663fbe9f92 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -980,5 +980,6 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Használod-e a Richtext módot a szerkesztőben vagy nem",
     "Your homeserver's URL": "Az egyedi szerver URL-t",
     "Your identity server's URL": "Az azonosítási szerver URL-t",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s"
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába."
 }

From 1356e6dfd2a674d9203e3885c75a81da3911b7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 15 Jan 2018 16:08:31 +0000
Subject: [PATCH 371/927] Translated using Weblate (French)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 109697d750..846cf7a32f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -980,5 +980,6 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si vous utilisez le mode de texte enrichi de l'éditeur de texte enrichi",
     "Your homeserver's URL": "L'URL de votre serveur d'accueil",
     "Your identity server's URL": "L'URL de votre serveur d'identité",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s"
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation."
 }

From a0ba25806c347facc5794a9fbee0371f86e8e23d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Sat, 20 Jan 2018 15:12:54 +0000
Subject: [PATCH 372/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index 0126299f9f..aca0fabbe4 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -953,5 +953,33 @@
     "This room is not showing flair for any communities": "V tejto miestnosti nie je zobrazená príslušnosť k žiadnym komunitám",
     "Flair will appear if enabled in room settings": "Príslušnosť ku komunite sa zobrazí ak je to povolené v nastaveniach miestnosti",
     "Flair will not appear": "Príslušnosť ku komunite nebude zobrazená",
-    "Display your community flair in rooms configured to show it.": "Zobrazovať vašu príslušnosť ku komunite v miestnostiach, ktoré sú nastavené na zobrazovanie tejto príslušnosti."
+    "Display your community flair in rooms configured to show it.": "Zobrazovať vašu príslušnosť ku komunite v miestnostiach, ktoré sú nastavené na zobrazovanie tejto príslušnosti.",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Message Replies": "Odpovede na správy",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Túto zmenu nebudete môcť vrátiť späť pretože  znižujete vašu vlastnú úroveň moci. Ak ste jediný poverený používateľ v miestnosti, nebudete môcť znovu získať úroveň, akú máte teraz.",
+    "Send an encrypted reply…": "Odoslať šifrovanú odpoveď…",
+    "Send a reply (unencrypted)…": "Odoslať odpoveď (nešifrovanú)…",
+    "Send an encrypted message…": "Odoslať šifrovanú správu…",
+    "Send a message (unencrypted)…": "Odoslať správu (nešifrovanú)…",
+    "Replying": "Odpoveď",
+    "Minimize apps": "Minimalizovať aplikácie",
+    "Quote": "Citácia",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText>, <sendAnywayText>Považovať zariadenia za známe a odoslať</sendAnywayText> alebo <cancelText>zrušiť všetko</cancelText>.",
+    "%(count)s of your messages have not been sent.|one": "Vaša správa nebola odoslaná.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Znovu poslať všetky</resendText> alebo <cancelText>zrušiť všetky</cancelText> teraz. Vybratím môžete tiež znovu odoslať alebo zrušiť jednotlivé správy.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Znovu odoslať správu</resendText> alebo <cancelText>zrušiť správu</cancelText> teraz.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Vaše súkromie je pre nás dôležité, preto nezhromažďujeme žiadne osobné údaje alebo údaje, na základe ktorých je možné vás identifikovať.",
+    "Learn more about how we use analytics.": "Zistite viac o tom, ako spracúvame analytické údaje.",
+    "The information being sent to us to help make Riot.im better includes:": "S cieľom vylepšovať aplikáciu Riot.im zbierame nasledujúce údaje:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Zaznamenávame tiež každú stránku aplikácie Riot.im, ktorú otvoríte (momentálne <CurrentPageHash>), reťazec user agent (<CurrentUserAgent>) a rozlíšenie obrazovky vašeho zariadenia (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ak sa na stránke vyskytujú identifikujúce údaje, akými sú napríklad názov miestnosti, ID používateľa, miestnosti alebo skupiny, tieto sú pred odoslaním na server odstránené.",
+    "The platform you're on": "Vami používaná platforma",
+    "The version of Riot.im": "Verzia Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Stav vašeho prihlásenia - prihlásený / neprihlásený (nezaznamenávame vaše používateľské meno)",
+    "Your language of choice": "Váš uprednostňovaný jazyk",
+    "Which officially provided instance you are using, if any": "Cez ktorú oficiálne podporovanú inštanciu Riot.im ste pripojení (ak nehostujete Riot sami)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Či pri písaní správ používate rozbalenú lištu formátovania textu",
+    "Your homeserver's URL": "URL adresa vami používaného domovského servera",
+    "Your identity server's URL": "URL adresa vami používaného servera totožností",
+    "This room is not public. You will not be able to rejoin without an invite.": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu."
 }

From 2111271bdad6ae482c150548c2cd71144f63361a Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 15 Jan 2018 14:02:58 +0000
Subject: [PATCH 373/927] Translated using Weblate (Russian)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8126f84799..4fc55e5e23 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -980,5 +980,6 @@
     "Your identity server's URL": "URL-адрес вашего идентификационного сервера",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "Which officially provided instance you are using, if any": "Какую официально выпущенную версию вы используете",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо от того, используете ли вы режим Richtext в редакторе Rich Text Editor"
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо от того, используете ли вы режим Richtext в редакторе Rich Text Editor",
+    "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения."
 }

From fd2ef3e54db84385e3a2a751b0bb894afcd87a05 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 16 Jan 2018 02:33:06 +0000
Subject: [PATCH 374/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f29debcf22..c6b37bf2bc 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -979,5 +979,6 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "您是否正在使用豐富文字編輯器的豐富文字模式",
     "Your homeserver's URL": "您的家伺服器 URL",
     "Your identity server's URL": "您的驗證伺服器 URL",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s"
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。"
 }

From fb9930ad2c3b7d0c2c543f543751120a7678af26 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Tue, 16 Jan 2018 11:21:32 +0000
Subject: [PATCH 375/927] Translated using Weblate (Basque)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index e8fe9b2f20..2dfb197f46 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -980,5 +980,6 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Testu editorean testu aberatsa modua erabiltzen duzun",
     "Your homeserver's URL": "Zure hasiera zerbitzariaren URL-a",
     "Your identity server's URL": "Zure identitate zerbitzariaren URL-a",
-    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa"
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa",
+    "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe."
 }

From 02824cfacf06f7a4eb22607476a6c3090022a120 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 22 Jan 2018 12:16:11 +0100
Subject: [PATCH 376/927] fix i18n for show devices prompt

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7efc5ff38e..6543f96508 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -781,7 +781,7 @@
     "You have no visible notifications": "You have no visible notifications",
     "Scroll to bottom of page": "Scroll to bottom of page",
     "Message not sent due to unknown devices being present": "Message not sent due to unknown devices being present",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Some of your messages have not been sent.",
     "%(count)s of your messages have not been sent.|one": "Your message was not sent.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.",

From 755ead7c1d26b823baf0a68dd2b327089499b47f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 20 Jan 2018 13:41:07 +0000
Subject: [PATCH 377/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 663fbe9f92..e630a3949c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -903,7 +903,7 @@
     "Room Notification": "Szoba értesítések",
     "Show these rooms to non-members on the community page and room list?": "Mutassuk meg ezeket a szobákat kívülállóknak a közösségi oldalon és a szobák listájában?",
     "Sign in to get started": "Az induláshoz jelentkezz be",
-    "Status.im theme": "Állapot.im téma",
+    "Status.im theme": "Állapot téma",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Figyelem, a %(hs)s szerverre jelentkezel be és nem a matrix.org szerverre.",
     "Username on %(hs)s": "Felhasználónév a %(hs)s szerveren",
     "Restricted": "Korlátozott",

From 2326ee2586d3879cbdbedad891587419008407bf Mon Sep 17 00:00:00 2001
From: "A.G" <mule@geotux.it>
Date: Sat, 20 Jan 2018 23:00:56 +0000
Subject: [PATCH 378/927] Translated using Weblate (Italian)

Currently translated at 9.1% (90 of 982 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 0da7cf704b..369db6f123 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -85,5 +85,9 @@
     "Unable to capture screen": "Impossibile acquisire lo schermo",
     "Call": "Chiama",
     "Answer": "Rispondi",
-    "Invite to Community": "Invita alla community"
+    "Invite to Community": "Invita alla community",
+    "Unpin Message": "Sblocca messaggio",
+    "Add rooms to this community": "Aggiungi stanze a questa community",
+    "Warning": "Attenzione",
+    "Unnamed room": "Stanza senza nome"
 }

From 1d43ccde23f18ac1c38af136516237713b0a28e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Sun, 21 Jan 2018 16:59:48 +0000
Subject: [PATCH 379/927] Translated using Weblate (Serbian)

Currently translated at 28.0% (275 of 982 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index e355c56b9d..ab2a4a529b 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -177,5 +177,101 @@
     "Tag Panel": "Означи површ",
     "Disable Emoji suggestions while typing": "Онемогући предлагање емоџија приликом куцања",
     "Use compact timeline layout": "Користи збијени распоред временске линије",
-    "Hide removed messages": "Сакриј уклоњене поруке"
+    "Hide removed messages": "Сакриј уклоњене поруке",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Сакриј поруке приступања и напуштања (позивнице, избацивања и забране нису захваћене)",
+    "Hide avatar changes": "Сакриј промене аватара",
+    "Hide display name changes": "Сакриј промене приказног имена",
+    "Hide read receipts": "Сакриј потврде прочитаности",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Прикажи временске жигове у 12-сатном облику (нпр.: 2:30 ПоП)",
+    "Always show message timestamps": "Увек прикажи временске жигове",
+    "Autoplay GIFs and videos": "Самостално пуштај GIF-ове и видео записе",
+    "Enable automatic language detection for syntax highlighting": "Омогући самостално препознавање језика за истицање синтаксе",
+    "Hide avatars in user and room mentions": "Сакриј аватаре у спомињањима корисника и соба",
+    "Disable big emoji in chat": "Онемогући велике емоџије у ћаскању",
+    "Don't send typing notifications": "Не шаљи обавештења о куцању",
+    "Automatically replace plain text Emoji": "Самостално замени емоџије писане обичним текстом",
+    "Mirror local video feed": "Копирај довод локалног видеа",
+    "Disable Peer-to-Peer for 1:1 calls": "Онемогући парњаке за 1 на 1 позиве",
+    "Opt out of analytics": "Не учествуј у аналитици",
+    "Never send encrypted messages to unverified devices from this device": "Никада не шаљи шифроване поруке са овог уређаја ка непровереним уређајима",
+    "Never send encrypted messages to unverified devices in this room from this device": "Никада не шаљи шифроване поруке са овог уређаја ка непровереним уређајима у овој соби",
+    "Enable inline URL previews by default": "Подразумевано омогући претпрегледе адреса унутар линије",
+    "Enable URL previews for this room (only affects you)": "Омогући претпрегледе адреса у овој соби (утиче само на вас)",
+    "Enable URL previews by default for participants in this room": "Подразумевано омогући прегледе адреса за чланове ове собе",
+    "Room Colour": "Боја собе",
+    "Active call (%(roomName)s)": "Активни позив (%(roomName)s)",
+    "unknown caller": "непознати позивалац",
+    "Incoming voice call from %(name)s": "Долазни гласовни позив од корисника %(name)s",
+    "Incoming video call from %(name)s": "Долазни видео позив од корисника %(name)s",
+    "Incoming call from %(name)s": "Долазни позив од корисника %(name)s",
+    "Decline": "Одбиј",
+    "Accept": "Прихвати",
+    "Error": "Грешка",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Текстуална порука је послата на %(msisdn)s. Унесите потврдни код из те поруке",
+    "Incorrect verification code": "Нетачни потврдни код",
+    "Enter Code": "Унесите код",
+    "Submit": "Пошаљи",
+    "Phone": "Телефон",
+    "Add phone number": "Додај телефонски број",
+    "Add": "Додај",
+    "Failed to upload profile picture!": "Нисам успео да отпремим профилну слику!",
+    "Upload new:": "Отпреми нову:",
+    "No display name": "Нема приказног имена",
+    "New passwords don't match": "Нове лозинке се не подударају",
+    "Passwords can't be empty": "Лозинке не могу бити празне",
+    "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.": "Промена лозинке ће тренутно ресетовати све кључеве за шифровање с краја на крај, на свим уређајима и тиме учинити шифровани историјат ћаскања нечитљивим осим ако прво не извезете кључеве ваше собе па их поново увезете после. Ово ће бити побољшано у будућности.",
+    "Continue": "Настави",
+    "Export E2E room keys": "Извези E2E кључеве собе",
+    "Do you want to set an email address?": "Да ли желите да поставите мејл адресу?",
+    "Current password": "Тренутна лозинка",
+    "Password": "Лозинка",
+    "New Password": "Нова лозинка",
+    "Confirm password": "Потврди лозинку",
+    "Change Password": "Промени лозинку",
+    "Your home server does not support device management.": "Ваш кућни сервер не подржава управљање уређајима.",
+    "Unable to load device list": "Нисам могао да учитам списак уређаја",
+    "Authentication": "Идентификација",
+    "Delete %(count)s devices|other": "Обриши %(count)s уређај(а)",
+    "Delete %(count)s devices|one": "Обриши уређај",
+    "Device ID": "ИБ уређаја",
+    "Device Name": "Назив уређаја",
+    "Last seen": "Последњи пут виђен",
+    "Select devices": "Изабери уређаје",
+    "Failed to set display name": "Нисам успео да поставим приказно име",
+    "Disable Notifications": "Онемогући обавештења",
+    "Enable Notifications": "Омогући обавештења",
+    "Cannot add any more widgets": "Не могу да додам још виџета",
+    "The maximum permitted number of widgets have already been added to this room.": "Највећи број дозвољених додатих виџета је прекорачен у овој соби.",
+    "Add a widget": "Додај виџет",
+    "Drop File Here": "Превуци датотеку овде",
+    "Drop file here to upload": "Превуци датотеку овде да би је отпремио",
+    " (unsupported)": " (неподржано)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Приступи преко <voiceText>гласа</voiceText> или <videoText>видеа</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Текући конференцијски позив %(supportedText)s.",
+    "%(senderName)s sent an image": "Корисник %(senderName)s је послао слику",
+    "%(senderName)s sent a video": "Корисник %(senderName)s је послао видео",
+    "%(senderName)s uploaded a file": "Корисник %(senderName)s је отпремио датотеку",
+    "Options": "Опције",
+    "Undecryptable": "Немогуће дешифровати",
+    "Encrypted by a verified device": "Шифровано на провереном уређају",
+    "Encrypted by an unverified device": "Шифровано на непровереном уређају",
+    "Unencrypted message": "Нешифрована порука",
+    "Please select the destination room for this message": "Изаберите одредишну собу за ову поруку",
+    "Blacklisted": "На црном списку",
+    "Verified": "Проверени",
+    "Unverified": "Непроверени",
+    "device id: ": "иб уређаја: ",
+    "Disinvite": "Откажи позивницу",
+    "Kick": "Избаци",
+    "Disinvite this user?": "Отказати позивницу за овог корисника?",
+    "Kick this user?": "Избацити овог корисника?",
+    "Failed to kick": "Неуспех при избацивању",
+    "Unban": "Скини забрану",
+    "Ban": "Забрани приступ",
+    "Unban this user?": "Скинути забрану за овог корисника?",
+    "Ban this user?": "Забранити приступ овом кориснику?",
+    "Failed to ban user": "Неуспех при забрањивању приступа кориснику",
+    "Failed to mute user": "Неуспех при пригушивању корисника",
+    "Failed to toggle moderator status": "Неуспех при промени стања модератора",
+    "Failed to change power level": "Неуспех при промени нивоа моћи"
 }

From 8496c947c87f53355710ad7d6719beed9d8c142e Mon Sep 17 00:00:00 2001
From: pebles <pebles@sindominio.net>
Date: Sat, 20 Jan 2018 16:17:34 +0000
Subject: [PATCH 380/927] Translated using Weblate (Spanish)

Currently translated at 58.3% (573 of 982 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index ff28d339d0..53e0a3cc9f 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -429,7 +429,7 @@
     "Changes colour scheme of current room": "Cambia el esquema de colores de esta sala",
     "Delete widget": "Eliminar widget",
     "Define the power level of a user": "Definir el nivel de poder de los usuarios",
-    "Edit": "Edita",
+    "Edit": "Editar",
     "Enable automatic language detection for syntax highlighting": "Activar la detección automática del lenguaje para resaltar la sintaxis",
     "Hide Apps": "Ocultar aplicaciones",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensajes de entrada/salida (no afecta invitaciones/kicks/bans)",
@@ -560,7 +560,7 @@
     "Jun": "Jun",
     "Jul": "Jul",
     "Aug": "August",
-    "Add rooms to this community": "Agrega salas a esta comunidad",
+    "Add rooms to this community": "Agregar salas a esta comunidad",
     "Call Failed": "La llamada falló",
     "Review Devices": "Revisar Dispositivos",
     "Call Anyway": "Llamar de todas formas",
@@ -570,5 +570,7 @@
     "Sep": "Sep",
     "Oct": "Oct",
     "Nov": "Nov",
-    "Dec": "Dic"
+    "Dec": "Dic",
+    "Warning": "Advertencia",
+    "Unpin Message": "Desmarcar Mensaje"
 }

From 37dcb33b15e9f3848f6badbdb4125c7dbf105c82 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 14:45:04 +0000
Subject: [PATCH 381/927] Reset quotingEvent on Room Change because inideal UX

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

diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index cf895d2190..4c010f4e8e 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -132,6 +132,8 @@ class RoomViewStore extends Store {
                 shouldPeek: payload.should_peek === undefined ? true : payload.should_peek,
                 // have we sent a join request for this room and are waiting for a response?
                 joining: payload.joining || false,
+                // Reset quotingEvent because we don't want cross-room because bad UX
+                quotingEvent: null,
             };
 
             if (this._state.forwardingEvent) {

From 0441487e97573dde03578efd8b621ab5394ff0a0 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 22 Jan 2018 17:00:50 +0100
Subject: [PATCH 382/927] Manage sticker packs link and add comments

---
 src/components/views/rooms/Stickerpack.js | 21 ++++++++++++++++++---
 src/i18n/strings/en_EN.json               |  1 +
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 3c4a8f6425..cb2a19eae7 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -115,7 +115,7 @@ export default class Stickerpack extends React.Component {
                         padding: '5px',
                         borderTop: '1px solid #999',
                     }}>
-                        <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} >Add sticker packs</span>
+                        <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("Manage sticker packs") } </span>
                     </div>
                 </div>
             );
@@ -126,6 +126,11 @@ export default class Stickerpack extends React.Component {
         this.setState({stickersContent});
     }
 
+    /**
+     * Show the sticker picker overlay
+     * If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
+     * @param  {Event} e Event that triggered the function
+     */
     onShowStickersClick(e) {
         const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
         const buttonRect = e.target.getBoundingClientRect();
@@ -149,23 +154,33 @@ export default class Stickerpack extends React.Component {
         this.setState({showStickers: true});
     }
 
+    /**
+     * Trigger hiding of the sticker picker overlay
+     * @param  {Event} ev Event that triggered the function call
+     */
     onHideStickersClick(ev) {
         this.stickersMenu.close();
     }
 
+    /**
+     * The stickers picker was hidden
+     */
     onFinished() {
         this.setState({showStickers: false});
         this.stickersMenu = null;
     }
 
+    /**
+     * Launch the integrations manager on the stickers integration page
+     */
     _launchManageIntegrations() {
         this.onFinished();
         const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
         const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
                 this.scalarClient.getScalarInterfaceUrlForRoom(
                     this.props.room.roomId,
-                    'add_integ',
-                    // this.widgetId,
+                    'type_stickerpack',
+                    this.widgetId,
                 ) :
                 null;
         Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 41f1b75e43..a4152ef94a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -555,6 +555,7 @@
     "NOTE: Apps are not end-to-end encrypted": "NOTE: Apps are not end-to-end encrypted",
     "Do you want to load widget from URL:": "Do you want to load widget from URL:",
     "Allow": "Allow",
+    "Manage sticker packs": "Manage sticker packs",
     "Delete Widget": "Delete Widget",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?",
     "Delete widget": "Delete widget",

From 34b9db2033200f95c977bacdffc9f71b68571895 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Sat, 20 Jan 2018 15:41:41 +0000
Subject: [PATCH 383/927] Translated using Weblate (Russian)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 4fc55e5e23..c89afb5ba6 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -981,5 +981,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "Which officially provided instance you are using, if any": "Какую официально выпущенную версию вы используете",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо от того, используете ли вы режим Richtext в редакторе Rich Text Editor",
-    "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения."
+    "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>."
 }

From 33995b053eb00baab5e8e80c37000326dc2e2cc8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 16:34:14 +0000
Subject: [PATCH 384/927] Add class to EventTile Line's that are quotes

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 937826b4fd..4e0ff2c6d6 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -592,7 +592,7 @@ module.exports = withMatrixClient(React.createClass({
                     <div className={classes}>
                         { avatar }
                         { sender }
-                        <div className="mx_EventTile_line">
+                        <div className="mx_EventTile_line mx_EventTile_quote">
                             <a href={permalink} onClick={this.onPermalinkClicked}>
                                 { timestamp }
                             </a>

From 3b1d69edbb01ff534ca53c8a58a3c79a08816cec Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 16:34:47 +0000
Subject: [PATCH 385/927] Change Quotes to be linearly rendered rather than
 recursively nested

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Quote.js       | 146 ++++++++++++-------
 src/components/views/messages/TextualBody.js |  24 +--
 src/i18n/strings/en_EN.json                  |   3 +-
 3 files changed, 109 insertions(+), 64 deletions(-)

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index bceba0f536..55b59a5789 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -20,10 +20,11 @@ import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import {wantsDateSeparator} from '../../../DateUtils';
 import {MatrixEvent} from 'matrix-js-sdk';
+import {makeUserPermalink} from "../../../matrix-to";
 
 // For URLs of matrix.to links in the timeline which have been reformatted by
 // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
-const REGEX_LOCAL_MATRIXTO = /^#\/room\/(([\#\!])[^\/]*)\/(\$[^\/]*)$/;
+const REGEX_LOCAL_MATRIXTO = /^#\/room\/([\#\!][^\/]*)\/(\$[^\/]*)$/;
 
 export default class Quote extends React.Component {
     static isMessageUrl(url) {
@@ -32,111 +33,148 @@ export default class Quote extends React.Component {
 
     static childContextTypes = {
         matrixClient: PropTypes.object,
+        addRichQuote: PropTypes.func,
     };
 
     static propTypes = {
         // The matrix.to url of the event
         url: PropTypes.string,
+        // The original node that was rendered
+        node: PropTypes.instanceOf(Element),
         // The parent event
         parentEv: PropTypes.instanceOf(MatrixEvent),
-        // Whether this isn't the first Quote, and we're being nested
-        isNested: PropTypes.bool,
     };
 
     constructor(props, context) {
         super(props, context);
 
         this.state = {
-            // The event related to this quote
-            event: null,
-            show: !this.props.isNested,
+            // The event related to this quote and their nested rich quotes
+            events: [],
+            // Whether the top (oldest) event should be shown or spoilered
+            show: true,
+            // Whether an error was encountered fetching another older event, show if it does
+            err: null,
         };
 
         this.onQuoteClick = this.onQuoteClick.bind(this);
+        this.addRichQuote = this.addRichQuote.bind(this);
     }
 
     getChildContext() {
         return {
             matrixClient: MatrixClientPeg.get(),
+            addRichQuote: this.addRichQuote,
         };
     }
 
+    parseUrl(url) {
+        if (!url) return;
+
+        // Default to the empty array if no match for simplicity
+        // resource and prefix will be undefined instead of throwing
+        const matrixToMatch = REGEX_LOCAL_MATRIXTO.exec(url) || [];
+
+        const [, roomIdentifier, eventId] = matrixToMatch;
+        return {roomIdentifier, eventId};
+    }
+
     componentWillReceiveProps(nextProps) {
-        let roomId;
-        let prefix;
-        let eventId;
+        const {roomIdentifier, eventId} = this.parseUrl(nextProps.url);
+        if (!roomIdentifier || !eventId) return;
 
-        if (nextProps.url) {
-            // Default to the empty array if no match for simplicity
-            // resource and prefix will be undefined instead of throwing
-            const matrixToMatch = REGEX_LOCAL_MATRIXTO.exec(nextProps.url) || [];
-
-            roomId = matrixToMatch[1]; // The room ID
-            prefix = matrixToMatch[2]; // The first character of prefix
-            eventId = matrixToMatch[3]; // The event ID
-        }
-
-        const room = prefix === '#' ?
-            MatrixClientPeg.get().getRooms().find((r) => {
-                return r.getAliases().includes(roomId);
-            }) : MatrixClientPeg.get().getRoom(roomId);
+        const room = this.getRoom(roomIdentifier);
+        if (!room) return;
 
         // Only try and load the event if we know about the room
         // otherwise we just leave a `Quote` anchor which can be used to navigate/join the room manually.
-        if (room) this.getEvent(room, eventId);
+        this.setState({ events: [] });
+        if (room) this.getEvent(room, eventId, true);
     }
 
     componentWillMount() {
         this.componentWillReceiveProps(this.props);
     }
 
-    async getEvent(room, eventId) {
-        let event = room.findEventById(eventId);
+    getRoom(id) {
+        const cli = MatrixClientPeg.get();
+        if (id[0] === '!') return cli.getRoom(id);
+
+        return cli.getRooms().find((r) => {
+            return r.getAliases().includes(id);
+        });
+    }
+
+    async getEvent(room, eventId, show) {
+        const event = room.findEventById(eventId);
         if (event) {
-            this.setState({room, event});
+            this.addEvent(event, show);
             return;
         }
 
         await MatrixClientPeg.get().getEventTimeline(room.getUnfilteredTimelineSet(), eventId);
-        event = room.findEventById(eventId);
-        this.setState({room, event});
+        this.addEvent(room.findEventById(eventId), show);
+    }
+
+    addEvent(event, show) {
+        const events = [event].concat(this.state.events);
+        this.setState({events, show});
+    }
+
+    // addRichQuote(roomId, eventId) {
+    addRichQuote(href) {
+        const {roomIdentifier, eventId} = this.parseUrl(href);
+        if (!roomIdentifier || !eventId) return;
+
+        const room = this.getRoom(roomIdentifier);
+        if (!room) return;
+
+        this.getEvent(room, eventId, false);
     }
 
     onQuoteClick() {
-        this.setState({
-            show: true,
-        });
+        this.setState({ show: true });
     }
 
     render() {
-        const ev = this.state.event;
-        if (ev) {
-            if (this.state.show) {
-                const EventTile = sdk.getComponent('views.rooms.EventTile');
-                let dateSep = null;
+        const events = this.state.events.slice();
+        if (events.length) {
+            const evTiles = [];
 
-                const evDate = ev.getDate();
-                if (wantsDateSeparator(this.props.parentEv.getDate(), evDate)) {
-                    const DateSeparator = sdk.getComponent('messages.DateSeparator');
-                    dateSep = <a href={this.props.url}><DateSeparator ts={evDate} /></a>;
-                }
+            if (!this.state.show) {
+                const oldestEv = events.shift();
+                const Pill = sdk.getComponent('elements.Pill');
+                const room = MatrixClientPeg.get().getRoom(oldestEv.getRoomId());
 
-                return <blockquote className="mx_Quote">
-                    { dateSep }
-                    <EventTile mxEvent={ev} tileShape="quote" />
-                </blockquote>;
+                evTiles.push(<blockquote className="mx_Quote" key="load">
+                    {
+                        _t('<a>In reply to</a> <pill>', {}, {
+                            'a': (sub) => <a onClick={this.onQuoteClick} className="mx_Quote_show">{ sub }</a>,
+                            'pill': <Pill type={Pill.TYPE_USER_MENTION} url={makeUserPermalink(oldestEv.getSender())} room={room} shouldShowPillAvatar={true} />,
+                        })
+                    }
+                </blockquote>);
             }
 
-            return <div>
-                <a onClick={this.onQuoteClick} className="mx_Quote_show">{ _t('Quote') }</a>
-                <br />
-            </div>;
+            const EventTile = sdk.getComponent('views.rooms.EventTile');
+            const DateSeparator = sdk.getComponent('messages.DateSeparator');
+            events.forEach((ev) => {
+                let dateSep = null;
+
+                if (wantsDateSeparator(this.props.parentEv.getDate(), ev.getDate())) {
+                    dateSep = <a href={this.props.url}><DateSeparator ts={ev.getTs()} /></a>;
+                }
+
+                evTiles.push(<blockquote className="mx_Quote" key={ev.getId()}>
+                    { dateSep }
+                    <EventTile mxEvent={ev} tileShape="quote" />
+                </blockquote>);
+            });
+
+            return <div>{ evTiles }</div>;
         }
 
         // Deliberately render nothing if the URL isn't recognised
-        return <div>
-            <a href={this.props.url}>{ _t('Quote') }</a>
-            <br />
-        </div>;
+        return this.props.node;
     }
 }
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 4f34a635dc..31c1df7b44 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -61,6 +61,10 @@ module.exports = React.createClass({
         tileShape: PropTypes.string,
     },
 
+    contextTypes: {
+        addRichQuote: PropTypes.func,
+    },
+
     getInitialState: function() {
         return {
             // the URLs (if any) to be previewed with a LinkPreviewWidget
@@ -202,18 +206,20 @@ module.exports = React.createClass({
                     // update the current node with one that's now taken its place
                     node = pillContainer;
                 } else if (SettingsStore.isFeatureEnabled("feature_rich_quoting") && Quote.isMessageUrl(href)) {
-                    // only allow this branch if we're not already in a quote, as fun as infinite nesting is.
-                    const quoteContainer = document.createElement('span');
+                    if (this.context.addRichQuote) { // We're already a Rich Quote so just append the next one above
+                        this.context.addRichQuote(href);
+                        node.remove();
+                    } else { // We're the first in the chain
+                        const quoteContainer = document.createElement('span');
 
-                    const quote =
-                        <Quote url={href} parentEv={this.props.mxEvent} isNested={this.props.tileShape === 'quote'} />;
-
-                    ReactDOM.render(quote, quoteContainer);
-                    node.parentNode.replaceChild(quoteContainer, node);
+                        const quote =
+                            <Quote url={href} parentEv={this.props.mxEvent} node={node} />;
 
+                        ReactDOM.render(quote, quoteContainer);
+                        node.parentNode.replaceChild(quoteContainer, node);
+                        node = quoteContainer;
+                    }
                     pillified = true;
-
-                    node = quoteContainer;
                 }
             } else if (node.nodeType == Node.TEXT_NODE) {
                 const Pill = sdk.getComponent('elements.Pill');
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 73e3f3a014..52cb8f0991 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -979,5 +979,6 @@
     "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
     "Your homeserver's URL": "Your homeserver's URL",
-    "Your identity server's URL": "Your identity server's URL"
+    "Your identity server's URL": "Your identity server's URL",
+    "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>"
 }

From a6cefb83f86f4fe0050e1af18e81d5c631b97024 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 16:41:32 +0000
Subject: [PATCH 386/927] basic error handling for malformed quotes

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

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index 55b59a5789..0a186b3ca6 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -53,8 +53,8 @@ export default class Quote extends React.Component {
             events: [],
             // Whether the top (oldest) event should be shown or spoilered
             show: true,
-            // Whether an error was encountered fetching another older event, show if it does
-            err: null,
+            // Whether an error was encountered fetching nested older event, show node if it does
+            err: false,
         };
 
         this.onQuoteClick = this.onQuoteClick.bind(this);
@@ -124,10 +124,16 @@ export default class Quote extends React.Component {
     // addRichQuote(roomId, eventId) {
     addRichQuote(href) {
         const {roomIdentifier, eventId} = this.parseUrl(href);
-        if (!roomIdentifier || !eventId) return;
+        if (!roomIdentifier || !eventId) {
+            this.setState({ err: true });
+            return;
+        }
 
         const room = this.getRoom(roomIdentifier);
-        if (!room) return;
+        if (!room) {
+            this.setState({ err: true });
+            return;
+        }
 
         this.getEvent(room, eventId, false);
     }

From e3e3535072bb053eb5c41a3c0aca89920b984fd5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 22 Jan 2018 17:02:20 +0000
Subject: [PATCH 387/927] delint

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

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index 0a186b3ca6..0c0078978d 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -156,7 +156,8 @@ export default class Quote extends React.Component {
                     {
                         _t('<a>In reply to</a> <pill>', {}, {
                             'a': (sub) => <a onClick={this.onQuoteClick} className="mx_Quote_show">{ sub }</a>,
-                            'pill': <Pill type={Pill.TYPE_USER_MENTION} url={makeUserPermalink(oldestEv.getSender())} room={room} shouldShowPillAvatar={true} />,
+                            'pill': <Pill type={Pill.TYPE_USER_MENTION} room={room}
+                                          url={makeUserPermalink(oldestEv.getSender())} shouldShowPillAvatar={true} />,
                         })
                     }
                 </blockquote>);

From 294a5db20eedb6610d6e34f36c216c0acf1d0820 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 20 Jan 2018 13:41:07 +0000
Subject: [PATCH 388/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (982 of 982 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index e630a3949c..6e03659c8a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -981,5 +981,6 @@
     "Your homeserver's URL": "Az egyedi szerver URL-t",
     "Your identity server's URL": "Az azonosítási szerver URL-t",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
-    "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába."
+    "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>."
 }

From e19435d39d942bdc1fda9e1b8ac583be3df95515 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 22 Jan 2018 16:03:49 +0000
Subject: [PATCH 389/927] Translated using Weblate (Russian)

Currently translated at 100.0% (983 of 983 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index c89afb5ba6..6ddc92b928 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -982,5 +982,6 @@
     "Which officially provided instance you are using, if any": "Какую официально выпущенную версию вы используете",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо от того, используете ли вы режим Richtext в редакторе Rich Text Editor",
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>.",
+    "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми."
 }

From 88443af8fac56e2fbcf3262df1af9599fc74d38b Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 22 Jan 2018 19:23:20 +0000
Subject: [PATCH 390/927] Translated using Weblate (Basque)

Currently translated at 100.0% (983 of 983 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 2dfb197f46..f1db7376e9 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -981,5 +981,7 @@
     "Your homeserver's URL": "Zure hasiera zerbitzariaren URL-a",
     "Your identity server's URL": "Zure identitate zerbitzariaren URL-a",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa",
-    "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe."
+    "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
+    "Community IDs cannot not be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>."
 }

From ace7b84987d6e4375819c371416bfb5b2f65c0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 22 Jan 2018 20:42:32 +0000
Subject: [PATCH 391/927] Translated using Weblate (French)

Currently translated at 100.0% (983 of 983 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 846cf7a32f..cff37c3d70 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -981,5 +981,7 @@
     "Your homeserver's URL": "L'URL de votre serveur d'accueil",
     "Your identity server's URL": "L'URL de votre serveur d'identité",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
-    "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation."
+    "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
+    "Community IDs cannot not be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>."
 }

From e5f5091505572147c233a6a1884fcd2747aa615a Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 23 Jan 2018 05:15:27 +0000
Subject: [PATCH 392/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (983 of 983 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c6b37bf2bc..bae5c33be9 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -980,5 +980,7 @@
     "Your homeserver's URL": "您的家伺服器 URL",
     "Your identity server's URL": "您的驗證伺服器 URL",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。"
+    "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
+    "Community IDs cannot not be empty.": "社群 ID 不能為空。",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。"
 }

From 71ecc5d7c595409a7b2d7c6439777a943ea8dbd6 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 22 Jan 2018 17:24:43 +0000
Subject: [PATCH 393/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (983 of 983 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6e03659c8a..da9de87695 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -982,5 +982,6 @@
     "Your identity server's URL": "Az azonosítási szerver URL-t",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>.",
+    "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres."
 }

From f45ad264237ff1aa57f3a355d9acf59b7bd7f346 Mon Sep 17 00:00:00 2001
From: d1d4c <d1d4c@aktivix.org>
Date: Wed, 24 Jan 2018 02:57:44 +0000
Subject: [PATCH 394/927] Translated using Weblate (Catalan)

Currently translated at 24.3% (239 of 983 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 6af10bf907..c8d5991c49 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -30,5 +30,212 @@
     "Remove": "Elimina",
     "unknown error code": "codi d'error desconegut",
     "OK": "D'acord",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "S'ha enviat un missatge de text a +%(msisdn)s. Entreu si us plau el codi de verificació que conté"
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "S'ha enviat un missatge de text a +%(msisdn)s. Entreu si us plau el codi de verificació que conté",
+    "Operation failed": "No s'ha pogut realitzar l'operació",
+    "Search": "Cerca",
+    "powered by Matrix": "amb tecnologia de Matrix",
+    "Edit": "Editeu",
+    "Unpin Message": "Desenganxa el missatge",
+    "Quote": "Cita",
+    "Register": "Registre",
+    "Rooms": "Sales",
+    "Add rooms to this community": "Afegeix sales a aquesta comunitat",
+    "World readable": "Llegible al món",
+    "Guests can join": "Els convidats s'hi poden unir",
+    "This email address is already in use": "Aquesta adreça de correu electrònic ja està en ús",
+    "This phone number is already in use": "Aquest número de telèfon ja està en ús",
+    "Failed to verify email address: make sure you clicked the link in the email": "No s'ha pogut verificar l'adreça de correu electrònic. Assegureu-vos de fer clic a l'enllaç del correu electrònic de verificació",
+    "Call Failed": "No s'ha pogut realitzar la trucada",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Hi ha dispositius desconeguts a aquesta sala. Si continueu sense verificar-los, és possible que algú escolti la vostra trucada.",
+    "Review Devices": "Revisió de dispositius",
+    "Call Anyway": "Truca de totes maneres",
+    "Answer Anyway": "Contesta en tot cas",
+    "Call": "Truca",
+    "Answer": "Contesta",
+    "The remote side failed to pick up": "El costat remot no s'ha pogut recuperar",
+    "Unable to capture screen": "No s'ha pogut capturar la pantalla",
+    "Existing Call": "Trucades existents",
+    "You are already in a call.": "Ja sou a una trucada.",
+    "VoIP is unsupported": "El VoIP no és compatible aquí",
+    "You cannot place VoIP calls in this browser.": "No es poden fer trucades VoIP amb aquest navegador.",
+    "You cannot place a call with yourself.": "No és possible trucar-se a un mateix.",
+    "Conference calls are not supported in this client": "Aquest client no és compatible amb les trucades de conferència",
+    "Conference calls are not supported in encrypted rooms": "Les trucades de conferència no es poden fer dins les sales encriptades",
+    "Warning!": "Avís!",
+    "Conference calling is in development and may not be reliable.": "Les conferències estan en desenvolupament i podrien no ser fiables.",
+    "Failed to set up conference call": "No s'ha pogut realitzar la trucada de conferència",
+    "Conference call failed.": "No s´ha pogut realitzar la trucada de conferència.",
+    "The file '%(fileName)s' failed to upload": "No s'ha pogut pujar el fitxer '%(fileName)s'",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "El fitxer '%(fileName)s' supera el límit de mida per a les càrregues d'aquest servidor",
+    "Upload Failed": "No s'ha pogut realitzar la pujada",
+    "Sun": "dg.",
+    "Mon": "dl.",
+    "Tue": "dt.",
+    "Wed": "dc.",
+    "Thu": "dj.",
+    "Fri": "dv.",
+    "Sat": "ds.",
+    "Jan": "gen.",
+    "Feb": "febr.",
+    "Mar": "març",
+    "Apr": "abr.",
+    "May": "maig",
+    "Jun": "juny",
+    "Jul": "jul.",
+    "Aug": "ag.",
+    "Sep": "set.",
+    "Oct": "oct.",
+    "Nov": "nov.",
+    "Dec": "des.",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s%(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s%(day)s%(monthName)s%(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s%(day)s%(monthName)s%(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s%(day)s%(monthName)s%(fullYear)s%(time)s",
+    "Who would you like to add to this community?": "A qui voleu afegir a aquesta comunitat?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Avís: les persones que afegiu a aquesta comunitat seran visibles públicament per a qualsevol que conegui l'ID de la comunitat",
+    "Invite new community members": "Convida a unir-se a la comunitat a nous membres",
+    "Name or matrix ID": "Nom o ID de Matrix",
+    "Invite to Community": "Convida a la comunitat",
+    "Which rooms would you like to add to this community?": "Quines sales voleu afegir a aquesta comunitat?",
+    "Show these rooms to non-members on the community page and room list?": "Voleu mostrar a la llista de sales i a la pàgina de la comunitat, aquestes sales, als qui no en siguin membres?",
+    "Add rooms to the community": "Afegeix sales a la comunitat",
+    "Room name or alias": "Nom de la sala o alies",
+    "Add to community": "Afegeix a la comunitat",
+    "Failed to invite the following users to %(groupId)s:": "No s'ha pogut convidar al grup %(groupId)s els següents usuaris:",
+    "Failed to invite users to community": "No s'ha pogut convidar als usuaris a la comunitat",
+    "Failed to invite users to %(groupId)s": "No s'ha pogut convidar als usuaris al grup %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "No s'ha pogut afegir al grup %(groupId)s les següents sales:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot no té permís per enviar-vos notificacions. Comproveu la configuració del vostre navegador",
+    "Riot was not given permission to send notifications - please try again": "Riot no ha rebut cap permís per enviar notificacions. Torneu-ho a provar",
+    "Unable to enable Notifications": "No s'ha pogut activar les notificacions",
+    "This email address was not found": "Aquesta adreça de correu electrònic no s'ha trobat",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "La vostra adreça de correu electrònic no sembla que estigui associada amb un identificador de Matrix d'aquest servidor.",
+    "Default": "Per defecte",
+    "Restricted": "Restringit",
+    "Moderator": "Moderador",
+    "Admin": "Admin",
+    "Start a chat": "Comença un xat",
+    "Who would you like to communicate with?": "Amb qui es vol comunicar?",
+    "Email, name or matrix ID": "Correu electrònic, nom o ID de Matrix",
+    "Start Chat": "Comença un xat",
+    "Invite new room members": "Convida a nous membres a la sala",
+    "Who would you like to add to this room?": "A qui vol afegir a aquesta sala?",
+    "Send Invites": "Envia invitacions",
+    "Failed to invite user": "No s'ha pogut convidar al usuari",
+    "Failed to invite": "No s'ha pogut tramitar la invitació",
+    "Failed to invite the following users to the %(roomName)s room:": "No s'ha pogut convidar a la sala %(roomName)s els següents usuaris:",
+    "You need to be logged in.": "És necessari estar autenticat.",
+    "You need to be able to invite users to do that.": "Per poder fer això, heu de poder convidar a altres usuaris.",
+    "Unable to create widget.": "No s'ha pogut crear el giny.",
+    "Failed to send request.": "No s'ha pogut enviar la sol·licitud.",
+    "This room is not recognised.": "No es reconeix aquesta sala.",
+    "Power level must be positive integer.": "El nivell de potència ha de ser un enter positiu.",
+    "You are not in this room.": "No heu entrat a aquesta sala.",
+    "You do not have permission to do that in this room.": "No teniu el permís per realitzar aquesta acció en aquesta sala.",
+    "Missing room_id in request": "Falta l'ID de la sala en la vostra sol·licitud",
+    "Must be viewing a room": "Hauríeu de veure una sala",
+    "Room %(roomId)s not visible": "La sala %(roomId)s no és visible",
+    "Missing user_id in request": "Falta l'ID d'usuari a la vostre sol·licitud",
+    "Failed to lookup current room": "No s'ha pogut buscar la sala actual",
+    "Usage": "Ús",
+    "/ddg is not a command": "/ddg no és un comandament",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-lo, simplement espereu que es completin els resultats automàticament i seleccioneu-ne el desitjat.",
+    "Unrecognised room alias:": "Alies de sala no reconeguts:",
+    "Ignored user": "Usuari ignorat",
+    "You are now ignoring %(userId)s": "S'està ignorant l'usuari %(userId)s",
+    "Unignored user": "Usuari no ignorat",
+    "You are no longer ignoring %(userId)s": "Ja no s'està ignorant al usuari %(userId)s",
+    "Device already verified!": "El dispositiu ja estava verificat!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "AVÍS: El dispositiu ja estava verificat, però les claus NO COINCIDIEN!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVÍS: NO S'HA POGUT VERIFICAR! La firma de la clau de l'usuari %(userId)s i el dispositiu %(deviceId)s és \"%(fprint)s\", però no coincideix amb la clau \"%(fingerprint)s\". Això pot significar que les vostres comunicacions estan sent interceptades!",
+    "Verified key": "Claus verificades",
+    "Call Timeout": "La trucada ha esgotat el temps d'espera",
+    "Unknown (user, device) pair:": "Parell desconegut (usuari, dispositiu):",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clau de signatura que heu proporcionat coincideix amb la clau de signatura que heu rebut del dispositiu %(deviceId)s de l'usuari %(userId)s. S'ha marcat el dispositiu com a dispositiu verificat.",
+    "Unrecognised command:": "Ordre no reconegut:",
+    "Reason": "Raó",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s ha acceptat la invitació de %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s ha acceptat una invitació.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha sol·licitat una conferència VoIP.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha convidat a %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha expulsat a %(targetName)s.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ha canviat el seu nom visible %(oldDisplayName)s a %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha establert %(displayName)s com el seu nom visible.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha retirat el seu nom visible %(oldDisplayName)s.",
+    "%(senderName)s removed their profile picture.": "%(senderName)s ha retirat la seva foto de perfil.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ha canviat la seva foto de perfil.",
+    "%(senderName)s set a profile picture.": "%(senderName)s ha establert una foto de perfil.",
+    "VoIP conference started.": "S'ha iniciat la conferència VoIP.",
+    "%(targetName)s joined the room.": "%(targetName)s ha entrat a la sala.",
+    "VoIP conference finished.": "S'ha finalitzat la conferència VoIP.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s ha rebutjat la invitació.",
+    "%(targetName)s left the room.": "%(targetName)s ha sortir de la sala.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha readmès a %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha fet fora a %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha retirat la invitació per a %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha canviat el tema a \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha eliminat el nom de la sala.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha canviat el nom de la sala a %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha enviat una imatge.",
+    "Someone": "Algú",
+    "(not supported by this browser)": "(no és compatible amb aquest navegador)",
+    "%(senderName)s answered the call.": "%(senderName)s ha contestat la trucada.",
+    "(could not connect media)": "(no s'ha pogut connectar el medi)",
+    "(no answer)": "(sense resposta)",
+    "(unknown failure: %(reason)s)": "(error desconegut: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s ha penjat.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha col·locat una trucada de %(callType)s.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha enviat una invitació a %(targetDisplayName)s a entrar a aquesta sala.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha fet visible l'històric futur de la sala per a tots els membres, a partir de que són convidats.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres de la sala.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha fet visible l´historial de la sala per a tothom.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha fet visible l'històric de la sala per a desconeguts (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha activat l'encriptació d'extrem a extrem (algoritme %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s de %(fromPowerLevel)s fins %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha canviat el nivell de potència de %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha canviat els missatges fixats de la sala.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s ha modificat el giny %(widgetName)s",
+    "%(widgetName)s widget added by %(senderName)s": "%(senderName)s ha afegit el giny %(widgetName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s ha eliminat el giny %(widgetName)s",
+    "%(displayName)s is typing": "%(displayName)s està escrivint",
+    "%(names)s and %(count)s others are typing|other": "%(names)s i %(count)s més estan escrivint",
+    "%(names)s and %(count)s others are typing|one": "%(names)s i algú altre està escrivint",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s i %(lastPerson)s estan escrivint",
+    "Failure to create room": "No s'ha pogut crear la sala",
+    "Server may be unavailable, overloaded, or you hit a bug.": "És possible que el servidor no estigui disponible, amb sobrecàrrega o que s'hagi trobat un error.",
+    "Send anyway": "Envia de totes maneres",
+    "Send": "Envia",
+    "Unnamed Room": "Sala sense nom",
+    "Your browser does not support the required cryptography extensions": "El vostre navegador no és compatible amb els complements criptogràfics necessaris",
+    "Not a valid Riot keyfile": "El fitxer no és un fitxer de claus de Riot valid",
+    "Authentication check failed: incorrect password?": "Ha fallat l'autenticació: heu introduït correctament la contrasenya?",
+    "Failed to join room": "No s'ha pogut entrar a la sala",
+    "Message Replies": "Respostes del missatge",
+    "Message Pinning": "Fixació de missatges",
+    "Presence Management": "Gestió de presència",
+    "Tag Panel": "Tauler d'etiquetes",
+    "Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu",
+    "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Amaga els missatges de entrada i sortida (no afecta a invitacions, expulsions o prohibicions)",
+    "Hide avatar changes": "Amaga els canvis de foto de perfil",
+    "Hide display name changes": "Amaga els canvis de nom visible",
+    "Hide read receipts": "Amaga els rebuts llegits",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra les marques de temps en format de 12 hores (per exemple, 2:30pm)",
+    "Autoplay GIFs and videos": "Reprodueix de forma automàtica els GIF i vídeos",
+    "Enable automatic language detection for syntax highlighting": "Activa la detecció automàtica d'idiomes per al ressaltat de sintaxi",
+    "Disable big emoji in chat": "Desactiva els grans emoji al xat",
+    "Don't send typing notifications": "No enviïs notificacions d'escriptura",
+    "Automatically replace plain text Emoji": "Substitueix automàticament Emoji de text pla",
+    "Disable Peer-to-Peer for 1:1 calls": "Desactiva el Peer-to-Peer per a trucades entre dos",
+    "Never send encrypted messages to unverified devices in this room from this device": "Des d´aquest dispositiu no enviïs mai a aquesta sala missatges encriptats a dispositius sense verificar",
+    "Enable inline URL previews by default": "Activa per defecte les visualitzacions prèvies d'URL en línia",
+    "Enable URL previews for this room (only affects you)": "Activa les visualitzacions prèvies d'URL d'aquesta sala (no afecta a altres usuaris)",
+    "Enable URL previews by default for participants in this room": "Activa per defecte les visualitzacions prèvies d'URL per als participants d'aquesta sala",
+    "Room Colour": "Color de la sala",
+    "Active call (%(roomName)s)": "Trucada activa (%(roomName)s)",
+    "unknown caller": "trucada desconeguda",
+    "Incoming voice call from %(name)s": "Trucada de veu entrant de %(name)s"
 }

From 18d9de61fa1f9d2fa102037cbc5820c285475140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Wed, 24 Jan 2018 07:59:40 +0000
Subject: [PATCH 395/927] Translated using Weblate (Catalan)

Currently translated at 24.3% (239 of 983 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index c8d5991c49..c40336f2d1 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -230,12 +230,12 @@
     "Don't send typing notifications": "No enviïs notificacions d'escriptura",
     "Automatically replace plain text Emoji": "Substitueix automàticament Emoji de text pla",
     "Disable Peer-to-Peer for 1:1 calls": "Desactiva el Peer-to-Peer per a trucades entre dos",
-    "Never send encrypted messages to unverified devices in this room from this device": "Des d´aquest dispositiu no enviïs mai a aquesta sala missatges encriptats a dispositius sense verificar",
-    "Enable inline URL previews by default": "Activa per defecte les visualitzacions prèvies d'URL en línia",
-    "Enable URL previews for this room (only affects you)": "Activa les visualitzacions prèvies d'URL d'aquesta sala (no afecta a altres usuaris)",
-    "Enable URL previews by default for participants in this room": "Activa per defecte les visualitzacions prèvies d'URL per als participants d'aquesta sala",
+    "Never send encrypted messages to unverified devices in this room from this device": "Des d'aquest dispositiu no enviïs mai a aquesta sala missatges encriptats a dispositius sense verificar",
+    "Enable inline URL previews by default": "Activa per defecte la vista prèvia d'URLs en línia",
+    "Enable URL previews for this room (only affects you)": "Activa la vista prèvia d'URLs d'aquesta sala (no afecta a altres usuaris)",
+    "Enable URL previews by default for participants in this room": "Activa per defecte la vista prèvia d'URLs per als participants d'aquesta sala",
     "Room Colour": "Color de la sala",
     "Active call (%(roomName)s)": "Trucada activa (%(roomName)s)",
-    "unknown caller": "trucada desconeguda",
+    "unknown caller": "trucada d'un desconegut",
     "Incoming voice call from %(name)s": "Trucada de veu entrant de %(name)s"
 }

From d3100f9bc99c465b94d3cbd35bfd5bc3d917bb40 Mon Sep 17 00:00:00 2001
From: d1d4c <d1d4c@aktivix.org>
Date: Wed, 24 Jan 2018 17:53:21 +0000
Subject: [PATCH 396/927] Translated using Weblate (Catalan)

Currently translated at 54.3% (534 of 983 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index c40336f2d1..342996513a 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -41,7 +41,7 @@
     "Rooms": "Sales",
     "Add rooms to this community": "Afegeix sales a aquesta comunitat",
     "World readable": "Llegible al món",
-    "Guests can join": "Els convidats s'hi poden unir",
+    "Guests can join": "Els usuaris d'altres xarxes s'hi poden unir",
     "This email address is already in use": "Aquesta adreça de correu electrònic ja està en ús",
     "This phone number is already in use": "Aquest número de telèfon ja està en ús",
     "Failed to verify email address: make sure you clicked the link in the email": "No s'ha pogut verificar l'adreça de correu electrònic. Assegureu-vos de fer clic a l'enllaç del correu electrònic de verificació",
@@ -101,7 +101,7 @@
     "Which rooms would you like to add to this community?": "Quines sales voleu afegir a aquesta comunitat?",
     "Show these rooms to non-members on the community page and room list?": "Voleu mostrar a la llista de sales i a la pàgina de la comunitat, aquestes sales, als qui no en siguin membres?",
     "Add rooms to the community": "Afegeix sales a la comunitat",
-    "Room name or alias": "Nom de la sala o alies",
+    "Room name or alias": "Nom de la sala o àlies",
     "Add to community": "Afegeix a la comunitat",
     "Failed to invite the following users to %(groupId)s:": "No s'ha pogut convidar al grup %(groupId)s els següents usuaris:",
     "Failed to invite users to community": "No s'ha pogut convidar als usuaris a la comunitat",
@@ -142,7 +142,7 @@
     "Usage": "Ús",
     "/ddg is not a command": "/ddg no és un comandament",
     "To use it, just wait for autocomplete results to load and tab through them.": "Per utilitzar-lo, simplement espereu que es completin els resultats automàticament i seleccioneu-ne el desitjat.",
-    "Unrecognised room alias:": "Alies de sala no reconeguts:",
+    "Unrecognised room alias:": "Àlies de sala no reconeguts:",
     "Ignored user": "Usuari ignorat",
     "You are now ignoring %(userId)s": "S'està ignorant l'usuari %(userId)s",
     "Unignored user": "Usuari no ignorat",
@@ -188,7 +188,7 @@
     "%(senderName)s ended the call.": "%(senderName)s ha penjat.",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha col·locat una trucada de %(callType)s.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha enviat una invitació a %(targetDisplayName)s a entrar a aquesta sala.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha fet visible l'històric futur de la sala per a tots els membres, a partir de que són convidats.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha fet visible l'històric futur de la sala per a tots els membres, a partir de que hi són convidats.",
     "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres, des de que entren a la sala.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha fet visible l'històric futur de la sala a tots els membres de la sala.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha fet visible l´historial de la sala per a tothom.",
@@ -237,5 +237,300 @@
     "Room Colour": "Color de la sala",
     "Active call (%(roomName)s)": "Trucada activa (%(roomName)s)",
     "unknown caller": "trucada d'un desconegut",
-    "Incoming voice call from %(name)s": "Trucada de veu entrant de %(name)s"
+    "Incoming voice call from %(name)s": "Trucada de veu entrant de %(name)s",
+    "Hide avatars in user and room mentions": "Amaga els avatars a les mencions de l'usuari i de la sala",
+    "Never send encrypted messages to unverified devices from this device": "No enviïs mai des de aquest dispositiu missatges encriptats a dispositius no verificats",
+    "Incoming video call from %(name)s": "Trucada de vídeo entrant de %(name)s",
+    "Incoming call from %(name)s": "Trucada entrant de %(name)s",
+    "Decline": "Declina",
+    "Accept": "Accepta",
+    "Incorrect verification code": "El codi de verificació és incorrecte",
+    "Enter Code": "Introduïu el codi",
+    "Submit": "Envia",
+    "Phone": "Telèfon",
+    "Add phone number": "Afegiu un número de telèfon",
+    "Add": "Afegeix",
+    "Failed to upload profile picture!": "No s'ha pogut pujar la imatge!",
+    "Upload new:": "Puja un nou:",
+    "No display name": "Sense nom visible",
+    "New passwords don't match": "Les noves contrasenyes no coincideixen",
+    "Passwords can't be empty": "Les contrasenyes no poden estar buides",
+    "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.": "Si canvieu la contrasenya es reiniciaran totes les actuals claus de xifratge d'extrem per a tots els dispositius, fent que l'historial encriptat no sigui llegible, tret que primer exporteu les claus de la vostra sala i les torneu a importar després. En un futur això serà millorat.",
+    "Export E2E room keys": "Exporta les claus E2E de la sala",
+    "Do you want to set an email address?": "Voleu establir una adreça de correu electrònic?",
+    "Current password": "Contrasenya actual",
+    "Password": "Contrasenya",
+    "New Password": "Nova contrasenya",
+    "Confirm password": "Confirma la contrasenya",
+    "Change Password": "Canvia la contrasenya",
+    "Your home server does not support device management.": "El seu servidor amfitrió no és compatible amb la gestió de dispositius.",
+    "Unable to load device list": "No s'ha pogut carregar la llista de dispositius",
+    "Authentication": "Autenticació",
+    "Delete %(count)s devices|other": "Suprimeix %(count)s dispositius",
+    "Delete %(count)s devices|one": "Suprimeix el dispositiu",
+    "Device ID": "ID del dispositiu",
+    "Device Name": "Nom del dispositiu",
+    "Last seen": "Vist per últim cop",
+    "Select devices": "Selecciona els dispositius",
+    "Failed to set display name": "No s'ha pogut establir el nom visible",
+    "Disable Notifications": "Desactiva les notificacions",
+    "Enable Notifications": "Activa les notificacions",
+    "Cannot add any more widgets": "No s'ha pogut afegir cap més giny",
+    "The maximum permitted number of widgets have already been added to this room.": "Ja s'han afegit el màxim de ginys permesos en aquesta sala.",
+    "Drop File Here": "Deixeu anar un fitxer aquí",
+    "Drop file here to upload": "Deixeu anar un arxiu aquí per pujar-lo",
+    " (unsupported)": " (incompatible)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Uneix-te com <voiceText>voice</voiceText> o <videoText>video</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Trucada de conferència en curs %(supportedText)s.",
+    "%(senderName)s sent an image": "%(senderName)s ha enviat una imatge",
+    "%(senderName)s sent a video": "%(senderName)s ha enviat un vídeo",
+    "%(senderName)s uploaded a file": "%(senderName)s ha pujat un fitxer",
+    "Options": "Opcions",
+    "Undecryptable": "Indesxifrable",
+    "Encrypted by a verified device": "Encriptat per un dispositiu verificat",
+    "Encrypted by an unverified device": "Encriptat per un dispositiu no verificat",
+    "Unencrypted message": "Missatge no encriptat",
+    "Please select the destination room for this message": "Si us plau, seleccioneu la sala destinatària per a aquest missatge",
+    "Blacklisted": "Llista negre",
+    "Verified": "Verificat",
+    "Unverified": "No verificat",
+    "device id: ": "ID del dispositiu: ",
+    "Disinvite": "Descarta la invitació",
+    "Kick": "Fes fora",
+    "Disinvite this user?": "Descartar la invitació per a aquest usuari?",
+    "Kick this user?": "Voleu fer fora a aquest usuari?",
+    "Failed to kick": "No s'ha pogut fer fora",
+    "Unban": "Retira l'expulsió",
+    "Ban": "Expulsa",
+    "Unban this user?": "Voleu retirar l'expulsió de aquest usuari?",
+    "This room is not public. You will not be able to rejoin without an invite.": "Aquesta sala no és pública. No podreu tronar a entrar sense invitació.",
+    "Ban this user?": "Voleu expulsar a aquest usuari?",
+    "Failed to ban user": "No s'ha pogut expulsar l'usuari",
+    "Failed to mute user": "No s'ha pogut silenciar l'usuari",
+    "Failed to toggle moderator status": "No s'ha pogut canviar l'estat del moderador",
+    "Failed to change power level": "No s'ha pogut canviar el nivell de potència",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "No podreu desfer aquest canvi ja que estareu baixant de grau de privilegis. Només un altre usuari amb més privilegis podrà fer que els recupereu.",
+    "Are you sure?": "Esteu segur?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "No podreu desfer aquesta acció ja que esteu donant al usuari el mateix nivell de privilegi que el vostre.",
+    "No devices with registered encryption keys": "No hi ha cap dispositiu amb les claus d'encriptació registrades",
+    "Devices": "Dispositius",
+    "Unignore": "Deixa de ignorar",
+    "Ignore": "Ignora",
+    "Jump to read receipt": "Salta a els rebuts llegits",
+    "Mention": "Menció",
+    "Invite": "Convida",
+    "User Options": "Opcions d'usuari",
+    "Direct chats": "Xats directes",
+    "Unmute": "No silenciïs",
+    "Revoke Moderator": "Revoca el moderador",
+    "Make Moderator": "Fes-lo moderador",
+    "Admin Tools": "Eines d'administració",
+    "Level:": "Nivell:",
+    "and %(count)s others...|other": "i %(count)s altres...",
+    "and %(count)s others...|one": "i un altre...",
+    "Invited": "Convidat",
+    "Filter room members": "Filtre de membres de sala",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (poder %(powerLevelNumber)s)",
+    "Attachment": "Adjunt",
+    "Upload Files": "Puja fitxers",
+    "Are you sure you want to upload the following files?": "Confirmeu que voleu pujar els següents fitxers?",
+    "Encrypted room": "Sala encriptada",
+    "Unencrypted room": "Sala no encriptada",
+    "Hangup": "Penja",
+    "Voice call": "Trucada de veu",
+    "Video call": "Trucada de vídeo",
+    "Hide Apps": "Amaga les aplicacions",
+    "Show Apps": "Mostra les aplicacions",
+    "Upload file": "Puja el fitxer",
+    "Show Text Formatting Toolbar": "Mostra la barra d'eines de format de text",
+    "Send an encrypted reply…": "Envia una resposta encriptada…",
+    "Send a reply (unencrypted)…": "Envia una resposta (sense encriptar)…",
+    "Send an encrypted message…": "Envia un missatge encriptat…",
+    "Send a message (unencrypted)…": "Envia un missatge (sense encriptar)…",
+    "You do not have permission to post to this room": "No teniu el permís per escriure en aquesta sala",
+    "Turn Markdown on": "Activa el Markdown",
+    "Turn Markdown off": "Desactiva el Markdown",
+    "Hide Text Formatting Toolbar": "Amaga la barra d'eines de format de text",
+    "Server error": "S'ha produït un error al servidor",
+    "Mirror local video feed": "Mostra el vídeo local com un mirall",
+    "Opt out of analytics": "Opcions fora d'anàlisi",
+    "Server unavailable, overloaded, or something else went wrong.": "El servidor no està disponible, està sobrecarregat o alguna altra cosa no ha funcionat correctament.",
+    "Command error": "S'ha produït un error en l'ordre",
+    "bold": "negreta",
+    "italic": "cursiva",
+    "strike": "tatxat",
+    "underline": "subratllat",
+    "code": "codi",
+    "quote": "cita",
+    "bullet": "pic",
+    "numbullet": "pic numerat",
+    "Markdown is disabled": "El Markdown està desactivat",
+    "Markdown is enabled": "El Markdown està activat",
+    "Jump to message": "Salta al missatge",
+    "No pinned messages.": "No hi ha cap missatge fixat.",
+    "Loading...": "S'està carregant...",
+    "Pinned Messages": "Missatges fixats",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "En línia durant %(duration)s",
+    "Idle for %(duration)s": "Inactiu durant %(duration)s",
+    "Offline for %(duration)s": "Desconnectat durant %(duration)s",
+    "Unknown for %(duration)s": "Desconegut durant %(duration)s",
+    "Online": "En línia",
+    "Idle": "Inactiu",
+    "Offline": "Desconnectat",
+    "Unknown": "Desconegut",
+    "Replying": "S'està contestant",
+    "Seen by %(userName)s at %(dateTime)s": "Vist per %(userName)s el %(dateTime)s",
+    "No rooms to show": "No hi ha cap sala per a mostrar",
+    "Unnamed room": "Sala sense nom",
+    "Failed to set avatar.": "No s'ha pogut establir l'avatar.",
+    "Save": "Desa",
+    "(~%(count)s results)|other": "(~%(count)s resultats)",
+    "(~%(count)s results)|one": "(~%(count)s resultat)",
+    "Join Room": "Entra a la sala",
+    "Upload avatar": "Puja l'avatar",
+    "Remove avatar": "Elimina l'avatar",
+    "Forget room": "Oblida la sala",
+    "Show panel": "Mostra el plafó",
+    "Drop here to favourite": "Deixa-ho anar aquí per a marcar-ho com a favorit",
+    "Drop here to tag direct chat": "Deixa'l anar aquí per posar-li la etiqueta de xat directe",
+    "Drop here to restore": "Deixa'l anar aquí per a restaurar-lo",
+    "Drop here to demote": "Deixa'l anar aquí per a baixar-lo de grau",
+    "Drop here to tag %(section)s": "Deixa´l anar aquí per posar-li la etiqueta de %(section)s",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Encara no ha entrat a cap sala. Premeu <CreateRoomButton>per crear una sala o bé <RoomDirectoryButton> per fullejar el directori",
+    "Community Invites": "Invitacions de les comunitats",
+    "Invites": "Invitacions",
+    "Favourites": "Preferits",
+    "Low priority": "Baixa prioritat",
+    "Historical": "Històric",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "No s'ha pogut determinar que s'hagi enviat la invitació des de una adreça associada al vostre compte.",
+    "This invitation was sent to an email address which is not associated with this account:": "Aquesta invitació s'ha enviat a una adreça de correu electrònic que no està associada a aquest compte:",
+    "Press <StartChatButton> to start a chat with someone": "Premeu <StartChatButton> per a iniciar un xat amb algú",
+    "You may wish to login with a different account, or add this email to this account.": "És possible que vulgueu iniciar la sessió amb un altre compte o bé afegir aquest correu electrònic a aquest compte.",
+    "You have been invited to join this room by %(inviterName)s": "Heu sigut convidat a aquesta sala per %(inviterName)s",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Voleu <acceptText>accept</acceptText> o bé declineText>decline</declineText> aquesta invitació?",
+    "Reason: %(reasonText)s": "Raó: %(reasonText)s",
+    "Rejoin": "Trona a entrar",
+    "You have been kicked from %(roomName)s by %(userName)s.": "%(userName)s us ha fet fora de la sala %(roomName)s.",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s vos ha fet fora de la sala.",
+    "You have been banned from %(roomName)s by %(userName)s.": "%(userName)s vos ha expulsat de la sala %(roomName)s.",
+    "You have been banned from this room by %(userName)s.": "Heu sigut expulsat d'aquesta sala per %(userName)s.",
+    "This room": "Aquesta sala",
+    "%(roomName)s does not exist.": "La sala %(roomName)s no existeix.",
+    "%(roomName)s is not accessible at this time.": "La sala %(roomName)s no és accessible en aquest moment.",
+    "You are trying to access %(roomName)s.": "Esteu intentant accedir a la sala %(roomName)s.",
+    "You are trying to access a room.": "Esteu intentant accedir a una sala.",
+    "<a>Click here</a> to join the discussion!": "<a>Click here</a> per a entrar al debat!",
+    "This is a preview of this room. Room interactions have been disabled": "Aquesta és una vista prèvia de la sala. No s'hi pot interactuar des de aquí",
+    "To change the room's avatar, you must be a": "Per canviar l'avatar de la sala, heu de ser",
+    "To change the room's name, you must be a": "Per canviar el nom de la sala, heu de ser",
+    "To change the room's main address, you must be a": "Per canviar l'adreça principal de la sala, heu de ser",
+    "To change the room's history visibility, you must be a": "Per canviar la visibilitat de l'historial de la sala, heu de ser",
+    "To change the permissions in the room, you must be a": "Per canviar els permisos a la sala, heu de ser",
+    "To change the topic, you must be a": "Per canviar el tema, heu de ser",
+    "To modify widgets in the room, you must be a": "Per modificar els ginys de la sala, has de ser",
+    "Failed to unban": "No s'ha pogut expulsar",
+    "Banned by %(displayName)s": "Expulsat per %(displayName)s",
+    "Privacy warning": "Avís de privadesa",
+    "Changes to who can read history will only apply to future messages in this room": "Els canvis de qui pot llegir l'historial només s'aplicaran als missatges futurs d'aquesta sala",
+    "The visibility of existing history will be unchanged": "La visibilitat de l'historial existent no es modificarà",
+    "End-to-end encryption is in beta and may not be reliable": "L'encriptació d'extrem a extrem està en fase beta i pot ser que no sigui fiable",
+    "You should not yet trust it to secure data": "Encara no hi heu de confiar per a comunicacions segures",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Els dispositius encara no podran desencriptar l'historial d'abans d'entrar a la sala",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Quan s'activa la encriptació en una sala, no es pot desactivar posteriorment (per ara)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Els missatges encriptats no es podran veure en els clients que encara no tenguin implementada la encriptació",
+    "Enable encryption": "L'encriptació està activada",
+    "(warning: cannot be disabled again!)": "(avís: no es pot desactivar de nou!)",
+    "Encryption is enabled in this room": "L'encriptació està activada en aquesta sala",
+    "Encryption is not enabled in this room": "L'encriptació no està activada en aquesta sala",
+    "Privileged Users": "Usuaris amb privilegis",
+    "%(user)s is a": "L'usuari %(user)s és",
+    "No users have specific privileges in this room": "Cap usuari té privilegis específics en aquesta sala",
+    "Banned users": "Usuaris expulsats",
+    "This room is not accessible by remote Matrix servers": "Aquesta sala no és accessible per a servidors de Matrix remots",
+    "Leave room": "Surt de la sala",
+    "Tagged as: ": "Etiquetats com: ",
+    "To link to a room it must have <a>an address</a>.": "Per poder fer un enllaç a una sala aquesta ha de tenir <a>an address</a>.",
+    "Guests cannot join this room even if explicitly invited.": "Els usuaris d'altres xarxes no poden entrar a la sala d'aquest esdeveniment, encara que hi hagin sigut convidats de forma explícita.",
+    "Click here to fix": "Feu clic aquí per corregir-ho",
+    "Who can access this room?": "Qui pot entrar a aquesta sala?",
+    "Only people who have been invited": "Només les persones que hi hagin sigut convidades",
+    "Anyone who knows the room's link, apart from guests": "Qualsevol que conegui l'enllaç de la sala, excepte els usuaris d'altres xarxes",
+    "Publish this room to the public in %(domain)s's room directory?": "Voleu que es publiqui aquesta sala al directori de sales públiques de %(domain)s?",
+    "Who can read history?": "Qui pot llegir l'historial?",
+    "Anyone": "Qualsevol",
+    "Members only (since the point in time of selecting this option)": "Només els membres (a partir del punt en què seleccioneu aquesta opció)",
+    "Members only (since they were invited)": "Només els membres (a partir del punt en què hi són convidats)",
+    "Members only (since they joined)": "Només els membres (a partir del punt en què entrin a la sala)",
+    "Permissions": "Permisos",
+    "The default role for new room members is": "El rol per defecte dels nous membres de la sala és",
+    "To send messages, you must be a": "Per poder enviar missatges, heu de ser",
+    "To invite users into the room, you must be a": "Per poder convidar a usuaris a aquesta sala, heu de ser",
+    "To configure the room, you must be a": "Per poder configurar aquesta sala, heu de ser",
+    "To kick users, you must be a": "Per poder fer fora a usuaris, heu de ser",
+    "To ban users, you must be a": "Per expulsar a usuaris, heu de ser",
+    "To remove other users' messages, you must be a": "Per eliminar missatges d'altres usuaris, heu de ser",
+    "To send events of type <eventType/>, you must be a": "Per poder enviar esdeveniments de tipus <eventType/>, heu de ser",
+    "This room's internal ID is": "L'ID d'aquesta sala és",
+    "Add a topic": "Afegeix un tema",
+    "Scroll to unread messages": "Desplaça't fins els missatges no llegits",
+    "Jump to first unread message.": "Salta al primer missatge no llegit.",
+    "Invalid alias format": "El format de l'àlies no és vàlid",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no és un format d'àlies vàlid",
+    "Invalid address format": "L'adreça no té un format vàlid",
+    "Anyone who knows the room's link, including guests": "Qualsevol que conegui l'enllaç, inclosos els usuaris d'altres xarxes",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' no és un format vàlid per a una adreça",
+    "not specified": "sense especificar",
+    "not set": "sense definir",
+    "Remote addresses for this room:": "Adreces remotes per a aquesta sala:",
+    "Addresses": "Adreces",
+    "The main address for this room is": "L'adreça principal d'aquesta sala és",
+    "Local addresses for this room:": "Adreces locals d'aquesta sala:",
+    "This room has no local addresses": "Aquesta sala no té adreces locals",
+    "New address (e.g. #foo:%(localDomain)s)": "Nova adreça (per exemple #foo:%(localDomain)s)",
+    "Invalid community ID": "L'ID de la comunitat no és vàlid",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' no és un ID de comunitat vàlid",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nou ID de comunitat (per exemple +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "Heu <a>enabled</a> les previsualitzacions per defecte de les URL.",
+    "You have <a>disabled</a> URL previews by default.": "Heu <a>disabled</a> les previsualitzacions per defecte de les URL.",
+    "URL previews are enabled by default for participants in this room.": "Les previsualitzacions de les URL estan activades per defecte per als membres d'aquesta sala.",
+    "URL previews are disabled by default for participants in this room.": "Les previsualitzacions de les URL estan per defecte desactivades per als membres d'aquesta sala.",
+    "URL Previews": "Previsualitzacions de les URL",
+    "Error decrypting audio": "S'ha produït un error mentre es desencriptava l'audio",
+    "Error decrypting attachment": "S'ha produït un error en desencriptar el fitxer adjunt",
+    "Decrypt %(text)s": "Desencripta %(text)s",
+    "Download %(text)s": "Baixa %(text)s",
+    "Invalid file%(extra)s": "Fitxer invàlid%(extra)s",
+    "Error decrypting image": "S'ha produït un error en desencriptar la imatge",
+    "Image '%(Body)s' cannot be displayed.": "La imatge '%(Body)s' no es pot mostrar.",
+    "This image cannot be displayed.": "Aquesta imatge no es pot mostrar.",
+    "Error decrypting video": "S'ha produït un error en desencriptar el vídeo",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha canviat el seu avatar per a la sala %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha eliminat l'avatar de la sala.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha canviat l'avatar de la sala per aquest <img/>",
+    "Copied!": "Copiat!",
+    "Failed to copy": "No s'ha pogut copiar",
+    "Add an Integration": "Afegeix una integració",
+    "Removed or unknown message type": "El tipus de missatge ha sigut eliminat o és desconegut",
+    "Message removed by %(userId)s": "El missatge ha sigut eliminat per l'usuari %(userId)s",
+    "Message removed": "S'ha eliminat el missatge",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Actualment, la verificació del robot no està disponible a l'escriptori: utilitzeu un <a>web browser</a>",
+    "Sign in with CAS": "Inicieu sessió amb CAS",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Podeu utilitzar les opcions de servidor personalitzades per a iniciar sessió en altres servidors Matrix, especificant una altre URL de servidor principal.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Això us permet utilitzar aquesta aplicació amb un compte de Matrix existent en un altre servidor.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "També podeu establir un servidor d'identitat personalitzat, però normalment això evitarà la interacció basada en l'adreça de correu electrònic amb altres usuaris.",
+    "To continue, please enter your password.": "Per poder continuar, si us plau, introduïu una contrasenya.",
+    "Password:": "Contrasenya:",
+    "An email has been sent to %(emailAddress)s": "S'ha enviat un correu electrònic a %(emailAddress)s",
+    "Please check your email to continue registration.": "Reviseu el vostre correu electrònic per a poder continuar amb el registre.",
+    "Token incorrect": "El testimoni és incorrecte",
+    "A text message has been sent to %(msisdn)s": "S'ha enviat un missatge de text a %(msisdn)s",
+    "Please enter the code it contains:": "Introduïu el codi que conté:",
+    "Start authentication": "Inicia l'autenticació",
+    "Username on %(hs)s": "Nom d'usuari a %(hs)s",
+    "User name": "Nom d'usuari",
+    "Mobile phone number": "Número de telèfon mòbil"
 }

From b7c32ee1b5731ca8efc1c6005227b4bbf19bdec4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Tue, 23 Jan 2018 20:59:39 +0000
Subject: [PATCH 397/927] Translated using Weblate (Serbian)

Currently translated at 38.9% (383 of 983 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index ab2a4a529b..87c8aea100 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -273,5 +273,113 @@
     "Failed to ban user": "Неуспех при забрањивању приступа кориснику",
     "Failed to mute user": "Неуспех при пригушивању корисника",
     "Failed to toggle moderator status": "Неуспех при промени стања модератора",
-    "Failed to change power level": "Неуспех при промени нивоа моћи"
+    "Failed to change power level": "Неуспех при промени нивоа моћи",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Нећете моћи да опозовете ове промене зато што снижавате себе, ако сте последњи овлашћени корисник у соби, немогуће је да поново добијете овлашћења.",
+    "Are you sure?": "Да ли сте сигурни?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Нећете моћи да опозовете ову измену јер унапређујете корисника тако да има исти ниво моћи као и ви.",
+    "No devices with registered encryption keys": "Нема уређаја са регистрованим кључевима за шифровање",
+    "Devices": "Уређаји",
+    "Unignore": "Не занемаруј више",
+    "Ignore": "Занемари",
+    "Jump to read receipt": "Скочи на потврду о прочитаности",
+    "Mention": "Спомени",
+    "Invite": "Позови",
+    "User Options": "Корисничке опције",
+    "Direct chats": "Директна ћаскања",
+    "Unmute": "Појачај",
+    "Mute": "Утишај",
+    "Revoke Moderator": "Опозови модератора",
+    "Make Moderator": "Учини модератором",
+    "Admin Tools": "Админ алатке",
+    "Level:": "Ниво:",
+    "and %(count)s others...|other": "и %(count)s других...",
+    "and %(count)s others...|one": "и још један други...",
+    "Invited": "Позван",
+    "Filter room members": "Филтрирај чланове собе",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (моћ %(powerLevelNumber)s)",
+    "Attachment": "Прилог",
+    "Upload Files": "Отпреми датотеке",
+    "Are you sure you want to upload the following files?": "Да ли сте сигурни да желите да отпремите следеће датотеке?",
+    "Encrypted room": "Шифрована соба",
+    "Unencrypted room": "Нешифрована соба",
+    "Hangup": "Спусти слушалицу",
+    "Voice call": "Гласовни позив",
+    "Video call": "Видео позив",
+    "Hide Apps": "Сакриј апликације",
+    "Show Apps": "Прикажи апликације",
+    "Upload file": "Отпреми датотеку",
+    "Show Text Formatting Toolbar": "Прикажи алатницу за форматирање текста",
+    "Send an encrypted reply…": "Пошаљи шифровани одговор…",
+    "Send a reply (unencrypted)…": "Пошаљи одговор (нешифровани)…",
+    "Send an encrypted message…": "Пошаљи шифровану поруку…",
+    "Send a message (unencrypted)…": "Пошаљи поруку (нешифровану)…",
+    "You do not have permission to post to this room": "Немате овлашћење за писање у овој соби",
+    "Turn Markdown on": "Укључи Маркдаун",
+    "Turn Markdown off": "Искључи Маркдаун",
+    "Hide Text Formatting Toolbar": "Сакриј алатницу за форматирање текста",
+    "Server error": "Грешка на серверу",
+    "Server unavailable, overloaded, or something else went wrong.": "Сервер није доступан или је преоптерећен или је нешто пошло наопако.",
+    "Command error": "Грешка у наредби",
+    "bold": "подебљано",
+    "italic": "искошено",
+    "strike": "прецртано",
+    "underline": "подвучено",
+    "code": "код",
+    "quote": "цитат",
+    "bullet": "списак",
+    "numbullet": "бројевни_списак",
+    "Markdown is disabled": "Маркдаун је искључен",
+    "Markdown is enabled": "Маркдаун је укључен",
+    "Unpin Message": "Откачи поруку",
+    "Jump to message": "Скочи на поруку",
+    "No pinned messages.": "Нема закачених порука.",
+    "Loading...": "Учитавам...",
+    "Pinned Messages": "Закачене поруке",
+    "%(duration)ss": "%(duration)sс",
+    "%(duration)sm": "%(duration)sм",
+    "%(duration)sh": "%(duration)sч",
+    "%(duration)sd": "%(duration)sд",
+    "Online for %(duration)s": "На мрежи %(duration)s",
+    "Idle for %(duration)s": "У мировању %(duration)s",
+    "Offline for %(duration)s": "Ван мреже %(duration)s",
+    "Unknown for %(duration)s": "Непознато већ %(duration)s",
+    "Online": "На мрежи",
+    "Idle": "У мировању",
+    "Offline": "Ван мреже",
+    "Unknown": "Непознато",
+    "Replying": "Одговара",
+    "Seen by %(userName)s at %(dateTime)s": "Видео корисник %(userName)s у %(dateTime)s",
+    "No rooms to show": "Нема соба за приказ",
+    "Unnamed room": "Неименована соба",
+    "World readable": "Читљиво за све",
+    "Guests can join": "Гости могу приступити",
+    "Failed to set avatar.": "Нисам успео да поставим аватар.",
+    "Save": "Сачувај",
+    "(~%(count)s results)|other": "(~%(count)s резултата)",
+    "(~%(count)s results)|one": "(~%(count)s резултат)",
+    "Join Room": "Приступи соби",
+    "Upload avatar": "Отпреми аватара",
+    "Remove avatar": "Уклони аватара",
+    "Settings": "Подешавања",
+    "Forget room": "Заборави собу",
+    "Search": "Претрага",
+    "Show panel": "Прикажи површ",
+    "Drop here to favourite": "Пусти овде да учиниш омиљеним",
+    "Drop here to tag direct chat": "Пусти овде да означиш директно ћаскање",
+    "Drop here to restore": "Пусти овде да опоравиш",
+    "Drop here to demote": "Пусти овде да унизиш",
+    "Drop here to tag %(section)s": "Пусти овде да означиш %(section)s",
+    "Press <StartChatButton> to start a chat with someone": "Притисни <StartChatButton> за започињање ћаскања са неким",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Још нисте у било којој соби! Притисните <CreateRoomButton> да бисте направили собу или <RoomDirectoryButton> да бисте погледали фасциклу",
+    "Community Invites": "Позивнице заједнице",
+    "Invites": "Позивнице",
+    "Favourites": "Омиљено",
+    "People": "Особе",
+    "Rooms": "Собе",
+    "Low priority": "Ниска важност",
+    "Historical": "Историјско",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не могу да утврдим да ли се адреса на овој позивници поклапа са оном која је повезана са вашим налогом.",
+    "This invitation was sent to an email address which is not associated with this account:": "Ова позивница је послата на мејл адресу која није повезана са вашим налогом:",
+    "You may wish to login with a different account, or add this email to this account.": "Можда бисте желели да се пријавите са другим налогом или да додате овај мејл у ваш налог.",
+    "You have been invited to join this room by %(inviterName)s": "Позвани сте да приступите овој соби од стране корисника %(inviterName)s"
 }

From 899192b0197a50279bbbe831496c8a2f45873a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 22 Jan 2018 20:43:11 +0000
Subject: [PATCH 398/927] Translated using Weblate (French)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index cff37c3d70..b9d2ef7d89 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -983,5 +983,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s %(day)s %(monthName)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
     "Community IDs cannot not be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
+    "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>"
 }

From 00f52edf4ca1e7f0cce69b8d75410ae7a1954ab2 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Tue, 23 Jan 2018 05:16:28 +0000
Subject: [PATCH 399/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index bae5c33be9..8333ce746c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -982,5 +982,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
     "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
     "Community IDs cannot not be empty.": "社群 ID 不能為空。",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。"
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
+    "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>"
 }

From dd4cef4c3e2c2f7a5444cf6eddee1b3fea8e851c Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 22 Jan 2018 18:31:43 +0000
Subject: [PATCH 400/927] Translated using Weblate (Russian)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 6ddc92b928..9ea84961c8 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -983,5 +983,6 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо от того, используете ли вы режим Richtext в редакторе Rich Text Editor",
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>.",
-    "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми."
+    "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми.",
+    "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>"
 }

From 3060ec10535e1be1850b809c24c18d97eea24b9b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 25 Jan 2018 09:54:31 +0000
Subject: [PATCH 401/927] Use invite_3pid prop of createRoom instead of manual
 invite after create

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/RoomInvite.js | 13 ++++++++++---
 src/createRoom.js | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/RoomInvite.js b/src/RoomInvite.js
index 1979c6d111..31541148d9 100644
--- a/src/RoomInvite.js
+++ b/src/RoomInvite.js
@@ -85,9 +85,7 @@ function _onStartChatFinished(shouldInvite, addrs) {
         if (rooms.length > 0) {
             // A Direct Message room already exists for this user, so select a
             // room from a list that is similar to the one in MemberInfo panel
-            const ChatCreateOrReuseDialog = sdk.getComponent(
-                "views.dialogs.ChatCreateOrReuseDialog",
-            );
+            const ChatCreateOrReuseDialog = sdk.getComponent("views.dialogs.ChatCreateOrReuseDialog");
             const close = Modal.createTrackedDialog('Create or Reuse', '', ChatCreateOrReuseDialog, {
                 userId: addrTexts[0],
                 onNewDMClick: () => {
@@ -115,6 +113,15 @@ function _onStartChatFinished(shouldInvite, addrs) {
                 });
             });
         }
+    } else if (addrTexts.length === 1) {
+        // Start a new DM chat
+        createRoom({dmUserId: addrTexts[0]}).catch((err) => {
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createTrackedDialog('Failed to invite user', '', ErrorDialog, {
+                title: _t("Failed to invite user"),
+                description: ((err && err.message) ? err.message : _t("Operation failed")),
+            });
+        });
     } else {
         // Start multi user chat
         let room;
diff --git a/src/createRoom.js b/src/createRoom.js
index ffe3a85c4e..a767d09288 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -22,6 +22,7 @@ import dis from "./dispatcher";
 import * as Rooms from "./Rooms";
 
 import Promise from 'bluebird';
+import {getAddressType} from "./UserAddress";
 
 /**
  * Create a new room, and switch to it.
@@ -52,7 +53,17 @@ function createRoom(opts) {
     createOpts.preset = createOpts.preset || defaultPreset;
     createOpts.visibility = createOpts.visibility || 'private';
     if (opts.dmUserId && createOpts.invite === undefined) {
-        createOpts.invite = [opts.dmUserId];
+        switch (getAddressType(opts.dmUserId)) {
+            case 'mx-user-id':
+                createOpts.invite = [opts.dmUserId];
+                break;
+            case 'email':
+                createOpts.invite_3pid = [{
+                    id_server: MatrixClientPeg.get().getIdentityServerUrl(true),
+                    medium: 'email',
+                    address: opts.dmUserId,
+                }];
+        }
     }
     if (opts.dmUserId && createOpts.is_direct === undefined) {
         createOpts.is_direct = true;

From c86c12de40f2c522f16856d610ff4cda92d1e04e Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 22 Jan 2018 19:23:52 +0000
Subject: [PATCH 402/927] Translated using Weblate (Basque)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index f1db7376e9..15c5e43d97 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -983,5 +983,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(fullYear)s(e)ko %(monthName)sk %(day)sa",
     "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
     "Community IDs cannot not be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
+    "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>"
 }

From 56bd4b7d06949a0d3cb11e2e15acd7c2edd00e19 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 25 Jan 2018 12:18:02 +0000
Subject: [PATCH 403/927] Fix not showing Invited section if all invites are
 3PID

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

diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 04b6089559..1c5eba7fbc 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -315,6 +315,30 @@ module.exports = React.createClass({
         });
     },
 
+    _getPending3PidInvites: function() {
+        // include 3pid invites (m.room.third_party_invite) state events.
+        // The HS may have already converted these into m.room.member invites so
+        // we shouldn't add them if the 3pid invite state key (token) is in the
+        // member invite (content.third_party_invite.signed.token)
+        const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+
+        if (room) {
+            return room.currentState.getStateEvents("m.room.third_party_invite").filter(function(e) {
+                // any events without these keys are not valid 3pid invites, so we ignore them
+                const requiredKeys = ['key_validity_url', 'public_key', 'display_name'];
+                for (let i = 0; i < requiredKeys.length; ++i) {
+                    if (e.getContent()[requiredKeys[i]] === undefined) return false;
+                }
+
+                // discard all invites which have a m.room.member event since we've
+                // already added them.
+                const memberEvent = room.currentState.getInviteForThreePidToken(e.getStateKey());
+                if (memberEvent) return false;
+                return true;
+            });
+        }
+    },
+
     _makeMemberTiles: function(members, membership) {
         const MemberTile = sdk.getComponent("rooms.MemberTile");
 
@@ -329,33 +353,13 @@ module.exports = React.createClass({
         // Double XXX: Now it's really, really not the right home for this logic:
         // we shouldn't even be passing in the 'membership' param to this function.
         // Ew, ew, and ew.
+        // Triple XXX: This violates the size constraint, the output is expected/desired
+        // to be the same length as the members input array.
         if (membership === "invite") {
-            // include 3pid invites (m.room.third_party_invite) state events.
-            // The HS may have already converted these into m.room.member invites so
-            // we shouldn't add them if the 3pid invite state key (token) is in the
-            // member invite (content.third_party_invite.signed.token)
-            const room = MatrixClientPeg.get().getRoom(this.props.roomId);
             const EntityTile = sdk.getComponent("rooms.EntityTile");
-            if (room) {
-                room.currentState.getStateEvents("m.room.third_party_invite").forEach(
-                function(e) {
-                    // any events without these keys are not valid 3pid invites, so we ignore them
-                    const required_keys = ['key_validity_url', 'public_key', 'display_name'];
-                    for (let i = 0; i < required_keys.length; ++i) {
-                        if (e.getContent()[required_keys[i]] === undefined) return;
-                    }
-
-                    // discard all invites which have a m.room.member event since we've
-                    // already added them.
-                    const memberEvent = room.currentState.getInviteForThreePidToken(e.getStateKey());
-                    if (memberEvent) {
-                        return;
-                    }
-                    memberList.push(
-                        <EntityTile key={e.getStateKey()} name={e.getContent().display_name} suppressOnHover={true} />,
-                    );
-                });
-            }
+            memberList.push(...this._getPending3PidInvites().map((e) => {
+                return <EntityTile key={e.getStateKey()} name={e.getContent().display_name} suppressOnHover={true} />;
+            }));
         }
 
         return memberList;
@@ -374,7 +378,7 @@ module.exports = React.createClass({
     },
 
     _getChildCountInvited: function() {
-        return this.state.filteredInvitedMembers.length;
+        return this.state.filteredInvitedMembers.length + (this._getPending3PidInvites() || []).length;
     },
 
     render: function() {

From e78659642e64997d969258fb79ece05e1e2e6401 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 23 Jan 2018 07:09:24 +0000
Subject: [PATCH 404/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index da9de87695..f2aa17c764 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -983,5 +983,6 @@
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(fullYear)s. %(monthName)s %(day)s, %(weekDayName)s",
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>.",
-    "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres."
+    "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres.",
+    "<a>In reply to</a> <pill>": "<a>Válaszolva neki</a> <pill>"
 }

From 9223a5db9eb24dae8f1066a29ded8d021cff26d0 Mon Sep 17 00:00:00 2001
From: d1d4c <d1d4c@aktivix.org>
Date: Thu, 25 Jan 2018 16:13:04 +0000
Subject: [PATCH 405/927] Translated using Weblate (Catalan)

Currently translated at 83.6% (823 of 984 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 342996513a..b5bca7d912 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -105,7 +105,7 @@
     "Add to community": "Afegeix a la comunitat",
     "Failed to invite the following users to %(groupId)s:": "No s'ha pogut convidar al grup %(groupId)s els següents usuaris:",
     "Failed to invite users to community": "No s'ha pogut convidar als usuaris a la comunitat",
-    "Failed to invite users to %(groupId)s": "No s'ha pogut convidar als usuaris al grup %(groupId)s",
+    "Failed to invite users to %(groupId)s": "No s'ha pogut convidar els usuaris al grup %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "No s'ha pogut afegir al grup %(groupId)s les següents sales:",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot no té permís per enviar-vos notificacions. Comproveu la configuració del vostre navegador",
     "Riot was not given permission to send notifications - please try again": "Riot no ha rebut cap permís per enviar notificacions. Torneu-ho a provar",
@@ -151,7 +151,7 @@
     "WARNING: Device already verified, but keys do NOT MATCH!": "AVÍS: El dispositiu ja estava verificat, però les claus NO COINCIDIEN!",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVÍS: NO S'HA POGUT VERIFICAR! La firma de la clau de l'usuari %(userId)s i el dispositiu %(deviceId)s és \"%(fprint)s\", però no coincideix amb la clau \"%(fingerprint)s\". Això pot significar que les vostres comunicacions estan sent interceptades!",
     "Verified key": "Claus verificades",
-    "Call Timeout": "La trucada ha esgotat el temps d'espera",
+    "Call Timeout": "Temps d'espera de les trucades",
     "Unknown (user, device) pair:": "Parell desconegut (usuari, dispositiu):",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La clau de signatura que heu proporcionat coincideix amb la clau de signatura que heu rebut del dispositiu %(deviceId)s de l'usuari %(userId)s. S'ha marcat el dispositiu com a dispositiu verificat.",
     "Unrecognised command:": "Ordre no reconegut:",
@@ -219,7 +219,7 @@
     "Tag Panel": "Tauler d'etiquetes",
     "Disable Emoji suggestions while typing": "Desactiva els suggeriments d'Emoji mentre s'escriu",
     "Use compact timeline layout": "Utilitza el disseny compacte de la línia de temps",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Amaga els missatges de entrada i sortida (no afecta a invitacions, expulsions o prohibicions)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Amaga els missatges d'entrada i sortida (no afecta a les invitacions, expulsions o prohibicions)",
     "Hide avatar changes": "Amaga els canvis de foto de perfil",
     "Hide display name changes": "Amaga els canvis de nom visible",
     "Hide read receipts": "Amaga els rebuts llegits",
@@ -329,7 +329,7 @@
     "and %(count)s others...|other": "i %(count)s altres...",
     "and %(count)s others...|one": "i un altre...",
     "Invited": "Convidat",
-    "Filter room members": "Filtre de membres de sala",
+    "Filter room members": "Filtra membres de sala",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (poder %(powerLevelNumber)s)",
     "Attachment": "Adjunt",
     "Upload Files": "Puja fitxers",
@@ -353,7 +353,7 @@
     "Hide Text Formatting Toolbar": "Amaga la barra d'eines de format de text",
     "Server error": "S'ha produït un error al servidor",
     "Mirror local video feed": "Mostra el vídeo local com un mirall",
-    "Opt out of analytics": "Opcions fora d'anàlisi",
+    "Opt out of analytics": "No acceptis analítiques",
     "Server unavailable, overloaded, or something else went wrong.": "El servidor no està disponible, està sobrecarregat o alguna altra cosa no ha funcionat correctament.",
     "Command error": "S'ha produït un error en l'ordre",
     "bold": "negreta",
@@ -408,7 +408,7 @@
     "Historical": "Històric",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "No s'ha pogut determinar que s'hagi enviat la invitació des de una adreça associada al vostre compte.",
     "This invitation was sent to an email address which is not associated with this account:": "Aquesta invitació s'ha enviat a una adreça de correu electrònic que no està associada a aquest compte:",
-    "Press <StartChatButton> to start a chat with someone": "Premeu <StartChatButton> per a iniciar un xat amb algú",
+    "Press <StartChatButton> to start a chat with someone": "Prem <StartChatButton> per a començar un xat amb algú",
     "You may wish to login with a different account, or add this email to this account.": "És possible que vulgueu iniciar la sessió amb un altre compte o bé afegir aquest correu electrònic a aquest compte.",
     "You have been invited to join this room by %(inviterName)s": "Heu sigut convidat a aquesta sala per %(inviterName)s",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Voleu <acceptText>accept</acceptText> o bé declineText>decline</declineText> aquesta invitació?",
@@ -454,11 +454,11 @@
     "Leave room": "Surt de la sala",
     "Tagged as: ": "Etiquetats com: ",
     "To link to a room it must have <a>an address</a>.": "Per poder fer un enllaç a una sala aquesta ha de tenir <a>an address</a>.",
-    "Guests cannot join this room even if explicitly invited.": "Els usuaris d'altres xarxes no poden entrar a la sala d'aquest esdeveniment, encara que hi hagin sigut convidats de forma explícita.",
+    "Guests cannot join this room even if explicitly invited.": "Els usuaris d'altres xarxes no poden entrar a la sala d'aquest esdeveniment encara que hi hagin sigut convidats de forma explícita.",
     "Click here to fix": "Feu clic aquí per corregir-ho",
     "Who can access this room?": "Qui pot entrar a aquesta sala?",
     "Only people who have been invited": "Només les persones que hi hagin sigut convidades",
-    "Anyone who knows the room's link, apart from guests": "Qualsevol que conegui l'enllaç de la sala, excepte els usuaris d'altres xarxes",
+    "Anyone who knows the room's link, apart from guests": "Qualsevol que conegui l'enllaç de la sala, excepte usuaris d'altres xarxes",
     "Publish this room to the public in %(domain)s's room directory?": "Voleu que es publiqui aquesta sala al directori de sales públiques de %(domain)s?",
     "Who can read history?": "Qui pot llegir l'historial?",
     "Anyone": "Qualsevol",
@@ -481,7 +481,7 @@
     "Invalid alias format": "El format de l'àlies no és vàlid",
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' no és un format d'àlies vàlid",
     "Invalid address format": "L'adreça no té un format vàlid",
-    "Anyone who knows the room's link, including guests": "Qualsevol que conegui l'enllaç, inclosos els usuaris d'altres xarxes",
+    "Anyone who knows the room's link, including guests": "Qualsevol que conegui l'enllaç de la sala, inclosos els usuaris d'altres xarxes",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' no és un format vàlid per a una adreça",
     "not specified": "sense especificar",
     "not set": "sense definir",
@@ -532,5 +532,294 @@
     "Start authentication": "Inicia l'autenticació",
     "Username on %(hs)s": "Nom d'usuari a %(hs)s",
     "User name": "Nom d'usuari",
-    "Mobile phone number": "Número de telèfon mòbil"
+    "Mobile phone number": "Número de telèfon mòbil",
+    "Forgot your password?": "Heu oblidat la vostra contrasenya?",
+    "%(serverName)s Matrix ID": "ID de Matrix de %(serverName)s",
+    "Sign in with": "Inicieu sessió amb",
+    "Email address": "Correu electrònic",
+    "Sign in": "Inicia sessió",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si no especifiqueu una adreça de correu electrònic, no podreu restablir la vostra contrasenya. N'esteu segur?",
+    "Email address (optional)": "Correu electrònic (opcional)",
+    "You are registering with %(SelectedTeamName)s": "Esteu registrant-vos amb %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Número de telèfon mòbil (opcional)",
+    "Default server": "Servidor per defecte",
+    "Custom server": "Servidor personalitzat",
+    "Identity server URL": "URL del servidor d'identitat",
+    "What does this mean?": "Què vol dir això?",
+    "Remove from community": "Elimina de la comunitat",
+    "Disinvite this user from community?": "Voleu retirar la invitació de aquest usuari a la comunitat?",
+    "Remove this user from community?": "Voleu eliminar de la comunitat a aquest usuari?",
+    "Failed to withdraw invitation": "No s'ha pogut retirar la invitació",
+    "Failed to remove user from community": "No s'ha pogut treure l'usuari de la comunitat",
+    "Filter community members": "Filtra membres de comunitat",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Esteu segur que voleu treure l'usuari '%(roomName)s' del grup %(groupId)s?",
+    "Home server URL": "URL del servidor d'origen",
+    "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
+    "Removing a room from the community will also remove it from the community page.": "L'eliminació d'una sala de la comunitat també l'eliminarà de la pàgina de la comunitat.",
+    "Failed to remove room from community": "No s'ha pogut eliminar la sala de la comunitat",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "No s'ha pogut treure la sala '%(roomName)s' de la comunitat %(groupId)s",
+    "Something went wrong!": "Alguna cosa ha anat malament!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "No s'ha pogut actualitzar la visibilitat de la sala '%(roomName)s' de la comunitat %(groupId)s.",
+    "Visibility in Room List": "Visibilitat a la llista de les sales",
+    "Visible to everyone": "Visible per a tothom",
+    "Only visible to community members": "Només visible per als membres de la comunitat",
+    "Filter community rooms": "Filtra sales de comunitats",
+    "Something went wrong when trying to get your communities.": "S'ha produït un error en intentar obtenir les vostres comunitats.",
+    "You're not currently a member of any communities.": "Actualment no sou membre de cap comunitat.",
+    "Unknown Address": "Adreça desconeguda",
+    "NOTE: Apps are not end-to-end encrypted": "NOTA: Les aplicacions no estan encriptades d'extrem a extrem",
+    "Do you want to load widget from URL:": "Carregar ginys des de l'URL:",
+    "Allow": "Permetre",
+    "Delete Widget": "Suprimeix el giny",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "La supressió d'un giny l'elimina per a tots els usuaris d'aquesta sala. Esteu segur que voleu eliminar aquest giny?",
+    "Delete widget": "Suprimeix el giny",
+    "Revoke widget access": "Revoca l'accés del giny",
+    "Minimize apps": "Minimitza les aplicacions",
+    "Blacklist": "Llista negre",
+    "Unverify": "Sense verificar",
+    "Verify...": "S'està verificant...",
+    "No results": "Sense resultats",
+    "Delete": "Esborra",
+    "Communities": "Comunitats",
+    "Home": "Inici",
+    "Integrations Error": "S'ha produït un error d'integració",
+    "Could not connect to the integration server": "No s'ha pogut connectar amb el servidor de l'integració",
+    "Manage Integrations": "Gestiona les integracions",
+    "%(nameList)s %(transitionList)s": "%(transitionList)s%(nameList)s",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s han entrat",
+    "Guest access is disabled on this Home Server.": "L'accés a usuaris d'altres xarxes no està permès en aquest servidor.",
+    "Login as guest": "Inicia sessió com a convidat",
+    "Unblacklist": "Treure de la llista negre",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s s'ha unit",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s han sortit",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ha sortit",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s s'han unit i han sortit %(count)s vegades",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s s'han unit i han sortit",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s ha entrat i ha sortit %(count)s vegades",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s ha entrat i ha sortit",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s han sortit i han tornat a entrar %(count)s vegades",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s han sortit i han tornat a entrar",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s ha sortit i ha tornat a entrar %(count)s vegades",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ha sortit i ha tornat a entrar",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s han rebutjat les seves invitacions %(count)s vegades",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s han rebutjat les seves invitacions",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s ha rebutjat la seva invitació %(count)s vegades",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s ha rebutjat la seva invitació",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "a %(severalUsers)s els hi han retirat les seves invitacions %(count)s vegades",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "a %(severalUsers)s els hi han retirat les seves invitacions",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "a %(oneUser)s li han retirat la seva invitació %(count)s vegades",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "a %(oneUser)s li han retirat la seva invitació",
+    "were invited %(count)s times|other": "a sigut invitat %(count)s vegades",
+    "were invited %(count)s times|one": "han sigut convidats",
+    "was invited %(count)s times|other": "ha sigut convidat %(count)s vegades",
+    "was invited %(count)s times|one": "ha sigut convidat",
+    "were banned %(count)s times|other": "han sigut expulsats %(count)s vegades",
+    "were banned %(count)s times|one": "ha sigut expulsat",
+    "was banned %(count)s times|other": "ha sigut expulsat %(count)s vegades",
+    "was banned %(count)s times|one": "ha sigut expulsat",
+    "were unbanned %(count)s times|other": "han sigut readmesos %(count)s vegades",
+    "were unbanned %(count)s times|one": "han sigut readmesos",
+    "was unbanned %(count)s times|other": "ha sigut readmès %(count)s vegades",
+    "was unbanned %(count)s times|one": "ha sigut readmès",
+    "were kicked %(count)s times|other": "els han fet fora %(count)s vegades",
+    "were kicked %(count)s times|one": "els han fet fora",
+    "was kicked %(count)s times|other": "l'han fet fora %(count)s vegades",
+    "was kicked %(count)s times|one": "l'han fet fora",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s han canviat el seu nom %(count)s vegades",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s han canviat el seu nom",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s han canviat el seu nom %(count)s vegades",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s ha canviat el seu nom",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s han canviat el seu avatar %(count)s vegades",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s han canviat el seu avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s han canviat el seu avatar %(count)s vegades",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s ha canviat el seu avatar",
+    "%(items)s and %(count)s others|other": "%(items)s i %(count)s altres",
+    "%(items)s and %(count)s others|one": "%(items)s i un altre",
+    "%(items)s and %(lastItem)s": "%(items)s i %(lastItem)s",
+    "collapse": "col·lapsa",
+    "expand": "expandeix",
+    "Custom of %(powerLevel)s": "Personalitzat de %(powerLevel)s",
+    "Custom level": "Nivell personalitzat",
+    "And %(count)s more...|other": "I %(count)s més...",
+    "ex. @bob:example.com": "per exemple @carles:exemple.cat",
+    "Add User": "Afegeix un usuari",
+    "Matrix ID": "ID de Matrix",
+    "Matrix Room ID": "ID de sala de Matrix",
+    "email address": "correu electrònic",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Proveu d'utilitzar un dels següents tipus d'adreça vàlids: %(validTypesList)s.",
+    "You have entered an invalid address.": "No heu introduït una adreça vàlida.",
+    "Create a new chat or reuse an existing one": "Creeu un xat nou o feu-ne servit un d'existent",
+    "Start new chat": "Inicia un nou xat",
+    "You already have existing direct chats with this user:": "Ja teniu xats directes amb aquest usuari:",
+    "Start chatting": "Comença a xerrar",
+    "Click on the button below to start chatting!": "Feu clic al botó de sota per començar a xerrar!",
+    "Start Chatting": "Comenceu a xatejar",
+    "Confirm Removal": "Confirmeu l'eliminació",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Esteu segur que voleu eliminar (suprimir) aquest esdeveniment? Tingueu en compte que si suprimiu un nom sala o si feu un canvi de tema, desfaria el canvi.",
+    "This room is not showing flair for any communities": "Aquesta sala no mostra talent per a cap comunitat",
+    "Flair": "Talents",
+    "Showing flair for these communities:": "Mostra els talents d'aquestes comunitats:",
+    "Flair will appear if enabled in room settings": "Els talents es mostraran si són activats a la configuració de la sala",
+    "Flair will not appear": "Els talents no es mostraran",
+    "Display your community flair in rooms configured to show it.": "Mostra els talents de la vostra comunitat dins les sales configurades per a mostrar-los.",
+    "This Home Server would like to make sure you are not a robot": "Aquest servidor amfitrió es vol assegurar que no sou un robot",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s han entrat %(count)s vegades",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s ha entrat %(count)s vegades",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s han sortit %(count)s vegades",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s ha sortit %(count)s vegades",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Les ID de les comunitats només poden contendre caràcters a-z, 0-9, o '=_-./'",
+    "Community IDs cannot not be empty.": "Les ID de les comunitats no poden estar buides.",
+    "Something went wrong whilst creating your community": "S'ha produït un error al crear la vostra comunitat",
+    "Create Community": "Crea una comunitat",
+    "Community Name": "Nom de la comunitat",
+    "Example": "Exemple",
+    "Community ID": "ID de la comunitat",
+    "example": "exemple",
+    "Create": "Crea",
+    "Create Room": "Crea una sala",
+    "Room name (optional)": "Nom de la sala (opcional)",
+    "Advanced options": "Opcions avançades",
+    "This setting cannot be changed later!": "Aquests paràmetres no es poden canviar després!",
+    "Unknown error": "S'ha produït un error desconegut",
+    "Incorrect password": "Contrasenya incorrecta",
+    "Deactivate Account": "Desactivar el compte",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Això farà que el vostre compte no es pugui utilitzar mai més. No podreu tornar a registrar la mateixa identificació d'usuari.",
+    "This action is irreversible.": "Aquesta acció és irreversible.",
+    "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:": "Per verificar que es pot confiar en aquest dispositiu, poseu-vos en contacte amb el propietari mitjançant altres mitjans (per exemple, en persona o amb una trucada telefònica) i pregunteu-li si la clau que veuen a la configuració del seu usuari, aquest dispositiu coincideix amb la següent clau:",
+    "Device name": "Nom del dispositiu",
+    "Device key": "Clau del dispositiu",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si coincideix, premeu el botó de verificació de sota. Si no coincideix, algú més està interceptant aquest dispositiu i probablement voleu prémer el botó de llista negra.",
+    "In future this verification process will be more sophisticated.": "En un futur, aquest procés de verificació serà més sofisticat.",
+    "Verify device": "Verifica el dispositiu",
+    "I verify that the keys match": "Verifico que les claus coincideixen",
+    "An error has occurred.": "S'ha produït un error.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Heu afegit el nou dispositiu '%(displayName)s', que està demanant les claus d'encriptació.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "El dispositiu no verificat '%(displayName)s' està demanat les claus d'encriptació.",
+    "Start verification": "Inicia la verificació",
+    "Share without verifying": "Comparteix sense verificar",
+    "Ignore request": "Ignora la sol·licitud",
+    "Loading device info...": "S'està carregant la informació del dispositiu...",
+    "Encryption key request": "Sol·licitud de claus",
+    "Otherwise, <a>click here</a> to send a bug report.": "D'una altra manera, <a>click here</a> per a enviar un informe d'error.",
+    "Unable to restore session": "No s'ha pogut restaurar la sessió",
+    "Continue anyway": "Continua de totes maneres",
+    "Invalid Email Address": "El correu electrònic no és vàlid",
+    "This doesn't appear to be a valid email address": "Aquest no sembla ser un correu electrònic vàlid",
+    "Verification Pending": "Verificació pendent",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Reviseu el vostre correu electrònic i feu clic a l'enllaç que conté. Un cop fet això, feu clic a Continua.",
+    "Unable to add email address": "No s'ha pogut afegir el correu electrònic",
+    "Unable to verify email address.": "No s'ha pogut verificar el correu electrònic.",
+    "This will allow you to reset your password and receive notifications.": "Això us permetrà restablir la vostra contrasenya i rebre notificacions.",
+    "Skip": "Omet",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Els noms d'usuari només poden contenir lletres, números, punts, guionets i guionets baixos.",
+    "Username not available": "Aquest nom d'usuari no està disponible",
+    "Username invalid: %(errMessage)s": "El nom d'usuari és invàlid: %(errMessage)s",
+    "An error occurred: %(error_string)s": "S'ha produït un error: %(error_string)s",
+    "Username available": "Aquest nom d'usuari està disponible",
+    "To get started, please pick a username!": "Per començar, seleccioneu un nom d'usuari!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Aquest serà el nom del seu compte al <span></span> servidor amfitrió, o bé trieu-ne un altre <a>different server</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Si ja teniu un compte a Matrix, podeu <a>log in</a>.",
+    "Block users on other matrix homeservers from joining this room": "Impedeix als usuaris d'altres servidors de Matrix d'entrar a aquesta sala",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Hem trobat un error en intentar restaurar la vostra sessió anterior. Si continueu, haureu d'iniciar la sessió de nou i  l'historial de xat encriptat serà il·legible.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriorment heu utilitzat un versió de Riot més recent, la vostra sessió podría ser incompatible amb aquesta versió. Tanqueu aquesta finestra i torneu a la versió més recent.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Actualment teniu a la llista negre els dispositius no verificats; per enviar missatges a aquests dispositius, els heu de verificar abans.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Recomanem que dugueu a terme el procès de verificació per a cada dispositiu per tal de confirmar que són del legítim propietari, però podeu enviar el missatge sense verificar-ho si ho preferiu.",
+    "Room contains unknown devices": "Hi ha dispositius desconeguts a la sala",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "A la sala \"%(RoomName)s\" hi ha dispositius que no havíeu vist abans.",
+    "Unknown devices": "Dispositius desconeguts",
+    "Private Chat": "Xat privat",
+    "Public Chat": "Xat públic",
+    "Custom": "Personalitzat",
+    "Name": "Nom",
+    "Topic": "Tema",
+    "Make this room private": "Fes que aquesta sala sigui privada",
+    "Share message history with new users": "Comparteix l'historial dels missatges amb els nous usuaris",
+    "Encrypt room": "Sala encriptada",
+    "You must <a>register</a> to use this functionality": "Heu de <a>register</a> per utilitzar aquesta funcionalitat",
+    "You must join the room to see its files": "Heu d'entrar a la sala per poder-ne veure els fitxers",
+    "There are no visible files in this room": "No hi ha fitxers visibles en aquesta sala",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Aquest és l'HTML per a la pàgina de la vostra comunitat</h1>\n<p>\n    Utilitzeu la descripció llarga per a presentar la comunitat a nous membres,\n    o per afegir-hi <a href=\"foo\">enlaços</a> d'interès. \n</p>\n<p>\n    També podeu utilitzar etiquetes 'img'.\n</p>\n",
+    "Add rooms to the community summary": "Afegiu sales al resum de la comunitat",
+    "Which rooms would you like to add to this summary?": "Quines sales voleu afegir a aquest resum?",
+    "Add to summary": "Afegeix-ho al resum",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "No s'ha pogut afegir al resum de la comunitat %(groupId)s les següents sales:",
+    "Add a Room": "Afegeix una sala",
+    "Failed to remove the room from the summary of %(groupId)s": "No s'ha pogut eliminar la sala del resum de la comunitat %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "La sala '%(roomName)s' no s'ha pogut eliminar del resum.",
+    "Add users to the community summary": "Afegeix usuaris al resum de la comunitat",
+    "Who would you like to add to this summary?": "A qui vol afegir a aquest resum?",
+    "Failed to add the following users to the summary of %(groupId)s:": "No s'ha pogut afegir al resum de la comunitat %(groupId)s, els següents usuaris:",
+    "Add a User": "Afegeix un usuari",
+    "Failed to remove a user from the summary of %(groupId)s": "No s'ha pogut eliminar l'usuari del resum de la comunitat %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "L'usuari '%(displayName)s' no s'ha pogut eliminar del resum.",
+    "Failed to upload image": "No s'ha pogut pujar la imatge",
+    "Failed to update community": "No s'ha pogut actualitzar la comunitat",
+    "Unable to accept invite": "No s'ha pogut acceptar la invitació",
+    "Unable to reject invite": "No s'ha pogut rebutjar la invitació",
+    "Leave Community": "Abandona la comunitat",
+    "Leave %(groupName)s?": "Voleu sortir de la comunitat %(groupName)s?",
+    "Leave": "Surt",
+    "Unable to leave room": "No s'ha pogut sortir de la sala",
+    "Community Settings": "Paràmetres de la comunitat",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Aquestes sales es mostren a la pàgina de la comunitat als seus membres i poden entrar-hi fent clic sobre elles.",
+    "Featured Rooms:": "Sales destacades:",
+    "Featured Users:": "Usuaris destacats:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s vos convida a unir-vos a aquesta comunitat",
+    "You are an administrator of this community": "Sou un administrador d'aquesta comunitat",
+    "You are a member of this community": "Sou un membre d'aquesta comunitat",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Esteu a punt de ser portat a un lloc de tercers perquè pugui autenticar-se amb el vostre compte per utilitzar-lo amb %(integrationsUrl)s. Voleu continuar?",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "La vostra comunitat no té una descripció llarga, una pàgina HTML per mostrar als membres de la comunitat. <br />Feu clic aquí per obrir la configuració i donar-ne una!",
+    "Long Description (HTML)": "Descripció llarga (HTML)",
+    "Description": "Descripció",
+    "Community %(groupId)s not found": "No s'ha pogut trobar la comunitat %(groupId)s",
+    "This Home server does not support communities": "Aquest servidor amfitrió no admet comunitats",
+    "Failed to load %(groupId)s": "No s'ha pogut carregar la comunitat %(groupId)s",
+    "Reject invitation": "Rebutja la invitació",
+    "Are you sure you want to reject the invitation?": "Esteu segur que voleu rebutjar la invitació?",
+    "Failed to reject invitation": "No s'ha pogut rebutjar la invitació",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Esteu segur que voleu sortir de la sala '%(roomName)s'?",
+    "Failed to leave room": "No s'ha pogut sortir de la sala",
+    "For security, this session has been signed out. Please sign in again.": "Per seguretat, aquesta sessió s'ha tancat. Torna a iniciar la sessió.",
+    "Cryptography data migrated": "S'han migrat les dades criptogràfiques",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "S'ha realitzat una migració puntual de les dades criptogràfiques. L'encriptació d'extrem a extrem no funcionarà si torneu a una versió anterior de Riot. Si necessiteu utilitzar l'encriptació d'extrem a extrem en una versió anterior, primer sortiu de Riot. Per poder llegir l'historial dels missatges encriptats, exporteu i torneu a importar les vostres claus.",
+    "Old cryptography data detected": "S'han detectat dades de criptografia antigues",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "S'han detectat dades d'una versió antiga de Riot. Això pot provocar que l'encriptació d'extrem a extrem no funcioni correctament a la versió anterior. Els missatges encriptats d'extrem a extrem que s'han intercanviat recentment mentre s'utilitzava la versió anterior no es poden desencriptar en aquesta versió. També pot provocar que els missatges intercanviats amb aquesta versió fallin. Si teniu problemes, tanqueu-lo i torneu-ho a engegar. Per poder llegir l'historial dels missatges encriptats, exporteu i torneu a importar les vostres claus.",
+    "Logout": "Surt",
+    "Your Communities": "Les teves comunitats",
+    "Error whilst fetching joined communities": "S'ha produït un error en buscar comunitats unides",
+    "Create a new community": "Crea una nova comunitat",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunitat per agrupar usuaris i sales! Creeu una pàgina d'inici personalitzada per definir el vostre espai a l'univers Matrix.",
+    "Join an existing community": "Uneix-te a una comunitat existent",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Per unir-se a una comunitat existent, haureu de conèixer l'identificador de la comunitat; això es veurà com <i>+exemple:matrix.org</i>.",
+    "You have no visible notifications": "No teniu cap notificació visible",
+    "Scroll to bottom of page": "Desplaça't fins a la part inferior de la pàgina",
+    "Message not sent due to unknown devices being present": "El missatge no s'ha enviat perquè hi ha dispositius desconeguts presents",
+    "%(count)s of your messages have not been sent.|other": "Alguns dels vostres missatges no s'han enviat.",
+    "%(count)s of your messages have not been sent.|one": "El vostre missatge no s'ha enviat.",
+    "Warning": "Avís",
+    "Connectivity to the server has been lost.": "S'ha perdut la connectivitat amb el servidor.",
+    "Sent messages will be stored until your connection has returned.": "Els missatges enviats s'emmagatzemaran fins que la vostra connexió hagi tornat.",
+    "%(count)s new messages|other": "%(count)s nous missatges",
+    "%(count)s new messages|one": "%(count)s nou missatge",
+    "Active call": "Trucada activa",
+    "You seem to be uploading files, are you sure you want to quit?": "Sembla que s'està pujant fitxers, esteu segur que voleu sortir?",
+    "You seem to be in a call, are you sure you want to quit?": "Sembla que està en una trucada, estàs segur que vols sortir?",
+    "Failed to upload file": "No s'ha pogut pujar el fitxer",
+    "Server may be unavailable, overloaded, or the file too big": "El servidor pot estar no disponible, sobrecarregat o el fitxer és massa gran",
+    "Search failed": "No s'ha pogut cercar",
+    "Server may be unavailable, overloaded, or search timed out :(": "Pot ser que el servidor no estigui disponible, que estigui sobrecarregat o que s'ha esgotat el temps de cerca :(",
+    "No more results": "No hi ha més resultats",
+    "Unknown room %(roomId)s": "La sala %(roomId)s és desconeguda",
+    "Room": "Sala",
+    "Failed to save settings": "No s'ha pogut desar la configuració",
+    "Failed to reject invite": "No s'ha pogut rebutjar la invitació",
+    "Fill screen": "Emplena la pantalla",
+    "Click to unmute video": "Feu clic per activar el so de vídeo",
+    "Click to mute video": "Feu clic per desactivar el so de vídeo",
+    "Click to unmute audio": "Feu clic per activar el so",
+    "Click to mute audio": "Feu clic per desactivar el so",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "S'ha intentat carregar un punt específic dins la línia de temps d'aquesta sala, però no teniu permís per veure el missatge en qüestió.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "S'ha intentat carregar un punt específic de la línia de temps d'aquesta sala, però no s'ha pogut trobar.",
+    "Failed to load timeline position": "No s'ha pogut carregar aquesta posició de la línia de temps",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostra els dispositius</showDevicesText>, <sendAnywayText>envia de totes maneres</sendAnywayText> o <cancelText>cancel·la</cancelText>."
 }

From 38de8a129bdf5359714f5721ebcfa38195cdcda4 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 25 Jan 2018 21:45:15 +0100
Subject: [PATCH 406/927] Add transaction capability to asyncActions

for relating pending/success/failure actions. Particularly useful for mapping
a failure to a pending action to roll back any optimistic updates.
---
 src/actions/actionCreators.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/actions/actionCreators.js b/src/actions/actionCreators.js
index 0238eee8c0..697930414c 100644
--- a/src/actions/actionCreators.js
+++ b/src/actions/actionCreators.js
@@ -31,18 +31,30 @@ limitations under the License.
  *                         `${id}.pending` and either
  *                         `${id}.success` or
  *                         `${id}.failure`.
+ *
+ *                     The shape of each are:
+ *                     { action: '${id}.pending', request, asyncId }
+ *                     { action: '${id}.success', result, asyncId }
+ *                     { action: '${id}.failure', err, asyncId }
+ *
+ *                     where `request` is returned by `pendingFn`, result
+ *                     is the result of the promise returned by `fn` and
+ *                     `asyncId` is a unique ID for each dispatch of the
+ *                     asynchronous action.
  */
 export function asyncAction(id, fn, pendingFn) {
     return (dispatch) => {
+        const asyncId = Math.random().toString(16).slice(2, 10);
         dispatch({
             action: id + '.pending',
             request:
                 typeof pendingFn === 'function' ? pendingFn() : undefined,
+            asyncId,
         });
         fn().then((result) => {
-            dispatch({action: id + '.success', result});
+            dispatch({action: id + '.success', result, asyncId});
         }).catch((err) => {
-            dispatch({action: id + '.failure', err});
+            dispatch({action: id + '.failure', err, asyncId});
         });
     };
 }

From 815f52587bd532bb916113fe205b3bbf2df6140b Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 25 Jan 2018 21:53:34 +0100
Subject: [PATCH 407/927] Move TagPanel out of LoggedInView

(...and into LeftPanel in riot-web. Can we merge the projects yet?)
---
 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 e97d9dd0a1..d7fe699156 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -208,7 +208,6 @@ const LoggedInView = React.createClass({
     },
 
     render: function() {
-        const TagPanel = sdk.getComponent('structures.TagPanel');
         const LeftPanel = sdk.getComponent('structures.LeftPanel');
         const RightPanel = sdk.getComponent('structures.RightPanel');
         const RoomView = sdk.getComponent('structures.RoomView');
@@ -330,7 +329,6 @@ const LoggedInView = React.createClass({
             <div className='mx_MatrixChat_wrapper'>
                 { topBar }
                 <div className={bodyClasses}>
-                    { SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> }
                     <LeftPanel
                         collapsed={this.props.collapseLhs || false}
                         disabled={this.props.leftDisabled}

From d0e3319bd9ea717c82592c2e8e1d55c484cc5fe8 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 25 Jan 2018 21:58:35 +0100
Subject: [PATCH 408/927] Remove DragDropContext from TagPanel and RoomList

So that we can have one context that can handle DND between
the TagPanel and RoomList.
---
 src/components/structures/TagPanel.js  |  53 ++---
 src/components/views/rooms/RoomList.js | 304 ++++++++-----------------
 2 files changed, 118 insertions(+), 239 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 1cd3f04f9d..8c790edc03 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -20,12 +20,11 @@ import { MatrixClient } from 'matrix-js-sdk';
 import TagOrderStore from '../../stores/TagOrderStore';
 
 import GroupActions from '../../actions/GroupActions';
-import TagOrderActions from '../../actions/TagOrderActions';
 
 import sdk from '../../index';
 import dis from '../../dispatcher';
 
-import { DragDropContext, Droppable } from 'react-beautiful-dnd';
+import { Droppable } from 'react-beautiful-dnd';
 
 const TagPanel = React.createClass({
     displayName: 'TagPanel',
@@ -82,22 +81,6 @@ const TagPanel = React.createClass({
         dis.dispatch({action: 'view_create_group'});
     },
 
-    onTagTileEndDrag(result) {
-        // Dragged to an invalid destination, not onto a droppable
-        if (!result.destination) {
-            return;
-        }
-
-        // Dispatch synchronously so that the TagPanel receives an
-        // optimistic update from TagOrderStore before the previous
-        // state is shown.
-        dis.dispatch(TagOrderActions.moveTag(
-            this.context.matrixClient,
-            result.draggableId,
-            result.destination.index,
-        ), true);
-    },
-
     render() {
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const TintableSvg = sdk.getComponent('elements.TintableSvg');
@@ -112,24 +95,22 @@ const TagPanel = React.createClass({
             />;
         });
         return <div className="mx_TagPanel">
-            <DragDropContext onDragEnd={this.onTagTileEndDrag}>
-                <Droppable droppableId="tag-panel-droppable">
-                    { (provided, snapshot) => (
-                        <div
-                            className="mx_TagPanel_tagTileContainer"
-                            ref={provided.innerRef}
-                            // react-beautiful-dnd has a bug that emits a click to the parent
-                            // of draggables upon dropping
-                            //   https://github.com/atlassian/react-beautiful-dnd/issues/273
-                            // so we use onMouseDown here as a workaround.
-                            onMouseDown={this.onClick}
-                        >
-                            { tags }
-                            { provided.placeholder }
-                        </div>
-                    ) }
-                </Droppable>
-            </DragDropContext>
+            <Droppable droppableId="tag-panel-droppable">
+                { (provided, snapshot) => (
+                    <div
+                        className="mx_TagPanel_tagTileContainer"
+                        ref={provided.innerRef}
+                        // react-beautiful-dnd has a bug that emits a click to the parent
+                        // of draggables upon dropping
+                        //   https://github.com/atlassian/react-beautiful-dnd/issues/273
+                        // so we use onMouseDown here as a workaround.
+                        onMouseDown={this.onClick}
+                    >
+                        { tags }
+                        { provided.placeholder }
+                    </div>
+                ) }
+            </Droppable>
             <AccessibleButton className="mx_TagPanel_createGroupButton" onClick={this.onCreateGroupClick}>
                 <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
             </AccessibleButton>
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ca1fccd1f5..d1ef6c2f2c 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -18,7 +18,6 @@ limitations under the License.
 'use strict';
 const React = require("react");
 const ReactDOM = require("react-dom");
-import { DragDropContext } from 'react-beautiful-dnd';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 const GeminiScrollbar = require('react-gemini-scrollbar');
@@ -33,8 +32,6 @@ const Receipt = require('../../../utils/Receipt');
 import TagOrderStore from '../../../stores/TagOrderStore';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
 
-import Modal from '../../../Modal';
-
 const HIDE_CONFERENCE_CHANS = true;
 
 function phraseForSection(section) {
@@ -278,103 +275,6 @@ module.exports = React.createClass({
         this.forceUpdate();
     },
 
-    onRoomTileEndDrag: function(result) {
-        if (!result.destination) return;
-
-        let newTag = result.destination.droppableId.split('_')[1];
-        let prevTag = result.source.droppableId.split('_')[1];
-        if (newTag === 'undefined') newTag = undefined;
-        if (prevTag === 'undefined') prevTag = undefined;
-
-        const roomId = result.draggableId.split('_')[1];
-        const room = MatrixClientPeg.get().getRoom(roomId);
-
-        const newIndex = result.destination.index;
-
-        // Evil hack to get DMs behaving
-        if ((prevTag === undefined && newTag === 'im.vector.fake.direct') ||
-            (prevTag === 'im.vector.fake.direct' && newTag === undefined)
-        ) {
-            Rooms.guessAndSetDMRoom(
-                room, newTag === 'im.vector.fake.direct',
-            ).catch((err) => {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to set direct chat tag " + err);
-                Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
-                    title: _t('Failed to set direct chat tag'),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-            });
-            return;
-        }
-
-        const hasChangedSubLists = result.source.droppableId !== result.destination.droppableId;
-
-        let newOrder = null;
-
-        // Is the tag ordered manually?
-        if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-            const newList = Object.assign({}, this.state.lists[newTag]);
-
-            // If the room was moved "down" (increasing index) in the same list we
-            // need to use the orders of the tiles with indices shifted by +1
-            const offset = (
-                newTag === prevTag && result.source.index < result.destination.index
-            ) ? 1 : 0;
-
-            const prevOrder = newIndex === 0 ?
-                0 : newList[offset + newIndex - 1].tags[newTag].order;
-            const nextOrder = newIndex === newList.length ?
-                1 : newList[offset + newIndex].tags[newTag].order;
-
-            newOrder = {
-                order: (prevOrder + nextOrder) / 2.0,
-            };
-        }
-
-        // More evilness: We will still be dealing with moving to favourites/low prio,
-        // but we avoid ever doing a request with 'im.vector.fake.direct`.
-        //
-        // if we moved lists, remove the old tag
-        if (prevTag && prevTag !== 'im.vector.fake.direct' &&
-            hasChangedSubLists
-        ) {
-            // Optimistic update of what will happen to the room tags
-            delete room.tags[prevTag];
-
-            MatrixClientPeg.get().deleteRoomTag(roomId, prevTag).catch(function(err) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to remove tag " + prevTag + " from room: " + err);
-                Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
-                    title: _t('Failed to remove tag %(tagName)s from room', {tagName: prevTag}),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-            });
-        }
-
-        // if we moved lists or the ordering changed, add the new tag
-        if (newTag && newTag !== 'im.vector.fake.direct' &&
-            (hasChangedSubLists || newOrder)
-        ) {
-            // Optimistic update of what will happen to the room tags
-            room.tags[newTag] = newOrder;
-
-            MatrixClientPeg.get().setRoomTag(roomId, newTag, newOrder).catch(function(err) {
-                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to add tag " + newTag + " to room: " + err);
-                Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
-                    title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
-                    description: ((err && err.message) ? err.message : _t('Operation failed')),
-                });
-            });
-        }
-
-        // Refresh to display the optimistic updates - this needs to be done in the
-        // same tick as the drag finishing otherwise the room will pop back to its
-        // previous position - hence no delayed refresh
-        this.refreshRoomList();
-    },
-
     _delayedRefreshRoomList: new rate_limited_func(function() {
         this.refreshRoomList();
     }, 500),
@@ -749,116 +649,114 @@ module.exports = React.createClass({
 
         const self = this;
         return (
-            <DragDropContext onDragEnd={this.onRoomTileEndDrag}>
-                <GeminiScrollbar className="mx_RoomList_scrollbar"
-                     autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
-                <div className="mx_RoomList">
-                    <RoomSubList list={[]}
-                                 extraTiles={this._makeGroupInviteTiles()}
-                                 label={_t('Community Invites')}
-                                 editable={false}
-                                 order="recent"
-                                 isInvite={true}
-                                 collapsed={self.props.collapsed}
-                                 searchFilter={self.props.searchFilter}
-                                 onHeaderClick={self.onSubListHeaderClick}
-                                 onShowMoreRooms={self.onShowMoreRooms}
-                    />
+            <GeminiScrollbar className="mx_RoomList_scrollbar"
+                 autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
+            <div className="mx_RoomList">
+                <RoomSubList list={[]}
+                             extraTiles={this._makeGroupInviteTiles()}
+                             label={_t('Community Invites')}
+                             editable={false}
+                             order="recent"
+                             isInvite={true}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms}
+                />
 
-                    <RoomSubList list={self.state.lists['im.vector.fake.invite']}
-                                 label={_t('Invites')}
-                                 editable={false}
-                                 order="recent"
-                                 isInvite={true}
-                                 incomingCall={self.state.incomingCall}
-                                 collapsed={self.props.collapsed}
-                                 searchFilter={self.props.searchFilter}
-                                 onHeaderClick={self.onSubListHeaderClick}
-                                 onShowMoreRooms={self.onShowMoreRooms}
-                    />
+                <RoomSubList list={self.state.lists['im.vector.fake.invite']}
+                             label={_t('Invites')}
+                             editable={false}
+                             order="recent"
+                             isInvite={true}
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms}
+                />
 
-                    <RoomSubList list={self.state.lists['m.favourite']}
-                                 label={_t('Favourites')}
-                                 tagName="m.favourite"
-                                 emptyContent={this._getEmptyContent('m.favourite')}
-                                 editable={true}
-                                 order="manual"
-                                 incomingCall={self.state.incomingCall}
-                                 collapsed={self.props.collapsed}
-                                 searchFilter={self.props.searchFilter}
-                                 onHeaderClick={self.onSubListHeaderClick}
-                                 onShowMoreRooms={self.onShowMoreRooms} />
+                <RoomSubList list={self.state.lists['m.favourite']}
+                             label={_t('Favourites')}
+                             tagName="m.favourite"
+                             emptyContent={this._getEmptyContent('m.favourite')}
+                             editable={true}
+                             order="manual"
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
-                    <RoomSubList list={self.state.lists['im.vector.fake.direct']}
-                                 label={_t('People')}
-                                 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}
-                                 collapsed={self.props.collapsed}
-                                 alwaysShowHeader={true}
-                                 searchFilter={self.props.searchFilter}
-                                 onHeaderClick={self.onSubListHeaderClick}
-                                 onShowMoreRooms={self.onShowMoreRooms} />
+                <RoomSubList list={self.state.lists['im.vector.fake.direct']}
+                             label={_t('People')}
+                             tagName="im.vector.fake.direct"
+                             emptyContent={this._getEmptyContent('im.vector.fake.direct')}
+                             headerItems={this._getHeaderItems('im.vector.fake.direct')}
+                             editable={true}
+                             order="recent"
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             alwaysShowHeader={true}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
-                    <RoomSubList list={self.state.lists['im.vector.fake.recent']}
-                                 label={_t('Rooms')}
-                                 editable={true}
-                                 emptyContent={this._getEmptyContent('im.vector.fake.recent')}
-                                 headerItems={this._getHeaderItems('im.vector.fake.recent')}
-                                 order="recent"
-                                 incomingCall={self.state.incomingCall}
-                                 collapsed={self.props.collapsed}
-                                 searchFilter={self.props.searchFilter}
-                                 onHeaderClick={self.onSubListHeaderClick}
-                                 onShowMoreRooms={self.onShowMoreRooms} />
+                <RoomSubList list={self.state.lists['im.vector.fake.recent']}
+                             label={_t('Rooms')}
+                             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}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
-                    { Object.keys(self.state.lists).map((tagName) => {
-                        if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-                            return <RoomSubList list={self.state.lists[tagName]}
-                                 key={tagName}
-                                 label={tagName}
-                                 tagName={tagName}
-                                 emptyContent={this._getEmptyContent(tagName)}
-                                 editable={true}
-                                 order="manual"
-                                 incomingCall={self.state.incomingCall}
-                                 collapsed={self.props.collapsed}
-                                 searchFilter={self.props.searchFilter}
-                                 onHeaderClick={self.onSubListHeaderClick}
-                                 onShowMoreRooms={self.onShowMoreRooms} />;
-                        }
-                    }) }
+                { Object.keys(self.state.lists).map((tagName) => {
+                    if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+                        return <RoomSubList list={self.state.lists[tagName]}
+                             key={tagName}
+                             label={tagName}
+                             tagName={tagName}
+                             emptyContent={this._getEmptyContent(tagName)}
+                             editable={true}
+                             order="manual"
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />;
+                    }
+                }) }
 
-                    <RoomSubList list={self.state.lists['m.lowpriority']}
-                                 label={_t('Low priority')}
-                                 tagName="m.lowpriority"
-                                 emptyContent={this._getEmptyContent('m.lowpriority')}
-                                 editable={true}
-                                 order="recent"
-                                 incomingCall={self.state.incomingCall}
-                                 collapsed={self.props.collapsed}
-                                 searchFilter={self.props.searchFilter}
-                                 onHeaderClick={self.onSubListHeaderClick}
-                                 onShowMoreRooms={self.onShowMoreRooms} />
+                <RoomSubList list={self.state.lists['m.lowpriority']}
+                             label={_t('Low priority')}
+                             tagName="m.lowpriority"
+                             emptyContent={this._getEmptyContent('m.lowpriority')}
+                             editable={true}
+                             order="recent"
+                             incomingCall={self.state.incomingCall}
+                             collapsed={self.props.collapsed}
+                             searchFilter={self.props.searchFilter}
+                             onHeaderClick={self.onSubListHeaderClick}
+                             onShowMoreRooms={self.onShowMoreRooms} />
 
-                    <RoomSubList list={self.state.lists['im.vector.fake.archived']}
-                                 label={_t('Historical')}
-                                 editable={false}
-                                 order="recent"
-                                 collapsed={self.props.collapsed}
-                                 alwaysShowHeader={true}
-                                 startAsHidden={true}
-                                 showSpinner={self.state.isLoadingLeftRooms}
-                                 onHeaderClick= {self.onArchivedHeaderClick}
-                                 incomingCall={self.state.incomingCall}
-                                 searchFilter={self.props.searchFilter}
-                                 onShowMoreRooms={self.onShowMoreRooms} />
-                </div>
-                </GeminiScrollbar>
-            </DragDropContext>
+                <RoomSubList list={self.state.lists['im.vector.fake.archived']}
+                             label={_t('Historical')}
+                             editable={false}
+                             order="recent"
+                             collapsed={self.props.collapsed}
+                             alwaysShowHeader={true}
+                             startAsHidden={true}
+                             showSpinner={self.state.isLoadingLeftRooms}
+                             onHeaderClick= {self.onArchivedHeaderClick}
+                             incomingCall={self.state.incomingCall}
+                             searchFilter={self.props.searchFilter}
+                             onShowMoreRooms={self.onShowMoreRooms} />
+            </div>
+            </GeminiScrollbar>
         );
     },
 });

From 701abb6a219cb278dc992c4761ef58d366e29743 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 25 Jan 2018 22:16:03 +0100
Subject: [PATCH 409/927] Move management of room lists to RoomListStore

this is part maintenance to make RoomList clearer and part
allowing room list state to be modified via a dispatch.
---
 src/actions/MatrixActionCreators.js    |   5 +
 src/actions/RoomListActions.js         | 142 +++++++++++++++++
 src/components/views/rooms/RoomList.js |  91 +++--------
 src/stores/RoomListStore.js            | 212 +++++++++++++++++++++++++
 4 files changed, 383 insertions(+), 67 deletions(-)
 create mode 100644 src/actions/RoomListActions.js
 create mode 100644 src/stores/RoomListStore.js

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 33bdb53799..d9309d7c1c 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -62,6 +62,10 @@ function createAccountDataAction(matrixClient, accountDataEvent) {
     };
 }
 
+function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
+    return { action: 'MatrixActions.Room.tags', room };
+}
+
 /**
  * This object is responsible for dispatching actions when certain events are emitted by
  * the given MatrixClient.
@@ -78,6 +82,7 @@ export default {
     start(matrixClient) {
         this._addMatrixClientListener(matrixClient, 'sync', createSyncAction);
         this._addMatrixClientListener(matrixClient, 'accountData', createAccountDataAction);
+        this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
     },
 
     /**
diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
new file mode 100644
index 0000000000..3e0ea53a33
--- /dev/null
+++ b/src/actions/RoomListActions.js
@@ -0,0 +1,142 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import { asyncAction } from './actionCreators';
+import RoomListStore from '../stores/RoomListStore';
+
+import Modal from '../Modal';
+import Rooms from '../Rooms';
+import { _t } from '../languageHandler';
+import sdk from '../index';
+
+const RoomListActions = {};
+
+/**
+ * Creates an action thunk that will do an asynchronous request to
+ * tag room.
+ *
+ * @param {MatrixClient} matrixClient the matrix client to set the
+ *                                    account data on.
+ * @param {Room} room the room to tag.
+ * @param {string} oldTag the tag to remove (unless oldTag ==== newTag)
+ * @param {string} newTag the tag with which to tag the room.
+ * @param {?number} oldIndex the previous position of the room in the
+ *                           list of rooms.
+ * @param {?number} newIndex the new position of the room in the list
+ *                           of rooms.
+ * @returns {function} an action thunk.
+ * @see asyncAction
+ */
+RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex, newIndex) {
+    let metaData = null;
+
+    // Is the tag ordered manually?
+    if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+        const lists = RoomListStore.getRoomLists();
+        const newList = [...lists[newTag]];
+
+        newList.sort((a, b) => a.tags[newTag].order - b.tags[newTag].order);
+
+        // If the room was moved "down" (increasing index) in the same list we
+        // need to use the orders of the tiles with indices shifted by +1
+        const offset = (
+            newTag === oldTag && oldIndex < newIndex
+        ) ? 1 : 0;
+
+        const prevOrder = newIndex === 0 ?
+            0 : newList[offset + newIndex - 1].tags[newTag].order;
+        const nextOrder = newIndex === newList.length ?
+            1 : newList[offset + newIndex].tags[newTag].order;
+
+        metaData = {
+            order: (prevOrder + nextOrder) / 2.0,
+        };
+    }
+
+    return asyncAction('RoomListActions.tagRoom', () => {
+        const promises = [];
+        const roomId = room.roomId;
+
+        // Evil hack to get DMs behaving
+        if ((oldTag === undefined && newTag === 'im.vector.fake.direct') ||
+            (oldTag === 'im.vector.fake.direct' && newTag === undefined)
+        ) {
+            return Rooms.guessAndSetDMRoom(
+                room, newTag === 'im.vector.fake.direct',
+            ).catch((err) => {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                console.error("Failed to set direct chat tag " + err);
+                Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
+                    title: _t('Failed to set direct chat tag'),
+                    description: ((err && err.message) ? err.message : _t('Operation failed')),
+                });
+            });
+        }
+
+        const hasChangedSubLists = oldTag !== newTag;
+
+        // More evilness: We will still be dealing with moving to favourites/low prio,
+        // but we avoid ever doing a request with 'im.vector.fake.direct`.
+        //
+        // if we moved lists, remove the old tag
+        if (oldTag && oldTag !== 'im.vector.fake.direct' &&
+            hasChangedSubLists
+        ) {
+            const promiseToDelete = matrixClient.deleteRoomTag(
+                roomId, oldTag,
+            ).catch(function(err) {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                console.error("Failed to remove tag " + oldTag + " from room: " + err);
+                Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
+                    title: _t('Failed to remove tag %(tagName)s from room', {tagName: oldTag}),
+                    description: ((err && err.message) ? err.message : _t('Operation failed')),
+                });
+            });
+
+            promises.push(promiseToDelete);
+        }
+
+        // if we moved lists or the ordering changed, add the new tag
+        if (newTag && newTag !== 'im.vector.fake.direct' &&
+            (hasChangedSubLists || metaData)
+        ) {
+            // Optimistic update of what will happen to the room tags
+            room.tags[newTag] = metaData;
+
+            const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function(err) {
+                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                console.error("Failed to add tag " + newTag + " to room: " + err);
+                Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
+                    title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
+                    description: ((err && err.message) ? err.message : _t('Operation failed')),
+                });
+
+                throw err;
+            });
+
+            promises.push(promiseToAdd);
+        }
+
+        return Promise.all(promises);
+    }, () => {
+        // For an optimistic update
+        return {
+            room, oldTag, newTag, metaData,
+        };
+    });
+};
+
+export default RoomListActions;
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index d1ef6c2f2c..ad85beac12 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -26,10 +26,11 @@ const CallHandler = require('../../../CallHandler');
 const dis = require("../../../dispatcher");
 const sdk = require('../../../index');
 const rate_limited_func = require('../../../ratelimitedfunc');
-const Rooms = require('../../../Rooms');
+import * as Rooms from '../../../Rooms';
 import DMRoomMap from '../../../utils/DMRoomMap';
 const Receipt = require('../../../utils/Receipt');
 import TagOrderStore from '../../../stores/TagOrderStore';
+import RoomListStore from '../../../stores/RoomListStore';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
 
 const HIDE_CONFERENCE_CHANS = true;
@@ -77,7 +78,6 @@ module.exports = React.createClass({
         cli.on("deleteRoom", this.onDeleteRoom);
         cli.on("Room.timeline", this.onRoomTimeline);
         cli.on("Room.name", this.onRoomName);
-        cli.on("Room.tags", this.onRoomTags);
         cli.on("Room.receipt", this.onRoomReceipt);
         cli.on("RoomState.events", this.onRoomStateEvents);
         cli.on("RoomMember.name", this.onRoomMemberName);
@@ -115,6 +115,10 @@ module.exports = React.createClass({
             this.updateVisibleRooms();
         });
 
+        this._roomListStoreToken = RoomListStore.addListener(() => {
+            this._delayedRefreshRoomList();
+        });
+
         this.refreshRoomList();
 
         // order of the sublists
@@ -175,7 +179,6 @@ module.exports = React.createClass({
             MatrixClientPeg.get().removeListener("deleteRoom", this.onDeleteRoom);
             MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
             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.events", this.onRoomStateEvents);
             MatrixClientPeg.get().removeListener("RoomMember.name", this.onRoomMemberName);
@@ -248,10 +251,6 @@ module.exports = React.createClass({
         this._delayedRefreshRoomList();
     },
 
-    onRoomTags: function(event, room) {
-        this._delayedRefreshRoomList();
-    },
-
     onRoomStateEvents: function(ev, state) {
         this._delayedRefreshRoomList();
     },
@@ -338,7 +337,7 @@ module.exports = React.createClass({
             totalRooms += l.length;
         }
         this.setState({
-            lists: this.getRoomLists(),
+            lists,
             totalRoomCount: totalRooms,
             // Do this here so as to not render every time the selected tags
             // themselves change.
@@ -349,70 +348,28 @@ module.exports = React.createClass({
     },
 
     getRoomLists: function() {
-        const 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"] = [];
+        const lists = RoomListStore.getRoomLists();
 
-        const dmRoomMap = DMRoomMap.shared();
+        const filteredLists = {};
 
-        this._visibleRooms.forEach((room, index) => {
-            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() +
-            //             ", prevMembership = " + me.events.member.getPrevContent().membership);
-
-            if (me.membership == "invite") {
-                lists["im.vector.fake.invite"].push(room);
-            } else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, this.props.ConferenceHandler)) {
-                // skip past this room & don't put it in any lists
-            } else if (me.membership == "join" || me.membership === "ban" ||
-                     (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
-                // Used to split rooms via tags
-                const tagNames = Object.keys(room.tags);
-                if (tagNames.length) {
-                    for (let i = 0; i < tagNames.length; i++) {
-                        const tagName = tagNames[i];
-                        lists[tagName] = lists[tagName] || [];
-                        lists[tagName].push(room);
-                    }
-                } else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
-                    // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
-                    lists["im.vector.fake.direct"].push(room);
-                } else {
-                    lists["im.vector.fake.recent"].push(room);
+        Object.keys(lists).forEach((tagName) => {
+            filteredLists[tagName] = lists[tagName].filter((taggedRoom) => {
+                // Somewhat impossible, but guard against it anyway
+                if (!taggedRoom) {
+                    return;
                 }
-            } else if (me.membership === "leave") {
-                lists["im.vector.fake.archived"].push(room);
-            } else {
-                console.error("unrecognised membership: " + me.membership + " - this should never happen");
-            }
+                const me = taggedRoom.getMember(MatrixClientPeg.get().credentials.userId);
+                if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(taggedRoom, me, this.props.ConferenceHandler)) {
+                    return;
+                }
+
+                return this._visibleRooms.some((visibleRoom) => {
+                    return visibleRoom.roomId === taggedRoom.roomId;
+                });
+            });
         });
 
-        // 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",
-            "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"
-        ];
-*/
-
-        return lists;
+        return filteredLists;
     },
 
     _getScrollNode: function() {
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
new file mode 100644
index 0000000000..16902ef471
--- /dev/null
+++ b/src/stores/RoomListStore.js
@@ -0,0 +1,212 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import {Store} from 'flux/utils';
+import dis from '../dispatcher';
+import DMRoomMap from '../utils/DMRoomMap';
+
+/**
+ * A class for storing application state for categorising rooms in
+ * the RoomList.
+ */
+class RoomListStore extends Store {
+    constructor() {
+        super(dis);
+
+        this._init();
+        this._actionHistory = [];
+    }
+
+    _init() {
+        // Initialise state
+        this._state = {
+            lists: {
+                "im.vector.fake.invite": [],
+                "m.favourite": [],
+                "im.vector.fake.recent": [],
+                "im.vector.fake.direct": [],
+                "m.lowpriority": [],
+                "im.vector.fake.archived": [],
+            },
+            ready: false,
+        };
+    }
+
+    _setState(newState) {
+        this._state = Object.assign(this._state, newState);
+        console.info(this._state);
+        this.__emitChange();
+    }
+
+    __onDispatch(payload) {
+        switch (payload.action) {
+            // Initialise state after initial sync
+            case 'MatrixActions.sync': {
+                if (!(payload.prevState !== 'PREPARED' && payload.state === 'PREPARED')) {
+                    break;
+                }
+
+                this._generateRoomLists(payload.matrixClient);
+                this._actionHistory.unshift(payload);
+            }
+            break;
+            case 'MatrixActions.Room.tags': {
+                if (!this._state.ready) break;
+                this._updateRoomLists(payload.room);
+                this._actionHistory.unshift(payload);
+            }
+            break;
+            case 'RoomListActions.tagRoom.pending': {
+                this._updateRoomListsOptimistic(
+                    payload.request.room,
+                    payload.request.oldTag,
+                    payload.request.newTag,
+                    payload.request.metaData,
+                );
+                this._actionHistory.unshift(payload);
+            }
+            break;
+            case 'RoomListActions.tagRoom.failure': {
+                this._actionHistory = this._actionHistory.filter((action) => {
+                    return action.asyncId !== payload.asyncId;
+                });
+
+                // don't duplicate history
+                const history = this._actionHistory.slice(0);
+                this._actionHistory = [];
+                this._reloadFromHistory(history);
+            }
+            break;
+            case 'on_logged_out': {
+                // Reset state without pushing an update to the view, which generally assumes that
+                // the matrix client isn't `null` and so causing a re-render will cause NPEs.
+                this._init();
+                this._actionHistory.unshift(payload);
+            }
+            break;
+        }
+    }
+
+    _reloadFromHistory(history) {
+        this._init();
+        history.forEach((action) => this.__onDispatch(action));
+    }
+
+    _updateRoomListsOptimistic(updatedRoom, oldTag, newTag, metaData) {
+        const newLists = {};
+
+        // Remove room from oldTag
+        Object.keys(this._state.lists).forEach((tagName) => {
+            if (tagName === oldTag) {
+                newLists[tagName] = this._state.lists[tagName].filter((room) => {
+                    return room.roomId !== updatedRoom.roomId;
+                });
+            } else {
+                newLists[tagName] = this._state.lists[tagName];
+            }
+        });
+
+        /// XXX: RoomSubList sorts by data on the room object. We
+        /// should sort in advance and incrementally insert new rooms
+        /// instead of resorting every time.
+        if (metaData) {
+            updatedRoom.tags[newTag] = metaData;
+        }
+
+        newLists[newTag].push(updatedRoom);
+
+        this._setState({
+            lists: newLists,
+        });
+    }
+
+    _updateRoomLists(updatedRoom) {
+        const roomTags = Object.keys(updatedRoom.tags);
+
+        const newLists = {};
+
+        // Removal of the updatedRoom from tags it no longer has
+        Object.keys(this._state.lists).forEach((tagName) => {
+            newLists[tagName] = this._state.lists[tagName].filter((room) => {
+                return room.roomId !== updatedRoom.roomId || roomTags.includes(tagName);
+            });
+        });
+
+        roomTags.forEach((tagName) => {
+            if (newLists[tagName].includes(updatedRoom)) return;
+            newLists[tagName].push(updatedRoom);
+        });
+
+        this._setState({
+            lists: newLists,
+        });
+    }
+
+    _generateRoomLists(matrixClient) {
+        const lists = {
+            "im.vector.fake.invite": [],
+            "m.favourite": [],
+            "im.vector.fake.recent": [],
+            "im.vector.fake.direct": [],
+            "m.lowpriority": [],
+            "im.vector.fake.archived": [],
+        };
+
+        const dmRoomMap = DMRoomMap.shared();
+
+        matrixClient.getRooms().forEach((room, index) => {
+            const me = room.getMember(matrixClient.credentials.userId);
+            if (!me) return;
+
+            if (me.membership == "invite") {
+                lists["im.vector.fake.invite"].push(room);
+            } else if (me.membership == "join" || me.membership === "ban" ||
+                     (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
+                // Used to split rooms via tags
+                const tagNames = Object.keys(room.tags);
+                if (tagNames.length) {
+                    for (let i = 0; i < tagNames.length; i++) {
+                        const tagName = tagNames[i];
+                        lists[tagName] = lists[tagName] || [];
+                        lists[tagName].push(room);
+                    }
+                } else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
+                    // "Direct Message" rooms (that we're still in and that aren't otherwise tagged)
+                    lists["im.vector.fake.direct"].push(room);
+                } else {
+                    lists["im.vector.fake.recent"].push(room);
+                }
+            } else if (me.membership === "leave") {
+                lists["im.vector.fake.archived"].push(room);
+            } else {
+                console.error("unrecognised membership: " + me.membership + " - this should never happen");
+            }
+        });
+
+        this._setState({
+            lists,
+            ready: true, // Ready to receive updates via Room.tags events
+        });
+    }
+
+    getRoomLists() {
+        return this._state.lists;
+    }
+}
+
+if (global.singletonRoomListStore === undefined) {
+    global.singletonRoomListStore = new RoomListStore();
+}
+export default global.singletonRoomListStore;

From 73e3a594ac20dece69ff3f9b3aa644153703dca4 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Thu, 25 Jan 2018 22:52:19 +0100
Subject: [PATCH 410/927] Prevent TagTiles from being dragged into other
 droppables

for the time being at least.
---
 src/components/structures/TagPanel.js       | 5 ++++-
 src/components/views/elements/DNDTagTile.js | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 8c790edc03..c843c08ce9 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -95,7 +95,10 @@ const TagPanel = React.createClass({
             />;
         });
         return <div className="mx_TagPanel">
-            <Droppable droppableId="tag-panel-droppable">
+            <Droppable
+                droppableId="tag-panel-droppable"
+                type="draggable-TagTile"
+            >
                 { (provided, snapshot) => (
                     <div
                         className="mx_TagPanel_tagTileContainer"
diff --git a/src/components/views/elements/DNDTagTile.js b/src/components/views/elements/DNDTagTile.js
index e17ea52976..9d8ecc1da6 100644
--- a/src/components/views/elements/DNDTagTile.js
+++ b/src/components/views/elements/DNDTagTile.js
@@ -25,6 +25,7 @@ export default function DNDTagTile(props) {
             key={props.tag}
             draggableId={props.tag}
             index={props.index}
+            type="draggable-TagTile"
         >
             { (provided, snapshot) => (
                 <div>

From 18bf9ef5987f2082a0b78d963449cb199a681c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Thu, 25 Jan 2018 22:23:58 +0000
Subject: [PATCH 411/927] Translated using Weblate (Catalan)

Currently translated at 88.5% (871 of 984 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index b5bca7d912..b28593861f 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -821,5 +821,53 @@
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "S'ha intentat carregar un punt específic dins la línia de temps d'aquesta sala, però no teniu permís per veure el missatge en qüestió.",
     "Tried to load a specific point in this room's timeline, but was unable to find it.": "S'ha intentat carregar un punt específic de la línia de temps d'aquesta sala, però no s'ha pogut trobar.",
     "Failed to load timeline position": "No s'ha pogut carregar aquesta posició de la línia de temps",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostra els dispositius</showDevicesText>, <sendAnywayText>envia de totes maneres</sendAnywayText> o <cancelText>cancel·la</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostra els dispositius</showDevicesText>, <sendAnywayText>envia de totes maneres</sendAnywayText> o <cancelText>cancel·la</cancelText>.",
+    "Signed Out": "Sessió tancada",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar tot</resendText> o <cancelText>cancel·lar tot</cancelText> ara. També pots seleccionar missatges individualment per reenviar o cancel·lar.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar missarge</resendText> o <cancelText>cancel·lar missatge</cancelText> ara.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "No hi ha ningú més aquí! T'agradaria <inviteText>convidar algú</inviteText> o <nowarnText>no avisar més que la sala està buida</nowarnText>?",
+    "Uploading %(filename)s and %(count)s others|other": "Pujant %(filename)s i %(count)s més",
+    "Uploading %(filename)s and %(count)s others|zero": "Pujant %(filename)s",
+    "Light theme": "Tema clar",
+    "Dark theme": "Tema fosc",
+    "Status.im theme": "Tema d'Status.im",
+    "Sign out": "Tancar sessió",
+    "Remove %(threePid)s?": "Esborrar %(threePid)s?",
+    "Interface Language": "Idioma de l'interfície",
+    "User Interface": "Interfície d'usuari",
+    "Import E2E room keys": "Importar claus E2E de la sala",
+    "Cryptography": "Criptografia",
+    "Device ID:": "ID del dispositiu:",
+    "Device key:": "Clau del dispositiu:",
+    "Ignored Users": "Usuaris ignorats",
+    "Labs": "Laboraroris",
+    "Use with caution": "Utilitzar amb precaució",
+    "Deactivate my account": "Desactivar la meva compte",
+    "Updates": "Actualitzacions",
+    "matrix-react-sdk version:": "Versió de matrix-react-sdk:",
+    "riot-web version:": "Versió de riot-web:",
+    "olm version:": "Versió d'olm:",
+    "Your password has been reset": "La teva contrasenya s'ha reiniciat",
+    "New password": "Nova contrasenya",
+    "Confirm your new password": "Confirma la teva nova contrasenya",
+    "Incorrect username and/or password.": "Usuari i/o contrasenya incorrectes.",
+    "The phone number entered looks invalid": "El número de telèfon introduït sembla erroni",
+    "none": "cap",
+    "Curve25519 identity key": "Clau de la identitat Curve25519",
+    "Claimed Ed25519 fingerprint key": "Empremta digital Ed25519 reclamada",
+    "Session ID": "ID de la sessió",
+    "End-to-end encryption information": "Informació de l'encriptació d'extrem a extrem",
+    "Event information": "Informació d'esdeveniment",
+    "User ID": "ID de l'usuari",
+    "Decryption error": "Error de desencriptació",
+    "Sender device information": "Informació del dispositiu remitent",
+    "Export room keys": "Exporta les claus de la sala",
+    "Upload an avatar:": "Pujar un avatar:",
+    "Confirm passphrase": "Introduïu una contrasenya",
+    "Export": "Exporta",
+    "Import room keys": "Importa les claus de la sala",
+    "Import": "Importa",
+    "The version of Riot.im": "La versió de Riot.im",
+    "Email": "Correu electrònic",
+    "Add email address": "Afegeix correu electrònic"
 }

From 4820a195ab1d75f318030c4313309ab319d23a29 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 26 Jan 2018 09:15:03 +0100
Subject: [PATCH 412/927] Remove logging

---
 src/stores/RoomListStore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 16902ef471..69d957f074 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -46,7 +46,6 @@ class RoomListStore extends Store {
 
     _setState(newState) {
         this._state = Object.assign(this._state, newState);
-        console.info(this._state);
         this.__emitChange();
     }
 

From 6fa217742ffa2df5b5a3c9368e74b77f2df2661c Mon Sep 17 00:00:00 2001
From: d1d4c <d1d4c@aktivix.org>
Date: Fri, 26 Jan 2018 02:45:24 +0000
Subject: [PATCH 413/927] Translated using Weblate (Catalan)

Currently translated at 88.5% (871 of 984 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index b28593861f..15d64cd9e1 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -34,7 +34,7 @@
     "Operation failed": "No s'ha pogut realitzar l'operació",
     "Search": "Cerca",
     "powered by Matrix": "amb tecnologia de Matrix",
-    "Edit": "Editeu",
+    "Edit": "Edita",
     "Unpin Message": "Desenganxa el missatge",
     "Quote": "Cita",
     "Register": "Registre",

From 40907ecf2925a9907d2f4a2e83875537dc438751 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Fri, 26 Jan 2018 19:39:06 +0100
Subject: [PATCH 414/927] Use correct condition for getting account data after
 first sync

so that we can get tags sooner.
---
 src/stores/TagOrderStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index effd8287c7..69b22797fb 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -48,7 +48,7 @@ class TagOrderStore extends Store {
         switch (payload.action) {
             // Initialise state after initial sync
             case 'MatrixActions.sync': {
-                if (!(payload.prevState === 'PREPARED' && payload.state === 'SYNCING')) {
+                if (!(payload.prevState !== 'PREPARED' && payload.state === 'PREPARED')) {
                     break;
                 }
                 const tagOrderingEvent = payload.matrixClient.getAccountData('im.vector.web.tag_ordering');

From 56927b23e675b2a5d984aa6b2fd288dd08a63c3b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 28 Jan 2018 22:12:34 +0000
Subject: [PATCH 415/927] pass onWidgetLoad (which is required for SOME
 EventTileTypes) XXX: they should follow an interface, this is somewhat nasty

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

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 4e0ff2c6d6..1d8df4c7a6 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -602,6 +602,7 @@ module.exports = withMatrixClient(React.createClass({
                                            mxEvent={this.props.mxEvent}
                                            highlights={this.props.highlights}
                                            highlightLink={this.props.highlightLink}
+                                           onWidgetLoad={this.props.onWidgetLoad}
                                            showUrlPreview={false} />
                         </div>
                     </div>

From 5764280588de9071f5a136e5d35e306ed5b71d43 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 Jan 2018 09:08:11 +0000
Subject: [PATCH 416/927] Persist contentState when sending SlashCommand via
 MessageComposerInput

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

diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index 932ccf3446..c142d97b28 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -723,6 +723,7 @@ export default class MessageComposerInput extends React.Component {
         const cmd = SlashCommands.processInput(this.props.room.roomId, commandText);
         if (cmd) {
             if (!cmd.error) {
+                this.historyManager.save(contentState, this.state.isRichtextEnabled ? 'html' : 'markdown');
                 this.setState({
                     editorState: this.createEditorState(),
                 });

From 6dd63ae6444835ae7b50948fa1c5a32eb4e62903 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 Jan 2018 19:17:46 +0000
Subject: [PATCH 417/927] Null guard against falsey (non-null) props.node, to
 make react happy

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

diff --git a/src/components/views/elements/Quote.js b/src/components/views/elements/Quote.js
index 0c0078978d..761f7aa151 100644
--- a/src/components/views/elements/Quote.js
+++ b/src/components/views/elements/Quote.js
@@ -182,6 +182,7 @@ export default class Quote extends React.Component {
         }
 
         // Deliberately render nothing if the URL isn't recognised
-        return this.props.node;
+        // in case we get an undefined/falsey node, replace it with null to make React happy
+        return this.props.node || null;
     }
 }

From c5a3a02e1d8d19ccb1c9b58fdd8ce4a6bc98fa4c Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 30 Jan 2018 10:14:05 +0000
Subject: [PATCH 418/927] Fix order calculation logic when reordering a room

---
 src/components/views/rooms/RoomList.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ca1fccd1f5..0c0f7366eb 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -314,7 +314,7 @@ module.exports = React.createClass({
 
         // Is the tag ordered manually?
         if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
-            const newList = Object.assign({}, this.state.lists[newTag]);
+            const newList = this.state.lists[newTag];
 
             // If the room was moved "down" (increasing index) in the same list we
             // need to use the orders of the tiles with indices shifted by +1
@@ -322,10 +322,13 @@ module.exports = React.createClass({
                 newTag === prevTag && result.source.index < result.destination.index
             ) ? 1 : 0;
 
-            const prevOrder = newIndex === 0 ?
-                0 : newList[offset + newIndex - 1].tags[newTag].order;
-            const nextOrder = newIndex === newList.length ?
-                1 : newList[offset + newIndex].tags[newTag].order;
+            const indexBefore = offset + newIndex - 1;
+            const indexAfter = offset + newIndex;
+
+            const prevOrder = indexBefore < 0 ?
+                0 : newList[indexBefore].tags[newTag].order;
+            const nextOrder = indexAfter >= newList.length ?
+                1 : newList[indexAfter].tags[newTag].order;
 
             newOrder = {
                 order: (prevOrder + nextOrder) / 2.0,

From 819dd93d1fc111fc6ce3593daf801fb96eb26295 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 29 Jan 2018 18:08:49 +0000
Subject: [PATCH 419/927] Translated using Weblate (Basque)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 15c5e43d97..2613ebf4ce 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -63,7 +63,7 @@
     "Ban": "Debekatu",
     "Unban": "Debekua kendu",
     "Connectivity to the server has been lost.": "Zerbitzariarekin konexioa galdu da.",
-    "You do not have permission to post to this room": "Ez duzu gela honetan idazteko baimena",
+    "You do not have permission to post to this room": "Ez duzu gela honetara mezuak bidaltzeko baimenik",
     "Logout": "Amaitu saioa",
     "Filter room members": "Iragazi gelako kideak",
     "Email": "E-mail",
@@ -73,7 +73,7 @@
     "Advanced": "Aurreratua",
     "Cryptography": "Kriptografia",
     "Devices": "Gailuak",
-    "Hide read receipts": "Ezkutatu irakurtze-agiria",
+    "Hide read receipts": "Ezkutatu irakurragiriak",
     "Don't send typing notifications": "Ez bidali idatzi bitarteko jakinarazpenak",
     "Always show message timestamps": "Erakutsi beti mezuen denbora-zigilua",
     "Name": "Izena",
@@ -90,7 +90,7 @@
     "none": "bat ere ez",
     "Who can read history?": "Nork irakurri dezake historiala?",
     "Who can access this room?": "Nor sartu daiteke gelara?",
-    "Anyone": "Edonor",
+    "Anyone": "Edonork",
     "Only people who have been invited": "Gonbidatua izan den jendea besterik ez",
     "Anyone who knows the room's link, apart from guests": "Gelaren esteka dakien edonor, bisitariak ezik",
     "Anyone who knows the room's link, including guests": "Gelaren esteka dakien edonor, bisitariak barne",
@@ -173,7 +173,7 @@
     "Bans user with given id": "Debekatu ID zehatz bat duen erabiltzailea",
     "Call Timeout": "Deiaren denbora-muga",
     "Change Password": "Aldatu pasahitza",
-    "Changes your display nickname": "Zure pantaila izena aldatzen du",
+    "Changes your display nickname": "Zure pantaila-izena aldatzen du",
     "Clear Cache": "Garbitu cachea",
     "<a>Click here</a> to join the discussion!": "<a>Elkartu elkarrizketara</a>!",
     "Click here to fix": "Egin klik hemen konpontzeko",
@@ -209,7 +209,7 @@
     "Device key:": "Gailuaren gakoa:",
     "Direct chats": "Txat zuzenak",
     "Disable Notifications": "Desgaitu jakinarazpenak",
-    "Display name": "Pantaila izena",
+    "Display name": "Pantaila-izena",
     "Displays action": "Ekintza bistaratzen du",
     "Drop File Here": "Jaregin fitxategia hona",
     "%(items)s and %(lastItem)s": "%(items)s eta %(lastItem)s",
@@ -253,7 +253,7 @@
     "Failed to send email": "Huts egin du e-maila bidaltzean",
     "Failed to send request.": "Huts egin du eskaera bidaltzean.",
     "Failed to set avatar.": "Huts egin du abatarra ezartzean.",
-    "Failed to set display name": "Huts egin du pantaila izena ezartzean",
+    "Failed to set display name": "Huts egin du pantaila-izena ezartzean",
     "Failed to set up conference call": "Huts egin du konferentzia deia ezartzean",
     "Failed to toggle moderator status": "Huts egin du moderatzaile rola aldatzean",
     "Failed to unban": "Huts egin du debekua kentzean",
@@ -272,9 +272,9 @@
     "Bulk Options": "Aukera masiboak",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ezin da hasiera zerbitzarira konektatu, egiaztatu zure konexioa, ziurtatu zure <a>hasiera zerbitzariaren SSL ziurtagiria</a> fidagarritzat jotzen duela zure gailuak, eta nabigatzailearen pluginen batek ez dituela eskaerak blokeatzen.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Ezin zara hasiera zerbitzarira HTTP bidez konektatu zure nabigatzailearen barran dagoen URLa HTTS bada. Erabili HTTPS edo <a>gaitu script ez seguruak</a>.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s erabiltzaileak bere pantaila izena aldatu du, %(oldDisplayName)s izatetik %(displayName)s izatera.",
+    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s erabiltzaileak bere pantaila-izena aldatu du, %(oldDisplayName)s izatetik %(displayName)s izatera.",
     "%(senderName)s changed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia aldatu du.",
-    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s erabiltzaileak %(powerLevelDiffText)s erabiltzailearen botere maila aldatu du.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s erabiltzaileak botere mailaz aldatu du %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du, orain %(roomName)s da.",
     "Drop here to tag %(section)s": "Jaregin hona %(section)s atalari etiketa jartzeko",
     "Incoming voice call from %(name)s": "%(name)s erabiltzailearen deia jasotzen",
@@ -354,7 +354,7 @@
     "Rejoin": "Berriro elkartu",
     "Remote addresses for this room:": "Gela honen urruneko helbideak:",
     "Remove Contact Information?": "Kendu kontaktuaren informazioa?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s erabiltzaileak bere pantaila izena kendu du (%(oldDisplayName)s).",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s erabiltzaileak bere pantaila-izena kendu du (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia kendu du.",
     "Remove %(threePid)s?": "Kendu %(threePid)s?",
     "%(senderName)s requested a VoIP conference.": "%(senderName)s erabiltzaileak VoIP konferentzia bat eskatu du.",
@@ -790,9 +790,9 @@
     "To change the permissions in the room, you must be a": "Gelaren baimenak aldatzeko, hau izan behar zara:",
     "To change the topic, you must be a": "Mintzagaia aldatzeko, hau izan behar zara:",
     "To modify widgets in the room, you must be a": "Gelaren trepetak aldatzeko, hau izan behar zara:",
-    "Members only (since the point in time of selecting this option)": "Kideak besterik ez (aukera hau hautatzen den unetik)",
-    "Members only (since they were invited)": "Kideak besterik ez (gonbidatu zaienetik)",
-    "Members only (since they joined)": "Kideak besterik ez (elkartu zirenetik)",
+    "Members only (since the point in time of selecting this option)": "Kideek besterik ez (aukera hau hautatzen den unetik)",
+    "Members only (since they were invited)": "Kideek besterik ez (gonbidatu zaienetik)",
+    "Members only (since they joined)": "Kideek besterik ez (elkartu zirenetik)",
     "To send events of type <eventType/>, you must be a": "<eventType/> motako gertaerak bidaltzeko, hau izan behar zara:",
     "Addresses": "Helbideak",
     "Invalid community ID": "Komunitate ID baliogabea",

From 5c7bdcec4f8ece9c8c92345fc05a9c9336cab696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Mon, 29 Jan 2018 20:47:05 +0000
Subject: [PATCH 420/927] Translated using Weblate (Catalan)

Currently translated at 88.5% (871 of 984 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 15d64cd9e1..eb4ac76d05 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -18,7 +18,7 @@
     "Error": "Error",
     "Failed to forget room %(errCode)s": "No s'ha pogut oblidar la sala %(errCode)s",
     "Favourite": "Favorit",
-    "Mute": "Silenciat",
+    "Mute": "Silencia",
     "Room directory": "Directori de sales",
     "Settings": "Paràmetres",
     "Start chat": "Inicia un xat",
@@ -316,7 +316,7 @@
     "Devices": "Dispositius",
     "Unignore": "Deixa de ignorar",
     "Ignore": "Ignora",
-    "Jump to read receipt": "Salta a els rebuts llegits",
+    "Jump to read receipt": "Vés a l'últim missatge llegit",
     "Mention": "Menció",
     "Invite": "Convida",
     "User Options": "Opcions d'usuari",
@@ -577,7 +577,7 @@
     "Minimize apps": "Minimitza les aplicacions",
     "Blacklist": "Llista negre",
     "Unverify": "Sense verificar",
-    "Verify...": "S'està verificant...",
+    "Verify...": "Verificar...",
     "No results": "Sense resultats",
     "Delete": "Esborra",
     "Communities": "Comunitats",

From 4afdefb926193160987018b57ec44286e79ca3ff Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Sun, 28 Jan 2018 21:52:17 +0000
Subject: [PATCH 421/927] Translated using Weblate (Dutch)

Currently translated at 73.9% (728 of 984 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index f440e128cb..492d9d596c 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -722,5 +722,10 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s en %(count)s andere gebruikers zijn aan het typen",
     "%(names)s and %(count)s others are typing|one": "%(names)s en iemand anders is aan het typen",
     "Send": "Verstuur",
-    "Message Pinning": "Boodschap vastpinnen"
+    "Message Pinning": "Boodschap vastpinnen",
+    "Message Replies": "Antwoorden op bericht",
+    "Presence Management": "Presentie Beheer",
+    "Tag Panel": "Label Paneel",
+    "Disable Emoji suggestions while typing": "Emoji suggesties tijdens het typen uitzetten",
+    "Hide avatar changes": "Avatar veranderingen verbergen"
 }

From 8d902010f8b8c82104f9ea96c6e97298153cc64d Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Tue, 30 Jan 2018 06:36:34 +0000
Subject: [PATCH 422/927] Translated using Weblate (Galician)

Currently translated at 99.1% (976 of 984 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 1807ce96d8..3fbaf2591b 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -352,5 +352,628 @@
     "World readable": "Visible por todos",
     "Guests can join": "Convidados pódense unir",
     "Failed to set avatar.": "Fallo ao establecer o avatar.",
-    "Save": "Gardar"
+    "Save": "Gardar",
+    "(~%(count)s results)|other": "(~%(count)s resultados)",
+    "(~%(count)s results)|one": "(~%(count)s resultado)",
+    "Join Room": "Unirse a sala",
+    "Upload avatar": "Subir avatar",
+    "Remove avatar": "Quitar avatar",
+    "Settings": "Axustes",
+    "Forget room": "Esquecer sala",
+    "Search": "Busca",
+    "Show panel": "Mostra panel",
+    "Drop here to favourite": "Solte aqui para favorito",
+    "Drop here to tag direct chat": "Solte aquí para etiquetar chat directo",
+    "Drop here to restore": "Solte aquí para restablecer",
+    "Drop here to tag %(section)s": "Solte aquí para etiquetar %(section)s",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non poderá desfacer este cambio xa que está a diminuír a súa autoridade, si vostede é a única usuaria con autorización na sala será imposible voltar a obter privilexios.",
+    "Drop here to demote": "Arrastre aquí para degradar",
+    "Press <StartChatButton> to start a chat with someone": "Pulse <StartChatButton> para iniciar a conversa con alguén",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Aínda non está en ningunha sala! Pulse <CreateRoomButton> para crear unha sala ou <RoomDirectoryButton> para buscar no directorio",
+    "Community Invites": "Convites da comunidade",
+    "Invites": "Convites",
+    "Favourites": "Favoritas",
+    "People": "Xente",
+    "Rooms": "Salas",
+    "Low priority": "Baixa prioridade",
+    "Historical": "Historial",
+    "This invitation was sent to an email address which is not associated with this account:": "Este convite foi enviado a un enderezo de correo que non está asociado con esta conta:",
+    "You may wish to login with a different account, or add this email to this account.": "Pode que desexe conectarse con outra conta, ou engadir este enderezo a súa conta.",
+    "You have been invited to join this room by %(inviterName)s": "Foi convidada por %(inviterName)s a unirse a esta sala",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Quere <acceptText>aceptar</acceptText> ou <declineText>rexeitar</declineText> este convite?",
+    "Reason: %(reasonText)s": "Razón: %(reasonText)s",
+    "Rejoin": "Voltar a unirse",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Foi expulsada de %(roomName)s por %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Foi expulsada de esta sala por %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Non se lle permite acceder a %(roomName)s por %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Non se lle permite o acceso a esta sala por %(userName)s.",
+    "This room": "Esta sala",
+    "%(roomName)s does not exist.": "%(roomName)s non existe.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s non está accesible en este momento.",
+    "You are trying to access %(roomName)s.": "Está intentando acceder a %(roomName)s.",
+    "You are trying to access a room.": "Está intentando acceder a unha sala.",
+    "<a>Click here</a> to join the discussion!": "<a>Pulse aquí</a> para unirse a conversa!",
+    "This is a preview of this room. Room interactions have been disabled": "Esta é unha vista previa de esta sala. Desactiváronse as interaccións coa sala",
+    "To change the room's avatar, you must be a": "Para cambiar o avatar da sala, debe ser",
+    "To change the room's name, you must be a": "Para cambiar o nome da sala, debe ser",
+    "To change the room's main address, you must be a": "Para cambiar o enderezo principal da sala, debe ser",
+    "To change the room's history visibility, you must be a": "Para cambiar a visibilidade do histórico da sala, debe ser",
+    "To change the permissions in the room, you must be a": "Para cambiar os permisos na sala, debe ser",
+    "To change the topic, you must be a": "Para cambiar o asunto, debe ser",
+    "To modify widgets in the room, you must be a": "Para modificar os widgets da sala, debe ser",
+    "Failed to unban": "Fallou eliminar a prohibición",
+    "Banned by %(displayName)s": "Non aceptado por %(displayName)s",
+    "Privacy warning": "Aviso de intimidade",
+    "Changes to who can read history will only apply to future messages in this room": "Os cambios sobre quen pode ler o histórico serán de aplicación a futuras mensaxes en esta sala",
+    "The visibility of existing history will be unchanged": "A visibilidade do histórico existente non cambiará",
+    "unknown error code": "código de fallo descoñecido",
+    "Failed to forget room %(errCode)s": "Fallo ao esquecer sala %(errCode)s",
+    "End-to-end encryption is in beta and may not be reliable": "O cifrado de extremo-a-extremo está en beta e podería non ser fiable",
+    "You should not yet trust it to secure data": "Polo de agora non debería confiarlle datos seguros",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos non poderán descifrar o histórico anterior a que se uniron a sala",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Unha vez habilitado o cifrado para unha sala non se poderá desactivar (por agora)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "As mensaxes cifradas non será visibles en clientes que non aínda non teñan implementado o cifrado",
+    "Enable encryption": "Habilitar cifrado",
+    "(warning: cannot be disabled again!)": "(aviso: non se pode deshabilitar!)",
+    "Encryption is enabled in this room": "O cifrado está habilitado en esta sala",
+    "Encryption is not enabled in this room": "O cifrado non se habilitou para esta sala",
+    "Privileged Users": "Usuarios con privilexios",
+    "%(user)s is a": "%(user)s é un",
+    "No users have specific privileges in this room": "Non hai usuarias con privilexios específicos en esta sala",
+    "Banned users": "Usuarias non permitidas",
+    "This room is not accessible by remote Matrix servers": "Esta sala non é accesible por servidores Matrix remotos",
+    "Leave room": "Deixar a sala",
+    "Favourite": "Favorita",
+    "Tagged as: ": "Etiquetada como: ",
+    "To link to a room it must have <a>an address</a>.": "Para ligar a unha sala deberá ter <a>un enderezo</a>.",
+    "Guests cannot join this room even if explicitly invited.": "As convidadas non se poden unir a esta sala incluso se foro explicitamente convidadas.",
+    "Click here to fix": "Pulse aquí para solución",
+    "Who can access this room?": "Quén pode acceder a esta sala?",
+    "Only people who have been invited": "Só persoas que foron convidadas",
+    "Anyone who knows the room's link, apart from guests": "Calquera que coñeza o enderezo da sala, aparte das convidadas",
+    "Anyone who knows the room's link, including guests": "Calquera que coñeza a ligazón a sala, incluíndo as convidadas",
+    "Publish this room to the public in %(domain)s's room directory?": "Publicar esta sala no directorio público de salas de %(domain)s?",
+    "Who can read history?": "Quén pode ler o histórico?",
+    "Anyone": "Calquera",
+    "Members only (since the point in time of selecting this option)": "Só membros (desde o momento en que se selecciona esta opción)",
+    "Members only (since they were invited)": "Só membros (desde que foron convidados)",
+    "Members only (since they joined)": "Só membros (desde que se uniron)",
+    "Permissions": "Permisos",
+    "The default role for new room members is": "Por omisión o rol na sala para novos membros é",
+    "To send messages, you must be a": "Para enviar mensaxes, deberá ser",
+    "To invite users into the room, you must be a": "Para convidar a usuarias a esta sala, debe ser",
+    "To configure the room, you must be a": "Para configurar a sala, debe ser",
+    "To kick users, you must be a": "Para expulsar usuarias, debe ser",
+    "To ban users, you must be a": "Para prohibir usuarias, debe ser",
+    "To remove other users' messages, you must be a": "Para eliminar mensaxes de outras usuarias, debe ser",
+    "To send events of type <eventType/>, you must be a": "Para enviar eventos de tipo <eventType/>, debe ser",
+    "Advanced": "Avanzado",
+    "This room's internal ID is": "O ID interno de esta sala é",
+    "Add a topic": "Engadir asunto",
+    "Cancel": "Cancelar",
+    "Scroll to unread messages": "Desplace ate mensaxes non lidas",
+    "Jump to first unread message.": "Ir a primeira mensaxe non lida.",
+    "Close": "Pechar",
+    "Invalid alias format": "Formato de alias non válido",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' non é un formato válido para un alias",
+    "Invalid address format": "Formato de enderezo non válido",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' non é un formato válido par un enderezo",
+    "not specified": "non indicado",
+    "not set": "non establecido",
+    "Remote addresses for this room:": "Enderezos remotos para esta sala:",
+    "Addresses": "Enderezos",
+    "The main address for this room is": "O enderezo principal para esta sala é",
+    "Local addresses for this room:": "O enderezo local para esta sala:",
+    "This room has no local addresses": "Esta sala non ten enderezos locais",
+    "New address (e.g. #foo:%(localDomain)s)": "Novos enderezos (ex. #foo:%(localDomain)s)",
+    "Invalid community ID": "ID da comunidade non válido",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' non é un ID de comunidade válido",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Novo ID da comunidade (ex. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "Vostede <a>habilitou</a> a vista previa de URL por omisión.",
+    "You have <a>disabled</a> URL previews by default.": "Vostede <a>desactivou</a> a vista previa de URL por omisión.",
+    "URL previews are enabled by default for participants in this room.": "As vistas previas de URL están habilitadas por omisión para os participantes de esta sala.",
+    "URL previews are disabled by default for participants in this room.": "As vistas previas de URL están desactivadas por omisión para os participantes de esta sala.",
+    "URL Previews": "Vista previa de URL",
+    "Error decrypting audio": "Fallo ao descifrar audio",
+    "Error decrypting attachment": "Fallo descifrando o anexo",
+    "Decrypt %(text)s": "Descifrar %(text)s",
+    "Download %(text)s": "Baixar %(text)s",
+    "Invalid file%(extra)s": "Ficheiro non válido %(extra)s",
+    "Error decrypting image": "Fallo ao descifrar a imaxe",
+    "Image '%(Body)s' cannot be displayed.": "Imaxe '%(Body)s' non pode ser mostrada.",
+    "This image cannot be displayed.": "Esta imaxe non se pode ser mostrada.",
+    "Error decrypting video": "Fallo descifrando vídeo",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s cambiou o avatar para %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s eliminou o avatar da sala.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s cambiou o avatar da sala a <img/>",
+    "Copied!": "Copiado!",
+    "Failed to copy": "Fallo ao copiar",
+    "Add an Integration": "Engadir unha integración",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Vai ser redirixido a unha web de terceiros para poder autenticar a súa conta e así utilizar %(integrationsUrl)s. Quere continuar?",
+    "Removed or unknown message type": "Tipo de mensaxe descoñecida ou eliminada",
+    "Message removed by %(userId)s": "Mensaxe eliminada por %(userId)s",
+    "Message removed": "Mensaxe eliminada",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Comprobación por Robot non está dispoñible en escritorio - por favor utilice un <a>navegador web</a>",
+    "This Home Server would like to make sure you are not a robot": "Este Servidor quere asegurarse de que vostede non é un robot",
+    "Sign in with CAS": "Conectarse con CAS",
+    "Custom Server Options": "Opcións personalizadas do servidor",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Pode utilizar as opcións personalizadas do servidor para conectarse a outros servidores Matrix indicando un URL de servidor de inicio diferente.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Así pode utilizar este aplicativo con unha conta Matrix existente en un servidor de incio diferente.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tamén pode establecer un servidor de identidade personalizado pero esto normalmente dificulta a interacción con usuarias basándose non enderezo de correo.",
+    "Dismiss": "Rexeitar",
+    "To continue, please enter your password.": "Para continuar, por favor introduza o seu contrasinal.",
+    "Password:": "Contrasinal:",
+    "An email has been sent to %(emailAddress)s": "Enviouse un correo a %(emailAddress)s",
+    "Please check your email to continue registration.": "Por favor comprobe o seu correo para continuar co rexistro.",
+    "Token incorrect": "Testemuño incorrecto",
+    "A text message has been sent to %(msisdn)s": "Enviouse unha mensaxe de texto a %(msisdn)s",
+    "Please enter the code it contains:": "Por favor introduza o código que contén:",
+    "Start authentication": "Inicie a autenticación",
+    "powered by Matrix": "funciona grazas a Matrix",
+    "Username on %(hs)s": "Nome de usuaria en %(hs)s",
+    "User name": "Nome de usuaria",
+    "Mobile phone number": "Número de teléfono móbil",
+    "Forgot your password?": "Esqueceu o contrasinal?",
+    "%(serverName)s Matrix ID": "Matrix ID en %(serverName)s",
+    "Sign in with": "Conectarse con",
+    "Email address": "Enderezo de correo",
+    "Sign in": "Conectar",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Si non indica un enderezo de correo non poderá restablecer o contrasinal, está segura?",
+    "Email address (optional)": "Enderezo de correo (opcional)",
+    "You are registering with %(SelectedTeamName)s": "Estase a rexistrar con %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Número de teléfono móbil (opcional)",
+    "Register": "Rexistar",
+    "Default server": "Servidor por omisión",
+    "Custom server": "Servidor personalizado",
+    "Home server URL": "URL do servidor de inicio",
+    "Identity server URL": "URL do servidor de identidade",
+    "What does this mean?": "Qué significa esto?",
+    "Remove from community": "Eliminar da comunidade",
+    "Disinvite this user from community?": "Retirar o convite a comunidade a esta usuaria?",
+    "Remove this user from community?": "Quitar a esta usuaria da comunidade?",
+    "Failed to withdraw invitation": "Fallo ao retirar o convite",
+    "Failed to remove user from community": "Fallo ao quitar a usuaria da comunidade",
+    "Filter community members": "Filtrar membros da comunidade",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Está segura de que quere eliminar '%(roomName)s' de %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Eliminar unha sala da comunidade tamén a quitará da páxina da comunidade.",
+    "Remove": "Eliminar",
+    "Failed to remove room from community": "Fallo ao quitar a sala da comunidade",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Fallo ao quitar '%(roomName)s' de %(groupId)s",
+    "Something went wrong!": "Algo fallou!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "A visibilidade de '%(roomName)s' en %(groupId)s non se puido actualizar.",
+    "Visibility in Room List": "Visibilidade na Lista de Salas",
+    "Visible to everyone": "Visible para todo o mundo",
+    "Only visible to community members": "Só visible para membros da comunidade",
+    "Filter community rooms": "Filtrar salas da comunidade",
+    "Something went wrong when trying to get your communities.": "Algo fallou ao intentar obter as súas comunidades.",
+    "You're not currently a member of any communities.": "Ate o momento non é membro de ningunha comunidade.",
+    "Unknown Address": "Enderezo descoñecido",
+    "NOTE: Apps are not end-to-end encrypted": "NOTA: As Apps non están cifradas de extremo-a-extremo",
+    "Do you want to load widget from URL:": "Quere cargar o widget da URL:",
+    "Allow": "Permitir",
+    "Delete Widget": "Eliminar Widget",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Quitando un widget eliminao para todas as usuarias de esta sala. Está segura de querer eliminar este widget?",
+    "Delete widget": "Eliminar widget",
+    "Revoke widget access": "Retirar acceso ao widget",
+    "Minimize apps": "Minimizar apps",
+    "Edit": "Editar",
+    "Create new room": "Crear unha nova sala",
+    "Unblacklist": "Quitar da lista negra",
+    "Blacklist": "Por na lista negra",
+    "Unverify": "Retirar verificación",
+    "Verify...": "Verificar...",
+    "No results": "Sen resultados",
+    "Delete": "Eliminar",
+    "Communities": "Comunidades",
+    "Home": "Inicio",
+    "Integrations Error": "Fallo nas integracións",
+    "Could not connect to the integration server": "Non se puido conectar ao servidor de integración",
+    "Manage Integrations": "Xestionar integracións",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s uníronse %(count)s veces",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s uníronse",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s uniuse %(count)s veces",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s uníuse",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s saíron %(count)s veces",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s saíron",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saiu %(count)s veces",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saiu",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s uníronse e saíron %(count)s veces",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s uníronse e saíron",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s uniuse e saiu %(count)s veces",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s uníuse e saiu",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíron e voltaron %(count)s veces",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíron e voltaron",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saiu e voltou %(count)s veces",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saiu e voltou",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rexeitaron convites %(count)s veces",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rexeitaron os seus convites",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rexeitou o seu convite %(count)s veces",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rexeitou o seu convite",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "retiróuselle o convite a %(severalUsers)s %(count)s veces",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "retirouselle o convite a %(severalUsers)s",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "retiróuselle o convite a %(oneUser)s %(count)s veces",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "retiróuselle o convite a %(oneUser)s",
+    "were invited %(count)s times|other": "foron convidados %(count)s veces",
+    "were invited %(count)s times|one": "foron convidados",
+    "was invited %(count)s times|other": "foi convidada %(count)s veces",
+    "was invited %(count)s times|one": "foi convidada",
+    "were banned %(count)s times|other": "foron prohibidas %(count)s veces",
+    "were banned %(count)s times|one": "foron prohibidas",
+    "was banned %(count)s times|other": "foi prohibida  %(count)s veces",
+    "was banned %(count)s times|one": "foi prohibida",
+    "were unbanned %(count)s times|other": "retirouselle a prohibición %(count)s veces",
+    "were unbanned %(count)s times|one": "retirouselle a prohibición",
+    "was unbanned %(count)s times|other": "retirouselle a prohibición  %(count)s veces",
+    "was unbanned %(count)s times|one": "retiróuselle a prohibición",
+    "were kicked %(count)s times|other": "foron expulsadas  %(count)s veces",
+    "were kicked %(count)s times|one": "foron expulsadas",
+    "was kicked %(count)s times|other": "foi expulsada %(count)s veces",
+    "was kicked %(count)s times|one": "foi expulsada",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s cambiaron o seu nome %(count)s veces",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s cambiaron o seu nome",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s cambiou o seu nome %(count)s veces",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s cambiou o seu nome",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s cambiaron o seu avatar %(count)s veces",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s cambiaron o seu avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s cambiou o seu avatar %(count)s veces",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s cambiou o seu avatar",
+    "%(items)s and %(count)s others|other": "%(items)s e %(count)s outras",
+    "%(items)s and %(count)s others|one": "%(items)s e outra máis",
+    "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
+    "collapse": "comprimir",
+    "expand": "expandir",
+    "Custom of %(powerLevel)s": "Personalización de %(powerLevel)s",
+    "Custom level": "Nivel personalizado",
+    "Quote": "Cita",
+    "Room directory": "Directorio de salas",
+    "Start chat": "Iniciar conversa",
+    "And %(count)s more...|other": "E %(count)s máis...",
+    "ex. @bob:example.com": "ex. @pepe:exemplo.com",
+    "Add User": "Engadir usuaria",
+    "Matrix ID": "ID Matrix",
+    "Matrix Room ID": "ID sala Matrix",
+    "email address": "enderezo de correo",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Intentar utilizar algún dos seguintes tipos de enderezo válidos: %(validTypesList)s.",
+    "You have entered an invalid address.": "Introduxo un enderezo non válido.",
+    "Create a new chat or reuse an existing one": "Crear un novo chat ou reutilizar un xa existente",
+    "Start new chat": "Iniciar un novo chat",
+    "You already have existing direct chats with this user:": "Xa ten unha conversa directa con esta usuaria:",
+    "Start chatting": "Iniciar a conversar",
+    "Click on the button below to start chatting!": "Pulse non botón inferior para iniciar a conversar!",
+    "Start Chatting": "Iniciar a conversa",
+    "Confirm Removal": "Confirme a retirada",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Está certa de que quere quitar (eliminar) este evento? Sepa que si elimina un nome de sala ou cambia o asunto, podería desfacer o cambio.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Os ID de comunidade só poden conter caracteres a-z, 0-9, or '=_-./'",
+    "Community IDs cannot not be empty.": "O ID de comunidade non pode quedar baldeiro.",
+    "Something went wrong whilst creating your community": "Algo fallou mentras se creaba a súa comunidade",
+    "Create Community": "Crear comunidade",
+    "Community Name": "Nome da comunidade",
+    "Example": "Exemplo",
+    "Community ID": "ID da comunidade",
+    "example": "exemplo",
+    "Create": "Crear",
+    "Create Room": "Crear sala",
+    "Room name (optional)": "Nome da sala (opcional)",
+    "Advanced options": "Axustes avanzados",
+    "Block users on other matrix homeservers from joining this room": "Evitar que usuarias de outros servidores matrix se unan a esta sala",
+    "This setting cannot be changed later!": "Esta preferencia non se pode cambiar máis tarde!",
+    "Unknown error": "Fallo descoñecido",
+    "Incorrect password": "Contrasinal incorrecto",
+    "Deactivate Account": "Desactivar conta",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Esto inutilizará a súa conta de xeito permanente. Non poderá voltar a rexistrarse co mesmo ID de usuaria.",
+    "This action is irreversible.": "Esta acción e irreversible.",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Non se pode determinar si o enderezo ao que foi enviado este convite coincide con un dos asociados a súa conta.",
+    "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:": "Para verificar que se pode confiar en este dispositivo, contacte co seu dono utilizando algún outro medio (ex. en persoa ou chamada de teléfono) e pregúntelle si a chave que ven nos Axustes de Usuaria do se dispositivo coincide coa chave inferior:",
+    "Device name": "Nome do dispositivo",
+    "Device key": "Chave do dispositivo",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Si concorda, pulse o botón verificar. Si non, entón alguén está interceptando este dispositivo e probablemente vostede desexe pulsar o botón lista negra.",
+    "In future this verification process will be more sophisticated.": "No futuro este proceso de verificación será máis sofisticado.",
+    "Verify device": "Verificar dispositivo",
+    "I verify that the keys match": "Certifico que coinciden as chaves",
+    "An error has occurred.": "Algo fallou.",
+    "OK": "OK",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Engadeu un novo dispositivo '%(displayName)s', que está a solicitar as chaves de cifrado.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "O seu dispositivo non verificado '%(displayName)s' está solicitando chaves de cifrado.",
+    "Start verification": "Iniciar verificación",
+    "Share without verifying": "Compartir sin verificar",
+    "Ignore request": "Ignorar petición",
+    "Loading device info...": "Cargando información do dispositivo...",
+    "Encryption key request": "Petición de chave de cifrado",
+    "Otherwise, <a>click here</a> to send a bug report.": "Se non, <a>pulse aquí</a> para enviar un informe de fallo.",
+    "Unable to restore session": "Non se puido restaurar a sesión",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Atopamos un erro intentando restablecer a sesión anterior. Si continúa, deberá conectarse de novo, e a parte cifrada do chat non será lexible.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Si anteriormente utilizou unha versión máis recente de Riot, a súa sesión podería non ser compatible con esta versión. Peche esta ventá e volte a versión máis recente.",
+    "Continue anyway": "Continuar igualmente",
+    "Invalid Email Address": "Enderezo de email non válido",
+    "This doesn't appear to be a valid email address": "Este non semella ser un enderezo de email válido",
+    "Verification Pending": "Verificación pendente",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Por favor comprobe o seu email e pulse na ligazón que contén. Unha vez feito, pulse continuar.",
+    "Unable to add email address": "Non se puido engadir enderezo de email",
+    "Unable to verify email address.": "Non se puido verificar enderezo de email.",
+    "This will allow you to reset your password and receive notifications.": "Esto permitiralle restablecer o seu contrasinal e recibir notificacións.",
+    "Skip": "Saltar",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Os nomes de usuaria só poden conter letras, números, puntos e guión alto e baixo.",
+    "Username not available": "Nome de usuaria non dispoñible",
+    "Username invalid: %(errMessage)s": "Nome de usuaria non válido: %(errMessage)s",
+    "An error occurred: %(error_string)s": "Algo fallou: %(error_string)s",
+    "Username available": "Nome de usuaria dispoñible",
+    "To get started, please pick a username!": "Para comezar, escolla un nome de usuaria!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Este será o nome da súa conta no <span></span> servidor, ou pode escoller un <a>servidor diferente</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Si xa ten unha conta Matrix entón pode <a>conectarse</a>.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "En este momento está por na lista negra os dispositivos non verificados; para enviar mensaxes a eses dispositivos debe verificalos.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Recomendámoslle que vaia ao proceso de verificación para cada dispositivo para confirmar que pertencen ao seu dono lexítimos, pero se o prefire pode enviar a mensaxe sen ter verificado.",
+    "Room contains unknown devices": "A sala contén dispositivos descoñecidos",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contén dispositivos que vostede non vira antes.",
+    "Unknown devices": "Dispositivos descoñecidos",
+    "Private Chat": "Conversa privada",
+    "Public Chat": "Conversa pública",
+    "Custom": "Personalizada",
+    "Alias (optional)": "Alias (opcional)",
+    "Name": "Nome",
+    "Topic": "Asunto",
+    "Make this room private": "Facer que esta sala sexa privada",
+    "Share message history with new users": "Compartir o histórico de mensaxes coas novas usuarias",
+    "Encrypt room": "Cifrar sala",
+    "You must <a>register</a> to use this functionality": "Debe <a>rexistrarse</a> para utilizar esta función",
+    "You must join the room to see its files": "Debe unirse a sala para ver os seus ficheiros",
+    "There are no visible files in this room": "Non hai ficheiros visibles en esta sala",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a páxina da súa comunidade</h1>\n<p>\n    Utilice a descrición longa para presentar novos membros a comunidade, ou publicar algunha  <a href=\"foo\">ligazón</a> importante\n   \n</p>\n<p>\n    Tamén pode utilizar etiquetas 'img'\n</p>\n",
+    "Add rooms to the community summary": "Engadir salas ao resumo da comunidade",
+    "Which rooms would you like to add to this summary?": "Qué salas desexa engadir a este resumo?",
+    "Add to summary": "Engadir ao resumo",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Algo fallou ao engadir estas salas ao resumo de %(groupId)s:",
+    "Add a Room": "Engadir unha sala",
+    "Failed to remove the room from the summary of %(groupId)s": "Algo fallou ao quitar a sala do resumo de %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' non se puido eliminar do resumo.",
+    "Add users to the community summary": "Engadir usuarias ao resumo da comunidade",
+    "Who would you like to add to this summary?": "A quén desexa engadir a este resumo?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Algo fallou ao engadir as seguintes usuarias ao resumo de %(groupId)s:",
+    "Add a User": "Engadir unha usuaria",
+    "Failed to remove a user from the summary of %(groupId)s": "Algo fallou ao eliminar a usuaria do resumo de %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "A usuaria '%(displayName)s' non se puido eliminar do resumo.",
+    "Failed to upload image": "Fallo ao subir a páxina",
+    "Failed to update community": "Fallo ao actualizar a comunidade",
+    "Unable to accept invite": "Non puido aceptar o convite",
+    "Unable to reject invite": "Non puido rexeitar o convite",
+    "Leave Community": "Deixar a comunidade",
+    "Leave %(groupName)s?": "Deixar %(groupName)s?",
+    "Leave": "Saír",
+    "Unable to leave room": "Non puido deixar a sala",
+    "Community Settings": "Axustes da comunidade",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas son mostradas aos membros da comunidade na páxina da comunidade. Os membros da comunidade poden unirse as salas pulsando en elas.",
+    "Add rooms to this community": "Engadir salas a esta comunidade",
+    "Featured Rooms:": "Salas destacadas:",
+    "Featured Users:": "Usuarias destacadas:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s convidouna a unirse a esta comunidade",
+    "You are an administrator of this community": "Vostede administra esta comunidade",
+    "You are a member of this community": "Vostede é membro de esta comunidade",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "A súa comunidade non ten unha Descrición Longa, unha páxina HTML para mostrar aos membros.<br />Pulse aquí para abrir os axustes e publicar unha!",
+    "Long Description (HTML)": "Descrición longa (HTML)",
+    "Description": "Descrición",
+    "Community %(groupId)s not found": "Non se atopou a comunidade %(groupId)s",
+    "This Home server does not support communities": "Este servidor non soporta comunidades",
+    "Failed to load %(groupId)s": "Fallo ao cargar %(groupId)s",
+    "Reject invitation": "Rexeitar convite",
+    "Are you sure you want to reject the invitation?": "Seguro que desexa rexeitar o convite?",
+    "Failed to reject invitation": "Fallo ao rexeitar o convite",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Seguro que desexa saír da sala '%(roomName)s'?",
+    "Failed to leave room": "Algo fallou ao saír da sala",
+    "Signed Out": "Desconectada",
+    "For security, this session has been signed out. Please sign in again.": "Por seguridade, pechouse a sesión. Por favor, conéctese de novo.",
+    "Cryptography data migrated": "Migráronse os datos de cifrado",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Levouse a fin a mudanza de datos criptográficos. O cifrado extremo-a-extremo si volta a unha versión máis antiga de Riot. Si precisa utilizar criptografía de extremo-a-extremo en unha versión anterior, primeiro desconéctese de Riot. Para manter o histórico de mensaxes, exporte e volte a importar as súas chaves.",
+    "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos",
+    "Logout": "Desconectar",
+    "Your Communities": "As súas Comunidades",
+    "Error whilst fetching joined communities": "Fallo mentras se obtiñas as comunidades unidas",
+    "Create a new community": "Crear unha nova comunidade",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.",
+    "Join an existing community": "Unirse a unha comunidade existente",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como <i>+exemplo:matrix.org</i>",
+    "You have no visible notifications": "Non ten notificacións visibles",
+    "Scroll to bottom of page": "Desplácese ate o final da páxina",
+    "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostrar dispositivos</showDevicesText>, <sendAnywayText>enviar igualmente</sendAnywayText> ou <cancelText>cancelar</cancelText>.",
+    "%(count)s of your messages have not been sent.|other": "Algunha das súas mensaxes non foron enviadas.",
+    "%(count)s of your messages have not been sent.|one": "A súa mensaxe non foi enviada.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todo</resendText> ou ben<cancelText>cancelar todo</cancelText>. Tamén pode seleccionar mensaxes individuais para reenviar ou cancelar.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensaxe</resendText> ou <cancelText>cancelar mensaxe</cancelText> agora.",
+    "Warning": "Aviso",
+    "Connectivity to the server has been lost.": "Perdeuse a conexión ao servidor.",
+    "Sent messages will be stored until your connection has returned.": "As mensaxes enviadas gardaránse ate que retome a conexión.",
+    "%(count)s new messages|other": "%(count)s novas mensaxes",
+    "%(count)s new messages|one": "%(count)s nova mensaxe",
+    "Active call": "Chamada activa",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Non hai ninguén por aquí! Desexa convidar <inviteText>a outras</inviteText> ou <nowarnText>deixar de informar sobre a sala baldeira</nowarnText>?",
+    "You seem to be uploading files, are you sure you want to quit?": "Semella estar a subir ficheiros, seguro que desexa deixalo?",
+    "You seem to be in a call, are you sure you want to quit?": "Semella estar en unha chamada, seguro que quere saír?",
+    "Failed to upload file": "Fallo ao subir ficheiro",
+    "Server may be unavailable, overloaded, or the file too big": "O servidor podería non estar dispoñible, sobrecargado ou o ficheiro ser demasiado grande",
+    "Search failed": "Fallou a busca",
+    "Server may be unavailable, overloaded, or search timed out :(": "O servidor podería non estar dispoñible, sobrecargado, ou caducou a busca :(",
+    "No more results": "Sen máis resultados",
+    "Unknown room %(roomId)s": "Sala descoñecida %(roomId)s",
+    "Room": "Sala",
+    "Failed to save settings": "Fallo ao gardar os axustes",
+    "Failed to reject invite": "Fallo ao rexeitar o convite",
+    "Fill screen": "Encher pantalla",
+    "Click to unmute video": "Pulse para escoitar vídeo",
+    "Click to mute video": "Pulse para acalar video",
+    "Click to unmute audio": "Pulse para escoitar audio",
+    "Click to mute audio": "Pulse para acalar audio",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Intentouse cargar un punto concreto do historial de esta sala, pero vostede non ten permiso para ver a mensaxe en cuestión.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Intentouse cargar un punto específico do historial de esta sala, pero non se puido atopar.",
+    "Failed to load timeline position": "Fallo ao cargar posición da liña temporal",
+    "Uploading %(filename)s and %(count)s others|other": "Subindo %(filename)s e %(count)s máis",
+    "Uploading %(filename)s and %(count)s others|zero": "Subindo %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Subindo %(filename)s e %(count)s máis",
+    "Light theme": "Decorado claro",
+    "Dark theme": "Decorado oscuro",
+    "Status.im theme": "Decorado Status.im",
+    "Can't load user settings": "Non se puideron cargar os axustes de usuaria",
+    "Server may be unavailable or overloaded": "O servidor podería non está dispoñible ou sobrecargado",
+    "Sign out": "Desconectar",
+    "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 seguridade, ao desconectarse borrará todas as chaves de cifrado extremo-a-extremo en este navegador. Si quere poder descifrar o historial da conversa en futuras sesións en Riot, por favor exporte as chaves da sala e gárdeas en lugar seguro.",
+    "Failed to change password. Is your password correct?": "Fallo ao cambiar o contrasinal. É correcto o contrasinal?",
+    "Success": "Parabéns",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "O seu contrasinal cambiouse correctamente. Non recibirá notificacións tipo push en outros dispositivos ate que se conecte novamente en eles",
+    "Remove Contact Information?": "Eliminar información do contacto?",
+    "Remove %(threePid)s?": "Eliminar %(threePid)s?",
+    "Unable to remove contact information": "Non se puido eliminar a información do contacto",
+    "Refer a friend to Riot:": "Convide a un amigo a Riot:",
+    "Interface Language": "Idioma da Interface",
+    "User Interface": "Interface de usuaria",
+    "Autocomplete Delay (ms):": "Retraso no autocompletado (ms):",
+    "<not supported>": "<non soportado>",
+    "Import E2E room keys": "Importar chaves E2E da sala",
+    "Cryptography": "Criptografía",
+    "Device ID:": "ID de dispositivo:",
+    "Device key:": "Chave do dispositivo:",
+    "Ignored Users": "Usuarias ignoradas",
+    "Bug Report": "Informe de fallo",
+    "Found a bug?": "Atopou un fallo?",
+    "Report it": "Informe",
+    "Analytics": "Analytics",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot recolle información analítica anónima para permitirnos mellorar o aplicativo.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A intimidade impórtanos, así que non recollemos información personal ou identificable nos datos dos nosos análises.",
+    "Learn more about how we use analytics.": "Saber máis sobre cómo utilizamos analytics.",
+    "Labs": "Labs",
+    "These are experimental features that may break in unexpected ways": "Estas son características experimentais que poderían dar lugar a fallos non agardados",
+    "Use with caution": "Utilice con precaución",
+    "Deactivate my account": "Desactivar a miña conta",
+    "Clear Cache": "Limpar caché",
+    "Clear Cache and Reload": "Limpar caché e recargar",
+    "Updates": "Actualizacións",
+    "Check for update": "Comprobar actualización",
+    "Reject all %(invitedRooms)s invites": "Rexeitar todos os %(invitedRooms)s convites",
+    "Bulk Options": "Opcións en bloque",
+    "Desktop specific": "Específicas de escritorio",
+    "Start automatically after system login": "Iniciar automáticamente  despóis de iniciar sesión",
+    "No media permissions": "Sen permisos de medios",
+    "You may need to manually permit Riot to access your microphone/webcam": "Igual ten que permitir manualmente a Riot acceder ao seus micrófono e cámara",
+    "Missing Media Permissions, click here to request.": "Faltan permisos de medios, pulse aquí para solicitalos.",
+    "No Microphones detected": "Non se detectaron micrófonos",
+    "No Webcams detected": "Non se detectaron cámaras",
+    "Default Device": "Dispositivo por omisión",
+    "Microphone": "Micrófono",
+    "Camera": "Cámara",
+    "VoIP": "VoIP",
+    "Email": "Correo-e",
+    "Add email address": "Engadir enderezo correo-e",
+    "Notifications": "Notificacións",
+    "Profile": "Perfil",
+    "Display name": "Nome mostrado",
+    "Account": "Conta",
+    "To return to your account in future you need to set a password": "Estableza un contrasinal para voltar a súa conta con posterioridade",
+    "Logged in as:": "Conectada como:",
+    "Access Token:": "Testemuño de acceso:",
+    "click to reveal": "pulse para revelar",
+    "Homeserver is": "O servidor de inicio é",
+    "Identity Server is": "O servidor de identidade é",
+    "matrix-react-sdk version:": "versión matrix-react-sdk:",
+    "riot-web version:": "versión riot-web:",
+    "olm version:": "versión olm:",
+    "Failed to send email": "Fallo ao enviar correo-e",
+    "The email address linked to your account must be entered.": "Debe introducir o correo-e ligado a súa conta.",
+    "A new password must be entered.": "Debe introducir un novo contrasinal.",
+    "New passwords must match each other.": "Os novos contrasinais deben ser coincidentes.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Detectáronse datos de una versión anterior de Riot. Esto causará un mal funcionamento da criptografía extremo-a-extremo na versión antiga. As mensaxes cifradas extremo-a-extremo intercambiadas mentras utilizaba a versión anterior poderían non ser descifrables en esta versión. Esto tamén podería causar que mensaxes intercambiadas con esta versión tampouco funcionasen. Si ten problemas, desconéctese e conéctese de novo. Para manter o historial de mensaxes, exporte e reimporte as súas chaves.",
+    "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.": "O restablecemento do contrasinal restablecerá tamén as chaves de cifrado extremo-a-extremo en todos os dispositivos, facendo o historial de chat cifrado non lexible, a menos que primeiro exporte as chaves da sala e as reimporte posteriormente. No futuro melloraremos esto.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Enviouse un email a %(emailAddress)s. Unha vez siga a ligazón que contén, pulse abaixo.",
+    "I have verified my email address": "Validei o meu enderezo de correo-e",
+    "Your password has been reset": "Restableceuse o seu contrasinal",
+    "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": "Foi desconectado de todos os seus dispositivos e xa non recibirá notificacións push. Para reactivar as notificacións, conéctese de novo en cada dispositivo",
+    "Return to login screen": "Voltar a pantalla de conexión",
+    "To reset your password, enter the email address linked to your account": "Para restablecer o seu contrasinal, introduza o enderezo de correo electrónico ligado a súa conta",
+    "New password": "Novo contrasinal",
+    "Confirm your new password": "Confirme o seu novo contrasinal",
+    "Send Reset Email": "Enviar correo-e de restablecemento",
+    "Create an account": "Crear unha conta",
+    "This Home Server does not support login using email address.": "Este servidor non soporta a conexión utilizando un enderezo de correo-e.",
+    "Incorrect username and/or password.": "Nome de usuaria ou contrasinal non válidos.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Teña en conta que se está a conectar ao servidor %(hs)s, non a matrix.org.",
+    "Guest access is disabled on this Home Server.": "O acceso de convidados está deshabilitado en este servidor de inicio.",
+    "The phone number entered looks invalid": "O número de teléfono introducido non semella ser válido",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor non ofrece ningún sistema de conexión que soporte este cliente.",
+    "Error: Problem communicating with the given homeserver.": "Fallo: problema ao comunicarse con servidor proporcionado.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Non se pode conectar ao servidor vía HTTP cando na barra de enderezos do navegador está HTTPS. Utilice HTTPS ou <a>active scripts non seguros</a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Non se conectou ao servidor - por favor comprobe a conexión, asegúrese de o <a>certificado SSL do servidor</a> é de confianza, e que ningún engadido do navegador está bloqueando as peticións.",
+    "Login as guest": "Conexión como convidado",
+    "Sign in to get started": "Conéctese para iniciar",
+    "Failed to fetch avatar URL": "Fallo ao obter o URL do avatar",
+    "Set a display name:": "Establecer nome público:",
+    "Upload an avatar:": "Suba un avatar:",
+    "This server does not support authentication with a phone number.": "O servidor non soporta a autenticación con número de teléfono.",
+    "Missing password.": "Falta contrasinal.",
+    "Passwords don't match.": "Non coinciden os contrasinais.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Contrasinal demasiado curto (min %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Non semella ser un enderezo de correo-e válido.",
+    "This doesn't look like a valid phone number.": "Non semella ser un número de teléfono válido.",
+    "You need to enter a user name.": "É preciso que introduza un nome de usuaria.",
+    "An unknown error occurred.": "Aconteceu un erro descoñecido.",
+    "I already have an account": "Xa teño unha conta",
+    "Displays action": "Mostra acción",
+    "Bans user with given id": "Prohibe a usuaria co ID indicado",
+    "Unbans user with given id": "Permite de novo a usuaria co ID proporcionado",
+    "Define the power level of a user": "Define o nivel de permisos de unha usuaria",
+    "Invites user with given id to current room": "Convida a usuaria co id proporcionado a sala actual",
+    "Joins room with given alias": "Únese a sala co alias proporcionado",
+    "Sets the room topic": "Establece o asunto da sala",
+    "Kicks user with given id": "Expulsa usuaria co id proporcionado",
+    "Changes your display nickname": "Cambia o alcume mostrado",
+    "Searches DuckDuckGo for results": "Buscar en DuckDuckGo por resultados",
+    "Changes colour scheme of current room": "Cambia o esquema de cores da sala actual",
+    "Verifies a user, device, and pubkey tuple": "Valida o conxunto de usuaria, dispositivo e chave pública",
+    "Ignores a user, hiding their messages from you": "Ignora unha usuaria, agochándolle as súas mensaxes",
+    "Stops ignoring a user, showing their messages going forward": "Deixa de ignorar unha usuaria, mostrándolles as súas mensaxes a partir de agora",
+    "Commands": "Comandos",
+    "Results from DuckDuckGo": "Resultados desde DuckDuckGo",
+    "Emoji": "Emoji",
+    "Notify the whole room": "Notificar a toda a sala",
+    "Room Notification": "Notificación da Sala",
+    "Users": "Usuarias",
+    "unknown device": "dispositivo descoñecido",
+    "NOT verified": "Non validado",
+    "verified": "validado",
+    "Verification": "Validación",
+    "Ed25519 fingerprint": "pegada Ed25519",
+    "User ID": "ID de usuaria",
+    "Curve25519 identity key": "Chave de identidade Curve25519",
+    "none": "nada",
+    "Claimed Ed25519 fingerprint key": "Chave de pegada pedida Ed25519",
+    "Algorithm": "Algoritmo",
+    "unencrypted": "non cifrado",
+    "Decryption error": "Fallo ao descifrar",
+    "Session ID": "ID de sesión",
+    "End-to-end encryption information": "Información do cifrado extremo-a-extremo",
+    "Event information": "Información do evento",
+    "Sender device information": "Información do dispositivo do remitente",
+    "Passphrases must match": "As frases de paso deben coincidir",
+    "Passphrase must not be empty": "A frase de paso non pode quedar baldeira",
+    "Export room keys": "Exportar chaves da sala",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Este proceso permítelle exportar a un ficheiro local as chaves para as mensaxes que recibeu en salas cifradas. Posteriormente permitiralle importar as chaves en outro cliente Matrix no futuro, así o cliente poderá descifrar esas mensaxes.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O ficheiro exportado permitiralle a calquera que poida lelo descifrar e cifrar mensaxes que vostede ve, así que debería ter coidado e gardalo de xeito seguro. Para axudarlle,  debe introducir unha frase de paso aquí abaixo que será utilizada para cifrar os datos exportados. Só será posible importar os datos utilizando a misma frase de paso.",
+    "Enter passphrase": "Introduza a frase de paso",
+    "Confirm passphrase": "Confirme a frase de paso",
+    "Export": "Exportar",
+    "Import room keys": "Importar chaves de sala",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Este proceso permítelle importar chaves de cifrado que vostede exportou de outro cliente Matrix. Así poderá descifrar calquer mensaxe que o outro cliente puidese cifrar.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "O ficheiro exportado estará protexido con unha frase de paso. Debe introducir aquí esa frase de paso para descifrar o ficheiro.",
+    "File to import": "Ficheiro a importar",
+    "Import": "Importar",
+    "The information being sent to us to help make Riot.im better includes:": "A información enviada a Riot.im para axudarnos a mellorar inclúe:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Tamén rexistramos cada páxina que vostede utiliza no aplicativo (actualmente <CurrentPageHash>), o User Agent (<CurrentUserAgent>) e a resolución do dispositivo (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Si esta páxina inclúe información identificable como ID de grupo, usuario ou sala, estes datos son eliminados antes de ser enviados ao servidor.",
+    "The platform you're on": "A plataforma na que está",
+    "The version of Riot.im": "A versión de Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Si está ou non conectada (non gardamos o nome de usuaria)",
+    "Your language of choice": "A súa preferencia de idioma",
+    "Which officially provided instance you are using, if any": "Qué instancia oficial está a utilizar, si algunha",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si utiliza o modo Richtext ou non do Editor Rich Text",
+    "Your homeserver's URL": "O URL do seu servidor de inicio",
+    "Your identity server's URL": "O URL da súa identidade no servidor",
+    "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
+    "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá voltar a ela sin un convite.",
+    "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades"
 }

From 5e34c8043f9026ec21c6e8cd8e055473d7e9611c Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Mon, 29 Jan 2018 17:04:22 +0000
Subject: [PATCH 423/927] Translated using Weblate (German)

Currently translated at 98.9% (974 of 984 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index f60b4e582d..d0c193bfa9 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -972,5 +972,7 @@
     "Your language of choice": "Deine ausgewählte Sprache",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ob du den Richtext-Modus des Editors benutzt oder nicht",
     "Your homeserver's URL": "Die URL deines Homeservers",
-    "Your identity server's URL": "Die URL deines Identitätsservers"
+    "Your identity server's URL": "Die URL deines Identitätsservers",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "Tag Panel": "Beschriftungsfeld"
 }

From fd4fc883c16579b0dc644bf75a5ff2279b4d2594 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 25 Jan 2018 15:24:21 +0000
Subject: [PATCH 424/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2aa17c764..f2e48905d5 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -912,7 +912,7 @@
     "Hide avatar changes": "Avatar változások elrejtése",
     "Hide display name changes": "Név változások elrejtése",
     "Enable inline URL previews by default": "Beágyazott URL előnézetek alapértelmezett engedélyezése",
-    "Enable URL previews for this room (only affects you)": "URL előnézet engedélyezése ebben a szobában (csak téged érint)",
+    "Enable URL previews for this room (only affects you)": "URL előnézet ebben a szobában (csak téged érint)",
     "Enable URL previews by default for participants in this room": "URL előnézet alapértelmezett engedélyezése a szoba tagságának",
     "URL previews are enabled by default for participants in this room.": "Az URL előnézetek alapértelmezetten engedélyezve vannak a szobában jelenlévőknek.",
     "URL previews are disabled by default for participants in this room.": "Az URL előnézet alapértelmezetten tiltva van a szobában jelenlévőknek.",

From 977dec40a30dacefe4e58a2d7bf3649a45e82150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Fri, 26 Jan 2018 20:50:25 +0000
Subject: [PATCH 425/927] Translated using Weblate (Serbian)

Currently translated at 60.8% (599 of 984 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 87c8aea100..6396455f9d 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -381,5 +381,221 @@
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не могу да утврдим да ли се адреса на овој позивници поклапа са оном која је повезана са вашим налогом.",
     "This invitation was sent to an email address which is not associated with this account:": "Ова позивница је послата на мејл адресу која није повезана са вашим налогом:",
     "You may wish to login with a different account, or add this email to this account.": "Можда бисте желели да се пријавите са другим налогом или да додате овај мејл у ваш налог.",
-    "You have been invited to join this room by %(inviterName)s": "Позвани сте да приступите овој соби од стране корисника %(inviterName)s"
+    "You have been invited to join this room by %(inviterName)s": "Позвани сте да приступите овој соби од стране корисника %(inviterName)s",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Да ли желите да <acceptText>прихватите</acceptText> или <declineText>одбијете</declineText> ову позивницу?",
+    "Reason: %(reasonText)s": "Разлог: %(reasonText)s",
+    "Rejoin": "Поново приступи",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Корисник %(userName)s вас је избацио из собе %(roomName)s.",
+    "You have been kicked from this room by %(userName)s.": "Корисник %(userName)s вас је избацио из ове собе.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Корисник %(userName)s је вама забранио приступ соби %(roomName)s.",
+    "You have been banned from this room by %(userName)s.": "Корисник %(userName)s је вама забранио приступ овој соби.",
+    "This room": "Ова соба",
+    "%(roomName)s does not exist.": "Соба %(roomName)s не постоји.",
+    "%(roomName)s is not accessible at this time.": "Соба %(roomName)s није доступна у овом тренутку.",
+    "You are trying to access %(roomName)s.": "Покушавате да приступите соби %(roomName)s.",
+    "You are trying to access a room.": "Покушавате да приступите соби.",
+    "<a>Click here</a> to join the discussion!": "<a>Кликните овде</a> да бисте се придружили разговору!",
+    "This is a preview of this room. Room interactions have been disabled": "Ово је претпреглед ове собе. Интеракције у соби су онемогућене",
+    "To change the room's avatar, you must be a": "Да бисте променили аватар собе, морате бити",
+    "To change the room's name, you must be a": "Да бисте променили назив собе, морате бити",
+    "To change the room's main address, you must be a": "Да бисте променили главну адресу собе, морате бити",
+    "To change the room's history visibility, you must be a": "Да бисте променили видљивост историјата собе, морате бити",
+    "To change the permissions in the room, you must be a": "Да бисте променили овлашћења у соби, морате бити",
+    "To change the topic, you must be a": "Да бисте променили тему, морате бити",
+    "To modify widgets in the room, you must be a": "Да бисте изменили виџете у соби, морате бити",
+    "Failed to unban": "Нисам успео да скинем забрану",
+    "Banned by %(displayName)s": "Приступ забранио %(displayName)s",
+    "Privacy warning": "Упозорење о приватности",
+    "Changes to who can read history will only apply to future messages in this room": "Измене права читања историјата биће примењене на будуће поруке у овој соби",
+    "The visibility of existing history will be unchanged": "Видљивост постојећег историјата неће бити промењена",
+    "unknown error code": "непознати код грешке",
+    "Failed to forget room %(errCode)s": "Нисам успео да заборавим собу %(errCode)s",
+    "End-to-end encryption is in beta and may not be reliable": "Шифровање с краја на крај је у бета фази и може бити непоуздано",
+    "You should not yet trust it to secure data": "Не бисте требали да му још верујете за обезбеђивање података",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Уређаји још не могу да дешифрују историјат настао пре приступања соби",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Када се шифровање омогући за собу, не може се поново искључити (за сада)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Шифроване поруке неће бити видљиве на клијентима који још не подржавају шифровање",
+    "Enable encryption": "Омогући шифровање",
+    "(warning: cannot be disabled again!)": "(упозорење: не може се поново искључити!)",
+    "Encryption is enabled in this room": "Шифровање је омогућено у овој соби",
+    "Encryption is not enabled in this room": "Шифровање није омогућено у овој соби",
+    "Privileged Users": "Овлашћени корисници",
+    "%(user)s is a": "%(user)s је",
+    "No users have specific privileges in this room": "Нема корисника са посебним овлашћењима у овој соби",
+    "Banned users": "Корисници са забраном приступа",
+    "This room is not accessible by remote Matrix servers": "Овој соби не могу приступити удаљени Матрикс сервери",
+    "Leave room": "Напусти собу",
+    "Favourite": "Омиљено",
+    "Tagged as: ": "Означено као: ",
+    "To link to a room it must have <a>an address</a>.": "Да бисте слали везу собе, она мора имати <a>адресу</a>.",
+    "Guests cannot join this room even if explicitly invited.": "Гости не могу приступити овој соби чак и ако су експлицитно позвани.",
+    "Click here to fix": "Кликните овде да бисте поправили",
+    "Who can access this room?": "Ко може приступити овој соби?",
+    "Only people who have been invited": "Само особе које су позване",
+    "Anyone who knows the room's link, apart from guests": "Било ко ко зна везу ка соби, осим гостију",
+    "Anyone who knows the room's link, including guests": "Било ко ко зна везу ка соби, укључујући и госте",
+    "Publish this room to the public in %(domain)s's room directory?": "Објавити ову собу у јавној фасцикли соба на домену %(domain)s?",
+    "Who can read history?": "Ко може читати историјат?",
+    "Anyone": "Било ко",
+    "Members only (since the point in time of selecting this option)": "Само чланови (од тренутка бирања ове опције)",
+    "Members only (since they were invited)": "Само чланови (од тренутка позивања)",
+    "Members only (since they joined)": "Само чланови (од приступања)",
+    "Permissions": "Овлашћења",
+    "The default role for new room members is": "Подразумевана улога за нове чланове у соби је",
+    "To send messages, you must be a": "Да бисте слали поруке, морате бити",
+    "To invite users into the room, you must be a": "Да бисте позивали кориснике у собу, морате бити",
+    "To configure the room, you must be a": "Да бисте подешавали собу, морате бити",
+    "To kick users, you must be a": "Да бисте избацивали кориснике, морате бити",
+    "To ban users, you must be a": "Да бисте забрањивали приступ корисницима, морате бити",
+    "To remove other users' messages, you must be a": "Да бисте уклањали поруке других корисника, морате бити",
+    "To send events of type <eventType/>, you must be a": "Да бисте слали догађаје врсте <eventType/>, морате бити",
+    "Advanced": "Напредно",
+    "This room's internal ID is": "Унутрашњи ИБ ове собе је",
+    "Add a topic": "Додај тему",
+    "Cancel": "Откажи",
+    "Scroll to unread messages": "Превуци на непрочитане поруке",
+    "Jump to first unread message.": "Скочи на прву непрочитану поруку.",
+    "Close": "Затвори",
+    "Invalid alias format": "Неисправан облик алијаса",
+    "'%(alias)s' is not a valid format for an alias": "„%(alias)s 1“ није исправан облик алијаса",
+    "Invalid address format": "Неисправан облик адресе",
+    "'%(alias)s' is not a valid format for an address": "„%(alias)s“ није исправан облик адресе",
+    "not specified": "није наведено",
+    "not set": "није постављено",
+    "Remote addresses for this room:": "Удаљене адресе за ову собу:",
+    "Addresses": "Адресе",
+    "The main address for this room is": "Главна адреса ове собе је",
+    "Local addresses for this room:": "Локална адреса ове собе:",
+    "This room has no local addresses": "Ова соба нема локалних адреса",
+    "New address (e.g. #foo:%(localDomain)s)": "Нова адреса (нпр.: #soba:%(localDomain)s)",
+    "Invalid community ID": "Неисправан ИБ заједнице",
+    "'%(groupId)s' is not a valid community ID": "„%(groupId)s“ није исправан ИБ заједнице",
+    "Flair": "Беџ",
+    "Showing flair for these communities:": "Приказујем беџ за ове заједнице:",
+    "This room is not showing flair for any communities": "Ова соба не приказује беџеве било које заједнице",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Нови ИБ заједнице (нпр.: +zajednica:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "<a>Омогућили</a> сте подразумеване претпрегледе адреса.",
+    "You have <a>disabled</a> URL previews by default.": "<a>Онемогућили</a> сте подразумеване претпрегледе адреса.",
+    "URL previews are enabled by default for participants in this room.": "Претпрегледи адреса су подразумевано омогућени за све чланове ове собе.",
+    "URL previews are disabled by default for participants in this room.": "Претпрегледи адреса су подразумевано онемогућени за све чланове ове собе.",
+    "URL Previews": "Претпрегледи адреса",
+    "Error decrypting audio": "Грешка при дешифровању звука",
+    "Error decrypting attachment": "Грешка при дешифровању прилога",
+    "Decrypt %(text)s": "Дешифруј %(text)s",
+    "Download %(text)s": "Преузми %(text)s",
+    "Invalid file%(extra)s": "Неисправна датотека %(extra)s",
+    "Error decrypting image": "Грешка при дешифровању слике",
+    "Image '%(Body)s' cannot be displayed.": "Слика „%(Body)s“ се не може приказати.",
+    "This image cannot be displayed.": "Ова слика се не може приказати.",
+    "Error decrypting video": "Грешка при дешифровању видеа",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "Корисник %(senderDisplayName)s је променио аватара собе %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "Корисник %(senderDisplayName)s је уклонио аватара собе.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "Корисник %(senderDisplayName)s је променио аватара собе у <img/>",
+    "Copied!": "Копирано!",
+    "Failed to copy": "Нисам успео да ископирам",
+    "Add an Integration": "Додај уградњу",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Бићете пребачени на сајт треће стране да бисте се идентификовали са својим налогом зарад коришћења уградње %(integrationsUrl)s. Да ли желите да наставите?",
+    "Removed or unknown message type": "Уклоњена порука или порука непознатог типа",
+    "Message removed by %(userId)s": "Поруку је уклонио корисник %(userId)s",
+    "Message removed": "Порука је уклоњена",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Роботска провера тренутно није доступна у стоним програмима, користите <a>веб прегледач</a>",
+    "This Home Server would like to make sure you are not a robot": "Овај кућни сервер жели да се увери да нисте робот",
+    "Sign in with CAS": "Пријавите се уз CAS",
+    "Custom Server Options": "Прилагођене опције сервера",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Можете користити прилагођене опције сервера да бисте се пријавили на друге Матрикс сервере тако што ћете навести другачију адресу кућног сервера.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Ово омогућава коришћење ове апликације са постојећим Матрикс налогом на другом кућном серверу.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Можете такође поставити прилагођени сервер идентитета али ово уобичајено спречава радње са другим корисницима које користе мејл адресе.",
+    "Dismiss": "Одбаци",
+    "To continue, please enter your password.": "Да бисте наставили, унесите вашу лозинку.",
+    "Password:": "Лозинка:",
+    "An email has been sent to %(emailAddress)s": "Мејл је послат на адресу %(emailAddress)s",
+    "Please check your email to continue registration.": "Проверите ваше сандуче да бисте наставили регистровање.",
+    "Token incorrect": "Жетон је нетачан",
+    "A text message has been sent to %(msisdn)s": "Текстуална порука је послата на %(msisdn)s",
+    "Please enter the code it contains:": "Унесите код који се налази у њој:",
+    "Start authentication": "Започните идентификацију",
+    "powered by Matrix": "покреће Матрикс",
+    "Username on %(hs)s": "Корисничко на %(hs)s",
+    "User name": "Корисничко име",
+    "Mobile phone number": "Мобилни број телефона",
+    "Forgot your password?": "Заборавили сте лозинку?",
+    "%(serverName)s Matrix ID": "%(serverName)s Матрикс ИБ",
+    "Sign in with": "Пријавите се преко",
+    "Email address": "Мејл адреса",
+    "Sign in": "Пријави се",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ако не наведете мејл адресу, нећете моћи да опоравите вашу лозинку. Да ли сте сигурни?",
+    "Email address (optional)": "Мејл адреса (изборно)",
+    "You are registering with %(SelectedTeamName)s": "Региструјете се уз %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Број мобилног телефона (изборно)",
+    "Register": "Регистровање",
+    "Default server": "Подразумевани сервер",
+    "Custom server": "Прилагођени сервер",
+    "Home server URL": "Адреса кућног сервера",
+    "Identity server URL": "Адреса сервера идентитета",
+    "What does this mean?": "Шта ово значи?",
+    "Remove from community": "Уклони из заједнице",
+    "Disinvite this user from community?": "Отказати позивницу у заједницу овом кориснику?",
+    "Remove this user from community?": "Уклонити овог корисника из заједнице?",
+    "Failed to withdraw invitation": "Нисам успео да повучем позивницу",
+    "Failed to remove user from community": "Нисам успео да уклоним кориснике из заједнице",
+    "Filter community members": "Филтрирај чланове заједнице",
+    "Flair will appear if enabled in room settings": "Беџ ће се приказати ако се омогући у подешавањима собе",
+    "Flair will not appear": "Беџ се неће приказати",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Да ли сте сигурни да желите да уклоните собу „%(roomName)s“ из %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Уклањање собе из заједнице је такође уклања и са странице заједнице.",
+    "Remove": "Уклони",
+    "Failed to remove room from community": "Нисам успео да уклоним собу из заједнице",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Нисам успео да уклоним собу „%(roomName)s“ из %(groupId)s",
+    "Something went wrong!": "Нешто је пошло наопако!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Видљивост собе „%(roomName)s“ у %(groupId)s није могла бити измењена.",
+    "Visibility in Room List": "Видљивост у списку соба",
+    "Visible to everyone": "Видљиво свима",
+    "Only visible to community members": "Видљиво само члановима заједнице",
+    "Filter community rooms": "Филтрирај собе заједнице",
+    "Something went wrong when trying to get your communities.": "Нешто је пошло наопако приликом добављања ваших заједница.",
+    "Display your community flair in rooms configured to show it.": "Приказује ваш беџ заједнице у собама које су подешене за то.",
+    "You're not currently a member of any communities.": "Тренутно нисте члан било које заједнице.",
+    "Unknown Address": "Непозната адреса",
+    "NOTE: Apps are not end-to-end encrypted": "НАПОМЕНА: Апликације не користе шифровање с краја на крај",
+    "Do you want to load widget from URL:": "Да ли желите да учитате виџет са адресе:",
+    "Allow": "Дозволи",
+    "Delete Widget": "Обриши виџет",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Брисање виџета уклања виџет за све чланове ове собе. Да ли сте сигурни да желите обрисати овај виџет?",
+    "Delete widget": "Обриши виџет",
+    "Revoke widget access": "Опозови приступ виџету",
+    "Minimize apps": "Умањи апликације",
+    "Edit": "Уреди",
+    "Create new room": "Направи нову собу",
+    "Unblacklist": "Скини са црног списка",
+    "Blacklist": "Стави на црни списак",
+    "Unverify": "Скини потврду",
+    "Verify...": "Потврди...",
+    "No results": "Нема резултата",
+    "Delete": "Обриши",
+    "Communities": "Заједнице",
+    "Home": "Почетна",
+    "Integrations Error": "Грешка са уградњама",
+    "Could not connect to the integration server": "Не могу да се повежем на сервер за уградње",
+    "Manage Integrations": "Управљај уградњама",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s су ушли %(count)s пута",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s је ушло",
+    "%(oneUser)sjoined %(count)s times|other": "Корисник %(oneUser)s је ушао %(count)s пута",
+    "%(oneUser)sjoined %(count)s times|one": "Корисник %(oneUser)s је ушао",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s је изашло %(count)s пута",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s је изашло",
+    "%(oneUser)sleft %(count)s times|other": "Корисник %(oneUser)s је изашло %(count)s пута",
+    "%(oneUser)sleft %(count)s times|one": "Корисник %(oneUser)s је изашао",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s је ушло и изашло %(count)s пута",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s је ушло и изашло",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s је ушао и изашао %(count)s пута",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s је ушао и изашао",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s је изашло и поново ушло %(count)s пута",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s је изашло и поново ушло",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s је изашао и поново ушао %(count)s пута",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s је изашао и поново ушао",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s је одбило њихове позивнице %(count)s пута",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s је одбило њихове позивнице",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s је одбио позивницу %(count)s пута",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s је одбио позивницу"
 }

From 8a6727ea98ea8034bbe79d29d6e6bc6585dbff43 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 30 Jan 2018 10:55:23 +0000
Subject: [PATCH 426/927] This is actually MFileBody not MImageBody, change
 classname

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

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index d106d7368e..c324c291e7 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -295,7 +295,7 @@ module.exports = React.createClass({
 
                 return (
                     <span className="mx_MFileBody" ref="body">
-                        <div className="mx_MImageBody_download">
+                        <div className="mx_MFileBody_download">
                             <a href="javascript:void(0)" onClick={decrypt}>
                                 { _t("Decrypt %(text)s", { text: text }) }
                             </a>
@@ -327,7 +327,7 @@ module.exports = React.createClass({
             }
             return (
                 <span className="mx_MFileBody">
-                    <div className="mx_MImageBody_download">
+                    <div className="mx_MFileBody_download">
                         <div style={{display: "none"}}>
                             { /*
                               * Add dummy copy of the "a" tag
@@ -347,7 +347,7 @@ module.exports = React.createClass({
             if (this.props.tileShape === "file_grid") {
                 return (
                     <span className="mx_MFileBody">
-                        <div className="mx_MImageBody_download">
+                        <div className="mx_MFileBody_download">
                             <a className="mx_ImageBody_downloadLink" href={contentUrl} download={fileName} target="_blank">
                                 { fileName }
                             </a>
@@ -360,7 +360,7 @@ module.exports = React.createClass({
             } else {
                 return (
                     <span className="mx_MFileBody">
-                        <div className="mx_MImageBody_download">
+                        <div className="mx_MFileBody_download">
                             <a href={contentUrl} download={fileName} target="_blank" rel="noopener">
                                 <img src={tintedDownloadImageURL} width="12" height="14" ref="downloadImage" />
                                 { _t("Download %(text)s", { text: text }) }

From 3a33eea5e9569b54094b99ae7b729a7cb5e6cdab Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Tue, 30 Jan 2018 20:29:30 +0000
Subject: [PATCH 427/927] Translated using Weblate (Dutch)

Currently translated at 75.5% (743 of 984 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 492d9d596c..9ad7c6d5bb 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -727,5 +727,20 @@
     "Presence Management": "Presentie Beheer",
     "Tag Panel": "Label Paneel",
     "Disable Emoji suggestions while typing": "Emoji suggesties tijdens het typen uitzetten",
-    "Hide avatar changes": "Avatar veranderingen verbergen"
+    "Hide avatar changes": "Avatar veranderingen verbergen",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Hide display name changes": "Weergavenaam wijzigingen verbergen",
+    "Enable inline URL previews by default": "Inline URL voorvertoning standaard aanzetten",
+    "Enable URL previews for this room (only affects you)": "URL voorvertoning in deze ruimte aanzetten (geldt alleen voor jou)",
+    "Enable URL previews by default for participants in this room": "URL voorvertoning standaard voor de gebruikers in deze ruimte aanzetten",
+    "Delete %(count)s devices|other": "Verwijder %(count)s apparaten",
+    "Delete %(count)s devices|one": "Verwijder apparaat",
+    "Select devices": "Apparaten selecteren",
+    "%(senderName)s sent an image": "%(senderName)s heeft een afbeelding gestuurd",
+    "%(senderName)s sent a video": "%(senderName)s heeft een video gestuurd",
+    "%(senderName)s uploaded a file": "%(senderName)s heeft een bestand geüpload",
+    "Disinvite this user?": "Uitnodiging van deze gebruiker intrekken?",
+    "Kick this user?": "Deze gebruiker er uit zetten?",
+    "Unban this user?": "Deze gebruiker ontbannen?",
+    "Ban this user?": "Deze gebruiker bannen?"
 }

From 497cf21c8669f6f17c3498714b880c01f1209c85 Mon Sep 17 00:00:00 2001
From: David Baker <github@dbkr.co.uk>
Date: Thu, 1 Feb 2018 10:31:44 +0000
Subject: [PATCH 428/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f2e48905d5..7bfadfc96e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -903,7 +903,7 @@
     "Room Notification": "Szoba értesítések",
     "Show these rooms to non-members on the community page and room list?": "Mutassuk meg ezeket a szobákat kívülállóknak a közösségi oldalon és a szobák listájában?",
     "Sign in to get started": "Az induláshoz jelentkezz be",
-    "Status.im theme": "Állapot téma",
+    "Status.im theme": "Status.im téma",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Figyelem, a %(hs)s szerverre jelentkezel be és nem a matrix.org szerverre.",
     "Username on %(hs)s": "Felhasználónév a %(hs)s szerveren",
     "Restricted": "Korlátozott",

From 41c9cb1c27112ea024605a46bb62a72f773545bc Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 1 Feb 2018 15:11:44 +0000
Subject: [PATCH 429/927] Translated using Weblate (German)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d0c193bfa9..dd5ed801a3 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -974,5 +974,15 @@
     "Your homeserver's URL": "Die URL deines Homeservers",
     "Your identity server's URL": "Die URL deines Identitätsservers",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "Tag Panel": "Beschriftungsfeld"
+    "Tag Panel": "Beschriftungsfeld",
+    "Message Replies": "Antworten auf Nachrichten",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Du wirst nicht in der Lage sein, die Änderung zurückzusetzen, da du dich degradierst. Wenn du der letze Nutzer mit Berechtigungen bist, wird es unmöglich sein die Privilegien zurückzubekommen.",
+    "Community IDs cannot not be empty.": "Community-IDs können nicht leer sein.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>trotzdem senden</sendAnywayText> oder <cancelText>abbrechen</cancelText>.",
+    "Learn more about how we use analytics.": "Lerne mehr darüber, wie wir die Analysedaten nutzen.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Wenn diese Seite identifizierbare Informationen sowie Raum, Nutzer oder Gruppen-ID enthalten, werden diese Daten entfernt bevor sie an den Server gesendet werden.",
+    "Whether or not you're logged in (we don't record your user name)": "Ob oder ob du nicht angemeldet bist (wir zeichnen deinen Benutzernamen nicht auf)",
+    "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
+    "<a>In reply to</a> <pill>": "<a>Antwort zu</a> <pill>",
+    "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können."
 }

From d1a24ac87b56d5fb7a1b2f28ea6189bcfc508227 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 2 Feb 2018 08:12:56 +0000
Subject: [PATCH 430/927] guard against m.room.aliases events with no keys
 (redaction?)

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

diff --git a/src/components/views/room_settings/AliasSettings.js b/src/components/views/room_settings/AliasSettings.js
index 2915a061de..bd92d75dd9 100644
--- a/src/components/views/room_settings/AliasSettings.js
+++ b/src/components/views/room_settings/AliasSettings.js
@@ -58,8 +58,8 @@ module.exports = React.createClass({
 
         state.domainToAliases = this.aliasEventsToDictionary(aliasEvents);
 
-        state.remoteDomains = Object.keys(state.domainToAliases).filter((alias) => {
-            return alias !== localDomain;
+        state.remoteDomains = Object.keys(state.domainToAliases).filter((domain) => {
+            return domain !== localDomain && state.domainToAliases[domain].length > 0;
         });
 
         if (canonicalAliasEvent) {
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 0bbf33478d..ea4a29615e 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -774,7 +774,8 @@ module.exports = React.createClass({
         const aliasEvents = this.props.room.currentState.getStateEvents('m.room.aliases') || [];
         let aliasCount = 0;
         aliasEvents.forEach((event) => {
-            aliasCount += event.getContent().aliases.length;
+            const aliases = event.getContent().aliases || [];
+            aliasCount += aliases.length;
         });
 
         if (this.state.join_rule === "public" && aliasCount == 0) {

From d884596a1f2b770fac9bb940042ade0a1d945dff Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Sun, 4 Feb 2018 14:22:56 +0000
Subject: [PATCH 431/927] Translated using Weblate (Dutch)

Currently translated at 100.0% (984 of 984 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 9ad7c6d5bb..b3dcfb3a8b 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -42,7 +42,7 @@
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s heeft het onderwerp gewijzigd naar \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Veranderingen aan wie de geschiedenis kan lezen worden alleen maar toegepast op toekomstige berichten in deze ruimte",
     "Changes your display nickname": "Verandert jouw weergavenaam",
-    "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.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde chat geschiedenis onleesbaar zou maken, behalve als je eerst je ruimtesleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
+    "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.": "Het veranderen van het wachtwoord zal op het moment alle eind-tot-eind encryptie sleutels resetten, wat alle versleutelde gespreksgeschiedenis onleesbaar zou maken, behalve als je eerst je ruimtesleutels exporteert en achteraf opnieuw importeert. Dit zal worden verbeterd in de toekomst.",
     "Clear Cache and Reload": "Legen cache en herlaad",
     "Clear Cache": "Legen cache",
     "Click here to fix": "Klik hier om op te lossen",
@@ -178,7 +178,7 @@
     "Cryptography": "Cryptografie",
     "Current password": "Huidig wachtwoord",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s heeft de naam van de ruimte verwijderd.",
-    "Create a new chat or reuse an existing one": "Maak een nieuwe chat aan of ga verder met een bestaande",
+    "Create a new chat or reuse an existing one": "Maak een nieuw gesprek aan of hergebruik een al bestaand gesprek",
     "Create Room": "Maak een ruimte aan",
     "Curve25519 identity key": "Curve25519-identiteitssleutel",
     "/ddg is not a command": "/ddg is geen commando",
@@ -556,7 +556,7 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Het te exporteren bestand zal beveiligd zijn met een wachtzin. Je moet hier een wachtzin invoeren om het bestand te ontsleutelen.",
     "You must join the room to see its files": "Je moet tot een ruimte toetreden om de bestanden te zien",
     "Reject all %(invitedRooms)s invites": "Alle %(invitedRooms)s uitnodigingen afslaan",
-    "Start new chat": "Nieuwe chat starten",
+    "Start new chat": "Nieuw gesprek starten",
     "Failed to invite": "Niet gelukt om uit te nodigen",
     "Failed to invite user": "Niet gelukt om de gebruiker uit te nodigen",
     "Failed to invite the following users to the %(roomName)s room:": "Niet gelukt om de volgende gebruikers voor de %(roomName)s ruimte uit te nodigen:",
@@ -742,5 +742,245 @@
     "Disinvite this user?": "Uitnodiging van deze gebruiker intrekken?",
     "Kick this user?": "Deze gebruiker er uit zetten?",
     "Unban this user?": "Deze gebruiker ontbannen?",
-    "Ban this user?": "Deze gebruiker bannen?"
+    "Ban this user?": "Deze gebruiker bannen?",
+    "Disable big emoji in chat": "Grote emoji in gesprekken uitzetten",
+    "Mirror local video feed": "Lokale video aanvoering ook op andere locaties (Mirrors) opslaan",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Je kan deze actie niet ongedaan maken omdat je jezelf degradeert. Als je het laatste persoon met rechten bent, is het onmogelijk om de rechten terug te krijgen.",
+    "Unignore": "Niet meer negeren",
+    "Ignore": "Negeren",
+    "Jump to read receipt": "Naar het laatst gelezen bericht gaan",
+    "Mention": "Vermelden",
+    "Invite": "Uitnodigen",
+    "User Options": "Gebruikersopties",
+    "Send an encrypted reply…": "Verstuur een versleuteld antwoord…",
+    "Send a reply (unencrypted)…": "Verstuur een antwoord (onversleuteld)…",
+    "Send an encrypted message…": "Verstuur een versleuteld bericht…",
+    "Send a message (unencrypted)…": "Verstuur een bericht (onversleuteld)…",
+    "Jump to message": "Naar bericht gaan",
+    "No pinned messages.": "Geen gepinde berichten.",
+    "Loading...": "Laden...",
+    "Pinned Messages": "Gepinde Berichten",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)su",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "Online voor %(duration)s",
+    "Idle for %(duration)s": "Inactief voor %(duration)s",
+    "Offline for %(duration)s": "Offline voor %(duration)s",
+    "Unknown for %(duration)s": "Onbekend voor %(duration)s",
+    "Unknown": "Onbekend",
+    "Replying": "Aan het beantwoorden",
+    "No rooms to show": "Geen ruimtes om weer te geven",
+    "Unnamed room": "Ruimte zonder naam",
+    "World readable": "Leesbaar voor iedereen",
+    "Guests can join": "Gasten kunnen toetreden",
+    "Remove avatar": "Avatar verwijderen",
+    "To change the room's avatar, you must be a": "Om de avatar van de ruimte te verwijderen, moet het volgende zijn:",
+    "Drop here to favourite": "Hier laten vallen om aan favorieten toe te voegen",
+    "Drop here to tag direct chat": "Hier laten vallen om als privégesprek te markeren",
+    "Drop here to restore": "Hier laten vallen om te herstellen",
+    "Drop here to demote": "Hier laten vallen om te degraderen",
+    "Community Invites": "Gemeenschapsuitnodigingen",
+    "You have been kicked from this room by %(userName)s.": "Je bent uit deze ruimte gezet door %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Je bent uit deze ruimte verbannen door %(userName)s.",
+    "You are trying to access a room.": "Je probeert een ruimte te betreden.",
+    "To change the room's name, you must be a": "Om de ruimtenaam te veranderen moet je het volgende zijn:",
+    "To change the room's main address, you must be a": "Om het hoofdadres van deze ruimte te wijzigen moet je het volgende zijn:",
+    "To change the room's history visibility, you must be a": "Om de zichtbaarheid van de geschiedenis van de ruimte te veranderen moet je het volgende zijn:",
+    "To change the permissions in the room, you must be a": "Om de permissies in de ruimte te veranderen moet je het volgende zijn:",
+    "To change the topic, you must be a": "Om het onderwerp te veranderen moet je het volgende zijn:",
+    "To modify widgets in the room, you must be a": "Om een widget in de ruimte aan te passen moet je het volgende zijn:",
+    "Banned by %(displayName)s": "Verbannen door %(displayName)s",
+    "Members only (since the point in time of selecting this option)": "Alleen gebruikers (vanaf het moment dat deze optie wordt geselecteerd)",
+    "Members only (since they were invited)": "Alleen gebruikers (vanaf het moment dat ze uitgenodigd zijn)",
+    "Members only (since they joined)": "Alleen gebruikers (vanaf het moment dat ze toegetreden zijn)",
+    "To send messages, you must be a": "Om berichten te versturen moet je het volgende zijn:",
+    "To invite users into the room, you must be a": "Om gebruikers in de ruimte uit te nodigen moet je het volgende zijn:",
+    "To configure the room, you must be a": "Om de ruimte te configureren moet je het volgende zijn:",
+    "To kick users, you must be a": "Om gebruikers er uit te zetten moet je het volgende zijn:",
+    "To ban users, you must be a": "Om gebruikers te verbannen moet je het volgende zijn:",
+    "To remove other users' messages, you must be a": "Om de berichten van andere gebruikers te verwijderen moet je het volgende zijn:",
+    "To send events of type <eventType/>, you must be a": "Om gebeurtenissen van het type <eventType/> te versturen, moet je het volgende zijn:",
+    "Addresses": "Adressen",
+    "Invalid community ID": "Ongeldig gemeenschaps-ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is niet een geldig gemeenschaps-ID",
+    "Flair": "Badge",
+    "Showing flair for these communities:": "Badges voor deze gemeenschappen weergeven:",
+    "This room is not showing flair for any communities": "Deze ruimte geeft geen badges voor gemeenschappen weer",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nieuw gemeenschaps-ID (bv. +foo:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "URL voorvertoning staat standaard aan voor deelnemers in deze ruimte.",
+    "URL previews are disabled by default for participants in this room.": "URL voorvertoning staat standaard uit voor deelnemers in deze ruimte.",
+    "Message removed by %(userId)s": "Bericht verwijderd door %(userId)s",
+    "Message removed": "Bericht verwijderd",
+    "An email has been sent to %(emailAddress)s": "Een e-mail is naar %(emailAddress)s verstuurd",
+    "A text message has been sent to %(msisdn)s": "Een tekstbericht is naar %(msisdn)s versuurd",
+    "Username on %(hs)s": "Gebruikersnaam op %(hs)s",
+    "Remove from community": "Verwijder van gemeenschap",
+    "Disinvite this user from community?": "Uitnodiging van de gemeenschap voor deze gebruiker intrekken?",
+    "Remove this user from community?": "Deze gebruiker van de gemeenschap verwijderen?",
+    "Failed to withdraw invitation": "Niet gelukt om de uitnodiging in te trekken",
+    "Failed to remove user from community": "Niet gelukt om de gebruiker van de gemeenschap te verwijderen",
+    "Filter community members": "Filter gemeenschapsleden",
+    "Flair will appear if enabled in room settings": "Badge zal worden weergeven als het aangezet is in de ruimte-instellingen",
+    "Flair will not appear": "Badge zal niet weergeven worden",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Weet je zeker dat je '%(roomName)s' van %(groupId)s wilt verwijderen?",
+    "Removing a room from the community will also remove it from the community page.": "Het verwijderen van de ruimte van de gemeenschap zal de ruimte ook van de gemeenschapspagina verwijderen.",
+    "Failed to remove room from community": "Niet gelukt om de ruimte van de gemeenschap te verwijderen",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Niet gelijkt om '%(roomName)s' van %(groupId)s te verwijderen",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "De zichtbaarheid van '%(roomName)s' in %(groupId)s kon niet geüpdatet worden.",
+    "Visibility in Room List": "Zichtbaarheid in Ruimte Lijst",
+    "Visible to everyone": "Zichtbaar voor iedereen",
+    "Only visible to community members": "Alleen zichtbaar voor gemeenschapsleden",
+    "Filter community rooms": "Gemeenschapsruimtes filteren",
+    "Something went wrong when trying to get your communities.": "Iets ging verkeerd tijdens het ophalen van je gemeenschappen.",
+    "Display your community flair in rooms configured to show it.": "Geef je gemeenschapsbadge weer in ruimtes die geconfigureerd zijn om het te weergeven.",
+    "You're not currently a member of any communities.": "Je bent momenteel niet een lid van een gemeenschap.",
+    "Minimize apps": "Applicaties minimaliseren",
+    "Communities": "Gemeenschappen",
+    "%(nameList)s %(transitionList)s": "%(nameList)s%(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s traden %(count)s keer toe",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s zijn toegetreden",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s trad %(count)s keer toe",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s is toegetreden",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s gingen %(count)s keer weg",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s gingen weg",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s ging %(count)s keer weg",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s ging weg",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s traden toe en gingen weer weg voor %(count)s keer",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s traden toe en gingen weer weg",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s trad toe en ging weer weg voor %(count)s keer",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s trad toe en ging weer weg",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s ging weg en trad weer toe voor %(count)s keer",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s gingen weg en kwamen weer terug",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s ging weg en kwam weer terug voor %(count)s keer",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s ging weg en kwam weer terug",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s wezen hun uitnodiging af voor %(count)s keer",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s wezen hun uitnodiging af",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s wees %(count)s keer zijn of haar uitnodiging af",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s wees zijn of haar uitnodiging af",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "De uitnodigingen naar %(severalUsers)s zijn %(count)s keer ingetrokken",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "De uitnodigingen voor %(severalUsers)s zijn ingetrokken",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "De uitnodiging van %(oneUser)s is %(count)s keer ingetrokken",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "De uitnodiging van %(oneUser)s is ingetrokken",
+    "were invited %(count)s times|other": "was %(count)s keer uitgenodigd",
+    "were invited %(count)s times|one": "was uitgenodigd",
+    "was invited %(count)s times|other": "was %(count)s keer uitgenodigd",
+    "was invited %(count)s times|one": "was uitgenodigd",
+    "were banned %(count)s times|other": "was %(count)s keer verbannen",
+    "were banned %(count)s times|one": "was verbannen",
+    "was banned %(count)s times|other": "was %(count)s keer verbannen",
+    "was banned %(count)s times|one": "was verbannen",
+    "were unbanned %(count)s times|other": "zijn voor %(count)s keer ontbannen",
+    "was unbanned %(count)s times|other": "was %(count)s keer ontbannen",
+    "was unbanned %(count)s times|one": "was ontbannen",
+    "were kicked %(count)s times|other": "werden er %(count)s keer uitgezet",
+    "were kicked %(count)s times|one": "werden er uit gezet",
+    "was kicked %(count)s times|other": "was er %(count)s keer uitgezet",
+    "was kicked %(count)s times|one": "was er uit gezet",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s veranderden hun naam %(count)s keer",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s veranderden hun naam",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s veranderde zijn of haar naam %(count)s keer",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s veranderde zijn of haar naam",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s veranderden hun avatar %(count)s keer",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s veranderden hun avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s veranderde zijn of haar avatar %(count)s keer",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s veranderde zijn of haar avatar",
+    "%(items)s and %(count)s others|other": "%(items)s en %(count)s anderen",
+    "%(items)s and %(count)s others|one": "%(items)s en één andere",
+    "collapse": "inklappen",
+    "expand": "openklappen",
+    "Custom of %(powerLevel)s": "Aangepast rank van %(powerLevel)s",
+    "Quote": "Citeren",
+    "And %(count)s more...|other": "En %(count)s meer...",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "Matrix Ruimte ID",
+    "email address": "e-mailadres",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Probeer één van de volgende geldige adrestypes: %(validTypesList)s.",
+    "You have entered an invalid address.": "Je hebt een ongeldig adres ingevoerd.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Een gemeenschaps-ID mag alleen de karakters a-z, 0-9, of '=_-./' bevatten.",
+    "Community IDs cannot not be empty.": "Een gemeenschaps-ID kan niet leeg zijn.",
+    "Something went wrong whilst creating your community": "Er is iets fout gegaan tijdens het aanmaken van je gemeenschap",
+    "Create Community": "Gemeenschap Aanmaken",
+    "Community Name": "Gemeenschapsnaam",
+    "Community ID": "Gemeenschap-ID",
+    "example": "voorbeeld",
+    "Advanced options": "Geavanceerde opties",
+    "Block users on other matrix homeservers from joining this room": "Gebruikers van andere matrix thuisservers niet toestaan om tot deze ruimte toe te treden",
+    "This setting cannot be changed later!": "Deze instelling kan niet later veranderd worden!",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML voor je gemeenschapspagina</h1>\n<p>\n    Gebruik de lange beschrijving om nieuwe leden in de gemeenschap te introduceren of om belangrijke <a href=\"foo\">links</a> te verspreiden\n</p>\n<p>\n    Je kan zelfs 'img' tags gebruiken\n</p>\n",
+    "Add rooms to the community summary": "Voeg ruimtes aan de gemeenschapssamenvatting toe",
+    "Which rooms would you like to add to this summary?": "Welke ruimtes zou je aan deze samenvatting willen toevoegen?",
+    "Add to summary": "Voeg aan samenvatting toe",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Het is niet gelukt om de volgende ruimtes aan de samenvatting van %(groupId)s toe te voegen:",
+    "Add a Room": "Voeg een ruimte toe",
+    "Failed to remove the room from the summary of %(groupId)s": "Het is niet gelukt om de ruimte van de samenvatting van %(groupId)s te verwijderen",
+    "The room '%(roomName)s' could not be removed from the summary.": "De ruimte '%(roomName)s' kan niet van de samenvatting verwijderd worden.",
+    "Add users to the community summary": "Voeg gebruikers aan de gemeenschapssamenvatting toe",
+    "Who would you like to add to this summary?": "Wie zou je aan de samenvatting toe willen voegen?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Het is niet gelukt om de volgende gebruikers aan de samenvatting van %(groupId)s toe te voegen:",
+    "Add a User": "Voeg een Gebruiker toe",
+    "Failed to remove a user from the summary of %(groupId)s": "Het is niet gelukt om een gebruiker van de samenvatting van %(groupId)s te verwijderen",
+    "The user '%(displayName)s' could not be removed from the summary.": "De gebruiker '%(displayName)s' kon niet van de samenvatting verwijderd worden.",
+    "Failed to update community": "Het is niet gelukt om de gemeenschap te updaten",
+    "Unable to accept invite": "De uitnodiging kon niet geaccepteerd worden",
+    "Unable to reject invite": "De uitnodiging kon niet afgewezen worden",
+    "Leave Community": "Gemeenschap Verlaten",
+    "Leave %(groupName)s?": "%(groupName)s verlaten?",
+    "Leave": "Verlaten",
+    "Unable to leave room": "De ruimte kon niet verlaten worden",
+    "Community Settings": "Gemeenschapsinstellingen",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Deze ruimtes worden aan gemeenschapsleden getoond op de gemeenschapspagina. Gemeenschapsleden kunnen tot de ruimtes toetreden door er op te klikken.",
+    "%(inviter)s has invited you to join this community": "%(inviter)s heeft jou uitgenodigd om tot deze gemeenschap toe te treden",
+    "You are an administrator of this community": "Je bent een administrator van deze gemeenschap",
+    "You are a member of this community": "Je bent lid van deze gemeenschap",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Jouw gemeenschap heeft geen Lange Beschrijving (een HTML pagina dat aan de gemeenschapsleden wordt weergeven).<br/>Klik hier om de instellingen te openen en een Lange Beschrijving te maken!",
+    "Long Description (HTML)": "Lange Beschrijving (HTML)",
+    "Description": "Beschrijving",
+    "Community %(groupId)s not found": "Gemeenschap %(groupId)s is niet gevonden",
+    "This Home server does not support communities": "Deze Thuisserver ondersteunt geen gemeenschappen",
+    "Failed to load %(groupId)s": "Het is niet gelukt om %(groupId)s te laden",
+    "Cryptography data migrated": "Cryptografie gegevens zijn gemigreerd",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Een eenmalige migratie van cryptografie gegevens heeft plaatsgevonden. Eind-tot-eind versleuteling zal niet werken als je terug gaat naar een oudere versie van Riot. Log eerst uit op Riot als je eind-tot-eind versleuteling wil gebruiken op een oudere versie. Exporteer je sleutels en importeer ze achteraf weer als je de berichtgeschiedenis wilt behouden.",
+    "Old cryptography data detected": "Oude cryptografie gegevens gedetecteerd",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Er zijn gegevens van een oudere versie van Riot gedetecteerd. Dit zal eind-tot-eind versleuteling laten storen in de oudere versie. Eind-tot-eind berichten dat recent zijn uitgewisseld zal misschien niet ontsleutelbaar zijn in deze versie. Dit zou er misschien ook voor kunnen zorgen dat berichten die zijn uitgewisseld in deze versie falen. Indien je problemen ervaart, log opnieuw in. Om de berichtgeschiedenis te behouden, exporteer de sleutels en importeer ze achteraf weer.",
+    "Your Communities": "Jouw Gemeenschappen",
+    "Error whilst fetching joined communities": "Er is een fout opgetreden tijdens het ophalen van de gemeenschappen waar je lid van bent",
+    "Create a new community": "Maak een nieuwe gemeenschap aan",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Maak een gemeenschap aan om gebruikers en ruimtes samen te groeperen! Bouw een aangepaste homepagina om je eigen plek in het Matrix universum te maken.",
+    "Join an existing community": "Treed tot een bestaande gemeenschap toe",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Je moet het gemeenschaps-ID weten om tot de gemeenschap toe te treden; dit zal er uitzien zoals <i>+voorbeeld:matrix.org</i>.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Toon apparaten</showDevicesText>, <sendAnywayText>Toch versturen</sendAnywayText> of <cancelText>annuleren</cancelText>.",
+    "%(count)s of your messages have not been sent.|one": "Je bericht was niet verstuurd.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Nu alles <resendText>opnieuw versturen</resendText> of <cancelText>annuleren</cancelText>. Je kan ook individuele berichten selecteren om opnieuw te versturen of te annuleren.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "Nu <resendText>bericht opnieuw versturen</resendText> of <cancelText>bericht annuleren</cancelText>.",
+    "Warning": "Waarschuwing",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Er is niemand anders hier! Wil je <inviteText>anderen uitnodigen</inviteText> of <nowarnText>de waarschuwing over de lege ruimte stoppen</nowarnText>?",
+    "Light theme": "Licht thema",
+    "Dark theme": "Donker thema",
+    "Status.im theme": "Status.im thema",
+    "Ignored Users": "Genegeerde Gebruikers",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is belangrijk voor ons, dus we collecteren geen persoonlijke of identificeerbare gegevens voor onze gegevensanalyse.",
+    "Learn more about how we use analytics.": "Leer meer over hoe we gegevensanalyse gebruiken.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Een e-mail is naar %(emailAddress)s verstuurd. Klik hieronder zodra je de link hebt gevolgd.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Merk op dat je aan het inloggen bent in de %(hs)s server, niet matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Deze thuisserver heeft geen inlogmethodes die bij deze client ondersteunt worden.",
+    "Sign in to get started": "Log in om te beginnen",
+    "Ignores a user, hiding their messages from you": "Negeert een gebruiker, waardoor de berichten van de gebruiker onzichtbaar voor je worden",
+    "Stops ignoring a user, showing their messages going forward": "Stopt het negeren van een gebruiker, hierdoor worden de berichten van de gebruiker vanaf nu weer zichtbaar",
+    "Notify the whole room": "Notificeer de gehele ruimte",
+    "Room Notification": "Ruimte Notificatie",
+    "The information being sent to us to help make Riot.im better includes:": "De informatie dat naar ons wordt verstuurd om Riot.im beter te maken betrekt:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "We nemen ook elke pagina die je in de applicatie gebruikt (momenteel <CurrentPageHash>), je User Agent (<CurrentUserAgent>) en de resolutie van je apparaat (<CurrentDeviceResolution>) op.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Waar deze pagina identificeerbare informatie bevat, zoals een ruimte, gebruiker of groep ID, zal deze data verwijderd worden voordat het naar de server gestuurd wordt.",
+    "The platform you're on": "Het platform waar je je op bevindt",
+    "The version of Riot.im": "De versie van Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Of je wel of niet ingelogd bent (we nemen niet je gebruikersnaam op)",
+    "Your language of choice": "De taal waarin de applicatie wordt weergeven",
+    "Which officially provided instance you are using, if any": "Welke officieel verschafte instantie je gebruikt, in dat het geval is",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Of je wel of niet gebruik maakt van de Richttext modus of de Rich Text Editor",
+    "Your homeserver's URL": "De URL van je thuisserver",
+    "Your identity server's URL": "De URL van je thuisserver",
+    "<a>In reply to</a> <pill>": "<a>Als antwoord op</a> <pill>",
+    "This room is not public. You will not be able to rejoin without an invite.": "Deze ruimte is niet publiekelijk. Je zal niet opnieuw kunnen toetreden zonder een uitnodiging.",
+    "were unbanned %(count)s times|one": "waren ontbant"
 }

From 03b137d42555781b62baeb88d55f3e18bbc03470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Sat, 3 Feb 2018 15:38:29 +0000
Subject: [PATCH 432/927] Translated using Weblate (Catalan)

Currently translated at 88.5% (871 of 984 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index eb4ac76d05..49c2c6ed9b 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -317,7 +317,7 @@
     "Unignore": "Deixa de ignorar",
     "Ignore": "Ignora",
     "Jump to read receipt": "Vés a l'últim missatge llegit",
-    "Mention": "Menció",
+    "Mention": "Menciona",
     "Invite": "Convida",
     "User Options": "Opcions d'usuari",
     "Direct chats": "Xats directes",

From 41338013909f130fd5071b979220a2b63c862e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Sat, 3 Feb 2018 11:51:18 +0000
Subject: [PATCH 433/927] Translated using Weblate (Serbian)

Currently translated at 78.4% (772 of 984 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 6396455f9d..5d31879b2e 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -1,7 +1,7 @@
 {
     "This email address is already in use": "Ова мејл адреса се већ користи",
     "This phone number is already in use": "Овај број телефона се већ користи",
-    "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": "Нисам успео да проверим мејл адресу, постарајте се да сте кликнули на везу у мејлу",
     "The remote side failed to pick up": "Друга страна није подигла слушалицу",
     "Unable to capture screen": "Не могу да ухватим садржај екрана",
     "Existing Call": "Постојећи позив",
@@ -569,7 +569,7 @@
     "Unblacklist": "Скини са црног списка",
     "Blacklist": "Стави на црни списак",
     "Unverify": "Скини потврду",
-    "Verify...": "Потврди...",
+    "Verify...": "Провери...",
     "No results": "Нема резултата",
     "Delete": "Обриши",
     "Communities": "Заједнице",
@@ -597,5 +597,178 @@
     "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s је одбило њихове позивнице %(count)s пута",
     "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s је одбило њихове позивнице",
     "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s је одбио позивницу %(count)s пута",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s је одбио позивницу"
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s је одбио позивницу",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "Корисницима %(severalUsers)s су позивнице повучене %(count)s пута",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "Корисницима %(severalUsers)s су позивнице повучене",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "Кориснику %(oneUser)s је позивница повучена %(count)s пута",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "Кориснику %(oneUser)s је позивница повучена",
+    "were invited %(count)s times|other": "су позвани %(count)s пута",
+    "were invited %(count)s times|one": "су позвани",
+    "was invited %(count)s times|other": "је позван %(count)s пута",
+    "was invited %(count)s times|one": "је позван",
+    "were banned %(count)s times|other": "забрањен приступ %(count)s пута",
+    "were banned %(count)s times|one": "забрањен приступ",
+    "was banned %(count)s times|other": "забрањен приступ %(count)s пута",
+    "was banned %(count)s times|one": "забрањен приступ",
+    "were unbanned %(count)s times|other": "дозвољен приступ %(count)s пута",
+    "were unbanned %(count)s times|one": "дозвољен приступ",
+    "was unbanned %(count)s times|other": "дозвољен приступ %(count)s пута",
+    "was unbanned %(count)s times|one": "дозвољен приступ",
+    "were kicked %(count)s times|other": "избачен %(count)s пута",
+    "were kicked %(count)s times|one": "избачен",
+    "was kicked %(count)s times|other": "избачен %(count)s пута",
+    "was kicked %(count)s times|one": "избачен",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s је променило своје име %(count)s пута",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s је променило своје име",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s је променило своје име %(count)s пута",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s је променило своје име",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s је променило свој аватар %(count)s пута",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s је променило свој аватар",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s је променило свој аватар %(count)s пута",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s је променило свој аватар",
+    "%(items)s and %(count)s others|other": "%(items)s и %(count)s других",
+    "%(items)s and %(count)s others|one": "%(items)s и још један",
+    "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
+    "collapse": "скупи",
+    "expand": "рашири",
+    "Custom of %(powerLevel)s": "Прилагођени ниво %(powerLevel)s",
+    "Custom level": "Прилагођени ниво",
+    "Quote": "Цитат",
+    "Room directory": "Фасцикла са собама",
+    "Start chat": "Започни ћаскање",
+    "And %(count)s more...|other": "И %(count)s других...",
+    "ex. @bob:example.com": "нпр.: @pera:domen.rs",
+    "Add User": "Додај корисника",
+    "Matrix ID": "Матрикс ИБ",
+    "Matrix Room ID": "ИБ Матрикс собе",
+    "email address": "мејл адреса",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Пробајте са једним од следећих исправних типова адреса: %(validTypesList)s.",
+    "You have entered an invalid address.": "Унели сте неисправну адресу.",
+    "Create a new chat or reuse an existing one": "Започните ново ћаскање или искористите постојеће",
+    "Start new chat": "Започни ново ћаскање",
+    "You already have existing direct chats with this user:": "Већ имате постојећа директна ћаскања са овим корисником:",
+    "Start chatting": "Започни ћаскање",
+    "Click on the button below to start chatting!": "Кликните на дугме испод да бисте започели ћаскање!",
+    "Start Chatting": "Започни ћаскање",
+    "Confirm Removal": "Потврди уклањање",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Да ли сте сигурни да желите уклонити (обрисати) овај догађај? Знајте да брисање назива собе или мењање теме може опозвати измену.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "ИБ-јеви заједнице могу садржати само знакове a-z, 0-9, или '=_-./'",
+    "Community IDs cannot not be empty.": "ИБ-јеви заједнице не могу бити празни.",
+    "Something went wrong whilst creating your community": "Нешто је пошло наопако приликом стварања ваше заједнице",
+    "Create Community": "Направи заједницу",
+    "Community Name": "Назив заједнице",
+    "Example": "Пример",
+    "Community ID": "ИБ заједнице",
+    "example": "пример",
+    "Create": "Направи",
+    "Create Room": "Направи собу",
+    "Room name (optional)": "Назив собе (изборно)",
+    "Advanced options": "Напредне опције",
+    "Block users on other matrix homeservers from joining this room": "Блокирај приступ соби корисницима са других матрикс кућних сервера",
+    "This setting cannot be changed later!": "Ово подешавање се не може променити касније!",
+    "Unknown error": "Непозната грешка",
+    "Incorrect password": "Нетачна лозинка",
+    "Deactivate Account": "Угаси налог",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Ово ће учинити ваш налог трајно неупотребљивим. Нећете моћи да се поново региструјете са истим корисничким ИБ-јем.",
+    "This action is irreversible.": "Ова радња се не може поништити.",
+    "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:": "Да бисте проверили да се овом уређају може веровати, контактирајте власника користећи друге начине (нпр.: лично или преко телефонског позива) и питајте га да ли се кључ који види у корисничким подешавањима подудара са кључем испод:",
+    "Device name": "Назив уређаја",
+    "Device key": "Кључ уређаја",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Ако се подудара, притисните дугме за потврду провере испод. Ако се не подудара, неко други прислушкује овај уређај и вероватно желите да притиснете дугме за стављање на црни списак.",
+    "In future this verification process will be more sophisticated.": "У будућности ће овај поступак потврђивања бити напреднији.",
+    "Verify device": "Провери уређај",
+    "I verify that the keys match": "Потврђујем да се кључеви подударају",
+    "An error has occurred.": "Догодила се грешка.",
+    "OK": "У реду",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Додали сте нови уређај „%(displayName)s“ који захтева кључеве за шифровање.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Ваш непотврђени уређај „%(displayName)s“ захтева кључеве за шифровање.",
+    "Start verification": "Започни потврђивање",
+    "Share without verifying": "Подели без потврђивања",
+    "Ignore request": "Занемари захтев",
+    "Loading device info...": "Учитавам податке о уређају...",
+    "Encryption key request": "Захтев за кључ шифровања",
+    "Otherwise, <a>click here</a> to send a bug report.": "У супротном, <a>кликните овде</a> да бисте послали извештај о грешци.",
+    "Unable to restore session": "Не могу да повратим сесију",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Наишли смо на грешку приликом опоравка ваше претходне сесије. Ако наставите, мораћете да се пријавите поново и ваш шифровани историјат ћаскања неће бити читљив.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ако сте претходно користили новије издање Riot-а, ваша сесија може бити некомпатибилна са овим издањем. Затворите овај прозор и вратите се на новије издање.",
+    "Continue anyway": "Ипак настави",
+    "Invalid Email Address": "Неисправна мејл адреса",
+    "This doesn't appear to be a valid email address": "Изгледа да ово није исправна мејл адреса",
+    "Verification Pending": "Чека се на потврду",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Проверите ваш мејл и кликните на везу унутар њега. Када ово урадите, кликните на дугме „настави“.",
+    "Unable to add email address": "Не могу да додам мејл адресу",
+    "Unable to verify email address.": "Не могу да проверим мејл адресу.",
+    "This will allow you to reset your password and receive notifications.": "Ово омогућава поновно постављање лозинке и примање обавештења.",
+    "Skip": "Прескочи",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Корисничка имена могу садржати само слова, бројеве, тачке, повлаке и доње црте.",
+    "Username not available": "Корисничко име није доступно",
+    "Username invalid: %(errMessage)s": "Корисничко име није исправно: %(errMessage)s",
+    "An error occurred: %(error_string)s": "Догодила се грешка: %(error_string)s",
+    "Username available": "Корисничко име је доступно",
+    "To get started, please pick a username!": "Да бисте кренули, изаберите корисничко име!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Ово ће бити назив вашег налога на <span></span> кућном серверу, или можете изабрати <a>други сервер</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Ако већ имате Матрикс налог, можете се већ <a>пријавити</a>.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Тренутно убацујете непроверене уређаје на црни списак. Да бисте им слали поруке, морате их проверити.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Предлажемо да прођете кроз поступак провере сваког уређаја да бисте потврдили да они припадају њиховим стварним власницима али можете поново послати поруку без провере, ако то желите.",
+    "Room contains unknown devices": "Соба садржи непознате уређаје",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "Соба „%(RoomName)s“ садржи уређаје које нисте видели пре.",
+    "Unknown devices": "Непознати уређаји",
+    "Private Chat": "Приватно ћаскање",
+    "Public Chat": "Јавно ћаскање",
+    "Custom": "Прилагођено",
+    "Alias (optional)": "Алијас (изборно)",
+    "Name": "Име",
+    "Topic": "Тема",
+    "Make this room private": "Учини ову собу приватном",
+    "Share message history with new users": "Подели историјат порука са новим корисницима",
+    "Encrypt room": "Шифруј собу",
+    "You must <a>register</a> to use this functionality": "Морате се <a>регистровати</a> да бисте користили ову могућност",
+    "You must join the room to see its files": "Морате приступити соби да бисте видели њене датотеке",
+    "There are no visible files in this room": "Нема видљивих датотека у овој соби",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML за страницу ваше заједнице</h1>\n<p>\n    Користите дужи опис да бисте упознали нове чланове са заједницом, или поделили\n    неке важне <a href=\"foo\">везе</a>\n</p>\n<p>\n    Можете чак користити \"img\" ознаке\n</p>\n",
+    "Add rooms to the community summary": "Додај собе у кратак опис заједнице",
+    "Which rooms would you like to add to this summary?": "Које собе желите додати у овај кратак опис?",
+    "Add to summary": "Додај у кратак опис",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Нисам успео да додам следеће собе у кратак опис групе %(groupId)s:",
+    "Add a Room": "Додај собу",
+    "Failed to remove the room from the summary of %(groupId)s": "Нисам успео да уклоним собу из кратког описа групе %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Соба „%(roomName)s“ се не може уклонити из кратког описа.",
+    "Add users to the community summary": "Додај кориснике у кратак опис заједнице",
+    "Who would you like to add to this summary?": "Да ли желите да додате у овај кратак опис?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Нисам успео да додам следеће кориснике у кратак опис групе %(groupId)s:",
+    "Add a User": "Додај корисника",
+    "Failed to remove a user from the summary of %(groupId)s": "Нисам успео да уклоним корисника из кратког описа групе %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Корисник „%(displayName)s“ се не може уклонити из кратког описа.",
+    "Failed to upload image": "Нисам успео да отпремим слику",
+    "Failed to update community": "Нисам успео да ажурирам заједницу",
+    "Unable to accept invite": "Не могу да прихватим позивницу",
+    "Unable to reject invite": "Не могу да одбијем позивницу",
+    "Leave Community": "Напусти заједницу",
+    "Leave %(groupName)s?": "Напустити %(groupName)s?",
+    "Leave": "Напусти",
+    "Unable to leave room": "Не могу да напустим собу",
+    "Community Settings": "Подешавања заједнице",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Ове собе су приказане члановима заједнице на страници заједнице. Чланови заједнице могу приступити собама кликом на њих.",
+    "Add rooms to this community": "Додај собе у ову заједницу",
+    "Featured Rooms:": "Издвојене собе:",
+    "Featured Users:": "Издвојени корисници:",
+    "%(inviter)s has invited you to join this community": "Корисник %(inviter)s вас је позвао у ову заједницу",
+    "You are an administrator of this community": "Ви сте администратор ове заједнице",
+    "You are a member of this community": "Ви сте члан ове заједнице",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Ваша заједница нема дуги опис, HTML страницу на којој су приказани чланови заједнице.<br />Кликните овде да бисте отворили подешавања и направили страницу!",
+    "Long Description (HTML)": "Дуги опис (HTML)",
+    "Description": "Опис",
+    "Community %(groupId)s not found": "Заједница %(groupId)s није нађена",
+    "This Home server does not support communities": "Овај кућни сервер не подржава заједнице",
+    "Failed to load %(groupId)s": "Нисам успео да учитам %(groupId)s",
+    "Reject invitation": "Одбиј позивницу",
+    "Are you sure you want to reject the invitation?": "Да ли сте сигурни да желите одбити позивницу?",
+    "Failed to reject invitation": "Нисам успео да одбијем позивницу",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Да ли сте сигурни да желите напустити собу „%(roomName)s“?",
+    "Failed to leave room": "Нисам успео да напустим собу",
+    "Signed Out": "Одјављен",
+    "For security, this session has been signed out. Please sign in again.": "Зарад безбедности, одјављени сте из ове сесије. Пријавите се поново.",
+    "Cryptography data migrated": "Криптографски подаци су пренесени",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Једноструко преношење криптографских података је обављено. Шифровање с краја на крај неће радити ако се вратите на старије издање Riot-а. Ако вам треба шифровање с краја на крај на старијем издању, прво се одјавите из Riot-а. Да бисте задржали историјат порука, извезите па поново увезите ваше кључеве.",
+    "Old cryptography data detected": "Нађени су стари криптографски подаци"
 }

From 29962ed89d1f4716a46e41877a17b4f5425d4672 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 5 Feb 2018 11:48:48 +0000
Subject: [PATCH 434/927] Add stickerpack strings.

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a4152ef94a..4458fefbf1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -241,6 +241,11 @@
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
+    "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
+    "Click": "Click",
+    "here": "here",
+    "to add some!": "to add some!",
+    "Add a stickerpack": "Add a stickerpack",
     "Drop File Here": "Drop File Here",
     "Drop file here to upload": "Drop file here to upload",
     " (unsupported)": " (unsupported)",

From 34de3729fe12c61f263f102131e2a3bf61761259 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 5 Feb 2018 11:49:26 +0000
Subject: [PATCH 435/927] Add method to remove all stickerpacks.

---
 src/utils/widgets.js | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index 4e26fa6ceb..806906f072 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -45,12 +45,33 @@ function getUserWidgets() {
  * @return {[object]} Array containing current / active stickerpack widgets
  */
 function getStickerpackWidgets() {
-    return getUserWidgets().filter((widget) => widget.type='stickerpack');
+    const stickerpackWidgets = getUserWidgets().filter((widget) => widget.type='stickerpack');
+    console.warn('Stickerpack widgets', stickerpackWidgets);
+    return stickerpackWidgets;
 }
 
+/**
+ * Remove all stickerpack widgets (stickerpacks are user widgets by nature)
+ */
+function removeStickerpackWidgets() {
+    const client = MatrixClientPeg.get();
+    if (!client) {
+        throw new Error('User not logged in');
+    }
+    const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+    Object.entries(userWidgets).forEach(([key, widget]) => {
+        if (widget.type === 'stickerpack') {
+            delete userWidgets[key];
+        }
+    });
+    client.setAccountData('m.widgets', userWidgets);
+}
+
+
 export default {
     getWidgets,
     getRoomWidgets,
     getUserWidgets,
     getStickerpackWidgets,
+    removeStickerpackWidgets,
 };

From 992c4771f4d78ee349e05a2e1d05ca9d88b19b1c Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 5 Feb 2018 11:49:44 +0000
Subject: [PATCH 436/927] Add button to remove all stickerpacks

---
 src/components/views/rooms/Stickerpack.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index cb2a19eae7..77e188198a 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -33,12 +33,13 @@ export default class Stickerpack extends React.Component {
         this.onHideStickersClick = this.onHideStickersClick.bind(this);
         this.onFinished = this.onFinished.bind(this);
         this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
+        this._removeStickerpackWidgets = this._removeStickerpackWidgets.bind(this);
 
         this.defaultStickersContent = (
             <div className='mx_Stickers_contentPlaceholder'>
-                <p>You don't currently have any stickerpacks enabled</p>
-                <p>Click <a href=''>here</a> to add some!</p>
-                <img src='img/stickerpack-placeholder.png' alt='Add a stickerpack' />
+                <p>{_t("You don't currently have any stickerpacks enabled")}</p>
+                <p>{_t("Click")} <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("here") } </span>{_t("to add some!")}</p>
+                <img src='img/stickerpack-placeholder.png' alt={_t('Add a stickerpack')} />
             </div>
         );
         this.popoverWidth = 300;
@@ -50,6 +51,11 @@ export default class Stickerpack extends React.Component {
         };
     }
 
+    _removeStickerpackWidgets() {
+        console.warn('Removing stickerpack widgets');
+        Widgets.removeStickerpackWidgets()
+    }
+
     componentDidMount() {
         this.scalarClient = null;
         if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
@@ -91,6 +97,14 @@ export default class Stickerpack extends React.Component {
                             width: this.popoverWidth,
                         }}
                     >
+                        <div
+                            style={{
+                                'float': 'right',
+                                'fontSize': 'smaller',
+                                'cursor': 'pointer',
+                            }}
+                            onClick={this._removeStickerpackWidgets()}
+                        >X</div>
                         <AppTile
                             id={stickerpackWidget.id}
                             url={stickerpackWidget.content.url}
@@ -121,7 +135,7 @@ export default class Stickerpack extends React.Component {
             );
         } else {
             // Default content to show if stickerpack widget not added
-            stickersContent = <p>Click here to add your first sitckerpack</p>;
+            stickersContent = this.defaultStickersContent;
         }
         this.setState({stickersContent});
     }

From e508f0676547732b9905839fe37418392cdc82e3 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 5 Feb 2018 11:50:25 +0000
Subject: [PATCH 437/927] Add asset add / remove messaging clauses.

---
 src/ScalarMessaging.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 9a57ab5bce..0fa342e69f 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -624,6 +624,12 @@ const onMessage = function(event) {
     } else if (event.data.action === "set_widget") {
         setWidget(event, roomId);
         return;
+    } else if (event.data.action === "add_widget_asset") {
+        addWidgetAsset(event, roomId);
+        return;
+    } else if (event.data.action === "remove_widget_asset") {
+        removeWidgetAsset(event, roomId);
+        return;
     }
 
     if (!roomId) {

From 330ce0f02e31a7be7195624718fb3caf5ad1d11a Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Mon, 5 Feb 2018 17:29:22 +0000
Subject: [PATCH 438/927] On failure, regenerate state from sdk

Instead of using history, which could be unpredictable
---
 src/stores/RoomListStore.js | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 69d957f074..e48eacaa6a 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -26,7 +26,6 @@ class RoomListStore extends Store {
         super(dis);
 
         this._init();
-        this._actionHistory = [];
     }
 
     _init() {
@@ -57,14 +56,13 @@ class RoomListStore extends Store {
                     break;
                 }
 
-                this._generateRoomLists(payload.matrixClient);
-                this._actionHistory.unshift(payload);
+                this._matrixClient = payload.matrixClient;
+                this._generateRoomLists();
             }
             break;
             case 'MatrixActions.Room.tags': {
                 if (!this._state.ready) break;
                 this._updateRoomLists(payload.room);
-                this._actionHistory.unshift(payload);
             }
             break;
             case 'RoomListActions.tagRoom.pending': {
@@ -74,35 +72,22 @@ class RoomListStore extends Store {
                     payload.request.newTag,
                     payload.request.metaData,
                 );
-                this._actionHistory.unshift(payload);
             }
             break;
             case 'RoomListActions.tagRoom.failure': {
-                this._actionHistory = this._actionHistory.filter((action) => {
-                    return action.asyncId !== payload.asyncId;
-                });
-
-                // don't duplicate history
-                const history = this._actionHistory.slice(0);
-                this._actionHistory = [];
-                this._reloadFromHistory(history);
+                // Reset state according to js-sdk
+                this._generateRoomLists();
             }
             break;
             case 'on_logged_out': {
                 // Reset state without pushing an update to the view, which generally assumes that
                 // the matrix client isn't `null` and so causing a re-render will cause NPEs.
                 this._init();
-                this._actionHistory.unshift(payload);
             }
             break;
         }
     }
 
-    _reloadFromHistory(history) {
-        this._init();
-        history.forEach((action) => this.__onDispatch(action));
-    }
-
     _updateRoomListsOptimistic(updatedRoom, oldTag, newTag, metaData) {
         const newLists = {};
 
@@ -153,7 +138,7 @@ class RoomListStore extends Store {
         });
     }
 
-    _generateRoomLists(matrixClient) {
+    _generateRoomLists() {
         const lists = {
             "im.vector.fake.invite": [],
             "m.favourite": [],
@@ -163,10 +148,14 @@ class RoomListStore extends Store {
             "im.vector.fake.archived": [],
         };
 
+
         const dmRoomMap = DMRoomMap.shared();
 
-        matrixClient.getRooms().forEach((room, index) => {
-            const me = room.getMember(matrixClient.credentials.userId);
+        // If somehow we dispatched a RoomListActions.tagRoom.failure before a MatrixActions.sync
+        if (!this._matrixClient) return;
+
+        this._matrixClient.getRooms().forEach((room, index) => {
+            const me = room.getMember(this._matrixClient.credentials.userId);
             if (!me) return;
 
             if (me.membership == "invite") {

From 9982efbd8f61b75c4d4c688ce0124b47fb6c9deb Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Mon, 5 Feb 2018 18:06:29 +0000
Subject: [PATCH 439/927] Regenerate room lists when we get m.direct

---
 src/stores/RoomListStore.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index e48eacaa6a..6a9217eab4 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -65,6 +65,11 @@ class RoomListStore extends Store {
                 this._updateRoomLists(payload.room);
             }
             break;
+            case 'MatrixActions.accountData': {
+                if (payload.event_type !== 'm.direct') break;
+                this._generateRoomLists();
+            }
+            break;
             case 'RoomListActions.tagRoom.pending': {
                 this._updateRoomListsOptimistic(
                     payload.request.room,

From c665c1170b419ec8b6e6b4b5fe7e7e06a792d0bd Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Mon, 5 Feb 2018 18:27:50 +0000
Subject: [PATCH 440/927] Regenerate room lists when we get
 RoomMember.membership

---
 src/actions/MatrixActionCreators.js | 5 +++++
 src/stores/RoomListStore.js         | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index d9309d7c1c..f4d6c34ff5 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -66,6 +66,10 @@ function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
     return { action: 'MatrixActions.Room.tags', room };
 }
 
+function createRoomMembershipAction(matrixClient, membershipEvent, member, oldMembership) {
+    return { action: 'MatrixActions.RoomMember.membership', member };
+}
+
 /**
  * This object is responsible for dispatching actions when certain events are emitted by
  * the given MatrixClient.
@@ -83,6 +87,7 @@ export default {
         this._addMatrixClientListener(matrixClient, 'sync', createSyncAction);
         this._addMatrixClientListener(matrixClient, 'accountData', createAccountDataAction);
         this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
+        this._addMatrixClientListener(matrixClient, 'RoomMember.membership', createRoomMembershipAction);
     },
 
     /**
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 6a9217eab4..28ffee99d2 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -70,6 +70,11 @@ class RoomListStore extends Store {
                 this._generateRoomLists();
             }
             break;
+            case 'MatrixActions.RoomMember.membership': {
+                if (!this._matrixClient || payload.member.userId !== this._matrixClient.credentials.userId) break;
+                this._generateRoomLists();
+            }
+            break;
             case 'RoomListActions.tagRoom.pending': {
                 this._updateRoomListsOptimistic(
                     payload.request.room,

From 0f2ca3bd95ea68401482152c36291bfa1553802d Mon Sep 17 00:00:00 2001
From: "Robert A. Viana" <robert.abreu@outlook.com>
Date: Tue, 6 Feb 2018 09:07:38 +0000
Subject: [PATCH 441/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 66.9% (659 of 984 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 817d094422..5a9c4d7d65 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -656,5 +656,7 @@
     "You are not in this room.": "Você não está nesta sala.",
     "You do not have permission to do that in this room.": "Você não tem permissão para fazer isto nesta sala.",
     "Ignored user": "Usuário ignorado",
-    "You are no longer ignoring %(userId)s": "Você parou de ignorar %(userId)s"
+    "You are no longer ignoring %(userId)s": "Você parou de ignorar %(userId)s",
+    "Edit": "Editar",
+    "Unpin Message": "Desafixar Mensagem"
 }

From feca1707f119bab11c836a810ec9566df7de6498 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 6 Feb 2018 09:55:58 +0000
Subject: [PATCH 442/927] Remove a factor n complexity during room visibility
 calc

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ad85beac12..269f04c963 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -352,6 +352,14 @@ module.exports = React.createClass({
 
         const filteredLists = {};
 
+        const isRoomVisible = {
+            // $roomId: true,
+        };
+
+        this._visibleRooms.forEach((r) => {
+            isRoomVisible[r.roomId] = true;
+        });
+
         Object.keys(lists).forEach((tagName) => {
             filteredLists[tagName] = lists[tagName].filter((taggedRoom) => {
                 // Somewhat impossible, but guard against it anyway
@@ -363,9 +371,7 @@ module.exports = React.createClass({
                     return;
                 }
 
-                return this._visibleRooms.some((visibleRoom) => {
-                    return visibleRoom.roomId === taggedRoom.roomId;
-                });
+                return isRoomVisible[taggedRoom.roomId];
             });
         });
 

From 8458023bbca4c805a9d8fdeeece501f843645c02 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 6 Feb 2018 10:24:38 +0000
Subject: [PATCH 443/927] Fix display name change message

(i18n file fixes coming separately for ease of review)

Fixes https://github.com/vector-im/riot-web/issues/5171
---
 src/TextForEvent.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/TextForEvent.js b/src/TextForEvent.js
index 1bdf5ad90c..e60bde4094 100644
--- a/src/TextForEvent.js
+++ b/src/TextForEvent.js
@@ -52,8 +52,7 @@ function textForMemberEvent(ev) {
         case 'join':
             if (prevContent && prevContent.membership === 'join') {
                 if (prevContent.displayname && content.displayname && prevContent.displayname !== content.displayname) {
-                    return _t('%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.', {
-                        senderName,
+                    return _t('%(oldDisplayName)s changed their display name to %(displayName)s.', {
                         oldDisplayName: prevContent.displayname,
                         displayName: content.displayname,
                     });

From f1eb899cadf3822b066ab90db58d4f1de0c76a71 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 6 Feb 2018 10:26:37 +0000
Subject: [PATCH 444/927] Re-run i18n script & prune

---
 src/i18n/strings/ca.json      |  2 --
 src/i18n/strings/cs.json      |  2 --
 src/i18n/strings/da.json      |  1 -
 src/i18n/strings/de_DE.json   |  4 ----
 src/i18n/strings/el.json      |  1 -
 src/i18n/strings/en_EN.json   | 38 ++++++++++++++++++-----------------
 src/i18n/strings/en_US.json   |  1 -
 src/i18n/strings/eo.json      |  2 --
 src/i18n/strings/es.json      |  1 -
 src/i18n/strings/eu.json      |  4 ----
 src/i18n/strings/fi.json      |  1 -
 src/i18n/strings/fr.json      |  4 ----
 src/i18n/strings/gl.json      |  2 --
 src/i18n/strings/hu.json      |  4 ----
 src/i18n/strings/id.json      |  1 -
 src/i18n/strings/ko.json      |  1 -
 src/i18n/strings/lv.json      |  1 -
 src/i18n/strings/nl.json      |  1 -
 src/i18n/strings/pl.json      |  1 -
 src/i18n/strings/pt.json      |  1 -
 src/i18n/strings/pt_BR.json   |  1 -
 src/i18n/strings/ru.json      |  4 ----
 src/i18n/strings/sk.json      |  4 ----
 src/i18n/strings/sr.json      |  1 -
 src/i18n/strings/sv.json      |  1 -
 src/i18n/strings/th.json      |  1 -
 src/i18n/strings/tr.json      |  1 -
 src/i18n/strings/uk.json      |  1 -
 src/i18n/strings/zh_Hans.json |  1 -
 src/i18n/strings/zh_Hant.json |  3 ---
 30 files changed, 20 insertions(+), 71 deletions(-)

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index eb4ac76d05..0aba649fde 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -36,7 +36,6 @@
     "powered by Matrix": "amb tecnologia de Matrix",
     "Edit": "Edita",
     "Unpin Message": "Desenganxa el missatge",
-    "Quote": "Cita",
     "Register": "Registre",
     "Rooms": "Sales",
     "Add rooms to this community": "Afegeix sales a aquesta comunitat",
@@ -161,7 +160,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s ha sol·licitat una conferència VoIP.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s ha convidat a %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s ha expulsat a %(targetName)s.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ha canviat el seu nom visible %(oldDisplayName)s a %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha establert %(displayName)s com el seu nom visible.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha retirat el seu nom visible %(oldDisplayName)s.",
     "%(senderName)s removed their profile picture.": "%(senderName)s ha retirat la seva foto de perfil.",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index b6b1aa8255..fe2c9bd249 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -359,7 +359,6 @@
     "Active call (%(roomName)s)": "Probíhající hovor (%(roomName)s)",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s vykázal/a %(targetName)s.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nelze se připojit k domovskému serveru přes HTTP, pokud je v adresním řádku HTTPS. Buď použijte HTTPS, nebo <a>povolte nebezpečné scripty</a>.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s změnil/a své zobrazované jméno z %(oldDisplayName)s na %(displayName)s.",
     "Click here to fix": "Klikněte zde pro opravu",
     "Click to mute video": "Klikněte pro zakázání videa",
     "click to reveal": "klikněte pro odhalení",
@@ -952,6 +951,5 @@
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Jednorázová migrace šifrovaných údajů dokončena. E2E šifrovaní vám nebude fungovat jakmile se vrátíte ke starší verzi programu Riot. Pokud plánujete používat šifrovaní ve starší verzi Riot, doporučujeme vám se nejdříve odhlásit. Aby jste si zachovali historii šifrovaných konverzací, exportujte a znovu importujte klíče místností.",
     "Old cryptography data detected": "Nalezeny starší šifrované datové zprávy",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nalezeny datové zprávy ze starší verze Riot. Důsledkem bude, že E2E šifrování nebude ve starší verzi Riot správně fungovat. Šifrované zprávy ze starší verze nemusí být čitelné v nové verzi. Může dojít i k selhání zasílaní zpráv s touto verzí Riot. Pokud zaznamenáte některý z uvedených problému, odhlaste se a přihlaste znovu. Pro zachování historie zpráv exportujte a znovu importujte vaše klíče.",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Zobrazit zařízení</showDevicesText> anebo <cancelText>Zrušit vše</cancelText>.",
     "Warning": "Upozornění"
 }
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 67f00cdefb..dbcc9fbb2c 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -218,7 +218,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s forespurgte en VoIP konference.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s inviterede %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s bannede %(targetName)s.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ændrede deres viste navn fra %(oldDisplayName)s til %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s satte deres viste navn til %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s fjernede deres viste navn (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s fjernede deres profilbillede.",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d0c193bfa9..d118d50d56 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -246,7 +246,6 @@
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hat die Einladung für %(displayName)s akzeptiert.",
     "%(senderName)s answered the call.": "%(senderName)s hat den Anruf angenommen.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s hat %(targetName)s verbannt.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s hat den Anzeigenamen von %(oldDisplayName)s auf %(displayName)s geändert.",
     "%(senderName)s changed their profile picture.": "%(senderName)s hat das Profilbild geändert.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s hat das Berechtigungslevel von %(powerLevelDiffText)s geändert.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s hat den Raumnamen geändert zu %(roomName)s.",
@@ -949,7 +948,6 @@
     "expand": "Erweitern",
     "Cryptography data migrated": "Kryptographie-Schlüssel wurden übertragen",
     "Old cryptography data detected": "Alte Kryptografiedaten erkannt",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText> oder <cancelText>alle abbrechen</cancelText>.",
     "Warning": "Warnung",
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Eine tiefgreifende Migration im Kontext der Verschlüsselungsdaten wurde durchgeführt. Ende-zu-Ende-Verschlüsselung wird nicht mehr funktionieren, wenn du zu einer älteren Version von Riot zurückkehrst. Wenn du Ende-zu-Ende-Verschlüssung bei einer älteren Version von Riot brauchst, melde dich bitte vorher ab. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
@@ -959,8 +957,6 @@
     "Send a message (unencrypted)…": "Nachricht senden (unverschlüsselt)…",
     "Replying": "Antwortet",
     "Minimize apps": "Apps minimieren",
-    "Quote": "Zitat",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Geräte anzeigen</showDevicesText>, <sendAnywayText>Geräte als bekannt markieren und senden</sendAnywayText> oder <cancelText>alles abbrechen</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Deine Nachricht wurde nicht gesendet.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Jetzt alle erneut senden</resendText> oder <cancelText>alle abbrechen</cancelText>. Du kannst auch einzelne Nachrichten auswählen und erneut senden oder abbrechen.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Nachricht jetzt erneut senden</resendText> oder <cancelText>senden abbrechen</cancelText> now.",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 4974268999..c17c49eb7c 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -49,7 +49,6 @@
     "Blacklisted": "Στη μαύρη λίστα",
     "Can't load user settings": "Δεν είναι δυνατή η φόρτωση των ρυθμίσεων χρήστη",
     "Change Password": "Αλλαγή κωδικού πρόσβασης",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "Ο %(senderName)s άλλαξε το όνομά του από %(oldDisplayName)s σε %(displayName)s.",
     "%(senderName)s changed their profile picture.": "Ο %(senderName)s άλλαξε τη φωτογραφία του προφίλ του.",
     "%(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\".",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 93af7aa47c..6139ac2a91 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2,6 +2,18 @@
     "This email address is already in use": "This email address is already in use",
     "This phone number is already in use": "This phone number is already in use",
     "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",
+    "The platform you're on": "The platform you're on",
+    "The version of Riot.im": "The version of Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Whether or not you're logged in (we don't record your user name)",
+    "Your language of choice": "Your language of choice",
+    "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
+    "Your homeserver's URL": "Your homeserver's URL",
+    "Your identity server's URL": "Your identity server's URL",
+    "Analytics": "Analytics",
+    "The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
     "Call Failed": "Call Failed",
     "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.",
     "Review Devices": "Review Devices",
@@ -119,7 +131,7 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s requested a VoIP conference.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s invited %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s banned %(targetName)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.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s changed their display name to %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s set their display name to %(displayName)s.",
     "%(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.",
@@ -369,6 +381,9 @@
     "Drop here to restore": "Drop here to restore",
     "Drop here to demote": "Drop here to demote",
     "Drop here to tag %(section)s": "Drop here to tag %(section)s",
+    "Failed to set direct chat tag": "Failed to set direct chat tag",
+    "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
     "Press <StartChatButton> to start a chat with someone": "Press <StartChatButton> to start a chat with someone",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory",
     "Community Invites": "Community Invites",
@@ -633,7 +648,7 @@
     "expand": "expand",
     "Custom of %(powerLevel)s": "Custom of %(powerLevel)s",
     "Custom level": "Custom level",
-    "Quote": "Quote",
+    "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
     "Room directory": "Room directory",
     "Start chat": "Start chat",
     "And %(count)s more...|other": "And %(count)s more...",
@@ -652,8 +667,8 @@
     "Start Chatting": "Start Chatting",
     "Confirm Removal": "Confirm Removal",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
     "Community IDs cannot not be empty.": "Community IDs cannot not be empty.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Community IDs may only contain characters a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Something went wrong whilst creating your community",
     "Create Community": "Create Community",
     "Community Name": "Community Name",
@@ -764,6 +779,7 @@
     "Reject invitation": "Reject invitation",
     "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Failed to reject invitation": "Failed to reject invitation",
+    "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Are you sure you want to leave the room '%(roomName)s'?",
     "Failed to leave room": "Failed to leave room",
     "Signed Out": "Signed Out",
@@ -842,7 +858,6 @@
     "Bug Report": "Bug Report",
     "Found a bug?": "Found a bug?",
     "Report it": "Report it",
-    "Analytics": "Analytics",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
     "Learn more about how we use analytics.": "Learn more about how we use analytics.",
@@ -969,18 +984,5 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
-    "Import": "Import",
-    "The information being sent to us to help make Riot.im better includes:": "The information being sent to us to help make Riot.im better includes:",
-    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.",
-    "The platform you're on": "The platform you're on",
-    "The version of Riot.im": "The version of Riot.im",
-    "Whether or not you're logged in (we don't record your user name)": "Whether or not you're logged in (we don't record your user name)",
-    "Your language of choice": "Your language of choice",
-    "Which officially provided instance you are using, if any": "Which officially provided instance you are using, if any",
-    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Whether or not you're using the Richtext mode of the Rich Text Editor",
-    "Your homeserver's URL": "Your homeserver's URL",
-    "Your identity server's URL": "Your identity server's URL",
-    "<a>In reply to</a> <pill>": "<a>In reply to</a> <pill>",
-    "This room is not public. You will not be able to rejoin without an invite.": "This room is not public. You will not be able to rejoin without an invite."
+    "Import": "Import"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index ce606d3907..2375e6ad2e 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -52,7 +52,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.",
     "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.",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 409c2054cb..a50d16a2b3 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -115,7 +115,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s petis rettelefonan vokon.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s invitis uzanton %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s forbaris uzanton %(targetName)s.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ŝanĝis sian vidigan nomon de %(oldDisplayName)s al %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s agordis sian vidigan nomon al %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s forigis sian vidigan nomon (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s forigis sian profilbildon.",
@@ -767,7 +766,6 @@
     "You have no visible notifications": "Neniuj videblaj sciigoj",
     "Scroll to bottom of page": "Rulumi al susbo de la paĝo",
     "Message not sent due to unknown devices being present": "Mesaĝoj ne sendiĝis pro ĉeesto de nekonataj aparatoj",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Montri aparatojn</showDevicesText> aŭ <cancelText>nuligi ĉiujn</cancelText>.",
     "Connectivity to the server has been lost.": "Konekto al la servilo perdiĝis.",
     "Sent messages will be stored until your connection has returned.": "Senditaj mesaĝoj konserviĝos ĝis via konekto refunkcios.",
     "%(count)s new messages|other": "%(count)s novaj mesaĝoj",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 53e0a3cc9f..1b513cc51f 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -35,7 +35,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "No se puede conectar al servidor via HTTP, cuando es necesario un enlace HTTPS en la barra de direcciones de tu navegador. Ya sea usando HTTPS o <a>habilitando los scripts inseguros</a>.",
     "Can't load user settings": "No se puede cargar las configuraciones del usuario",
     "Change Password": "Cambiar clave",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s ha cambiado su nombre de %(oldDisplayName)s a %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiado su foto de perfil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha cambiado el nivel de acceso de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha cambiado el nombre de la sala a %(roomName)s.",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 2613ebf4ce..8ec181d879 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -272,7 +272,6 @@
     "Bulk Options": "Aukera masiboak",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Ezin da hasiera zerbitzarira konektatu, egiaztatu zure konexioa, ziurtatu zure <a>hasiera zerbitzariaren SSL ziurtagiria</a> fidagarritzat jotzen duela zure gailuak, eta nabigatzailearen pluginen batek ez dituela eskaerak blokeatzen.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Ezin zara hasiera zerbitzarira HTTP bidez konektatu zure nabigatzailearen barran dagoen URLa HTTS bada. Erabili HTTPS edo <a>gaitu script ez seguruak</a>.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s erabiltzaileak bere pantaila-izena aldatu du, %(oldDisplayName)s izatetik %(displayName)s izatera.",
     "%(senderName)s changed their profile picture.": "%(senderName)s erabiltzaileak bere profileko argazkia aldatu du.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s erabiltzaileak botere mailaz aldatu du %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s erabiltzaileak gelaren izena aldatu du, orain %(roomName)s da.",
@@ -947,7 +946,6 @@
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du <i>+adibidea:matrix.org</i>.",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText> edo <cancelText>baztertu guztia</cancelText>.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Ez dago beste inor hemen! <inviteText>Beste batzuk gonbidatu</inviteText> nahi dituzu edo <nowarnText>gela hutsik dagoela abisatzeari utzi</nowarnText>?",
     "Light theme": "Itxura argia",
     "Dark theme": "Itxura iluna",
@@ -965,11 +963,9 @@
     "Send a message (unencrypted)…": "Bidali mezu bat (zifratu gabea)…",
     "Replying": "Erantzuten",
     "Minimize apps": "Minimizatu aplikazioak",
-    "Quote": "Aipua",
     "The platform you're on": "Zauden plataforma",
     "The version of Riot.im": "Riot.im bertsioa",
     "Your language of choice": "Zure aukerako hizkuntza",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>markatu gailuak ezagun gisa eta bidali</sendAnywayText> edo <cancelText>ezeztatu guztia</cancelText>.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Pribatutasuna garrantzitsua da guretzat, beraz ez dugu datu pertsonalik edo identifikagarririk jasotzen gure estatistiketan.",
     "Learn more about how we use analytics.": "Ikasi gehiago estatistikei ematen diegun erabileraz.",
     "The information being sent to us to help make Riot.im better includes:": "Riot.im hobetzeko bidaltzen zaigun informazioan hau dago:",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index 0ae3379ed7..fc7eac51a7 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -62,7 +62,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Yhdistäminen kotipalveluun HTTP:n avulla ei ole mahdollista kun selaimen osoitepalkissa on HTTPS URL. Käytä joko HTTPS tai <a>salli turvattomat skriptit</a>.",
     "Can't load user settings": "Käyttäjäasetusten lataaminen epäonnistui",
     "Change Password": "Muuta salasana",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s muutti näyttönimensä %(oldDisplayName)s -> %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s muutti profiilikuvansa.",
     "%(targetName)s accepted an invitation.": "%(targetName)s hyväksyi kutsun.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s hyväksyi kutsun käyttäjän %(displayName)s puolesta.",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index b9d2ef7d89..36620c2894 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -62,7 +62,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossible de se connecter au serveur d'accueil en HTTP si l'URL dans la barre de votre explorateur est en HTTPS. Utilisez HTTPS ou <a>activez le support des scripts non-vérifiés</a>.",
     "Can't load user settings": "Impossible de charger les paramètres de l'utilisateur",
     "Change Password": "Changer le mot de passe",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s a changé son nom affiché de %(oldDisplayName)s en %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s a changé son image de profil.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s a changé le rang de %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s a changé le nom du salon en %(roomName)s.",
@@ -952,7 +951,6 @@
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Une migration unique des données de chiffrement a été effectuée. Le chiffrement de bout-en-bout ne fonctionnera pas si vous revenez sur une version antérieure de Riot. Si vous avez besoin d'utiliser le chiffrement de bout-en-bout sur une ancienne version, déconnectez-vous de Riot. Pour conserver l'historique des messages, exportez et réimportez vos clés de chiffrement.",
     "Old cryptography data detected": "Anciennes données de chiffrement détectées",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nous avons détecté des données d'une ancienne version de Riot. Le chiffrement de bout-en-bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText> ou <cancelText>tout annuler</cancelText>.",
     "Warning": "Attention",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Vous ne pourrez pas annuler cette modification car vous vous destituez. Si vous êtes le dernier utilisateur privilégié de ce salon, il sera impossible de récupérer les privilèges.",
     "%(count)s of your messages have not been sent.|one": "Votre message n'a pas été envoyé.",
@@ -965,8 +963,6 @@
     "Send a message (unencrypted)…": "Envoyer un message (non chiffré)…",
     "Replying": "Répond",
     "Minimize apps": "Minimiser les applications",
-    "Quote": "Citer",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>marquer les appareils comme connus et envoyer</sendAnywayText> ou <cancelText>tout annuler</cancelText>.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Le respect de votre vie privée est important pour nous, donc nous ne collectons aucune donnée personnelle ou permettant de vous identifier pour nos statistiques.",
     "Learn more about how we use analytics.": "En savoir plus sur notre utilisation des statistiques.",
     "The information being sent to us to help make Riot.im better includes:": "Les informations qui nous sont envoyées pour nous aider à améliorer Riot.im comprennent :",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 3fbaf2591b..7a1fd567ee 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -117,7 +117,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s solicitou unha conferencia VoIP.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s convidou a %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s bloqueou a %(targetName)s.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s mudou o seu nome público de %(oldDisplayName)s a %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s estableceu o seu nome público a %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s eliminou o seu nome público (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s eliminou a súa imaxe de perfil.",
@@ -625,7 +624,6 @@
     "expand": "expandir",
     "Custom of %(powerLevel)s": "Personalización de %(powerLevel)s",
     "Custom level": "Nivel personalizado",
-    "Quote": "Cita",
     "Room directory": "Directorio de salas",
     "Start chat": "Iniciar conversa",
     "And %(count)s more...|other": "E %(count)s máis...",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7bfadfc96e..29067f0bb4 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -76,7 +76,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nem lehet csatlakozni a saját szerverhez HTTP-n keresztül ha HTTPS van a böngésző címsorában. Vagy használj HTTPS-t vagy <a>engedélyezd a nem biztonságos script-et</a>.",
     "Can't load user settings": "A felhasználói beállítások nem tölthetők be",
     "Change Password": "Jelszó megváltoztatása",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s megváltoztatta a nevét erről: %(oldDisplayName)s erre: %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s megváltoztatta a profil képét.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s megváltoztatta a hozzáférési szintjét erre: %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s megváltoztatta a szoba nevét erre: %(roomName)s.",
@@ -952,7 +951,6 @@
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "A titkosítási adatok egyszeri migrációja megtörtént. Ha egy régebbi Riot verzióra állsz vissza a végponttól-végpontig titkosítás nem fog működni. Ha régi verzióval szeretnéd használni a végponttól-végpontig titkosítást először jelentkezz ki a Riotból. A régi üzenetek későbbi eléréséhez először mentsd ki a kulcsokat majd töltsd be újra.",
     "Old cryptography data detected": "Régi titkosítási adatot találhatók",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Régebbi Riot verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Eszközök megmutatása</showDevicesText> vagy <cancelText>mind elutasítása</cancelText>.",
     "Warning": "Figyelmeztetés",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Ahogy lefokozod magad a változás visszafordíthatatlan, ha te vagy az utolsó jogosultságokkal bíró felhasználó a szobában a jogok már nem szerezhetők vissza.",
     "%(count)s of your messages have not been sent.|one": "Az üzeneted nem lett elküldve.",
@@ -965,8 +963,6 @@
     "Send a message (unencrypted)…": "Üzenet küldése (titkosítás nélkül)…",
     "Replying": "Válaszolni",
     "Minimize apps": "Alkalmazás összecsukása",
-    "Quote": "Idézet",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Eszközök megjelenítése</showDevicesText>, <sendAnywayText>eszközök ismertnek jelölése és küldés</sendAnywayText> vagy <cancelText>mindent megszakít</cancelText>.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A személyes adatok védelme fontos számunkra, így mi nem gyűjtünk személyes és személyhez köthető adatokat az analitikánkhoz.",
     "Learn more about how we use analytics.": "Tudj meg többet arról hogyan használjuk az analitikai adatokat.",
     "The information being sent to us to help make Riot.im better includes:": "Az adatok amiket a Riot.im javításához felhasználunk az alábbiak:",
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 2c45314a6e..e95f3b13af 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -178,7 +178,6 @@
     "Banned users": "Pengguna yang diblokir",
     "Bulk Options": "Opsi Massal",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Tidak dapat terhubung ke server Home - harap cek koneksi anda, pastikan <a>sertifikat SSL server Home</a> Anda terpercaya, dan ekstensi dari browser tidak memblokir permintaan.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s mengubah tampilan namanya dari %(oldDisplayName)s menjadi %(displayName)s.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Tidak dapat terhubung ke server Home melalui HTTP ketika URL di browser berupa HTTPS. Pilih gunakan HTTPS atau <a>aktifkan skrip yang tidak aman</a>.",
     "%(senderName)s changed their profile picture.": "%(senderName)s telah mengubah foto profilnya.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s telah mengubah tingkat kekuatan dari %(powerLevelDiffText)s.",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 8a92e0f496..82174ad5d0 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -96,7 +96,6 @@
     "Call Timeout": "전화 대기 시간 초과",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "홈 서버에 연결할 수 없어요 - 연결을 확인해주시고, <a>홈 서버의 SSL 인증서</a>가 믿을 수 있는지 확인하시고, 브라우저 확장기능이 요청을 차단하고 있는지 확인해주세요.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "주소창에 HTTPS URL이 있을 때는 HTTP로 홈 서버를 연결할 수 없어요. HTTPS를 쓰거나 <a>안전하지 않은 스크립트를 허용해주세요</a>.",
-    "%(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로 바꾸셨어요.",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 71cfdc5110..ae290d4d5f 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -53,7 +53,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdevās savienoties ar serveri izmantojot HTTP protokolu, kad tava pārlūka adreses laukā ir HTTPS saite. Tā vietā izmanto HTTPS savienojumu vai <a>iespējo nedrošos skriptus</a>.",
     "Can't load user settings": "Neizdevās ielādēt lietotāja uzstādījumus",
     "Change Password": "Paroles maiņa",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s nomainīja redzamo vārdu no %(oldDisplayName)s uz %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s nomainīja profila attēlu.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s nomainīja statusa līmeni %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s nomainīja istabas nosaukumu uz %(roomName)s.",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 9ad7c6d5bb..bb1e45c730 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -35,7 +35,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Kan niet met de thuisserver verbinden via HTTP wanneer er een HTTPS-URL in je browser balk staat. Gebruik HTTPS of <a>activeer onveilige scripts</a>.",
     "Can't load user settings": "Kan de gebruikersinstellingen niet laden",
     "Change Password": "Wachtwoord veranderen",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s heeft zijn of haar weergavenaam veranderd van %(oldDisplayName)s naar %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s heeft zijn of haar profielfoto veranderd.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s heeft het machtsniveau van %(powerLevelDiffText)s gewijzigd.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s heeft de kamernaam van %(roomName)s gewijzigd.",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 2ddbf47ce6..0933b77dee 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -145,7 +145,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Nie można nawiązać połączenia z serwerem przy użyciu HTTP podczas korzystania z HTTPS dla bieżącej strony. Użyj HTTPS lub <a>włącz niebezpieczne skrypty</a>.",
     "Can't load user settings": "Nie można załadować ustawień użytkownika",
     "Cannot add any more widgets": "Nie można dodać już więcej widżetów",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s zmienił swoją nazwę z %(oldDisplayName)s na %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s zmienił swoje zdjęcie profilowe.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s zmienił poziom mocy %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s zmienił nazwę pokoju na %(roomName)s.",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 5c55b1eddb..a91a66bdbd 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -207,7 +207,6 @@
     "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
     "%(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.",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 817d094422..d58a78160b 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -207,7 +207,6 @@
     "%(senderName)s answered the call.": "%(senderName)s atendeu à chamada.",
     "%(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.",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 9ea84961c8..5f82177a2f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -146,7 +146,6 @@
     "%(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.",
@@ -946,7 +945,6 @@
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Выполнена одноразовая миграция данных криптографии. Сквозное шифрование не будет работать, если вы вернетесь к старой версии Riot. Если требуется использовать сквозную криптографию для более старой версии, сначала выйдите из Riot. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
     "Old cryptography data detected": "Обнаружены старые криптографические данные",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Обнаружены данные из более старой версии Riot. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText> или <cancelText>отменить все</cancelText>.",
     "Warning": "Предупреждение",
     "Showing flair for these communities:": "Показ таланта в следующих сообществах:",
     "This room is not showing flair for any communities": "В этой комнате не отображается талант для любых сообществ",
@@ -965,8 +963,6 @@
     "Send a message (unencrypted)…": "Отправить сообщение (незашифрованное)…",
     "Replying": "Отвечая",
     "Minimize apps": "Свернуть приложения",
-    "Quote": "Цитата",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отметить известные устройства и отправить</sendAnywayText> или <cancelText>отменить все</cancelText>.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Конфиденциальность важна для нас, поэтому мы не собираем никаких личных или идентифицируемых данных для нашей аналитики.",
     "Learn more about how we use analytics.": "Подробнее о том, как мы используем аналитику.",
     "The information being sent to us to help make Riot.im better includes:": "Информация направляемая нам, чтобы помочь сделать Riot.im лучше включает в себя:",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index aca0fabbe4..fa118beca4 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -109,7 +109,6 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s požiadal o VoIP konferenciu.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s pozval %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s zakázal vstup %(targetName)s.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s si zmenil zobrazované meno z %(oldDisplayName)s na %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s si nastavil zobrazované meno %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s odstránil svoje zobrazované meno (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s si z profilu odstránil obrázok.",
@@ -945,7 +944,6 @@
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Práve bola vykonaná jednorázová migrácia kryptografických údajov. E2E šifrovanie vám nebude fungovať, ak sa vrátite k staršej verzii programu Riot. Ak plánujete použiť šifrovanie v staršej verzii Riot, mali by ste sa pred tým odhlásiť. Aby ste si zachovali históriu šifrovaných konverzácií, exportujte a znovu importujte kľúče miestností.",
     "Old cryptography data detected": "Nájdené zastaralé kryptografické údaje",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Boli nájdené údaje zo staršej verzie Riot. Toto spôsobí, že E2E šifrovanie nebude v staršej verzii Riot fungovať. Zašifrované správy prijaté a odoslané v poslednom čase cez staršiu verziu Riot nemusia byť čitateľné v tejto verzii Riot. Môže to tiež spôsobiť, že šifrované konverzácie nebudú s touto verziou Riot čitateľné. Ak spozorujete niektoré s týchto problémov, odhláste sa a opätovne sa prihláste prosím. Históriu šifrovaných konverzácií zachováte tak, že si exportujete a znovu importujete kľúče miestností.",
-    "<showDevicesText>Show devices</showDevicesText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText> alebo <cancelText>Zrušiť všetko</cancelText>.",
     "Warning": "Upozornenie",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Tento domovský server neponúka žiadny prihlasovací mechanizmus podporovaný vašim klientom.",
     "Flair": "Príslušnosť ku komunitám",
@@ -963,8 +961,6 @@
     "Send a message (unencrypted)…": "Odoslať správu (nešifrovanú)…",
     "Replying": "Odpoveď",
     "Minimize apps": "Minimalizovať aplikácie",
-    "Quote": "Citácia",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText>, <sendAnywayText>Považovať zariadenia za známe a odoslať</sendAnywayText> alebo <cancelText>zrušiť všetko</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "Vaša správa nebola odoslaná.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Znovu poslať všetky</resendText> alebo <cancelText>zrušiť všetky</cancelText> teraz. Vybratím môžete tiež znovu odoslať alebo zrušiť jednotlivé správy.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Znovu odoslať správu</resendText> alebo <cancelText>zrušiť správu</cancelText> teraz.",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 6396455f9d..efac9b9e84 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -119,7 +119,6 @@
     "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s.",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "УПОЗОРЕЊЕ: ПОТВРДА КЉУЧА НИЈЕ УСПЕЛА! Кључ потписивања за корисника %(userId)s и уређај %(deviceId)s је „%(fprint)s“ а то се не подудара са достављеним кључем „%(fingerprint)s“. Ово можда значи да се ваши разговори прате!",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Кључ за потписивање који сте доставили се подудара са кључем за потписивање од корисника %(userId)s и уређаја %(deviceId)s. Уређај је означен као проверен.",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "Корисник %(senderName)s је променио приказно име из %(oldDisplayName)s у %(displayName)s.",
     "%(senderName)s set their display name to %(displayName)s.": "Корисник %(senderName)s је себи поставио приказно име %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "Корисник %(senderName)s је себи уклонио приказно име %(oldDisplayName)s.",
     "%(senderName)s removed their profile picture.": "Корисник %(senderName)s је себи уклонио профилну слику.",
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 59e9d2a899..ac0c9503f3 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -48,7 +48,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Det går inte att ansluta till en hemserver via HTTP då adressen i webbläsaren är HTTPS. Använd HTTPS, eller <a>sätt på osäkra skript</a>.",
     "Can't load user settings": "Det gick inte att ladda användarinställningar",
     "Change Password": "Byt lösenord",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s bytte namn från %(oldDisplayName)s till %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s bytte sin profilbild.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s bytte rummets namn till %(roomName)s.",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s tog bort rummets namn.",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 9e9e606826..adb351f1c2 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -84,7 +84,6 @@
     "Bans user with given id": "ผู้ใช้และ id ที่ถูกแบน",
     "Blacklisted": "ขึ้นบัญชีดำ",
     "Can't load user settings": "ไม่สามารถโหลดการตั้งค่าผู้ใช้ได้",
-    "%(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 เปลี่ยนรูปโปรไฟล์ของเขา",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s เปลี่ยนชื่อห้องไปเป็น %(roomName)s",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ลบชื่อห้อง",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 4067de767e..51c7a44dd4 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -55,7 +55,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Tarayıcı çubuğunuzda bir HTTPS URL'si olduğunda Ana Sunusuna HTTP üzerinden bağlanılamıyor . Ya HTTPS kullanın veya  <a> güvensiz komut dosyalarını</a> etkinleştirin.",
     "Can't load user settings": "Kullanıcı ayarları yüklenemiyor",
     "Change Password": "Şifre Değiştir",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s görüntülenen ismini %(oldDisplayName)s dan %(displayName)s 'a değiştirdi.",
     "%(senderName)s changed their profile picture.": "%(senderName)s profil resmini değiştirdi.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s %(powerLevelDiffText)s'nin güç düzeyini değiştirdi.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s odanın ismini  %(roomName)s olarak değiştirdi.",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 7d292a4bbe..2ff04fec65 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -80,7 +80,6 @@
     "Can't load user settings": "Неможливо завантажити настройки користувача",
     "Cannot add any more widgets": "Неможливо додати більше віджетів",
     "Change Password": "Поміняти пароль",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s змінено з %(oldDisplayName)s на %(displayName)s.",
     "%(senderName)s changed their profile picture.": "%(senderName)s змінив зображення профіля.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s змінив(ла) рівень доступу для %(powerLevelDiffText)s.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s змінив(ла) назву кімнати на %(roomName)s.",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 1885cf58f0..14e5a0712f 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -191,7 +191,6 @@
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "当浏览器地址栏里有 HTTPS 的 URL 时，不能使用 HTTP 连接主服务器。请使用 HTTPS 或者<a>允许不安全的脚本</a>。",
     "Can't load user settings": "无法加载用户设置",
     "Change Password": "修改密码",
-    "%(senderName)s changed their display name from %(oldDisplayName)s to %(displayName)s.": "%(senderName)s 将昵称从 %(oldDisplayName)s 改为了 %(displayName)s。",
     "%(senderName)s changed their profile picture.": "%(senderName)s 修改了头像。",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s 将聊天室名称改为 %(roomName)s。",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s 移除了聊天室名称。",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 8333ce746c..93a324aba0 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -255,7 +255,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "您確定您要想要離開房間 '%(roomName)s' 嗎？",
     "Bans user with given id": "禁止有指定 ID 的使用者",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "無法連線到家伺服器 - 請檢查您的連線，確保您的<a>家伺服器的 SSL 憑證</a>可被信任，而瀏覽器擴充套件也沒有阻擋請求。",
-    "%(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。",
@@ -890,7 +889,6 @@
     "collapse": "摺疊",
     "expand": "展開",
     "Custom of %(powerLevel)s": "自訂 %(powerLevel)s",
-    "Quote": "引用",
     "And %(count)s more...|other": "與更多 %(count)s 個……",
     "Matrix ID": "Matrix ID",
     "Matrix Room ID": "Matrix 聊天室 ID",
@@ -948,7 +946,6 @@
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "建立社群以將使用者與聊天室湊成一組！建立自訂的首頁以在 Matrix 宇宙中標出您的空間。",
     "Join an existing community": "加入既有的社群",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "要加入既有的社群，您必須知道它的社群標記符號；其看起來像是 <i>+example:matrix.org</i>.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>mark devices known and send</sendAnywayText> or <cancelText>cancel all</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>，<sendAnywayText>標記裝置為已知並傳送</sendAnywayText>或<cancelText>取消全部</cancelText>.",
     "%(count)s of your messages have not been sent.|one": "您的訊息尚未傳送。",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "現在<resendText>重新傳送全部</resendText>或<cancelText>取消全部</cancelText>。您也可以選取單一訊息以重新傳送或取消。",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "現在<resendText>重新傳送訊息</resendText>或<cancelText>取消訊息</cancelText>。",

From 3398c29aa5989312776d90a15ff72b646e40117e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 6 Feb 2018 10:31:37 +0000
Subject: [PATCH 445/927] Revert unintentional package.josn change

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

diff --git a/package.json b/package.json
index edf8ad03d4..f81e72e556 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.0.1",
     "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-react": "^7.5.1",
+    "eslint-plugin-react": "^7.4.0",
     "estree-walker": "^0.5.0",
     "expect": "^1.16.0",
     "flow-parser": "^0.57.3",

From 623cc10ab073a0d90254b00b5de02616460e979a Mon Sep 17 00:00:00 2001
From: "Robert A. Viana" <robert.abreu@outlook.com>
Date: Tue, 6 Feb 2018 09:15:50 +0000
Subject: [PATCH 446/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 67.0% (660 of 984 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 5a9c4d7d65..f2bd95185e 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -658,5 +658,6 @@
     "Ignored user": "Usuário ignorado",
     "You are no longer ignoring %(userId)s": "Você parou de ignorar %(userId)s",
     "Edit": "Editar",
-    "Unpin Message": "Desafixar Mensagem"
+    "Unpin Message": "Desafixar Mensagem",
+    "Add rooms to this community": "Adicionar salas na comunidade"
 }

From b744dbaab7d7feb3008f144a369d7f7cb4309eea Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 6 Feb 2018 11:56:55 +0000
Subject: [PATCH 447/927] Handle setting a newTag without metaData

metaData is actually the request body for the PUT that adds the tag
so we need to send {} for e.g. m.lowpriority, which is not manually
ordered.
---
 src/actions/RoomListActions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index 3e0ea53a33..5802dbcaed 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -114,7 +114,7 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
             (hasChangedSubLists || metaData)
         ) {
             // Optimistic update of what will happen to the room tags
-            room.tags[newTag] = metaData;
+            room.tags[newTag] = metaData || {};
 
             const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function(err) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");

From 8d0d0b43ffa6440bf98577c2246d6ec78fa3ab76 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 6 Feb 2018 12:00:06 +0000
Subject: [PATCH 448/927] Handle first tag added/last tag removed

This is a special case because untagged rooms should
appear in im.vector.fake.recent and tagged rooms
should not.
---
 src/stores/RoomListStore.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 28ffee99d2..32aab47009 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -101,6 +101,16 @@ class RoomListStore extends Store {
     _updateRoomListsOptimistic(updatedRoom, oldTag, newTag, metaData) {
         const newLists = {};
 
+        // Adding a tag to an untagged room - need to remove it from recents
+        if (newTag && Object.keys(updatedRoom.tags).length === 0) {
+            oldTag = 'im.vector.fake.recent';
+        }
+
+        // Removing a tag from a room with one tag left - need to add it to recents
+        if (oldTag && Object.keys(updatedRoom.tags).length === 1) {
+            newTag = 'im.vector.fake.recent';
+        }
+
         // Remove room from oldTag
         Object.keys(this._state.lists).forEach((tagName) => {
             if (tagName === oldTag) {

From dd0e981d728e9cb9974ed49d0cc46b48f1dea7ae Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 6 Feb 2018 12:00:23 +0000
Subject: [PATCH 449/927] Handle indication from server that a room has no more
 tags

---
 src/stores/RoomListStore.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 32aab47009..42c77d5237 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -153,6 +153,10 @@ class RoomListStore extends Store {
             newLists[tagName].push(updatedRoom);
         });
 
+        if (roomTags.length === 0) {
+            newLists['im.vector.fake.recent'].unshift(updatedRoom);
+        }
+
         this._setState({
             lists: newLists,
         });

From 6a858863fcf8b49382b6a442dffca7bb53c0ec74 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Tue, 6 Feb 2018 12:41:13 +0000
Subject: [PATCH 450/927] Translated using Weblate (Russian)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5f82177a2f..e7cc2f2319 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -980,5 +980,9 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Эта комната не является публичной. Вы не сможете войти без приглашения.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Показать устройства</showDevicesText>, <sendAnywayText>отправить в любом случае</sendAnywayText> или <cancelText>отменить</cancelText>.",
     "Community IDs cannot not be empty.": "ID сообществ не могут быть пустыми.",
-    "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>"
+    "<a>In reply to</a> <pill>": "<a>В ответ на</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил отображаемое имя на %(displayName)s.",
+    "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
+    "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
+    "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату"
 }

From 1ea6301ecaf7154acc4b862f2d7f7639ea32e711 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 6 Feb 2018 14:25:33 +0000
Subject: [PATCH 451/927] Add index fix again

This was changed on /develop to fix an issue where the incorrect
index was being used in a condition to handle literal edge cases
of dragging room tiles to start or end of an ordered sublist.
---
 src/actions/RoomListActions.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index 5802dbcaed..f59e9953ee 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -56,10 +56,13 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
             newTag === oldTag && oldIndex < newIndex
         ) ? 1 : 0;
 
-        const prevOrder = newIndex === 0 ?
-            0 : newList[offset + newIndex - 1].tags[newTag].order;
-        const nextOrder = newIndex === newList.length ?
-            1 : newList[offset + newIndex].tags[newTag].order;
+        const indexBefore = offset + newIndex - 1;
+        const indexAfter = offset + newIndex;
+
+        const prevOrder = indexBefore <= 0 ?
+            0 : newList[indexBefore].tags[newTag].order;
+        const nextOrder = indexAfter >= newList.length ?
+            1 : newList[indexAfter].tags[newTag].order;
 
         metaData = {
             order: (prevOrder + nextOrder) / 2.0,

From aab57d091d7fea357bd26af63cde458df5ada304 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 6 Feb 2018 14:39:13 +0000
Subject: [PATCH 452/927] Make ratelimitedfunc time from the function's end

Otherwise any function tghat takes longer than the delay to execute
will become eligible for execution again immediately after
finishing and therefore be able to spin.

This should help with https://github.com/vector-im/riot-web/issues/6060
(at least in the respect that it makes ratelimitedfunc do its job)
even if it's not the reason Riot started getting wedged.
---
 src/ratelimitedfunc.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ratelimitedfunc.js b/src/ratelimitedfunc.js
index d8c30f5d03..20f6db79b8 100644
--- a/src/ratelimitedfunc.js
+++ b/src/ratelimitedfunc.js
@@ -35,13 +35,17 @@ module.exports = function(f, minIntervalMs) {
 
         if (self.lastCall < now - minIntervalMs) {
             f.apply(this);
-            self.lastCall = now;
+            // get the time again now the function has finished, so if it
+            // took longer than the delay time to execute, it doesn't
+            // immediately become eligible to run again.
+            self.lastCall = Date.now();
         } else if (self.scheduledCall === undefined) {
             self.scheduledCall = setTimeout(
                 () => {
                     self.scheduledCall = undefined;
                     f.apply(this);
-                    self.lastCall = now;
+                    // get time again as per above
+                    self.lastCall = Date.now();
                 },
                 (self.lastCall + minIntervalMs) - now,
             );

From 6162c0b3605c284fe053e9de94adbae8daaec6ca Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 6 Feb 2018 15:01:14 +0000
Subject: [PATCH 453/927] Fix key bindings in address picker dialog

Another regression from https://github.com/matrix-org/matrix-react-sdk/pull/1674

Fixes https://github.com/vector-im/riot-web/issues/5994
---
 src/components/views/dialogs/BaseDialog.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 8e6f944df3..e879808dc2 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -37,6 +37,9 @@ export default React.createClass({
         // callback to call when Enter is pressed
         onEnterPressed: PropTypes.func,
 
+        // called when a key is pressed
+        onKeyDown: PropTypes.func,
+
         // CSS class to apply to dialog div
         className: PropTypes.string,
 
@@ -49,6 +52,9 @@ export default React.createClass({
     },
 
     _onKeyDown: function(e) {
+        if (this.props.onKeyDown) {
+            this.props.onKeyDown(e);
+        }
         if (e.keyCode === KeyCode.ESCAPE) {
             e.stopPropagation();
             e.preventDefault();

From cf4ae681f49be20c9d9eb17c267efb9e115f5868 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukebarnard1@users.noreply.github.com>
Date: Tue, 6 Feb 2018 17:50:53 +0000
Subject: [PATCH 454/927] Offline mode (#1723)

* Allow the client to run without connection to HS (i.e. using indexeddb)

Allows running without having pushRules (it's safe not to have these
when running from indexeddb sync.)

This means rooms will be displayed with "unknown" notifcation state.

This assumes anything that uses the push rules will get pushRule state
again when the client starts syncing again.

For recovering from being disconnected,
* If an avatar has fallen back, try again on reconnection
* If a thumbnail image failed to load, retry on reconnect
* Load joined groups when reconnecting

Update tests to give MELS a context.matrixClient
---
 src/RoomNotifs.js                             | 14 +++++-
 src/components/structures/TagPanel.js         | 12 +++++
 src/components/views/avatars/BaseAvatar.js    | 32 +++++++++++++
 src/components/views/elements/Pill.js         | 14 +++++-
 src/components/views/messages/MImageBody.js   | 46 +++++++++++++++++--
 .../elements/MemberEventListSummary-test.js   | 19 ++++----
 test/test-utils.js                            | 26 ++++++++++-
 7 files changed, 148 insertions(+), 15 deletions(-)

diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index 5cc078dc59..91e49fe09b 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -34,7 +34,14 @@ export function getRoomNotifsState(roomId) {
     }
 
     // for everything else, look at the room rule.
-    const roomRule = MatrixClientPeg.get().getRoomPushRule('global', roomId);
+    let roomRule = null;
+    try {
+        roomRule = MatrixClientPeg.get().getRoomPushRule('global', roomId);
+    } catch (err) {
+        // Possible that the client doesn't have pushRules yet. If so, it
+        // hasn't started eiher, so indicate that this room is not notifying.
+        return null;
+    }
 
     // XXX: We have to assume the default is to notify for all messages
     // (in particular this will be 'wrong' for one to one rooms because
@@ -130,6 +137,11 @@ function setRoomNotifsStateUnmuted(roomId, newState) {
 }
 
 function findOverrideMuteRule(roomId) {
+    if (!MatrixClientPeg.get().pushRules ||
+        !MatrixClientPeg.get().pushRules['global'] ||
+        !MatrixClientPeg.get().pushRules['global'].override) {
+        return null;
+    }
     for (const rule of MatrixClientPeg.get().pushRules['global'].override) {
         if (isRuleForRoom(roomId, rule)) {
             if (isMuteRule(rule) && rule.enabled) {
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 1cd3f04f9d..49a7a4020a 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -44,6 +44,7 @@ const TagPanel = React.createClass({
     componentWillMount: function() {
         this.unmounted = false;
         this.context.matrixClient.on("Group.myMembership", this._onGroupMyMembership);
+        this.context.matrixClient.on("sync", this.onClientSync);
 
         this._tagOrderStoreToken = TagOrderStore.addListener(() => {
             if (this.unmounted) {
@@ -61,6 +62,7 @@ const TagPanel = React.createClass({
     componentWillUnmount() {
         this.unmounted = true;
         this.context.matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership);
+        this.context.matrixClient.removeListener("sync", this.onClientSync);
         if (this._filterStoreToken) {
             this._filterStoreToken.remove();
         }
@@ -71,6 +73,16 @@ const TagPanel = React.createClass({
         dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient));
     },
 
+    onClientSync(syncState, prevState) {
+        // Consider the client reconnected if there is no error with syncing.
+        // This means the state could be RECONNECTING, SYNCING or PREPARED.
+        const reconnected = syncState !== "ERROR" && prevState !== syncState;
+        if (reconnected) {
+            // Load joined groups
+            dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient));
+        }
+    },
+
     onClick(e) {
         // Ignore clicks on children
         if (e.target !== e.currentTarget) return;
diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 47c217eb96..5735a99125 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import { MatrixClient } from 'matrix-js-sdk';
 import AvatarLogic from '../../../Avatar';
 import sdk from '../../../index';
 import AccessibleButton from '../elements/AccessibleButton';
@@ -36,6 +37,10 @@ module.exports = React.createClass({
         defaultToInitialLetter: PropTypes.bool, // true to add default url
     },
 
+    contextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    },
+
     getDefaultProps: function() {
         return {
             width: 40,
@@ -49,6 +54,16 @@ module.exports = React.createClass({
         return this._getState(this.props);
     },
 
+    componentWillMount() {
+        this.unmounted = false;
+        this.context.matrixClient.on('sync', this.onClientSync);
+    },
+
+    componentWillUnmount() {
+        this.unmounted = true;
+        this.context.matrixClient.removeListener('sync', this.onClientSync);
+    },
+
     componentWillReceiveProps: function(nextProps) {
         // work out if we need to call setState (if the image URLs array has changed)
         const newState = this._getState(nextProps);
@@ -67,6 +82,23 @@ module.exports = React.createClass({
         }
     },
 
+    onClientSync(syncState, prevState) {
+        if (this.unmounted) return;
+
+        // Consider the client reconnected if there is no error with syncing.
+        // This means the state could be RECONNECTING, SYNCING or PREPARED.
+        const reconnected = syncState !== "ERROR" && prevState !== syncState;
+        if (reconnected &&
+            // Did we fall back?
+            this.state.urlsIndex > 0
+        ) {
+            // Start from the highest priority URL again
+            this.setState({
+                urlsIndex: 0,
+            });
+        }
+    },
+
     _getState: function(props) {
         // work out the full set of urls to try to load. This is formed like so:
         // imageUrls: [ props.url, props.urls, default image ]
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index a85f83d78c..067c377eaa 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -17,7 +17,7 @@ import React from 'react';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import classNames from 'classnames';
-import { Room, RoomMember } from 'matrix-js-sdk';
+import { Room, RoomMember, MatrixClient } from 'matrix-js-sdk';
 import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import { MATRIXTO_URL_PATTERN } from '../../../linkify-matrix';
@@ -61,6 +61,17 @@ const Pill = React.createClass({
         shouldShowPillAvatar: PropTypes.bool,
     },
 
+
+    childContextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    },
+
+    getChildContext() {
+        return {
+            matrixClient: this._matrixClient,
+        };
+    },
+
     getInitialState() {
         return {
             // ID/alias of the room/user
@@ -135,6 +146,7 @@ const Pill = React.createClass({
 
     componentWillMount() {
         this._unmounted = false;
+        this._matrixClient = MatrixClientPeg.get();
         this.componentWillReceiveProps(this.props);
     },
 
diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 608f48112e..f5515fad90 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -18,8 +18,9 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import { MatrixClient } from 'matrix-js-sdk';
+
 import MFileBody from './MFileBody';
-import MatrixClientPeg from '../../../MatrixClientPeg';
 import ImageUtils from '../../../ImageUtils';
 import Modal from '../../../Modal';
 import sdk from '../../../index';
@@ -40,15 +41,37 @@ module.exports = React.createClass({
         onWidgetLoad: PropTypes.func.isRequired,
     },
 
+    contextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    },
+
     getInitialState: function() {
         return {
             decryptedUrl: null,
             decryptedThumbnailUrl: null,
             decryptedBlob: null,
             error: null,
+            imgError: false,
         };
     },
 
+    componentWillMount() {
+        this.unmounted = false;
+        this.context.matrixClient.on('sync', this.onClientSync);
+    },
+
+    onClientSync(syncState, prevState) {
+        if (this.unmounted) return;
+        // Consider the client reconnected if there is no error with syncing.
+        // This means the state could be RECONNECTING, SYNCING or PREPARED.
+        const reconnected = syncState !== "ERROR" && prevState !== syncState;
+        if (reconnected && this.state.imgError) {
+            // Load the image again
+            this.setState({
+                imgError: false,
+            });
+        }
+    },
 
     onClick: function onClick(ev) {
         if (ev.button == 0 && !ev.metaKey) {
@@ -97,12 +120,18 @@ module.exports = React.createClass({
         imgElement.src = this._getThumbUrl();
     },
 
+    onImageError: function() {
+        this.setState({
+            imgError: true,
+        });
+    },
+
     _getContentUrl: function() {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined) {
             return this.state.decryptedUrl;
         } else {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.url);
+            return this.context.matrixClient.mxcUrlToHttp(content.url);
         }
     },
 
@@ -115,7 +144,7 @@ module.exports = React.createClass({
             }
             return this.state.decryptedUrl;
         } else {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600);
+            return this.context.matrixClient.mxcUrlToHttp(content.url, 800, 600);
         }
     },
 
@@ -156,7 +185,9 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
+        this.unmounted = true;
         dis.unregister(this.dispatcherRef);
+        this.context.matrixClient.removeListener('sync', this.onClientSync);
     },
 
     onAction: function(payload) {
@@ -217,6 +248,14 @@ module.exports = React.createClass({
             );
         }
 
+        if (this.state.imgError) {
+            return (
+                <span className="mx_MImageBody">
+                    { _t("This image cannot be displayed.") }
+                </span>
+            );
+        }
+
         const contentUrl = this._getContentUrl();
         let thumbUrl;
         if (this._isGif() && SettingsStore.getValue("autoplayGifsAndVideos")) {
@@ -231,6 +270,7 @@ module.exports = React.createClass({
                     <a href={contentUrl} onClick={this.onClick}>
                         <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
                             alt={content.body}
+                            onError={this.onImageError}
                             onLoad={this.props.onWidgetLoad}
                             onMouseEnter={this.onImageEnter}
                             onMouseLeave={this.onImageLeave} />
diff --git a/test/components/views/elements/MemberEventListSummary-test.js b/test/components/views/elements/MemberEventListSummary-test.js
index 436133c717..b593923ef9 100644
--- a/test/components/views/elements/MemberEventListSummary-test.js
+++ b/test/components/views/elements/MemberEventListSummary-test.js
@@ -1,12 +1,15 @@
-const expect = require('expect');
-const React = require('react');
-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 expect from 'expect';
+import React from 'react';
+import ReactTestUtils from 'react-addons-test-utils';
+import sdk from 'matrix-react-sdk';
 import * as languageHandler from '../../../../src/languageHandler';
+import * as testUtils from '../../../test-utils';
+
+// Give MELS a matrixClient in its child context
+const MemberEventListSummary = testUtils.wrapInMatrixClientContext(
+    sdk.getComponent('views.elements.MemberEventListSummary'),
+);
 
-const testUtils = require('../../../test-utils');
 describe('MemberEventListSummary', function() {
     let sandbox;
 
@@ -113,7 +116,6 @@ describe('MemberEventListSummary', function() {
         renderer.render(<MemberEventListSummary {...props} />);
         const result = renderer.getRenderOutput();
 
-        expect(result.type).toBe('div');
         expect(result.props.children).toEqual([
           <div className="event_tile" key="event0">Expanded membership</div>,
         ]);
@@ -136,7 +138,6 @@ describe('MemberEventListSummary', function() {
         renderer.render(<MemberEventListSummary {...props} />);
         const result = renderer.getRenderOutput();
 
-        expect(result.type).toBe('div');
         expect(result.props.children).toEqual([
           <div className="event_tile" key="event0">Expanded membership</div>,
           <div className="event_tile" key="event1">Expanded membership</div>,
diff --git a/test/test-utils.js b/test/test-utils.js
index 0b536f5766..5753c02665 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -2,7 +2,8 @@
 
 import sinon from 'sinon';
 import Promise from 'bluebird';
-
+import React from 'react';
+import PropTypes from 'prop-types';
 import peg from '../src/MatrixClientPeg';
 import dis from '../src/dispatcher';
 import jssdk from 'matrix-js-sdk';
@@ -265,3 +266,26 @@ export function getDispatchForStore(store) {
         dis._isDispatching = false;
     };
 }
+
+export function wrapInMatrixClientContext(WrappedComponent) {
+    class Wrapper extends React.Component {
+        static childContextTypes = {
+            matrixClient: PropTypes.object,
+        }
+
+        getChildContext() {
+            return {
+                matrixClient: this._matrixClient,
+            };
+        }
+
+        componentWillMount() {
+            this._matrixClient = peg.get();
+        }
+
+        render() {
+            return <WrappedComponent {...this.props} />;
+        }
+    }
+    return Wrapper;
+}

From 424c367ecc7c2b7f607d5d973056365591a7aac6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 6 Feb 2018 18:45:43 +0000
Subject: [PATCH 455/927] Fix the reject/accept call buttons in canary (mk2)

Fixes https://github.com/vector-im/riot-web/issues/6081 by making
the accept/reject buttons AccessibleButtons which they should be
anyway (presumably the role=button makes chrome do the right thing
with the events). Also swallow the onClick event otherwise that
propagates out to the room header and causes it to expand/collapse.
---
 src/components/views/voip/IncomingCallBox.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index 8d75029baa..c0dff4e8a3 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,6 +19,7 @@ import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
+import AccessibleButton from '../elements/AccessibleButton';
 
 module.exports = React.createClass({
     displayName: 'IncomingCallBox',
@@ -26,14 +28,16 @@ module.exports = React.createClass({
         incomingCall: PropTypes.object,
     },
 
-    onAnswerClick: function() {
+    onAnswerClick: function(e) {
+        e.stopPropagation();
         dis.dispatch({
             action: 'answer',
             room_id: this.props.incomingCall.roomId,
         });
     },
 
-    onRejectClick: function() {
+    onRejectClick: function(e) {
+        e.stopPropagation();
         dis.dispatch({
             action: 'hangup',
             room_id: this.props.incomingCall.roomId,
@@ -67,14 +71,14 @@ module.exports = React.createClass({
                 </div>
                 <div className="mx_IncomingCallBox_buttons">
                     <div className="mx_IncomingCallBox_buttons_cell">
-                        <div className="mx_IncomingCallBox_buttons_decline" onClick={this.onRejectClick}>
+                        <AccessibleButton className="mx_IncomingCallBox_buttons_decline" onClick={this.onRejectClick}>
                             { _t("Decline") }
-                        </div>
+                        </AccessibleButton>
                     </div>
                     <div className="mx_IncomingCallBox_buttons_cell">
-                        <div className="mx_IncomingCallBox_buttons_accept" onClick={this.onAnswerClick}>
+                        <AccessibleButton className="mx_IncomingCallBox_buttons_accept" onClick={this.onAnswerClick}>
                             { _t("Accept") }
-                        </div>
+                        </AccessibleButton>
                     </div>
                 </div>
             </div>

From ab88c1cf58b4d9b08362b1eca2cdb892bffc3338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 6 Feb 2018 19:11:22 +0000
Subject: [PATCH 456/927] Translated using Weblate (French)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 36620c2894..f0f9b2dae9 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -980,5 +980,9 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Ce salon n'est pas public. Vous ne pourrez pas y revenir sans invitation.",
     "Community IDs cannot not be empty.": "Les identifiants de communauté ne peuvent pas être vides.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Afficher les appareils</showDevicesText>, <sendAnywayText>envoyer quand même</sendAnywayText> ou <cancelText>annuler</cancelText>.",
-    "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>"
+    "<a>In reply to</a> <pill>": "<a>En réponse à</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
+    "Failed to set direct chat tag": "Échec de l'ajout de l'étiquette discussion directe",
+    "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l'étiquette %(tagName)s du salon",
+    "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon"
 }

From 1b196655fa0767391f59383e699b86cc9a82e3c8 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 6 Feb 2018 21:11:17 +0000
Subject: [PATCH 457/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 29067f0bb4..4f06bbfc4e 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -980,5 +980,9 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Ez a szoba nem nyilvános. Kilépés után csak újabb meghívóval tudsz újra belépni a szobába.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Eszközök listája</showDevicesText>, <sendAnywayText>mindenképpen küld</sendAnywayText> vagy <cancelText>szakítsd meg</cancelText>.",
     "Community IDs cannot not be empty.": "A közösségi azonosító nem lehet üres.",
-    "<a>In reply to</a> <pill>": "<a>Válaszolva neki</a> <pill>"
+    "<a>In reply to</a> <pill>": "<a>Válaszolva neki</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
+    "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
+    "Failed to remove tag %(tagName)s from room": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
+    "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s"
 }

From 054849bc18c304b042ad1a0e5e8ecbea9268a207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Wed, 7 Feb 2018 08:52:37 +0000
Subject: [PATCH 458/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index fa118beca4..959a18270a 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -977,5 +977,12 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Či pri písaní správ používate rozbalenú lištu formátovania textu",
     "Your homeserver's URL": "URL adresa vami používaného domovského servera",
     "Your identity server's URL": "URL adresa vami používaného servera totožností",
-    "This room is not public. You will not be able to rejoin without an invite.": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu."
+    "This room is not public. You will not be able to rejoin without an invite.": "Toto nie je verejne dostupná miestnosť. Bez pozvánky nebudete do nej môcť vstúpiť znovu.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s si zmenil zobrazované meno na %(displayName)s.",
+    "Failed to set direct chat tag": "Nepodarilo sa nastaviť značku priama konverzácia",
+    "Failed to remove tag %(tagName)s from room": "Z miestnosti sa nepodarilo odstrániť značku %(tagName)s",
+    "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
+    "<a>In reply to</a> <pill>": "<a>Odpoveď na</a> <pill>",
+    "Community IDs cannot not be empty.": "ID komunity nemôže ostať prázdne.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText>, <sendAnywayText>napriek tomu odoslať</sendAnywayText> alebo <cancelText>zrušiť</cancelText>."
 }

From 393236ba3438707da047debbca7464912b61a01f Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 7 Feb 2018 09:23:00 +0000
Subject: [PATCH 459/927] Update / remove stickerpacks

---
 src/ScalarMessaging.js                    |  2 +
 src/components/views/rooms/Stickerpack.js | 45 +++++++++++++++++++----
 src/utils/widgets.js                      |  4 +-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 0fa342e69f..3d585108dd 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -362,6 +362,8 @@ function setWidget(event, roomId) {
         sendResponse(event, {
             success: true,
         });
+
+        dis.dispatch({ action: "user_widget_updated" });
     } else { // Room widget
         if (!roomId) {
             sendError(event, _t('Missing roomId.'), null);
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 77e188198a..a61ca84fbd 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -24,7 +24,7 @@ import Modal from '../../../Modal';
 import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
-
+import dis from '../../../dispatcher';
 
 export default class Stickerpack extends React.Component {
     constructor(props) {
@@ -34,11 +34,12 @@ export default class Stickerpack extends React.Component {
         this.onFinished = this.onFinished.bind(this);
         this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
         this._removeStickerpackWidgets = this._removeStickerpackWidgets.bind(this);
+        this._onWidgetAction = this._onWidgetAction.bind(this);
 
         this.defaultStickersContent = (
             <div className='mx_Stickers_contentPlaceholder'>
-                <p>{_t("You don't currently have any stickerpacks enabled")}</p>
-                <p>{_t("Click")} <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("here") } </span>{_t("to add some!")}</p>
+                <p>{ _t("You don't currently have any stickerpacks enabled") }</p>
+                <p>{ _t("Click") } <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("here") } </span>{ _t("to add some!") }</p>
                 <img src='img/stickerpack-placeholder.png' alt={_t('Add a stickerpack')} />
             </div>
         );
@@ -53,7 +54,9 @@ export default class Stickerpack extends React.Component {
 
     _removeStickerpackWidgets() {
         console.warn('Removing stickerpack widgets');
-        Widgets.removeStickerpackWidgets()
+        Widgets.removeStickerpackWidgets();
+        this._getStickerPickerWidget();
+        this.onFinished();
     }
 
     componentDidMount() {
@@ -70,16 +73,36 @@ export default class Stickerpack extends React.Component {
                 //     });
             });
         }
+        this._getStickerPickerWidget();
+        this.dispatcherRef = dis.register(this._onWidgetAction);
+    }
 
+    componentWillUnmount() {
+        dis.unregister(this.dispatcherRef);
+    }
+
+    _onWidgetAction(payload) {
+        if (payload.action === "user_widget_updated") {
+            console.warn("user widget updated");
+            this._getStickerPickerWidget();
+            return;
+        }
+        console.error("Unhandled widget action");
+    }
+
+    _getStickerPickerWidget() {
         // Stickers
         // TODO - Add support for stickerpacks from multiple app stores.
         // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
+        console.warn("Checking for sticker picker widgets");
         const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
-        console.warn('Stickerpack widget', stickerpackWidget);
         let stickersContent;
 
         // Load stickerpack content
         if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
+            // Set default name
+            stickerpackWidget.content.name = stickerpackWidget.name || "Stickerpack";
+            console.warn('Stickerpack widget', stickerpackWidget);
             this.widgetId = stickerpackWidget.id;
             stickersContent = (
                 <div
@@ -103,7 +126,7 @@ export default class Stickerpack extends React.Component {
                                 'fontSize': 'smaller',
                                 'cursor': 'pointer',
                             }}
-                            onClick={this._removeStickerpackWidgets()}
+                            onClick={this._removeStickerpackWidgets}
                         >X</div>
                         <AppTile
                             id={stickerpackWidget.id}
@@ -135,9 +158,14 @@ export default class Stickerpack extends React.Component {
             );
         } else {
             // Default content to show if stickerpack widget not added
+            console.warn("No available sticker picker widgets");
             stickersContent = this.defaultStickersContent;
+            this.forceUpdate();
         }
-        this.setState({stickersContent});
+        this.setState({
+            showStickers: false,
+            stickersContent: stickersContent,
+        });
     }
 
     /**
@@ -146,6 +174,7 @@ export default class Stickerpack extends React.Component {
      * @param  {Event} e Event that triggered the function
      */
     onShowStickersClick(e) {
+        this._getStickerPickerWidget();
         const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
         const buttonRect = e.target.getBoundingClientRect();
 
@@ -182,6 +211,8 @@ export default class Stickerpack extends React.Component {
     onFinished() {
         this.setState({showStickers: false});
         this.stickersMenu = null;
+        this.forceUpdate();
+        console.warn("finshed");
     }
 
     /**
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index 806906f072..081815fed9 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -45,7 +45,9 @@ function getUserWidgets() {
  * @return {[object]} Array containing current / active stickerpack widgets
  */
 function getStickerpackWidgets() {
-    const stickerpackWidgets = getUserWidgets().filter((widget) => widget.type='stickerpack');
+    const widgets = getUserWidgets();
+    console.warn("widgets", widgets);
+    const stickerpackWidgets = widgets.filter((widget) => widget.type='stickerpack');
     console.warn('Stickerpack widgets', stickerpackWidgets);
     return stickerpackWidgets;
 }

From ae094bebe576a58b8c0b6ca893b2e4c650a0d87a Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 7 Feb 2018 09:40:21 +0000
Subject: [PATCH 460/927] Translated using Weblate (German)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 05745932b9..a1687858d1 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -980,5 +980,9 @@
     "Whether or not you're logged in (we don't record your user name)": "Ob oder ob du nicht angemeldet bist (wir zeichnen deinen Benutzernamen nicht auf)",
     "Which officially provided instance you are using, if any": "Welche offiziell angebotene Instanz du nutzt, wenn es der Fall ist",
     "<a>In reply to</a> <pill>": "<a>Antwort zu</a> <pill>",
-    "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können."
+    "This room is not public. You will not be able to rejoin without an invite.": "Dies ist kein öffentlicher Raum. Du wirst diesen nicht ohne Einladung wieder beitreten können.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
+    "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
+    "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
+    "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags von dem Raum"
 }

From c1649d1b754777d665301c5b319cbba5ee5075eb Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 7 Feb 2018 09:45:36 +0000
Subject: [PATCH 461/927] Give dialogs a matrixClient context

Dialogs are mounted outside of the main react tree of MatrixChat,
so they won't have its child context.
---
 src/components/views/dialogs/BaseDialog.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index e879808dc2..66e5fcb0c0 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -17,9 +17,12 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { MatrixClient } from 'matrix-js-sdk';
+
 import { KeyCode } from '../../../Keyboard';
 import AccessibleButton from '../elements/AccessibleButton';
 import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
 
 /**
  * Basic container for modal dialogs.
@@ -51,6 +54,20 @@ export default React.createClass({
         children: PropTypes.node,
     },
 
+    childContextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    },
+
+    getChildContext: function() {
+        return {
+            matrixClient: this._matrixClient,
+        };
+    },
+
+    componentWillMount() {
+        this._matrixClient = MatrixClientPeg.get();
+    },
+
     _onKeyDown: function(e) {
         if (this.props.onKeyDown) {
             this.props.onKeyDown(e);

From 74a28a749661e2e742bac2085f2b517081ae8397 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 7 Feb 2018 09:41:35 +0000
Subject: [PATCH 462/927] Translated using Weblate (German)

Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 a1687858d1..f92b7b479a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -984,5 +984,5 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
     "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
-    "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags von dem Raum"
+    "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum"
 }

From 443c19c6e149aa7667f8f4b162911eabe34eb006 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 6 Feb 2018 21:13:13 +0000
Subject: [PATCH 463/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 4f06bbfc4e..48132200a3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -890,7 +890,7 @@
     "%(items)s and %(count)s others|other": "%(items)s és még %(count)s másik",
     "%(items)s and %(count)s others|one": "%(items)s és még egy másik",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Az e-mail leküldésre került ide: %(emailAddress)s. Ha követte a levélben lévő linket kattints alább.",
-    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "%(roomName)s szoba láthatóságát nem lehet frissíteni ebben a közösségben: %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "%(roomName)s szoba láthatóságát nem lehet frissíteni ebben a közösségben: %(groupId)s.",
     "Visibility in Room List": "Láthatóság a szoba listában",
     "Visible to everyone": "Mindenki számára látható",
     "Only visible to community members": "Csak a közösség számára látható",

From b65e80fa53b49ae2f5802a2521be868b219ac965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Tue, 6 Feb 2018 21:40:24 +0000
Subject: [PATCH 464/927] Translated using Weblate (Serbian)

Currently translated at 80.4% (793 of 986 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 1a6da54baa..9d5c08046a 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -769,5 +769,28 @@
     "For security, this session has been signed out. Please sign in again.": "Зарад безбедности, одјављени сте из ове сесије. Пријавите се поново.",
     "Cryptography data migrated": "Криптографски подаци су пренесени",
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Једноструко преношење криптографских података је обављено. Шифровање с краја на крај неће радити ако се вратите на старије издање Riot-а. Ако вам треба шифровање с краја на крај на старијем издању, прво се одјавите из Riot-а. Да бисте задржали историјат порука, извезите па поново увезите ваше кључеве.",
-    "Old cryptography data detected": "Нађени су стари криптографски подаци"
+    "Old cryptography data detected": "Нађени су стари криптографски подаци",
+    "The platform you're on": "Платформа коју користите",
+    "The version of Riot.im": "Riot.im издање",
+    "Whether or not you're logged in (we don't record your user name)": "Стање ваше пријављености (не памтимо ваше корисничко име)",
+    "Your language of choice": "Ваш жељени језик",
+    "Which officially provided instance you are using, if any": "Коју званичну инстанцу користите, ако користите",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Да ли користите режим богатог текста у уређивачу богатог текста",
+    "Your homeserver's URL": "Адреса вашег кућног сервера",
+    "Your identity server's URL": "Адреса вашег идентитеског сервера",
+    "Analytics": "Аналитика",
+    "The information being sent to us to help make Riot.im better includes:": "У податке које нам шаљете зарад побољшавања Riot.im-а спадају:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Такође бележимо сваку страницу коју користите у апликацији (тренутно <CurrentPageHash>), ваш кориснички агент (<CurrentUserAgent>) и резолуцију вашег уређаја (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ако страница садржи поверљиве податке (као што је назив собе, корисника или ИБ-ја групе), ти подаци се уклањају пре слања на сервер.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "Корисник %(oldDisplayName)s је променио приказно име у %(displayName)s.",
+    "Failed to set direct chat tag": "Нисам успео да поставим ознаку директног ћаскања",
+    "Failed to remove tag %(tagName)s from room": "Нисам успео да скинем ознаку %(tagName)s са собе",
+    "Failed to add tag %(tagName)s to room": "Нисам успео да додам ознаку %(tagName)s на собу",
+    "<a>In reply to</a> <pill>": "<a>Као одговор за</a> <pill>",
+    "This room is not public. You will not be able to rejoin without an invite.": "Ова соба није јавна. Нећете моћи да поново приступите без позивнице.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Подаци из старијег издања Riot-а су нађени. Ово ће узроковати лош рад шифровања с краја на крај у старијем издању. Размењене поруке које су шифроване с краја на крај у старијем издању је можда немогуће дешифровати у овом издању. Такође, ово може узроковати неуспешно размењивање порука са овим издањем. Ако доживите проблеме, одјавите се и пријавите се поново. Да бисте задржали историјат поруке, извезите па поново увезите ваше кључеве.",
+    "Logout": "Одјава",
+    "Your Communities": "Ваше заједнице",
+    "Error whilst fetching joined communities": "Грешка приликом добављања списка са приступљеним заједницама",
+    "Create a new community": "Направи нову заједницу"
 }

From f3943bef51e9551634b42ffad6daef72fc9879c8 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 7 Feb 2018 10:05:50 +0000
Subject: [PATCH 465/927] Check for empty user widgets.

---
 src/components/views/rooms/Stickerpack.js | 1 -
 src/utils/widgets.js                      | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index a61ca84fbd..3722818bf6 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -87,7 +87,6 @@ export default class Stickerpack extends React.Component {
             this._getStickerPickerWidget();
             return;
         }
-        console.error("Unhandled widget action");
     }
 
     _getStickerPickerWidget() {
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index 081815fed9..2c7901a18f 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -36,8 +36,12 @@ function getUserWidgets() {
     if (!client) {
         throw new Error('User not logged in');
     }
-    const userWidgets = client.getAccountData('m.widgets').getContent() || {};
-    return Object.keys(userWidgets).map((key) => userWidgets[key]);
+    const userWidgets = client.getAccountData('m.widgets');
+    let userWidgetContent = {};
+    if (userWidgets && userWidgets.getContent()) {
+      userWidgetContent = userWidgets.getContent();
+    }
+    return Object.keys(userWidgetContent).map((key) => userWidgetContent[key]);
 }
 
 /**

From 0a5bf079139dedb3cc3b897ea68513a7ab146487 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 7 Feb 2018 10:13:19 +0000
Subject: [PATCH 466/927] Use getComponent

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

diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index c0dff4e8a3..a04cf4421e 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -19,7 +19,6 @@ import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
-import AccessibleButton from '../elements/AccessibleButton';
 
 module.exports = React.createClass({
     displayName: 'IncomingCallBox',
@@ -63,6 +62,7 @@ module.exports = React.createClass({
             }
         }
 
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         return (
             <div className="mx_IncomingCallBox" id="incomingCallBox">
                 <img className="mx_IncomingCallBox_chevron" src="img/chevron-left.png" width="9" height="16" />

From 2a68e3ea392f84ef11b1efb0b5d58a2dd837bc92 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 7 Feb 2018 11:42:50 +0000
Subject: [PATCH 467/927] import sdk

---
 src/components/views/voip/IncomingCallBox.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index a04cf4421e..ae003ff6f3 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
+import sdk from '../../../index'
 
 module.exports = React.createClass({
     displayName: 'IncomingCallBox',

From 8eb4137ec315293b546a0ec305e76774c16e0ae3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 7 Feb 2018 11:51:41 +0000
Subject: [PATCH 468/927] missing semicolon

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

diff --git a/src/components/views/voip/IncomingCallBox.js b/src/components/views/voip/IncomingCallBox.js
index ae003ff6f3..6cbaabe602 100644
--- a/src/components/views/voip/IncomingCallBox.js
+++ b/src/components/views/voip/IncomingCallBox.js
@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher';
 import { _t } from '../../../languageHandler';
-import sdk from '../../../index'
+import sdk from '../../../index';
 
 module.exports = React.createClass({
     displayName: 'IncomingCallBox',

From 8d21803df5c9b36b93d06fcc996db552bc819a2d Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 7 Feb 2018 11:57:06 +0000
Subject: [PATCH 469/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 93a324aba0..8ea32cf99c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -980,5 +980,9 @@
     "This room is not public. You will not be able to rejoin without an invite.": "這個聊天室並未公開。您在沒有邀請的情況下將無法重新加入。",
     "Community IDs cannot not be empty.": "社群 ID 不能為空。",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>顯示裝置</showDevicesText>、<sendAnywayText>無論如何都要傳送</sendAnywayText>或<cancelText>取消</cancelText>。",
-    "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>"
+    "<a>In reply to</a> <pill>": "<a>回覆給</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他們的顯示名稱為 %(displayName)s 。",
+    "Failed to set direct chat tag": "設定直接聊天標籤失敗",
+    "Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗",
+    "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗"
 }

From 34eae0fbde1b59b8a1a37feadd7658694b72ccbe Mon Sep 17 00:00:00 2001
From: "Robert A. Viana" <robert.abreu@outlook.com>
Date: Wed, 7 Feb 2018 11:19:03 +0000
Subject: [PATCH 470/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 67.0% (661 of 986 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 023294db22..8c7b6ffbd6 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -658,5 +658,7 @@
     "You are no longer ignoring %(userId)s": "Você parou de ignorar %(userId)s",
     "Edit": "Editar",
     "Unpin Message": "Desafixar Mensagem",
-    "Add rooms to this community": "Adicionar salas na comunidade"
+    "Add rooms to this community": "Adicionar salas na comunidade",
+    "The version of Riot.im": "A Versão do Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Se você está ou não conectado (Nos não Gravaremos seu nome de usuário)"
 }

From 7b75dbbd15d621df14fb292716d0c499b8ac198e Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 7 Feb 2018 14:44:01 +0000
Subject: [PATCH 471/927] Use default AppTile menu bar.

---
 src/components/views/elements/AppTile.js  | 109 ++++++++++++++--------
 src/components/views/rooms/Stickerpack.js |  31 ++----
 2 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 582cc01a57..c96ce9f775 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -274,12 +274,16 @@ export default class AppTile extends React.Component {
 
     _onEditClick(e) {
         console.log("Edit widget ID ", this.props.id);
-        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-        const src = this._scalarClient.getScalarInterfaceUrlForRoom(
-            this.props.room.roomId, 'type_' + this.props.type, this.props.id);
-        Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
-            src: src,
-        }, "mx_IntegrationsManager");
+        if (this.props.onEditClick) {
+            this.props.onEditClick();
+        } else {
+            const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+            const src = this._scalarClient.getScalarInterfaceUrlForRoom(
+                this.props.room.roomId, 'type_' + this.props.type, this.props.id);
+            Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+                src: src,
+            }, "mx_IntegrationsManager");
+        }
     }
 
     _onSnapshotClick(e) {
@@ -298,34 +302,38 @@ export default class AppTile extends React.Component {
      * otherwise revoke access for the widget to load in the user's browser
     */
     _onDeleteClick() {
-        if (this._canUserModify()) {
-            // Show delete confirmation dialog
-            const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
-            Modal.createTrackedDialog('Delete Widget', '', QuestionDialog, {
-                title: _t("Delete Widget"),
-                description: _t(
-                    "Deleting a widget removes it for all users in this room." +
-                    " Are you sure you want to delete this widget?"),
-                button: _t("Delete widget"),
-                onFinished: (confirmed) => {
-                    if (!confirmed) {
-                        return;
-                    }
-                    this.setState({deleting: true});
-                    MatrixClientPeg.get().sendStateEvent(
-                        this.props.room.roomId,
-                        'im.vector.modular.widgets',
-                        {}, // empty content
-                        this.props.id,
-                    ).catch((e) => {
-                        console.error('Failed to delete widget', e);
-                        this.setState({deleting: false});
-                    });
-                },
-            });
+        if (this.props.onDeleteClick) {
+            this.props.onDeleteClick();
         } else {
-            console.log("Revoke widget permissions - %s", this.props.id);
-            this._revokeWidgetPermission();
+            if (this._canUserModify()) {
+                // Show delete confirmation dialog
+                const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                Modal.createTrackedDialog('Delete Widget', '', QuestionDialog, {
+                    title: _t("Delete Widget"),
+                    description: _t(
+                        "Deleting a widget removes it for all users in this room." +
+                        " Are you sure you want to delete this widget?"),
+                    button: _t("Delete widget"),
+                    onFinished: (confirmed) => {
+                        if (!confirmed) {
+                            return;
+                        }
+                        this.setState({deleting: true});
+                        MatrixClientPeg.get().sendStateEvent(
+                            this.props.room.roomId,
+                            'im.vector.modular.widgets',
+                            {}, // empty content
+                            this.props.id,
+                        ).catch((e) => {
+                            console.error('Failed to delete widget', e);
+                            this.setState({deleting: false});
+                        });
+                    },
+                });
+            } else {
+                console.log("Revoke widget permissions - %s", this.props.id);
+                this._revokeWidgetPermission();
+            }
         }
     }
 
@@ -429,6 +437,22 @@ export default class AppTile extends React.Component {
         return safeWidgetUrl;
     }
 
+    _getTileTitle() {
+        const name = this.formatAppTileName();
+        const titleSpacer = <span>&nbsp;-&nbsp;</span>;
+        let title = '';
+        if (this.state.widgetPageTitle && this.state.widgetPageTitle != this.formatAppTileName()) {
+            title = this.state.widgetPageTitle;
+        }
+
+        return (
+            <span>
+                <b>{ name }</b>
+                <span>{ title ? titleSpacer : '' }{ title }</span>
+            </span>
+        );
+    }
+
     render() {
         let appTileBody;
 
@@ -508,17 +532,14 @@ export default class AppTile extends React.Component {
                 { this.props.showMenubar &&
                 <div ref="menu_bar" className="mx_AppTileMenuBar" onClick={this.onClickMenuBar}>
                     <span className="mx_AppTileMenuBarTitle">
-                        <TintableSvgButton
+                        { this.props.showMinimise && <TintableSvgButton
                             src={windowStateIcon}
                             className="mx_AppTileMenuBarWidget mx_AppTileMenuBarWidgetPadding"
                             title={_t('Minimize apps')}
                             width="10"
                             height="10"
-                        />
-                        <b>{ this.formatAppTileName() }</b>
-                        { this.state.widgetPageTitle && this.state.widgetPageTitle != this.formatAppTileName() && (
-                            <span>&nbsp;-&nbsp;{ this.state.widgetPageTitle }</span>
-                        ) }
+                        /> }
+                        { this.props.showTitle && this._getTileTitle() }
                     </span>
                     <span className="mx_AppTileMenuBarWidgets">
                       { /* Snapshot widget */ }
@@ -575,10 +596,20 @@ AppTile.propTypes = {
     showMenubar: React.PropTypes.bool,
     // Should the AppTile render itself
     show: React.PropTypes.bool,
+    // Optional onEditClickHandler (overrides default behaviour)
+    onEditClick: React.PropTypes.func,
+    // Optional onDeleteClickHandler (overrides default behaviour)
+    onDeleteClick: React.PropTypes.func,
+    // Optionally hide the tile title
+    showTitle: React.PropTypes.bool,
+    // Optionally hide the tile minimise icon
+    showMinimise: React.PropTypes.bool,
 };
 
 AppTile.defaultProps = {
     url: "",
     waitForIframeLoad: true,
     showMenubar: true,
+    showTitle: true,
+    showMinimise: true,
 };
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 3722818bf6..6a61618b2c 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -25,6 +25,8 @@ import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
+import TintableSvgButton from '../elements/TintableSvgButton';
+
 
 export default class Stickerpack extends React.Component {
     constructor(props) {
@@ -103,6 +105,7 @@ export default class Stickerpack extends React.Component {
             stickerpackWidget.content.name = stickerpackWidget.name || "Stickerpack";
             console.warn('Stickerpack widget', stickerpackWidget);
             this.widgetId = stickerpackWidget.id;
+
             stickersContent = (
                 <div
                     style={{
@@ -115,18 +118,10 @@ export default class Stickerpack extends React.Component {
                         className='mx_Stickers_content'
                         style={{
                             border: 'none',
-                            height: this.popoverHeight - 30,
+                            height: this.popoverHeight,
                             width: this.popoverWidth,
                         }}
                     >
-                        <div
-                            style={{
-                                'float': 'right',
-                                'fontSize': 'smaller',
-                                'cursor': 'pointer',
-                            }}
-                            onClick={this._removeStickerpackWidgets}
-                        >X</div>
                         <AppTile
                             id={stickerpackWidget.id}
                             url={stickerpackWidget.content.url}
@@ -138,21 +133,13 @@ export default class Stickerpack extends React.Component {
                             creatorUserId={MatrixClientPeg.get().credentials.userId}
                             waitForIframeLoad={true}
                             show={true}
-                            showMenubar={false}
+                            showMenubar={true}
+                            onEditClick={this._launchManageIntegrations}
+                            onDeleteClick={this._removeStickerpackWidgets}
+                            showTitle={false}
+                            showMinimise={false}
                         />
                     </div>
-                    <div style={{
-                        height: '20px',
-                        position: 'absolute',
-                        bottom: '5px',
-                        right: '19px',
-                        width: '263px',
-                        textAlign: 'right',
-                        padding: '5px',
-                        borderTop: '1px solid #999',
-                    }}>
-                        <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("Manage sticker packs") } </span>
-                    </div>
                 </div>
             );
         } else {

From 5e30468a0080b02f175222e96f29ba53dda6a347 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 7 Feb 2018 14:48:43 +0000
Subject: [PATCH 472/927] Linting

---
 src/components/views/elements/AppTile.js  | 4 ++--
 src/components/views/rooms/Stickerpack.js | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index c96ce9f775..9d76e3410e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -37,8 +37,6 @@ import dis from '../../../dispatcher';
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
 
 export default class AppTile extends React.Component {
-    static displayName ='AppTile';
-
     constructor(props) {
         super(props);
         this.state = this._getNewState(props);
@@ -579,6 +577,8 @@ export default class AppTile extends React.Component {
     }
 }
 
+AppTile.displayName ='AppTile';
+
 AppTile.propTypes = {
     id: React.PropTypes.string.isRequired,
     url: React.PropTypes.string.isRequired,
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 6a61618b2c..e04098a06b 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -25,8 +25,6 @@ import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
-import TintableSvgButton from '../elements/TintableSvgButton';
-
 
 export default class Stickerpack extends React.Component {
     constructor(props) {

From 45ad46b4687242f296a12a9c937ddf46577d2574 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 7 Feb 2018 15:51:03 +0000
Subject: [PATCH 473/927] Fix HS/IS URL reset when switching to Registration

---
 src/components/structures/MatrixChat.js       | 43 ++++++++++++++-----
 src/components/structures/login/Login.js      |  3 ++
 .../structures/login/Registration.js          |  2 +
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index d6d0b00c84..b37da0144f 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -618,18 +618,26 @@ export default React.createClass({
     },
 
     _startRegistration: function(params) {
-        this.setStateForNewView({
+        const newState = {
             view: VIEWS.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,
-        });
+        };
+
+        // Only honour params if they are all present, otherwise we reset
+        // HS and IS URLs when switching to registration.
+        if (params.client_secret &&
+            params.session_id &&
+            params.hs_url &&
+            params.is_url &&
+            params.sid
+        ) {
+            newState.register_client_secret = params.client_secret;
+            newState.register_session_id = params.session_id;
+            newState.register_hs_url = params.hs_url;
+            newState.register_is_url = params.is_url;
+            newState.register_id_sid = params.sid;
+        }
+
+        this.setStateForNewView(newState);
         this.notifyNewScreen('register');
     },
 
@@ -1501,6 +1509,17 @@ export default React.createClass({
         }
     },
 
+    onServerConfigChange(config) {
+        const newState = {};
+        if (config.hsUrl) {
+            newState.register_hs_url = config.hsUrl;
+        }
+        if (config.isUrl) {
+            newState.register_is_url = config.isUrl;
+        }
+        this.setState(newState);
+    },
+
     _makeRegistrationUrl: function(params) {
         if (this.props.startingFragmentQueryParams.referrer) {
             params.referrer = this.props.startingFragmentQueryParams.referrer;
@@ -1589,6 +1608,7 @@ export default React.createClass({
                     onLoginClick={this.onLoginClick}
                     onRegisterClick={this.onRegisterClick}
                     onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null}
+                    onServerConfigChange={this.onServerConfigChange}
                     />
             );
         }
@@ -1623,6 +1643,7 @@ export default React.createClass({
                     onForgotPasswordClick={this.onForgotPasswordClick}
                     enableGuest={this.props.enableGuest}
                     onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null}
+                    onServerConfigChange={this.onServerConfigChange}
                 />
             );
         }
diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index f4c08e8362..5042ca1fd0 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -58,6 +58,7 @@ module.exports = React.createClass({
         // login shouldn't care how password recovery is done.
         onForgotPasswordClick: PropTypes.func,
         onCancelClick: PropTypes.func,
+        onServerConfigChange: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
@@ -218,6 +219,8 @@ module.exports = React.createClass({
         if (config.isUrl !== undefined) {
             newState.enteredIdentityServerUrl = config.isUrl;
         }
+
+        this.props.onServerConfigChange(config);
         this.setState(newState, function() {
             self._initLoginLogic(config.hsUrl || null, config.isUrl);
         });
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index b8a85c5f82..62a3ee4f68 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -61,6 +61,7 @@ module.exports = React.createClass({
         // registration shouldn't know or care how login is done.
         onLoginClick: PropTypes.func.isRequired,
         onCancelClick: PropTypes.func,
+        onServerConfigChange: PropTypes.func.isRequired,
     },
 
     getInitialState: function() {
@@ -131,6 +132,7 @@ module.exports = React.createClass({
         if (config.isUrl !== undefined) {
             newState.isUrl = config.isUrl;
         }
+        this.props.onServerConfigChange(config);
         this.setState(newState, function() {
             this._replaceClient();
         });

From 2549b44768a525e0ca46778573fcd99132b864a7 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 7 Feb 2018 18:57:32 +0000
Subject: [PATCH 474/927] Linting

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

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 37e7abe05e..e71a3c929b 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -122,7 +122,7 @@ module.exports = React.createClass({
                 return mlist[leftUserIds[0]].getAvatarUrl(
                     MatrixClientPeg.get().getHomeserverUrl(),
                     props.width, props.height, props.resizeMethod,
-                        false
+                    false,
                 );
             }
             return mlist[userIds[0]].getAvatarUrl(

From 5823b32ab14c52be42ffac359b8f18d3ef2f10f7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Thu, 8 Feb 2018 10:01:24 +0000
Subject: [PATCH 475/927] RoomView: guard against unmounting during peeking

it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.
---
 src/components/structures/RoomView.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 27a70fdb10..5304f38901 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -264,12 +264,19 @@ module.exports = React.createClass({
                     isPeeking: true, // this will change to false if peeking fails
                 });
                 MatrixClientPeg.get().peekInRoom(roomId).then((room) => {
+                    if (this.unmounted) {
+                        return;
+                    }
                     this.setState({
                         room: room,
                         peekLoading: false,
                     });
                     this._onRoomLoaded(room);
                 }, (err) => {
+                    if (this.unmounted) {
+                        return;
+                    }
+
                     // Stop peeking if anything went wrong
                     this.setState({
                         isPeeking: false,
@@ -286,7 +293,7 @@ module.exports = React.createClass({
                     } else {
                         throw err;
                     }
-                }).done();
+                });
             }
         } else if (room) {
             // Stop peeking because we have joined this room previously

From 5cf3d3176fd7b31eeb197982fe41e7852ee096b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Wed, 7 Feb 2018 20:35:20 +0000
Subject: [PATCH 476/927] Translated using Weblate (Serbian)

Currently translated at 91.1% (899 of 986 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 9d5c08046a..9a38d6fac8 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -792,5 +792,111 @@
     "Logout": "Одјава",
     "Your Communities": "Ваше заједнице",
     "Error whilst fetching joined communities": "Грешка приликом добављања списка са приступљеним заједницама",
-    "Create a new community": "Направи нову заједницу"
+    "Create a new community": "Направи нову заједницу",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Направите заједницу да бисте спојили кориснике и собе! Направите прилагођену почетну страницу да бисте означили ваш кутак у Матрикс универзуму.",
+    "Join an existing community": "Приступи већ постојећој заједници",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Да бисте приступили већ постојећој заједници, морате знати њен идентификатор заједнице. Ово изгледа нешто као <i>+primer:matrix.org</i>.",
+    "You have no visible notifications": "Немате видљивих обавештења",
+    "Scroll to bottom of page": "Превуци на дно странице",
+    "Message not sent due to unknown devices being present": "Порука се неће послати због присутности непознатих уређаја",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Прикажи уређаје</showDevicesText>, <sendAnywayText>ипак пошаљи</sendAnywayText> или <cancelText>откажи</cancelText>.",
+    "%(count)s of your messages have not been sent.|other": "Неке ваше поруке нису послате.",
+    "%(count)s of your messages have not been sent.|one": "Ваша порука није послата.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Пошаљи поново</resendText> или <cancelText>откажи све</cancelText> сада. Такође можете изабрати појединачне поруке за поновно слање или отказивање.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Поново пошаљи поруку</resendText> или <cancelText>откажи поруку</cancelText> сада.",
+    "Warning": "Упозорење",
+    "Connectivity to the server has been lost.": "Веза ка серверу је прекинута.",
+    "Sent messages will be stored until your connection has returned.": "Послате поруке биће сачуване док се веза не успостави поново.",
+    "%(count)s new messages|other": "%(count)s нових порука",
+    "%(count)s new messages|one": "%(count)s нова порука",
+    "Active call": "Текући позив",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Нема других чланова! Да ли желите да <inviteText>позовете друге</inviteText> или да <nowarnText>склоните упозорење о празној соби</nowarnText>?",
+    "You seem to be uploading files, are you sure you want to quit?": "Изгледа да отпремате датотеке. Да ли сте сигурни да желите изаћи?",
+    "You seem to be in a call, are you sure you want to quit?": "Изгледа да сте у позиву. Да ли сте сигурни да желите изаћи?",
+    "Failed to upload file": "Нисам успео да отпремим датотеку",
+    "Server may be unavailable, overloaded, or the file too big": "Сервер је можда недоступан, преоптерећен или је датотека сувише велика",
+    "Search failed": "Претрага је неуспешна",
+    "Server may be unavailable, overloaded, or search timed out :(": "Сервер је можда недоступан, преоптерећен или је истекло време претраживања :(",
+    "No more results": "Нема више резултата",
+    "Unknown room %(roomId)s": "Непозната соба %(roomId)s",
+    "Room": "Соба",
+    "Failed to save settings": "Нисам успео да сачувам подешавања",
+    "Failed to reject invite": "Нисам успео да одбацим позивницу",
+    "Fill screen": "Испуни екран",
+    "Click to unmute video": "Кликни да појачаш видео",
+    "Click to mute video": "Кликни да утишаш видео",
+    "Click to unmute audio": "Кликни да појачаш звук",
+    "Click to mute audio": "Кликни да утишаш звук",
+    "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.": "Покушао сам да учитам одређену тачку у временској линији ове собе али нисам могао да је нађем.",
+    "Failed to load timeline position": "Нисам могао да учитам позицију у временској линији",
+    "Uploading %(filename)s and %(count)s others|other": "Отпремам датотеку %(filename)s и још %(count)s других",
+    "Uploading %(filename)s and %(count)s others|zero": "Отпремам датотеку %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Отпремам датотеку %(filename)s и %(count)s других датотека",
+    "Light theme": "Светла тема",
+    "Dark theme": "Тамна тема",
+    "Status.im theme": "Status.im тема",
+    "Can't load user settings": "Не могу да учитам корисничка подешавања",
+    "Server may be unavailable or overloaded": "Сервер је недоступан или је преоптерећен",
+    "Sign out": "Одјави ме",
+    "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.": "Зарад безбедности, одјава ће обрисати све кључеве за шифровање с краја на крај, на овом прегледачу. Ако желите да дешифрујете историјат вашег ћаскања из будућих Riot сесија, извезите ваше кључеве и чувајте их.",
+    "Failed to change password. Is your password correct?": "Нисам успео да променим лозинку. Да ли је ваша лозинка тачна?",
+    "Success": "Успех",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ваша лозинка је успешно промењена. Нећете добијати пуш обавештења на вашим другим уређајима док се поново не пријавите на њима",
+    "Remove Contact Information?": "Уклонити контакт податке?",
+    "Remove %(threePid)s?": "Уклонити %(threePid)s?",
+    "Unable to remove contact information": "Не могу да уклоним контакт податке",
+    "Refer a friend to Riot:": "Кажите пријатељу за Riot:",
+    "Interface Language": "Језик интерфејса",
+    "User Interface": "Кориснички интерфејс",
+    "Autocomplete Delay (ms):": "Застој самодопуњавања (мс):",
+    "<not supported>": "<није подржано>",
+    "Import E2E room keys": "Увези E2E кључеве собе",
+    "Cryptography": "Криптографија",
+    "Device ID:": "ИБ уређаја:",
+    "Device key:": "Кључ уређаја:",
+    "Ignored Users": "Занемарени корисници",
+    "Bug Report": "Извештај о грешци",
+    "Found a bug?": "Нашли сте грешку?",
+    "Report it": "Пријавите је",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot прикупља анонимне податке о коришћењу да бисмо побољшали апликацију.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Приватност је веома важна нама те не сакупљамо било какве податке личне природе у нашој аналитици.",
+    "Learn more about how we use analytics.": "Сазнајте више о нашем начину употребе аналитике.",
+    "Labs": "Лабораторије",
+    "These are experimental features that may break in unexpected ways": "Ово су пробне могућности које се могу поломити на непредвидљиве начине",
+    "Use with caution": "Опрезно користите",
+    "Deactivate my account": "Деактивирај мој налог",
+    "Clear Cache": "Очисти кеш",
+    "Clear Cache and Reload": "Очисти кеш и поново учитај",
+    "Updates": "Ажурирања",
+    "Check for update": "Провери да ли има ажурирања",
+    "Reject all %(invitedRooms)s invites": "Одбиј све позивнице за собе %(invitedRooms)s",
+    "Bulk Options": "Вишеструке опције",
+    "Desktop specific": "Само за стоне уређаје",
+    "Start automatically after system login": "Самостално покрећи након пријаве на систем",
+    "No media permissions": "Нема овлашћења за медије",
+    "You may need to manually permit Riot to access your microphone/webcam": "Можда ћете морати да ручно доделите овлашћења Riot-у за приступ микрофону/веб камери",
+    "Missing Media Permissions, click here to request.": "Недостају овлашћења за медије, кликните овде да затражите.",
+    "No Microphones detected": "Нема уочених микрофона",
+    "No Webcams detected": "Нема уочених веб камера",
+    "Default Device": "Подразумевани уређај",
+    "Microphone": "Микрофон",
+    "Camera": "Камера",
+    "VoIP": "VoIP",
+    "Email": "Мејл",
+    "Add email address": "Додај мејл адресу",
+    "Notifications": "Обавештења",
+    "Profile": "Профил",
+    "Display name": "Приказно име",
+    "Account": "Налог",
+    "To return to your account in future you need to set a password": "Да бисте се вратили у ваш налог у будућности, морате поставити лозинку",
+    "Logged in as:": "Пријављени као:",
+    "Access Token:": "Приступни жетон:",
+    "click to reveal": "кликни за приказ",
+    "Homeserver is": "Кућни сервер је",
+    "Identity Server is": "Идентитетски сервер је",
+    "matrix-react-sdk version:": "matrix-react-sdk издање:",
+    "riot-web version:": "riot-web издање:",
+    "olm version:": "olm издање:",
+    "Failed to send email": "Нисам успео да пошаљем мејл"
 }

From 7a594ce08dbcb1b0248ecfe39acab5b8ce60a607 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 8 Feb 2018 17:58:53 +0200
Subject: [PATCH 477/927] Add seconds to formatFullDate()

Fixes vector-im/riot-web#6055

Signed-off-by: Tulir Asokan <tulir@maunium.net>
---
 src/DateUtils.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/DateUtils.js b/src/DateUtils.js
index 986525eec8..108697238c 100644
--- a/src/DateUtils.js
+++ b/src/DateUtils.js
@@ -50,11 +50,15 @@ function pad(n) {
     return (n < 10 ? '0' : '') + n;
 }
 
-function twelveHourTime(date) {
+function twelveHourTime(date, showSeconds=false) {
     let hours = date.getHours() % 12;
     const minutes = pad(date.getMinutes());
     const ampm = date.getHours() >= 12 ? _t('PM') : _t('AM');
     hours = hours ? hours : 12; // convert 0 -> 12
+    if (showSeconds) {
+        const seconds = pad(date.getSeconds());
+        return `${hours}:${minutes}:${seconds}${ampm}`;
+    }
     return `${hours}:${minutes}${ampm}`;
 }
 
@@ -101,10 +105,17 @@ export function formatFullDate(date, showTwelveHour=false) {
         monthName: months[date.getMonth()],
         day: date.getDate(),
         fullYear: date.getFullYear(),
-        time: formatTime(date, showTwelveHour),
+        time: formatFullTime(date, showTwelveHour),
     });
 }
 
+export function formatFullTime(date, showTwelveHour=false) {
+    if (showTwelveHour) {
+        return twelveHourTime(date, true);
+    }
+    return pad(date.getHours()) + ':' + pad(date.getMinutes()) + ':' + pad(date.getSeconds());
+}
+
 export function formatTime(date, showTwelveHour=false) {
     if (showTwelveHour) {
         return twelveHourTime(date);

From 21d70125e4e21d40320c793186527d96c9b9358c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 8 Feb 2018 14:48:29 +0000
Subject: [PATCH 478/927] Dispatch MatrixActions synchronously

Otherwise we risk blocking the dispatches on other work, and they
do not need to be done asynchronously.

This emerged as a bug where the room list appeared empty until
MatrixActions.sync dispatches all occured in one big lump, well
after the sync events being emitted by the js-sdk.
---
 src/actions/MatrixActionCreators.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index f4d6c34ff5..dbfe910533 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -101,7 +101,7 @@ export default {
      */
     _addMatrixClientListener(matrixClient, eventName, actionCreator) {
         const listener = (...args) => {
-            dis.dispatch(actionCreator(matrixClient, ...args));
+            dis.dispatch(actionCreator(matrixClient, ...args), true);
         };
         matrixClient.on(eventName, listener);
         this._matrixClientListenersStop.push(() => {

From 9b0df1914953223cbbf31b33231585d1ba6f5afb Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Tue, 6 Feb 2018 15:15:47 +0000
Subject: [PATCH 479/927] Make RoomListStore aware of sub list orderings

so that it can do optimistic updates of ordered lists.
---
 src/actions/RoomListActions.js |   5 +-
 src/stores/RoomListStore.js    | 173 +++++++++++++++++++--------------
 2 files changed, 103 insertions(+), 75 deletions(-)

diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index f59e9953ee..a92bd1ebaf 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -116,8 +116,9 @@ RoomListActions.tagRoom = function(matrixClient, room, oldTag, newTag, oldIndex,
         if (newTag && newTag !== 'im.vector.fake.direct' &&
             (hasChangedSubLists || metaData)
         ) {
-            // Optimistic update of what will happen to the room tags
-            room.tags[newTag] = metaData || {};
+            // metaData is the body of the PUT to set the tag, so it must
+            // at least be an empty object.
+            metaData = metaData || {};
 
             const promiseToAdd = matrixClient.setRoomTag(roomId, newTag, metaData).catch(function(err) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 42c77d5237..193784811c 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -16,6 +16,7 @@ limitations under the License.
 import {Store} from 'flux/utils';
 import dis from '../dispatcher';
 import DMRoomMap from '../utils/DMRoomMap';
+import Unread from '../Unread';
 
 /**
  * A class for storing application state for categorising rooms in
@@ -26,6 +27,8 @@ class RoomListStore extends Store {
         super(dis);
 
         this._init();
+        this._getManualComparator = this._getManualComparator.bind(this);
+        this._recentsComparator = this._recentsComparator.bind(this);
     }
 
     _init() {
@@ -62,7 +65,7 @@ class RoomListStore extends Store {
             break;
             case 'MatrixActions.Room.tags': {
                 if (!this._state.ready) break;
-                this._updateRoomLists(payload.room);
+                this._generateRoomLists();
             }
             break;
             case 'MatrixActions.accountData': {
@@ -76,12 +79,7 @@ class RoomListStore extends Store {
             }
             break;
             case 'RoomListActions.tagRoom.pending': {
-                this._updateRoomListsOptimistic(
-                    payload.request.room,
-                    payload.request.oldTag,
-                    payload.request.newTag,
-                    payload.request.metaData,
-                );
+                this._generateRoomLists(payload.request);
             }
             break;
             case 'RoomListActions.tagRoom.failure': {
@@ -93,76 +91,13 @@ class RoomListStore extends Store {
                 // Reset state without pushing an update to the view, which generally assumes that
                 // the matrix client isn't `null` and so causing a re-render will cause NPEs.
                 this._init();
+                this._matrixClient = null;
             }
             break;
         }
     }
 
-    _updateRoomListsOptimistic(updatedRoom, oldTag, newTag, metaData) {
-        const newLists = {};
-
-        // Adding a tag to an untagged room - need to remove it from recents
-        if (newTag && Object.keys(updatedRoom.tags).length === 0) {
-            oldTag = 'im.vector.fake.recent';
-        }
-
-        // Removing a tag from a room with one tag left - need to add it to recents
-        if (oldTag && Object.keys(updatedRoom.tags).length === 1) {
-            newTag = 'im.vector.fake.recent';
-        }
-
-        // Remove room from oldTag
-        Object.keys(this._state.lists).forEach((tagName) => {
-            if (tagName === oldTag) {
-                newLists[tagName] = this._state.lists[tagName].filter((room) => {
-                    return room.roomId !== updatedRoom.roomId;
-                });
-            } else {
-                newLists[tagName] = this._state.lists[tagName];
-            }
-        });
-
-        /// XXX: RoomSubList sorts by data on the room object. We
-        /// should sort in advance and incrementally insert new rooms
-        /// instead of resorting every time.
-        if (metaData) {
-            updatedRoom.tags[newTag] = metaData;
-        }
-
-        newLists[newTag].push(updatedRoom);
-
-        this._setState({
-            lists: newLists,
-        });
-    }
-
-    _updateRoomLists(updatedRoom) {
-        const roomTags = Object.keys(updatedRoom.tags);
-
-        const newLists = {};
-
-        // Removal of the updatedRoom from tags it no longer has
-        Object.keys(this._state.lists).forEach((tagName) => {
-            newLists[tagName] = this._state.lists[tagName].filter((room) => {
-                return room.roomId !== updatedRoom.roomId || roomTags.includes(tagName);
-            });
-        });
-
-        roomTags.forEach((tagName) => {
-            if (newLists[tagName].includes(updatedRoom)) return;
-            newLists[tagName].push(updatedRoom);
-        });
-
-        if (roomTags.length === 0) {
-            newLists['im.vector.fake.recent'].unshift(updatedRoom);
-        }
-
-        this._setState({
-            lists: newLists,
-        });
-    }
-
-    _generateRoomLists() {
+    _generateRoomLists(optimisticRequest) {
         const lists = {
             "im.vector.fake.invite": [],
             "m.favourite": [],
@@ -187,7 +122,19 @@ class RoomListStore extends Store {
             } else if (me.membership == "join" || me.membership === "ban" ||
                      (me.membership === "leave" && me.events.member.getSender() !== me.events.member.getStateKey())) {
                 // Used to split rooms via tags
-                const tagNames = Object.keys(room.tags);
+                let tagNames = Object.keys(room.tags);
+
+                if (optimisticRequest && optimisticRequest.room === room) {
+                    // Remove old tag
+                    tagNames = tagNames.filter((tagName) => tagName !== optimisticRequest.oldTag);
+                    // Add new tag
+                    if (optimisticRequest.newTag &&
+                        !tagNames.includes(optimisticRequest.newTag)
+                    ) {
+                        tagNames.push(optimisticRequest.newTag);
+                    }
+                }
+
                 if (tagNames.length) {
                     for (let i = 0; i < tagNames.length; i++) {
                         const tagName = tagNames[i];
@@ -207,12 +154,92 @@ class RoomListStore extends Store {
             }
         });
 
+        const listOrders = {
+            "manual": [
+                "m.favourite",
+            ],
+            "recent": [
+                "im.vector.fake.invite",
+                "im.vector.fake.recent",
+                "im.vector.fake.direct",
+                "m.lowpriority",
+                "im.vector.fake.archived",
+            ],
+        };
+
+        Object.keys(listOrders).forEach((order) => {
+            listOrders[order].forEach((listKey) => {
+                let comparator;
+                switch (order) {
+                    case "manual":
+                        comparator = this._getManualComparator(listKey, optimisticRequest);
+                        break;
+                    case "recent":
+                        comparator = this._recentsComparator;
+                        break;
+                }
+                lists[listKey].sort(comparator);
+            });
+        });
+
         this._setState({
             lists,
             ready: true, // Ready to receive updates via Room.tags events
         });
     }
 
+    _tsOfNewestEvent(room) {
+        for (let i = room.timeline.length - 1; i >= 0; --i) {
+            const ev = room.timeline[i];
+            if (ev.getTs() &&
+                (Unread.eventTriggersUnreadCount(ev) ||
+                (ev.getSender() === this._matrixClient.credentials.userId))
+            ) {
+                return ev.getTs();
+            }
+        }
+
+        // we might only have events that don't trigger the unread indicator,
+        // in which case use the oldest event even if normally it wouldn't count.
+        // This is better than just assuming the last event was forever ago.
+        if (room.timeline.length && room.timeline[0].getTs()) {
+            return room.timeline[0].getTs();
+        } else {
+            return Number.MAX_SAFE_INTEGER;
+        }
+    }
+
+    _recentsComparator(roomA, roomB) {
+        return this._tsOfNewestEvent(roomB) - this._tsOfNewestEvent(roomA);
+    }
+
+    _lexicographicalComparator(roomA, roomB) {
+        return roomA.name > roomB.name ? 1 : -1;
+    }
+
+    _getManualComparator(tagName, optimisticRequest) {
+        return (roomA, roomB) => {
+            let metaA = roomA.tags[tagName];
+            let metaB = roomB.tags[tagName];
+
+            if (optimisticRequest && roomA === optimisticRequest.room) metaA = optimisticRequest.metaData;
+            if (optimisticRequest && roomB === optimisticRequest.room) metaB = optimisticRequest.metaData;
+
+            // Make sure the room tag has an order element, if not set it to be the bottom
+            const a = metaA.order;
+            const b = metaB.order;
+
+            // Order undefined room tag orders to the bottom
+            if (a === undefined && b !== undefined) {
+                return 1;
+            } else if (a !== undefined && b === undefined) {
+                return -1;
+            }
+
+            return a == b ? this._lexicographicalComparator(roomA, roomB) : ( a > b ? 1 : -1);
+        };
+    }
+
     getRoomLists() {
         return this._state.lists;
     }

From c5da1015fe95a5d30971cd05164e1fd89a3898d8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 8 Feb 2018 17:47:36 +0000
Subject: [PATCH 480/927] Do not truncate autocompleted users in composer

so that disambiguation is possible at a glance.

Fixes https://github.com/vector-im/riot-web/issues/6024
---
 src/autocomplete/UserProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index fefe77f6cd..bceec3f144 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -158,7 +158,7 @@ export default class UserProvider extends AutocompleteProvider {
     }
 
     renderCompletions(completions: [React.Component]): ?React.Component {
-        return <div className="mx_Autocomplete_Completion_container_pill mx_Autocomplete_Completion_container_truncate">
+        return <div className="mx_Autocomplete_Completion_container_pill">
             { completions }
         </div>;
     }

From 234ca8b062f088f23a2f50d508d2a20056a73c79 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 8 Feb 2018 17:50:30 +0000
Subject: [PATCH 481/927] Remove top padding from app tile.

---
 src/ScalarMessaging.js                      | 1 -
 src/components/structures/ContextualMenu.js | 4 ++++
 src/components/views/rooms/Stickerpack.js   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 3d585108dd..ac68d1a2d2 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -336,7 +336,6 @@ function setWidget(event, roomId) {
     if (userWidget) {
         console.warn('Adding user widget');
         const client = MatrixClientPeg.get();
-        // client.setAccountData('m.widgets', {});
         const userWidgets = client.getAccountData('m.widgets').getContent() || {};
 
         // Delete existing widget with ID
diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 7ec078f739..3c23e0ceae 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -134,6 +134,10 @@ module.exports = {
             menuStyle["backgroundColor"] = props.menuColour;
         }
 
+        if (!isNaN(Number(props.menuPaddingTop))) {
+            menuStyle["paddingTop"] = props.menuPaddingTop;
+        }
+
         // FIXME: If a menu uses getDefaultProps it clobbers the onFinished
         // property set here so you can't close the menu from a button click!
         const menu = (
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index e04098a06b..24bd44c3d3 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -175,6 +175,7 @@ export default class Stickerpack extends React.Component {
             menuHeight: this.popoverHeight,
             element: this.state.stickersContent,
             onFinished: this.onFinished,
+            menuPaddingTop: 0,
         });
 
 

From 015477278914b38d559e6bd77cabea16c8aee2bb Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 8 Feb 2018 18:18:57 +0000
Subject: [PATCH 482/927] Change wording of debug log submission

Fixes https://github.com/vector-im/riot-web/issues/5985
---
 src/components/structures/UserSettings.js | 6 +++---
 src/i18n/strings/en_EN.json               | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b1eedd1a90..4237cd78eb 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -794,11 +794,11 @@ module.exports = React.createClass({
         }
         return (
             <div>
-                <h3>{ _t("Bug Report") }</h3>
+                <h3>{ _t("Debug Logs Submission") }</h3>
                 <div className="mx_UserSettings_section">
-                    <p>{ _t("Found a bug?") }</p>
+                    <p>{ _t("Want to send logs?") }</p>
                     <button className="mx_UserSettings_button danger"
-                        onClick={this._onBugReportClicked}>{ _t('Report it') }
+                        onClick={this._onBugReportClicked}>{ _t('Submit debug logs') }
                     </button>
                 </div>
             </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6139ac2a91..d51f20dbd0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -500,8 +500,8 @@
     "Download %(text)s": "Download %(text)s",
     "Invalid file%(extra)s": "Invalid file%(extra)s",
     "Error decrypting image": "Error decrypting image",
-    "Image '%(Body)s' cannot be displayed.": "Image '%(Body)s' cannot be displayed.",
     "This image cannot be displayed.": "This image cannot be displayed.",
+    "Image '%(Body)s' cannot be displayed.": "Image '%(Body)s' cannot be displayed.",
     "Error decrypting video": "Error decrypting video",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
@@ -855,9 +855,9 @@
     "Device ID:": "Device ID:",
     "Device key:": "Device key:",
     "Ignored Users": "Ignored Users",
-    "Bug Report": "Bug Report",
-    "Found a bug?": "Found a bug?",
-    "Report it": "Report it",
+    "Debug Logs Submission": "Debug Logs Submission",
+    "Want to send logs?": "Want to send logs?",
+    "Submit debug logs": "Submit debug logs",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",
     "Learn more about how we use analytics.": "Learn more about how we use analytics.",

From 8f97e9479d3be395d9855f17fb093629b1cd4ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 8 Feb 2018 21:16:57 +0100
Subject: [PATCH 483/927] Ooops, restore a bit of RoomCreateDialog content I
 have accidentally removed while trying to solve merge conflicts (thx @dbkr)

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

diff --git a/src/components/views/dialogs/CreateRoomDialog.js b/src/components/views/dialogs/CreateRoomDialog.js
index 7a8852bc00..51693a19c9 100644
--- a/src/components/views/dialogs/CreateRoomDialog.js
+++ b/src/components/views/dialogs/CreateRoomDialog.js
@@ -55,6 +55,19 @@ export default React.createClass({
                         <div>
                             <input id="textinput" ref="textinput" className="mx_CreateRoomDialog_input" autoFocus={true} size="64" />
                         </div>
+                        <br />
+
+                        <details className="mx_CreateRoomDialog_details">
+                            <summary className="mx_CreateRoomDialog_details_summary">{ _t('Advanced options') }</summary>
+                            <div>
+                                <input type="checkbox" id="checkbox" ref="checkbox" defaultChecked={this.defaultNoFederate} />
+                                <label htmlFor="checkbox">
+                                { _t('Block users on other matrix homeservers from joining this room') }
+                                    <br />
+                                    ({ _t('This setting cannot be changed later!') })
+                                </label>
+                            </div>
+                        </details>
                     </div>
                 </form>
                 <DialogButtons primaryButton={_t('Create Room')}

From 16049bff3dbe0b53805d69c77052ca5496b0c297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Thu, 8 Feb 2018 21:16:25 +0000
Subject: [PATCH 484/927] Translated using Weblate (Serbian)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 9a38d6fac8..39a1f1cf20 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -898,5 +898,92 @@
     "matrix-react-sdk version:": "matrix-react-sdk издање:",
     "riot-web version:": "riot-web издање:",
     "olm version:": "olm издање:",
-    "Failed to send email": "Нисам успео да пошаљем мејл"
+    "Failed to send email": "Нисам успео да пошаљем мејл",
+    "The email address linked to your account must be entered.": "Морате унети мејл адресу која је везана за ваш налог.",
+    "A new password must be entered.": "Морате унети нову лозинку.",
+    "New passwords must match each other.": "Нове лозинке се морају подударати.",
+    "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.": "Опоравак ваше лозинке ће тренутно поново поставити кључеве за шифровање с краја на крај, на свим вашим уређајима. Ово ће учинити шифровани историјат ћаскања нечитљивим осим ако прво не извезете ваше кључеве собе па их онда увезете касније. Ово ће бити побољшано у будућности.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Мејл је послат на адресу %(emailAddress)s. Када будете испратили везу у њему, кликните испод.",
+    "I have verified my email address": "Потврдио сам своју мејл адресу",
+    "Your password has been reset": "Ваша лозинка је опорављена",
+    "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": "Одјављени сте са свих ваших уређаја и више нећете примати пуш обавештења. Да бисте поново омогућили обавештења, одјавите се и пријавите поново на сваком вашем уређају",
+    "Return to login screen": "Врати ме на екран за пријаву",
+    "To reset your password, enter the email address linked to your account": "Да бисте опоравили вашу лозинку, унесите мејл адресу повезану са вашим налогом",
+    "New password": "Нова лозинка",
+    "Confirm your new password": "Потврдите вашу нову лозинку",
+    "Send Reset Email": "Пошаљи мејл за опоравак",
+    "Create an account": "Направи налог",
+    "This Home Server does not support login using email address.": "Овај кућни сервер не подржава пријављивање преко мејл адресе.",
+    "Incorrect username and/or password.": "Нетачно корисничко име и/или лозинка.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Знајте да се пријављујете на сервер %(hs)s, не на matrix.org.",
+    "Guest access is disabled on this Home Server.": "Гостински приступ је онемогућен на овом кућном серверу.",
+    "The phone number entered looks invalid": "Унети број телефона не изгледа исправно",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Овај кућни сервер не пружа било који начин пријаве унутар овог клијента.",
+    "Error: Problem communicating with the given homeserver.": "Грешка: проблем у комуницирању са датим кућним сервером.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не могу да се повежем на кућни сервер преко HTTP-а када се користи HTTPS адреса у траци вашег прегледача. Или користите HTTPS или <a>омогућите небезбедне скрипте</a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Не могу да се повежем на кућни сервер. Проверите вашу интернет везу, постарајте се да верујете <a>SSL сертификату кућног сервера</a> и да проширење прегледача не блокира захтеве.",
+    "Login as guest": "Пријави се као гост",
+    "Sign in to get started": "Пријави се да почнеш",
+    "Failed to fetch avatar URL": "Нисам успео да добавим адресу аватара",
+    "Set a display name:": "Постави приказно име:",
+    "Upload an avatar:": "Отпреми аватар:",
+    "This server does not support authentication with a phone number.": "Овај сервер не подржава идентификацију преко броја мобилног.",
+    "Missing password.": "Недостаје лозинка.",
+    "Passwords don't match.": "Лозинке се не подударају.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Лозинка је сувише кратка (најмање %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Мејл адреса не изгледа исправно.",
+    "This doesn't look like a valid phone number.": "Број телефона не изгледа исправно.",
+    "You need to enter a user name.": "Морате унети корисничко име.",
+    "An unknown error occurred.": "Непозната грешка се догодила.",
+    "I already have an account": "Већ имам налог",
+    "Displays action": "Приказује радњу",
+    "Bans user with given id": "Забрањује приступ кориснику са датим иб-јем",
+    "Unbans user with given id": "Скида забрану приступа кориснику са датим иб-јем",
+    "Define the power level of a user": "Дефинише ниво моћи корисника",
+    "Deops user with given id": "Укида админа за корисника са датим иб-јем",
+    "Invites user with given id to current room": "Позива корисника са датим иб-јем у тренутну собу",
+    "Joins room with given alias": "Приступа соби са датим алијасем",
+    "Sets the room topic": "Поставља тему собе",
+    "Kicks user with given id": "Избацује корисника са датим иб-јем",
+    "Changes your display nickname": "Мења ваш приказни надимак",
+    "Searches DuckDuckGo for results": "Претражује DuckDuckGo за резултате",
+    "Changes colour scheme of current room": "Мења шему боје у тренутној соби",
+    "Verifies a user, device, and pubkey tuple": "Проверава корисника, уређај и торку јавног кључа",
+    "Ignores a user, hiding their messages from you": "Занемарује корисника и тиме скрива њихове поруке од вас",
+    "Stops ignoring a user, showing their messages going forward": "Престаје са занемаривањем корисника и тиме приказује њихове поруке одсад",
+    "Commands": "Наредбе",
+    "Results from DuckDuckGo": "Резултати са DuckDuckGo-а",
+    "Emoji": "Емоџи",
+    "Notify the whole room": "Обавести све у соби",
+    "Room Notification": "Собно обавештење",
+    "Users": "Корисници",
+    "unknown device": "непознати уређај",
+    "NOT verified": "НИЈЕ проверен",
+    "verified": "проверен",
+    "Verification": "Провера",
+    "Ed25519 fingerprint": "Ed25519 отисак прста",
+    "User ID": "Кориснички ИБ",
+    "Curve25519 identity key": "Curve25519 идентитески кључ",
+    "none": "ништа",
+    "Claimed Ed25519 fingerprint key": "Наводни Ed25519 кључ отиска прста",
+    "Algorithm": "Алгоритам",
+    "unencrypted": "нешифрован",
+    "Decryption error": "Грешка дешифровања",
+    "Session ID": "ИБ сесије",
+    "End-to-end encryption information": "Подаци о шифровању с краја на крај",
+    "Event information": "Подаци о догађају",
+    "Sender device information": "Подаци о уређају пошиљаоца",
+    "Passphrases must match": "Фразе се морају подударати",
+    "Passphrase must not be empty": "Фразе не смеју бити празне",
+    "Export room keys": "Извези кључеве собе",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Ова радња вам омогућава да извезете кључеве за примљене поруке у шифрованим собама у локалну датотеку. Онда ћете моћи да увезете датотеку у други Матрикс клијент, у будућности, тако да ће тај клијент моћи да дешифрује ове поруке.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Извезена датотека ће дозволити свима који је могу прочитати да дешифрују било које шифроване поруке које можете видети те бисте требали да будете пажљиви и да је осигурате. Да бисмо вам помогли са тиме, требало би да унесете фразу испод са којом ће извезени подаци бити шифровани. Поновни увоз података ће бити могућ само уз коришћење исте фразе.",
+    "Enter passphrase": "Унеси фразу",
+    "Confirm passphrase": "Потврди фразу",
+    "Export": "Извези",
+    "Import room keys": "Увези кључеве собе",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ова радња вам омогућава да увезете кључеве за шифровање које сте претходно извезли из другог Матрикс клијента. Након тога ћете моћи да дешифрујете било коју поруку коју је други клијент могао да дешифрује.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Извезена датотека ће бити заштићена са фразом. Требало би да унесете фразу овде, да бисте дешифровали датотеку.",
+    "File to import": "Датотека за увоз",
+    "Import": "Увези"
 }

From 410570936a6e301b2eff5591f99bf75a6f838337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Thu, 8 Feb 2018 22:51:07 +0100
Subject: [PATCH 485/927] Reimplement setting aria-hidden on the main app node
 by dispatching actions rather than assuming we can find and manipulate the
 node directly

---
 src/Modal.js                              | 25 +++++++++++------------
 src/components/structures/LoggedInView.js |  2 +-
 src/components/structures/MatrixChat.js   | 14 +++++++++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/Modal.js b/src/Modal.js
index 8e3b394f87..2565d5c73b 100644
--- a/src/Modal.js
+++ b/src/Modal.js
@@ -22,6 +22,7 @@ const ReactDOM = require('react-dom');
 import PropTypes from 'prop-types';
 import Analytics from './Analytics';
 import sdk from './index';
+import dis from './dispatcher';
 
 const DIALOG_CONTAINER_ID = "mx_Dialog_Container";
 
@@ -187,24 +188,22 @@ class ModalManager {
     }
 
     _reRender() {
-        // Retrieve the root node of the Riot application outside the modal
-        let applicationNode = document.getElementById('matrixchat');
         if (this._modals.length == 0) {
-            if (applicationNode) {
-                // If there is no modal to render, make all of Riot available
-                // to screen reader users again
-                applicationNode.setAttribute('aria-hidden', 'false');
-            }
+            // If there is no modal to render, make all of Riot available
+            // to screen reader users again
+            dis.dispatch({
+                action: 'aria_unhide_main_app',
+            });
             ReactDOM.unmountComponentAtNode(this.getOrCreateContainer());
             return;
         }
 
-        if (applicationNode) {
-            // Hide the content outside the modal to screen reader users
-            // so they won't be able to navigate into it and act on it using
-            // screen reader specific features
-            applicationNode.setAttribute('aria-hidden', 'true');
-        }
+        // Hide the content outside the modal to screen reader users
+        // so they won't be able to navigate into it and act on it using
+        // screen reader specific features
+        dis.dispatch({
+            action: 'aria_hide_main_app',
+        });
 
         const modal = this._modals[0];
         const dialog = (
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index e97d9dd0a1..211340f5a8 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -327,7 +327,7 @@ const LoggedInView = React.createClass({
         }
 
         return (
-            <div className='mx_MatrixChat_wrapper'>
+            <div className='mx_MatrixChat_wrapper' aria-hidden={this.props.hideToSRUsers}>
                 { topBar }
                 <div className={bodyClasses}>
                     { SettingsStore.isFeatureEnabled("feature_tag_panel") ? <TagPanel /> : <div /> }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index d6d0b00c84..380cc697e1 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -171,6 +171,10 @@ export default React.createClass({
             register_hs_url: null,
             register_is_url: null,
             register_id_sid: null,
+
+            // When showing Modal dialogs we need to set aria-hidden on the root app element
+            // and disable it when there are no dialogs
+            hideToSRUsers: false,
         };
         return s;
     },
@@ -608,6 +612,16 @@ export default React.createClass({
             case 'send_event':
                 this.onSendEvent(payload.room_id, payload.event);
                 break;
+            case 'aria_hide_main_app':
+                this.setState({
+                    hideToSRUsers: true,
+                });
+                break;
+            case 'aria_unhide_main_app':
+                this.setState({
+                    hideToSRUsers: false,
+                });
+                break;
         }
     },
 

From cf0d45a65bd0082bc3ce0b9890b61a08a78bfa68 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 9 Feb 2018 10:28:32 +0000
Subject: [PATCH 486/927] Translated using Weblate (Basque)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 8ec181d879..7592eb0708 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -980,5 +980,9 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Gela hau ez da publikoa. Ezin izango zara berriro elkartu gonbidapenik gabe.",
     "Community IDs cannot not be empty.": "Komunitate ID-ak ezin dira hutsik egon.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Erakutsi gailuak</showDevicesText>, <sendAnywayText>bidali hala ere</sendAnywayText> edo <cancelText>ezeztatu</cancelText>.",
-    "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>"
+    "<a>In reply to</a> <pill>": "<a>honi erantzunez:</a> <pill>",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
+    "Failed to set direct chat tag": "Huts egin du txat zuzenarenaren etiketa jartzean",
+    "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
+    "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean"
 }

From 9e3c1fbc7ac6a7e1da09e9a82406497ec388d2af Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 9 Feb 2018 11:44:27 +0000
Subject: [PATCH 487/927] Pass room name.

---
 src/ScalarAuthClient.js                             | 5 ++++-
 src/components/views/elements/AppTile.js            | 2 +-
 src/components/views/elements/ManageIntegsButton.js | 4 ++--
 src/components/views/rooms/AppsDrawer.js            | 2 +-
 src/components/views/rooms/RoomHeader.js            | 2 +-
 src/components/views/rooms/Stickerpack.js           | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index 3e775a94ab..756965d41e 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -105,10 +105,13 @@ class ScalarAuthClient {
         return defer.promise;
     }
 
-    getScalarInterfaceUrlForRoom(roomId, screen, id) {
+    getScalarInterfaceUrlForRoom(room, screen, id) {
+        const roomId = room.roomId;
+        const roomName = room.name;
         let url = SdkConfig.get().integrations_ui_url;
         url += "?scalar_token=" + encodeURIComponent(this.scalarToken);
         url += "&room_id=" + encodeURIComponent(roomId);
+        url += "&room_name=" + encodeURIComponent(roomName);
         if (id) {
             url += '&integ_id=' + encodeURIComponent(id);
         }
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 9d76e3410e..cc11a8542a 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -277,7 +277,7 @@ export default class AppTile extends React.Component {
         } else {
             const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
             const src = this._scalarClient.getScalarInterfaceUrlForRoom(
-                this.props.room.roomId, 'type_' + this.props.type, this.props.id);
+                this.props.room, 'type_' + this.props.type, this.props.id);
             Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
                 src: src,
             }, "mx_IntegrationsManager");
diff --git a/src/components/views/elements/ManageIntegsButton.js b/src/components/views/elements/ManageIntegsButton.js
index 17dbbeee62..024c5feda5 100644
--- a/src/components/views/elements/ManageIntegsButton.js
+++ b/src/components/views/elements/ManageIntegsButton.js
@@ -64,7 +64,7 @@ export default class ManageIntegsButton extends React.Component {
         const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
         Modal.createDialog(IntegrationsManager, {
             src: (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
-                this.scalarClient.getScalarInterfaceUrlForRoom(this.props.roomId) :
+                this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room) :
                 null,
         }, "mx_IntegrationsManager");
     }
@@ -103,5 +103,5 @@ export default class ManageIntegsButton extends React.Component {
 }
 
 ManageIntegsButton.propTypes = {
-    roomId: PropTypes.string.isRequired,
+    room: PropTypes.object.isRequired,
 };
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 78677e138b..7541b304a2 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -189,7 +189,7 @@ module.exports = React.createClass({
     _launchManageIntegrations: function() {
         const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
         const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
-                this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room.roomId, 'add_integ') :
+                this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room, 'add_integ') :
                 null;
         Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
             src: src,
diff --git a/src/components/views/rooms/RoomHeader.js b/src/components/views/rooms/RoomHeader.js
index aee229c5da..67ede1a011 100644
--- a/src/components/views/rooms/RoomHeader.js
+++ b/src/components/views/rooms/RoomHeader.js
@@ -391,7 +391,7 @@ module.exports = React.createClass({
         let manageIntegsButton;
         if (this.props.room && this.props.room.roomId && this.props.inRoom) {
             manageIntegsButton = <ManageIntegsButton
-                roomId={this.props.room.roomId}
+                room={this.props.room}
             />;
         }
 
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 24bd44c3d3..983a357d86 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -208,7 +208,7 @@ export default class Stickerpack extends React.Component {
         const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
         const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
                 this.scalarClient.getScalarInterfaceUrlForRoom(
-                    this.props.room.roomId,
+                    this.props.room,
                     'type_stickerpack',
                     this.widgetId,
                 ) :

From 3e4175f3e0e32db28f39935d1a3f45212104328e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Feb 2018 12:20:05 +0000
Subject: [PATCH 488/927] Add isUrlPermitted function

---
 src/HtmlUtils.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 0c262fe89a..5c6cbd6c1b 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import escape from 'lodash/escape';
 import emojione from 'emojione';
 import classNames from 'classnames';
 import MatrixClientPeg from './MatrixClientPeg';
+import url from 'url';
 
 emojione.imagePathSVG = 'emojione/svg/';
 // Store PNG path for displaying many flags at once (for increased performance over SVG)
@@ -44,6 +45,8 @@ const SYMBOL_PATTERN = /([\u2100-\u2bff])/;
 const EMOJI_REGEX = new RegExp(emojione.unicodeRegexp+"+", "gi");
 const COLOR_REGEX = /^#[0-9a-fA-F]{6}$/;
 
+const PERMITTED_URL_SCHEMES = ['http', 'https', 'ftp', 'mailto', 'magnet'];
+
 /*
  * Return true if the given string contains emoji
  * Uses a much, much simpler regex than emojione's so will give false
@@ -152,6 +155,25 @@ export function sanitizedHtmlNode(insaneHtml) {
     return <div dangerouslySetInnerHTML={{ __html: saneHtml }} dir="auto" />;
 }
 
+/**
+ * Tests if a URL from an untrusted source may be safely put into the DOM
+ * The biggest threat here is javascript: URIs.
+ * Note that the HTML sanitiser library has its own internal logic for
+ * doing this, to which we pass the same list of schemes. This is used in
+ * other places we need to sanitise URLs.
+ * @return true if permitted, otherwise false
+ */
+export function isUrlPermitted(inputUrl) {
+    try {
+        const parsed = url.parse(inputUrl);
+        if (!parsed.protocol) return false;
+        // URL parser protocol includes the trailing colon
+        return PERMITTED_URL_SCHEMES.includes(parsed.protocol.slice(0, -1));
+    } catch (e) {
+        return false;
+    }
+}
+
 const sanitizeHtmlParams = {
     allowedTags: [
         'font', // custom to matrix for IRC-style font coloring
@@ -172,7 +194,7 @@ const sanitizeHtmlParams = {
     // Lots of these won't come up by default because we don't allow them
     selfClosing: ['img', 'br', 'hr', 'area', 'base', 'basefont', 'input', 'link', 'meta'],
     // URL schemes we permit
-    allowedSchemes: ['http', 'https', 'ftp', 'mailto', 'magnet'],
+    allowedSchemes: PERMITTED_URL_SCHEMES,
 
     allowProtocolRelative: false,
 

From 52181fde9550192e88a548cbb257ae2c2f631651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Thu, 8 Feb 2018 19:20:09 +0000
Subject: [PATCH 489/927] Translated using Weblate (Catalan)

Currently translated at 88.3% (871 of 986 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 691da985f2..1ff3e7f8e9 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -867,5 +867,7 @@
     "Import": "Importa",
     "The version of Riot.im": "La versió de Riot.im",
     "Email": "Correu electrònic",
-    "Add email address": "Afegeix correu electrònic"
+    "Add email address": "Afegeix correu electrònic",
+    "I have verified my email address": "He verificat l'adreça de correu electrònic",
+    "Send Reset Email": "Envia email de reinici"
 }

From 22aedb6075259cf1e58745dc7825c6aca9d78533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Thu, 8 Feb 2018 21:19:42 +0000
Subject: [PATCH 490/927] Translated using Weblate (Serbian)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 39a1f1cf20..6f1958094a 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -117,7 +117,7 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s је затражио VoIP конференцију.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s је позвао %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s је бановао %(targetName)s.",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "УПОЗОРЕЊЕ: ПОТВРДА КЉУЧА НИЈЕ УСПЕЛА! Кључ потписивања за корисника %(userId)s и уређај %(deviceId)s је „%(fprint)s“ а то се не подудара са достављеним кључем „%(fingerprint)s“. Ово можда значи да се ваши разговори прате!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "УПОЗОРЕЊЕ: ПРОВЕРА КЉУЧА НИЈЕ УСПЕЛА! Кључ потписивања за корисника %(userId)s и уређај %(deviceId)s је „%(fprint)s“ а то се не подудара са достављеним кључем „%(fingerprint)s“. Ово можда значи да се ваши разговори прате!",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Кључ за потписивање који сте доставили се подудара са кључем за потписивање од корисника %(userId)s и уређаја %(deviceId)s. Уређај је означен као проверен.",
     "%(senderName)s set their display name to %(displayName)s.": "Корисник %(senderName)s је себи поставио приказно име %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "Корисник %(senderName)s је себи уклонио приказно име %(oldDisplayName)s.",
@@ -567,7 +567,7 @@
     "Create new room": "Направи нову собу",
     "Unblacklist": "Скини са црног списка",
     "Blacklist": "Стави на црни списак",
-    "Unverify": "Скини потврду",
+    "Unverify": "Означи непровереним",
     "Verify...": "Провери...",
     "No results": "Нема резултата",
     "Delete": "Обриши",
@@ -674,15 +674,15 @@
     "Device name": "Назив уређаја",
     "Device key": "Кључ уређаја",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Ако се подудара, притисните дугме за потврду провере испод. Ако се не подудара, неко други прислушкује овај уређај и вероватно желите да притиснете дугме за стављање на црни списак.",
-    "In future this verification process will be more sophisticated.": "У будућности ће овај поступак потврђивања бити напреднији.",
+    "In future this verification process will be more sophisticated.": "У будућности ће овај поступак провере бити напреднији.",
     "Verify device": "Провери уређај",
     "I verify that the keys match": "Потврђујем да се кључеви подударају",
     "An error has occurred.": "Догодила се грешка.",
     "OK": "У реду",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "Додали сте нови уређај „%(displayName)s“ који захтева кључеве за шифровање.",
-    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Ваш непотврђени уређај „%(displayName)s“ захтева кључеве за шифровање.",
-    "Start verification": "Започни потврђивање",
-    "Share without verifying": "Подели без потврђивања",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Ваш непроверени уређај „%(displayName)s“ захтева кључеве за шифровање.",
+    "Start verification": "Започни проверу",
+    "Share without verifying": "Подели без провере",
     "Ignore request": "Занемари захтев",
     "Loading device info...": "Учитавам податке о уређају...",
     "Encryption key request": "Захтев за кључ шифровања",
@@ -693,7 +693,7 @@
     "Continue anyway": "Ипак настави",
     "Invalid Email Address": "Неисправна мејл адреса",
     "This doesn't appear to be a valid email address": "Изгледа да ово није исправна мејл адреса",
-    "Verification Pending": "Чека се на потврду",
+    "Verification Pending": "Чека се на проверу",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Проверите ваш мејл и кликните на везу унутар њега. Када ово урадите, кликните на дугме „настави“.",
     "Unable to add email address": "Не могу да додам мејл адресу",
     "Unable to verify email address.": "Не могу да проверим мејл адресу.",

From e9e0d65401c3ff6b840b2df66a92fab269e76df3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Feb 2018 12:33:59 +0000
Subject: [PATCH 491/927] Prepare changelog for v0.11.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87459882c9..055e25b805 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.11.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.11.4) (2018-02-09)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.11.3...v0.11.4)
+
+ * Add isUrlPermitted function to sanity check URLs
+
 Changes in [0.11.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.11.3) (2017-12-04)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.11.2...v0.11.3)

From 4bf5e44b2043bbe95faa66943878acad23dfb823 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Feb 2018 12:34:00 +0000
Subject: [PATCH 492/927] v0.11.4

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

diff --git a/package.json b/package.json
index 5c81db2153..36f137e4f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.11.3",
+  "version": "0.11.4",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 9dba4ab569e050dd28492ba633889f392546c0b7 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 9 Feb 2018 12:30:53 +0000
Subject: [PATCH 493/927] Translated using Weblate (Esperanto)

Currently translated at 97.1% (958 of 986 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index a50d16a2b3..c6a4b81740 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -944,5 +944,17 @@
     "Import": "Enporti",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Forigo de fenestraĵo efektiviĝos por ĉiuj uzantoj en ĉi tiu ĉambro. Ĉu vi certe volas ĝin forigi?",
     "Unblacklist": "Repermesi legadon de ĉifritaj mesaĝoj",
-    "none": "neniu"
+    "none": "neniu",
+    "The version of Riot.im": "Tiu ĉi versio de Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Ĉu vi salutis aŭ ne (ni ne registras vian salutnomon)",
+    "Your language of choice": "Via preferata lingvo",
+    "The information being sent to us to help make Riot.im better includes:": "Informoj sendataj al ni por plibonigi la servon Riot.im inkluzivas:",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ŝanĝis sian vidigan nomon al %(displayName)s.",
+    "Send an encrypted reply…": "Sendi ĉifritan respondon…",
+    "Send a reply (unencrypted)…": "Sendi respondon (neĉifritan)…",
+    "Send an encrypted message…": "Sendi ĉifritan mesaĝon…",
+    "Send a message (unencrypted)…": "Sendi mesaĝon (neĉifritan)…",
+    "Replying": "Respondanta",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privato gravas al ni, tial ni ne kolektas personajn aŭ spureblajn datumojn por nia analizo.",
+    "Learn more about how we use analytics.": "Lernu pli pri nia uzo de analiziloj."
 }

From 55593416fa71c9c2a77382da8053457c6a5d4d39 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Fri, 9 Feb 2018 13:23:34 +0000
Subject: [PATCH 494/927] Hide apps drawer when viewining room settings.

---
 src/components/structures/RoomView.js    |  3 +-
 src/components/views/rooms/AppsDrawer.js | 40 ++++++++++++++----------
 src/components/views/rooms/AuxPanel.js   |  9 +++++-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 60987fe26e..4873bbc961 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -1605,7 +1605,8 @@ module.exports = React.createClass({
               displayConfCallNotification={this.state.displayConfCallNotification}
               maxHeight={this.state.auxPanelMaxHeight}
               onResize={this.onChildResize}
-              showApps={this.state.showApps && !this.state.editingRoomSettings} >
+              showApps={this.state.showApps}
+              hideAppsDrawer={this.state.editingRoomSettings} >
                 { aux }
             </AuxPanel>
         );
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index 7541b304a2..a8336edfc3 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -35,7 +35,15 @@ module.exports = React.createClass({
     displayName: 'AppsDrawer',
 
     propTypes: {
+        userId: React.PropTypes.string.isRequired,
         room: React.PropTypes.object.isRequired,
+        showApps: React.PropTypes.bool, // Should apps be rendered
+        hide: React.PropTypes.bool, // If rendered, should apps drawer be visible
+    },
+
+    defaultProps: {
+        showApps: true,
+        hide: false,
     },
 
     getInitialState: function() {
@@ -46,7 +54,7 @@ module.exports = React.createClass({
 
     componentWillMount: function() {
         ScalarMessaging.startListening();
-        MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
+        MatrixClientPeg.get().on('RoomState.events', this.onRoomStateEvents);
     },
 
     componentDidMount: function() {
@@ -56,7 +64,7 @@ module.exports = React.createClass({
             this.scalarClient.connect().then(() => {
                 this.forceUpdate();
             }).catch((e) => {
-                console.log("Failed to connect to integrations server");
+                console.log('Failed to connect to integrations server');
                 // TODO -- Handle Scalar errors
                 //     this.setState({
                 //         scalar_error: err,
@@ -70,7 +78,7 @@ module.exports = React.createClass({
     componentWillUnmount: function() {
         ScalarMessaging.stopListening();
         if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
+            MatrixClientPeg.get().removeListener('RoomState.events', this.onRoomStateEvents);
         }
         dis.unregister(this.dispatcherRef);
     },
@@ -81,7 +89,7 @@ module.exports = React.createClass({
     },
 
     onAction: function(action) {
-        const hideWidgetKey = this.props.room.roomId + "_hide_widget_drawer";
+        const hideWidgetKey = this.props.room.roomId + '_hide_widget_drawer';
         switch (action.action) {
             case 'appsDrawer':
                 // When opening the app drawer when there aren't any apps,
@@ -109,7 +117,7 @@ module.exports = React.createClass({
      * passed through encodeURIComponent.
      * @param {string} pathTemplate The path with template variables e.g. '/foo/$bar'.
      * @param {Object} variables The key/value pairs to replace the template
-     * variables with. E.g. { "$bar": "baz" }.
+     * variables with. E.g. { '$bar': 'baz' }.
      * @return {string} The result of replacing all template variables e.g. '/foo/baz'.
      */
     encodeUri: function(pathTemplate, variables) {
@@ -187,13 +195,13 @@ module.exports = React.createClass({
     },
 
     _launchManageIntegrations: function() {
-        const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+        const IntegrationsManager = sdk.getComponent('views.settings.IntegrationsManager');
         const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
                 this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room, 'add_integ') :
                 null;
         Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
             src: src,
-        }, "mx_IntegrationsManager");
+        }, 'mx_IntegrationsManager');
     },
 
     onClickAddWidget: function(e) {
@@ -201,12 +209,12 @@ module.exports = React.createClass({
         // Display a warning dialog if the max number of widgets have already been added to the room
         const apps = this._getApps();
         if (apps && apps.length >= MAX_WIDGETS) {
-            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
             const errorMsg = `The maximum number of ${MAX_WIDGETS} widgets have already been added to this room.`;
             console.error(errorMsg);
             Modal.createDialog(ErrorDialog, {
-                title: _t("Cannot add any more widgets"),
-                description: _t("The maximum permitted number of widgets have already been added to this room."),
+                title: _t('Cannot add any more widgets'),
+                description: _t('The maximum permitted number of widgets have already been added to this room.'),
             });
             return;
         }
@@ -238,11 +246,11 @@ module.exports = React.createClass({
         ) {
             addWidget = <div
                 onClick={this.onClickAddWidget}
-                role="button"
-                tabIndex="0"
+                role='button'
+                tabIndex='0'
                 className={this.state.apps.length<2 ?
-                    "mx_AddWidget_button mx_AddWidget_button_full_width" :
-                    "mx_AddWidget_button"
+                    'mx_AddWidget_button mx_AddWidget_button_full_width' :
+                    'mx_AddWidget_button'
                 }
                 title={_t('Add a widget')}>
                 [+] { _t('Add a widget') }
@@ -250,8 +258,8 @@ module.exports = React.createClass({
         }
 
         return (
-            <div className="mx_AppsDrawer">
-                <div id="apps" className="mx_AppsContainer">
+            <div className={'mx_AppsDrawer' + (this.props.hide ? ' mx_AppsDrawer_hidden' : '')}>
+                <div id='apps' className='mx_AppsContainer'>
                     { apps }
                 </div>
                 { this._canUserModify() && addWidget }
diff --git a/src/components/views/rooms/AuxPanel.js b/src/components/views/rooms/AuxPanel.js
index c0857d9691..749026d5c6 100644
--- a/src/components/views/rooms/AuxPanel.js
+++ b/src/components/views/rooms/AuxPanel.js
@@ -31,7 +31,8 @@ module.exports = React.createClass({
         // js-sdk room object
         room: React.PropTypes.object.isRequired,
         userId: React.PropTypes.string.isRequired,
-        showApps: React.PropTypes.bool,
+        showApps: React.PropTypes.bool, // Render apps
+        hideAppsDrawer: React.PropTypes.bool, // Do not display apps drawer and content (may still be rendered)
 
         // Conference Handler implementation
         conferenceHandler: React.PropTypes.object,
@@ -51,6 +52,11 @@ module.exports = React.createClass({
         onResize: React.PropTypes.func,
     },
 
+    defaultProps: {
+        showApps: true,
+        hideAppsDrawer: false,
+    },
+
     shouldComponentUpdate: function(nextProps, nextState) {
         return (!ObjectUtils.shallowEqual(this.props, nextProps) ||
                 !ObjectUtils.shallowEqual(this.state, nextState));
@@ -133,6 +139,7 @@ module.exports = React.createClass({
             userId={this.props.userId}
             maxHeight={this.props.maxHeight}
             showApps={this.props.showApps}
+            hide={this.props.hideAppsDrawer}
         />;
 
         return (

From e1410755600b4a3f94400cace45aae3ea2c84406 Mon Sep 17 00:00:00 2001
From: Oskars <oskars@lanet.lv>
Date: Sat, 10 Feb 2018 16:38:14 +0000
Subject: [PATCH 495/927] Translated using Weblate (Latvian)

Currently translated at 90.3% (891 of 986 strings)

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

diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index ae290d4d5f..50416f0318 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -21,7 +21,7 @@
     "Default Device": "Noklusējuma ierīce",
     "Microphone": "Mikrofons",
     "Camera": "Kamera",
-    "Advanced": "Īpašie",
+    "Advanced": "Papildus",
     "Algorithm": "Algoritms",
     "Hide removed messages": "Slēpt dzēstos ziņojumus",
     "Always show message timestamps": "Vienmēr rādīt ziņojumu laika zīmogu",
@@ -35,7 +35,7 @@
     "Anyone": "Ikviens",
     "Anyone who knows the room's link, apart from guests": "Ikviens, kurš zina adreses saiti uz istabu, izņemot viesus",
     "Anyone who knows the room's link, including guests": "Ikviens, kurš zina adreses saiti uz istabu, tai skaitā arī viesi",
-    "Are you sure?": "Esi pārliecināts/a?",
+    "Are you sure?": "Vai tiešām to vēlies?",
     "Are you sure you want to leave the room '%(roomName)s'?": "Vai tiešām vēlies pamest istabas:  '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Vai tiešām vēlies noraidīt šo uzaicinājumu?",
     "Are you sure you want to upload the following files?": "Vai tiešām vēlies augšuplādēt sekojošos failus?",
@@ -48,7 +48,7 @@
     "Blacklisted": "Melnajā sarakstā iekļautie",
     "Bug Report": "Paziņojums par kļūdu",
     "Bulk Options": "Lielapjoma darbības",
-    "Call Timeout": "Zvana noilgums",
+    "Call Timeout": "Zvana gaidīšanas noilgums",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Neizdevās savienoties ar serveri. Lūdzu pārbaudi savu tīkla savienējumu un pārliecinies, ka tava  <a>servera SSL sertifikāts</a> ir uzticams, kā arī pārlūkā instalētie paplašinājumi nebloķē pieprasījumus.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdevās savienoties ar serveri izmantojot HTTP protokolu, kad tava pārlūka adreses laukā ir HTTPS saite. Tā vietā izmanto HTTPS savienojumu vai <a>iespējo nedrošos skriptus</a>.",
     "Can't load user settings": "Neizdevās ielādēt lietotāja uzstādījumus",
@@ -77,21 +77,21 @@
     "Conference call failed.": "Konferences zvans neizdevās.",
     "Conference calling is in development and may not be reliable.": "Konferences zvans šobrīd atrodas izstrādes stadijā un var būt nestabils.",
     "Conference calls are not supported in encrypted rooms": "Konferences zvani nav iespējami istabās, kurās tiek izmantota šifrēšana",
-    "Conference calls are not supported in this client": "Konferences zvani netiek atbalstīti šajā programmā",
+    "Conference calls are not supported in this client": "Konferences zvani šajā klienta programmā netiek atbalstīti",
     "Confirm password": "Apstiprini paroli",
     "Confirm your new password": "Apstiprini jauno paroli",
     "Continue": "Turpināt",
     "Could not connect to the integration server": "Neizdevās savienoties ar integrācijas serveri",
     "%(count)s new messages|one": "jaunu ziņu skaits: %(count)s",
     "%(count)s new messages|other": "%(count)s jaunas ziņas",
-    "Create a new chat or reuse an existing one": "Izveidot jaunu čatu vai izmantot eksistējošu",
+    "Create a new chat or reuse an existing one": "Izveidot jaunu čalu vai izmantot jau esošu",
     "Create an account": "Reģistrēt kontu",
     "Create Room": "Izveidot istabu",
     "Cryptography": "Kriptogrāfija",
     "Current password": "Pašreizējā parole",
     "Curve25519 identity key": "Curve25519 identifikācijas atslēga",
     "Custom": "Pielāgots",
-    "Custom level": "Speciāls līmenis",
+    "Custom level": "Īpašais līmenis",
     "/ddg is not a command": "/ddg nav komanda",
     "Deactivate Account": "Deaktivizēt kontu",
     "Deactivate my account": "Deaktivizēt manu kontu",
@@ -116,7 +116,7 @@
     "Don't send typing notifications": "Nesūtīt paziņojumus",
     "Download %(text)s": "Lejupielādēt tekstu: %(text)s",
     "Drop File Here": "Ievelc failu šeit",
-    "Drop here to tag %(section)s": "Ievelc šeit uz birkas %(section)s",
+    "Drop here to tag %(section)s": "Nomest šeit, lai birkotu %(section)s",
     "Ed25519 fingerprint": "Ed25519 identificējošā zīmju virkne",
     "Email": "Epasts",
     "Email address": "Epasta adrese",
@@ -140,11 +140,11 @@
     "Error decrypting attachment": "Kļūda atšifrējot pielikumu",
     "Error: Problem communicating with the given homeserver.": "Kļūda: Radās komunikācijas problēma ar norādīto serveri.",
     "Event information": "Notikuma informācija",
-    "Existing Call": "Eksistējošs zvans",
+    "Existing Call": "Pašreizējā saruna (zvans)",
     "Export": "Eksportēt",
     "Export E2E room keys": "Eksportēt E2E istabas atslēgas",
-    "Failed to ban user": "Neizdevās liegt pieeju lietotājam",
-    "Failed to change password. Is your password correct?": "Neizdevās mainīt paroli. Vai tava parole ir pareiza?",
+    "Failed to ban user": "Neizdevās bloķēt (liegt pieeju) lietotāju",
+    "Failed to change password. Is your password correct?": "Neizdevās nomainīt paroli. Vai tā ir pareiza?",
     "Failed to change power level": "Neizdevās mainīt statusa līmeni",
     "Power level must be positive integer.": "Statusa līmenim ir jābūt pozitīvam skaitlim.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tu nevarēsi atcelt šo darbību, jo šim lietotājam piešķir tādu pašu statusa līmeni, kāds ir Tev.",
@@ -170,12 +170,12 @@
     "Failed to upload profile picture!": "Neizdevās augšuplādēt profila attēlu!",
     "Failed to verify email address: make sure you clicked the link in the email": "Neizdevās apstiprināt epasta adresi. Pārbaudi, vai Tu esi noklikšķinājis/usi saiti epasta ziņā",
     "Failure to create room": "Neizdevās izveidot istabu",
-    "Favourite": "Favorīts",
+    "Favourite": "Tava izlase (favorīti)",
     "Favourites": "Favorīti",
     "Fill screen": "Aizpildīt ekrānu",
     "Filter room members": "Filtrēt istabas biedrus",
     "Forget room": "\"Aizmirst\" istabu",
-    "Forgot your password?": "Aizmirsi savu paroli?",
+    "Forgot your password?": "Aizmirsi paroli?",
     "For security, this session has been signed out. Please sign in again.": "Drošības nolūkos, šī sesija ir beigusies. Lūdzu, pieraksties par jaunu.",
     "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.": "Drošības nolūkos, izrakstīšanās dzēsīs jebkādas ierīce-ierīce šifrēšanas atslēgas no šī pārlūka. Ja Tu vēlies  saglabāt iespēju atšifrēt tavu saziņas vēsturi no Riot nākotnes sesijām, lūdzu eksportē tavas istabas atslēgas, saglabājot tās drošā vietā.",
     "Found a bug?": "Pamanīji kļūdu?",
@@ -198,7 +198,7 @@
     "Incorrect username and/or password.": "Nepareizs lietotājvārds un/vai parole.",
     "Incorrect verification code": "Nepareizs verifikācijas kods",
     "Interface Language": "Saskarnes valoda",
-    "Invalid alias format": "Nepareizs aizstājējvārda formāts",
+    "Invalid alias format": "Nepareizs aizstājējvārda (aliases) formāts",
     "Invalid address format": "Nepareizs adreses formāts",
     "Invalid Email Address": "Nepareiza epasta adrese",
     "Invalid file%(extra)s": "Nepareizs faila %(extra)s",
@@ -215,7 +215,7 @@
     "Join Room": "Pievienoties istabai",
     "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
     "Joins room with given alias": "Pievieno istabai ar uzdoto aizstājējvārdu",
-    "Jump to first unread message.": "Pārlekt uz pirmo neizlasīto ziņu.",
+    "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s iespēra (kick) %(targetName)s.",
     "Kick": "Iespert (kick)",
     "Kicks user with given id": "Iesper (kick) lietotājam pēc norādītā id",
@@ -240,7 +240,7 @@
     "Turn Markdown off": "Izslēgt formatēšanas iespēju",
     "Turn Markdown on": "Ieslēgt formatēšanas iespēju",
     "matrix-react-sdk version:": "matrix-react-sdk versija:",
-    "The default role for new room members is": "Noklusējuma loma jaunam istabas biedram ir",
+    "The default role for new room members is": "Jauna istabas biedra statuss pēc noklusējuma ir",
     "Message not sent due to unknown devices being present": "Ziņa nav nosūtīta, jo tika konstatēta nezināmu ierīču klātbūtne",
     "Missing room_id in request": "Iztrūkstošs room_id pieprasījumā",
     "Missing user_id in request": "Iztrūkstošs user_id pieprasījumā",
@@ -248,7 +248,7 @@
     "Mobile phone number (optional)": "Mobilā telefona numurs (nav obligāts)",
     "Moderator": "Moderators",
     "Must be viewing a room": "Jāapskata istaba",
-    "Mute": "Apklusināt",
+    "Mute": "Kluss (noklusināt)",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
     "Name": "Vārds",
     "Never send encrypted messages to unverified devices from this device": "Nekad nesūti no šīs ierīces šifrētas ziņas uz neverificētām ierīcēm",
@@ -269,7 +269,7 @@
     "No more results": "Nav tālāko rezultātu",
     "No results": "Nav rezultātu",
     "No users have specific privileges in this room": "Nav lietotāju ar īpašām privilēģijām šajā istabā",
-    "OK": "LABI",
+    "OK": "Labs ir",
     "olm version:": "olm versija:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Tiklīdz istabai tiks iespējota šifrēšana, tā vairs nebūs atslēdzama (pašlaik)",
     "Only people who have been invited": "Vienīgi personas, kuras ir tikušas uzaicinātas",
@@ -283,7 +283,7 @@
     "Phone": "Telefons",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s nolika %(callType)s zvanu.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
-    "Press <StartChatButton> to start a chat with someone": "Nospied <StartChatButton>, lai uzsāktu čatu ar kādu",
+    "Press <StartChatButton> to start a chat with someone": "Nospied <StartChatButton>, lai ar kādu uzsāktu čalošanu",
     "Privacy warning": "Privātuma brīdinājums",
     "Private Chat": "Privātais čats",
     "Privileged Users": "Priviliģētie lietotāji",
@@ -308,8 +308,8 @@
     "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.": "Paroles atiestatīšana atiestatīs visas ierīce-ierīce šifrēšanas atslēgas visās ierīcēs, padarot čata šifrēto ziņu vēsturi nelasāmu, ja vien Tu pirms tam neesi eksportējis savas istabas atslēgas un atkārtoti importējis tās atpakaļ. Nākotnē šo ir plānots uzlabot.",
     "Results from DuckDuckGo": "Rezultāti no DuckDuckGo",
     "Return to login screen": "Atgriezties uz pierakstīšanās lapu",
-    "Riot does not have permission to send you notifications - please check your browser settings": "Riot nav atļauts nosūtīt Tev paziņojumus. Lūdzu pārbaudi sava pārlūka uzstādījumus",
-    "Riot was not given permission to send notifications - please try again": "Riot nav atļauts nosūtīt paziņojumus. Lūdzu mēģini vēlreiz.",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot nav atļauts nosūtīt Tev paziņojumus. Lūdzu pārbaudi sava pārlūka iestatījumus",
+    "Riot was not given permission to send notifications - please try again": "Riot nav piešķirta atļauja nosūtīt paziņojumus. Lūdzu mēģini vēlreiz",
     "riot-web version:": "riot-web versija:",
     "Unable to enable Notifications": "Nav iespējams iespējot paziņojumus",
     "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": "Tu izrakstījies no visām ierīcēm un vairs nesaņemsi pašpiegādes (push) paziņojumus. Lai iespējotu paziņojumus, pieraksties atkārtoti katrā no ierīcēm",
@@ -319,14 +319,14 @@
     "Room %(roomId)s not visible": "Istaba %(roomId)s nav redzama",
     "%(roomName)s does not exist.": "%(roomName)s neeksistē.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s šobrīd nav pieejama.",
-    "Seen by %(userName)s at %(dateTime)s": "Redzams %(userName)s  %(dateTime)s",
+    "Seen by %(userName)s at %(dateTime)s": "Redzējis %(userName)s %(dateTime)s",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
     "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s uzstādīja redzamo vārdu uz: %(displayName)s.",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Tevis uzdotā pierakstīšanās atslēga sakrīt ar atslēgu, kuru Tu saņēmi no %(userId)s ierīces %(deviceId)s. Ierīce tika atzīmēta kā verificēta.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Faila '%(fileName)s' izmērs pārsniedz šī mājas servera augšupielādes lieluma ierobežojumu",
-    "The file '%(fileName)s' failed to upload": "Failu '%(fileName)s' neizdevās augšuplādēt",
+    "The file '%(fileName)s' failed to upload": "Failu '%(fileName)s' neizdevās nosūtīt (augšuplādēt)",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza ierīce-ierīce šifrēšanu (algorithm %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
     "Unknown room %(roomId)s": "Nezināma istaba %(roomId)s",
@@ -402,7 +402,7 @@
     "This email address is already in use": "Šī epasta adrese jau tiek izmantota",
     "This email address was not found": "Šāda epasta adrese nav atrasta",
     "The email address linked to your account must be entered.": "Ir jāievada tavam kontam piesaistītā epasta adrese.",
-    "The remote side failed to pick up": "Neizdevās uzņemt attālināto pusi",
+    "The remote side failed to pick up": "Zvana adresāts  neatbild",
     "This Home Server does not support login using email address.": "Šis serveris neatbalsta pierakstīšanos ar epasta adresi.",
     "This invitation was sent to an email address which is not associated with this account:": "Šis uzaicinājums tika nosūtīts uz epasta adresi, kura nav piesaistīta šim kontam:",
     "This room has no local addresses": "Šai istabai nav lokālo adrešu",
@@ -425,7 +425,7 @@
     "Unable to verify email address.": "Nav iespējams apstiprināt epasta adresi.",
     "Unban": "Atbanot",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Nav iespējams pārliecināties, ka šis uzaicinājums tika nosūtīts uz to pašu adresi, kura ir piesaistīta tavam kontam.",
-    "Unable to capture screen": "Nav iespējams uzņemt ekrānattēlu",
+    "Unable to capture screen": "Neizdevās uzņemt ekrānattēlu",
     "Unable to load device list": "Nav iespējams ielādēt ierīču sarakstu",
     "Undecryptable": "Neatšifrējams",
     "Unencrypted room": "Nešifrēta istaba",
@@ -439,14 +439,14 @@
     "Unnamed Room": "Istaba bez nosaukuma",
     "Cancel": "Atcelt",
     "Create new room": "Izveidot jaunu istabu",
-    "Custom Server Options": "Īpaši servera uzstādījumi",
-    "Dismiss": "Noņemt",
+    "Custom Server Options": "Iestatāmie servera uzstādījumi",
+    "Dismiss": "Atteikums",
     "You have <a>enabled</a> URL previews by default.": "Tev ir pēc noklusējuma <a>iespējots</a> URL adrešu priekšskatījums.",
     "Unrecognised command:": "Neatpazīta komanda:",
     "Unrecognised room alias:": "Neatpazīts istabas aizstājējvārds:",
     "Unverified": "Neverificēts",
     "Upload avatar": "Augšuplādē profila attēlu",
-    "Upload Failed": "Augšupielāde neizdevās",
+    "Upload Failed": "Nosūtīšana (augšupielāde) neizdevās",
     "Upload Files": "Augšuplādē failus",
     "Upload file": "Augšuplādē failu",
     "Upload new:": "Augšuplādē jaunu:",
@@ -481,11 +481,11 @@
     "Who would you like to add to this room?": "Kuru vēlies pievienot šai istabai?",
     "Who would you like to communicate with?": "Ar kuru vēlies komunicēt?",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Vai vēlies <acceptText>apstiprināt</acceptText> vai <declineText>noraidīt</declineText> šo uzaicinājumu?",
-    "You already have existing direct chats with this user:": "Tev jau ir eksistējošs tiešais čats ar šo lietotāju:",
-    "You are already in a call.": "Tu jau šobrīd atrodies zvanā.",
+    "You already have existing direct chats with this user:": "Tev jau ir viens tiešais čats ar šo lietotāju:",
+    "You are already in a call.": "Tu jau šobrīd esi sarunā.",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Šobrīd Tu vēl neatrodies nevienā istabā! Klikšķini <CreateRoomButton> lai izveidotu istabu, vai <RoomDirectoryButton>, lai skatītu istabu katalogu",
-    "You cannot place a call with yourself.": "Tu nevari veikt zvanu sev.",
-    "You cannot place VoIP calls in this browser.": "Tu nevari veikt VoIP zvanus šajā pārlūkā.",
+    "You cannot place a call with yourself.": "Nav iespējams piezvanīt sev.",
+    "You cannot place VoIP calls in this browser.": "VoIP zvani šajā pārlūkā netiek atbalstīti.",
     "You do not have permission to post to this room": "Tev nav vajadzīgās atļaujas pievienot ziņas šajā istabā",
     "You have <a>disabled</a> URL previews by default.": "URL priekšskatījums pēc noklusējuma Tev ir <a>atspējots</a>.",
     "You may wish to login with a different account, or add this email to this account.": "Tu varētu, iespējams, vēlēties pierakstīties no cita konta vai piesaistīt šo epastu šim kontam.",
@@ -531,7 +531,7 @@
     "An unknown error occurred.": "Notikusi neparedzēta kļūda.",
     "I already have an account": "Man jau ir konts",
     "Topic": "Tēma",
-    "Make Moderator": "Piešķirt moderatora līmeni",
+    "Make Moderator": "Piešķirt moderatora statusu",
     "Make this room private": "Padarīt šo istabu privātu",
     "Share message history with new users": "Kopīgot ziņu vēsturi ar jauniem lietotājiem",
     "Encrypt room": "Šifrēt istabu",
@@ -550,7 +550,7 @@
     "numbullet": "lode ar numuru",
     "Please select the destination room for this message": "Lūdzu izvēlies šīs ziņas mērķa istabu",
     "Room directory": "Istabu katalogs",
-    "Start chat": "Uzsākt čatu",
+    "Start chat": "Uzsākt čalošanu",
     "New Password": "Jauna parole",
     "Start automatically after system login": "Uzsākt automātiski pēc pierakstīšanās sistēmā",
     "Desktop specific": "Darbvirsmai specifiski",
@@ -569,7 +569,7 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Šis process ļauj Tev importēt tās šifrēšanas atslēgas, kuras Tu iepriekš eksportēji no citas Matrix klienta aplikācijas. Importētās atslēgas ļaus vajadzīgajā klienta aplikācijā lasīt atšifrētās ziņas.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Eksporta fails būs aizsargāts ar paroles frāzi. Tā ir jāievada šeit, lai atšifrētu failu.",
     "You must join the room to see its files": "Tev ir jāpievienojas istabai, lai redzētu tās failus",
-    "Start new chat": "Uzsākt jaunu čatu",
+    "Start new chat": "Uzsākt jaunu čalu",
     "Failed to invite": "Neizdevās uzaicināt",
     "Failed to invite user": "Neizdevās uzaicināt lietotāju",
     "Confirm Removal": "Apstiprini dzēšanu",
@@ -596,7 +596,7 @@
     "Blacklist": "Melnais saraksts",
     "Unverify": "Atverificēt",
     "Verify...": "Verificē...",
-    "ex. @bob:example.com": "piemēram, @janis:majaslapa.lv",
+    "ex. @bob:example.com": "piemēram, @valters:smaidu.lv",
     "Add User": "Pievienot lietotāju",
     "This Home Server would like to make sure you are not a robot": "Šis mājas serveris vēlas pārliecināties, ka Tu neesi robots",
     "Sign in with CAS": "Pierakstīties ar CAS",
@@ -606,7 +606,7 @@
     "Please check your email to continue registration.": "Lūdzu pārbaudi savu epastu lai turpinātu reģistrāciju.",
     "Token incorrect": "Nepareizs autentifikācijas kods",
     "Please enter the code it contains:": "Lūdzu ievadi tajā ietverto kodu:",
-    "powered by Matrix": "spēcināts ar Matrix",
+    "powered by Matrix": "Tiek darbināts ar Matrix",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ja Tu nenorādīsi epasta adresi, tev nebūs iespējams izmantot paroles atiestatīšanu. Vai esi pārliecināts/a?",
     "Default server": "Noklusējuma serveris",
     "Custom server": "Īpašs serveris",
@@ -617,18 +617,18 @@
     "Error decrypting image": "Kļūda atšifrējot attēlu",
     "Error decrypting video": "Kļūda atšifrējot video",
     "Add an Integration": "Pievienot integrāciju",
-    "Removed or unknown message type": "Dzēsts vai nezināms ziņas veids",
+    "Removed or unknown message type": "Dzēsts vai nezināms ziņas tips",
     "URL Previews": "URL adrešu priekšskatījumi",
     "Drop file here to upload": "Ievelc failu šeit lai augšuplādētu",
     " (unsupported)": " (netiek atbalstīts)",
-    "Online": "Tiešsaistē",
+    "Online": "Tiešsaistē (pieslēgumā)",
     "Idle": "Dīkstāve",
-    "Offline": "Nav tiešsaistē",
+    "Offline": "Atsaistē (ārpus tīkla)",
     "Updates": "Atjauninājumi",
     "Check for update": "Pārbaudīt, vai ir atjauninājumi",
-    "Start chatting": "Sākt čatošanu",
-    "Start Chatting": "Sākt čatošanu",
-    "Click on the button below to start chatting!": "Klikšķini uz zemāk esošās pogas, lai uzsāktu čatošanu!",
+    "Start chatting": "Sākt čalošanu",
+    "Start Chatting": "Sākt čalošanu",
+    "Click on the button below to start chatting!": "Klikšķini uz zemāk esošās pogas, lai uzsāktu čalošanu!",
     "Username available": "Lietotājvārds ir pieejams",
     "Username not available": "Lietotājvārds nav pieejams",
     "Something went wrong!": "Kaut kas nogāja greizi!",
@@ -653,14 +653,14 @@
     "Delete widget": "Dzēst widžetu",
     "Define the power level of a user": "Definēt lietotāja pakāpes līmeni",
     "Do you want to load widget from URL:": "Vai vēlies ielādēt widžetu no URL:",
-    "Edit": "Labot",
+    "Edit": "Rediģēt",
     "Enable automatic language detection for syntax highlighting": "Iespējot automātisko valodas noteikšanu sintakses iezīmējumiem",
     "Hide Apps": "Slēpt aplikācijas",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Slēpt pievienoties/pamest ziņas (tas neietekmē uzaicinājumus, vai kick/bana darbības)",
     "Integrations Error": "Integrācijas kļūda",
     "Publish this room to the public in %(domain)s's room directory?": "Publicēt šo istabu publiskajā %(domain)s katalogā?",
     "AM": "AM",
-    "PM": "PZ",
+    "PM": "PM",
     "NOTE: Apps are not end-to-end encrypted": "PIEZĪME: Aplikācijās nav ierīce-ierīce šifrēšanas",
     "Sets the room topic": "Uzstāda istabas tēmas nosaukumu",
     "Show Apps": "Rādīt aplikācijas",
@@ -683,5 +683,211 @@
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pievienoja %(widgetName)s vidžetu",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotu pārbaude šobrīd nav pieejama darbvirsmas versijā. Lūdzu izmanto <a>web pārlūku</a>",
-    "Revoke widget access": "Atsaukt vidžeta piekļuvi"
+    "Revoke widget access": "Atsaukt vidžeta piekļuvi",
+    "Unpin Message": "Atkabināt ziņu",
+    "Add rooms to this community": "Pievienot istabas šai komūnai",
+    "Failed to set direct chat tag": "Neizdevās tiešajam čatam uzstādīt birku",
+    "Warning": "Brīdinājums",
+    "Send": "Sūtīt",
+    "Leave": "Pamest",
+    "Unnamed room": "Nenosaukta istaba",
+    "Guests can join": "Var pievienoties viesi",
+    "The platform you're on": "Izmantotā operētājsistēma",
+    "The version of Riot.im": "Riot.im versija",
+    "Whether or not you're logged in (we don't record your user name)": "Neatkarīgi no tā, vai esi vai neesi iegājis sistēmā (netiek fiksēts Tavs lietotājvārds)",
+    "Your language of choice": "Izvēlētā valoda",
+    "Which officially provided instance you are using, if any": "Kuru oficiāli izlaisto versiju izmantojat (ja to darat)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Neatkarīgi no tā, vai izmantojat Richtext režīmu redaktorā Rich Text Editor",
+    "Your homeserver's URL": "Mājasservera URL adrese",
+    "Your identity server's URL": "Tava identitātes servera URL adrese",
+    "The information being sent to us to help make Riot.im better includes:": "Informācija, kura mums tiek nosūtīta, lai ļautu padarīt Riot.im labāku, ietver:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Mēs arī fiksējam katru lapu, kuru tu izmanto programmā (currently <CurrentPageHash>), Tavu lietotāja aģentu (<CurrentUserAgent>) un Tavas ierīces ekrāna izšķirtspēju (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ja šī lapa ietver identificējamu informāciju, tādu kā istaba, lietotājs, grupas ID, šie dati tiek noņemti pirms nosūtīšanas uz serveri.",
+    "Call Failed": "Zvans neizdevās",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Šajā istabā ir nepazīstamas ierīces: ja Tu turpināsi bez to pārbaudes, ir iespējams, ka kāda nepiederoša persona var noklausīties Tavas sarunas.",
+    "Review Devices": "Ierīču pārskats",
+    "Call Anyway": "Vienalga zvanīt",
+    "Answer Anyway": "Vienalga atbildēt",
+    "Call": "Zvans",
+    "Answer": "Atbildēt",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "Who would you like to add to this community?": "Kurus cilvēkus Tu vēlētos pievienot šai komūnai?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Brīdinājums: ikviens, kurš tiek pievienots komūnai būs publiski redzams visiem, kuri zin komūnas ID",
+    "Invite new community members": "Uzaicināt jaunus komūnas biedrus",
+    "Name or matrix ID": "Vārds vai Matrix ID",
+    "Invite to Community": "Uzaicināt komūnā",
+    "Which rooms would you like to add to this community?": "Kuras istabas vēlies pievienot šai komūnai?",
+    "Show these rooms to non-members on the community page and room list?": "Vai ne-biedriem rādīt komūnas lapā un istabu sarakstā šīs istabas?",
+    "Add rooms to the community": "Istabu pievienošana komūnai",
+    "Room name or alias": "Istabas nosaukums vai aliase",
+    "Add to community": "Pievienot komūnai",
+    "Failed to invite the following users to %(groupId)s:": "Neizdevās uzaicināt sekojošus lietotājus grupā %(groupId)s:",
+    "Failed to invite users to community": "Neizdevās uzaicināt lietotājus komūnā",
+    "Failed to invite users to %(groupId)s": "Neizdevās uzaicināt lietotājus grupā %(groupId)s:",
+    "Failed to add the following rooms to %(groupId)s:": "Neizdevās pievienot sekojošas istabas grupai %(groupId)s:",
+    "Restricted": "Ierobežots",
+    "Ignored user": "Ignorējams lietotājs",
+    "You are now ignoring %(userId)s": "Tagad Tu ignorē %(userId)s",
+    "Unignored user": "Neignorējams lietotājs",
+    "You are no longer ignoring %(userId)s": "Tu vairāk neignorē %(userId)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu attēlojamo vārdu uz %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s šai istabai nomainīja piekabinātās ziņas.",
+    "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
+    "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta",
+    "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
+    "Message Replies": "Atbildes uz ziņām",
+    "Message Pinning": "Ziņu piekabināšana",
+    "Presence Management": "Klātbūtnes vadība",
+    "Tag Panel": "Birku panelis",
+    "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā",
+    "Hide avatar changes": "Slēpt avatara izmaiņas",
+    "Hide display name changes": "Slēpt attēlojamā vārda izmaiņas",
+    "Disable big emoji in chat": "Atspējot čatā lielos emoji",
+    "Mirror local video feed": "Spoguļots vietējā video attēlojums",
+    "Enable inline URL previews by default": "Ieslēgt URL adrešu priekšskatījumu pēc noklusējuma",
+    "Enable URL previews for this room (only affects you)": "Ieslēgt URL adrešu priekšskatījumus šai istabai (ietekmē tikai Tevi pašu)",
+    "Enable URL previews by default for participants in this room": "Ieslēgt URL adrešu priekšskatījumus pēc noklusējuma visiem šīs istabas dalībniekiem",
+    "Delete %(count)s devices|other": "Dzēst %(count)s ierīces",
+    "Delete %(count)s devices|one": "Dzēst ierīci",
+    "Select devices": "Izvēlēties ierīces",
+    "%(senderName)s sent an image": "%(senderName)s nosūtīja bildi",
+    "%(senderName)s sent a video": "%(senderName)s nosūtīja video",
+    "%(senderName)s uploaded a file": "%(senderName)s augšupielādēja failu",
+    "Disinvite this user?": "Atcelt ielūgumu šim lietotājam?",
+    "Kick this user?": "Padzīt šo lietotāju?",
+    "Unban this user?": "Atbloķēt šo lietotāju (atcelt liegumu šim lietotājam)?",
+    "Ban this user?": "Bloķēt šo lietotāju (uzlikt liegumu šim lietotājam)?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Jūs nevarēsiet atcelt šīs izmaiņas pēc sava statusa pazemināšanas. Gadījumā, ja esat pēdējais priviliģētais lietotājs istabā, būs neiespējami atgūt šīs privilēģijas.",
+    "Unignore": "Atcelt ignorēšanu",
+    "Ignore": "Ignorēt",
+    "Jump to read receipt": "Pāriet uz izlasīšanas apstiprinājumu",
+    "Mention": "Atsauce (pieminējums)",
+    "Invite": "Uzaicināt",
+    "User Options": "Lietotāja uzstādījumi",
+    "Send an encrypted reply…": "Sūtīt šifrētu atbildi…",
+    "Send a reply (unencrypted)…": "Sūtīt nešifrētu atbildi…",
+    "Send an encrypted message…": "Sūtīt šifrētu ziņu…",
+    "Send a message (unencrypted)…": "Sūtīt NEšifrētu ziņu…",
+    "Jump to message": "Pāriet uz ziņu",
+    "No pinned messages.": "Nav piestiprinātu ziņu.",
+    "Loading...": "Ielāde...",
+    "Pinned Messages": "Piestiprinātās ziņas",
+    "%(duration)ss": "%(duration)s sek",
+    "%(duration)sm": "%(duration)smin",
+    "%(duration)sh": "%(duration)sstundas",
+    "%(duration)sd": "%(duration)sdienas",
+    "Online for %(duration)s": "Pieslēgumā %(duration)s",
+    "Idle for %(duration)s": "Dīkstāvē (neaktīvs) %(duration)s",
+    "Offline for %(duration)s": "Atslēgumā %(duration)s",
+    "Unknown for %(duration)s": "Neskaidrā statusā %(duration)s",
+    "Unknown": "Neskaidrs statuss",
+    "Replying": "Atbildot uz",
+    "No rooms to show": "Nav istabu, kuras parādīt",
+    "World readable": "Pieejams ikvienam no visurienes",
+    "Remove avatar": "Dzēst avataru",
+    "Drop here to favourite": "Nomest šeit (atvilt uz šejieni), lai iekļautu izlasē (favorītos)",
+    "Drop here to tag direct chat": "Nomest šeit, lai pievienotu atzīmi \"Tiešais čats\"",
+    "Drop here to restore": "Nomest šeit, lai atgrieztu",
+    "Drop here to demote": "Nomest šeit, lai pazeminātu",
+    "Failed to remove tag %(tagName)s from room": "Neizdevās istabai noņemt birku %(tagName)s",
+    "Failed to add tag %(tagName)s to room": "Neizdevās istabai pievienot birku %(tagName)s",
+    "Community Invites": "Uzaicinājums uz komūnu",
+    "You have been kicked from this room by %(userName)s.": "%(userName)s padzina Tevi no šīs istabas.",
+    "You have been banned from this room by %(userName)s.": "%(userName)s nobloķēja Tevi (liedza piekļuvi) šajā istabā.",
+    "You are trying to access a room.": "Tu centies gūt piekļuvi istabai.",
+    "To change the room's avatar, you must be a": "Lai izmainītu istabas avatāru, Tev jābūt",
+    "To change the room's name, you must be a": "Lai izmainītu istabas nosaukumu, Tev jābūt",
+    "To change the room's main address, you must be a": "Lai izmainītu istabas pamatadresi, Tev jābūt",
+    "To change the room's history visibility, you must be a": "Lai izmainītu istabas vēstures redzamību, Tev jābūt",
+    "To change the permissions in the room, you must be a": "Lai istabā izmainītu atļaujas, Tev jābūt",
+    "To change the topic, you must be a": "Lai izmainītu tematu, Tev jābūt",
+    "To modify widgets in the room, you must be a": "Lai istabā izmainītu vidžetus, Tev jābūt",
+    "Banned by %(displayName)s": "Nobloķējis (liedzis piekļuvi) %(displayName)s",
+    "Members only (since the point in time of selecting this option)": "Tikai biedri (no šī parametra iestatīšanas brīža)",
+    "Members only (since they were invited)": "Tikai biedri (no to uzaicināšanas brīža)",
+    "Members only (since they joined)": "Tikai biedri (kopš pievienošanās)",
+    "To send messages, you must be a": "Lai sūtītu ziņas, Tev jābūt",
+    "To invite users into the room, you must be a": "Lai aicinātu istabā lietotājus, ir jābūt",
+    "To configure the room, you must be a": "Lai konfigurētu istabu, ir jābūt",
+    "To kick users, you must be a": "Lai padzītu lietotājus, ir jābūt",
+    "To ban users, you must be a": "Lai bloķētu (liegtu pieeju) lietotājiem, ir jābūt",
+    "To remove other users' messages, you must be a": "Lai dzēstu citu lietotāju ziņas, ir jābūt",
+    "To send events of type <eventType/>, you must be a": "Lai sūtītu <eventType/> tipa notikumus, ir jābūt",
+    "Addresses": "Adreses",
+    "Invalid community ID": "Nederīgs komūnas ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nav derīgs komūnas ID",
+    "Flair": "Gaidas (nojauta)",
+    "Showing flair for these communities:": "Parādīt Tavas gaidas šajās komūnās:",
+    "This room is not showing flair for any communities": "Šajā istabā neparādās gaidas, kas uzstādītas komūnās",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Jaunās komūnas ID (piem. +foo:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "URL adrešu priekšskats šīs istabas dalībniekiem ir iespējots pēc noklusējuma.",
+    "URL previews are disabled by default for participants in this room.": "ULR adrešu priešskats šīs istabas dalībniekiem pēc noklusējuma ir atspējots.",
+    "Copied!": "Nokopēts!",
+    "Failed to copy": "Nokopēt neizdevās",
+    "Message removed by %(userId)s": "Ziņu dzēsis %(userId)s",
+    "Message removed": "Ziņa dzēsta",
+    "An email has been sent to %(emailAddress)s": "Vēstule tika nosūtīta uz %(emailAddress)s",
+    "A text message has been sent to %(msisdn)s": "Teksta ziņa tika nosūtīts uz %(msisdn)s",
+    "Username on %(hs)s": "Lietotājvārds uz %(hs)s",
+    "Remove from community": "Izdzēst no komūnas",
+    "Disinvite this user from community?": "Atcelt šim lietotājam nosūtīto uzaicinājumu pievienoties komūnai?",
+    "Remove this user from community?": "Izdzēst šo lietotāju no kopienas?",
+    "Failed to withdraw invitation": "Neizdevās atcelt uzaicinājumu",
+    "Failed to remove user from community": "Neizdevās izdzēst lietotāju no kopienas",
+    "Filter community members": "Kopienas biedru filtrs",
+    "Flair will appear if enabled in room settings": "Gaidas parādīsies, ja tās iespējotas istabas iestatījumos",
+    "Flair will not appear": "Gaidas neparādīsies",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Vai tiešām vēlies izdzēst '%(roomName)s' no %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Dzēšot istabu no kopienas tā tiks dzēsta arī no kopienas lapas.",
+    "Failed to remove room from community": "Neizdevās dzēst istabu no kopienas",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Neizdevās dzēst '%(roomName)s' no %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Istabas '%(roomName)s' redzamību %(groupId)s nebija iespējams atjaunot.",
+    "Visibility in Room List": "Redzamība istabu sarakstā",
+    "Visible to everyone": "Redzama visiem",
+    "Only visible to community members": "Tikai komūnas dalībniekiem",
+    "Filter community rooms": "Kopienas istabu filtrs",
+    "Something went wrong when trying to get your communities.": "Kaut kas nogāja greizi, kad tika mēģināts attēlot Tavas kopienas.",
+    "Display your community flair in rooms configured to show it.": "Parādīt Tavas gaidas istabās, kurās to parādīšana iespējota.",
+    "You're not currently a member of any communities.": "Pašreiz Tu neesi neesi nevienas komūnas piederīgais.",
+    "Delete Widget": "Dzēst vidžetu",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Vidžeta dzēšana to dzēš visiem šīs istabas lietotājiem. Vai tiešām vēlies dzēst šo vidžetu?",
+    "Minimize apps": "Minimizēt lietotājprogrammas",
+    "Communities": "Kopienas",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)spievienojās %(count)s reizes",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)spievienojās",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)spievienojās %(count)s reizes",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s pievienojās",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s izgāja %(count)s reizes",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s izgāja (atvienojās)",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s izgāja (atvienojās) %(count)s reizes",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s izgāja",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s pievienojās un izgāja %(count)s reizes",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s pievienojās un izgāja",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s pievienojās un izgāja %(count)s reizes",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s pievienojās un izgāja",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s izgāja un atkalpievienojās %(count)s reizes",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s noraidīja uzaicinājumus %(count)s reizes",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s atsauca izsniegtos uzaicinājumus %(count)s reizes",
+    "were banned %(count)s times|other": "tika bloķēti (liegta piekļuve) %(count)s reizes",
+    "was banned %(count)s times|other": "tika bloķēts (liegta piekļuve) %(count)s reizes",
+    "were unbanned %(count)s times|other": "tika atbloķēti (atgriezta pieeja) %(count)s reizes",
+    "were kicked %(count)s times|other": "tika padzīti %(count)s reizes",
+    "collapse": "sakļaut",
+    "expand": "izvērst",
+    "Custom of %(powerLevel)s": "Lietotāja līmenis %(powerLevel)s",
+    "<a>In reply to</a> <pill>": "<a>Atbildē uz</a> <pill>",
+    "And %(count)s more...|other": "Un par %(count)s vairāk...",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "Matrix istabas ID",
+    "email address": "e-pasta adrese",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Mēģiniet izmantot vienu no sekojošiem pieļautajiem adrešu tipiem: %(validTypesList)s.",
+    "You have entered an invalid address.": "Ievadīta nederīga adrese.",
+    "Community IDs cannot not be empty.": "Kopienas IDs nevar būt tukšs.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Kopienas IDs var saturēt tikai simbolus a-z, 0-9, or '=_-./'",
+    "Something went wrong whilst creating your community": "Radot Tavu kopienu kaut kas nogāja greizi",
+    "Create Community": "Radīt kopienu",
+    "Community Name": "Kopienas nosaukums",
+    "Community ID": "Kopienas ID",
+    "example": "piemērs"
 }

From 97ce84c8e36eaf20c0306242a4700c03e9419ef6 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sun, 11 Feb 2018 16:14:17 +1300
Subject: [PATCH 496/927] Add display name to the read receipt view

Show the user's display name (aka nick) in the ReadReceiptMarker
title (mouseover text), and then the user ID in parentheses.
---
 src/components/views/rooms/ReadReceiptMarker.js | 6 ++++--
 src/i18n/strings/en_EN.json                     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 5dd62ff6b7..d5436efc76 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -186,8 +186,10 @@ module.exports = React.createClass({
         let title;
         if (this.props.timestamp) {
             title = _t(
-                "Seen by %(userName)s at %(dateTime)s",
-                {userName: this.props.member.userId, dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
+                "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
+                {displayName: this.props.member.name,
+                 userName: this.props.member.userId,
+                 dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
             );
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6139ac2a91..2be4bf2e48 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -360,7 +360,7 @@
     "Offline": "Offline",
     "Unknown": "Unknown",
     "Replying": "Replying",
-    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
     "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",
     "World readable": "World readable",

From 0fd9b3e9b2d89965bb3966839d8f55700e17e7b9 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sun, 11 Feb 2018 16:27:07 +1300
Subject: [PATCH 497/927] Avoid doubling up username in read receipt view

In the ReadReceiptMarker title, use the RoomMember.rawDisplayName because
RoomMember.name may already include the username, which we are going to add
ourselves.
---
 src/components/views/rooms/ReadReceiptMarker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index d5436efc76..8dc3c0f7d0 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -187,7 +187,7 @@ module.exports = React.createClass({
         if (this.props.timestamp) {
             title = _t(
                 "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
-                {displayName: this.props.member.name,
+                {displayName: this.props.member.rawDisplayName,
                  userName: this.props.member.userId,
                  dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
             );

From 0f5dc5a7e4fa9eff05d59732389085e504225d67 Mon Sep 17 00:00:00 2001
From: Oskars <oskars@lanet.lv>
Date: Mon, 12 Feb 2018 00:54:12 +0000
Subject: [PATCH 498/927] Translated using Weblate (Latvian)

Currently translated at 96.5% (952 of 986 strings)

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

diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 50416f0318..b888050e29 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -4,19 +4,19 @@
     "%(targetName)s accepted an invitation.": "%(targetName)s apstiprināja uzaicinājumu.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s apstiprināja uzaicinājumu no %(displayName)s.",
     "Account": "Konts",
-    "Access Token:": "Pieejas atslēga:",
+    "Access Token:": "Pieejas tokens:",
     "Active call (%(roomName)s)": "Aktīvs zvans (%(roomName)s)",
     "Add": "Pievienot",
     "Add a topic": "Pievieno tematu",
-    "Add email address": "Pievieno Epasta adresi",
+    "Add email address": "Pievieno epasta adresi",
     "Add phone number": "Pievieno tālruņa numuru",
     "Admin": "Administrators",
     "Admin Tools": "Administratora rīki",
     "VoIP": "VoIP",
-    "Missing Media Permissions, click here to request.": "Nav pieejas medija saturam. Klikšķini šeit, lai pieprasītu.",
-    "No Microphones detected": "Mikrofoni nav atrasti",
-    "No Webcams detected": "Webkameras nav atrastas",
-    "No media permissions": "Nav pieejas mediju saturam",
+    "Missing Media Permissions, click here to request.": "Nav atļauju piekļūt ierīcei. Klikšķini šeit, lai tās pieprasītu.",
+    "No Microphones detected": "Nav mikrofonu",
+    "No Webcams detected": "Nav webkameru",
+    "No media permissions": "Nav datu nesēju, kuriem atļauta piekļuve",
     "You may need to manually permit Riot to access your microphone/webcam": "Tev varētu būt nepieciešams manuāli atļaut Riot pieslēgties tavam mikrofonam/webkamerai",
     "Default Device": "Noklusējuma ierīce",
     "Microphone": "Mikrofons",
@@ -44,14 +44,14 @@
     "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
     "Ban": "Liegt pieeju (Bans)",
     "Banned users": "Lietotāji, kuriem ir liegta pieeja (banotie)",
-    "Bans user with given id": "Liedz pieeju lietotājam pēc uzdotā ID (Bans)",
+    "Bans user with given id": "Bloķē (liedz pieeju) lietotāju pēc uzdotā ID (nobano)",
     "Blacklisted": "Melnajā sarakstā iekļautie",
     "Bug Report": "Paziņojums par kļūdu",
-    "Bulk Options": "Lielapjoma darbības",
+    "Bulk Options": "Grupveida darbību parametri",
     "Call Timeout": "Zvana gaidīšanas noilgums",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Neizdevās savienoties ar serveri. Lūdzu pārbaudi savu tīkla savienējumu un pārliecinies, ka tava  <a>servera SSL sertifikāts</a> ir uzticams, kā arī pārlūkā instalētie paplašinājumi nebloķē pieprasījumus.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdevās savienoties ar serveri izmantojot HTTP protokolu, kad tava pārlūka adreses laukā ir HTTPS saite. Tā vietā izmanto HTTPS savienojumu vai <a>iespējo nedrošos skriptus</a>.",
-    "Can't load user settings": "Neizdevās ielādēt lietotāja uzstādījumus",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Neizdodas savienoties ar bāzes serveri. Pārbaudi tīkla savienojumu un pārliecinies, ka <a> bāzes servera SSL sertifikāts</a> ir uzticams, kā arī pārlūkā instalētie paplašinājumi nebloķē pieprasījumus.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdodas savienoties ar bāzes serveri izmantojot HTTP protokolu, kad Tava pārlūka adreses laukā norādīts HTTPS protokols. Tā vietā izmanto HTTPS vai <a>iespējo nedrošos skriptus</a>.",
+    "Can't load user settings": "Neizdevās ielādēt lietotāja iestatījumus",
     "Change Password": "Paroles maiņa",
     "%(senderName)s changed their profile picture.": "%(senderName)s nomainīja profila attēlu.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s nomainīja statusa līmeni %(powerLevelDiffText)s.",
@@ -59,18 +59,18 @@
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s dzēsa istabas nosaukumu.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s nomainīja tēmas nosaukumu uz \"%(topic)s\".",
     "Changes to who can read history will only apply to future messages in this room": "Izmaiņas attiecībā uz to, kurš varēs lasīt vēstures ziņas, stāsies spēkā tikai uz ziņām,kuras vēl tiks pievienotas šajā istabā",
-    "Changes your display nickname": "Nomaina tavu publisko segvārdu (niku)",
+    "Changes your display nickname": "Nomaina Tavu publisko segvārdu (niku)",
     "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.": "Paroles maiņa dzēsīs pašreizējās šifrēšanas atslēgas visās savstarpēji saistītajās ierīcēs, padarot čata vēsturi neizlasāmu, ja vien vien istabas atslēgas nav tikušas iepriekš eksportētas un no jauna importētas atpakaļ. Nākotnē to plānojam uzlabot.",
-    "Claimed Ed25519 fingerprint key": "Norādīta Ed25519 identificējošās zīmju virknes atslēga",
+    "Claimed Ed25519 fingerprint key": "Ed25519 pieprasītā nospieduma (fingerprint) atslēga",
     "Clear Cache and Reload": "Iztīri kešatmiņu un pārlādē",
     "Clear Cache": "Iztīri kešatmiņu",
     "<a>Click here</a> to join the discussion!": "<a>Klikšķini šeit</a> lai pievienotos diskusijai!",
     "Click here to fix": "Klikšķini šeit, lai izlabotu",
-    "Click to mute audio": "Klikšķini, lai izslēgtu skaņu",
-    "Click to mute video": "Klikšķini, lai izslēgtu video skaņu",
-    "click to reveal": "Klikšķini, lai atvērtu",
-    "Click to unmute video": "Klikšķini, lai ieslēgtu video skaņu",
-    "Click to unmute audio": "Klikšķini, lai ieslēgtu audio skaņu",
+    "Click to mute audio": "Klikšķini, lai audio skaņu izslēgtu",
+    "Click to mute video": "Klikšķini, lai video skaņu izslēgtu",
+    "click to reveal": "Klikšķini, lai atsegtu",
+    "Click to unmute video": "Klikšķini, lai video skaņu ieslēgtu",
+    "Click to unmute audio": "Klikšķini, lai audio skaņu ieslēgtu",
     "Close": "Aizvērt",
     "Command error": "Komandas kļūda",
     "Commands": "Komandas",
@@ -93,13 +93,13 @@
     "Custom": "Pielāgots",
     "Custom level": "Īpašais līmenis",
     "/ddg is not a command": "/ddg nav komanda",
-    "Deactivate Account": "Deaktivizēt kontu",
-    "Deactivate my account": "Deaktivizēt manu kontu",
+    "Deactivate Account": "Deaktivēt kontu",
+    "Deactivate my account": "Deaktivēt manu kontu",
     "Decline": "Noraidīt",
     "Decrypt %(text)s": "Atšifrēt %(text)s",
     "Decryption error": "Atšifrēšanas kļūda",
     "Delete": "Dzēst",
-    "Deops user with given id": "Noņemt operatora statusu lietotājam ar norādīto id",
+    "Deops user with given id": "Atceļ operatora statusu lietotājam ar norādīto ID",
     "Default": "Noklusējuma",
     "Device already verified!": "Ierīce ir jau verificēta!",
     "Device ID": "Ierīces ID",
@@ -111,13 +111,13 @@
     "Direct chats": "Tiešie čati",
     "Disable Notifications": "Atslēgt paziņojumus",
     "Disinvite": "Atsaukt",
-    "Display name": "Redzamais vārds",
+    "Display name": "Attēlojamais vārds",
     "Displays action": "Parāda darbību",
     "Don't send typing notifications": "Nesūtīt paziņojumus",
     "Download %(text)s": "Lejupielādēt tekstu: %(text)s",
     "Drop File Here": "Ievelc failu šeit",
     "Drop here to tag %(section)s": "Nomest šeit, lai birkotu %(section)s",
-    "Ed25519 fingerprint": "Ed25519 identificējošā zīmju virkne",
+    "Ed25519 fingerprint": "Ed25519 nospiedums (fingerprint), zīmju virkne",
     "Email": "Epasts",
     "Email address": "Epasta adrese",
     "Email address (optional)": "Epasta adrese (neobligāta)",
@@ -138,7 +138,7 @@
     "Enter passphrase": "Ievadi paroles frāzi",
     "Error": "Kļūda",
     "Error decrypting attachment": "Kļūda atšifrējot pielikumu",
-    "Error: Problem communicating with the given homeserver.": "Kļūda: Radās komunikācijas problēma ar norādīto serveri.",
+    "Error: Problem communicating with the given homeserver.": "Kļūda: Saziņas problēma ar norādīto bāzes serveri.",
     "Event information": "Notikuma informācija",
     "Existing Call": "Pašreizējā saruna (zvans)",
     "Export": "Eksportēt",
@@ -166,7 +166,7 @@
     "Failed to set up conference call": "Neizdevās iestatīt konferences zvanu",
     "Failed to toggle moderator status": "Neizdevās pārslēgt moderatora statusu",
     "Failed to unban": "Neizdevās atcelt pieejas liegumu (atbanot)",
-    "Failed to upload file": "Neizdevās augšuplādēt failu",
+    "Failed to upload file": "Neizdevās augšupielādēt failu",
     "Failed to upload profile picture!": "Neizdevās augšuplādēt profila attēlu!",
     "Failed to verify email address: make sure you clicked the link in the email": "Neizdevās apstiprināt epasta adresi. Pārbaudi, vai Tu esi noklikšķinājis/usi saiti epasta ziņā",
     "Failure to create room": "Neizdevās izveidot istabu",
@@ -180,14 +180,14 @@
     "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.": "Drošības nolūkos, izrakstīšanās dzēsīs jebkādas ierīce-ierīce šifrēšanas atslēgas no šī pārlūka. Ja Tu vēlies  saglabāt iespēju atšifrēt tavu saziņas vēsturi no Riot nākotnes sesijām, lūdzu eksportē tavas istabas atslēgas, saglabājot tās drošā vietā.",
     "Found a bug?": "Pamanīji kļūdu?",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
-    "Guest access is disabled on this Home Server.": "Šajā serverī viesu pierakstīšanās nav iespējama.",
+    "Guest access is disabled on this Home Server.": "Šajā bāzes serverī viesu pierakstīšanās nav iespējama.",
     "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai pat ja ir uzaicināti.",
     "Hangup": "Aizturēt",
     "Hide read receipts": "Slēpt izlasītās receptes",
     "Hide Text Formatting Toolbar": "Slēpt teksta formatēšanas rīkjoslu",
     "Historical": "Vēsturiskais",
     "Home": "Mājup",
-    "Homeserver is": "Serveris ir",
+    "Homeserver is": "Bāzes serveris ir",
     "Identity Server is": "Indentifikācijas serveris ir",
     "I have verified my email address": "Mana epasta adrese ir verificēta",
     "Import": "Importēt",
@@ -214,11 +214,11 @@
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>balss</voiceText> vai <videoText>video</videoText>.",
     "Join Room": "Pievienoties istabai",
     "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
-    "Joins room with given alias": "Pievieno istabai ar uzdoto aizstājējvārdu",
+    "Joins room with given alias": "Pievienojas istabai ar minēto aliasi (pseidonīmu)",
     "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s iespēra (kick) %(targetName)s.",
     "Kick": "Iespert (kick)",
-    "Kicks user with given id": "Iesper (kick) lietotājam pēc norādītā id",
+    "Kicks user with given id": "Padzen (kick) lietotāju ar norādīto ID",
     "Labs": "Laboratorija",
     "Last seen": "Pēdējo reizi redzēts/a",
     "Leave room": "Pamest istabu",
@@ -226,7 +226,7 @@
     "Level:": "Līmenis:",
     "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logged in as:": "Pierakstījās kā:",
-    "Login as guest": "Pierakstīties kā viesis",
+    "Login as guest": "Pierakstīties kā viesim",
     "Logout": "Izrakstīties",
     "Low priority": "Zema prioritāte",
     "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uzstādīja nākotnes istabas ziņu vēsturi redzamu visi istabas biedri secībā, kādā tika uzaicināti.",
@@ -257,7 +257,7 @@
     "New password": "Jauna parole",
     "New passwords don't match": "Jaunās paroles nesakrīt",
     "New passwords must match each other.": "Jaunajām parolēm ir jāsakrīt vienai ar otru.",
-    "none": "nekāds",
+    "none": "neviens",
     "not set": "nav iestatījuma",
     "not specified": "nav noteikts",
     "Notifications": "Paziņojumi",
@@ -292,7 +292,7 @@
     "Reason": "Iemesls",
     "Reason: %(reasonText)s": "Iemesls: %(reasonText)s",
     "Revoke Moderator": "Atcelt moderatoru",
-    "Refer a friend to Riot:": "Nosūtīt draugu uz Riot:",
+    "Refer a friend to Riot:": "Rekomendēt draugam Riot:",
     "Register": "Reģistrēties",
     "%(targetName)s rejected the invitation.": "%(targetName)s noraidīja uzaicinājumu.",
     "Reject invitation": "Noraidīt uzaicinājumu",
@@ -370,14 +370,14 @@
     "Scroll to unread messages": "Aizritināt uz nelasītajām ziņām",
     "Search": "Meklēt",
     "Search failed": "Meklēšana neizdevās",
-    "Searches DuckDuckGo for results": "Meklē DuckDuckGo rezultātus",
+    "Searches DuckDuckGo for results": "Meklēšanai izmanto DuckDuckGo",
     "Send anyway": "Nosūtīt jebkurā gadījumā",
     "Sender device information": "Nosūtītāja ierīces informācija",
     "Send Invites": "Nosūtīt uzaicinājumus",
     "Send Reset Email": "Nosūtīt atiestatīšanas epastu",
     "Server error": "Servera kļūda",
     "Server may be unavailable or overloaded": "Serveris var nebūt pieejams vai ir pārslogots",
-    "Server may be unavailable, overloaded, or search timed out :(": "Serveris var nebūt pieejams, ir pārslogots, vai arī meklēšana beidzās ar savienojuma noilgumu :(",
+    "Server may be unavailable, overloaded, or search timed out :(": "Serveris izskatās nepieejams, ir pārslogots, vai arī meklēšana beidzās ar savienojuma noildzi :(",
     "Server may be unavailable, overloaded, or the file too big": "Serveris var nebūt pieejams, ir pārslogots, vai arī faila izmērs ir par lielu",
     "Server may be unavailable, overloaded, or you hit a bug.": "Serveris var nebūt pieejams, ir pārslogots, vai arī sastapi neparedzētu kļūdu.",
     "Server unavailable, overloaded, or something else went wrong.": "Serveris nav pieejams, ir pārslogots, vai arī ir notikusi cita, neparedzēta, kļūda.",
@@ -395,19 +395,19 @@
     "Start authentication": "Sākt autentifikāciju",
     "Start Chat": "Sākt čatu",
     "Submit": "Iesniegt",
-    "Success": "Veiksmīgi",
+    "Success": "Izdevās",
     "Tagged as: ": "Atzīmēts,kā: ",
     "The main address for this room is": "Galvenā šīs istabas adrese ir",
     "The phone number entered looks invalid": "Ievadītais telefona numurs izskatās nepareizs",
     "This email address is already in use": "Šī epasta adrese jau tiek izmantota",
     "This email address was not found": "Šāda epasta adrese nav atrasta",
-    "The email address linked to your account must be entered.": "Ir jāievada tavam kontam piesaistītā epasta adrese.",
+    "The email address linked to your account must be entered.": "Ir jāievada Tavam kontam piesaistītā epasta adrese.",
     "The remote side failed to pick up": "Zvana adresāts  neatbild",
-    "This Home Server does not support login using email address.": "Šis serveris neatbalsta pierakstīšanos ar epasta adresi.",
+    "This Home Server does not support login using email address.": "Šis bāzes serveris neatbalsta pierakstīšanos ar epasta adresi.",
     "This invitation was sent to an email address which is not associated with this account:": "Šis uzaicinājums tika nosūtīts uz epasta adresi, kura nav piesaistīta šim kontam:",
     "This room has no local addresses": "Šai istabai nav lokālo adrešu",
     "This room is not recognised.": "Šī istaba netika atpazīta.",
-    "These are experimental features that may break in unexpected ways": "Šīs ir eksperimentālās iespējas, kuras var būt dažādos veidos nestrādājošas",
+    "These are experimental features that may break in unexpected ways": "Šīs ir eksperimentālas funkcijas, kuras reizēm var novest pie negaidītiem rezultātiem",
     "The visibility of existing history will be unchanged": "Esošās ziņu vēstures redzamība paliks nemainīga",
     "This doesn't appear to be a valid email address": "Šī neizskatās pēc derīgas epasta adreses",
     "This is a preview of this room. Room interactions have been disabled": "Šis ir esošās istabas priekšskatījums. Istabas mijiedarbība ir atspējota",
@@ -416,10 +416,10 @@
     "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no attālinātajiem Matrix serveriem",
     "This room's internal ID is": "Šīs istabas iekšējais ID ir",
     "To link to a room it must have <a>an address</a>.": "Lai ieliktu saiti uz istabu, tai ir jābūt piešķirtai <a>adresei</a>.",
-    "To reset your password, enter the email address linked to your account": "Lai atiestatītu savu paroli, ievadi tavam kontam piesaistīto epasta adresi",
+    "To reset your password, enter the email address linked to your account": "Lai atiestatītu savu paroli, ievadi savam kontam piesaistīto epasta adresi",
     "To use it, just wait for autocomplete results to load and tab through them.": "Lai to izmantotu, vienkārši gaidi, kamēr ielādējas automātiski ieteiktie rezultāti, un pārvietojies caur tiem.",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Notika mēģinājums ielādēt šīs istabas specifisku laikpaziņojumu sadaļu, bet Tev nav atļaujas skatīt šo ziņu.",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Notika mēģinājums ielādēt šīs istabas specifisku laikpaziņojumu sadaļu, bet tā netika atrasta.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Mēģinājums ielādēt šīs istabas čata vēstures izvēlēto posmu neizdevās, jo tas netika atrasts.",
     "Unable to add email address": "Nav iespējams pievienot epasta adresi",
     "Unable to remove contact information": "Nav iespējams dzēst kontaktinformāciju",
     "Unable to verify email address.": "Nav iespējams apstiprināt epasta adresi.",
@@ -518,10 +518,10 @@
     "Oct": "Okt.",
     "Nov": "Nov.",
     "Dec": "Dec.",
-    "Set a display name:": "Iestatīt redzamo vārdu:",
+    "Set a display name:": "Iestatīt attēloto vārdu:",
     "This image cannot be displayed.": "Šo attēlu nav iespējams parādīt.",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s nomainīja istabas attēlu uz <img/>",
-    "Upload an avatar:": "Augšuplādē profila attēlu:",
+    "Upload an avatar:": "Augšuplādē avataru (profila attēlu):",
     "This server does not support authentication with a phone number.": "Šis serveris neatbalsta autentifikāciju pēc telefona numura.",
     "Missing password.": "Trūkst parole.",
     "Passwords don't match.": "Paroles nesakrīt.",
@@ -530,14 +530,14 @@
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Lietotājvārdi drīkst saturēt vienīgi alfabēta burtus, skaitļus, punktus, defises un apakšsvītras.",
     "An unknown error occurred.": "Notikusi neparedzēta kļūda.",
     "I already have an account": "Man jau ir konts",
-    "Topic": "Tēma",
+    "Topic": "Temats",
     "Make Moderator": "Piešķirt moderatora statusu",
     "Make this room private": "Padarīt šo istabu privātu",
     "Share message history with new users": "Kopīgot ziņu vēsturi ar jauniem lietotājiem",
     "Encrypt room": "Šifrēt istabu",
     "There are no visible files in this room": "Nav redzamu failu šajā istabā",
     "Room": "Istaba",
-    "Connectivity to the server has been lost.": "Savienojums ar serveri tika zaudēts.",
+    "Connectivity to the server has been lost.": "Savienojums ar serveri pārtrūka.",
     "Sent messages will be stored until your connection has returned.": "Nosūtītās ziņas tiks saglabātas tiklīdz savienojums tiks atjaunots.",
     "Active call": "Aktīvs zvans",
     "bold": "trekns",
@@ -552,8 +552,8 @@
     "Room directory": "Istabu katalogs",
     "Start chat": "Uzsākt čalošanu",
     "New Password": "Jauna parole",
-    "Start automatically after system login": "Uzsākt automātiski pēc pierakstīšanās sistēmā",
-    "Desktop specific": "Darbvirsmai specifiski",
+    "Start automatically after system login": "Palaist programmu automātiski pie sistēmas ielādes",
+    "Desktop specific": "Darbvirsmai specifiskie",
     "Analytics": "Analītika",
     "Opt out of analytics": "Atteikties no analītikas",
     "Options": "Iespējas",
@@ -564,9 +564,9 @@
     "Confirm passphrase": "Apstiprināt paroles frāzi",
     "Import room keys": "Importēt istabas atslēgas",
     "File to import": "Importējamais fails",
-    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Šī darbība atļauj Tev eksportēt lokālā failā atslēgas tām ziņām, kuras Tu saņēmi šifrētās istabās. Pēc tam nākotnē Tu varēsi importēt šo failu citā Matrix klienta aplikācijā, lai tajā būtu iespējams atšifrēt šīs ziņas.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Eksportētais fails atļaus ikvienam, kurš to ir nolasījis, atšifrēt jebkuras tev redzamās šifrētās ziņas, tāpēc ievēro piesardzību, un glabā šo failu drošā vietā. Lai palīdzētu to nodrošināt, Tev ir jāievada paroles frāze, kura tiks izmantota eksportēto datu šifrēšanai. Datu importēšana būs iespējama tikai izmantojot šo pašu paroles frāzi.",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Šis process ļauj Tev importēt tās šifrēšanas atslēgas, kuras Tu iepriekš eksportēji no citas Matrix klienta aplikācijas. Importētās atslēgas ļaus vajadzīgajā klienta aplikācijā lasīt atšifrētās ziņas.",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Šī darbība ļauj Tev uz lokālo failu eksportēt atslēgas priekš tām ziņām, kuras Tu saņēmi šifrētās istabās. Tu varēsi importēt šo failu citā Matrix klientā, lai tajā būtu iespējams lasīt šīs ziņas atšifrētas.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Eksportētais fails ļaus ikvienam, kurš to spēj lasīt, atšifrēt jebkuras Tavas šifrētās ziņas, tāpēc ievēro piesardzību, un glabā šo failu drošā vietā. Lai palīdzētu to nodrošināt, Tev jāievada paroles frāze, kura tiks izmantota eksportēto datu šifrēšanai. Datu importēšana būs iespējama tikai izmantojot šo pašu paroles frāzi.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Šis process ļaus Tev importēt šifrēšanas atslēgas, kuras Tu iepriekš eksportēji no cita Matrix klienta. Tas ļaus Tev atšifrēt čata vēsturi.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Eksporta fails būs aizsargāts ar paroles frāzi. Tā ir jāievada šeit, lai atšifrētu failu.",
     "You must join the room to see its files": "Tev ir jāpievienojas istabai, lai redzētu tās failus",
     "Start new chat": "Uzsākt jaunu čalu",
@@ -586,7 +586,7 @@
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Ja tā sakrīt, tad nospied zemāk esošo verifikācijas pogu . Ja nesakrīt, tad kāds cits ir piekļuvis šai ierīcei un šādā gadījumā Tu, iespējams, vēlies izmantot \"melnais saraksts\" iespēju.",
     "Verify device": "Verificēt ierīci",
     "I verify that the keys match": "Es pārbaudu, vai atslēgas sakrīt",
-    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Mēs sastapāmies ar kļūdu, mēģinot atjaunot tavu iepriekšējo sesiju. Ja vēlies turpināt, tev ir jāpierakstās par jaunu un šifrēta čata ziņu vēsture nebūs izlasāma.",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Atgadījās kļūda, mēģinot atjaunot tavu iepriekšējo sesiju. Ja vēlies turpināt, Tev ir jāpierakstās no jauna, taču šifrētā čata ziņu vēsture nebūs izlasāma.",
     "Unable to restore session": "Nav iespējams atjaunot sesiju",
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ja Tu iepriekš izmantoji jaunāku Riot versiju, tava sesija var nebūt saderīga ar šo versiju. Aizver šo logu un atgriezies jaunākajā versijā.",
     "Continue anyway": "Turpināt jebkurā gadījumā",
@@ -624,8 +624,8 @@
     "Online": "Tiešsaistē (pieslēgumā)",
     "Idle": "Dīkstāve",
     "Offline": "Atsaistē (ārpus tīkla)",
-    "Updates": "Atjauninājumi",
-    "Check for update": "Pārbaudīt, vai ir atjauninājumi",
+    "Updates": "Aktualizācijas",
+    "Check for update": "Pārbaudīt, vai ir aktualizācijas",
     "Start chatting": "Sākt čalošanu",
     "Start Chatting": "Sākt čalošanu",
     "Click on the button below to start chatting!": "Klikšķini uz zemāk esošās pogas, lai uzsāktu čalošanu!",
@@ -651,7 +651,7 @@
     "Cannot add any more widgets": "Nav iespējams pievienot vairāk vidžetu",
     "Changes colour scheme of current room": "Nomaina pašreizējās istabas krāsu paleti",
     "Delete widget": "Dzēst widžetu",
-    "Define the power level of a user": "Definēt lietotāja pakāpes līmeni",
+    "Define the power level of a user": "Definē lietotāja statusu",
     "Do you want to load widget from URL:": "Vai vēlies ielādēt widžetu no URL:",
     "Edit": "Rediģēt",
     "Enable automatic language detection for syntax highlighting": "Iespējot automātisko valodas noteikšanu sintakses iezīmējumiem",
@@ -662,12 +662,12 @@
     "AM": "AM",
     "PM": "PM",
     "NOTE: Apps are not end-to-end encrypted": "PIEZĪME: Aplikācijās nav ierīce-ierīce šifrēšanas",
-    "Sets the room topic": "Uzstāda istabas tēmas nosaukumu",
+    "Sets the room topic": "Uzstāda istabas tematu",
     "Show Apps": "Rādīt aplikācijas",
     "The maximum permitted number of widgets have already been added to this room.": "Atļautais vidžetu skaits jau ir sasniegts šai istabai.",
     "To get started, please pick a username!": "Lai sāktu, lūdzu izvēlies lietotājvārdu!",
     "Unable to create widget.": "Nav iespējams izveidot widžetu.",
-    "Unbans user with given id": "Atceļ pieejas liegumu (atbano) lietotāju pēc norādītā id",
+    "Unbans user with given id": "Atbloķē (atceļ pieejas liegumu) lietotāju pēc norādītā ID (atbano)",
     "You are not in this room.": "Tu neatrodies šajā istabā.",
     "You do not have permission to do that in this room.": "Tev nav atļaujas šai darbībai šajā istabā.",
     "Verifies a user, device, and pubkey tuple": "Verificē lietotāju, ierīci, un publiskās atslēgas",
@@ -685,11 +685,11 @@
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotu pārbaude šobrīd nav pieejama darbvirsmas versijā. Lūdzu izmanto <a>web pārlūku</a>",
     "Revoke widget access": "Atsaukt vidžeta piekļuvi",
     "Unpin Message": "Atkabināt ziņu",
-    "Add rooms to this community": "Pievienot istabas šai komūnai",
+    "Add rooms to this community": "Pievienot istabas šai kopienai",
     "Failed to set direct chat tag": "Neizdevās tiešajam čatam uzstādīt birku",
     "Warning": "Brīdinājums",
     "Send": "Sūtīt",
-    "Leave": "Pamest",
+    "Leave": "Atstāt",
     "Unnamed room": "Nenosaukta istaba",
     "Guests can join": "Var pievienoties viesi",
     "The platform you're on": "Izmantotā operētājsistēma",
@@ -889,5 +889,66 @@
     "Create Community": "Radīt kopienu",
     "Community Name": "Kopienas nosaukums",
     "Community ID": "Kopienas ID",
-    "example": "piemērs"
+    "example": "piemērs",
+    "Advanced options": "Papildus parametri",
+    "Block users on other matrix homeservers from joining this room": "Neļaut lietotājiem no citiem mājasserveriem pievienoties šai istabai",
+    "This setting cannot be changed later!": "Šo parametru vēlāk izmainīt nebūs iespējams!",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s aizgājuši un atgriezušies",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s aizgājis un atgriezies %(count)s reizes",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s aizgājis un atgriezies",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s nepieņēma uzaicinājumus",
+    "were invited %(count)s times|one": "tika uzaicināti",
+    "was invited %(count)s times|other": "tika uzaicināta %(count)s reizes",
+    "was invited %(count)s times|one": "tika uzaicināts(a)",
+    "were unbanned %(count)s times|one": "tika atbloķēti (atcelts pieejas liegums)",
+    "was unbanned %(count)s times|other": "tika atbloķēts %(count)s reizes",
+    "was banned %(count)s times|one": "tika bloķēts",
+    "were banned %(count)s times|one": "tika bloķēti",
+    "was unbanned %(count)s times|one": "tika atbloķēts",
+    "were kicked %(count)s times|one": "tika padzīti",
+    "was kicked %(count)s times|other": "tika padzīts %(count)s reizes",
+    "was kicked %(count)s times|one": "tika padzīts",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s izmainīja savu lietotājvārdu %(count)s reizes",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s izmainīja savu lietotājvārdu",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>Tavas kopienas lapas HTML</h1>\n<p>\n    Izmanto garāku aprakstu, lai iepazīstinātu jaunos lietoājus ar kopienu, \n    vai padalies ar kādām attiecināmām <a href=\"foo\">web-saitēm</a>\n</p>\n<p>\n    Vari izmantot arī 'img' birkas\n</p>\n",
+    "Add rooms to the community summary": "Pievienot istabas kopienas informatīvajā kopsavilkumā",
+    "Which rooms would you like to add to this summary?": "Kuras istabas vēlaties pievienot šim kopsavilkumam?",
+    "Add to summary": "Pievienot kopsavilkumam",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Neizdevās sekojošās istabas pievienot %(groupId)s kopsavilkumam:",
+    "Add a Room": "Pievienot istabu",
+    "Failed to remove the room from the summary of %(groupId)s": "Neizdevās dzēst istabu no %(groupId)s kopsavilkuma",
+    "The room '%(roomName)s' could not be removed from the summary.": "Istabu '%(roomName)s' neizdevās dzēst no kopsavilkuma.",
+    "Leave Community": "Atstāt kopienu",
+    "Unable to leave room": "Nav iespējams atstāt istabu",
+    "Community Settings": "Kopienas iestatījumi",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Šīs istabas tiek rādītas kopienas dalībniekiem šīs kopienas lapā. Kopienas dalībnieki var pievienoties istabām, uzklikšķinot uz tām.",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Jūsu kopienai nav plašāka HTML-lapas apraksta ko parādīt dalībniekiem.<br />Klikšķini šeit, lai atvērtu iestatījumus un to pievienotu!",
+    "Description": "Apraksts",
+    "Failed to load %(groupId)s": "Neizdevās  ielādēt %(groupId)s",
+    "This Home server does not support communities": "Šis mitināšanas serveris neatbalsta kopienas",
+    "This room is not public. You will not be able to rejoin without an invite.": "Šīs istaba nav publiska. Tu nevari tajā ieiet bez uzaicinājuma.",
+    "Cryptography data migrated": "Sifrēšanas dati tika pārnesti",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Veikta vienreizēja šifrēšanas datu pārnese. Sifrēšana (end-to-end) nedarbosies, ja Tu atgriezīses pie vecākas Riot versijas. Ja nepieciešams izmantot end-to-end šifrēšanu, izmantojot vecāku versija, vispirms izraksties no Riot. Lai saglabātu ziņu vēsturi, eksportē un tad importē savas kripto-atslēgas.",
+    "Old cryptography data detected": "Tika uzieti novecojuši šifrēšanas dati",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Uzieti dati no vecākas Riot versijas. Tas novedīs pie end-to-end šifrēšanas problēmām vecākajā versijā. Šajā versijā nevar tikt atšifrēti ziņojumi, kuri radīti izmantojot vecākajā versijā end-to-end šifrētas ziņas. Tas var arī novest pie ziņapmaiņas, kas veikta ar šo versiju. Ja rodas ķibeles, izraksties un par jaunu pieraksties sistēmā. Lai saglabātu ziņu vēsturi, eksportē un tad importē savas šifrēšanas atslēgas.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Radi kopienu, lai apvienotu lietotājus un istabas. Izveido mājaslapu, lai iezīmētu Matrix visumā savu klātbūtni, vietu un telpu.",
+    "Error whilst fetching joined communities": "Ielādējot kopienas radās kļūda",
+    "%(count)s of your messages have not been sent.|one": "Tava ziņa netika nosūtīta.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Parādīt ierīces</showDevicesText>, <sendAnywayText>vienalga nosūtīt</sendAnywayText> vai <cancelText>sūtīšanu atcelt</cancelText>.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Atkārtoti nosūtīt ziņu</resendText> vai <cancelText>atcelt sūtīšanu</cancelText>.",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Šeit neviena nav. Ja vēlies <inviteText>kādu uzaicināt</inviteText> vai <nowarnText>atslēgt paziņojumu par tukšu istabu</nowarnText>?",
+    "Light theme": "Gaiša tēma",
+    "Dark theme": "Tumša tēma",
+    "Status.im theme": "Status.im tēma",
+    "Ignored Users": "Ignorētie lietotāji",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privātumu augstu respektējam, tādēļ nevācam nekādus personas un identificējamus datus analītikas mērķiem.",
+    "Learn more about how we use analytics.": "Sīkāk par to, kā tiek izmantota analītika.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Epasts ir nosūtīts uz %(emailAddress)s. Izmantojiet epastā nosūtīto tīmekļa saiti un tad noklišķiniet šeit zemāk.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Lūdzu ņem vērā, ka Tu pieraksties %(hs)s serverī, nevis matrix.org serverī.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Šis bāzes serveris neatbalsta nevienu pierakstīšanās metodi, kuru piedāvā šis Riot klients.",
+    "Sign in to get started": "Pierakstīties, lai sāktu",
+    "Ignores a user, hiding their messages from you": "Ignorē lietotāju, Tev nerādot viņa sūtītās ziņas",
+    "Stops ignoring a user, showing their messages going forward": "Atceļ lietotāja ignorēšanu, rādot viņa turpmāk sūtītās ziņas",
+    "Notify the whole room": "Paziņot visai istabai",
+    "Room Notification": "Istabas paziņojums"
 }

From e3f68f12c859e23342b6f7266338d9feb2655f50 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 12 Feb 2018 18:01:08 +0000
Subject: [PATCH 499/927] Add context menu to TagTile

With two options: View Community and Remove, which
removes the tag from the panel.
---
 src/actions/TagOrderActions.js           | 47 ++++++++++++++++++++++++
 src/components/views/elements/TagTile.js | 35 ++++++++++++++++++
 src/i18n/strings/en_EN.json              |  2 +-
 src/stores/TagOrderStore.js              | 20 +++++++++-
 4 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
index dd4df6a9d4..3504adb09b 100644
--- a/src/actions/TagOrderActions.js
+++ b/src/actions/TagOrderActions.js
@@ -56,4 +56,51 @@ TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
     });
 };
 
+/**
+ * Creates an action thunk that will do an asynchronous request to
+ * label a tag as removed in im.vector.web.tag_ordering account data.
+ *
+ * The reason this is implemented with new state `removedTags` is that
+ * we incrementally and initially populate `tags` with groups that
+ * have been joined. If we remove a group from `tags`, it will just
+ * get added (as it looks like a group we've recently joined).
+ *
+ * NB: If we ever support adding of tags (which is planned), we should
+ * take special care to remove the tag from `removedTags` when we add
+ * it.
+ *
+ * @param {MatrixClient} matrixClient the matrix client to set the
+ *                                    account data on.
+ * @param {string} tag the tag to remove.
+ * @returns {function} an action thunk that will dispatch actions
+ *                     indicating the status of the request.
+ * @see asyncAction
+ */
+TagOrderActions.removeTag = function(matrixClient, tag) {
+    // Don't change tags, just removedTags
+    const tags = TagOrderStore.getOrderedTags();
+    const removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
+
+    if (removedTags.includes(tag)) {
+        // Return a thunk that doesn't do anything, we don't even need
+        // an asynchronous action here, the tag is already removed.
+        return () => {};
+    }
+
+    removedTags.push(tag);
+
+    const storeId = TagOrderStore.getStoreId();
+
+    return asyncAction('TagOrderActions.removeTag', () => {
+        Analytics.trackEvent('TagOrderActions', 'removeTag');
+        return matrixClient.setAccountData(
+            'im.vector.web.tag_ordering',
+            {tags, removedTags, _storeId: storeId},
+        );
+    }, () => {
+        // For an optimistic update
+        return {removedTags};
+    });
+};
+
 export default TagOrderActions;
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index f52f758cc0..8d801d986d 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -21,6 +21,7 @@ import { MatrixClient } from 'matrix-js-sdk';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
+import ContextualMenu from '../../structures/ContextualMenu';
 
 import FlairStore from '../../../stores/FlairStore';
 
@@ -81,6 +82,35 @@ export default React.createClass({
         });
     },
 
+    onContextButtonClick: function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+
+        // Hide the (...) immediately
+        this.setState({ hover: false });
+
+        const TagTileContextMenu = sdk.getComponent('context_menus.TagTileContextMenu');
+        const elementRect = e.target.getBoundingClientRect();
+
+        // The window X and Y offsets are to adjust position when zoomed in to page
+        const x = elementRect.right + window.pageXOffset + 3;
+        const chevronOffset = 12;
+        let y = (elementRect.top + (elementRect.height / 2) + window.pageYOffset);
+        y = y - (chevronOffset + 8); // where 8 is half the height of the chevron
+
+        const self = this;
+        ContextualMenu.createMenu(TagTileContextMenu, {
+            chevronOffset: chevronOffset,
+            left: x,
+            top: y,
+            tag: this.props.tag,
+            onFinished: function() {
+                self.setState({ menuDisplayed: false });
+            },
+        });
+        this.setState({ menuDisplayed: true });
+    },
+
     onMouseOver: function() {
         this.setState({hover: true});
     },
@@ -109,10 +139,15 @@ export default React.createClass({
         const tip = this.state.hover ?
             <RoomTooltip className="mx_TagTile_tooltip" label={name} /> :
             <div />;
+        const contextButton = this.state.hover || this.state.menuDisplayed ?
+            <div className="mx_TagTile_context_button" onClick={this.onContextButtonClick}>
+                { "\u00B7\u00B7\u00B7" }
+            </div> : <div />;
         return <AccessibleButton className={className} onClick={this.onClick}>
             <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
                 <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
                 { tip }
+                { contextButton }
             </div>
         </AccessibleButton>;
     },
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6139ac2a91..3cfbe24122 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -500,8 +500,8 @@
     "Download %(text)s": "Download %(text)s",
     "Invalid file%(extra)s": "Invalid file%(extra)s",
     "Error decrypting image": "Error decrypting image",
-    "Image '%(Body)s' cannot be displayed.": "Image '%(Body)s' cannot be displayed.",
     "This image cannot be displayed.": "This image cannot be displayed.",
+    "Image '%(Body)s' cannot be displayed.": "Image '%(Body)s' cannot be displayed.",
     "Error decrypting video": "Error decrypting video",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 69b22797fb..3ec751d075 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -55,6 +55,7 @@ class TagOrderStore extends Store {
                 const tagOrderingEventContent = tagOrderingEvent ? tagOrderingEvent.getContent() : {};
                 this._setState({
                     orderedTagsAccountData: tagOrderingEventContent.tags || null,
+                    removedTagsAccountData: tagOrderingEventContent.removedTags || null,
                     hasSynced: true,
                 });
                 this._updateOrderedTags();
@@ -70,6 +71,7 @@ class TagOrderStore extends Store {
 
                 this._setState({
                     orderedTagsAccountData: payload.event_content ? payload.event_content.tags : null,
+                    removedTagsAccountData: payload.event_content ? payload.event_content.removedTags : null,
                 });
                 this._updateOrderedTags();
                 break;
@@ -90,6 +92,14 @@ class TagOrderStore extends Store {
                 });
                 break;
             }
+            case 'TagOrderActions.removeTag.pending': {
+                // Optimistic update of a removed tag
+                this._setState({
+                    removedTagsAccountData: payload.request.removedTags,
+                });
+                this._updateOrderedTags();
+                break;
+            }
             case 'select_tag': {
                 let newTags = [];
                 // Shift-click semantics
@@ -165,13 +175,15 @@ class TagOrderStore extends Store {
     _mergeGroupsAndTags() {
         const groupIds = this._state.joinedGroupIds || [];
         const tags = this._state.orderedTagsAccountData || [];
+        const removedTags = this._state.removedTagsAccountData || [];
+
 
         const tagsToKeep = tags.filter(
-            (t) => t[0] !== '+' || groupIds.includes(t),
+            (t) => (t[0] !== '+' || groupIds.includes(t)) && !removedTags.includes(t),
         );
 
         const groupIdsToAdd = groupIds.filter(
-            (groupId) => !tags.includes(groupId),
+            (groupId) => !tags.includes(groupId) && !removedTags.includes(groupId),
         );
 
         return tagsToKeep.concat(groupIdsToAdd);
@@ -181,6 +193,10 @@ class TagOrderStore extends Store {
         return this._state.orderedTags;
     }
 
+    getRemovedTagsAccountData() {
+        return this._state.removedTagsAccountData;
+    }
+
     getStoreId() {
         // Generate a random ID to prevent this store from clobbering its
         // state with redundant remote echos.

From 7a4c1994c327e4616a801c0a5d4aa1495fbdbb67 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 12 Feb 2018 18:35:13 +0000
Subject: [PATCH 500/927] Use Boolean() instead of assuming filter is based on
 truthiness

---
 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 269f04c963..4a491c8a03 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -371,7 +371,7 @@ module.exports = React.createClass({
                     return;
                 }
 
-                return isRoomVisible[taggedRoom.roomId];
+                return Boolean(isRoomVisible[taggedRoom.roomId]);
             });
         });
 

From 3eeef064bf5e7abaca367f2c62dce174d9707644 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 12 Feb 2018 18:37:54 +0000
Subject: [PATCH 501/927] Remove unused asyncId

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

diff --git a/src/actions/actionCreators.js b/src/actions/actionCreators.js
index 697930414c..967ce609e7 100644
--- a/src/actions/actionCreators.js
+++ b/src/actions/actionCreators.js
@@ -33,28 +33,25 @@ limitations under the License.
  *                         `${id}.failure`.
  *
  *                     The shape of each are:
- *                     { action: '${id}.pending', request, asyncId }
- *                     { action: '${id}.success', result, asyncId }
- *                     { action: '${id}.failure', err, asyncId }
+ *                     { action: '${id}.pending', request }
+ *                     { action: '${id}.success', result }
+ *                     { action: '${id}.failure', err }
  *
- *                     where `request` is returned by `pendingFn`, result
- *                     is the result of the promise returned by `fn` and
- *                     `asyncId` is a unique ID for each dispatch of the
- *                     asynchronous action.
+ *                     where `request` is returned by `pendingFn` and
+ *                     result is the result of the promise returned by
+ *                     `fn`.
  */
 export function asyncAction(id, fn, pendingFn) {
     return (dispatch) => {
-        const asyncId = Math.random().toString(16).slice(2, 10);
         dispatch({
             action: id + '.pending',
             request:
                 typeof pendingFn === 'function' ? pendingFn() : undefined,
-            asyncId,
         });
         fn().then((result) => {
-            dispatch({action: id + '.success', result, asyncId});
+            dispatch({action: id + '.success', result});
         }).catch((err) => {
-            dispatch({action: id + '.failure', err, asyncId});
+            dispatch({action: id + '.failure', err});
         });
     };
 }

From 322012cf889c00fe5b2bc790a01c52e6ca1e689e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 12 Feb 2018 18:46:36 +0000
Subject: [PATCH 502/927] Add comment to explain hacky optimism

---
 src/stores/RoomListStore.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 193784811c..b71e1c5cc1 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -79,6 +79,11 @@ class RoomListStore extends Store {
             }
             break;
             case 'RoomListActions.tagRoom.pending': {
+                // XXX: we only show one optimistic update at any one time.
+                // Ideally we should be making a list of in-flight requests
+                // that are backed by transaction IDs. Until the js-sdk
+                // supports this, we're stuck with only being able to use
+                // the most recent optimistic update.
                 this._generateRoomLists(payload.request);
             }
             break;

From 5e9368e794eac546569d93ae2738bd24566cdc74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Mon, 12 Feb 2018 21:13:53 +0100
Subject: [PATCH 503/927] Add comments explaining our non standard usage of
 aria-described-by

---
 src/components/views/dialogs/BaseDialog.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/components/views/dialogs/BaseDialog.js b/src/components/views/dialogs/BaseDialog.js
index 08fd972621..053aef66c3 100644
--- a/src/components/views/dialogs/BaseDialog.js
+++ b/src/components/views/dialogs/BaseDialog.js
@@ -76,6 +76,12 @@ export default React.createClass({
                 className={this.props.className}
                 role="dialog"
                 aria-labelledby='mx_BaseDialog_title'
+                // This should point to a node describing the dialog.
+                // If we were about to completelly follow this recommendation we'd need to
+                // make all the components relying on BaseDialog to be aware of it.
+                // So instead we will use the whole content as the description.
+                // Description comes first and if the content contains more text,
+                // AT users can skip its presentation.
                 aria-describedby={this.props.contentId}
             >
                 <AccessibleButton onClick={this._onCancelClick}

From 6d3634a06c3b0a8789200c89c19feec8630f90ba Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 09:44:00 +0000
Subject: [PATCH 504/927] Move groups button to TagPanel

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 49a7a4020a..f10936e802 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -111,8 +111,7 @@ const TagPanel = React.createClass({
     },
 
     render() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
-        const TintableSvg = sdk.getComponent('elements.TintableSvg');
+        const GroupsButton = sdk.getComponent('elements.GroupsButton');
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
 
         const tags = this.state.orderedTags.map((tag, index) => {
@@ -142,9 +141,9 @@ const TagPanel = React.createClass({
                     ) }
                 </Droppable>
             </DragDropContext>
-            <AccessibleButton className="mx_TagPanel_createGroupButton" onClick={this.onCreateGroupClick}>
-                <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
-            </AccessibleButton>
+            <div className="mx_TagPanel_createGroupButton">
+                <GroupsButton tooltip={true} />
+            </div>
         </div>;
     },
 });

From 493116b17e57d56036a896ef60ab9886ebb97112 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 11:43:22 +0000
Subject: [PATCH 505/927] Give the login page its spinner back

---
 src/components/structures/login/Login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 5042ca1fd0..7f4aa0325a 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -431,10 +431,10 @@ module.exports = React.createClass({
         // FIXME: remove status.im theme tweaks
         const theme = SettingsStore.getValue("theme");
         if (theme !== "status") {
-            header = <h2>{ _t('Sign in') }</h2>;
+            header = <h2>{ _t('Sign in') } { loader }</h2>;
         } else {
             if (!this.state.errorText) {
-                header = <h2>{ _t('Sign in to get started') }</h2>;
+                header = <h2>{ _t('Sign in to get started') } { loader }</h2>;
             }
         }
 

From 8377abcd1987a34cecbb3b363f807731f5dd861e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 11:49:59 +0000
Subject: [PATCH 506/927] Store component state for editors

to prevent a forceUpdate from /sync causing the editors to revert
before the user had a chance to hit "Save".

Part of fixing https://github.com/vector-im/riot-web/issues/6019
---
 src/components/views/rooms/RoomNameEditor.js  | 21 ++++++++++++++---
 src/components/views/rooms/RoomTopicEditor.js | 23 +++++++++++++++----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/components/views/rooms/RoomNameEditor.js b/src/components/views/rooms/RoomNameEditor.js
index 5c224d79c0..d073a0be25 100644
--- a/src/components/views/rooms/RoomNameEditor.js
+++ b/src/components/views/rooms/RoomNameEditor.js
@@ -29,13 +29,21 @@ module.exports = React.createClass({
         room: PropTypes.object.isRequired,
     },
 
+    getInitialState: function() {
+        return {
+            name: null,
+        };
+    },
+
     componentWillMount: function() {
         const room = this.props.room;
         const name = room.currentState.getStateEvents('m.room.name', '');
         const myId = MatrixClientPeg.get().credentials.userId;
         const defaultName = room.getDefaultRoomName(myId);
 
-        this._initialName = name ? name.getContent().name : '';
+        this.setState({
+            name: name ? name.getContent().name : '',
+        });
 
         this._placeholderName = _t("Unnamed Room");
         if (defaultName && defaultName !== 'Empty room') { // default name from JS SDK, needs no translation as we don't ever show it.
@@ -44,7 +52,13 @@ module.exports = React.createClass({
     },
 
     getRoomName: function() {
-        return this.refs.editor.getValue();
+        return this.state.name;
+    },
+
+    _onValueChanged: function(value, shouldSubmit) {
+        this.setState({
+            name: value,
+        });
     },
 
     render: function() {
@@ -57,7 +71,8 @@ module.exports = React.createClass({
                          placeholderClassName="mx_RoomHeader_placeholder"
                          placeholder={this._placeholderName}
                          blurToCancel={false}
-                         initialValue={this._initialName}
+                         initialValue={this.state.name}
+                         onValueChanged={this._onValueChanged}
                          dir="auto" />
                 </div>
         );
diff --git a/src/components/views/rooms/RoomTopicEditor.js b/src/components/views/rooms/RoomTopicEditor.js
index 8f950d625c..7ad02f264c 100644
--- a/src/components/views/rooms/RoomTopicEditor.js
+++ b/src/components/views/rooms/RoomTopicEditor.js
@@ -28,26 +28,41 @@ module.exports = React.createClass({
         room: PropTypes.object.isRequired,
     },
 
+    getInitialState: function() {
+        return {
+            topic: null,
+        };
+    },
+
     componentWillMount: function() {
         const room = this.props.room;
         const topic = room.currentState.getStateEvents('m.room.topic', '');
-        this._initialTopic = topic ? topic.getContent().topic : '';
+        this.setState({
+            topic: topic ? topic.getContent().topic : '',
+        });
     },
 
     getTopic: function() {
-        return this.refs.editor.getValue();
+        return this.state.topic;
+    },
+
+    _onValueChanged: function(value) {
+        this.setState({
+            topic: value,
+        });
     },
 
     render: function() {
         const EditableText = sdk.getComponent("elements.EditableText");
 
         return (
-                <EditableText ref="editor"
+                <EditableText
                      className="mx_RoomHeader_topic mx_RoomHeader_editable"
                      placeholderClassName="mx_RoomHeader_placeholder"
                      placeholder={_t("Add a topic")}
                      blurToCancel={false}
-                     initialValue={this._initialTopic}
+                     initialValue={this.state.topic}
+                     onValueChanged={this._onValueChanged}
                      dir="auto" />
         );
     },

From 36e8bf1f20661c380bec1ad5a2337f914480cd0a Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 14:13:47 +0000
Subject: [PATCH 507/927] Change CSS class for message panel spinner

to stop scrollbars appearing when we
 - jump to a message or,
 - permalink that is to an not paginated in event
---
 src/components/structures/TimelinePanel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 4ade78af85..12f745146e 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1121,9 +1121,9 @@ var TimelinePanel = React.createClass({
         // exist.
         if (this.state.timelineLoading) {
             return (
-                    <div className={this.props.className + " mx_RoomView_messageListWrapper"}>
-                        <Loader />
-                    </div>
+                <div className="mx_RoomView_messagePanelSpinner">
+                    <Loader />
+                </div>
             );
         }
 

From 5af560f625ef48000063c1a5b9ee3b060bf6d46e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 14:43:34 +0000
Subject: [PATCH 508/927] Make removedTags a Set for perf

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

diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 3ec751d075..78e4a6e95d 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -175,15 +175,15 @@ class TagOrderStore extends Store {
     _mergeGroupsAndTags() {
         const groupIds = this._state.joinedGroupIds || [];
         const tags = this._state.orderedTagsAccountData || [];
-        const removedTags = this._state.removedTagsAccountData || [];
+        const removedTags = new Set(this._state.removedTagsAccountData || []);
 
 
         const tagsToKeep = tags.filter(
-            (t) => (t[0] !== '+' || groupIds.includes(t)) && !removedTags.includes(t),
+            (t) => (t[0] !== '+' || groupIds.includes(t)) && !removedTags.has(t),
         );
 
         const groupIdsToAdd = groupIds.filter(
-            (groupId) => !tags.includes(groupId) && !removedTags.includes(groupId),
+            (groupId) => !tags.includes(groupId) && !removedTags.has(groupId),
         );
 
         return tagsToKeep.concat(groupIdsToAdd);

From f16bc93fee1c46dddf90f323d82e1646fab4b5a4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Feb 2018 16:09:17 +0000
Subject: [PATCH 509/927] If a tag is unrecognised, assume manual ordering

(as we did previously)

Fixes https://github.com/vector-im/riot-web/issues/6135
---
 src/stores/RoomListStore.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index b71e1c5cc1..693275952b 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -176,12 +176,13 @@ class RoomListStore extends Store {
             listOrders[order].forEach((listKey) => {
                 let comparator;
                 switch (order) {
-                    case "manual":
-                        comparator = this._getManualComparator(listKey, optimisticRequest);
-                        break;
                     case "recent":
                         comparator = this._recentsComparator;
                         break;
+                    case "manual":
+                    default:
+                        comparator = this._getManualComparator(listKey, optimisticRequest);
+                        break;
                 }
                 lists[listKey].sort(comparator);
             });

From 06b18dda1856b45b9d17a2f7c1707cbcbddbcb78 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Tue, 13 Feb 2018 17:23:42 +0000
Subject: [PATCH 510/927] Added translation using Weblate (Bulgarian)

---
 src/i18n/strings/bg.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/bg.json

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/bg.json
@@ -0,0 +1 @@
+{}

From bee0a952c37c1d7c6abc3b2092430f4fc815affa Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Tue, 13 Feb 2018 18:57:09 +0000
Subject: [PATCH 511/927] Translated using Weblate (Bulgarian)

Currently translated at 0.2% (2 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 0967ef424b..1300a32895 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1 +1,4 @@
-{}
+{
+    "OK": "ОК",
+    "Operation failed": "Операцията е неуспешна"
+}

From 02e0663409b965bcc165dcf8703aadbc8ae80c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Tue, 13 Feb 2018 18:44:58 +0000
Subject: [PATCH 512/927] Translated using Weblate (Catalan)

Currently translated at 88.3% (871 of 986 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 1ff3e7f8e9..0b1a7b10ef 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -376,7 +376,7 @@
     "Idle for %(duration)s": "Inactiu durant %(duration)s",
     "Offline for %(duration)s": "Desconnectat durant %(duration)s",
     "Unknown for %(duration)s": "Desconegut durant %(duration)s",
-    "Online": "En línia",
+    "Online": "Conectat",
     "Idle": "Inactiu",
     "Offline": "Desconnectat",
     "Unknown": "Desconegut",

From ed871cbd83987e6f2492327f8df7d6a308e17293 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Tue, 13 Feb 2018 18:55:45 +0000
Subject: [PATCH 513/927] Translated using Weblate (Russian)

Currently translated at 100.0% (986 of 986 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index e7cc2f2319..d24ee71de1 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -536,7 +536,7 @@
     "Drop file here to upload": "Перетащите файл сюда для отправки",
     " (unsupported)": " (не поддерживается)",
     "Ongoing conference call%(supportedText)s.": "Установлен групповой вызов %(supportedText)s.",
-    "Online": "В сети",
+    "Online": "Онлайн",
     "Idle": "Неактивен",
     "Offline": "Не в сети",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s сменил аватар комнаты на <img/>",

From db2f6f863a8c63ec434c4cd11b7fa52cae846ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Tue, 13 Feb 2018 18:00:22 +0000
Subject: [PATCH 514/927] Translated using Weblate (Spanish)

Currently translated at 58.1% (573 of 986 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 1b513cc51f..ccfd6f7761 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -571,5 +571,6 @@
     "Nov": "Nov",
     "Dec": "Dic",
     "Warning": "Advertencia",
-    "Unpin Message": "Desmarcar Mensaje"
+    "Unpin Message": "Desmarcar Mensaje",
+    "Online": "Conectado"
 }

From 3020c8cd94a08210070a7633bfa35a93a049c367 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 11:23:29 +0000
Subject: [PATCH 515/927] Fix custom tags not being ordered manually

Actually fixes vector-im/riot-web#6135 unlike #1748, which
incorrectly assumed that custom tags would be included in
listOrders.

This fix makes sure that the `default` case in the `switch`
is actually used.
---
 src/stores/RoomListStore.js | 42 ++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 693275952b..fdd9ca6692 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -160,32 +160,26 @@ class RoomListStore extends Store {
         });
 
         const listOrders = {
-            "manual": [
-                "m.favourite",
-            ],
-            "recent": [
-                "im.vector.fake.invite",
-                "im.vector.fake.recent",
-                "im.vector.fake.direct",
-                "m.lowpriority",
-                "im.vector.fake.archived",
-            ],
+            "m.favourite": "manual",
+            "im.vector.fake.invite": "recent",
+            "im.vector.fake.recent": "recent",
+            "im.vector.fake.direct": "recent",
+            "m.lowpriority": "recent",
+            "im.vector.fake.archived": "recent",
         };
 
-        Object.keys(listOrders).forEach((order) => {
-            listOrders[order].forEach((listKey) => {
-                let comparator;
-                switch (order) {
-                    case "recent":
-                        comparator = this._recentsComparator;
-                        break;
-                    case "manual":
-                    default:
-                        comparator = this._getManualComparator(listKey, optimisticRequest);
-                        break;
-                }
-                lists[listKey].sort(comparator);
-            });
+        Object.keys(lists).forEach((listKey) => {
+            let comparator;
+            switch (listOrders[listKey]) {
+                case "recent":
+                    comparator = this._recentsComparator;
+                    break;
+                case "manual":
+                default:
+                    comparator = this._getManualComparator(listKey, optimisticRequest);
+                    break;
+            }
+            lists[listKey].sort(comparator);
         });
 
         this._setState({

From db4f0cb0bffc091df477899f00eded9c265bedc7 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 16:40:24 +0000
Subject: [PATCH 516/927] Handle adding previously removed tags

---
 src/actions/TagOrderActions.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
index 3504adb09b..38bada2228 100644
--- a/src/actions/TagOrderActions.js
+++ b/src/actions/TagOrderActions.js
@@ -35,6 +35,7 @@ const TagOrderActions = {};
 TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
     // Only commit tags if the state is ready, i.e. not null
     let tags = TagOrderStore.getOrderedTags();
+    let removedTags = TagOrderStore.getRemovedTagsAccountData();
     if (!tags) {
         return;
     }
@@ -42,17 +43,19 @@ TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
     tags = tags.filter((t) => t !== tag);
     tags = [...tags.slice(0, destinationIx), tag, ...tags.slice(destinationIx)];
 
+    removedTags = removedTags.filter((t) => t !== tag);
+
     const storeId = TagOrderStore.getStoreId();
 
     return asyncAction('TagOrderActions.moveTag', () => {
         Analytics.trackEvent('TagOrderActions', 'commitTagOrdering');
         return matrixClient.setAccountData(
             'im.vector.web.tag_ordering',
-            {tags, _storeId: storeId},
+            {tags, removedTags, _storeId: storeId},
         );
     }, () => {
         // For an optimistic update
-        return {tags};
+        return {tags, removedTags};
     });
 };
 

From b626420eb93e4f25333cd5c98758d7d3cc586265 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 16:40:58 +0000
Subject: [PATCH 517/927] Move DND context to LoggedInView

so that we can drag things from any part of the logged in app to
another. (Specifically GroupView and TagPanel).
---
 src/components/structures/LoggedInView.js | 70 +++++++++++++++++++----
 1 file changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index d7fe699156..f6bbfd247b 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -19,6 +19,7 @@ limitations under the License.
 import * as Matrix from 'matrix-js-sdk';
 import React from 'react';
 import PropTypes from 'prop-types';
+import { DragDropContext } from 'react-beautiful-dnd';
 
 import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
 import Notifier from '../../Notifier';
@@ -30,6 +31,9 @@ import sessionStore from '../../stores/SessionStore';
 import MatrixClientPeg from '../../MatrixClientPeg';
 import SettingsStore from "../../settings/SettingsStore";
 
+import TagOrderActions from '../../actions/TagOrderActions';
+import RoomListActions from '../../actions/RoomListActions';
+
 /**
  * This is what our MatrixChat shows when we are logged in. The precise view is
  * determined by the page_type property.
@@ -207,6 +211,50 @@ const LoggedInView = React.createClass({
         }
     },
 
+    _onDragEnd: function(result) {
+        // Dragged to an invalid destination, not onto a droppable
+        if (!result.destination) {
+            return;
+        }
+
+        const dest = result.destination.droppableId;
+
+        if (dest === 'tag-panel-droppable') {
+            // Could be "GroupTile +groupId:domain"
+            const draggableId = result.draggableId.split(' ').pop();
+
+            // Dispatch synchronously so that the TagPanel receives an
+            // optimistic update from TagOrderStore before the previous
+            // state is shown.
+            dis.dispatch(TagOrderActions.moveTag(
+                this._matrixClient,
+                draggableId,
+                result.destination.index,
+            ), true);
+        } else if (dest.startsWith('room-sub-list-droppable_')) {
+            this._onRoomTileEndDrag(result);
+        }
+    },
+
+    _onRoomTileEndDrag: function(result) {
+        let newTag = result.destination.droppableId.split('_')[1];
+        let prevTag = result.source.droppableId.split('_')[1];
+        if (newTag === 'undefined') newTag = undefined;
+        if (prevTag === 'undefined') prevTag = undefined;
+
+        const roomId = result.draggableId.split('_')[1];
+
+        const oldIndex = result.source.index;
+        const newIndex = result.destination.index;
+
+        dis.dispatch(RoomListActions.tagRoom(
+            this._matrixClient,
+            this._matrixClient.getRoom(roomId),
+            prevTag, newTag,
+            oldIndex, newIndex,
+        ), true);
+    },
+
     render: function() {
         const LeftPanel = sdk.getComponent('structures.LeftPanel');
         const RightPanel = sdk.getComponent('structures.RightPanel');
@@ -328,16 +376,18 @@ const LoggedInView = React.createClass({
         return (
             <div className='mx_MatrixChat_wrapper'>
                 { topBar }
-                <div className={bodyClasses}>
-                    <LeftPanel
-                        collapsed={this.props.collapseLhs || false}
-                        disabled={this.props.leftDisabled}
-                    />
-                    <main className='mx_MatrixChat_middlePanel'>
-                        { page_element }
-                    </main>
-                    { right_panel }
-                </div>
+                <DragDropContext onDragEnd={this._onDragEnd}>
+                    <div className={bodyClasses}>
+                        <LeftPanel
+                            collapsed={this.props.collapseLhs || false}
+                            disabled={this.props.leftDisabled}
+                        />
+                        <main className='mx_MatrixChat_middlePanel'>
+                            { page_element }
+                        </main>
+                        { right_panel }
+                    </div>
+                </DragDropContext>
             </div>
         );
     },

From 74c8a74e7d2106057b9c1e368914146c8d2ad8d3 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 16:43:01 +0000
Subject: [PATCH 518/927] Add Droppable to GroupView

to contain the GroupTiles as Draggables
---
 src/components/structures/MyGroups.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 22157beaca..4c9229a2ea 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import GeminiScrollbar from 'react-gemini-scrollbar';
+import { Droppable } from 'react-beautiful-dnd';
 import sdk from '../../index';
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
@@ -74,7 +75,13 @@ export default withMatrixClient(React.createClass({
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
                 <GeminiScrollbar className="mx_MyGroups_joinedGroups">
-                    { groupNodes }
+                    <Droppable droppableId="my-groups-droppable" type="draggable-TagTile">
+                        { (provided, snapshot) => (
+                            <div ref={provided.innerRef}>
+                                { groupNodes }
+                            </div>
+                        ) }
+                    </Droppable>
                 </GeminiScrollbar> :
                 <div className="mx_MyGroups_placeholder">
                     { _t(

From 3850b552a5bddb753d21da3634d30914ed1f520f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 16:46:06 +0000
Subject: [PATCH 519/927] Make GroupTile avatar draggable

---
 src/components/views/groups/GroupTile.js | 32 +++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index ce426a9b78..70947afa65 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -17,10 +17,12 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClient} from 'matrix-js-sdk';
+import { Draggable } from 'react-beautiful-dnd';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import FlairStore from '../../../stores/FlairStore';
 
+
 const GroupTile = React.createClass({
     displayName: 'GroupTile',
 
@@ -78,9 +80,33 @@ const GroupTile = React.createClass({
             profile.avatarUrl, avatarHeight, avatarHeight, "crop",
         ) : null;
         return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
-            <div className="mx_GroupTile_avatar">
-                <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
-            </div>
+            <Draggable
+                key={"GroupTile " + this.props.groupId}
+                draggableId={"GroupTile " + this.props.groupId}
+                index={this.props.groupId}
+                type="draggable-TagTile"
+            >
+                { (provided, snapshot) => (
+                    <div>
+                        <div
+                            ref={provided.innerRef}
+                            {...provided.draggableProps}
+                            {...provided.dragHandleProps}
+                        >
+                            <div className="mx_GroupTile_avatar">
+                                <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
+                            </div>
+                        </div>
+                        { /* Instead of a blank placeholder, use a copy of the avatar itself. */ }
+                        { provided.placeholder ?
+                            <div className="mx_GroupTile_avatar">
+                                <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
+                            </div> :
+                            <div />
+                        }
+                    </div>
+                ) }
+            </Draggable>
             <div className="mx_GroupTile_profile">
                 <div className="mx_GroupTile_name">{ name }</div>
                 { descElement }

From 389d96bc46047bf2791b2fc6bf8200d68f7673ed Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 16:47:29 +0000
Subject: [PATCH 520/927] Use optimistic removedTagsAccountData state in
 TagOrderStore

when receiving TagOrderActions.moveTag.pending, which now exposes
this state.
---
 src/stores/TagOrderStore.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/stores/TagOrderStore.js b/src/stores/TagOrderStore.js
index 78e4a6e95d..eef078d8da 100644
--- a/src/stores/TagOrderStore.js
+++ b/src/stores/TagOrderStore.js
@@ -89,6 +89,7 @@ class TagOrderStore extends Store {
                 // Optimistic update of a moved tag
                 this._setState({
                     orderedTags: payload.request.tags,
+                    removedTagsAccountData: payload.request.removedTags,
                 });
                 break;
             }

From 3948ee8ca14d5f00f2a0163a692569f303be9811 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 17:53:54 +0000
Subject: [PATCH 521/927] Give each GroupTile avatar its own droppable

so that they can be dragged and dropped
without interacting with each other, as
they would do if GroupView contained
one droppable to contain them all.
---
 src/components/structures/MyGroups.js    | 13 ++----
 src/components/views/groups/GroupTile.js | 56 +++++++++++++-----------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 4c9229a2ea..116607fb08 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import GeminiScrollbar from 'react-gemini-scrollbar';
-import { Droppable } from 'react-beautiful-dnd';
 import sdk from '../../index';
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
@@ -74,14 +73,10 @@ export default withMatrixClient(React.createClass({
             });
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
-                <GeminiScrollbar className="mx_MyGroups_joinedGroups">
-                    <Droppable droppableId="my-groups-droppable" type="draggable-TagTile">
-                        { (provided, snapshot) => (
-                            <div ref={provided.innerRef}>
-                                { groupNodes }
-                            </div>
-                        ) }
-                    </Droppable>
+                <GeminiScrollbar>
+                    <div className="mx_MyGroups_joinedGroups">
+                        { groupNodes }
+                    </div>
                 </GeminiScrollbar> :
                 <div className="mx_MyGroups_placeholder">
                     { _t(
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index 70947afa65..f1dbb75988 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -17,7 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import {MatrixClient} from 'matrix-js-sdk';
-import { Draggable } from 'react-beautiful-dnd';
+import { Draggable, Droppable } from 'react-beautiful-dnd';
 import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import FlairStore from '../../../stores/FlairStore';
@@ -80,33 +80,39 @@ const GroupTile = React.createClass({
             profile.avatarUrl, avatarHeight, avatarHeight, "crop",
         ) : null;
         return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
-            <Draggable
-                key={"GroupTile " + this.props.groupId}
-                draggableId={"GroupTile " + this.props.groupId}
-                index={this.props.groupId}
-                type="draggable-TagTile"
-            >
-                { (provided, snapshot) => (
-                    <div>
-                        <div
-                            ref={provided.innerRef}
-                            {...provided.draggableProps}
-                            {...provided.dragHandleProps}
+            <Droppable droppableId="my-groups-droppable" type="draggable-TagTile">
+                { (droppableProvided, droppableSnapshot) => (
+                    <div ref={droppableProvided.innerRef}>
+                        <Draggable
+                            key={"GroupTile " + this.props.groupId}
+                            draggableId={"GroupTile " + this.props.groupId}
+                            index={this.props.groupId}
+                            type="draggable-TagTile"
                         >
-                            <div className="mx_GroupTile_avatar">
-                                <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
-                            </div>
-                        </div>
-                        { /* Instead of a blank placeholder, use a copy of the avatar itself. */ }
-                        { provided.placeholder ?
-                            <div className="mx_GroupTile_avatar">
-                                <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
-                            </div> :
-                            <div />
-                        }
+                            { (provided, snapshot) => (
+                                <div>
+                                    <div
+                                        ref={provided.innerRef}
+                                        {...provided.draggableProps}
+                                        {...provided.dragHandleProps}
+                                    >
+                                        <div className="mx_GroupTile_avatar">
+                                            <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
+                                        </div>
+                                    </div>
+                                    { /* Instead of a blank placeholder, use a copy of the avatar itself. */ }
+                                    { provided.placeholder ?
+                                        <div className="mx_GroupTile_avatar">
+                                            <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
+                                        </div> :
+                                        <div />
+                                    }
+                                </div>
+                            ) }
+                        </Draggable>
                     </div>
                 ) }
-            </Draggable>
+            </Droppable>
             <div className="mx_GroupTile_profile">
                 <div className="mx_GroupTile_name">{ name }</div>
                 { descElement }

From a4c7da63afe4a58551a8497c221e91e1d97fdeec Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 15 Feb 2018 10:47:20 +0000
Subject: [PATCH 522/927] Translated using Weblate (Bulgarian)

Currently translated at 4.6% (46 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 1300a32895..a05100dd3f 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1,4 +1,48 @@
 {
     "OK": "ОК",
-    "Operation failed": "Операцията е неуспешна"
+    "Operation failed": "Операцията е неуспешна",
+    "Search": "Търсене",
+    "Custom Server Options": "Потребителски опции за сървър",
+    "Dismiss": "Отказ",
+    "powered by Matrix": "базирано на Matrix",
+    "Warning": "Предупреждение",
+    "Error": "Грешка",
+    "Remove": "Премахни",
+    "Close": "Затвори",
+    "Cancel": "Отказ",
+    "Send": "Изпрати",
+    "Edit": "Редактирай",
+    "Continue": "Продължи",
+    "Failed to change password. Is your password correct?": "Неуспешна промяна. Правилно ли сте въвели Вашата парола?",
+    "Unpin Message": "Откачи съобщението",
+    "Sun": "нд.",
+    "Mon": "пн.",
+    "Tue": "вт.",
+    "Wed": "ср.",
+    "Thu": "чт.",
+    "Fri": "пт.",
+    "Sat": "сб.",
+    "Jan": "ян.",
+    "Feb": "февр.",
+    "Mar": "март",
+    "Apr": "апр.",
+    "May": "май",
+    "Jun": "юни",
+    "Jul": "юли",
+    "Aug": "авг.",
+    "Sep": "септ.",
+    "Oct": "окт.",
+    "Nov": "ноем.",
+    "Dec": "дек.",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(day)s %(monthName)s %(fullYear)s, %(weekDayName)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
+    "Online": "Онлайн",
+    "Failed to remove tag %(tagName)s from room": "Неуспешно премахване на %(tagName)s етикет от стаята",
+    "unknown error code": "неизвестен код за грешка",
+    "Failed to forget room %(errCode)s": "Не успешно забравяне на стаята %(errCode)s",
+    "Mute": "Заглуши",
+    "Leave": "Напусни",
+    "Favourite": "Любим"
 }

From ceec40551908db8b35a0bd33d9fff6aa01b83b87 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Feb 2018 11:23:00 +0000
Subject: [PATCH 523/927] Remove RoomListStore listener

This caused the the RoomList component to leak (although in practice
only accross logins because that's the only time it's unmounted)
---
 package.json                           | 2 +-
 src/components/views/rooms/RoomList.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bb8db64d28..9d5013de28 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
     "sinon": "^1.17.3",
-    "source-map-loader": "^0.1.5",
+    "source-map-loader": "^0.1.6",
     "walk": "^2.3.9",
     "webpack": "^1.12.14"
   }
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 4a491c8a03..41a200420d 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -191,6 +191,10 @@ module.exports = React.createClass({
             this._tagStoreToken.remove();
         }
 
+        if (this._roomListStoreToken) {
+            this._roomListStoreToken.remove();
+        }
+
         if (this._groupStoreTokens.length > 0) {
             // NB: GroupStore is not a Flux.Store
             this._groupStoreTokens.forEach((token) => token.unregister());

From 44964e80a9c3f8974be669b9bf453375649ea986 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Feb 2018 11:25:40 +0000
Subject: [PATCH 524/927] undo unintentional commit

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

diff --git a/package.json b/package.json
index 9d5013de28..bb8db64d28 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
     "sinon": "^1.17.3",
-    "source-map-loader": "^0.1.6",
+    "source-map-loader": "^0.1.5",
     "walk": "^2.3.9",
     "webpack": "^1.12.14"
   }

From 39af04f09048d872beef7c0059148aa7cd978d2c Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 15 Feb 2018 13:18:15 +0000
Subject: [PATCH 525/927] Translated using Weblate (Bulgarian)

Currently translated at 5.5% (55 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index a05100dd3f..6ce4acf267 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -44,5 +44,14 @@
     "Failed to forget room %(errCode)s": "Не успешно забравяне на стаята %(errCode)s",
     "Mute": "Заглуши",
     "Leave": "Напусни",
-    "Favourite": "Любим"
+    "Favourite": "Любим",
+    "Register": "Регистрация",
+    "Notifications": "Известия",
+    "Rooms": "Стаи",
+    "Add rooms to this community": "Добави стаи в това общество",
+    "Unnamed room": "Ненаименувана стая",
+    "World readable": "Четимо за всички",
+    "Guests can join": "Гости могат да се присъединят",
+    "No rooms to show": "Няма стаи, които да бъдат показани",
+    "Failed to add tag %(tagName)s to room": "Неуспешно добавяне на %(tagName)s етикет в стаята"
 }

From 57419a7f8d485c621b6de0a85467a499874c3c45 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 15 Feb 2018 14:11:45 +0000
Subject: [PATCH 526/927] Give emptySubListTip a container for correct bg
 colour

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 4a491c8a03..e53b7b6536 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -544,17 +544,20 @@ module.exports = React.createClass({
         const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
         const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
 
+        let tip = null;
+
         switch (section) {
             case 'im.vector.fake.direct':
-                return <div className="mx_RoomList_emptySubListTip">
+                tip = <div className="mx_RoomList_emptySubListTip">
                     { _t(
                         "Press <StartChatButton> to start a chat with someone",
                         {},
                         { 'StartChatButton': <StartChatButton size="16" callout={true} /> },
                     ) }
                 </div>;
+                break;
             case 'im.vector.fake.recent':
-                return <div className="mx_RoomList_emptySubListTip">
+                tip = <div className="mx_RoomList_emptySubListTip">
                     { _t(
                         "You're not in any rooms yet! Press <CreateRoomButton> to make a room or"+
                         " <RoomDirectoryButton> to browse the directory",
@@ -565,6 +568,13 @@ module.exports = React.createClass({
                         },
                     ) }
                 </div>;
+                break;
+        }
+
+        if (tip) {
+            return <div className="mx_RoomList_emptySubListTip_container">
+                { tip }
+            </div>;
         }
 
         // We don't want to display drop targets if there are no room tiles to drag'n'drop

From 19b6684089e7a50e5bb80ed2bc8ba4c7d6e6961e Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 15 Feb 2018 14:50:16 +0000
Subject: [PATCH 527/927] Translated using Weblate (Bulgarian)

Currently translated at 7.0% (70 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 6ce4acf267..7574c0278f 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -53,5 +53,20 @@
     "World readable": "Четимо за всички",
     "Guests can join": "Гости могат да се присъединят",
     "No rooms to show": "Няма стаи, които да бъдат показани",
-    "Failed to add tag %(tagName)s to room": "Неуспешно добавяне на %(tagName)s етикет в стаята"
+    "Failed to add tag %(tagName)s to room": "Неуспешно добавяне на %(tagName)s етикет в стаята",
+    "This email address is already in use": "Този имейл адрес е вече зает",
+    "This phone number is already in use": "Този телефонен номер е вече зает",
+    "Failed to verify email address: make sure you clicked the link in the email": "Неуспешно потвърждаване на имейл адреса: уверете се, че сте кликнали върху връзката в имейла",
+    "The platform you're on": "Платформата, която използвате",
+    "The version of Riot.im": "Версията на Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Независимо дали сте в профила си или не (не записваме Вашето потребителско име)",
+    "Your language of choice": "Вашият език по избор",
+    "Which officially provided instance you are using, if any": "Коя официално предоставена инстанция използвате, ако има такава",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо дали използвате Richtext режим на Rich Text Editor",
+    "Your homeserver's URL": "Адрес на Вашия Home сървър",
+    "Your identity server's URL": "Адрес на Вашия сървър за самоличност",
+    "Analytics": "Статистика",
+    "The information being sent to us to help make Riot.im better includes:": "За да направи Riot по-добър, информацията изпратена до нас включва:",
+    "Call Failed": "Неуспешно повикване",
+    "Call": "Обаждане"
 }

From 07b691a45d14fa817fe9d08d8ed1ecc2886b313c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 15 Feb 2018 20:20:19 +0000
Subject: [PATCH 528/927] typo

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

diff --git a/src/components/views/messages/MFileBody.js b/src/components/views/messages/MFileBody.js
index c324c291e7..90efe24df3 100644
--- a/src/components/views/messages/MFileBody.js
+++ b/src/components/views/messages/MFileBody.js
@@ -82,7 +82,7 @@ Tinter.registerTintable(updateTintedDownloadImage);
 // downloaded. This limit does not seem to apply when the url is used as
 // the source attribute of an image tag.
 //
-// Blob URLs are generated using window.URL.createObjectURL and unforuntately
+// Blob URLs are generated using window.URL.createObjectURL and unfortunately
 // for our purposes they inherit the origin of the page that created them.
 // This means that any scripts that run when the URL is viewed will be able
 // to access local storage.

From b111a824e88fc4ceb29ec03ef7c2765480ada2d1 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 15 Feb 2018 19:36:52 +0000
Subject: [PATCH 529/927] Translated using Weblate (Bulgarian)

Currently translated at 12.0% (119 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 7574c0278f..948181fa9d 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -49,7 +49,7 @@
     "Notifications": "Известия",
     "Rooms": "Стаи",
     "Add rooms to this community": "Добави стаи в това общество",
-    "Unnamed room": "Ненаименувана стая",
+    "Unnamed room": "Стая без име",
     "World readable": "Четимо за всички",
     "Guests can join": "Гости могат да се присъединят",
     "No rooms to show": "Няма стаи, които да бъдат показани",
@@ -68,5 +68,54 @@
     "Analytics": "Статистика",
     "The information being sent to us to help make Riot.im better includes:": "За да направи Riot по-добър, информацията изпратена до нас включва:",
     "Call Failed": "Неуспешно повикване",
-    "Call": "Обаждане"
+    "Call": "Обаждане",
+    "Answer": "Отговори, приеми",
+    "You are already in a call.": "Вече сте в разговор.",
+    "VoIP is unsupported": "Не се поддържа VoIP",
+    "You cannot place VoIP calls in this browser.": "Не може да осъществите VoIP разговори в този браузър.",
+    "You cannot place a call with yourself.": "Не може да осъществите разговор със себе си.",
+    "Existing Call": "Съществуващ разговор",
+    "Conference calls are not supported in this client": "Групови разговори не се поддържат в тази програма",
+    "Conference calls are not supported in encrypted rooms": "Групови разговори не се поддържат в шифровани стаи",
+    "Warning!": "Внимание!",
+    "Conference calling is in development and may not be reliable.": "Груповите разговори са в процес на разработка и не са надеждни.",
+    "Review Devices": "Преглед на устройства",
+    "Failed to set up conference call": "Неуспешно осъществяване на групов чат",
+    "Conference call failed.": "Неуспешен групов разговор.",
+    "The file '%(fileName)s' failed to upload": "Неуспешно качване на файл '%(fileName)s'",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файлът '%(fileName)s' надхвърля ограничението на размера за качвания на този Home сървър",
+    "Upload Failed": "Качването е неуспешно",
+    "PM": "PM",
+    "AM": "AM",
+    "Who would you like to add to this community?": "Кой бихте желали да добавите в това общество?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Предупреждение: Всеки човек, който добавяте в дадено общество, ще бъде публично видим за знаещите идентификатора на обществото",
+    "Invite new community members": "Покани нови членове на обществото",
+    "Name or matrix ID": "Име или matrix ID",
+    "Invite to Community": "Покани в обществото",
+    "Which rooms would you like to add to this community?": "Кои стаи бихте желали да добавите в това общество?",
+    "Show these rooms to non-members on the community page and room list?": "Показване на тези стаи на не-членове на страницата на обществата и списъка със стаи?",
+    "Add rooms to the community": "Добави стаи в обществото",
+    "Room name or alias": "Име или псевдоним на стая",
+    "Add to community": "Добави в обществото",
+    "Failed to invite the following users to %(groupId)s:": "Следните потребители не могат да бъдат поканени в %(groupId)s:",
+    "Failed to invite users to community": "Потребителите не могат да бъдат поканени в обществото",
+    "Failed to invite users to %(groupId)s": "Потребителите не могат да бъдат поканени в %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Следните стаи не могат да бъдат добавени в %(groupId)s:",
+    "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 не е получил разрешение да изпраща известия - моля опитайте отново",
+    "Unable to enable Notifications": "Неупешно включване на известия",
+    "This email address was not found": "Този имейл адрес не беше открит",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Изглежда вашият имейл адрес не може да се асоциира с Matrix ID на този Home сървър.",
+    "Default": "По подразбиране",
+    "Restricted": "Ограничен",
+    "Moderator": "Модератор",
+    "Admin": "Администратор",
+    "Start a chat": "Започване на чат",
+    "Who would you like to communicate with?": "С кой бихте желали да си комуникирате?",
+    "Email, name or matrix ID": "Имейл, име или matrix ID",
+    "Start Chat": "Започни чат",
+    "Invite new room members": "Покани нови членове на стаята",
+    "Who would you like to add to this room?": "Кой бихте желали да добавите в тази стая?",
+    "Send Invites": "Изпрати покани",
+    "Failed to invite user": "Неуспешна покана на потребителя"
 }

From 94a0a904574ba3e63bf80dffc381db2f20842747 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 16 Feb 2018 14:16:50 +0000
Subject: [PATCH 530/927] Make RoomListStore aware of Room.timeline events

so that we can do reorderings of lists ordered by most recent event.

No optimisations here; we only update for timeline events
on live timelines that could update the "unread count".
---
 src/actions/MatrixActionCreators.js    | 10 ++++++
 src/components/views/rooms/RoomList.js |  9 ------
 src/stores/RoomListStore.js            | 43 +++++++++++++++++---------
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index dbfe910533..27fbb6dda5 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -66,6 +66,15 @@ function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
     return { action: 'MatrixActions.Room.tags', room };
 }
 
+function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTimeline, removed, data) {
+    return {
+        action: 'MatrixActions.Room.timeline',
+        event: timelineEvent,
+        isLiveEvent: data.liveEvent,
+        room,
+    };
+}
+
 function createRoomMembershipAction(matrixClient, membershipEvent, member, oldMembership) {
     return { action: 'MatrixActions.RoomMember.membership', member };
 }
@@ -87,6 +96,7 @@ export default {
         this._addMatrixClientListener(matrixClient, 'sync', createSyncAction);
         this._addMatrixClientListener(matrixClient, 'accountData', createAccountDataAction);
         this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
+        this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
         this._addMatrixClientListener(matrixClient, 'RoomMember.membership', createRoomMembershipAction);
     },
 
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 41a200420d..bab8054c60 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -76,7 +76,6 @@ module.exports = React.createClass({
 
         cli.on("Room", this.onRoom);
         cli.on("deleteRoom", this.onDeleteRoom);
-        cli.on("Room.timeline", this.onRoomTimeline);
         cli.on("Room.name", this.onRoomName);
         cli.on("Room.receipt", this.onRoomReceipt);
         cli.on("RoomState.events", this.onRoomStateEvents);
@@ -177,7 +176,6 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("Room", this.onRoom);
             MatrixClientPeg.get().removeListener("deleteRoom", this.onDeleteRoom);
-            MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
             MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
             MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
             MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
@@ -236,13 +234,6 @@ module.exports = React.createClass({
         this._updateStickyHeaders(true, scrollToPosition);
     },
 
-    onRoomTimeline: function(ev, room, toStartOfTimeline, removed, data) {
-        if (toStartOfTimeline) return;
-        if (!room) return;
-        if (data.timeline.getTimelineSet() !== room.getUnfilteredTimelineSet()) return;
-        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
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index fdd9ca6692..707a9da17e 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -23,6 +23,16 @@ import Unread from '../Unread';
  * the RoomList.
  */
 class RoomListStore extends Store {
+
+    static _listOrders = {
+        "m.favourite": "manual",
+        "im.vector.fake.invite": "recent",
+        "im.vector.fake.recent": "recent",
+        "im.vector.fake.direct": "recent",
+        "m.lowpriority": "recent",
+        "im.vector.fake.archived": "recent",
+    };
+
     constructor() {
         super(dis);
 
@@ -68,6 +78,14 @@ class RoomListStore extends Store {
                 this._generateRoomLists();
             }
             break;
+            case 'MatrixActions.Room.timeline': {
+                if (!this._state.ready ||
+                    !payload.isLiveEvent ||
+                    !this._eventTriggersRecentReorder(payload.event)
+                ) break;
+                this._generateRoomLists();
+            }
+            break;
             case 'MatrixActions.accountData': {
                 if (payload.event_type !== 'm.direct') break;
                 this._generateRoomLists();
@@ -159,18 +177,9 @@ class RoomListStore extends Store {
             }
         });
 
-        const listOrders = {
-            "m.favourite": "manual",
-            "im.vector.fake.invite": "recent",
-            "im.vector.fake.recent": "recent",
-            "im.vector.fake.direct": "recent",
-            "m.lowpriority": "recent",
-            "im.vector.fake.archived": "recent",
-        };
-
         Object.keys(lists).forEach((listKey) => {
             let comparator;
-            switch (listOrders[listKey]) {
+            switch (RoomListStore._listOrders[listKey]) {
                 case "recent":
                     comparator = this._recentsComparator;
                     break;
@@ -188,13 +197,17 @@ class RoomListStore extends Store {
         });
     }
 
+    _eventTriggersRecentReorder(ev) {
+        return ev.getTs() && (
+            Unread.eventTriggersUnreadCount(ev) ||
+            ev.getSender() === this._matrixClient.credentials.userId
+        );
+    }
+
     _tsOfNewestEvent(room) {
         for (let i = room.timeline.length - 1; i >= 0; --i) {
             const ev = room.timeline[i];
-            if (ev.getTs() &&
-                (Unread.eventTriggersUnreadCount(ev) ||
-                (ev.getSender() === this._matrixClient.credentials.userId))
-            ) {
+            if (this._eventTriggersRecentReorder(ev)) {
                 return ev.getTs();
             }
         }
@@ -210,6 +223,8 @@ class RoomListStore extends Store {
     }
 
     _recentsComparator(roomA, roomB) {
+        // XXX: We could use a cache here and update it when we see new
+        // events that trigger a reorder
         return this._tsOfNewestEvent(roomB) - this._tsOfNewestEvent(roomA);
     }
 

From 84ab1ae3e2996157c358f0ca152669585be93863 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 16 Feb 2018 15:52:15 +0000
Subject: [PATCH 531/927] Do not assume that tags have been removed

when moving tags
---
 src/actions/TagOrderActions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actions/TagOrderActions.js b/src/actions/TagOrderActions.js
index 38bada2228..a257ff16d8 100644
--- a/src/actions/TagOrderActions.js
+++ b/src/actions/TagOrderActions.js
@@ -35,7 +35,7 @@ const TagOrderActions = {};
 TagOrderActions.moveTag = function(matrixClient, tag, destinationIx) {
     // Only commit tags if the state is ready, i.e. not null
     let tags = TagOrderStore.getOrderedTags();
-    let removedTags = TagOrderStore.getRemovedTagsAccountData();
+    let removedTags = TagOrderStore.getRemovedTagsAccountData() || [];
     if (!tags) {
         return;
     }

From cca820c3538ae6e806fd6929b34f728eaf35d109 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Fri, 16 Feb 2018 11:48:04 +0000
Subject: [PATCH 532/927] Translated using Weblate (Bulgarian)

Currently translated at 15.2% (150 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 948181fa9d..5df65775fe 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -117,5 +117,36 @@
     "Invite new room members": "Покани нови членове на стаята",
     "Who would you like to add to this room?": "Кой бихте желали да добавите в тази стая?",
     "Send Invites": "Изпрати покани",
-    "Failed to invite user": "Неуспешна покана на потребителя"
+    "Failed to invite user": "Неуспешна покана на потребителя",
+    "Failed to invite": "Неуспешна покана",
+    "Failed to invite the following users to the %(roomName)s room:": "Следните потребителите не успяха да бъдат добавени в %(roomName)s:",
+    "You need to be logged in.": "Трябва да влезете в профила си.",
+    "You need to be able to invite users to do that.": "Трябва да имате право да добавите потребители, за да извършите това.",
+    "Unable to create widget.": "Неуспешно създаване на приспособление.",
+    "Failed to send request.": "Неуспешно изпращане на запитване.",
+    "This room is not recognised.": "Стаята не е разпозната.",
+    "Power level must be positive integer.": "Нивото на достъп трябва да бъде позитивно число.",
+    "Call Anyway": "Обади се въпреки това",
+    "Answer Anyway": "Отговори въпреки това",
+    "Call Timeout": "Изтекло време за повикване",
+    "The remote side failed to pick up": "Отсрещната страна не успя да отговори",
+    "Unable to capture screen": "Неуспешно заснемане на екрана",
+    "You are not in this room.": "Не сте в тази стая.",
+    "You do not have permission to do that in this room.": "Нямате достъп да направите това в тази стая.",
+    "Missing room_id in request": "Липсва room_id в заявката",
+    "Room %(roomId)s not visible": "Стая %(roomId)s не е видима",
+    "Missing user_id in request": "Липсва user_id в заявката",
+    "Failed to lookup current room": "Неуспешно намиране на текущата стая",
+    "/ddg is not a command": "/ddg не е команда",
+    "To use it, just wait for autocomplete results to load and tab through them.": "За използване, изчакайте зареждането на списъка с предложения и изберете от него.",
+    "Unrecognised room alias:": "Непознат псевдоним на стая:",
+    "Ignored user": "Игнориран потребител",
+    "You are now ignoring %(userId)s": "Вече игнорирате %(userId)s",
+    "Unignored user": "Неигнориран потребител",
+    "You are no longer ignoring %(userId)s": "Вече не игнорирате %(userId)s",
+    "Device already verified!": "Устройството е вече верифицирано!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: Устройстовото е верифицирано, но ключовете не съвпадат!",
+    "Verified key": "Верифициран ключ",
+    "Unrecognised command:": "Неразпозната команда:",
+    "Reason": "Причина"
 }

From f2903d1439eb62cdc97dca0b2eb71ed586c39472 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Fri, 16 Feb 2018 08:45:19 +0000
Subject: [PATCH 533/927] Translated using Weblate (Finnish)

Currently translated at 95.2% (939 of 986 strings)

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

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index fc7eac51a7..48a8ea755f 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -561,7 +561,7 @@
     "Sep": "syyskuu",
     "Oct": "lokakuu",
     "Nov": "marraskuu",
-    "Dec": "jolukuu",
+    "Dec": "joulukuu",
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Käyttäjänimet voivat sisältää vain kirjaimia, numeroita, pisteitä, viivoja ja alaviivoja.",
     "To continue, please enter your password.": "Ole hyvä ja syötä salasanasi jatkaaksesi.",
     "Verifies a user, device, and pubkey tuple": "Varmentaa käyttäjän, laitteen ja julkisen avaimen kolmikon",

From 3f6c15506c4116cb7bbe016c167d8d759842ab1f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 16 Feb 2018 16:17:47 +0000
Subject: [PATCH 534/927] Remove unused `room` parameter of
 MatrixActions.Room.timeline

---
 src/actions/MatrixActionCreators.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 27fbb6dda5..a9ea671fbe 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -71,7 +71,6 @@ function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTi
         action: 'MatrixActions.Room.timeline',
         event: timelineEvent,
         isLiveEvent: data.liveEvent,
-        room,
     };
 }
 

From cbeee72062c6e9f4fb7fb3e24b91beb92454d1f6 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 16 Feb 2018 10:11:04 -0700
Subject: [PATCH 535/927] Don't show empty custom tags when filtering tags

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

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 41a200420d..68b171b0ee 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -34,6 +34,7 @@ import RoomListStore from '../../../stores/RoomListStore';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
 
 const HIDE_CONFERENCE_CHANS = true;
+const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/;
 
 function phraseForSection(section) {
     switch (section) {
@@ -365,7 +366,7 @@ module.exports = React.createClass({
         });
 
         Object.keys(lists).forEach((tagName) => {
-            filteredLists[tagName] = lists[tagName].filter((taggedRoom) => {
+            const filteredRooms = lists[tagName].filter((taggedRoom) => {
                 // Somewhat impossible, but guard against it anyway
                 if (!taggedRoom) {
                     return;
@@ -377,6 +378,10 @@ module.exports = React.createClass({
 
                 return Boolean(isRoomVisible[taggedRoom.roomId]);
             });
+            
+            if (filteredRooms.length > 0 || tagName.match(STANDARD_TAGS_REGEX)) {
+                filteredLists[tagName] = filteredRooms;
+            }
         });
 
         return filteredLists;
@@ -682,7 +687,7 @@ module.exports = React.createClass({
                              onShowMoreRooms={self.onShowMoreRooms} />
 
                 { Object.keys(self.state.lists).map((tagName) => {
-                    if (!tagName.match(/^(m\.(favourite|lowpriority)|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
+                    if (!tagName.match(STANDARD_TAGS_REGEX)) {
                         return <RoomSubList list={self.state.lists[tagName]}
                              key={tagName}
                              label={tagName}

From 113fc696d885eec3ce55ed67cade8a81b4bd96b1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 16 Feb 2018 17:43:24 +0000
Subject: [PATCH 536/927] Implement global filter to deselect all tags

and make TagPanel scrollable whilst we're at it.
---
 src/components/structures/TagPanel.js | 51 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 6e3bcf521b..74b6656b79 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
+import GeminiScrollbar from 'react-gemini-scrollbar';
 import TagOrderStore from '../../stores/TagOrderStore';
 
 import GroupActions from '../../actions/GroupActions';
@@ -93,9 +94,14 @@ const TagPanel = React.createClass({
         dis.dispatch({action: 'view_create_group'});
     },
 
+    onLogoClick(ev) {
+        dis.dispatch({action: 'deselect_tags'});
+    },
+
     render() {
         const GroupsButton = sdk.getComponent('elements.GroupsButton');
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
+        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
 
         const tags = this.state.orderedTags.map((tag, index) => {
             return <DNDTagTile
@@ -106,25 +112,32 @@ const TagPanel = React.createClass({
             />;
         });
         return <div className="mx_TagPanel">
-            <Droppable
-                droppableId="tag-panel-droppable"
-                type="draggable-TagTile"
-            >
-                { (provided, snapshot) => (
-                    <div
-                        className="mx_TagPanel_tagTileContainer"
-                        ref={provided.innerRef}
-                        // react-beautiful-dnd has a bug that emits a click to the parent
-                        // of draggables upon dropping
-                        //   https://github.com/atlassian/react-beautiful-dnd/issues/273
-                        // so we use onMouseDown here as a workaround.
-                        onMouseDown={this.onClick}
-                    >
-                        { tags }
-                        { provided.placeholder }
-                    </div>
-                ) }
-            </Droppable>
+            <AccessibleButton className="mx_TagPanel_logo" onClick={this.onLogoClick}>
+                <img src="img/logos/riot-logo.svg" />
+            </AccessibleButton>
+            <div className="mx_TagPanel_divider" />
+            <GeminiScrollbar autoShow={true} className="mx_TagPanel_scroller">
+                <Droppable
+                    droppableId="tag-panel-droppable"
+                    type="draggable-TagTile"
+                >
+                    { (provided, snapshot) => (
+                            <div
+                                className="mx_TagPanel_tagTileContainer"
+                                ref={provided.innerRef}
+                                // react-beautiful-dnd has a bug that emits a click to the parent
+                                // of draggables upon dropping
+                                //   https://github.com/atlassian/react-beautiful-dnd/issues/273
+                                // so we use onMouseDown here as a workaround.
+                                onMouseDown={this.onClick}
+                            >
+                                { tags }
+                                { provided.placeholder }
+                            </div>
+                    ) }
+                </Droppable>
+            </GeminiScrollbar>
+            <div className="mx_TagPanel_divider" />
             <div className="mx_TagPanel_createGroupButton">
                 <GroupsButton tooltip={true} />
             </div>

From 7a0c82a327b7df5e28160c10cfd89fb55ee9b798 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 16 Feb 2018 18:08:29 +0000
Subject: [PATCH 537/927] Fix click background to deselect

---
 src/components/structures/TagPanel.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 74b6656b79..d614588ccc 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -84,8 +84,6 @@ const TagPanel = React.createClass({
     },
 
     onClick(e) {
-        // Ignore clicks on children
-        if (e.target !== e.currentTarget) return;
         dis.dispatch({action: 'deselect_tags'});
     },
 
@@ -116,7 +114,11 @@ const TagPanel = React.createClass({
                 <img src="img/logos/riot-logo.svg" />
             </AccessibleButton>
             <div className="mx_TagPanel_divider" />
-            <GeminiScrollbar autoShow={true} className="mx_TagPanel_scroller">
+            <GeminiScrollbar
+                className="mx_TagPanel_scroller"
+                autoShow={true}
+                onClick={this.onClick}
+            >
                 <Droppable
                     droppableId="tag-panel-droppable"
                     type="draggable-TagTile"
@@ -125,11 +127,6 @@ const TagPanel = React.createClass({
                             <div
                                 className="mx_TagPanel_tagTileContainer"
                                 ref={provided.innerRef}
-                                // react-beautiful-dnd has a bug that emits a click to the parent
-                                // of draggables upon dropping
-                                //   https://github.com/atlassian/react-beautiful-dnd/issues/273
-                                // so we use onMouseDown here as a workaround.
-                                onMouseDown={this.onClick}
                             >
                                 { tags }
                                 { provided.placeholder }

From 2d5a2a9d48b3c7446cb00a2b3c8014b4edac3b11 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 16 Feb 2018 23:59:48 +0000
Subject: [PATCH 538/927] improve origin check of ScalarMessaging postmessage
 API.

ensures that https://scalar.ve can't access the API.
many thanks to @rugk for pointing out the potential vuln.
cc @rxl881 in case this bug has been transplanted elsewhere.
---
 src/ScalarMessaging.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 3c164c6551..fc8ee9edf6 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -563,7 +563,7 @@ const onMessage = function(event) {
     const url = SdkConfig.get().integrations_ui_url;
     if (
         event.origin.length === 0 ||
-        !url.startsWith(event.origin) ||
+        !url.startsWith(event.origin + '/') ||
         !event.data.action ||
         event.data.api // Ignore messages with specific API set
     ) {

From 32130fbc28bc315adae9cd88bc19226f9ff121a6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 19 Feb 2018 09:56:03 +0000
Subject: [PATCH 539/927] Don't regenerate RoomListStore state for
 notifs/scrollback/etc.

Only do so for the live timeline of rooms.
---
 src/actions/MatrixActionCreators.js | 2 ++
 src/stores/RoomListStore.js         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index a9ea671fbe..a307af6f57 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -71,6 +71,8 @@ function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTi
         action: 'MatrixActions.Room.timeline',
         event: timelineEvent,
         isLiveEvent: data.liveEvent,
+        isLiveUnfilteredRoomTimelineEvent:
+            room && data.timeline.getTimelineSet() === room.getUnfilteredTimelineSet(),
     };
 }
 
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 707a9da17e..8a3af309fc 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -81,6 +81,7 @@ class RoomListStore extends Store {
             case 'MatrixActions.Room.timeline': {
                 if (!this._state.ready ||
                     !payload.isLiveEvent ||
+                    !payload.isLiveUnfilteredRoomTimelineEvent ||
                     !this._eventTriggersRecentReorder(payload.event)
                 ) break;
                 this._generateRoomLists();

From da35871cb1952255335ab502aebf2ad5939825f6 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Sun, 18 Feb 2018 20:21:27 +0000
Subject: [PATCH 540/927] Translated using Weblate (Bulgarian)

Currently translated at 24.4% (241 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 5df65775fe..ae049dff52 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -148,5 +148,96 @@
     "WARNING: Device already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: Устройстовото е верифицирано, но ключовете не съвпадат!",
     "Verified key": "Верифициран ключ",
     "Unrecognised command:": "Неразпозната команда:",
-    "Reason": "Причина"
+    "Reason": "Причина",
+    "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прие поканата за %(displayName)s.",
+    "%(targetName)s accepted an invitation.": "%(targetName)s прие поканата.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s заяви VoIP конферентен разговор.",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s покани %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s блокира %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име/псевдоним на %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s промени своето име на %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s премахна своето име (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s премахна своята профилна снимка.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s промени своята профилна снимка.",
+    "%(senderName)s set a profile picture.": "%(senderName)s зададе снимка на профила си.",
+    "VoIP conference started.": "VoIP конференцията започна.",
+    "%(targetName)s joined the room.": "%(targetName)s се присъедини към стаята.",
+    "VoIP conference finished.": "VoIP конференцията приключи.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s отказа поканата.",
+    "%(targetName)s left the room.": "%(targetName)s напусна стаята.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s отблокира %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s изгони %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s оттегли поканата си към %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s смени темата на \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s премахна името на стаята.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s промени името на стаята на %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s изпрати снимка.",
+    "Someone": "Някой",
+    "(not supported by this browser)": "(не се поддържа от този браузър)",
+    "%(senderName)s answered the call.": "%(senderName)s отговори на повикването.",
+    "(no answer)": "(няма отговор)",
+    "(unknown failure: %(reason)s)": "(непозната грешка: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s прекрати разговора.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s започна %(callType)s разговор.",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s направи бъдещата история на стаята видима за всички членове на стаята, от момента, в който те са поканени в нея.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s направи бъдещата история на стаята видима за всички членове на стаята, от момента, в който те се присъединят към нея.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s направи бъдещата история на стаята видима за всички членове в нея.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s направи бъдещата история на стаята видима за всеки.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s направи бъдещата история на стаята видима за непознат (%(visibility)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включи шифроване от край до край (алгоритъм %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s смени нивото на достъп на %(powerLevelDiffText)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s смени закачените съобщения на стаята.",
+    "%(widgetName)s widget modified by %(senderName)s": "Приспособлението %(widgetName)s е променено от %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Приспособлението %(widgetName)s е добавено от %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Приспособлението %(widgetName)s е премахнато от %(senderName)s",
+    "%(displayName)s is typing": "%(displayName)s пише",
+    "%(names)s and %(count)s others are typing|other": "%(names)s и %(count)s други пишат",
+    "%(names)s and %(count)s others are typing|one": "%(names)s и още един човек пишат",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s пишат",
+    "Failure to create room": "Неуспешно създаване на стая",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Сървърът може би е претоварен, недостъпен или се натъкнахте на проблем.",
+    "Send anyway": "Изпрати така или иначе",
+    "Unnamed Room": "Стая без име",
+    "Your browser does not support the required cryptography extensions": "Вашият браузър не поддържа необходимите разширения за шифроване",
+    "Not a valid Riot keyfile": "Невалиден Riot ключов файл",
+    "Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?",
+    "Failed to join room": "Неуспешно присъединяване към стаята",
+    "Message Replies": "Отговори на съобщението",
+    "Message Pinning": "Закачания на съобщението",
+    "Presence Management": "Управление на присъствието",
+    "Tag Panel": "Панел с етикети",
+    "Disable Emoji suggestions while typing": "Деактивиране на предложенията за емотиконите при писане",
+    "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",
+    "Hide removed messages": "Скриване на премахнати съобщения",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Скриване на съобщения присъединяване/напускане (покани/изгонвания/блокиране незасегнати)",
+    "Hide avatar changes": "Скриване промени на аватара",
+    "Hide display name changes": "Скриване промени на името",
+    "Hide read receipts": "Скриване",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показване на времето в 12-часов формат (напр. 2:30pm)",
+    "Always show message timestamps": "Винаги показвай времето",
+    "Autoplay GIFs and videos": "Автоматично възпроизвеждане на GIF-файлове и видеа",
+    "Enable automatic language detection for syntax highlighting": "Активиране на автоматичното разпознаване на език за подчертаване на синтаксиса",
+    "Disable big emoji in chat": "Деактивиране на големи емотикони в чата",
+    "Don't send typing notifications": "Не изпращай известия за писане",
+    "Automatically replace plain text Emoji": "Автоматично откриване и заместване на емотикони в текста",
+    "Mirror local video feed": "Огледален образ",
+    "Disable Peer-to-Peer for 1:1 calls": "Деактивиране на Peer-to-Peer в 1:1 разговор",
+    "Opt out of analytics": "Отказване от събиране на статистически данни",
+    "Never send encrypted messages to unverified devices from this device": "Никога не изпращай шифровани съобщения до непотвърдени устройства от това устройство",
+    "Never send encrypted messages to unverified devices in this room from this device": "Никога не изпращай шифровани съобщение до непотвърдени устройства в тази стая от това устройство",
+    "Enable inline URL previews by default": "Включване по подразбиране на URL прегледи",
+    "Enable URL previews for this room (only affects you)": "Включване на URL прегледи за тази стая (засяга само Вас)",
+    "Enable URL previews by default for participants in this room": "Включване по подразбиране на URL прегледи за участниците в тази стая",
+    "Room Colour": "Цвят на стая",
+    "Active call (%(roomName)s)": "Активен разговор (%(roomName)s)",
+    "unknown caller": "повикване от непознат",
+    "Incoming voice call from %(name)s": "Входящо гласово повикване от %(name)s",
+    "Incoming video call from %(name)s": "Входящо видео повикване от %(name)s",
+    "Incoming call from %(name)s": "Входящо повикване от %(name)s",
+    "Decline": "Откажи",
+    "Accept": "Приеми",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Съобщение е изпратено до +%(msisdn)s. Моля въведете кода за потвърждение, което то съдържа",
+    "Incorrect verification code": "Неправилен код за потвърждение"
 }

From 71a1de1e73e77367d8d51841bb312633a0b3ee4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sim=C3=B3=20Albert=20i=20Beltran?= <sim6@probeta.net>
Date: Sat, 17 Feb 2018 13:40:44 +0000
Subject: [PATCH 541/927] Translated using Weblate (Catalan)

Currently translated at 89.2% (880 of 986 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 0b1a7b10ef..120134e296 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -869,5 +869,14 @@
     "Email": "Correu electrònic",
     "Add email address": "Afegeix correu electrònic",
     "I have verified my email address": "He verificat l'adreça de correu electrònic",
-    "Send Reset Email": "Envia email de reinici"
+    "Send Reset Email": "Envia email de reinici",
+    "Your homeserver's URL": "URL del teu homeserver",
+    "Your identity server's URL": "URL del teu servidor d'identitat",
+    "Analytics": "Analítiques",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s",
+    "Server may be unavailable or overloaded": "El servidor pot estar inaccessible o sobrecarregat",
+    "Report it": "Informa",
+    "Found a bug?": "Has trobat un error?",
+    "Display name": "Nom visible",
+    "Identity Server is": "El servidor d'identitat es"
 }

From 4998890a0ef656f2d5a979f3ed57a6e551bd40fe Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Mon, 19 Feb 2018 16:12:43 +0000
Subject: [PATCH 542/927] Translated using Weblate (Bulgarian)

Currently translated at 27.7% (274 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index ae049dff52..d5dd208602 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -239,5 +239,38 @@
     "Decline": "Откажи",
     "Accept": "Приеми",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Съобщение е изпратено до +%(msisdn)s. Моля въведете кода за потвърждение, което то съдържа",
-    "Incorrect verification code": "Неправилен код за потвърждение"
+    "Incorrect verification code": "Неправилен код за потвърждение",
+    "Enter Code": "Въведи код",
+    "Submit": "Изпрати",
+    "Phone": "Телефон",
+    "Add phone number": "Добави телефонен номер",
+    "Add": "Добави",
+    "Failed to upload profile picture!": "Неуспешно качване на профилна снимка!",
+    "Upload new:": "Качи нов:",
+    "No display name": "Няма име",
+    "New passwords don't match": "Новите пароли не съвпадат",
+    "Passwords can't be empty": "Полето с парола не може да е празно",
+    "Export E2E room keys": "Експортиране E2E ключове на стая",
+    "Do you want to set an email address?": "Искате ли да зададете имейл адрес?",
+    "Current password": "Текуща парола",
+    "Password": "Парола",
+    "New Password": "Нова парола",
+    "Confirm password": "Потвърждаване на парола",
+    "Change Password": "Смяна на парола",
+    "Your home server does not support device management.": "Вашият home сървър не поддръжа управление на устройства.",
+    "Unable to load device list": "Неуспешно зареждане на списък с устройства",
+    "Authentication": "Автентикация",
+    "Delete %(count)s devices|other": "Изтрий %(count)s устройства",
+    "Delete %(count)s devices|one": "Изтрий устройство",
+    "Device ID": "Идентификатор на устройство",
+    "Device Name": "Име на устройство",
+    "Last seen": "Последно видян",
+    "Select devices": "Избери устройства",
+    "Failed to set display name": "Неуспешно задаване на име",
+    "Disable Notifications": "Изключване на известия",
+    "Enable Notifications": "Включване на известия",
+    "Cannot add any more widgets": "Не могат да се добавят повече приспособления",
+    "The maximum permitted number of widgets have already been added to this room.": "Максимално разрешеният брой приспособления е вече добавен към тази стая.",
+    "Add a widget": "Добавяне на приспособление",
+    "Drop File Here": "Постави файл тук"
 }

From 1c96c1f4d9262cabc1841f0504abc1aee10fc88f Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Tue, 20 Feb 2018 10:17:13 +0000
Subject: [PATCH 543/927] Translated using Weblate (Bulgarian)

Currently translated at 38.0% (375 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index d5dd208602..1c7c2026ed 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -144,9 +144,9 @@
     "You are now ignoring %(userId)s": "Вече игнорирате %(userId)s",
     "Unignored user": "Неигнориран потребител",
     "You are no longer ignoring %(userId)s": "Вече не игнорирате %(userId)s",
-    "Device already verified!": "Устройството е вече верифицирано!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: Устройстовото е верифицирано, но ключовете не съвпадат!",
-    "Verified key": "Верифициран ключ",
+    "Device already verified!": "Устройството е вече потвърдено!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ВНИМАНИЕ: Устройстовото е потвърдено, но ключовете не съвпадат!",
+    "Verified key": "Потвърден ключ",
     "Unrecognised command:": "Неразпозната команда:",
     "Reason": "Причина",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прие поканата за %(displayName)s.",
@@ -272,5 +272,106 @@
     "Cannot add any more widgets": "Не могат да се добавят повече приспособления",
     "The maximum permitted number of widgets have already been added to this room.": "Максимално разрешеният брой приспособления е вече добавен към тази стая.",
     "Add a widget": "Добавяне на приспособление",
-    "Drop File Here": "Постави файл тук"
+    "Drop File Here": "Пусни файла тук",
+    "Drop file here to upload": "Пуснете файла тук, за да се качи",
+    " (unsupported)": " (не се поддържа)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Присъединете се като <voiceText>voice</voiceText> или <videoText>video</videoText>.",
+    "Ongoing conference call%(supportedText)s.": "Текущ групов разговор %(supportedText)s.",
+    "%(senderName)s sent an image": "%(senderName)s изпрати снимка",
+    "%(senderName)s sent a video": "%(senderName)s изпрати видео",
+    "%(senderName)s uploaded a file": "%(senderName)s качи файл",
+    "Options": "Настройки",
+    "Undecryptable": "Невъзможно разшифроване",
+    "Encrypted by a verified device": "Шифровано от потвърдено устройство",
+    "Encrypted by an unverified device": "Шифровано от непотвърдено устройство",
+    "Unencrypted message": "Нешифровано съобщение",
+    "Please select the destination room for this message": "Моля изберете стаята, в която искате да изпратите това съобщение",
+    "Blacklisted": "В черен списък",
+    "Verified": "Потвърдено",
+    "Unverified": "Непотвърдено",
+    "device id: ": "идентификатор на устройството: ",
+    "Disinvite": "Отмени поканата",
+    "Kick": "Изгони",
+    "Disinvite this user?": "Отмени поканата към този потребител?",
+    "Kick this user?": "Изгони този потребител?",
+    "Failed to kick": "Неуспешно изгонване",
+    "Unban": "Отблокирай",
+    "Ban": "Блокирай",
+    "Unban this user?": "Отблокирай този потребител?",
+    "Ban this user?": "Блокирай този потребител?",
+    "Failed to ban user": "Неуспешно блокиране на потребителя",
+    "Failed to mute user": "Неуспешно заглушаване на потребителя",
+    "Failed to toggle moderator status": "Неуспешна промяна на статуса на модератора",
+    "Failed to change power level": "Неуспешна промяна на нивото на достъп",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "След като си намалите нивото на достъп, няма да можете да възвърнете тази промяна. Ако сте потребителя с най-малко привилегии в тази стая, ще бъде невъзможно да възвърнете своите привилегии.",
+    "Are you sure?": "Сигурни ли сте?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Няма да можете да възвърнете тази промяна, тъй като повишавате този потребител да има същото ниво на достъп като Вашето.",
+    "No devices with registered encryption keys": "Няма устройства с регистрирани шифровани ключове",
+    "Devices": "Устройства",
+    "Unignore": "Премахни игнорирането",
+    "Ignore": "Игнориране",
+    "Mention": "Спомени",
+    "Direct chats": "Директни чатове",
+    "User Options": "Опции на потребителя",
+    "Invite": "Покани",
+    "Unmute": "Премахни заглушаването",
+    "Make Moderator": "Направи потребителя модератор",
+    "Admin Tools": "Инструменти на администратора",
+    "Level:": "Ниво:",
+    "and %(count)s others...|other": "и %(count)s други...",
+    "and %(count)s others...|one": "и още един...",
+    "Invited": "Поканен",
+    "Filter room members": "Филтриране на членовете в стаята",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (ниво на достъп %(powerLevelNumber)s)",
+    "Attachment": "Прикачване",
+    "Upload Files": "Качи файлове",
+    "Are you sure you want to upload the following files?": "Сигурни ли сте, че искате да качите тези файлове?",
+    "Encrypted room": "Шифрована стая",
+    "Unencrypted room": "Нешифрована стая",
+    "Hangup": "Затвори",
+    "Voice call": "Гласово повикване",
+    "Video call": "Видео повикване",
+    "Hide Apps": "Скрий приложенията",
+    "Show Apps": "Покани приложенията",
+    "Upload file": "Качи файл",
+    "Show Text Formatting Toolbar": "Показване на лентата с инструменти за форматиране на текст",
+    "Send an encrypted reply…": "Изпрати шифрован отговор…",
+    "Send a reply (unencrypted)…": "Отговори (нешифрованo)…",
+    "Send an encrypted message…": "Изпрати шифровано съобщение…",
+    "Send a message (unencrypted)…": "Изпрати съобщение (нешифровано)…",
+    "You do not have permission to post to this room": "Нямате разрешение да публикувате в тази стая",
+    "Turn Markdown on": "Включи Markdown",
+    "Turn Markdown off": "Изключи Markdown",
+    "Hide Text Formatting Toolbar": "Скриване на лентата с инструменти за форматиране на текст",
+    "Server error": "Сървърна грешка",
+    "Server unavailable, overloaded, or something else went wrong.": "Сървърът е недостъпен, претоварен или нещо друго се обърка.",
+    "Command error": "Грешка в командата",
+    "bold": "удебелен",
+    "italic": "курсивен",
+    "strike": "задраскан",
+    "underline": "подчертан",
+    "code": "код",
+    "quote": "цитат",
+    "bullet": "списък",
+    "numbullet": "номериран списък",
+    "Markdown is disabled": "Markdown е изключен",
+    "Markdown is enabled": "Markdown е включен",
+    "No pinned messages.": "Няма закачени съобщения.",
+    "Loading...": "Зареждане...",
+    "Pinned Messages": "Закачени съобщения",
+    "%(duration)ss": "%(duration)sсек",
+    "%(duration)sm": "%(duration)sмин",
+    "%(duration)sh": "%(duration)sч",
+    "%(duration)sd": "%(duration)sд",
+    "Online for %(duration)s": "Онлайн от %(duration)s",
+    "Idle for %(duration)s": "Неактивен от %(duration)s",
+    "Offline for %(duration)s": "Офлайн от %(duration)s",
+    "Unknown for %(duration)s": "Неизвестен от %(duration)s",
+    "Idle": "Неактивен",
+    "Offline": "Офлайн",
+    "Unknown": "Неизвестен",
+    "Replying": "Отговаря",
+    "Seen by %(userName)s at %(dateTime)s": "Видяно от %(userName)s в %(dateTime)s",
+    "Failed to set avatar.": "Неуспешно задаване на аватар.",
+    "Save": "Запази"
 }

From c5ad486c57d59eef7044126be2f21fe36ae61748 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Mon, 19 Feb 2018 20:17:44 +0000
Subject: [PATCH 544/927] Translated using Weblate (Catalan)

Currently translated at 89.2% (880 of 986 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 120134e296..40fbcc53b4 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -873,7 +873,7 @@
     "Your homeserver's URL": "URL del teu homeserver",
     "Your identity server's URL": "URL del teu servidor d'identitat",
     "Analytics": "Analítiques",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha canviat el seu nom visible a %(displayName)s.",
     "Server may be unavailable or overloaded": "El servidor pot estar inaccessible o sobrecarregat",
     "Report it": "Informa",
     "Found a bug?": "Has trobat un error?",

From d21f55633dfb3d5f99cf8b58f37d969b85da736e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 20 Feb 2018 14:03:43 +0000
Subject: [PATCH 545/927] Fix DMs being marked as with the current user ("me")

Whilst testing various DM paths, @lukebarnard1 found that there were
many failures to add the room as a DM against the correct user. It
turned out most of the failures seen were because the user chosen
was the current user. If the user accepted an invite it would often
be marked as with themselves because we chose the sender of the
join event as the DM user.

This fix makes the DM room setting process the same for both the
inviting client and the invited client. A RoomState.members
event causes the DM room state to be set in the room, regardless
of whether we are currently `joining` (see previous impl.)

The two cases for setting a DM are:
 - this user accepting an invite with is_direct
 - this user inviting someone with is_direct

This should handle all cases for setting DM state.
---
 src/components/structures/RoomView.js | 61 +++++++++++++++------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5304f38901..c827a63057 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -678,21 +678,40 @@ module.exports = React.createClass({
         // refresh the conf call notification state
         this._updateConfCallNotification();
 
-        // if we are now a member of the room, where we were not before, that
-        // means we have finished joining a room we were previously peeking
-        // into.
-        const me = MatrixClientPeg.get().credentials.userId;
-        if (this.state.joining && this.state.room.hasMembershipState(me, "join")) {
-            // Having just joined a room, check to see if it looks like a DM room, and if so,
-            // mark it as one. This is to work around the fact that some clients don't support
-            // is_direct. We should remove this once they do.
-            const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
-            if (Rooms.looksLikeDirectMessageRoom(this.state.room, me)) {
-                // XXX: There's not a whole lot we can really do if this fails: at best
-                // perhaps we could try a couple more times, but since it's a temporary
-                // compatability workaround, let's not bother.
-                Rooms.setDMRoom(this.state.room.roomId, me.events.member.getSender()).done();
-            }
+        const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
+        if (!me || me.membership !== "join") {
+            return;
+        }
+
+        // The user may have accepted an invite with is_direct set
+        if (me.events.member.getPrevContent().membership === "invite" &&
+            me.events.member.getPrevContent().is_direct
+        ) {
+            // This is a DM with the sender of the invite event (which we assume
+            // preceded the join event)
+            Rooms.setDMRoom(
+                this.state.room.roomId,
+                me.events.member.getUnsigned().prev_sender,
+            );
+            return;
+        }
+
+        const invitedMembers = this.state.room.getMembersWithMembership("invite");
+        const joinedMembers = this.state.room.getMembersWithMembership("join");
+
+        // There must be one invited member and one joined member
+        if (invitedMembers.length !== 1 || joinedMembers.length !== 1) {
+            return;
+        }
+
+        // The user may have sent an invite with is_direct sent
+        const other = invitedMembers[0];
+        if (other &&
+            other.membership === "invite" &&
+            other.events.member.getContent().is_direct
+        ) {
+            Rooms.setDMRoom(this.state.room.roomId, other.userId);
+            return;
         }
     }, 500),
 
@@ -826,18 +845,6 @@ module.exports = React.createClass({
                 action: 'join_room',
                 opts: { inviteSignUrl: signUrl },
             });
-
-            // if this is an invite and has the 'direct' hint set, mark it as a DM room now.
-            if (this.state.room) {
-                const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
-                if (me && me.membership == 'invite') {
-                    if (me.events.member.getContent().is_direct) {
-                        // The 'direct' hint is there, so declare that this is a DM room for
-                        // whoever invited us.
-                        return Rooms.setDMRoom(this.state.room.roomId, me.events.member.getSender());
-                    }
-                }
-            }
             return Promise.resolve();
         });
     },

From bc15303358c58226c4ef47793d34276d58d9b1ee Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 20 Feb 2018 14:10:34 +0000
Subject: [PATCH 546/927] Factor out updateDmState

---
 src/components/structures/RoomView.js | 75 ++++++++++++++-------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index c827a63057..8ceba2a850 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -677,42 +677,7 @@ module.exports = React.createClass({
         // a member state changed in this room
         // refresh the conf call notification state
         this._updateConfCallNotification();
-
-        const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
-        if (!me || me.membership !== "join") {
-            return;
-        }
-
-        // The user may have accepted an invite with is_direct set
-        if (me.events.member.getPrevContent().membership === "invite" &&
-            me.events.member.getPrevContent().is_direct
-        ) {
-            // This is a DM with the sender of the invite event (which we assume
-            // preceded the join event)
-            Rooms.setDMRoom(
-                this.state.room.roomId,
-                me.events.member.getUnsigned().prev_sender,
-            );
-            return;
-        }
-
-        const invitedMembers = this.state.room.getMembersWithMembership("invite");
-        const joinedMembers = this.state.room.getMembersWithMembership("join");
-
-        // There must be one invited member and one joined member
-        if (invitedMembers.length !== 1 || joinedMembers.length !== 1) {
-            return;
-        }
-
-        // The user may have sent an invite with is_direct sent
-        const other = invitedMembers[0];
-        if (other &&
-            other.membership === "invite" &&
-            other.events.member.getContent().is_direct
-        ) {
-            Rooms.setDMRoom(this.state.room.roomId, other.userId);
-            return;
-        }
+        this._updateDMState();
     }, 500),
 
     _checkIfAlone: function(room) {
@@ -753,6 +718,44 @@ module.exports = React.createClass({
         });
     },
 
+    _updateDMState() {
+        const me = this.state.room.getMember(MatrixClientPeg.get().credentials.userId);
+        if (!me || me.membership !== "join") {
+            return;
+        }
+
+        // The user may have accepted an invite with is_direct set
+        if (me.events.member.getPrevContent().membership === "invite" &&
+            me.events.member.getPrevContent().is_direct
+        ) {
+            // This is a DM with the sender of the invite event (which we assume
+            // preceded the join event)
+            Rooms.setDMRoom(
+                this.state.room.roomId,
+                me.events.member.getUnsigned().prev_sender,
+            );
+            return;
+        }
+
+        const invitedMembers = this.state.room.getMembersWithMembership("invite");
+        const joinedMembers = this.state.room.getMembersWithMembership("join");
+
+        // There must be one invited member and one joined member
+        if (invitedMembers.length !== 1 || joinedMembers.length !== 1) {
+            return;
+        }
+
+        // The user may have sent an invite with is_direct sent
+        const other = invitedMembers[0];
+        if (other &&
+            other.membership === "invite" &&
+            other.events.member.getContent().is_direct
+        ) {
+            Rooms.setDMRoom(this.state.room.roomId, other.userId);
+            return;
+        }
+    },
+
     onSearchResultsResize: function() {
         dis.dispatch({ action: 'timeline_resize' }, true);
     },

From f227d13dfe701b4b96a2cfb1e1e75b3d868195bd Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Tue, 20 Feb 2018 14:21:24 +0000
Subject: [PATCH 547/927] Translated using Weblate (Bulgarian)

Currently translated at 43.8% (432 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 1c7c2026ed..f47b3b24ee 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -41,7 +41,7 @@
     "Online": "Онлайн",
     "Failed to remove tag %(tagName)s from room": "Неуспешно премахване на %(tagName)s етикет от стаята",
     "unknown error code": "неизвестен код за грешка",
-    "Failed to forget room %(errCode)s": "Не успешно забравяне на стаята %(errCode)s",
+    "Failed to forget room %(errCode)s": "Неуспешно забравяне на стаята %(errCode)s",
     "Mute": "Заглуши",
     "Leave": "Напусни",
     "Favourite": "Любим",
@@ -372,6 +372,63 @@
     "Unknown": "Неизвестен",
     "Replying": "Отговаря",
     "Seen by %(userName)s at %(dateTime)s": "Видяно от %(userName)s в %(dateTime)s",
-    "Failed to set avatar.": "Неуспешно задаване на аватар.",
-    "Save": "Запази"
+    "Failed to set avatar.": "Неуспешно задаване на профилна снимка.",
+    "Save": "Запази",
+    "(~%(count)s results)|other": "(~%(count)s резултати)",
+    "(~%(count)s results)|one": "(~%(count)s резултат)",
+    "Join Room": "Присъедини се към стаята",
+    "Upload avatar": "Качи профилната снимка",
+    "Remove avatar": "Премахни профилната снимка",
+    "Settings": "Настройки",
+    "Forget room": "Забрави стаята",
+    "Show panel": "Покажи панелa",
+    "Drop here to favourite": "За любим пуснeте тук",
+    "Drop here to tag direct chat": "Пуснете тук, за да означите директен чат",
+    "Drop here to restore": "Пуснете тук за възстановяване",
+    "Drop here to demote": "Пуснете тук за",
+    "Drop here to tag %(section)s": "Пуснете тук, за да означите %(section)s",
+    "Failed to set direct chat tag": "Неуспешно означаване на директен чат",
+    "Press <StartChatButton> to start a chat with someone": "Натиснете <StartChatButton>, за да започнете чат с някого",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Все още не сте в нито една стая! Натиснете <CreateRoomButton>, за да направите такава или <RoomDirectoryButton>, за да прегледате директорията",
+    "Community Invites": "Покани за общества",
+    "Invites": "Покани",
+    "Favourites": "Любими",
+    "People": "Хора",
+    "Low priority": "Нисък приоритет",
+    "Historical": "Архив",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не може да се потвърди, че адреса към който е изпратена тази покана е обвързан с акаунта Ви.",
+    "This invitation was sent to an email address which is not associated with this account:": "Тази покана е изпратена на имейл адрес, който не е свързан с този профил:",
+    "You may wish to login with a different account, or add this email to this account.": "Може да искате да влезете с друг профил или да добавите този имейл в този профил.",
+    "You have been invited to join this room by %(inviterName)s": "Вие сте поканен да се присъедините към тази стая от %(inviterName)s",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Желаете да <acceptText>приемете</acceptText> или да <declineText>откажете</declineText> тази покана?",
+    "Reason: %(reasonText)s": "Причина: %(reasonText)s",
+    "Rejoin": "Повторно присъединяване",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Вие сте изгонен от %(roomName)s от %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Вие сте изгонен от тази стая от %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Вие сте блокиран в %(roomName)s от %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Вие сте блокиран в тази стая от %(userName)s.",
+    "This room": "В тази стая",
+    "%(roomName)s does not exist.": "%(roomName)s не съществува.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s не е достъпна към този момент.",
+    "You are trying to access %(roomName)s.": "Опитвате се да влезете в %(roomName)s.",
+    "You are trying to access a room.": "Опитвате се да влезете в стая.",
+    "<a>Click here</a> to join the discussion!": "<a>Натиснете тук</a>, за да се присъедините към дискусията!",
+    "This is a preview of this room. Room interactions have been disabled": "Това е преглед на стаята. Интеракции в нея са деактивирани",
+    "To change the room's avatar, you must be a": "За да смените снимката на стаята, трябва да бъдете",
+    "To change the room's name, you must be a": "За да смените името на стаята, трябва да бъдете",
+    "To change the room's main address, you must be a": "За да смените основния адрес на стаята, трябва да бъдете",
+    "To change the room's history visibility, you must be a": "За да смените видимостта на историята на стаята, трябва да бъдете",
+    "To change the permissions in the room, you must be a": "За да промените разрешенията в стаята, трябва да бъдете",
+    "To change the topic, you must be a": "За да смените темата, трябва да бъдете",
+    "To modify widgets in the room, you must be a": "За да промените приспособленията в стаята, трябва да бъдете",
+    "Failed to unban": "Неуспешно отблокиране",
+    "Banned by %(displayName)s": "Блокиран от %(displayName)s",
+    "Privacy warning": "Предупреждение за сигурност",
+    "Changes to who can read history will only apply to future messages in this room": "Промени за това кой може да чете историята ще се отнасят само за бъдещи съобщения в тази стая",
+    "The visibility of existing history will be unchanged": "Видимостта на съществуващата история ще остане непроменена",
+    "End-to-end encryption is in beta and may not be reliable": "Шифроване от край до край е в бета версия и може да не е надеждно",
+    "Devices will not yet be able to decrypt history from before they joined the room": "Устройства все още не могат да разшифроват история от преди присъединяването към стая",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Веднъж включено шифроване в стаята не може да бъде изключено (за сега)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "Шифровани съобщения не са видими за клиенти, които все още не поддържат шифроване",
+    "Enable encryption": "Включване на шифроване"
 }

From 644ddbf9b9d7488c247129f4718afed523185d90 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 20 Feb 2018 17:57:46 +0000
Subject: [PATCH 548/927] Regenerate room lists on Room event

To make sure that we handle rooms that our
client has not seen previously, we regenerate
the room list when the room is stored -
which is indicated by the js-sdk by the
Room event.
---
 src/actions/MatrixActionCreators.js | 5 +++++
 src/stores/RoomListStore.js         | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index a307af6f57..78c653c551 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -62,6 +62,10 @@ function createAccountDataAction(matrixClient, accountDataEvent) {
     };
 }
 
+function createRoomAction(matrixClient, room) {
+    return { action: 'MatrixActions.Room', room };
+}
+
 function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
     return { action: 'MatrixActions.Room.tags', room };
 }
@@ -96,6 +100,7 @@ export default {
     start(matrixClient) {
         this._addMatrixClientListener(matrixClient, 'sync', createSyncAction);
         this._addMatrixClientListener(matrixClient, 'accountData', createAccountDataAction);
+        this._addMatrixClientListener(matrixClient, 'Room', createRoomAction);
         this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
         this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
         this._addMatrixClientListener(matrixClient, 'RoomMember.membership', createRoomMembershipAction);
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 8a3af309fc..80db6ca9a8 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -97,6 +97,14 @@ class RoomListStore extends Store {
                 this._generateRoomLists();
             }
             break;
+            // This could be a new room that we've been invited to, joined or created
+            // we won't get a RoomMember.membership for these cases if we're not already
+            // a member.
+            case 'MatrixActions.Room': {
+                if (!this._state.ready || !this._matrixClient.credentials.userId) break;
+                this._generateRoomLists();
+            }
+            break;
             case 'RoomListActions.tagRoom.pending': {
                 // XXX: we only show one optimistic update at any one time.
                 // Ideally we should be making a list of in-flight requests

From a78575929c47f6895cfe09ec812c5bcfdde3d6ce Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 21 Feb 2018 10:15:52 +0000
Subject: [PATCH 549/927] Document a few action creators

---
 src/actions/MatrixActionCreators.js | 79 +++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 78c653c551..1998ecfef2 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -62,14 +62,75 @@ function createAccountDataAction(matrixClient, accountDataEvent) {
     };
 }
 
+/**
+ * @typedef RoomAction
+ * @type {Object}
+ * @property {string} action 'MatrixActions.Room'.
+ * @property {Room} room the Room that was stored.
+ */
+
+/**
+ * Create a MatrixActions.Room action that represents a MatrixClient `Room`
+ * matrix event, emitted when a Room is stored in the client.
+ *
+ * @param {MatrixClient} matrixClient the matrix client.
+ * @param {Room} room the Room that was stored.
+ * @returns {RoomAction} an action of type `MatrixActions.Room`.
+ */
 function createRoomAction(matrixClient, room) {
     return { action: 'MatrixActions.Room', room };
 }
 
+/**
+ * @typedef RoomTagsAction
+ * @type {Object}
+ * @property {string} action 'MatrixActions.Room.tags'.
+ * @property {Room} room the Room whose tags changed.
+ */
+
+/**
+ * Create a MatrixActions.Room.tags action that represents a MatrixClient
+ * `Room.tags` matrix event, emitted when the m.tag room account data
+ * event is updated.
+ *
+ * @param {MatrixClient} matrixClient the matrix client.
+ * @param {MatrixEvent} roomTagsEvent the m.tag event.
+ * @param {Room} room the Room whose tags were changed.
+ * @returns {RoomTagsAction} an action of type `MatrixActions.Room.tags`.
+ */
 function createRoomTagsAction(matrixClient, roomTagsEvent, room) {
     return { action: 'MatrixActions.Room.tags', room };
 }
 
+/**
+ * @typedef RoomTimelineAction
+ * @type {Object}
+ * @property {string} action 'MatrixActions.Room.timeline'.
+ * @property {boolean} isLiveEvent whether the event was attached to a
+ * live timeline.
+ * @property {boolean} isLiveUnfilteredRoomTimelineEvent whether the
+ * event was attached to a timeline in the set of unfiltered timelines.
+ * @property {Room} room the Room whose tags changed.
+ */
+
+/**
+ * Create a MatrixActions.Room.timeline action that represents a
+ * MatrixClient `Room.timeline` matrix event, emitted when an event
+ * is added to or removed from a timeline of a room.
+ *
+ * @param {MatrixClient} matrixClient the matrix client.
+ * @param {MatrixEvent} timelineEvent the event that was added/removed.
+ * @param {Room} room the Room that was stored.
+ * @param {boolean} toStartOfTimeline whether the event is being added
+ * to the start (and not the end) of the timeline.
+ * @param {boolean} removed whether the event was removed from the
+ * timeline.
+ * @param {Object} data
+ * @param {boolean} data.liveEvent whether the event is a live event,
+ * belonging to a live timeline.
+ * @param {EventTimeline} data.timeline the timeline being altered.
+ * @returns {RoomTimelineAction} an action of type `MatrixActions.Room.timeline`.
+ */
 function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTimeline, removed, data) {
     return {
         action: 'MatrixActions.Room.timeline',
@@ -80,6 +141,24 @@ function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTi
     };
 }
 
+/**
+ * @typedef RoomMembershipAction
+ * @type {Object}
+ * @property {string} action 'MatrixActions.RoomMember.membership'.
+ * @property {RoomMember} member the member whose membership was updated.
+ */
+
+/**
+ * Create a MatrixActions.RoomMember.membership action that represents
+ * a MatrixClient `RoomMember.membership` matrix event, emitted when a
+ * member's membership is updated.
+ *
+ * @param {MatrixClient} matrixClient the matrix client.
+ * @param {MatrixEvent} membershipEvent the m.room.member event.
+ * @param {RoomMember} member the member whose membership was updated.
+ * @param {string} oldMembership the member's previous membership.
+ * @returns {RoomMembershipAction} an action of type `MatrixActions.RoomMember.membership`.
+ */
 function createRoomMembershipAction(matrixClient, membershipEvent, member, oldMembership) {
     return { action: 'MatrixActions.RoomMember.membership', member };
 }

From b7601f86d1dbdb347c439c73e4477dc3ee799583 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Wed, 21 Feb 2018 13:37:58 +0000
Subject: [PATCH 550/927] Translated using Weblate (Bulgarian)

Currently translated at 76.8% (758 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index f47b3b24ee..35505c0038 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -48,7 +48,7 @@
     "Register": "Регистрация",
     "Notifications": "Известия",
     "Rooms": "Стаи",
-    "Add rooms to this community": "Добави стаи в това общество",
+    "Add rooms to this community": "Добави стаи в тази общност",
     "Unnamed room": "Стая без име",
     "World readable": "Четимо за всички",
     "Guests can join": "Гости могат да се присъединят",
@@ -87,18 +87,18 @@
     "Upload Failed": "Качването е неуспешно",
     "PM": "PM",
     "AM": "AM",
-    "Who would you like to add to this community?": "Кой бихте желали да добавите в това общество?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Предупреждение: Всеки човек, който добавяте в дадено общество, ще бъде публично видим за знаещите идентификатора на обществото",
-    "Invite new community members": "Покани нови членове на обществото",
+    "Who would you like to add to this community?": "Кого бихте желали да добавите в тaзи общност?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Предупреждение: Всеки човек, който добавяте в дадена общност, ще бъде публично видим за знаещите идентификатора на общността",
+    "Invite new community members": "Покани нови членове в общността",
     "Name or matrix ID": "Име или matrix ID",
-    "Invite to Community": "Покани в обществото",
-    "Which rooms would you like to add to this community?": "Кои стаи бихте желали да добавите в това общество?",
-    "Show these rooms to non-members on the community page and room list?": "Показване на тези стаи на не-членове на страницата на обществата и списъка със стаи?",
-    "Add rooms to the community": "Добави стаи в обществото",
+    "Invite to Community": "Покани в общността",
+    "Which rooms would you like to add to this community?": "Кои стаи бихте желали да добавите в тази общност?",
+    "Show these rooms to non-members on the community page and room list?": "Показване на тези стаи на не-членове на страницата на общностите и списъка със стаи?",
+    "Add rooms to the community": "Добави стаи в общността",
     "Room name or alias": "Име или псевдоним на стая",
-    "Add to community": "Добави в обществото",
+    "Add to community": "Добави в общност",
     "Failed to invite the following users to %(groupId)s:": "Следните потребители не могат да бъдат поканени в %(groupId)s:",
-    "Failed to invite users to community": "Потребителите не могат да бъдат поканени в обществото",
+    "Failed to invite users to community": "Потребителите не могат да бъдат поканени в общността",
     "Failed to invite users to %(groupId)s": "Потребителите не могат да бъдат поканени в %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Следните стаи не могат да бъдат добавени в %(groupId)s:",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot няма разрешение да Ви изпраща известия - моля проверете вашите настройки на браузъра",
@@ -123,7 +123,7 @@
     "You need to be logged in.": "Трябва да влезете в профила си.",
     "You need to be able to invite users to do that.": "Трябва да имате право да добавите потребители, за да извършите това.",
     "Unable to create widget.": "Неуспешно създаване на приспособление.",
-    "Failed to send request.": "Неуспешно изпращане на запитване.",
+    "Failed to send request.": "Неуспешно изпращане на заявката.",
     "This room is not recognised.": "Стаята не е разпозната.",
     "Power level must be positive integer.": "Нивото на достъп трябва да бъде позитивно число.",
     "Call Anyway": "Обади се въпреки това",
@@ -198,7 +198,7 @@
     "%(names)s and %(lastPerson)s are typing": "%(names)s и %(lastPerson)s пишат",
     "Failure to create room": "Неуспешно създаване на стая",
     "Server may be unavailable, overloaded, or you hit a bug.": "Сървърът може би е претоварен, недостъпен или се натъкнахте на проблем.",
-    "Send anyway": "Изпрати така или иначе",
+    "Send anyway": "Изпрати въпреки това",
     "Unnamed Room": "Стая без име",
     "Your browser does not support the required cryptography extensions": "Вашият браузър не поддържа необходимите разширения за шифроване",
     "Not a valid Riot keyfile": "Невалиден Riot ключов файл",
@@ -286,7 +286,7 @@
     "Encrypted by an unverified device": "Шифровано от непотвърдено устройство",
     "Unencrypted message": "Нешифровано съобщение",
     "Please select the destination room for this message": "Моля изберете стаята, в която искате да изпратите това съобщение",
-    "Blacklisted": "В черен списък",
+    "Blacklisted": "В черния списък",
     "Verified": "Потвърдено",
     "Unverified": "Непотвърдено",
     "device id: ": "идентификатор на устройството: ",
@@ -390,7 +390,7 @@
     "Failed to set direct chat tag": "Неуспешно означаване на директен чат",
     "Press <StartChatButton> to start a chat with someone": "Натиснете <StartChatButton>, за да започнете чат с някого",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Все още не сте в нито една стая! Натиснете <CreateRoomButton>, за да направите такава или <RoomDirectoryButton>, за да прегледате директорията",
-    "Community Invites": "Покани за общества",
+    "Community Invites": "Покани за общност",
     "Invites": "Покани",
     "Favourites": "Любими",
     "People": "Хора",
@@ -430,5 +430,331 @@
     "Devices will not yet be able to decrypt history from before they joined the room": "Устройства все още не могат да разшифроват история от преди присъединяването към стая",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Веднъж включено шифроване в стаята не може да бъде изключено (за сега)",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Шифровани съобщения не са видими за клиенти, които все още не поддържат шифроване",
-    "Enable encryption": "Включване на шифроване"
+    "Enable encryption": "Включване на шифроване",
+    "(warning: cannot be disabled again!)": "(внимание: не може да бъде изключено отново!)",
+    "Encryption is enabled in this room": "Шифроването е включено в тази стая",
+    "Encryption is not enabled in this room": "Шифроването не е включено в тази стая",
+    "Privileged Users": "Потребители с привилегии",
+    "%(user)s is a": "%(user)s е",
+    "No users have specific privileges in this room": "Никой няма специфични привилегии в тази стая",
+    "Banned users": "Блокирани потребители",
+    "This room is not accessible by remote Matrix servers": "Тази стая не е достъпна за далечни Matrix сървъри",
+    "Leave room": "Напусни стаята",
+    "Tagged as: ": "Означен като: ",
+    "To link to a room it must have <a>an address</a>.": "За да дадете линк към стаята, тя трябва да има <a>адрес</a>.",
+    "Guests cannot join this room even if explicitly invited.": "Гости не могат да се присъединят към тази стая, дори изрично поканени.",
+    "Click here to fix": "Натиснете тук за поправяне",
+    "Who can access this room?": "Кой има достъп до тази стая?",
+    "Only people who have been invited": "Само хора, които са поканени",
+    "Anyone who knows the room's link, apart from guests": "Всеки, който знае адреса на стаята, освен гости",
+    "Anyone who knows the room's link, including guests": "Всеки, който знае адрес на стаята, включително гости",
+    "Publish this room to the public in %(domain)s's room directory?": "Публично публикуване на тази стая в директорията на %(domain)s?",
+    "Who can read history?": "Кой може да чете историята?",
+    "Anyone": "Всеки",
+    "Members only (since the point in time of selecting this option)": "Само членове (от момента на избиране на тази опция)",
+    "Members only (since they were invited)": "Само членове (от момента, в който те са поканени)",
+    "Members only (since they joined)": "Само членове (от момента, в който са се присъединили)",
+    "Permissions": "Разрешения",
+    "The default role for new room members is": "По подразбиране ролята за нови членове в стаята е",
+    "To send messages, you must be a": "За да изпращате съобщения, трябва да бъдете",
+    "To invite users into the room, you must be a": "За да поканите потребители в стаята, трябва да бъдете",
+    "To configure the room, you must be a": "За да конфигурирате стаята, трябва да бъдете",
+    "To kick users, you must be a": "За да изгоните потребител, трябва да бъдете",
+    "To ban users, you must be a": "За да блокирате потребител, трябва да бъдете",
+    "To remove other users' messages, you must be a": "За да премахнете съобщения на друг потребител, трябва да бъдете",
+    "To send events of type <eventType/>, you must be a": "За да изпратите събития от вида <eventType/>, трябва да бъдете",
+    "Advanced": "Разширени",
+    "This room's internal ID is": "Вътрешният идентификатор на тази стая е",
+    "Add a topic": "Добавете тема",
+    "Jump to first unread message.": "Отиди до първото непрочетено съобщение.",
+    "Scroll to unread messages": "Скролирай до непрочетените съобщения",
+    "Invalid alias format": "Невалиден формат на псевдонима",
+    "'%(alias)s' is not a valid format for an alias": "%(alias)s не е валиден формат на псевдоним",
+    "Invalid address format": "Невалиден формат на адреса",
+    "'%(alias)s' is not a valid format for an address": "%(alias)s не е валиден формат на адрес",
+    "not specified": "неопределен",
+    "not set": "незададен",
+    "Remote addresses for this room:": "Далечни адреси на тази стая:",
+    "Addresses": "Адреси",
+    "The main address for this room is": "Основният адрес на тази стая е",
+    "Local addresses for this room:": "Локалните адреси на тази стая са:",
+    "This room has no local addresses": "Тази стая няма локални адреси",
+    "New address (e.g. #foo:%(localDomain)s)": "Нов адрес (напр. #foo:%(localDomain)s)",
+    "Invalid community ID": "Невалиден идентификатор на общност",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' е невалиден идентификатор на общност",
+    "Flair": "Значка",
+    "Showing flair for these communities:": "Показване на значки за тези общности:",
+    "This room is not showing flair for any communities": "Тази стая не показва значки за нито една общност",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Нов идентификатор на общност (напр. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "Вие сте <a>включил</a> URL прегледи по подразбиране.",
+    "You have <a>disabled</a> URL previews by default.": "Вие сте <a>изключил</a> URL прегледи по подразбиране.",
+    "URL previews are enabled by default for participants in this room.": "URL прегледи са включени по подразбиране за участниците в тази стая.",
+    "URL previews are disabled by default for participants in this room.": "URL прегледи са изключени по подразбиране за участниците в тази стая.",
+    "URL Previews": "URL прегледи",
+    "Error decrypting audio": "Грешка при разшифроване на аудио файл",
+    "Error decrypting attachment": "Грешка при разшифроване на прикачване",
+    "Decrypt %(text)s": "Разшифровай %(text)s",
+    "Download %(text)s": "Изтегли %(text)s",
+    "(could not connect media)": "(неуспешно свързване на медийните устройства)",
+    "Must be viewing a room": "Трябва да видите стаята",
+    "Usage": "Употреба",
+    "Remove from community": "Премахни от общността",
+    "Disinvite this user from community?": "Оттегляне на поканата към този потребител от общността?",
+    "Remove this user from community?": "Премахване на този потребител от общността?",
+    "Failed to remove user from community": "Неуспешно премахване на потребителя от тази общност",
+    "Filter community members": "Филтриране на членовете на общността",
+    "Removing a room from the community will also remove it from the community page.": "Премахване на стая от общността ще бъде също премахната от страницата с общността.",
+    "Failed to remove room from community": "Неуспешно премахване на стаята от общността",
+    "Only visible to community members": "Видимо само за членове на общността",
+    "Filter community rooms": "Филтрирай стаи на общността",
+    "Community IDs cannot not be empty.": "Идентификаторите на общността не могат да бъдат празни.",
+    "Create Community": "Създай общност",
+    "Community Name": "Име на общност",
+    "Community ID": "Идентификатор на общност",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML за страница на Вашата общност</h1>\n<p>\n    Използвайте дългото описание, за да въведете нови членове в общността, \n    или да разпространите важни <a href=\"foo\">връзки</a>\n</p>\n<p>\n    Можете дори да използвате 'img' тагове\n</p>\n",
+    "Add rooms to the community summary": "Добавете стаи към обобщението на общността",
+    "Add users to the community summary": "Добавете потребители към обобщението на общността",
+    "Failed to update community": "Неуспешно обновяване на общността",
+    "Leave Community": "Напусни общността",
+    "Community Settings": "Настройки на общността",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Тези стаи са показани на членове на общността на страницата на общността. Членовете на общността могат да се присъединят към стаите като натиснат върху тях.",
+    "%(inviter)s has invited you to join this community": "%(inviter)s Ви покани да се присъедините към тази общност",
+    "You are an administrator of this community": "Вие сте администратор на тази общност",
+    "You are a member of this community": "Вие сте член на тази общност",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Вашата общност няма дълго описание - HTML страница, която да се показва на членовете на общността. <br/>Натиснете тук, за да отворите настройките и да създадете такова!",
+    "Community %(groupId)s not found": "Общност %(groupId)s не е намерена",
+    "Create a new community": "Създаване на нова общност",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Създайте общност, за да обедините заедно потребители и стаи! Изградете персонализирана начална страница, за да маркирате своето пространство във Вселената на матрицата.",
+    "Join an existing community": "Присъединяване към вече съществуваща общност",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "За да се присъедините към вече съществуваща общност, трябва да знаете неиния идентификатор; това изглежда нещо подобно на <i>+example:matrix.org</i>.",
+    "Unknown (user, device) pair:": "Непозната двойка (потребител, устройство):",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Подписващият ключ, който сте предоставили, съвпада с подписващия ключ, който сте получили от устройството %(deviceId)s на %(userId)s. Устройството е маркирано като потвърдено.",
+    "Hide avatars in user and room mentions": "Скриване на профилната снимка при споменаване на потребители и стаи",
+    "Jump to message": "Отиди до съобщението",
+    "Jump to read receipt": "Отиди до потвърдението за прочетено",
+    "Revoke Moderator": "Премахване на правата на модератора",
+    "You should not yet trust it to secure data": "Все още не трябва да се доверявате на това, че ще запази Вашите данни",
+    "Invalid file%(extra)s": "Невалиден файл%(extra)s",
+    "Error decrypting image": "Грешка при разшифроване на снимка",
+    "This image cannot be displayed.": "Тази снимка не може да бъде показана.",
+    "Image '%(Body)s' cannot be displayed.": "Снимката '%(Body)s' не може да бъде показана.",
+    "Error decrypting video": "Грешка при разшифроване на видео",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s промени аватара на %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s премахна аватара на стаята.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s промени аватара на стаята на <img/>",
+    "Copied!": "Копирано!",
+    "Failed to copy": "Неуспешно копиране",
+    "Add an Integration": "Добавяне на интеграция",
+    "Removed or unknown message type": "Премахнато или неизвестен тип съобщение",
+    "Message removed by %(userId)s": "Съобщението е премахнато от %(userId)s",
+    "Message removed": "Съобщението е премахнато",
+    "This Home Server would like to make sure you are not a robot": "Този Home сървър би искал да се увери, че не сте робот",
+    "Sign in with CAS": "Влез с CAS",
+    "To continue, please enter your password.": "За да продължите, моля, въведете своята парола.",
+    "Password:": "Парола:",
+    "An email has been sent to %(emailAddress)s": "Имейл беше изпратен на %(emailAddress)s",
+    "Please check your email to continue registration.": "Моля, проверете имейла си, за да продължите регистрацията.",
+    "Token incorrect": "Неправителен token",
+    "A text message has been sent to %(msisdn)s": "Текстово съобщение беше изпратено на %(msisdn)s",
+    "Please enter the code it contains:": "Моля, въведете кода, който то съдържа:",
+    "Start authentication": "Започнете автентикация",
+    "Username on %(hs)s": "Потребителско име на %(hs)s",
+    "User name": "Потребителско име",
+    "Mobile phone number": "Мобилен номер",
+    "Forgot your password?": "Забравена парола?",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
+    "Sign in with": "Влезте с",
+    "Email address": "Имейл адрес",
+    "Sign in": "Вход",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ако не посочите имейл адрес, няма да бъде възможно да възстановите Вашата парола. Сигурни ли сте?",
+    "Email address (optional)": "Имейл адрес (по избор)",
+    "You are registering with %(SelectedTeamName)s": "Регистрирате се с %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Мобилен номер (по избор)",
+    "Default server": "Сървър по подразбиране",
+    "Custom server": "Потребителски сървър",
+    "Home server URL": "Адрес на home сървър",
+    "Identity server URL": "Адрес на сървър за самоличност",
+    "What does this mean?": "Какво означава това?",
+    "Failed to withdraw invitation": "Неуспешно оттегляне на поканата",
+    "Flair will appear if enabled in room settings": "Значката ще се покаже, ако е включена в настройките на стаята",
+    "Flair will not appear": "Значката няма да се покаже",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Сигурни ли сте, че искате да премахнете '%(roomName)s' от %(groupId)s?",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Неуспешно премахване на '%(roomName)s' от %(groupId)s",
+    "Something went wrong!": "Нещо се обърка!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Видимостта на '%(roomName)s' в %(groupId)s не може да бъде обновена.",
+    "Visibility in Room List": "Видимост в списъка със стаи",
+    "Visible to everyone": "Видимо за всеки",
+    "Something went wrong when trying to get your communities.": "Нещо се обърка при зареждането на Вашите общности.",
+    "Display your community flair in rooms configured to show it.": "Показване на значката на общността в стаи, кофигурирани да я показват.",
+    "You're not currently a member of any communities.": "Към момента не сте член на нито една общност.",
+    "Unknown Address": "Неизвестен адрес",
+    "NOTE: Apps are not end-to-end encrypted": "ЗАБЕЛЕЖКА: Приложенията не са шифровани от край до край",
+    "Do you want to load widget from URL:": "Искате ли да заредите приспособление от URL адреса:",
+    "Allow": "Позволение",
+    "Delete Widget": "Изтриване на приспособление",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Изтриването на приспособление го премахва за всички потребители в тази стая. Сигурни ли сте, че искате да изтриете това приспособление?",
+    "Delete widget": "Изтрий приспособлението",
+    "Revoke widget access": "Премахване на достъпа до приспособления",
+    "Minimize apps": "Минимизирай приложенията",
+    "Create new room": "Създай нова стая",
+    "Unblacklist": "Премахване от черния списък",
+    "Blacklist": "Черен списък",
+    "Unverify": "Махни потвърждението",
+    "Verify...": "Потвърди...",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Вашето непотвърдено устройство '%(displayName)s' изисква ключове за шифроване.",
+    "I have verified my email address": "Потвърдих имейл адреса си",
+    "NOT verified": "НЕ е потвърдено",
+    "verified": "потвърдено",
+    "No results": "Няма резултати",
+    "Delete": "Изтрий",
+    "Communities": "Общности",
+    "Home": "Начална страница",
+    "Integrations Error": "Грешка при интеграциите",
+    "Could not connect to the integration server": "Неуспешно свързване със сървъра с интеграции",
+    "Manage Integrations": "Управление на интеграциите",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sсе присъединиха %(count)s пъти",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)sсе присъединиха",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sсе присъедини %(count)s пъти",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sсе присъедини",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)sнапуснаха %(count)s пъти",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)sнапуснаха",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sнапусна %(count)s пъти",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sнапусна",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)sсе присъединиха и напуснаха %(count)s пъти",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)sсе присъединиха и напуснаха",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sсе присъедини и напусна %(count)s пъти",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sсе присъедини и напусна",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)sнапуснаха и се присъединиха отново %(count)s пъти",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sнапуснаха и се присъединиха отново",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sнапусна и се присъедини отново %(count)s пъти",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sнапусна и се присъедини отново",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sотказаха своите покани %(count)s пъти",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sотказаха своите покани",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотказа своята покана %(count)s пъти",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sотказа своята покана",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sоттеглиха своите покани %(count)s пъти",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sоттеглиха своите покани",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sоттегли своята покана %(count)s пъти",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sоттегли своята покана",
+    "were invited %(count)s times|other": "бяха поканени %(count)s пъти",
+    "were invited %(count)s times|one": "бяха поканени",
+    "was invited %(count)s times|other": "беше поканен %(count)s пъти",
+    "was invited %(count)s times|one": "беше поканен",
+    "were banned %(count)s times|other": "бяха блокирани %(count)s пъти",
+    "were banned %(count)s times|one": "бяха блокирани",
+    "was banned %(count)s times|other": "беше блокиран %(count)s пъти",
+    "was banned %(count)s times|one": "беше блокиран",
+    "were unbanned %(count)s times|other": "бяха отблокирани %(count)s пъти",
+    "were unbanned %(count)s times|one": "бяха отблокирани",
+    "was unbanned %(count)s times|other": "беше отблокиран %(count)s пъти",
+    "was unbanned %(count)s times|one": "беше отблокиран",
+    "were kicked %(count)s times|other": "бяха изгонени %(count)s пъти",
+    "were kicked %(count)s times|one": "бяха изгонени",
+    "was kicked %(count)s times|other": "беше изгонен %(count)s пъти",
+    "was kicked %(count)s times|one": "беше изгонен",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)sсмениха своето име %(count)s пъти",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)sсмениха своето име",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sсмени своето име %(count)s пъти",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sсмени своето име",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)sсмениха своята профилна снимка %(count)s пъти",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)sсмениха своята профилна снимка",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sсмени своята профилна снимка %(count)s пъти",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sсмени своята профилна снимка",
+    "%(items)s and %(count)s others|other": "%(items)s и %(count)s други",
+    "%(items)s and %(count)s others|one": "%(items)s и още един",
+    "%(items)s and %(lastItem)s": "%(items)s и %(lastItem)s",
+    "collapse": "свий",
+    "expand": "разшири",
+    "Custom of %(powerLevel)s": "Персонализирано със стойност %(powerLevel)s",
+    "Custom level": "Персонализирано ниво",
+    "Custom": "Персонализирано",
+    "<a>In reply to</a> <pill>": "<a>В отговор на</a> <pill>",
+    "Room directory": "Директория на стаята",
+    "Start chat": "Започни чат",
+    "And %(count)s more...|other": "И %(count)s други...",
+    "ex. @bob:example.com": "напр. @bob:example.com",
+    "Add User": "Добави потребител",
+    "Matrix ID": "Matrix ID",
+    "Matrix Room ID": "Идентификатор на стаята",
+    "email address": "имейл адрес",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Опитайте се да използвате един от следните видове валидни адреси: %(validTypesList)s.",
+    "You have entered an invalid address.": "Въвели сте невалиден адрес.",
+    "Create a new chat or reuse an existing one": "Създаване на нов чат или повторно използване на съществуващ",
+    "Start new chat": "Започни нов чат",
+    "You already have existing direct chats with this user:": "Вече имате налични директни чатове с този потребител:",
+    "Start chatting": "Започнете чата",
+    "Click on the button below to start chatting!": "Натиснете бутона по-долу, за да започнете чата!",
+    "Start Chatting": "Започнете чата",
+    "Confirm Removal": "Потвърдете премахването",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Идентификаторите на общността могат да съдържат само a-z, 0-9, или '=_-./'",
+    "Something went wrong whilst creating your community": "Нещо се обърка по време на създаването на Вашата общност",
+    "Example": "Пример",
+    "example": "пример",
+    "Create": "Създай",
+    "Create Room": "Създай стая",
+    "Room name (optional)": "Име на стая (по избор)",
+    "Advanced options": "Разширени настройки",
+    "Block users on other matrix homeservers from joining this room": "Не позволявай на потребители от други matrix home сървъри да се присъединяват към тази стая",
+    "This setting cannot be changed later!": "Тази настройка не може да бъде променена по-късно!",
+    "Unknown error": "Непозната грешка",
+    "Incorrect password": "Неправилна парола",
+    "Deactivate Account": "Деактивация на профила",
+    "Deactivate my account": "Деактивирай моя профил",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Това ще направи профил Ви перманентно неизползваем. Няма да можете да се регистрирате отново със същия потребителски идентификатор.",
+    "This action is irreversible.": "Това действие е необратимо.",
+    "Device name": "Име на устройството",
+    "Device key": "Ключ на устройството",
+    "In future this verification process will be more sophisticated.": "В бъдеще този процес на потвърждение ще бъде по-лесен.",
+    "Verify device": "Потвърди устройството",
+    "Start verification": "Започни потвърждението",
+    "Verification Pending": "Очакване на потвърждението",
+    "Verification": "Потвърждение",
+    "I verify that the keys match": "Потвърждавам, че ключовете съвпадат",
+    "An error has occurred.": "Възникна грешка.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Добавихте ново устройство '%(displayName)s', което изисква ключове за шифроване.",
+    "Share without verifying": "Сподели без потвърждение",
+    "Ignore request": "Игнорирай поканата",
+    "Loading device info...": "Зареждане на информация за устройството...",
+    "Encryption key request": "Шифроване на ключове за заявка",
+    "Otherwise, <a>click here</a> to send a bug report.": "В противен случай, <a>натиснете тук</a>, за да изпратите съобщение за грешка.",
+    "Report it": "Съобщете го",
+    "Bug Report": "Съобщение за грешка",
+    "Unable to restore session": "Неуспешно възстановяване на сесията",
+    "Continue anyway": "Продължете въпреки това",
+    "Invalid Email Address": "Невалиден имейл адрес",
+    "This doesn't appear to be a valid email address": "Това не изглежда да е валиден имейл адрес",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Моля, проверете своя имейл адрес и натиснете връзката, която той съдържа. След като направите това, натиснете продължи.",
+    "Unable to add email address": "Неуспешно добавяне на имейл адрес",
+    "Unable to verify email address.": "Неуспешно потвърждение на имейл адрес.",
+    "Unable to accept invite": "Неуспешно приемане на поканата",
+    "Unable to reject invite": "Неуспешно отхвърляне на поканата",
+    "Unable to leave room": "Неуспешно напускане на стаята",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Опита се да зареди конкретна точка в хронологията на тази стая, но не успя да я намери.",
+    "Unable to remove contact information": "Неуспешно премахване на информацията на контакта",
+    "This will allow you to reset your password and receive notifications.": "Това ще Ви позволи да възстановите Вашата парола и да получавате известия.",
+    "Skip": "Пропусни",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "Потребителските имена могат да съдържат само букви, цифри, точки, тирета и долни черти.",
+    "Username not available": "Потребителското име е заето",
+    "Username invalid: %(errMessage)s": "Невалидно потребителско име: %(errMessage)s",
+    "An error occurred: %(error_string)s": "Възникна грешка: %(error_string)s",
+    "Username available": "Потребителското име не е заето",
+    "To get started, please pick a username!": "За да започнете, моля изберете потребителско име!",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Ако вече имате Matrix профил, можете да <a>влезете</a> с него.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "В момента Вие блокирате непотвърдени устройства; за да изпращате съобщения до тези устройства, трябва да ги потвърдите.",
+    "Room contains unknown devices": "Стаята съдържа непознати устройства",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" съдържа устройства, който не сте виждали до сега.",
+    "Unknown devices": "Непознати устройства",
+    "Private Chat": "Личен чат",
+    "Public Chat": "Публичен чат",
+    "Alias (optional)": "Псевдоним (по избор)",
+    "Name": "Име",
+    "Topic": "Тема",
+    "Make this room private": "Направи тази стая лична",
+    "Share message history with new users": "Сподели историята на съобщението с новите потребители",
+    "Encrypt room": "Шифровай стаята",
+    "You must <a>register</a> to use this functionality": "Трябва да се <a>регистрирате</a>, за да използвате тази функционалност",
+    "You must join the room to see its files": "Трябва да се присъедините към стаята, за да видите файловете, които съдържа",
+    "There are no visible files in this room": "Няма видими файлове в тази стая",
+    "Which rooms would you like to add to this summary?": "Кои стаи бихте искали да добавите в това обобщение?"
 }

From 5e90da73f0489d5e6c25c8f31bf017889116c951 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Wed, 21 Feb 2018 11:56:55 +0000
Subject: [PATCH 551/927] Translated using Weblate (Galician)

Currently translated at 98.7% (974 of 986 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 7a1fd567ee..d972376d41 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -768,7 +768,7 @@
     "Create a new community": "Crear unha nova comunidade",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crear unha comunidade para agrupar usuarias e salas! Poña unha páxina de inicio personalizada para destacar o seu lugar no universo Matrix.",
     "Join an existing community": "Unirse a unha comunidade existente",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como <i>+exemplo:matrix.org</i>",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Para unirse a unha comunidade existente deberá coñecer o identificador de esa comunidade; terá un aspecto como <i>+exemplo:matrix.org</i>.",
     "You have no visible notifications": "Non ten notificacións visibles",
     "Scroll to bottom of page": "Desplácese ate o final da páxina",
     "Message not sent due to unknown devices being present": "Non se enviou a mensaxe porque hai dispositivos non coñecidos",

From fc73442cdc4fba8cf7c610bee8a45c76aee8b67b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 21 Feb 2018 15:06:10 +0000
Subject: [PATCH 552/927] Change icon from "R" to "X"

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index d614588ccc..59365d8139 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -111,7 +111,7 @@ const TagPanel = React.createClass({
         });
         return <div className="mx_TagPanel">
             <AccessibleButton className="mx_TagPanel_logo" onClick={this.onLogoClick}>
-                <img src="img/logos/riot-logo.svg" />
+                <img src="img/icons-close.svg" width="24" height="24" />
             </AccessibleButton>
             <div className="mx_TagPanel_divider" />
             <GeminiScrollbar

From ff868691c9b6341841237592dbed0913e0c0b16d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 21 Feb 2018 17:15:43 +0000
Subject: [PATCH 553/927] Only show "X" when filtering, add alt/title

---
 src/components/structures/TagPanel.js | 17 ++++++++++++++---
 src/i18n/strings/en_EN.json           |  9 +++++----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 59365d8139..46e539fa04 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -24,6 +24,7 @@ import GroupActions from '../../actions/GroupActions';
 
 import sdk from '../../index';
 import dis from '../../dispatcher';
+import { _t } from '../../languageHandler';
 
 import { Droppable } from 'react-beautiful-dnd';
 
@@ -92,7 +93,7 @@ const TagPanel = React.createClass({
         dis.dispatch({action: 'view_create_group'});
     },
 
-    onLogoClick(ev) {
+    onClearFilterClick(ev) {
         dis.dispatch({action: 'deselect_tags'});
     },
 
@@ -109,9 +110,19 @@ const TagPanel = React.createClass({
                 selected={this.state.selectedTags.includes(tag)}
             />;
         });
+
+        const clearButton = this.state.selectedTags.length > 0 ?
+            <img
+                src="img/icons-close.svg"
+                alt={_t("Clear filter")}
+                title={_t("Clear filter")}
+                width="24"
+                height="24" /> :
+            <div />;
+
         return <div className="mx_TagPanel">
-            <AccessibleButton className="mx_TagPanel_logo" onClick={this.onLogoClick}>
-                <img src="img/icons-close.svg" width="24" height="24" />
+            <AccessibleButton className="mx_TagPanel_clearButton" onClick={this.onClearFilterClick}>
+                { clearButton }
             </AccessibleButton>
             <div className="mx_TagPanel_divider" />
             <GeminiScrollbar
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3cfbe24122..ef4bdf343e 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -381,9 +381,6 @@
     "Drop here to restore": "Drop here to restore",
     "Drop here to demote": "Drop here to demote",
     "Drop here to tag %(section)s": "Drop here to tag %(section)s",
-    "Failed to set direct chat tag": "Failed to set direct chat tag",
-    "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
     "Press <StartChatButton> to start a chat with someone": "Press <StartChatButton> to start a chat with someone",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory",
     "Community Invites": "Community Invites",
@@ -826,6 +823,7 @@
     "Click to mute video": "Click to mute video",
     "Click to unmute audio": "Click to unmute audio",
     "Click to mute audio": "Click to mute audio",
+    "Clear filter": "Clear filter",
     "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.",
     "Failed to load timeline position": "Failed to load timeline position",
@@ -984,5 +982,8 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.",
     "File to import": "File to import",
-    "Import": "Import"
+    "Import": "Import",
+    "Failed to set direct chat tag": "Failed to set direct chat tag",
+    "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room"
 }

From bb386c05d906eda9e519a7c70812ee5b98948e65 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Wed, 21 Feb 2018 14:27:58 +0000
Subject: [PATCH 554/927] Translated using Weblate (Bulgarian)

Currently translated at 79.5% (784 of 986 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 35505c0038..4b0993e4ba 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -756,5 +756,31 @@
     "You must <a>register</a> to use this functionality": "Трябва да се <a>регистрирате</a>, за да използвате тази функционалност",
     "You must join the room to see its files": "Трябва да се присъедините към стаята, за да видите файловете, които съдържа",
     "There are no visible files in this room": "Няма видими файлове в тази стая",
-    "Which rooms would you like to add to this summary?": "Кои стаи бихте искали да добавите в това обобщение?"
+    "Which rooms would you like to add to this summary?": "Кои стаи бихте искали да добавите в това обобщение?",
+    "Add to summary": "Добави в обобщението",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Неуспешно добавяне на следните стаи в обобщението на %(groupId)s:",
+    "Add a Room": "Добавяне на стая",
+    "Failed to remove the room from the summary of %(groupId)s": "Неуспешно премахване на стаята от обобщението на %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Стаята '%(roomName)s' не може да бъде премахната от обобщението.",
+    "Who would you like to add to this summary?": "Кого бихте желали да добавите в това обобщение?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Неуспешно добавяне на следните потребители в обобщението на %(groupId)s:",
+    "Add a User": "Добавяне на потребител",
+    "Failed to remove a user from the summary of %(groupId)s": "Неуспешно премахване на потребител от обобщението на %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Потребителят '%(displayName)s' не може да бъде премахнат от обобщението.",
+    "Failed to upload image": "Неуспешно качване на снимка",
+    "Leave %(groupName)s?": "Напускане на %(groupName)s?",
+    "Featured Rooms:": "Препоръчани стаи:",
+    "Featured Users:": "Препоръчани потребители:",
+    "Long Description (HTML)": "Дълго описание (HTML)",
+    "Description": "Описание",
+    "This Home server does not support communities": "Този Home сървър не поддържа общности",
+    "Failed to load %(groupId)s": "Неуспешно зареждане на %(groupId)s",
+    "Reject invitation": "Отхвърли поканата",
+    "Are you sure you want to reject the invitation?": "Сигурни ли сте, че искате да отхвърлите поканата?",
+    "Failed to reject invitation": "Неуспешно отхвърляне на поканата",
+    "This room is not public. You will not be able to rejoin without an invite.": "Тази стая не е публична. Няма да можете да се присъедините отново без покана.",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Сигурни ли сте, че искате да напуснете стаята '%(roomName)s'?",
+    "Failed to leave room": "Неуспешно напускане на стаята",
+    "Old cryptography data detected": "Старите криптирани данни са изтрити",
+    "Your Communities": "Вашите общности"
 }

From d9032d706f5ea80b51edaaad86dbbdbe8d748144 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Tue, 13 Feb 2018 18:55:45 +0000
Subject: [PATCH 555/927] Translated using Weblate (Russian)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index d24ee71de1..c07ea1e1fb 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -984,5 +984,6 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s изменил отображаемое имя на %(displayName)s.",
     "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
     "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
-    "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату"
+    "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
+    "Clear filter": "Очистить фильтр"
 }

From 296e2bd928e703d1afbb48a778bde338e0d81c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 6 Feb 2018 19:11:45 +0000
Subject: [PATCH 556/927] Translated using Weblate (French)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f0f9b2dae9..7efbf5f548 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -984,5 +984,6 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s a changé son nom affiché en %(displayName)s.",
     "Failed to set direct chat tag": "Échec de l'ajout de l'étiquette discussion directe",
     "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l'étiquette %(tagName)s du salon",
-    "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon"
+    "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon",
+    "Clear filter": "Supprimer les filtres"
 }

From 5cd7a7fc061784bff84795c961782d73866c97f2 Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Wed, 21 Feb 2018 19:26:14 +0000
Subject: [PATCH 557/927] Fix group member spinner being out of flex order

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

diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 305aec8cdd..097fb1f7db 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -132,7 +132,9 @@ module.exports = React.createClass({
     render: function() {
         if (this.state.removingUser) {
             const Spinner = sdk.getComponent("elements.Spinner");
-            return <Spinner />;
+            return <div className="mx_MemberInfo">
+                <Spinner />
+            </div>;
         }
 
         let adminTools;

From ffb524b6a5a614734d9ae30401b95b44eb62ca48 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rxl881@olivia.local>
Date: Wed, 21 Feb 2018 23:10:08 +0000
Subject: [PATCH 558/927] Allow widget iframes to request camera and microphone
 permissions.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index a63823555f..b325dace84 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -393,6 +393,10 @@ export default React.createClass({
         const sandboxFlags = "allow-forms allow-popups allow-popups-to-escape-sandbox "+
             "allow-same-origin allow-scripts allow-presentation";
 
+        // Additional iframe feature pemissions
+        // (see - https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-permissions-in-cross-origin-iframes and https://wicg.github.io/feature-policy/)
+        const iframeFeatures = "microphone; camera; encrypted-media;";
+
         if (this.props.show) {
             const loadingElement = (
                 <div className='mx_AppTileBody mx_AppLoading'>
@@ -413,6 +417,8 @@ export default React.createClass({
                         <div className={this.state.loading ? 'mx_AppTileBody mx_AppLoading' : 'mx_AppTileBody'}>
                             { this.state.loading && loadingElement }
                             <iframe
+                                is
+                                allow={iframeFeatures}
                                 ref="appFrame"
                                 src={this._getSafeUrl()}
                                 allowFullScreen="true"

From 7e8660cd37dde21c3cca3b6a026343b9b8d84998 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rxl881@olivia.local>
Date: Wed, 21 Feb 2018 23:23:44 +0000
Subject: [PATCH 559/927] Add comment for "is" attribute.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index b325dace84..e52cbade96 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -417,7 +417,7 @@ export default React.createClass({
                         <div className={this.state.loading ? 'mx_AppTileBody mx_AppLoading' : 'mx_AppTileBody'}>
                             { this.state.loading && loadingElement }
                             <iframe
-                                is
+                                is // This is required in order to enable passing of that "allow" preoperty, which is unknown to react 15
                                 allow={iframeFeatures}
                                 ref="appFrame"
                                 src={this._getSafeUrl()}

From ecde099146e37b9fd91ae2806f12d3031476503c Mon Sep 17 00:00:00 2001
From: Richard Lewis <rxl881@olivia.local>
Date: Wed, 21 Feb 2018 23:24:53 +0000
Subject: [PATCH 560/927] Fix typo.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index e52cbade96..b83ddbcee9 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -417,7 +417,7 @@ export default React.createClass({
                         <div className={this.state.loading ? 'mx_AppTileBody mx_AppLoading' : 'mx_AppTileBody'}>
                             { this.state.loading && loadingElement }
                             <iframe
-                                is // This is required in order to enable passing of that "allow" preoperty, which is unknown to react 15
+                                is // This is required in order to enable passing of the "allow" property, which is unknown to react 15
                                 allow={iframeFeatures}
                                 ref="appFrame"
                                 src={this._getSafeUrl()}

From 13bebd69c9f9d5abe96b0372bb5f47231caa9bed Mon Sep 17 00:00:00 2001
From: Richard Lewis <rxl881@olivia.local>
Date: Wed, 21 Feb 2018 23:35:57 +0000
Subject: [PATCH 561/927] Made comment "react-style".

---
 src/components/views/elements/AppTile.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index b83ddbcee9..3972b0d0be 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -416,8 +416,12 @@ export default React.createClass({
                     appTileBody = (
                         <div className={this.state.loading ? 'mx_AppTileBody mx_AppLoading' : 'mx_AppTileBody'}>
                             { this.state.loading && loadingElement }
+                            { /*
+                                The "is" attribute in the following iframe tag is needed in order to enable rendering of the
+                                "allow" attribute, which is unknown to react 15.
+                            */ }
                             <iframe
-                                is // This is required in order to enable passing of the "allow" property, which is unknown to react 15
+                                is
                                 allow={iframeFeatures}
                                 ref="appFrame"
                                 src={this._getSafeUrl()}

From 70d2ffc850ae590749ac730913991cd933d6775c Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 21 Feb 2018 23:51:35 +0000
Subject: [PATCH 562/927] don't let 3pid invites mark room as unread

fixes https://github.com/vector-im/riot-web/issues/5698
---
 src/Unread.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Unread.js b/src/Unread.js
index 383b5c2e5a..55e60f2a9a 100644
--- a/src/Unread.js
+++ b/src/Unread.js
@@ -28,6 +28,8 @@ module.exports = {
             return false;
         } else if (ev.getType() == 'm.room.member') {
             return false;
+        } else if (ev.getType() == 'm.room.third_party_invite') {
+            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') {

From 4f122e38e381ee3be4206deec3215d323796149a Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Wed, 21 Feb 2018 23:17:33 +0000
Subject: [PATCH 563/927] Translated using Weblate (Bulgarian)

Currently translated at 81.5% (805 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4b0993e4ba..2c46547176 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -59,17 +59,17 @@
     "Failed to verify email address: make sure you clicked the link in the email": "Неуспешно потвърждаване на имейл адреса: уверете се, че сте кликнали върху връзката в имейла",
     "The platform you're on": "Платформата, която използвате",
     "The version of Riot.im": "Версията на Riot.im",
-    "Whether or not you're logged in (we don't record your user name)": "Независимо дали сте в профила си или не (не записваме Вашето потребителско име)",
+    "Whether or not you're logged in (we don't record your user name)": "Независимо дали сте влезли с профила си или не (не записваме Вашето потребителско име)",
     "Your language of choice": "Вашият език по избор",
-    "Which officially provided instance you are using, if any": "Коя официално предоставена инстанция използвате, ако има такава",
+    "Which officially provided instance you are using, if any": "Кой официално-предоставен сървър използвате, ако има такъв",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Независимо дали използвате Richtext режим на Rich Text Editor",
     "Your homeserver's URL": "Адрес на Вашия Home сървър",
     "Your identity server's URL": "Адрес на Вашия сървър за самоличност",
     "Analytics": "Статистика",
-    "The information being sent to us to help make Riot.im better includes:": "За да направи Riot по-добър, информацията изпратена до нас включва:",
+    "The information being sent to us to help make Riot.im better includes:": "За да направим Riot по-добър, информацията изпратена до нас включва:",
     "Call Failed": "Неуспешно повикване",
-    "Call": "Обаждане",
-    "Answer": "Отговори, приеми",
+    "Call": "Позвъни",
+    "Answer": "Отговори",
     "You are already in a call.": "Вече сте в разговор.",
     "VoIP is unsupported": "Не се поддържа VoIP",
     "You cannot place VoIP calls in this browser.": "Не може да осъществите VoIP разговори в този браузър.",
@@ -83,7 +83,7 @@
     "Failed to set up conference call": "Неуспешно осъществяване на групов чат",
     "Conference call failed.": "Неуспешен групов разговор.",
     "The file '%(fileName)s' failed to upload": "Неуспешно качване на файл '%(fileName)s'",
-    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файлът '%(fileName)s' надхвърля ограничението на размера за качвания на този Home сървър",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файлът '%(fileName)s' надхвърля ограничението на размера за качване на този Home сървър",
     "Upload Failed": "Качването е неуспешно",
     "PM": "PM",
     "AM": "AM",
@@ -126,7 +126,7 @@
     "Failed to send request.": "Неуспешно изпращане на заявката.",
     "This room is not recognised.": "Стаята не е разпозната.",
     "Power level must be positive integer.": "Нивото на достъп трябва да бъде позитивно число.",
-    "Call Anyway": "Обади се въпреки това",
+    "Call Anyway": "Позвъни въпреки това",
     "Answer Anyway": "Отговори въпреки това",
     "Call Timeout": "Изтекло време за повикване",
     "The remote side failed to pick up": "Отсрещната страна не успя да отговори",
@@ -781,6 +781,27 @@
     "This room is not public. You will not be able to rejoin without an invite.": "Тази стая не е публична. Няма да можете да се присъедините отново без покана.",
     "Are you sure you want to leave the room '%(roomName)s'?": "Сигурни ли сте, че искате да напуснете стаята '%(roomName)s'?",
     "Failed to leave room": "Неуспешно напускане на стаята",
-    "Old cryptography data detected": "Старите криптирани данни са изтрити",
-    "Your Communities": "Вашите общности"
+    "Old cryptography data detected": "Бяха открити стари криптографски данни",
+    "Your Communities": "Вашите общности",
+    "Failed to fetch avatar URL": "Неуспешно изтегляне от адреса на аватара",
+    "Signed Out": "Излязохте",
+    "For security, this session has been signed out. Please sign in again.": "Поради мерки за сигурност, тази сесия е прекратена. Моля, влезте отново.",
+    "Cryptography data migrated": "Бяха мигрирани криптографските данни",
+    "Logout": "Излез",
+    "Sign out": "Изход",
+    "Error whilst fetching joined communities": "Грешка при извличането на общности, към които сте присъединени",
+    "You have no visible notifications": "Нямате видими известия",
+    "Scroll to bottom of page": "Отиди до края на страницата",
+    "Message not sent due to unknown devices being present": "Съобщението не е изпратено поради наличието на непознати устройства",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Покажи устройствата</showDevicesText>, <sendAnywayText>изпрати въпреки това</sendAnywayText> или <cancelText>откажи</cancelText>.",
+    "%(count)s of your messages have not been sent.|other": "Някои от Вашите съобщение не бяха изпратени.",
+    "%(count)s of your messages have not been sent.|one": "Вашето съобщение не беше изпратено.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Изпрати всички наново</resendText> или <cancelText>откажи всички</cancelText> сега. Можете също да изберете индивидуални съобщения, които да изпратите наново или да откажете.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Изпрати съобщението наново</resendText> или <cancelText>откажи съобщението</cancelText> сега.",
+    "Connectivity to the server has been lost.": "Връзката със сървъра е изгубена.",
+    "Sent messages will be stored until your connection has returned.": "Изпратените съобщения ще бъдат запаметени докато връзката Ви се възвърне.",
+    "%(count)s new messages|other": "%(count)s нови съобщения",
+    "%(count)s new messages|one": "%(count)s ново съобщение",
+    "Active call": "Активен разговор",
+    "Use with caution": "Внимавайте при използване"
 }

From 0c0d4707e13c8e8ddb14a749807a4630eebbdf8f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Tue, 6 Feb 2018 21:13:13 +0000
Subject: [PATCH 564/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 48132200a3..f691a12f1c 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -984,5 +984,6 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s megváltoztatta a nevét erre: %(displayName)s.",
     "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
     "Failed to remove tag %(tagName)s from room": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
-    "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s"
+    "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
+    "Clear filter": "Szűrő törlése"
 }

From cc727bc5b54c60268fd2a5c1c571632db07b224d Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 22 Feb 2018 10:30:45 +0000
Subject: [PATCH 565/927] Translated using Weblate (Bulgarian)

Currently translated at 90.0% (889 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 2c46547176..45a190bdab 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -163,7 +163,7 @@
     "VoIP conference started.": "VoIP конференцията започна.",
     "%(targetName)s joined the room.": "%(targetName)s се присъедини към стаята.",
     "VoIP conference finished.": "VoIP конференцията приключи.",
-    "%(targetName)s rejected the invitation.": "%(targetName)s отказа поканата.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s отхвърли поканата.",
     "%(targetName)s left the room.": "%(targetName)s напусна стаята.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s отблокира %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s изгони %(targetName)s.",
@@ -629,10 +629,10 @@
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)sнапуснаха и се присъединиха отново",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sнапусна и се присъедини отново %(count)s пъти",
     "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sнапусна и се присъедини отново",
-    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sотказаха своите покани %(count)s пъти",
-    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sотказаха своите покани",
-    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотказа своята покана %(count)s пъти",
-    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sотказа своята покана",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)sотхвърлиха своите покани %(count)s пъти",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)sотхвърлиха своите покани",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sотхвърли своята покана %(count)s пъти",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sотхвърли своята покана",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)sоттеглиха своите покани %(count)s пъти",
     "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)sоттеглиха своите покани",
     "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sоттегли своята покана %(count)s пъти",
@@ -718,7 +718,7 @@
     "Loading device info...": "Зареждане на информация за устройството...",
     "Encryption key request": "Шифроване на ключове за заявка",
     "Otherwise, <a>click here</a> to send a bug report.": "В противен случай, <a>натиснете тук</a>, за да изпратите съобщение за грешка.",
-    "Report it": "Съобщете го",
+    "Report it": "Съобщете я",
     "Bug Report": "Съобщение за грешка",
     "Unable to restore session": "Неуспешно възстановяване на сесията",
     "Continue anyway": "Продължете въпреки това",
@@ -730,8 +730,8 @@
     "Unable to accept invite": "Неуспешно приемане на поканата",
     "Unable to reject invite": "Неуспешно отхвърляне на поканата",
     "Unable to leave room": "Неуспешно напускане на стаята",
-    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Опита се да зареди конкретна точка в хронологията на тази стая, но не успя да я намери.",
-    "Unable to remove contact information": "Неуспешно премахване на информацията на контакта",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Беше направен опит да се зареди конкретна точка в хронологията на тази стая, но не я намери.",
+    "Unable to remove contact information": "Неуспешно премахване на информацията за контакти",
     "This will allow you to reset your password and receive notifications.": "Това ще Ви позволи да възстановите Вашата парола и да получавате известия.",
     "Skip": "Пропусни",
     "User names may only contain letters, numbers, dots, hyphens and underscores.": "Потребителските имена могат да съдържат само букви, цифри, точки, тирета и долни черти.",
@@ -803,5 +803,89 @@
     "%(count)s new messages|other": "%(count)s нови съобщения",
     "%(count)s new messages|one": "%(count)s ново съобщение",
     "Active call": "Активен разговор",
-    "Use with caution": "Внимавайте при използване"
+    "Use with caution": "Внимавайте при използване",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Няма никой друг тук! Желаете ли да <inviteText>поканите други</inviteText> или <nowarnText>изключи предупреждението, че стаята е празна</nowarnText>?",
+    "You seem to be uploading files, are you sure you want to quit?": "Изглежда, че качвате файлове. Сигурни ли сте, че искате да затворите програмата?",
+    "You seem to be in a call, are you sure you want to quit?": "Изглежда, че сте в разговор. Сигурни ли сте, че искате да излезете от програмата?",
+    "Failed to upload file": "Неуспешно качване на файлове",
+    "Server may be unavailable, overloaded, or the file too big": "Сървърът може би е недостъпен, претоварен или файлът е твърде голям",
+    "Search failed": "Търсенето е неуспешно",
+    "Server may be unavailable, overloaded, or search timed out :(": "Сървърът може би е недостъпен, претоварен или времето за търсене изтече :(",
+    "No more results": "Няма повече резултати",
+    "Unknown room %(roomId)s": "Неизвестна стая %(roomId)s",
+    "Room": "Стая",
+    "Failed to save settings": "Неуспешно запазване на настройките",
+    "Failed to reject invite": "Неуспешно отхвърляне на поканата",
+    "Reject all %(invitedRooms)s invites": "Отхвърли всички %(invitedRooms)s покани",
+    "Fill screen": "Запълни екрана",
+    "Click to unmute video": "Натиснете, за да включите звука на видеото",
+    "Click to mute video": "Натиснете, за да заглушите видеото",
+    "Click to unmute audio": "Натиснете, за да включите звука",
+    "Click to mute audio": "Натиснете, за да заглушите звука",
+    "Clear filter": "Изчисти филтър",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Беше направен опит да се зареди конкретна точка в хронологията на тази стая, но нямате разрешение да разгледате въпросното съобщение.",
+    "Failed to load timeline position": "Неуспешно зареждане на място в хронологията",
+    "Uploading %(filename)s and %(count)s others|other": "Качване на %(filename)s и %(count)s други",
+    "Uploading %(filename)s and %(count)s others|zero": "Качване на %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
+    "Light theme": "Светла тема",
+    "Dark theme": "Тъмна тема",
+    "Status.im theme": "Тема Status.im",
+    "Can't load user settings": "Потребителските настройки не могат да бъдат заредени",
+    "Server may be unavailable or overloaded": "Сървърът може би е недостъпен или претоварен",
+    "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.": "За сигурност, излизането ще изтрие всеки ключ за разшифроване от край до край в този браузър. Ако искате да бъде възможно да разшифровате вашата история на разговорите от бъдещи Riot сесии, моля експортирайте вашите ключове на стаята за съхранение.",
+    "Success": "Успешно",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Вашата парола беше успешно сменена. Няма да получавате известия на други устройства, докато не влезете обратно от тях в профила си",
+    "Remove Contact Information?": "Премахване на информацията за контакти?",
+    "Remove %(threePid)s?": "Премахни %(threePid)s?",
+    "Refer a friend to Riot:": "Покани приятел в Riot:",
+    "Interface Language": "Език на интерфейса",
+    "User Interface": "Потребителски интерфейс",
+    "Autocomplete Delay (ms):": "Забавяне на автоматичното завършване (мс):",
+    "<not supported>": "<не се поддържа>",
+    "Import E2E room keys": "Импортиране E2E ключове на стая",
+    "Cryptography": "Криптография",
+    "Device ID:": "Идентификатор на устройството:",
+    "Device key:": "Ключ на устройството:",
+    "Ignored Users": "Игнорирани потребители",
+    "Found a bug?": "Намерихте грешка?",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot събира анонимни статистики, за да ни позволи да подобрим приложението.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Поверителността е важна за нас, затова не събираме лични или подлежащи на идентифициране данни за нашите статистики.",
+    "Learn more about how we use analytics.": "Научете повече за това как използваме статистическите данни.",
+    "Labs": "Експерименти",
+    "These are experimental features that may break in unexpected ways": "Това са експериментални функции , които могат да се счупят по неочаквани начини",
+    "Clear Cache": "Изчисти кеш",
+    "Clear Cache and Reload": "Изчисти кеш и зареди наново",
+    "Updates": "Нови версии",
+    "Check for update": "Провери за нова версия",
+    "Bulk Options": "Групови опции",
+    "Desktop specific": "Специфичен за работния плот",
+    "Start automatically after system login": "Автоматично стартиране след влизане в системата",
+    "No media permissions": "Няма разрешения за медийните устройства",
+    "You may need to manually permit Riot to access your microphone/webcam": "Може да се наложи ръчно да разрешите на Riot да получи достъп до Вашия микрофон/уеб камера",
+    "Missing Media Permissions, click here to request.": "Липсват разрешения за медийните устройства, натиснете тук, за да ги поискате.",
+    "No Microphones detected": "Няма открити микрофони",
+    "No Webcams detected": "Няма открити уеб камери",
+    "Default Device": "Устройство по подразбиране",
+    "Microphone": "Микрофон",
+    "Camera": "Камера",
+    "VoIP": "VoIP",
+    "Email": "Имейл",
+    "Add email address": "Добави имейл адрес",
+    "Profile": "Профил",
+    "Display name": "Име/псевдоним",
+    "Account": "Акаунт",
+    "To return to your account in future you need to set a password": "За да се върнете в профила си в бъдеще, трябва да зададете парола",
+    "Logged in as:": "Влезли сте като:",
+    "Access Token:": "Token за достъп:",
+    "click to reveal": "натиснете, за да покажете",
+    "Homeserver is": "Home сървър е:",
+    "Identity Server is": "Сървър за самоличност е:",
+    "matrix-react-sdk version:": "версия на matrix-react-sdk:",
+    "riot-web version:": "версия на riot-web:",
+    "olm version:": "версия на olm:",
+    "Failed to send email": "Неуспешно изпращане на имейл",
+    "The email address linked to your account must be entered.": "Имейл адресът, свързан с профила Ви, трябва да бъде въведен.",
+    "A new password must be entered.": "Нова парола трябва да бъде въведена.",
+    "New passwords must match each other.": "Новите пароли трябва да съвпадат една с друга."
 }

From f08ec3498a2bf5499c33a746fca310b026093fa0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 22 Feb 2018 10:53:06 +0000
Subject: [PATCH 566/927] Fix bug that prevented tint updates

---
 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 8ceba2a850..b71978647f 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -627,8 +627,8 @@ module.exports = React.createClass({
         const room = this.state.room;
         if (!room) return;
 
-        const color_scheme = SettingsStore.getValue("roomColor", room.room_id);
         console.log("Tinter.tint from updateTint");
+        const color_scheme = SettingsStore.getValue("roomColor", room.roomId);
         Tinter.tint(color_scheme.primary_color, color_scheme.secondary_color);
     },
 

From dbe0a64e39231ebc78aeb4fa428ebc9d86d089a5 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 22 Feb 2018 11:09:50 +0000
Subject: [PATCH 567/927] Translated using Weblate (Bulgarian)

Currently translated at 92.0% (909 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 45a190bdab..6a932a93e9 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -887,5 +887,25 @@
     "Failed to send email": "Неуспешно изпращане на имейл",
     "The email address linked to your account must be entered.": "Имейл адресът, свързан с профила Ви, трябва да бъде въведен.",
     "A new password must be entered.": "Нова парола трябва да бъде въведена.",
-    "New passwords must match each other.": "Новите пароли трябва да съвпадат една с друга."
+    "New passwords must match each other.": "Новите пароли трябва да съвпадат една с друга.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Имейл беше изпратен на %(emailAddress)s. След като проследите връзката, която съдържа, натиснете по-долу.",
+    "Your password has been reset": "Вашата парола беше възстановена",
+    "Return to login screen": "Връщане към страницата за влизане в профила",
+    "To reset your password, enter the email address linked to your account": "За да възстановите Вашата парола, въведете имейл адреса, свързан с профила Ви",
+    "New password": "Нова парола",
+    "Confirm your new password": "Потвърдете новата си парола",
+    "Send Reset Email": "Изпрати имейл за възстановяване на парола",
+    "Create an account": "Създаване на профил",
+    "This Home Server does not support login using email address.": "Този Home сървър не поддържа влизане в профила чрез имейл адрес.",
+    "Incorrect username and/or password.": "Неправилно потребителско име и/или парола.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Моля, обърнете внимание, че влизате в %(hs)s сървър, а не в matrix.org.",
+    "Guest access is disabled on this Home Server.": "Достъпът на гости е изключен на този Home сървър.",
+    "The phone number entered looks invalid": "Въведеният телефонен номер изглежда невалиден",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага потоци за влизане, които се поддържат от този клиент.",
+    "Error: Problem communicating with the given homeserver.": "Грешка: Проблем при комуникацията с дадения Home сървър.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не може да се свърже към Home сървъра чрез HTTP, когато HTTPS URL адресът е в лентата на браузъра Ви. Използвайте или HTTP или <a>включете небезопасни скриптове</a>.",
+    "Login as guest": "Вход в профила като гост",
+    "Sign in to get started": "Влезте в профила си, за да започнете",
+    "Set a display name:": "Задаване на име:",
+    "Upload an avatar:": "Качване на профилна снимка:"
 }

From f2e1c0ebcacd0b24d2f769641d8b93b6121ab7af Mon Sep 17 00:00:00 2001
From: adi1 <adibadi@gmail.com>
Date: Thu, 22 Feb 2018 13:59:37 +0100
Subject: [PATCH 568/927] Fix TextualBody.js to remove NodeList.forEach()

Not all browsers support forEach() on NodeList objects. This causes crashes on some browsers, such as IE and FF<50.
---
 src/components/views/messages/TextualBody.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 31c1df7b44..abb4da227c 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -337,7 +337,7 @@ module.exports = React.createClass({
 
     _addCodeCopyButton() {
         // Add 'copy' buttons to pre blocks
-        ReactDOM.findDOMNode(this).querySelectorAll('.mx_EventTile_body pre').forEach((p) => {
+        Array.from(ReactDOM.findDOMNode(this).querySelectorAll('.mx_EventTile_body pre')).forEach((p) => {
             const button = document.createElement("span");
             button.className = "mx_EventTile_copyButton";
             button.onclick = (e) => {

From ce560c577f04e88c27e9b8a86086f0a37e3a2f46 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Thu, 22 Feb 2018 15:20:51 +0000
Subject: [PATCH 569/927] Fix link spacing

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

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 983a357d86..e7403c3787 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -39,7 +39,7 @@ export default class Stickerpack extends React.Component {
         this.defaultStickersContent = (
             <div className='mx_Stickers_contentPlaceholder'>
                 <p>{ _t("You don't currently have any stickerpacks enabled") }</p>
-                <p>{ _t("Click") } <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("here") } </span>{ _t("to add some!") }</p>
+                <p>{ _t("Click") } <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("here") }</span> { _t("to add some!") }</p>
                 <img src='img/stickerpack-placeholder.png' alt={_t('Add a stickerpack')} />
             </div>
         );

From 9a5c916570ebe2e81077f270329f3f4cb1a90888 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Thu, 22 Feb 2018 15:36:01 +0000
Subject: [PATCH 570/927] Close modal on integration manager launch.

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

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index e7403c3787..5aa845b4db 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -195,8 +195,6 @@ export default class Stickerpack extends React.Component {
      */
     onFinished() {
         this.setState({showStickers: false});
-        this.stickersMenu = null;
-        this.forceUpdate();
         console.warn("finshed");
     }
 
@@ -204,7 +202,6 @@ export default class Stickerpack extends React.Component {
      * Launch the integrations manager on the stickers integration page
      */
     _launchManageIntegrations() {
-        this.onFinished();
         const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
         const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
                 this.scalarClient.getScalarInterfaceUrlForRoom(
@@ -216,6 +213,7 @@ export default class Stickerpack extends React.Component {
         Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
             src: src,
         }, "mx_IntegrationsManager");
+        this.stickersMenu.close();
     }
 
     render() {

From f4bdb4897efb711be942765d63b56801fd2cebce Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 9 Feb 2018 10:28:51 +0000
Subject: [PATCH 571/927] Translated using Weblate (Basque)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 7592eb0708..5c891bcdc4 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -984,5 +984,6 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s erabiltzaileak bere pantaila izena aldatu du %(displayName)s izatera.",
     "Failed to set direct chat tag": "Huts egin du txat zuzenarenaren etiketa jartzean",
     "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
-    "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean"
+    "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean",
+    "Clear filter": "Garbitu iragazkia"
 }

From 773fef7f1d0261d472b21bba4fe60b8d1d736db6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 22 Feb 2018 16:14:56 +0000
Subject: [PATCH 572/927] fix shouldHideEvent saying an event is a leave/join
 when a profile change

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

diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
index 1ecd1ac051..ae7be56c2e 100644
--- a/src/shouldHideEvent.js
+++ b/src/shouldHideEvent.js
@@ -27,10 +27,11 @@ function memberEventDiff(ev) {
     const content = ev.getContent();
     const prevContent = ev.getPrevContent();
 
-    diff.isJoin = content.membership === 'join' && prevContent.membership !== 'ban';
-    diff.isPart = content.membership === 'leave' && ev.getStateKey() === ev.getSender();
-
     const isJoinToJoin = content.membership === prevContent.membership && content.membership === 'join';
+
+    diff.isJoin = !isJoinToJoin && content.membership === 'join' && prevContent.membership !== 'ban';
+    diff.isPart = !isJoinToJoin && content.membership === 'leave' && ev.getStateKey() === ev.getSender();
+
     diff.isDisplaynameChange = isJoinToJoin && content.displayname !== prevContent.displayname;
     diff.isAvatarChange = isJoinToJoin && content.avatar_url !== prevContent.avatar_url;
     return diff;

From a897da75041299820033e94d95d22cf448caff20 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 22 Feb 2018 16:15:50 +0000
Subject: [PATCH 573/927] Use undocumented piwik cmd to disable heartbeattimer

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

diff --git a/src/Analytics.js b/src/Analytics.js
index 5c39b48a35..d18c11bc66 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -92,6 +92,7 @@ class Analytics {
      */
     disable() {
         this.trackEvent('Analytics', 'opt-out');
+        this._paq.push(['disableHeartBeatTimer']);
         this.disabled = true;
     }
 

From 5d6a447620ff320f490bdcdf846091003ede3a4f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 22 Feb 2018 18:45:52 +0000
Subject: [PATCH 574/927] Fix bug where global "Never send to unverified..." is
 ignored

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

diff --git a/src/Lifecycle.js b/src/Lifecycle.js
index efd5c20d5c..ec1fca2bc6 100644
--- a/src/Lifecycle.js
+++ b/src/Lifecycle.js
@@ -362,7 +362,7 @@ async function _doSetLoggedIn(credentials, clearStorage) {
         dis.dispatch({action: 'on_logged_in', teamToken: teamToken});
     });
 
-    startMatrixClient();
+    await startMatrixClient();
     return MatrixClientPeg.get();
 }
 
@@ -423,7 +423,7 @@ export function logout() {
  * Starts the matrix client and all other react-sdk services that
  * listen for events while a session is logged in.
  */
-function startMatrixClient() {
+async function startMatrixClient() {
     console.log(`Lifecycle: Starting MatrixClient`);
 
     // dispatch this before starting the matrix client: it's used
@@ -437,7 +437,7 @@ function startMatrixClient() {
     Presence.start();
     DMRoomMap.makeShared().start();
 
-    MatrixClientPeg.start();
+    await MatrixClientPeg.start();
 
     // dispatch that we finished starting up to wire up any other bits
     // of the matrix client that cannot be set prior to starting up.

From 5402f4919ca8b7aa18ae3849ebf0e7a23b7fc88c Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 22 Feb 2018 20:54:10 +0000
Subject: [PATCH 575/927] Translated using Weblate (Bulgarian)

Currently translated at 99.7% (985 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 6a932a93e9..9aac5d6728 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -176,7 +176,7 @@
     "(not supported by this browser)": "(не се поддържа от този браузър)",
     "%(senderName)s answered the call.": "%(senderName)s отговори на повикването.",
     "(no answer)": "(няма отговор)",
-    "(unknown failure: %(reason)s)": "(непозната грешка: %(reason)s)",
+    "(unknown failure: %(reason)s)": "(неизвестна грешка: %(reason)s)",
     "%(senderName)s ended the call.": "%(senderName)s прекрати разговора.",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s започна %(callType)s разговор.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
@@ -250,7 +250,7 @@
     "No display name": "Няма име",
     "New passwords don't match": "Новите пароли не съвпадат",
     "Passwords can't be empty": "Полето с парола не може да е празно",
-    "Export E2E room keys": "Експортиране E2E ключове на стая",
+    "Export E2E room keys": "Експортиране E2E ключове за стая",
     "Do you want to set an email address?": "Искате ли да зададете имейл адрес?",
     "Current password": "Текуща парола",
     "Password": "Парола",
@@ -697,7 +697,7 @@
     "Advanced options": "Разширени настройки",
     "Block users on other matrix homeservers from joining this room": "Не позволявай на потребители от други matrix home сървъри да се присъединяват към тази стая",
     "This setting cannot be changed later!": "Тази настройка не може да бъде променена по-късно!",
-    "Unknown error": "Непозната грешка",
+    "Unknown error": "Неизвестна грешка",
     "Incorrect password": "Неправилна парола",
     "Deactivate Account": "Деактивация на профила",
     "Deactivate my account": "Деактивирай моя профил",
@@ -716,7 +716,7 @@
     "Share without verifying": "Сподели без потвърждение",
     "Ignore request": "Игнорирай поканата",
     "Loading device info...": "Зареждане на информация за устройството...",
-    "Encryption key request": "Шифроване на ключове за заявка",
+    "Encryption key request": "Заявка за ключ за шифроване",
     "Otherwise, <a>click here</a> to send a bug report.": "В противен случай, <a>натиснете тук</a>, за да изпратите съобщение за грешка.",
     "Report it": "Съобщете я",
     "Bug Report": "Съобщение за грешка",
@@ -796,8 +796,8 @@
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Покажи устройствата</showDevicesText>, <sendAnywayText>изпрати въпреки това</sendAnywayText> или <cancelText>откажи</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Някои от Вашите съобщение не бяха изпратени.",
     "%(count)s of your messages have not been sent.|one": "Вашето съобщение не беше изпратено.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Изпрати всички наново</resendText> или <cancelText>откажи всички</cancelText> сега. Можете също да изберете индивидуални съобщения, които да изпратите наново или да откажете.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Изпрати съобщението наново</resendText> или <cancelText>откажи съобщението</cancelText> сега.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Изпрати всички отново</resendText> или <cancelText>откажи всички</cancelText> сега. Можете също да изберете индивидуални съобщения, които да изпратите отново или да откажете.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Изпрати съобщението отново</resendText> или <cancelText>откажи съобщението</cancelText> сега.",
     "Connectivity to the server has been lost.": "Връзката със сървъра е изгубена.",
     "Sent messages will be stored until your connection has returned.": "Изпратените съобщения ще бъдат запаметени докато връзката Ви се възвърне.",
     "%(count)s new messages|other": "%(count)s нови съобщения",
@@ -833,7 +833,7 @@
     "Status.im theme": "Тема Status.im",
     "Can't load user settings": "Потребителските настройки не могат да бъдат заредени",
     "Server may be unavailable or overloaded": "Сървърът може би е недостъпен или претоварен",
-    "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.": "За сигурност, излизането ще изтрие всеки ключ за разшифроване от край до край в този браузър. Ако искате да бъде възможно да разшифровате вашата история на разговорите от бъдещи Riot сесии, моля експортирайте вашите ключове на стаята за съхранение.",
+    "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.": "За сигурност, излизането ще изтрие всеки ключ за разшифроване от край до край в този браузър. Ако искате да бъде възможно да разшифровате вашата история на разговорите от бъдещи Riot сесии, моля експортирайте вашите ключове за стаята за съхранение.",
     "Success": "Успешно",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Вашата парола беше успешно сменена. Няма да получавате известия на други устройства, докато не влезете обратно от тях в профила си",
     "Remove Contact Information?": "Премахване на информацията за контакти?",
@@ -843,7 +843,7 @@
     "User Interface": "Потребителски интерфейс",
     "Autocomplete Delay (ms):": "Забавяне на автоматичното завършване (мс):",
     "<not supported>": "<не се поддържа>",
-    "Import E2E room keys": "Импортиране E2E ключове на стая",
+    "Import E2E room keys": "Импортиране E2E ключове за стая",
     "Cryptography": "Криптография",
     "Device ID:": "Идентификатор на устройството:",
     "Device key:": "Ключ на устройството:",
@@ -855,7 +855,7 @@
     "Labs": "Експерименти",
     "These are experimental features that may break in unexpected ways": "Това са експериментални функции , които могат да се счупят по неочаквани начини",
     "Clear Cache": "Изчисти кеш",
-    "Clear Cache and Reload": "Изчисти кеш и зареди наново",
+    "Clear Cache and Reload": "Изчисти кеш и зареди отново",
     "Updates": "Нови версии",
     "Check for update": "Провери за нова версия",
     "Bulk Options": "Групови опции",
@@ -907,5 +907,81 @@
     "Login as guest": "Вход в профила като гост",
     "Sign in to get started": "Влезте в профила си, за да започнете",
     "Set a display name:": "Задаване на име:",
-    "Upload an avatar:": "Качване на профилна снимка:"
+    "Upload an avatar:": "Качване на профилна снимка:",
+    "This server does not support authentication with a phone number.": "Този сървър не поддържа автентикация с телефонен номер.",
+    "Missing password.": "Липсва парола.",
+    "Passwords don't match.": "Паролите не съвпадат.",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Паролата е твърде къса (мин. %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Това не изглежда да е валиден имейл адрес.",
+    "This doesn't look like a valid phone number.": "Това не изглежда да е валиден телефонен номер.",
+    "You need to enter a user name.": "Трябва да въведете потребителско име.",
+    "An unknown error occurred.": "Възникна неизвестна грешка.",
+    "I already have an account": "Вече имам профил",
+    "Displays action": "Показва действие",
+    "Bans user with given id": "Блокира потребители с даден идентификатор",
+    "Unbans user with given id": "Отблокира потребител с даден идентификатор",
+    "Define the power level of a user": "Определи нивото на достъп на потребителя",
+    "Deops user with given id": "Деактивира потребителя с даден идентификатор",
+    "Invites user with given id to current room": "Поканва потребителя с даден идентификатор в текущата стая",
+    "Joins room with given alias": "Присъединява се към стая с даден псевдоним",
+    "Sets the room topic": "Задава темата на стаята",
+    "Kicks user with given id": "Изгонва потребителя с даден идентификатор",
+    "Changes your display nickname": "Сменя Вашия псевдоним",
+    "Searches DuckDuckGo for results": "Търси в DuckDuckGo за резултати",
+    "Changes colour scheme of current room": "Променя цветовата схема на текущата стая",
+    "Verifies a user, device, and pubkey tuple": "Потвърждава потребител, устройство или потребит",
+    "Ignores a user, hiding their messages from you": "Игнорира потребител, скривайки неговите съобщения от Вас",
+    "Stops ignoring a user, showing their messages going forward": "Спира игнорирането на потребител, показва неговите съобщения напред",
+    "Commands": "Команди",
+    "Results from DuckDuckGo": "Резултати от DuckDuckGo",
+    "Emoji": "Емотикони",
+    "Notify the whole room": "Извести всички в стаята",
+    "Room Notification": "Известия за стаята",
+    "Users": "Потребители",
+    "unknown device": "неизвестно устройство",
+    "Ed25519 fingerprint": "Ed25519 пръстов отпечатък",
+    "User ID": "Потребителски идентификатор",
+    "Curve25519 identity key": "ключ за самоличност Curve25519",
+    "Algorithm": "Алгоритъм",
+    "unencrypted": "нешифрован",
+    "Decryption error": "Грешка при разшифроването",
+    "Session ID": "Идентификатор на сесията",
+    "Claimed Ed25519 fingerprint key": "Изискан ключ за пръстови отпечатъци Ed25519",
+    "End-to-end encryption information": "Информация за шифроването от край до край",
+    "Event information": "Информация за събитието",
+    "Sender device information": "Информация за устройството на подателя",
+    "Passphrases must match": "Паролите трябва да съвпадат",
+    "Passphrase must not be empty": "Паролата не трябва да е празна",
+    "Export room keys": "Експортиране на ключове за стаята",
+    "Enter passphrase": "Въведи парола",
+    "Confirm passphrase": "Потвърди парола",
+    "Export": "Експортирай",
+    "Import room keys": "Импортиране на ключове за стаята",
+    "File to import": "Файл за импортиране",
+    "Import": "Импортирай",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Ние също записваме всяка страница, която използвате във Вашето приложение (currently <CurrentPageHash>), Вашия потребителски агент (<CurrentUserAgent>) и Вашата резолюция на устройството (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Дали тази страница включва подлежаща на идентифициране информация, като например стая, потребител или идентификатор на група, тези данни са премахнати преди да бъдат изпратени до сървъра.",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Има непознати устройства в тази стая. Ако продължите без да ги потвърдите, ще бъде възможно за някого да подслушва Вашия разговор.",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ВНИМАНИЕ: НЕУСПЕШНО ПОТВЪРЖДАВАНЕ НА КЛЮЧА! Ключът за подписване за %(userId)s и устройството %(deviceId)s е \"%(fprint)s\", което не съвпада с предоставения ключ \"%(fingerprint)s\". Това може да означава, че Вашата комуникация е прихваната!",
+    "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.": "Смяната на парола ще нулира всички ключове за шифроване на всички устройства от край до край, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате ключовете за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "На път сте да бъдете отведени до друг сайт, така че можете да удостоверите профила си за използване с %(integrationsUrl)s. Искате ли да продължите?",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Проверка от робот в момента не е налична на работния плот. Моля използвайте <a>уеб браузъра</a>",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Можете да използвате опциите за друг сървър, за да влезете в други Matrix сървъри като посочите различен Home сървър.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Това Ви позволява да използвате това приложение със съществуващ Matrix профил на различен Home сървър.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Възможно е и да зададете друг сървър за самоличност, но това обикновено предотвратява намирането на други потребители по имейл адрес.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Сигурни ли сте, че искате да премахнете (изтриете) това събитие? Забележете, че ако изтриете събитие за промяна на името на стая или тема, това може да обърне промяната.",
+    "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:": "За да потвърдите, че на това устройство може да се вярва, моля свържете се със собственика му по друг начин (напр. на живо или чрез телефонен разговор) и го попитайте дали ключът, който той вижда в неговите настройки на потребителя за това устройство, съвпада с ключа по-долу:",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Ако съвпада, моля натиснете бутона за потвърждение по-долу. Ако не, то тогава някой друг прихваща това устройство и Вие вероятно искате вместо това да натиснете бутона за черния списък.",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Засякохме грешка при опита за възстановяване на Вашата предишна сесия. Ако продължите, трябва да влезете в профила си отново, и шифрованата история на чата няма да се чете.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ако преди сте използвали по-нова версия на Riot, Вашата сесия може да не бъде съвместима с тази версия. Затворете този прозорец и се върнете в по-нова версия.",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Това ще бъде името на профила Ви на <span></span> Home сървър, или можете да изберете <a>друг сървър</a>.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Препоръчваме Ви да минете през процеса за потвърждение за всяко устройство, за да потвърдите, че принадлежат на легитимен собственик. Ако предпочитате, можете да изпратите съобщение без потвърждение.",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Извършена е еднократна миграция на криптографски данни. Шифроване от край до край няма да работи, ако се върнете обратно в по-стара версия на Riot. Ако искате да използвате криптография от край до край на по-стара версия, първо излезте от Riot. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Засечени са данни от по-стара версия на Riot. Това ще доведе до неправилна работа на криптографията от край до край в по-старата версия. Шифрованите съобщения от край до край се обмениха наскоро, докато използването на по-стара версия може да не бъде разшифрована в тази версия. Това също може да доведе до неуспех в обмяната на съобщения в тази версия. Ако имате проблеми, излезте и влезте отново в профила си. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
+    "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.": "Възстановяването на парола ще нулира всички ключове за шифроване на всички устройства от край до край, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате Вашите ключове за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
+    "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": "Вие сте излязли от профила си от всички устройства и вече няма да получавате извесия. За да включите известията отново, влезте в профила си от всяко устройство",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка, уверете се, че a>сертификат на Home сървъра</a> е надежден и че разширението на браузъра не блокира заявки.",
+    "none": "няма",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате ключове за съобщения в локален файл, които сте получили в шифровани стаи. Тогава ще можете да импортирате файла в друг Matrix клиент, така че клиентът също ще може да разшифрова тези съобщения.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите, така че Вие трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използването на същата парола."
 }

From 0838ef329933aecf768deff5505ac54d018df71f Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 22 Feb 2018 20:55:54 +0000
Subject: [PATCH 576/927] Translated using Weblate (Bulgarian)

Currently translated at 99.8% (986 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 9aac5d6728..26a908f748 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -983,5 +983,6 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка, уверете се, че a>сертификат на Home сървъра</a> е надежден и че разширението на браузъра не блокира заявки.",
     "none": "няма",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате ключове за съобщения в локален файл, които сте получили в шифровани стаи. Тогава ще можете да импортирате файла в друг Matrix клиент, така че клиентът също ще може да разшифрова тези съобщения.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите, така че Вие трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използването на същата парола."
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите, така че Вие трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използването на същата парола.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес Ви позволява да импортирате шифровани ключове, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова."
 }

From 45172537f50a338c33ae0b9f890ef6ec9edc75af Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 22 Feb 2018 20:56:19 +0000
Subject: [PATCH 577/927] Translated using Weblate (Bulgarian)

Currently translated at 99.8% (986 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 26a908f748..4bc52e6cb3 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -3,7 +3,7 @@
     "Operation failed": "Операцията е неуспешна",
     "Search": "Търсене",
     "Custom Server Options": "Потребителски опции за сървър",
-    "Dismiss": "Отказ",
+    "Dismiss": "Затвори",
     "powered by Matrix": "базирано на Matrix",
     "Warning": "Предупреждение",
     "Error": "Грешка",

From e1fc1c1c6c6cd8a6fce12dbf81e5fdf142d3e829 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 22 Feb 2018 20:56:47 +0000
Subject: [PATCH 578/927] Translated using Weblate (Bulgarian)

Currently translated at 99.8% (987 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4bc52e6cb3..4966f92d42 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -984,5 +984,6 @@
     "none": "няма",
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате ключове за съобщения в локален файл, които сте получили в шифровани стаи. Тогава ще можете да импортирате файла в друг Matrix клиент, така че клиентът също ще може да разшифрова тези съобщения.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите, така че Вие трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използването на същата парола.",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес Ви позволява да импортирате шифровани ключове, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова."
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес Ви позволява да импортирате шифровани ключове, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведе парола тук, за да разшифровате файла."
 }

From bc162d3bd070b69f7eb2da94b21593490b4e193e Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 22 Feb 2018 23:41:27 +0000
Subject: [PATCH 579/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4966f92d42..685db8d8b6 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -93,7 +93,7 @@
     "Name or matrix ID": "Име или matrix ID",
     "Invite to Community": "Покани в общността",
     "Which rooms would you like to add to this community?": "Кои стаи бихте желали да добавите в тази общност?",
-    "Show these rooms to non-members on the community page and room list?": "Показване на тези стаи на не-членове на страницата на общностите и списъка със стаи?",
+    "Show these rooms to non-members on the community page and room list?": "Показване на тези стаи на не-членове в страницата на общността и в списъка със стаи?",
     "Add rooms to the community": "Добави стаи в общността",
     "Room name or alias": "Име или псевдоним на стая",
     "Add to community": "Добави в общност",
@@ -121,7 +121,7 @@
     "Failed to invite": "Неуспешна покана",
     "Failed to invite the following users to the %(roomName)s room:": "Следните потребителите не успяха да бъдат добавени в %(roomName)s:",
     "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.": "За да извършите това, трябва да имате право да добавяте потребители.",
     "Unable to create widget.": "Неуспешно създаване на приспособление.",
     "Failed to send request.": "Неуспешно изпращане на заявката.",
     "This room is not recognised.": "Стаята не е разпозната.",
@@ -154,20 +154,20 @@
     "%(senderName)s requested a VoIP conference.": "%(senderName)s заяви VoIP конферентен разговор.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s покани %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s блокира %(targetName)s.",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име/псевдоним на %(displayName)s.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s промени своето име на %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име на %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s си сложи име %(displayName)s.",
     "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s премахна своето име (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s премахна своята профилна снимка.",
     "%(senderName)s changed their profile picture.": "%(senderName)s промени своята профилна снимка.",
     "%(senderName)s set a profile picture.": "%(senderName)s зададе снимка на профила си.",
-    "VoIP conference started.": "VoIP конференцията започна.",
+    "VoIP conference started.": "Започна VoIP конференция.",
     "%(targetName)s joined the room.": "%(targetName)s се присъедини към стаята.",
     "VoIP conference finished.": "VoIP конференцията приключи.",
     "%(targetName)s rejected the invitation.": "%(targetName)s отхвърли поканата.",
     "%(targetName)s left the room.": "%(targetName)s напусна стаята.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s отблокира %(targetName)s.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s изгони %(targetName)s.",
-    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s оттегли поканата си към %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s оттегли поканата си за %(targetName)s.",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s смени темата на \"%(topic)s\".",
     "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s премахна името на стаята.",
     "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s промени името на стаята на %(roomName)s.",
@@ -180,18 +180,18 @@
     "%(senderName)s ended the call.": "%(senderName)s прекрати разговора.",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s започна %(callType)s разговор.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s изпрати покана на %(targetDisplayName)s да се присъедини към стаята.",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s направи бъдещата история на стаята видима за всички членове на стаята, от момента, в който те са поканени в нея.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s направи бъдещата история на стаята видима за всички членове на стаята, от момента, в който те се присъединят към нея.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на поканването им в нея.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s направи бъдещата история на стаята видима за всички членове, от момента на присъединяването им в нея.",
     "%(senderName)s made future room history visible to all room members.": "%(senderName)s направи бъдещата история на стаята видима за всички членове в нея.",
     "%(senderName)s made future room history visible to anyone.": "%(senderName)s направи бъдещата история на стаята видима за всеки.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s направи бъдещата история на стаята видима за непознат (%(visibility)s).",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s направи бъдещата история на стаята видима по непознат начин (%(visibility)s).",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s включи шифроване от край до край (алгоритъм %(algorithm)s).",
-    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s с %(fromPowerLevel)s на %(toPowerLevel)s",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s от %(fromPowerLevel)s на %(toPowerLevel)s",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s смени нивото на достъп на %(powerLevelDiffText)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s смени закачените съобщения на стаята.",
-    "%(widgetName)s widget modified by %(senderName)s": "Приспособлението %(widgetName)s е променено от %(senderName)s",
-    "%(widgetName)s widget added by %(senderName)s": "Приспособлението %(widgetName)s е добавено от %(senderName)s",
-    "%(widgetName)s widget removed by %(senderName)s": "Приспособлението %(widgetName)s е премахнато от %(senderName)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s смени закачените съобщения за стаята.",
+    "%(widgetName)s widget modified by %(senderName)s": "Приспособлението %(widgetName)s беше променено от %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Приспособлението %(widgetName)s беше добавено от %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Приспособлението %(widgetName)s беше премахнато от %(senderName)s",
     "%(displayName)s is typing": "%(displayName)s пише",
     "%(names)s and %(count)s others are typing|other": "%(names)s и %(count)s други пишат",
     "%(names)s and %(count)s others are typing|one": "%(names)s и още един човек пишат",
@@ -201,7 +201,7 @@
     "Send anyway": "Изпрати въпреки това",
     "Unnamed Room": "Стая без име",
     "Your browser does not support the required cryptography extensions": "Вашият браузър не поддържа необходимите разширения за шифроване",
-    "Not a valid Riot keyfile": "Невалиден Riot ключов файл",
+    "Not a valid Riot keyfile": "Невалиден файл с ключ за Riot",
     "Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?",
     "Failed to join room": "Неуспешно присъединяване към стаята",
     "Message Replies": "Отговори на съобщението",
@@ -211,22 +211,22 @@
     "Disable Emoji suggestions while typing": "Деактивиране на предложенията за емотиконите при писане",
     "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",
     "Hide removed messages": "Скриване на премахнати съобщения",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Скриване на съобщения присъединяване/напускане (покани/изгонвания/блокиране незасегнати)",
-    "Hide avatar changes": "Скриване промени на аватара",
-    "Hide display name changes": "Скриване промени на името",
-    "Hide read receipts": "Скриване",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Скриване на съобщения за присъединяване/напускане (не засяга покани/изгонвания/блокирания)",
+    "Hide avatar changes": "Скриване на информацията за промените на аватара",
+    "Hide display name changes": "Скриване на информацията за промените на името",
+    "Hide read receipts": "Скриване на потвържденията за прочитане на съобщение",
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показване на времето в 12-часов формат (напр. 2:30pm)",
-    "Always show message timestamps": "Винаги показвай времето",
+    "Always show message timestamps": "Винаги показвай часа на съобщението",
     "Autoplay GIFs and videos": "Автоматично възпроизвеждане на GIF-файлове и видеа",
-    "Enable automatic language detection for syntax highlighting": "Активиране на автоматичното разпознаване на език за подчертаване на синтаксиса",
+    "Enable automatic language detection for syntax highlighting": "Активиране на автоматично разпознаване на език за подчертаване на синтаксиса",
     "Disable big emoji in chat": "Деактивиране на големи емотикони в чата",
-    "Don't send typing notifications": "Не изпращай известия за писане",
+    "Don't send typing notifications": "Не показвай на другите, че в момента пиша",
     "Automatically replace plain text Emoji": "Автоматично откриване и заместване на емотикони в текста",
-    "Mirror local video feed": "Огледален образ",
+    "Mirror local video feed": "Показвай ми огледално моя видео образ",
     "Disable Peer-to-Peer for 1:1 calls": "Деактивиране на Peer-to-Peer в 1:1 разговор",
     "Opt out of analytics": "Отказване от събиране на статистически данни",
-    "Never send encrypted messages to unverified devices from this device": "Никога не изпращай шифровани съобщения до непотвърдени устройства от това устройство",
-    "Never send encrypted messages to unverified devices in this room from this device": "Никога не изпращай шифровани съобщение до непотвърдени устройства в тази стая от това устройство",
+    "Never send encrypted messages to unverified devices from this device": "Никога не изпращай шифровани съобщения от това устройство до непотвърдени устройства",
+    "Never send encrypted messages to unverified devices in this room from this device": "Никога не изпращай шифровани съобщения от това устройство до непотвърдени устройства в тази стая",
     "Enable inline URL previews by default": "Включване по подразбиране на URL прегледи",
     "Enable URL previews for this room (only affects you)": "Включване на URL прегледи за тази стая (засяга само Вас)",
     "Enable URL previews by default for participants in this room": "Включване по подразбиране на URL прегледи за участниците в тази стая",
@@ -275,7 +275,7 @@
     "Drop File Here": "Пусни файла тук",
     "Drop file here to upload": "Пуснете файла тук, за да се качи",
     " (unsupported)": " (не се поддържа)",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Присъединете се като <voiceText>voice</voiceText> или <videoText>video</videoText>.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Присъединете се с <voiceText>глас</voiceText> или с <videoText>видео</videoText>.",
     "Ongoing conference call%(supportedText)s.": "Текущ групов разговор %(supportedText)s.",
     "%(senderName)s sent an image": "%(senderName)s изпрати снимка",
     "%(senderName)s sent a video": "%(senderName)s изпрати видео",
@@ -303,9 +303,9 @@
     "Failed to mute user": "Неуспешно заглушаване на потребителя",
     "Failed to toggle moderator status": "Неуспешна промяна на статуса на модератора",
     "Failed to change power level": "Неуспешна промяна на нивото на достъп",
-    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "След като си намалите нивото на достъп, няма да можете да възвърнете тази промяна. Ако сте потребителя с най-малко привилегии в тази стая, ще бъде невъзможно да възвърнете своите привилегии.",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "След като си намалите нивото на достъп, няма да можете да възвърнете тази промяна. Ако сте последния потребител с привилегии в тази стая, ще бъде невъзможно да възвърнете привилегии си.",
     "Are you sure?": "Сигурни ли сте?",
-    "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.": "Няма да можете да възвърнете тази промяна, тъй като повишавате този потребител до същото ниво на достъп като Вашето.",
     "No devices with registered encryption keys": "Няма устройства с регистрирани шифровани ключове",
     "Devices": "Устройства",
     "Unignore": "Премахни игнорирането",
@@ -315,7 +315,7 @@
     "User Options": "Опции на потребителя",
     "Invite": "Покани",
     "Unmute": "Премахни заглушаването",
-    "Make Moderator": "Направи потребителя модератор",
+    "Make Moderator": "Направи модератор",
     "Admin Tools": "Инструменти на администратора",
     "Level:": "Ниво:",
     "and %(count)s others...|other": "и %(count)s други...",
@@ -332,7 +332,7 @@
     "Voice call": "Гласово повикване",
     "Video call": "Видео повикване",
     "Hide Apps": "Скрий приложенията",
-    "Show Apps": "Покани приложенията",
+    "Show Apps": "Покажи приложенията",
     "Upload file": "Качи файл",
     "Show Text Formatting Toolbar": "Показване на лентата с инструменти за форматиране на текст",
     "Send an encrypted reply…": "Изпрати шифрован отговор…",
@@ -385,8 +385,8 @@
     "Drop here to favourite": "За любим пуснeте тук",
     "Drop here to tag direct chat": "Пуснете тук, за да означите директен чат",
     "Drop here to restore": "Пуснете тук за възстановяване",
-    "Drop here to demote": "Пуснете тук за",
-    "Drop here to tag %(section)s": "Пуснете тук, за да означите %(section)s",
+    "Drop here to demote": "Пуснете тук за понижаване",
+    "Drop here to tag %(section)s": "Пуснете тук, за да означите като %(section)s",
     "Failed to set direct chat tag": "Неуспешно означаване на директен чат",
     "Press <StartChatButton> to start a chat with someone": "Натиснете <StartChatButton>, за да започнете чат с някого",
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Все още не сте в нито една стая! Натиснете <CreateRoomButton>, за да направите такава или <RoomDirectoryButton>, за да прегледате директорията",
@@ -397,16 +397,16 @@
     "Low priority": "Нисък приоритет",
     "Historical": "Архив",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не може да се потвърди, че адреса към който е изпратена тази покана е обвързан с акаунта Ви.",
-    "This invitation was sent to an email address which is not associated with this account:": "Тази покана е изпратена на имейл адрес, който не е свързан с този профил:",
-    "You may wish to login with a different account, or add this email to this account.": "Може да искате да влезете с друг профил или да добавите този имейл в този профил.",
+    "This invitation was sent to an email address which is not associated with this account:": "Поканата е изпратена на имейл адрес, който не е свързан с този профил:",
+    "You may wish to login with a different account, or add this email to this account.": "Може да искате да влезете с друг профил или да добавите имейл адреса в този.",
     "You have been invited to join this room by %(inviterName)s": "Вие сте поканен да се присъедините към тази стая от %(inviterName)s",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Желаете да <acceptText>приемете</acceptText> или да <declineText>откажете</declineText> тази покана?",
     "Reason: %(reasonText)s": "Причина: %(reasonText)s",
     "Rejoin": "Повторно присъединяване",
-    "You have been kicked from %(roomName)s by %(userName)s.": "Вие сте изгонен от %(roomName)s от %(userName)s.",
-    "You have been kicked from this room by %(userName)s.": "Вие сте изгонен от тази стая от %(userName)s.",
-    "You have been banned from %(roomName)s by %(userName)s.": "Вие сте блокиран в %(roomName)s от %(userName)s.",
-    "You have been banned from this room by %(userName)s.": "Вие сте блокиран в тази стая от %(userName)s.",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Бяхте изгонен от %(roomName)s от %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Бяхте изгонен от тази стая от %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Бяхте блокиран в %(roomName)s от %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Бяхте блокиран в тази стая от %(userName)s.",
     "This room": "В тази стая",
     "%(roomName)s does not exist.": "%(roomName)s не съществува.",
     "%(roomName)s is not accessible at this time.": "%(roomName)s не е достъпна към този момент.",
@@ -424,11 +424,11 @@
     "Failed to unban": "Неуспешно отблокиране",
     "Banned by %(displayName)s": "Блокиран от %(displayName)s",
     "Privacy warning": "Предупреждение за сигурност",
-    "Changes to who can read history will only apply to future messages in this room": "Промени за това кой може да чете историята ще се отнасят само за бъдещи съобщения в тази стая",
-    "The visibility of existing history will be unchanged": "Видимостта на съществуващата история ще остане непроменена",
+    "Changes to who can read history will only apply to future messages in this room": "Промени по това кой може да чете историята ще се отнасят само за бъдещи съобщения в тази стая",
+    "The visibility of existing history will be unchanged": "Видимостта на история до сега ще остане непроменена",
     "End-to-end encryption is in beta and may not be reliable": "Шифроване от край до край е в бета версия и може да не е надеждно",
     "Devices will not yet be able to decrypt history from before they joined the room": "Устройства все още не могат да разшифроват история от преди присъединяването към стая",
-    "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)": "Веднъж включено, шифроването в стаята не може да бъде изключено (за сега)",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Шифровани съобщения не са видими за клиенти, които все още не поддържат шифроване",
     "Enable encryption": "Включване на шифроване",
     "(warning: cannot be disabled again!)": "(внимание: не може да бъде изключено отново!)",
@@ -467,7 +467,7 @@
     "This room's internal ID is": "Вътрешният идентификатор на тази стая е",
     "Add a topic": "Добавете тема",
     "Jump to first unread message.": "Отиди до първото непрочетено съобщение.",
-    "Scroll to unread messages": "Скролирай до непрочетените съобщения",
+    "Scroll to unread messages": "Отиди до непрочетените съобщения",
     "Invalid alias format": "Невалиден формат на псевдонима",
     "'%(alias)s' is not a valid format for an alias": "%(alias)s не е валиден формат на псевдоним",
     "Invalid address format": "Невалиден формат на адреса",
@@ -496,7 +496,7 @@
     "Decrypt %(text)s": "Разшифровай %(text)s",
     "Download %(text)s": "Изтегли %(text)s",
     "(could not connect media)": "(неуспешно свързване на медийните устройства)",
-    "Must be viewing a room": "Трябва да видите стаята",
+    "Must be viewing a room": "Трябва да извършите това в стая",
     "Usage": "Употреба",
     "Remove from community": "Премахни от общността",
     "Disinvite this user from community?": "Оттегляне на поканата към този потребител от общността?",
@@ -524,16 +524,16 @@
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Вашата общност няма дълго описание - HTML страница, която да се показва на членовете на общността. <br/>Натиснете тук, за да отворите настройките и да създадете такова!",
     "Community %(groupId)s not found": "Общност %(groupId)s не е намерена",
     "Create a new community": "Създаване на нова общност",
-    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Създайте общност, за да обедините заедно потребители и стаи! Изградете персонализирана начална страница, за да маркирате своето пространство във Вселената на матрицата.",
-    "Join an existing community": "Присъединяване към вече съществуваща общност",
-    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "За да се присъедините към вече съществуваща общност, трябва да знаете неиния идентификатор; това изглежда нещо подобно на <i>+example:matrix.org</i>.",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Създайте общност, за да групирате потребители и стаи! Изградете персонализирана начална страница, за да маркирате своето пространство в Matrix Вселената.",
+    "Join an existing community": "Присъединяване към съществуваща общност",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "За да се присъедините към вече съществуваща общност, трябва да знаете нейния идентификатор; той изглежда нещо подобно на <i>+example:matrix.org</i>.",
     "Unknown (user, device) pair:": "Непозната двойка (потребител, устройство):",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Подписващият ключ, който сте предоставили, съвпада с подписващия ключ, който сте получили от устройството %(deviceId)s на %(userId)s. Устройството е маркирано като потвърдено.",
     "Hide avatars in user and room mentions": "Скриване на профилната снимка при споменаване на потребители и стаи",
     "Jump to message": "Отиди до съобщението",
-    "Jump to read receipt": "Отиди до потвърдението за прочетено",
+    "Jump to read receipt": "Отиди до потвърждението за прочитане",
     "Revoke Moderator": "Премахване на правата на модератора",
-    "You should not yet trust it to secure data": "Все още не трябва да се доверявате на това, че ще запази Вашите данни",
+    "You should not yet trust it to secure data": "Все още не трябва да се доверявате на това, че ще защити Вашите данни",
     "Invalid file%(extra)s": "Невалиден файл%(extra)s",
     "Error decrypting image": "Грешка при разшифроване на снимка",
     "This image cannot be displayed.": "Тази снимка не може да бъде показана.",
@@ -557,13 +557,13 @@
     "Token incorrect": "Неправителен token",
     "A text message has been sent to %(msisdn)s": "Текстово съобщение беше изпратено на %(msisdn)s",
     "Please enter the code it contains:": "Моля, въведете кода, който то съдържа:",
-    "Start authentication": "Започнете автентикация",
+    "Start authentication": "Започни автентикация",
     "Username on %(hs)s": "Потребителско име на %(hs)s",
     "User name": "Потребителско име",
     "Mobile phone number": "Мобилен номер",
     "Forgot your password?": "Забравена парола?",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
-    "Sign in with": "Влезте с",
+    "Sign in with": "Влизане с",
     "Email address": "Имейл адрес",
     "Sign in": "Вход",
     "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ако не посочите имейл адрес, няма да бъде възможно да възстановите Вашата парола. Сигурни ли сте?",
@@ -585,20 +585,20 @@
     "Visibility in Room List": "Видимост в списъка със стаи",
     "Visible to everyone": "Видимо за всеки",
     "Something went wrong when trying to get your communities.": "Нещо се обърка при зареждането на Вашите общности.",
-    "Display your community flair in rooms configured to show it.": "Показване на значката на общността в стаи, кофигурирани да я показват.",
+    "Display your community flair in rooms configured to show it.": "Показване на значката на общността в стаи, конфигурирани да я показват.",
     "You're not currently a member of any communities.": "Към момента не сте член на нито една общност.",
     "Unknown Address": "Неизвестен адрес",
     "NOTE: Apps are not end-to-end encrypted": "ЗАБЕЛЕЖКА: Приложенията не са шифровани от край до край",
     "Do you want to load widget from URL:": "Искате ли да заредите приспособление от URL адреса:",
-    "Allow": "Позволение",
+    "Allow": "Позволи",
     "Delete Widget": "Изтриване на приспособление",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Изтриването на приспособление го премахва за всички потребители в тази стая. Сигурни ли сте, че искате да изтриете това приспособление?",
     "Delete widget": "Изтрий приспособлението",
-    "Revoke widget access": "Премахване на достъпа до приспособления",
+    "Revoke widget access": "Премахни достъпа на приспособлението",
     "Minimize apps": "Минимизирай приложенията",
     "Create new room": "Създай нова стая",
-    "Unblacklist": "Премахване от черния списък",
-    "Blacklist": "Черен списък",
+    "Unblacklist": "Премахни от черния списък",
+    "Blacklist": "Добави в черен списък",
     "Unverify": "Махни потвърждението",
     "Verify...": "Потвърди...",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Вашето непотвърдено устройство '%(displayName)s' изисква ключове за шифроване.",
@@ -668,7 +668,7 @@
     "expand": "разшири",
     "Custom of %(powerLevel)s": "Персонализирано със стойност %(powerLevel)s",
     "Custom level": "Персонализирано ниво",
-    "Custom": "Персонализирано",
+    "Custom": "Персонализиран",
     "<a>In reply to</a> <pill>": "<a>В отговор на</a> <pill>",
     "Room directory": "Директория на стаята",
     "Start chat": "Започни чат",
@@ -708,7 +708,7 @@
     "In future this verification process will be more sophisticated.": "В бъдеще този процес на потвърждение ще бъде по-лесен.",
     "Verify device": "Потвърди устройството",
     "Start verification": "Започни потвърждението",
-    "Verification Pending": "Очакване на потвърждението",
+    "Verification Pending": "Очакване на потвърждение",
     "Verification": "Потвърждение",
     "I verify that the keys match": "Потвърждавам, че ключовете съвпадат",
     "An error has occurred.": "Възникна грешка.",
@@ -718,10 +718,10 @@
     "Loading device info...": "Зареждане на информация за устройството...",
     "Encryption key request": "Заявка за ключ за шифроване",
     "Otherwise, <a>click here</a> to send a bug report.": "В противен случай, <a>натиснете тук</a>, за да изпратите съобщение за грешка.",
-    "Report it": "Съобщете я",
-    "Bug Report": "Съобщение за грешка",
+    "Report it": "Съобщи за нея",
+    "Bug Report": "Съобщаване за грешка",
     "Unable to restore session": "Неуспешно възстановяване на сесията",
-    "Continue anyway": "Продължете въпреки това",
+    "Continue anyway": "Продължи въпреки това",
     "Invalid Email Address": "Невалиден имейл адрес",
     "This doesn't appear to be a valid email address": "Това не изглежда да е валиден имейл адрес",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Моля, проверете своя имейл адрес и натиснете връзката, която той съдържа. След като направите това, натиснете продължи.",
@@ -751,7 +751,7 @@
     "Name": "Име",
     "Topic": "Тема",
     "Make this room private": "Направи тази стая лична",
-    "Share message history with new users": "Сподели историята на съобщението с новите потребители",
+    "Share message history with new users": "Сподели историята на съобщенията с нови потребители",
     "Encrypt room": "Шифровай стаята",
     "You must <a>register</a> to use this functionality": "Трябва да се <a>регистрирате</a>, за да използвате тази функционалност",
     "You must join the room to see its files": "Трябва да се присъедините към стаята, за да видите файловете, които съдържа",
@@ -796,7 +796,7 @@
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Покажи устройствата</showDevicesText>, <sendAnywayText>изпрати въпреки това</sendAnywayText> или <cancelText>откажи</cancelText>.",
     "%(count)s of your messages have not been sent.|other": "Някои от Вашите съобщение не бяха изпратени.",
     "%(count)s of your messages have not been sent.|one": "Вашето съобщение не беше изпратено.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Изпрати всички отново</resendText> или <cancelText>откажи всички</cancelText> сега. Можете също да изберете индивидуални съобщения, които да изпратите отново или да откажете.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Изпрати всички отново</resendText> или <cancelText>откажи всички</cancelText> сега. Също така може да изберете индивидуални съобщения, които да изпратите отново или да откажете.",
     "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Изпрати съобщението отново</resendText> или <cancelText>откажи съобщението</cancelText> сега.",
     "Connectivity to the server has been lost.": "Връзката със сървъра е изгубена.",
     "Sent messages will be stored until your connection has returned.": "Изпратените съобщения ще бъдат запаметени докато връзката Ви се възвърне.",
@@ -804,7 +804,7 @@
     "%(count)s new messages|one": "%(count)s ново съобщение",
     "Active call": "Активен разговор",
     "Use with caution": "Внимавайте при използване",
-    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Няма никой друг тук! Желаете ли да <inviteText>поканите други</inviteText> или <nowarnText>изключи предупреждението, че стаята е празна</nowarnText>?",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Няма никой друг тук! Желаете ли да <inviteText>поканите други</inviteText> или да <nowarnText>изключите предупреждението, че стаята е празна</nowarnText>?",
     "You seem to be uploading files, are you sure you want to quit?": "Изглежда, че качвате файлове. Сигурни ли сте, че искате да затворите програмата?",
     "You seem to be in a call, are you sure you want to quit?": "Изглежда, че сте в разговор. Сигурни ли сте, че искате да излезете от програмата?",
     "Failed to upload file": "Неуспешно качване на файлове",
@@ -824,7 +824,7 @@
     "Click to mute audio": "Натиснете, за да заглушите звука",
     "Clear filter": "Изчисти филтър",
     "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Беше направен опит да се зареди конкретна точка в хронологията на тази стая, но нямате разрешение да разгледате въпросното съобщение.",
-    "Failed to load timeline position": "Неуспешно зареждане на място в хронологията",
+    "Failed to load timeline position": "Неуспешно зареждане на позицията в хронологията",
     "Uploading %(filename)s and %(count)s others|other": "Качване на %(filename)s и %(count)s други",
     "Uploading %(filename)s and %(count)s others|zero": "Качване на %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Качване на %(filename)s и %(count)s друг",
@@ -833,15 +833,15 @@
     "Status.im theme": "Тема Status.im",
     "Can't load user settings": "Потребителските настройки не могат да бъдат заредени",
     "Server may be unavailable or overloaded": "Сървърът може би е недостъпен или претоварен",
-    "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.": "За сигурност, излизането ще изтрие всеки ключ за разшифроване от край до край в този браузър. Ако искате да бъде възможно да разшифровате вашата история на разговорите от бъдещи Riot сесии, моля експортирайте вашите ключове за стаята за съхранение.",
+    "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.": "За сигурност, излизането ще изтрие ключовете за разшифроване от край до край от този браузър. Ако искате да бъде възможно да разшифровате Вашата история на разговорите от бъдещи Riot сесии, моля експортирайте Вашите ключове за стаите.",
     "Success": "Успешно",
-    "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": "Вашата парола беше успешно сменена. Няма да получавате известия на други устройства, докато не влезете отново в профила си от тях",
     "Remove Contact Information?": "Премахване на информацията за контакти?",
     "Remove %(threePid)s?": "Премахни %(threePid)s?",
     "Refer a friend to Riot:": "Покани приятел в Riot:",
     "Interface Language": "Език на интерфейса",
     "User Interface": "Потребителски интерфейс",
-    "Autocomplete Delay (ms):": "Забавяне на автоматичното завършване (мс):",
+    "Autocomplete Delay (ms):": "Забавяне на визуализацията на автоматичните подсказки (мс):",
     "<not supported>": "<не се поддържа>",
     "Import E2E room keys": "Импортиране E2E ключове за стая",
     "Cryptography": "Криптография",
@@ -850,7 +850,7 @@
     "Ignored Users": "Игнорирани потребители",
     "Found a bug?": "Намерихте грешка?",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot събира анонимни статистики, за да ни позволи да подобрим приложението.",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Поверителността е важна за нас, затова не събираме лични или подлежащи на идентифициране данни за нашите статистики.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Поверителността е важна за нас, затова за нашите статистики не събираме лични или подлежащи на идентифициране данни.",
     "Learn more about how we use analytics.": "Научете повече за това как използваме статистическите данни.",
     "Labs": "Експерименти",
     "These are experimental features that may break in unexpected ways": "Това са експериментални функции , които могат да се счупят по неочаквани начини",
@@ -863,7 +863,7 @@
     "Start automatically after system login": "Автоматично стартиране след влизане в системата",
     "No media permissions": "Няма разрешения за медийните устройства",
     "You may need to manually permit Riot to access your microphone/webcam": "Може да се наложи ръчно да разрешите на Riot да получи достъп до Вашия микрофон/уеб камера",
-    "Missing Media Permissions, click here to request.": "Липсват разрешения за медийните устройства, натиснете тук, за да ги поискате.",
+    "Missing Media Permissions, click here to request.": "Липсват разрешения за медийните устройства. Натиснете тук, за да ги поискате.",
     "No Microphones detected": "Няма открити микрофони",
     "No Webcams detected": "Няма открити уеб камери",
     "Default Device": "Устройство по подразбиране",
@@ -878,7 +878,7 @@
     "To return to your account in future you need to set a password": "За да се върнете в профила си в бъдеще, трябва да зададете парола",
     "Logged in as:": "Влезли сте като:",
     "Access Token:": "Token за достъп:",
-    "click to reveal": "натиснете, за да покажете",
+    "click to reveal": "натиснете за показване",
     "Homeserver is": "Home сървър е:",
     "Identity Server is": "Сървър за самоличност е:",
     "matrix-react-sdk version:": "версия на matrix-react-sdk:",
@@ -899,12 +899,12 @@
     "This Home Server does not support login using email address.": "Този Home сървър не поддържа влизане в профила чрез имейл адрес.",
     "Incorrect username and/or password.": "Неправилно потребителско име и/или парола.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Моля, обърнете внимание, че влизате в %(hs)s сървър, а не в matrix.org.",
-    "Guest access is disabled on this Home Server.": "Достъпът на гости е изключен на този Home сървър.",
+    "Guest access is disabled on this Home Server.": "Достъпът за гости е изключен на този Home сървър.",
     "The phone number entered looks invalid": "Въведеният телефонен номер изглежда невалиден",
-    "This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага потоци за влизане, които се поддържат от този клиент.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Този Home сървър не предлага методи за влизане, които се поддържат от този клиент.",
     "Error: Problem communicating with the given homeserver.": "Грешка: Проблем при комуникацията с дадения Home сървър.",
-    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не може да се свърже към Home сървъра чрез HTTP, когато HTTPS URL адресът е в лентата на браузъра Ви. Използвайте или HTTP или <a>включете небезопасни скриптове</a>.",
-    "Login as guest": "Вход в профила като гост",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Не е възможно свързване към Home сървъра чрез HTTP, когато има HTTPS адрес в лентата на браузъра Ви. Или използвайте HTTPS или <a>включете функция небезопасни скриптове</a>.",
+    "Login as guest": "Влез като гост",
     "Sign in to get started": "Влезте в профила си, за да започнете",
     "Set a display name:": "Задаване на име:",
     "Upload an avatar:": "Качване на профилна снимка:",
@@ -920,33 +920,33 @@
     "Displays action": "Показва действие",
     "Bans user with given id": "Блокира потребители с даден идентификатор",
     "Unbans user with given id": "Отблокира потребител с даден идентификатор",
-    "Define the power level of a user": "Определи нивото на достъп на потребителя",
-    "Deops user with given id": "Деактивира потребителя с даден идентификатор",
-    "Invites user with given id to current room": "Поканва потребителя с даден идентификатор в текущата стая",
-    "Joins room with given alias": "Присъединява се към стая с даден псевдоним",
+    "Define the power level of a user": "Променя нивото на достъп на потребителя",
+    "Deops user with given id": "Отнема правата на потребител с даден идентификатор",
+    "Invites user with given id to current room": "Поканва потребител с даден идентификатор в текущата стая",
+    "Joins room with given alias": "Присъединяване към стая с даден псевдоним",
     "Sets the room topic": "Задава темата на стаята",
     "Kicks user with given id": "Изгонва потребителя с даден идентификатор",
     "Changes your display nickname": "Сменя Вашия псевдоним",
     "Searches DuckDuckGo for results": "Търси в DuckDuckGo за резултати",
     "Changes colour scheme of current room": "Променя цветовата схема на текущата стая",
-    "Verifies a user, device, and pubkey tuple": "Потвърждава потребител, устройство или потребит",
-    "Ignores a user, hiding their messages from you": "Игнорира потребител, скривайки неговите съобщения от Вас",
-    "Stops ignoring a user, showing their messages going forward": "Спира игнорирането на потребител, показва неговите съобщения напред",
+    "Verifies a user, device, and pubkey tuple": "Потвърждава потребител, устройство или ключова двойка",
+    "Ignores a user, hiding their messages from you": "Игнорира потребител, скривайки съобщенията му от Вас",
+    "Stops ignoring a user, showing their messages going forward": "Спира игнорирането на потребител, показвайки съобщенията му занапред",
     "Commands": "Команди",
     "Results from DuckDuckGo": "Резултати от DuckDuckGo",
     "Emoji": "Емотикони",
     "Notify the whole room": "Извести всички в стаята",
-    "Room Notification": "Известия за стаята",
+    "Room Notification": "Известие за стая",
     "Users": "Потребители",
     "unknown device": "неизвестно устройство",
-    "Ed25519 fingerprint": "Ed25519 пръстов отпечатък",
+    "Ed25519 fingerprint": "Ed25519 отпечатък",
     "User ID": "Потребителски идентификатор",
-    "Curve25519 identity key": "ключ за самоличност Curve25519",
+    "Curve25519 identity key": "Curve25519 ключ за самоличност",
     "Algorithm": "Алгоритъм",
     "unencrypted": "нешифрован",
     "Decryption error": "Грешка при разшифроването",
     "Session ID": "Идентификатор на сесията",
-    "Claimed Ed25519 fingerprint key": "Изискан ключ за пръстови отпечатъци Ed25519",
+    "Claimed Ed25519 fingerprint key": "Заявен ключов отпечатък Ed25519",
     "End-to-end encryption information": "Информация за шифроването от край до край",
     "Event information": "Информация за събитието",
     "Sender device information": "Информация за устройството на подателя",
@@ -959,31 +959,31 @@
     "Import room keys": "Импортиране на ключове за стаята",
     "File to import": "Файл за импортиране",
     "Import": "Импортирай",
-    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Ние също записваме всяка страница, която използвате във Вашето приложение (currently <CurrentPageHash>), Вашия потребителски агент (<CurrentUserAgent>) и Вашата резолюция на устройството (<CurrentDeviceResolution>).",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Дали тази страница включва подлежаща на идентифициране информация, като например стая, потребител или идентификатор на група, тези данни са премахнати преди да бъдат изпратени до сървъра.",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Също така записваме всяка страница, която използвате в приложението (в момента <CurrentPageHash>), браузъра, който използвате (<CurrentUserAgent>) и резолюцията на устройството (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Когато тази страница съдържа информация идентифицираща Вас (като например стая, потребител или идентификатор на група), тези данни биват премахнати преди да бъдат изпратени до сървъра.",
     "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Има непознати устройства в тази стая. Ако продължите без да ги потвърдите, ще бъде възможно за някого да подслушва Вашия разговор.",
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ВНИМАНИЕ: НЕУСПЕШНО ПОТВЪРЖДАВАНЕ НА КЛЮЧА! Ключът за подписване за %(userId)s и устройството %(deviceId)s е \"%(fprint)s\", което не съвпада с предоставения ключ \"%(fingerprint)s\". Това може да означава, че Вашата комуникация е прихваната!",
-    "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.": "Смяната на парола ще нулира всички ключове за шифроване на всички устройства от край до край, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате ключовете за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "На път сте да бъдете отведени до друг сайт, така че можете да удостоверите профила си за използване с %(integrationsUrl)s. Искате ли да продължите?",
-    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Проверка от робот в момента не е налична на работния плот. Моля използвайте <a>уеб браузъра</a>",
+    "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.": "Смяната на парола ще нулира всички ключове за шифроване от край до край на всички устройства, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате ключовете за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "На път сте да бъдете отведени до друг сайт, където можете да удостоверите профила си за използване с %(integrationsUrl)s. Искате ли да продължите?",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Проверка за робот в момента не е налична на работния плот. Моля използвайте <a>уеб браузър</a>",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Можете да използвате опциите за друг сървър, за да влезете в други Matrix сървъри като посочите различен Home сървър.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Това Ви позволява да използвате това приложение със съществуващ Matrix профил на различен Home сървър.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Възможно е и да зададете друг сървър за самоличност, но това обикновено предотвратява намирането на други потребители по имейл адрес.",
     "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Сигурни ли сте, че искате да премахнете (изтриете) това събитие? Забележете, че ако изтриете събитие за промяна на името на стая или тема, това може да обърне промяната.",
     "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:": "За да потвърдите, че на това устройство може да се вярва, моля свържете се със собственика му по друг начин (напр. на живо или чрез телефонен разговор) и го попитайте дали ключът, който той вижда в неговите настройки на потребителя за това устройство, съвпада с ключа по-долу:",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Ако съвпада, моля натиснете бутона за потвърждение по-долу. Ако не, то тогава някой друг прихваща това устройство и Вие вероятно искате вместо това да натиснете бутона за черния списък.",
-    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Засякохме грешка при опита за възстановяване на Вашата предишна сесия. Ако продължите, трябва да влезете в профила си отново, и шифрованата история на чата няма да се чете.",
-    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ако преди сте използвали по-нова версия на Riot, Вашата сесия може да не бъде съвместима с тази версия. Затворете този прозорец и се върнете в по-нова версия.",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Това ще бъде името на профила Ви на <span></span> Home сървър, или можете да изберете <a>друг сървър</a>.",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Ако съвпада, моля натиснете бутона за потвърждение по-долу. Ако не, то тогава някой друг имитира това устройство и вероятно искате вместо това да натиснете бутона за черен списък.",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Засякохме грешка при опита за възстановяване на предишната Ви сесия. Ако продължите, ще трябва да влезете в профила си отново. Шифрованата история на чата няма да бъде четима.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ако преди сте използвали по-нова версия на Riot, Вашата сесия може да не бъде съвместима с текущата версия. Затворете този прозорец и се върнете в по-новата версия.",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Това ще бъде името на профила Ви на <span></span> Home сървъра, или можете да изберете <a>друг сървър</a>.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Препоръчваме Ви да минете през процеса за потвърждение за всяко устройство, за да потвърдите, че принадлежат на легитимен собственик. Ако предпочитате, можете да изпратите съобщение без потвърждение.",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Извършена е еднократна миграция на криптографски данни. Шифроване от край до край няма да работи, ако се върнете обратно в по-стара версия на Riot. Ако искате да използвате криптография от край до край на по-стара версия, първо излезте от Riot. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
-    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Засечени са данни от по-стара версия на Riot. Това ще доведе до неправилна работа на криптографията от край до край в по-старата версия. Шифрованите съобщения от край до край се обмениха наскоро, докато използването на по-стара версия може да не бъде разшифрована в тази версия. Това също може да доведе до неуспех в обмяната на съобщения в тази версия. Ако имате проблеми, излезте и влезте отново в профила си. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
-    "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.": "Възстановяването на парола ще нулира всички ключове за шифроване на всички устройства от край до край, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате Вашите ключове за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
-    "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": "Вие сте излязли от профила си от всички устройства и вече няма да получавате извесия. За да включите известията отново, влезте в профила си от всяко устройство",
-    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка, уверете се, че a>сертификат на Home сървъра</a> е надежден и че разширението на браузъра не блокира заявки.",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Извършена е еднократна миграция на криптографски данни. Шифроването от край до край няма да работи, ако се върнете към по-стара версия на Riot. Ако искате да използвате криптография от край до край на по-стара версия, първо излезте от Riot. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Засечени са данни от по-стара версия на Riot. Това ще доведе до неправилна работа на криптографията от край до край в по-старата версия. Шифрованите от край до край съобщения, които са били обменени наскоро (при използването на по-стара версия), може да не успеят да бъдат разшифровани в тази версия. Това също може да доведе до неуспех в обмяната на съобщения в тази версия. Ако имате проблеми, излезте и влезте отново в профила си. За да запазите историята на съобщенията, експортирайте и импортирайте отново Вашите ключове.",
+    "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.": "Възстановяването на парола ще нулира всички ключове за шифроване от край до край за всички устройства, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате Вашите ключове за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
+    "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": "Вие сте излязли от профила си от всички устройства и вече няма да получавате известия. За да включите известията отново, влезте в профила си от всички устройства",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка. Уверете се, че <a>SSL сертификатът на Home сървъра</a> е надежден и че някое разширение на браузъра не блокира заявките.",
     "none": "няма",
-    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате ключове за съобщения в локален файл, които сте получили в шифровани стаи. Тогава ще можете да импортирате файла в друг Matrix клиент, така че клиентът също ще може да разшифрова тези съобщения.",
-    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите, така че Вие трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използването на същата парола.",
-    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес Ви позволява да импортирате шифровани ключове, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате във файл ключове за съобщения в шифровани стаи. Така ще можете да импортирате файла в друг Matrix клиент, така че той също да може да разшифрова тези съобщения.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите. Трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използване на същата парола.",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведе парола тук, за да разшифровате файла."
 }

From 070619bfdb19de2e86f4749612013e5e8f050313 Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Fri, 23 Feb 2018 07:26:11 +0000
Subject: [PATCH 580/927] Translated using Weblate (Galician)

Currently translated at 99.1% (979 of 987 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index d972376d41..02271757c1 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -973,5 +973,10 @@
     "Your identity server's URL": "O URL da súa identidade no servidor",
     "<a>In reply to</a> <pill>": "<a>En resposta a</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Esta sala non é pública. Non poderá voltar a ela sin un convite.",
-    "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades"
+    "This room is not showing flair for any communities": "Esta sala non mostra popularidade para as comunidades",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s cambiou o seu nome mostrado a %(displayName)s.",
+    "Clear filter": "Quitar filtro",
+    "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
+    "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
+    "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala"
 }

From d8ef6f79b1f79614f9aabf3a2d47180e7e71078e Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 23 Feb 2018 10:13:56 +0000
Subject: [PATCH 581/927] s/autoShow/autoshow/

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 46e539fa04..3d76a967a2 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -127,7 +127,7 @@ const TagPanel = React.createClass({
             <div className="mx_TagPanel_divider" />
             <GeminiScrollbar
                 className="mx_TagPanel_scroller"
-                autoShow={true}
+                autoshow={true}
                 onClick={this.onClick}
             >
                 <Droppable

From 88288ff3f57f1a0628b036107bc15c5428016f73 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 23 Feb 2018 10:20:16 +0000
Subject: [PATCH 582/927] Add error handling for failure to connect to
 integration manager.

---
 src/components/views/rooms/Stickerpack.js | 26 ++++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 5aa845b4db..7b3508b9a0 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -49,6 +49,7 @@ export default class Stickerpack extends React.Component {
         this.state = {
             stickersContent: this.defaultStickersContent,
             showStickers: false,
+            imError: null,
         };
     }
 
@@ -56,7 +57,7 @@ export default class Stickerpack extends React.Component {
         console.warn('Removing stickerpack widgets');
         Widgets.removeStickerpackWidgets();
         this._getStickerPickerWidget();
-        this.onFinished();
+        this.stickersMenu.close();
     }
 
     componentDidMount() {
@@ -66,21 +67,30 @@ export default class Stickerpack extends React.Component {
             this.scalarClient.connect().then(() => {
                 this.forceUpdate();
             }).catch((e) => {
-                console.log("Failed to connect to integrations server");
-                // TODO -- Handle Scalar errors
-                //     this.setState({
-                //         scalar_error: err,
-                //     });
+                this._imError("Failed to connect to integrations server", e);
             });
         }
-        this._getStickerPickerWidget();
-        this.dispatcherRef = dis.register(this._onWidgetAction);
+
+        if (!this.state.imError) {
+            this._getStickerPickerWidget();
+            this.dispatcherRef = dis.register(this._onWidgetAction);
+        }
     }
 
     componentWillUnmount() {
         dis.unregister(this.dispatcherRef);
     }
 
+    _imError(errorMsg, e) {
+        console.error(errorMsg, e);
+        const imErrorContent = <div style={{"text-align": "center"}} className="error"><p> { errorMsg } </p></div>;
+        this.setState({
+            showStickers: false,
+            imError: errorMsg,
+            stickersContent: imErrorContent,
+        });
+    }
+
     _onWidgetAction(payload) {
         if (payload.action === "user_widget_updated") {
             console.warn("user widget updated");

From fefc325b12564e3b1018e8ad31c53f42e986085a Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 23 Feb 2018 10:29:52 +0000
Subject: [PATCH 583/927] Remove unused dep.

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

diff --git a/package.json b/package.json
index 43a5ebfcfd..943c443c59 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,6 @@
     "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^15.4.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
-    "react-simple-popover": "matrix-org/react-popover",
     "sanitize-html": "^1.14.1",
     "text-encoding-utf-8": "^1.0.1",
     "url": "^0.11.0",

From 9e969e33b7223b839a4774dab4383460c681db0d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 23 Feb 2018 10:32:33 +0000
Subject: [PATCH 584/927] Reorder the RoomListStore lists on Event.decrypted

---
 src/actions/MatrixActionCreators.js | 21 +++++++++++++++++++++
 src/stores/RoomListStore.js         | 14 ++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index 1998ecfef2..6e1d52a88f 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -163,6 +163,26 @@ function createRoomMembershipAction(matrixClient, membershipEvent, member, oldMe
     return { action: 'MatrixActions.RoomMember.membership', member };
 }
 
+/**
+ * @typedef EventDecryptedAction
+ * @type {Object}
+ * @property {string} action 'MatrixActions.Event.decrypted'.
+ * @property {MatrixEvent} event the matrix event that was decrypted.
+ */
+
+/**
+ * Create a MatrixActions.Event.decrypted action that represents
+ * a MatrixClient `Event.decrypted` matrix event, emitted when a
+ * matrix event is decrypted.
+ *
+ * @param {MatrixClient} matrixClient the matrix client.
+ * @param {MatrixEvent} event the matrix event that was decrypted.
+ * @returns {EventDecryptedAction} an action of type `MatrixActions.Event.decrypted`.
+ */
+function createEventDecryptedAction(matrixClient, event) {
+    return { action: 'MatrixActions.Event.decrypted', event };
+}
+
 /**
  * This object is responsible for dispatching actions when certain events are emitted by
  * the given MatrixClient.
@@ -183,6 +203,7 @@ export default {
         this._addMatrixClientListener(matrixClient, 'Room.tags', createRoomTagsAction);
         this._addMatrixClientListener(matrixClient, 'Room.timeline', createRoomTimelineAction);
         this._addMatrixClientListener(matrixClient, 'RoomMember.membership', createRoomMembershipAction);
+        this._addMatrixClientListener(matrixClient, 'Event.decrypted', createEventDecryptedAction);
     },
 
     /**
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 80db6ca9a8..7660cf8df8 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -87,6 +87,20 @@ class RoomListStore extends Store {
                 this._generateRoomLists();
             }
             break;
+            // When an event is decrypted, it could mean we need to reorder the room
+            // list because we now know the type of the event.
+            case 'MatrixActions.Event.decrypted': {
+                const room = this._matrixClient.getRoom(payload.event.getRoomId());
+                const liveTimeline = room.getLiveTimeline();
+                const eventTimeline = room.getTimelineForEvent(payload.event.getId());
+
+                if (!this._state.ready ||
+                    liveTimeline !== eventTimeline ||
+                    !this._eventTriggersRecentReorder(payload.event)
+                ) break;
+                this._generateRoomLists();
+            }
+            break;
             case 'MatrixActions.accountData': {
                 if (payload.event_type !== 'm.direct') break;
                 this._generateRoomLists();

From 46f94b3c5aab156b6b6d1406fa7d5aa00fc85089 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 23 Feb 2018 14:53:52 +0000
Subject: [PATCH 585/927] Ensure that roomId is validated before accessing
 room-based widgets.

---
 src/ScalarMessaging.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index ac68d1a2d2..abd1caaec1 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -334,7 +334,6 @@ function setWidget(event, roomId) {
     };
 
     if (userWidget) {
-        console.warn('Adding user widget');
         const client = MatrixClientPeg.get();
         const userWidgets = client.getAccountData('m.widgets').getContent() || {};
 
@@ -357,7 +356,6 @@ function setWidget(event, roomId) {
         }
 
         client.setAccountData('m.widgets', userWidgets);
-        console.warn(`Set user widgets to:`, client.getAccountData('m.widgets'));
         sendResponse(event, {
             success: true,
         });
@@ -619,17 +617,14 @@ const onMessage = function(event) {
     const userId = event.data.user_id;
 
     // These APIs don't require roomId
+    // Get and set user widgets (not associated with a specific room)
+    // If roomId is specified, it must be validated, so room-based widgets agreed
+    // handled further down.
     if (event.data.action === "get_widgets") {
-        getWidgets(event, roomId);
+        getWidgets(event, null);
         return;
     } else if (event.data.action === "set_widget") {
-        setWidget(event, roomId);
-        return;
-    } else if (event.data.action === "add_widget_asset") {
-        addWidgetAsset(event, roomId);
-        return;
-    } else if (event.data.action === "remove_widget_asset") {
-        removeWidgetAsset(event, roomId);
+        setWidget(event, null);
         return;
     }
 
@@ -656,6 +651,15 @@ const onMessage = function(event) {
             return;
         }
 
+        // Get and set room-based widgets
+        if (event.data.action === "get_widgets") {
+            getWidgets(event, null);
+            return;
+        } else if (event.data.action === "set_widget") {
+            setWidget(event, null);
+            return;
+        }
+
         // These APIs don't require userId
         if (event.data.action === "join_rules_state") {
             getJoinRules(event, roomId);

From fae7af1a6261e4903d0efef694c89ecda8512d6f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 23 Feb 2018 14:54:00 +0000
Subject: [PATCH 586/927] Do proper null-checks on decypted events to fix NPEs

Previously we assumed that a decrypted event has a room_id
but this isn't necessarily true for to_device events.

It makes sense to ignore events that aren't associated with
rooms anyway given that the list we're updating only contains
rooms!
---
 src/stores/RoomListStore.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 7660cf8df8..b6d0949dd3 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -90,12 +90,25 @@ class RoomListStore extends Store {
             // When an event is decrypted, it could mean we need to reorder the room
             // list because we now know the type of the event.
             case 'MatrixActions.Event.decrypted': {
-                const room = this._matrixClient.getRoom(payload.event.getRoomId());
+                // We may not have synced or done an initial generation of the lists
+                if (!this._matrixClient || !this._state.ready) break;
+
+                const roomId = payload.event.getRoomId();
+
+                // We may have decrypted an event without a roomId (e.g to_device)
+                if (!roomId) break;
+
+                const room = this._matrixClient.getRoom(roomId);
+
+                // We somehow decrypted an event for a room our client is unaware of
+                if (!room) break;
+
                 const liveTimeline = room.getLiveTimeline();
                 const eventTimeline = room.getTimelineForEvent(payload.event.getId());
 
-                if (!this._state.ready ||
-                    liveTimeline !== eventTimeline ||
+                // Either this event was not added to the live timeline (e.g. pagination)
+                // or it doesn't affect the ordering of the room list.
+                if (liveTimeline !== eventTimeline ||
                     !this._eventTriggersRecentReorder(payload.event)
                 ) break;
                 this._generateRoomLists();

From 57b027b77619dd9e130cac74e072b5f1f3fccf0a Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 23 Feb 2018 15:11:28 +0000
Subject: [PATCH 587/927] Fix API names.

---
 src/WidgetMessaging.js | 158 +++--------------------------------------
 1 file changed, 9 insertions(+), 149 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index c1af402e4d..75a9960987 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -15,146 +15,8 @@ limitations under the License.
 */
 
 /*
-POSTMESSAGE API
-===============
-
-Listens for incoming postMessage requests from embedded widgets. The following API is exposed:
-{
-    api: "widget",
-    action: "content_loaded",
-    widgetId: $WIDGET_ID,
-    data: {}
-    // additional request fields
-}
-
-The complete request object is returned to the caller with an additional "response" key like so:
-{
-    api: "widget",
-    action: "content_loaded",
-    widgetId: $WIDGET_ID,
-    data: {},
-    // additional request fields
-    response: { ... }
-}
-
-The "api" field is required to use this API, and must be set to "widget" in all requests.
-
-The "action" determines the format of the request and response. All actions can return an error response.
-
-Additional data can be sent as abritrary fields. However, typically the data object should be used.
-
-A success response is an object with zero or more keys.
-
-An error response is a "response" object which consists of a sole "error" key to indicate an error.
-They look like:
-{
-    error: {
-        message: "Unable to invite user into room.",
-        _error: <Original Error Object>
-    }
-}
-The "message" key should be a human-friendly string.
-
-ACTIONS
-=======
-** All actions must include an "api" field with value of "widget".**
-All actions can return an error response instead of the response outlined below.
-
-content_loaded
---------------
-Indicates that widget contet has fully loaded
-
-Request:
- - widgetId is the unique ID of the widget instance in riot / matrix state.
- - No additional fields.
-Response:
-{
-    success: "true"
-}
-Example:
-{
-    api: "widget",
-    action: "content_loaded",
-    widgetId: $WIDGET_ID
-}
-
-
-api_version
------------
-Get the current version of the widget postMessage API
-
-Request:
- - No additional fields.
-Response:
-{
-    api_version: "0.0.1"
-}
-Example:
-{
-    api: "widget",
-    action: "api_version",
-}
-
-supported_api_versions
-----------------------
-Get versions of the widget postMessage API that are currently supported
-
-Request:
- - No additional fields.
-Response:
-{
-    api: "widget"
-    supported_versions: ["0.0.1"]
-}
-Example:
-{
-    api: "widget",
-    action: "supported_api_versions",
-}
-
-
-OUTBOUND POSTMESSAGE API
-========================
-
-This API can be used to initiate actions in remote widget instances.
-
-ACTIONS
-=======
-
-Outbound actions use the "widget_client" API key / name, which must be included
-on all requests.
-
-{
-    api: "widget_client",
-    action: "screenshot",
-    widgetId: $WIDGET_ID,
-    data: {}
-    // additional request fields
-}
-
-
-screenshot
-----------
-
-Request a screenshot from the widget (if supported).
-This can currently only be supported by widgets that have access to all of their DOM tree.
-For example, widgets that nest further levels of iframes can not support this capability.
-
-The screenshot is returned as a Blob object.
-
-Request:
- - No additional fields.
-Response:
-{
-    screenshot: {<Blob>data...}
-}
-Example:
-{
-    api: "widget_client",
-    action: "screenshot",
-    widgetId: $WIDGET_ID
-}
-
+* See - https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing for
+* spec. details / documentation.
 */
 
 import URL from 'url';
@@ -166,6 +28,8 @@ const WIDGET_API_VERSION = '0.0.1'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
     '0.0.1',
 ];
+const INBOUND_API_NAME = 'fromWidget';
+const OUTBOUND_API_NAME = 'toWidget';
 
 if (!global.mxWidgetMessagingListenerCount) {
     global.mxWidgetMessagingListenerCount = 0;
@@ -293,7 +157,6 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
         return false;
     }
 
-
     /**
      * Handle widget postMessage events
      * @param  {Event} event Event to handle
@@ -308,7 +171,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
         if (
             event.origin.length === 0 ||
             !this.trustedEndpoint(event.origin) ||
-            event.data.api !== "widget" ||
+            event.data.api !== INBOUND_API_NAME ||
             !event.data.widgetId
         ) {
             return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
@@ -324,12 +187,12 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
             this.sendResponse(event, {success: true});
         } else if (action === 'supported_api_versions') {
             this.sendResponse(event, {
-                api: "widget",
+                api: INBOUND_API_NAME,
                 supported_versions: SUPPORTED_WIDGET_API_VERSIONS,
             });
         } else if (action === 'api_version') {
             this.sendResponse(event, {
-                api: "widget",
+                api: INBOUND_API_NAME,
                 version: WIDGET_API_VERSION,
             });
         } else if (action === 'sticker_message') {
@@ -393,10 +256,9 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
     getScreenshot() {
         return new Promise((resolve, reject) => {
             this.exec({
-                api: "widget_client",
+                api: OUTBOUND_API_NAME,
                 action: "screenshot",
             }).then(function(response) {
-                // console.warn("got screenshot", response.screenshot);
                 resolve(response.screenshot);
             }).catch((error) => {
                 reject(Error("Failed to get screenshot: " + error.message));
@@ -407,10 +269,9 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
     getCapabilities() {
         return new Promise((resolve, reject) => {
             this.exec({
-                api: "widget_client",
+                api: OUTBOUND_API_NAME,
                 action: "capabilities",
             }).then(function(response) {
-                // console.warn("got capabilities", response.capabilities);
                 resolve(response.capabilities);
             }).catch((error) => {
                 reject(Error("Failed to get capabilities: " + error.message));
@@ -419,7 +280,6 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
     }
 }
 
-
 /**
  * Represents mapping of widget instance to URLs for trusted postMessage communication.
  */

From d755b8284c40a95e96c1e6f30dd64c07e00af1e2 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 23 Feb 2018 15:22:56 +0000
Subject: [PATCH 588/927] Remove logging and cleanup.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index cc11a8542a..07bb811667 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -74,7 +74,6 @@ export default class AppTile extends React.Component {
         };
     }
 
-
     /**
      * Does the widget support a given capability
      * @param  {[type]}  capability Capability to check for
@@ -112,7 +111,6 @@ export default class AppTile extends React.Component {
         return u.format();
     }
 
-
     /**
      * Returns true if specified url is a scalar URL, typically https://scalar.vector.im/api
      * @param  {[type]}  url URL to check
@@ -164,7 +162,6 @@ export default class AppTile extends React.Component {
 
     componentWillUnmount() {
         // Widget action listeners
-        console.warn('Removing widget event listener', this.dispatcherRef);
         dis.unregister(this.dispatcherRef);
 
         // Widget postMessage listeners
@@ -339,7 +336,6 @@ export default class AppTile extends React.Component {
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
-        console.warn("App frame loaded", this.props.id);
         this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);

From 9b667f2c3820881f35a943ed0f7091aa5325e23e Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 23 Feb 2018 15:26:47 +0000
Subject: [PATCH 589/927] Reduce logging.

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

diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 7b3508b9a0..2163d89f76 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -93,7 +93,6 @@ export default class Stickerpack extends React.Component {
 
     _onWidgetAction(payload) {
         if (payload.action === "user_widget_updated") {
-            console.warn("user widget updated");
             this._getStickerPickerWidget();
             return;
         }
@@ -103,7 +102,6 @@ export default class Stickerpack extends React.Component {
         // Stickers
         // TODO - Add support for stickerpacks from multiple app stores.
         // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
-        console.warn("Checking for sticker picker widgets");
         const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
         let stickersContent;
 
@@ -111,7 +109,6 @@ export default class Stickerpack extends React.Component {
         if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
             // Set default name
             stickerpackWidget.content.name = stickerpackWidget.name || "Stickerpack";
-            console.warn('Stickerpack widget', stickerpackWidget);
             this.widgetId = stickerpackWidget.id;
 
             stickersContent = (
@@ -205,7 +202,6 @@ export default class Stickerpack extends React.Component {
      */
     onFinished() {
         this.setState({showStickers: false});
-        console.warn("finshed");
     }
 
     /**

From 9ae89e2b43cd577f89d66c60523c8cb8a985d624 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 23 Feb 2018 15:27:55 +0000
Subject: [PATCH 590/927] Reduce logging.

---
 src/utils/widgets.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index 2c7901a18f..a70a4f0406 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -50,9 +50,7 @@ function getUserWidgets() {
  */
 function getStickerpackWidgets() {
     const widgets = getUserWidgets();
-    console.warn("widgets", widgets);
     const stickerpackWidgets = widgets.filter((widget) => widget.type='stickerpack');
-    console.warn('Stickerpack widgets', stickerpackWidgets);
     return stickerpackWidgets;
 }
 

From 86461bc88f7b663fd69d327da5abd0a6f80df860 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Sat, 24 Feb 2018 00:10:28 +0000
Subject: [PATCH 592/927] Disable all widget assets on widget removal.

---
 src/ScalarAuthClient.js                   | 27 +++++++++++++++++++++++
 src/components/views/rooms/Stickerpack.js | 10 +++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index c3fcf80308..fea7ee9aa4 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -148,6 +148,33 @@ class ScalarAuthClient {
         return defer.promise;
     }
 
+    disableWidgetAssets(widgetType, widgetId) {
+        let url = SdkConfig.get().integrations_rest_url + '/widgets/set_assets_state';
+        url = this.getStarterLink(url);
+        return new Promise((resolve, reject) => {
+            request({
+                method: 'GET',
+                uri: url,
+                json: true,
+                qs: {
+                    'widget_type': widgetType,
+                    'widget_id': widgetId,
+                    'state': 'disable',
+                },
+            }, (err, response, body) => {
+                if (err) {
+                    reject(err);
+                } else if (response.statusCode / 100 !== 2) {
+                    reject({statusCode: response.statusCode});
+                } else if (!body) {
+                    reject(new Error("Failed to set widget assets state"));
+                } else {
+                    resolve();
+                }
+            });
+        });
+    }
+
     getScalarInterfaceUrlForRoom(room, screen, id) {
         const roomId = room.roomId;
         const roomName = room.name;
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpack.js
index 2163d89f76..f20c581171 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpack.js
@@ -55,6 +55,15 @@ export default class Stickerpack extends React.Component {
 
     _removeStickerpackWidgets() {
         console.warn('Removing stickerpack widgets');
+        if (this.widgetId) {
+            this.scalarClient.disableWidgetAssets('stickerpack', this.widgetId).then(() => {
+                console.warn('Assets disabled');
+            }).catch((err) => {
+                console.error('Failed to disable assets');
+            });
+        } else {
+            console.warn('No widget ID specified, not disabling assets');
+        }
         Widgets.removeStickerpackWidgets();
         this._getStickerPickerWidget();
         this.stickersMenu.close();
@@ -151,6 +160,7 @@ export default class Stickerpack extends React.Component {
             // Default content to show if stickerpack widget not added
             console.warn("No available sticker picker widgets");
             stickersContent = this.defaultStickersContent;
+            this.widgetId = null;
             this.forceUpdate();
         }
         this.setState({

From ee4310cc41e26482fdf2e2444c4dee2023f583d7 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Sun, 25 Feb 2018 21:47:23 +0000
Subject: [PATCH 593/927] Avoid potential NPE.

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

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index abdea55506..7a9f85a9e0 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -335,7 +335,10 @@ function setWidget(event, roomId) {
 
     if (userWidget) {
         const client = MatrixClientPeg.get();
-        const userWidgets = client.getAccountData('m.widgets').getContent() || {};
+        let userWidgets = {};
+        if (client.getAccountData('m.widgets')) {
+          userWidgets = client.getAccountData('m.widgets').getContent();
+        }
 
         // Delete existing widget with ID
         try {

From e249e3d6223624c5027bda839f82fd248be1ea01 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Sun, 25 Feb 2018 22:10:38 +0000
Subject: [PATCH 594/927] Correct stickerpicker naming,

---
 src/components/views/rooms/MessageComposer.js |  4 +--
 .../{Stickerpack.js => Stickerpicker.js}      | 36 +++++++++----------
 src/utils/widgets.js                          | 20 +++++------
 3 files changed, 30 insertions(+), 30 deletions(-)
 rename src/components/views/rooms/{Stickerpack.js => Stickerpicker.js} (87%)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index e210442c50..70971e2299 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -24,7 +24,7 @@ import sdk from '../../../index';
 import dis from '../../../dispatcher';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
-import Stickerpack from './Stickerpack';
+import Stickerpicker from './Stickerpicker';
 
 export default class MessageComposer extends React.Component {
     constructor(props, context) {
@@ -344,7 +344,7 @@ export default class MessageComposer extends React.Component {
                 hangupButton,
                 callButton,
                 videoCallButton,
-                <Stickerpack key='stickerpack_controls_button' room={this.props.room} />,
+                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
             );
         } else {
             controls.push(
diff --git a/src/components/views/rooms/Stickerpack.js b/src/components/views/rooms/Stickerpicker.js
similarity index 87%
rename from src/components/views/rooms/Stickerpack.js
rename to src/components/views/rooms/Stickerpicker.js
index f20c581171..780a48d848 100644
--- a/src/components/views/rooms/Stickerpack.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -26,14 +26,14 @@ import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
 
-export default class Stickerpack extends React.Component {
+export default class Stickerpicker extends React.Component {
     constructor(props) {
         super(props);
         this.onShowStickersClick = this.onShowStickersClick.bind(this);
         this.onHideStickersClick = this.onHideStickersClick.bind(this);
         this.onFinished = this.onFinished.bind(this);
         this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
-        this._removeStickerpackWidgets = this._removeStickerpackWidgets.bind(this);
+        this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
         this._onWidgetAction = this._onWidgetAction.bind(this);
 
         this.defaultStickersContent = (
@@ -53,8 +53,8 @@ export default class Stickerpack extends React.Component {
         };
     }
 
-    _removeStickerpackWidgets() {
-        console.warn('Removing stickerpack widgets');
+    _removeStickerpickerWidgets() {
+        console.warn('Removing Stickerpicker widgets');
         if (this.widgetId) {
             this.scalarClient.disableWidgetAssets('stickerpack', this.widgetId).then(() => {
                 console.warn('Assets disabled');
@@ -64,7 +64,7 @@ export default class Stickerpack extends React.Component {
         } else {
             console.warn('No widget ID specified, not disabling assets');
         }
-        Widgets.removeStickerpackWidgets();
+        Widgets.removeStickerpickerWidgets();
         this._getStickerPickerWidget();
         this.stickersMenu.close();
     }
@@ -109,16 +109,16 @@ export default class Stickerpack extends React.Component {
 
     _getStickerPickerWidget() {
         // Stickers
-        // TODO - Add support for stickerpacks from multiple app stores.
-        // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpack UI element.
-        const stickerpackWidget = Widgets.getStickerpackWidgets()[0];
+        // TODO - Add support for Stickerpickers from multiple app stores.
+        // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpicker UI element.
+        const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
         let stickersContent;
 
         // Load stickerpack content
-        if (stickerpackWidget && stickerpackWidget.content && stickerpackWidget.content.url) {
+        if (stickerpickerWidget && stickerpickerWidget.content && stickerpickerWidget.content.url) {
             // Set default name
-            stickerpackWidget.content.name = stickerpackWidget.name || "Stickerpack";
-            this.widgetId = stickerpackWidget.id;
+            stickerpickerWidget.content.name = stickerpickerWidget.name || "Stickerpack";
+            this.widgetId = stickerpickerWidget.id;
 
             stickersContent = (
                 <div
@@ -137,19 +137,19 @@ export default class Stickerpack extends React.Component {
                         }}
                     >
                         <AppTile
-                            id={stickerpackWidget.id}
-                            url={stickerpackWidget.content.url}
-                            name={stickerpackWidget.content.name}
+                            id={stickerpickerWidget.id}
+                            url={stickerpickerWidget.content.url}
+                            name={stickerpickerWidget.content.name}
                             room={this.props.room}
-                            type={stickerpackWidget.content.type}
+                            type={stickerpickerWidget.content.type}
                             fullWidth={true}
-                            userId={stickerpackWidget.sender || MatrixClientPeg.get().credentials.userId}
+                            userId={stickerpickerWidget.sender || MatrixClientPeg.get().credentials.userId}
                             creatorUserId={MatrixClientPeg.get().credentials.userId}
                             waitForIframeLoad={true}
                             show={true}
                             showMenubar={true}
                             onEditClick={this._launchManageIntegrations}
-                            onDeleteClick={this._removeStickerpackWidgets}
+                            onDeleteClick={this._removeStickerpickerWidgets}
                             showTitle={false}
                             showMinimise={false}
                         />
@@ -157,7 +157,7 @@ export default class Stickerpack extends React.Component {
                 </div>
             );
         } else {
-            // Default content to show if stickerpack widget not added
+            // Default content to show if stickerpicker widget not added
             console.warn("No available sticker picker widgets");
             stickersContent = this.defaultStickersContent;
             this.widgetId = null;
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index a70a4f0406..da68abb4a9 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -45,26 +45,26 @@ function getUserWidgets() {
 }
 
 /**
- * Get active stickerpack widgets (stickerpacks are user widgets by nature)
- * @return {[object]} Array containing current / active stickerpack widgets
+ * Get active stickerpicker widgets (stickerpickers are user widgets by nature)
+ * @return {[object]} Array containing current / active stickerpicker widgets
  */
-function getStickerpackWidgets() {
+function getStickerpickerWidgets() {
     const widgets = getUserWidgets();
-    const stickerpackWidgets = widgets.filter((widget) => widget.type='stickerpack');
-    return stickerpackWidgets;
+    const stickerpickerWidgets = widgets.filter((widget) => widget.type='m.stickerpicker');
+    return stickerpickerWidgets;
 }
 
 /**
- * Remove all stickerpack widgets (stickerpacks are user widgets by nature)
+ * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
  */
-function removeStickerpackWidgets() {
+function removeStickerpickerWidgets() {
     const client = MatrixClientPeg.get();
     if (!client) {
         throw new Error('User not logged in');
     }
     const userWidgets = client.getAccountData('m.widgets').getContent() || {};
     Object.entries(userWidgets).forEach(([key, widget]) => {
-        if (widget.type === 'stickerpack') {
+        if (widget.type === 'm.stickerpicker') {
             delete userWidgets[key];
         }
     });
@@ -76,6 +76,6 @@ export default {
     getWidgets,
     getRoomWidgets,
     getUserWidgets,
-    getStickerpackWidgets,
-    removeStickerpackWidgets,
+    getStickerpickerWidgets,
+    removeStickerpickerWidgets,
 };

From c93faf7de7f73850e608aab4635860286270f446 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Sun, 25 Feb 2018 22:21:30 +0000
Subject: [PATCH 595/927] Fix promise wrapping.

---
 src/WidgetMessaging.js | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 75a9960987..7d240137a7 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -22,7 +22,6 @@ limitations under the License.
 import URL from 'url';
 import dis from './dispatcher';
 import MatrixPostMessageApi from './MatrixPostMessageApi';
-import Promise from 'bluebird';
 
 const WIDGET_API_VERSION = '0.0.1'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -251,32 +250,26 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
 
     /**
      * Request a screenshot from a widget
-     * @return {Promise} To be resolved when screenshot has been generated
+     * @return {Promise} To be resolved with screenshot data when it has been generated
      */
     getScreenshot() {
-        return new Promise((resolve, reject) => {
-            this.exec({
+        return this.exec({
                 api: OUTBOUND_API_NAME,
                 action: "screenshot",
-            }).then(function(response) {
-                resolve(response.screenshot);
-            }).catch((error) => {
-                reject(Error("Failed to get screenshot: " + error.message));
-            });
-        });
+            }).then((response) => response.screenshot)
+            .catch((error) => new Error("Failed to get screenshot: " + error.message));
     }
 
+    /**
+     * Request capabilities required by the widget
+     * @return {Promise} To be resolved with an array of requested widget capabilities
+     */
     getCapabilities() {
-        return new Promise((resolve, reject) => {
-            this.exec({
+        return this.exec({
                 api: OUTBOUND_API_NAME,
                 action: "capabilities",
-            }).then(function(response) {
-                resolve(response.capabilities);
-            }).catch((error) => {
-                reject(Error("Failed to get capabilities: " + error.message));
-            });
-        });
+            }).then((response) => response.capabilities)
+            .catch((error) => new Error("Failed to get capabilities: " + error.message));
     }
 }
 

From 2b0790b32bb3ddbf32871aa2e6d662ea42ab5de8 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Sun, 25 Feb 2018 22:36:59 +0000
Subject: [PATCH 596/927] Fix PropTypes.

---
 src/components/views/elements/AppTile.js | 30 ++++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 8abd5961bc..6c9ea55142 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -587,30 +587,30 @@ export default class AppTile extends React.Component {
 AppTile.displayName ='AppTile';
 
 AppTile.propTypes = {
-    id: React.PropTypes.string.isRequired,
-    url: React.PropTypes.string.isRequired,
-    name: React.PropTypes.string.isRequired,
-    room: React.PropTypes.object.isRequired,
-    type: React.PropTypes.string.isRequired,
+    id: PropTypes.string.isRequired,
+    url: PropTypes.string.isRequired,
+    name: PropTypes.string.isRequired,
+    room: PropTypes.object.isRequired,
+    type: PropTypes.string.isRequired,
     // Specifying 'fullWidth' as true will render the app tile to fill the width of the app drawer continer.
     // This should be set to true when there is only one widget in the app drawer, otherwise it should be false.
-    fullWidth: React.PropTypes.bool,
+    fullWidth: PropTypes.bool,
     // UserId of the current user
-    userId: React.PropTypes.string.isRequired,
+    userId: PropTypes.string.isRequired,
     // UserId of the entity that added / modified the widget
-    creatorUserId: React.PropTypes.string,
-    waitForIframeLoad: React.PropTypes.bool,
-    showMenubar: React.PropTypes.bool,
+    creatorUserId: PropTypes.string,
+    waitForIframeLoad: PropTypes.bool,
+    showMenubar: PropTypes.bool,
     // Should the AppTile render itself
-    show: React.PropTypes.bool,
+    show: PropTypes.bool,
     // Optional onEditClickHandler (overrides default behaviour)
-    onEditClick: React.PropTypes.func,
+    onEditClick: PropTypes.func,
     // Optional onDeleteClickHandler (overrides default behaviour)
-    onDeleteClick: React.PropTypes.func,
+    onDeleteClick: PropTypes.func,
     // Optionally hide the tile title
-    showTitle: React.PropTypes.bool,
+    showTitle: PropTypes.bool,
     // Optionally hide the tile minimise icon
-    showMinimise: React.PropTypes.bool,
+    showMinimise: PropTypes.bool,
 };
 
 AppTile.defaultProps = {

From 20a442c9626d55bb71621313b1d6385d394e3d47 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Sun, 25 Feb 2018 23:00:46 +0000
Subject: [PATCH 597/927] Add comment.

---
 src/ScalarAuthClient.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/ScalarAuthClient.js b/src/ScalarAuthClient.js
index fea7ee9aa4..c7e439bf2e 100644
--- a/src/ScalarAuthClient.js
+++ b/src/ScalarAuthClient.js
@@ -148,6 +148,14 @@ class ScalarAuthClient {
         return defer.promise;
     }
 
+    /**
+     * Mark all assets associated with the specified widget as "disabled" in the
+     * integration manager database.
+     * This can be useful to temporarily prevent purchased assets from being displayed.
+     * @param  {string} widgetType [description]
+     * @param  {string} widgetId   [description]
+     * @return {Promise}           Resolves on completion
+     */
     disableWidgetAssets(widgetType, widgetId) {
         let url = SdkConfig.get().integrations_rest_url + '/widgets/set_assets_state';
         url = this.getStarterLink(url);

From d3de44e6ebd062c4dec603cc69918a05b0781ade Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 26 Feb 2018 13:26:49 +0000
Subject: [PATCH 598/927] Global interface to start integration manager.

---
 src/IntegrationManager.js | 78 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/IntegrationManager.js

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
new file mode 100644
index 0000000000..fcc97a1044
--- /dev/null
+++ b/src/IntegrationManager.js
@@ -0,0 +1,78 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+import Modal from './Modal';
+import sdk from './index';
+import SdkConfig from './SdkConfig';
+import ScalarMessaging from './ScalarMessaging';
+import ScalarAuthClient from './ScalarAuthClient';
+
+let currentRoomId = "!JWyCNPOtOmEXOylMBv:matrix.org";
+
+if (!global.im) {
+  global.im = {};
+}
+
+export default class IntegrationManager {
+  static async _init() {
+    if (!global.im.client || !global.im.connected) {
+      if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
+        ScalarMessaging.startListening();
+        global.im.client = new ScalarAuthClient();
+
+        await global.im.client.connect().then(() => {
+          global.im.connected = true;
+        }).catch((e) => {
+          console.error("Failed to connect to integrations server", e);
+          global.im.error = e;
+        });
+      } else {
+        console.error('Invalid integration manager config', SdkConfig.get());
+      }
+    }
+  }
+
+  /**
+   * Launch the integrations manager on the stickers integration page
+   * @param  {string} integType integration / widget type
+   * @param  {string} integId   integration / widget ID
+   * @param  {function} onClose Callback to invoke on integration manager close
+   */
+  static async open(integType, integId, onClose) {
+    await IntegrationManager._init();
+    const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
+    console.warn("IM", global.im);
+    if (global.im.error || !(global.im.client && global.im.client.hasCredentials())) {
+      console.error("Scalar error", global.im);
+      return;
+    }
+    integType = 'type_' + integType;
+    console.warn("Launching integration manager", currentRoomId, integType, integId);
+    const src = (global.im.client && global.im.client.hasCredentials()) ?
+    global.im.client.getScalarInterfaceUrlForRoom(
+      currentRoomId,
+      integType,
+      integId,
+    ) :
+    null;
+    Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+      src: src,
+    }, "mx_IntegrationsManager");
+
+    if (onClose) {
+      onClose();
+    }
+  }
+}

From 14d52c9f250c970e358e702ba0c76f8b6e32d208 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 26 Feb 2018 13:29:16 +0000
Subject: [PATCH 599/927] Open integration manager from widget postMessage.

---
 src/WidgetMessaging.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 7d240137a7..edef56cee4 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -22,6 +22,7 @@ limitations under the License.
 import URL from 'url';
 import dis from './dispatcher';
 import MatrixPostMessageApi from './MatrixPostMessageApi';
+import IntegrationManager from './IntegrationManager';
 
 const WIDGET_API_VERSION = '0.0.1'; // Current API version
 const SUPPORTED_WIDGET_API_VERSIONS = [
@@ -196,6 +197,11 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
             });
         } else if (action === 'sticker_message') {
             dis.dispatch({action: 'sticker_message', data: event.data.widgetData, widgetId: event.data.widgetId});
+        } else if (action === 'integration_manager_open') {
+            const data = event.data.widgetData;
+            const integType = (data && data.integType) ? data.integType : null;
+            const integId = (data && data.integId) ? data.integId : null;
+            IntegrationManager.open(integType, integId);
         } else {
             console.warn("Widget postMessage event unhandled");
             this.sendError(event, {message: "The postMessage was unhandled"});

From 707e3f3382becd35f5e68ede8bb2c47f851f0ba9 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 26 Feb 2018 13:32:27 +0000
Subject: [PATCH 600/927] Temp. revert unintended commit.

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

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index fcc97a1044..dde3294536 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -19,8 +19,6 @@ import SdkConfig from './SdkConfig';
 import ScalarMessaging from './ScalarMessaging';
 import ScalarAuthClient from './ScalarAuthClient';
 
-let currentRoomId = "!JWyCNPOtOmEXOylMBv:matrix.org";
-
 if (!global.im) {
   global.im = {};
 }
@@ -53,14 +51,13 @@ export default class IntegrationManager {
   static async open(integType, integId, onClose) {
     await IntegrationManager._init();
     const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-    console.warn("IM", global.im);
     if (global.im.error || !(global.im.client && global.im.client.hasCredentials())) {
       console.error("Scalar error", global.im);
       return;
     }
     integType = 'type_' + integType;
-    console.warn("Launching integration manager", currentRoomId, integType, integId);
     const src = (global.im.client && global.im.client.hasCredentials()) ?
+    // FIXME -- Currently broken. Get current room ID
     global.im.client.getScalarInterfaceUrlForRoom(
       currentRoomId,
       integType,

From 73c8ef50d104b995701db117b369a37f1bf76433 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 26 Feb 2018 13:37:53 +0000
Subject: [PATCH 601/927] Fix current roomID.

---
 src/IntegrationManager.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index dde3294536..35b3baafbd 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -18,6 +18,7 @@ import sdk from './index';
 import SdkConfig from './SdkConfig';
 import ScalarMessaging from './ScalarMessaging';
 import ScalarAuthClient from './ScalarAuthClient';
+import RoomViewStore from './stores/RoomViewStore';
 
 if (!global.im) {
   global.im = {};
@@ -56,14 +57,14 @@ export default class IntegrationManager {
       return;
     }
     integType = 'type_' + integType;
+    console.warn("Current room", RoomViewStore.getRoomId());
     const src = (global.im.client && global.im.client.hasCredentials()) ?
-    // FIXME -- Currently broken. Get current room ID
-    global.im.client.getScalarInterfaceUrlForRoom(
-      currentRoomId,
-      integType,
-      integId,
-    ) :
-    null;
+      global.im.client.getScalarInterfaceUrlForRoom(
+        RoomViewStore.getRoomId(),
+        integType,
+        integId,
+      ) :
+      null;
     Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
       src: src,
     }, "mx_IntegrationsManager");

From b64736aa44910a4cad4e449dc3f81c2839b95173 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 26 Feb 2018 13:43:16 +0000
Subject: [PATCH 602/927] Add listener to close stickerpicker.

---
 src/IntegrationManager.js                   | 1 -
 src/WidgetMessaging.js                      | 3 +++
 src/components/views/rooms/Stickerpicker.js | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index 35b3baafbd..d85b89f744 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -57,7 +57,6 @@ export default class IntegrationManager {
       return;
     }
     integType = 'type_' + integType;
-    console.warn("Current room", RoomViewStore.getRoomId());
     const src = (global.im.client && global.im.client.hasCredentials()) ?
       global.im.client.getScalarInterfaceUrlForRoom(
         RoomViewStore.getRoomId(),
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index edef56cee4..50013a1c30 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -198,6 +198,9 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
         } else if (action === 'sticker_message') {
             dis.dispatch({action: 'sticker_message', data: event.data.widgetData, widgetId: event.data.widgetId});
         } else if (action === 'integration_manager_open') {
+            // Close the stickerpicker
+            dis.dispatch({action: 'stickerpicker_close'});
+            // Open the integration manager
             const data = event.data.widgetData;
             const integType = (data && data.integType) ? data.integType : null;
             const integId = (data && data.integId) ? data.integId : null;
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 780a48d848..fb9e7dc5f0 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -104,6 +104,8 @@ export default class Stickerpicker extends React.Component {
         if (payload.action === "user_widget_updated") {
             this._getStickerPickerWidget();
             return;
+        } else if (payload.action === "stickerpicker_close") {
+          this.stickersMenu.close();
         }
     }
 

From 5ca0fc3ab5a37307c0a5f530db44ae035a0e47b8 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 26 Feb 2018 14:01:33 +0000
Subject: [PATCH 603/927] Make MStickerBody extend MImageBody.

---
 src/components/views/messages/MImageBody.js   | 115 +++++----
 src/components/views/messages/MStickerBody.js | 218 ++----------------
 2 files changed, 82 insertions(+), 251 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index f5515fad90..55d5a18a25 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -30,35 +30,45 @@ import Promise from 'bluebird';
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 
-module.exports = React.createClass({
-    displayName: 'MImageBody',
+export default class extends React.Component {
+    displayName: 'MImageBody'
 
-    propTypes: {
+    static propTypes = {
         /* the MatrixEvent to show */
         mxEvent: PropTypes.object.isRequired,
 
         /* called when the image has loaded */
         onWidgetLoad: PropTypes.func.isRequired,
-    },
+    }
 
-    contextTypes: {
+    static contextTypes = {
         matrixClient: PropTypes.instanceOf(MatrixClient),
-    },
+    }
 
-    getInitialState: function() {
-        return {
+    constructor(props) {
+        super(props);
+
+        this.onAction = this.onAction.bind(this);
+        this.onImageEnter = this.onImageEnter.bind(this);
+        this.onImageLeave = this.onImageLeave.bind(this);
+        this.onClientSync = this.onClientSync.bind(this);
+        this.onClick = this.onClick.bind(this);
+        this.fixupHeight = this.fixupHeight.bind(this);
+        this._isGif = this._isGif.bind(this);
+
+        this.state = {
             decryptedUrl: null,
             decryptedThumbnailUrl: null,
             decryptedBlob: null,
             error: null,
             imgError: false,
         };
-    },
+    }
 
     componentWillMount() {
         this.unmounted = false;
         this.context.matrixClient.on('sync', this.onClientSync);
-    },
+    }
 
     onClientSync(syncState, prevState) {
         if (this.unmounted) return;
@@ -71,9 +81,9 @@ module.exports = React.createClass({
                 imgError: false,
             });
         }
-    },
+    }
 
-    onClick: function onClick(ev) {
+    onClick(ev) {
         if (ev.button == 0 && !ev.metaKey) {
             ev.preventDefault();
             const content = this.props.mxEvent.getContent();
@@ -93,49 +103,49 @@ module.exports = React.createClass({
 
             Modal.createDialog(ImageView, params, "mx_Dialog_lightbox");
         }
-    },
+    }
 
-    _isGif: function() {
+    _isGif() {
         const content = this.props.mxEvent.getContent();
         return (
           content &&
           content.info &&
           content.info.mimetype === "image/gif"
         );
-    },
+    }
 
-    onImageEnter: function(e) {
+    onImageEnter(e) {
         if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
             return;
         }
         const imgElement = e.target;
         imgElement.src = this._getContentUrl();
-    },
+    }
 
-    onImageLeave: function(e) {
+    onImageLeave(e) {
         if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
             return;
         }
         const imgElement = e.target;
         imgElement.src = this._getThumbUrl();
-    },
+    }
 
-    onImageError: function() {
+    onImageError() {
         this.setState({
             imgError: true,
         });
-    },
+    }
 
-    _getContentUrl: function() {
+    _getContentUrl() {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined) {
             return this.state.decryptedUrl;
         } else {
             return this.context.matrixClient.mxcUrlToHttp(content.url);
         }
-    },
+    }
 
-    _getThumbUrl: function() {
+    _getThumbUrl() {
         const content = this.props.mxEvent.getContent();
         if (content.file !== undefined) {
             // Don't use the thumbnail for clients wishing to autoplay gifs.
@@ -146,9 +156,9 @@ module.exports = React.createClass({
         } else {
             return this.context.matrixClient.mxcUrlToHttp(content.url, 800, 600);
         }
-    },
+    }
 
-    componentDidMount: function() {
+    componentDidMount() {
         this.dispatcherRef = dis.register(this.onAction);
         this.fixupHeight();
         const content = this.props.mxEvent.getContent();
@@ -182,23 +192,23 @@ module.exports = React.createClass({
                 });
             }).done();
         }
-    },
+    }
 
-    componentWillUnmount: function() {
+    componentWillUnmount() {
         this.unmounted = true;
         dis.unregister(this.dispatcherRef);
         this.context.matrixClient.removeListener('sync', this.onClientSync);
-    },
+    }
 
-    onAction: function(payload) {
+    onAction(payload) {
         if (payload.action === "timeline_resize") {
             this.fixupHeight();
         }
-    },
+    }
 
-    fixupHeight: function() {
+    fixupHeight() {
         if (!this.refs.image) {
-            console.warn("Refusing to fix up height on MImageBody with no image element");
+            console.warn(`Refusing to fix up height on ${this.displayName} with no image element`);
             return;
         }
 
@@ -214,10 +224,25 @@ module.exports = React.createClass({
         }
         this.refs.image.style.height = thumbHeight + "px";
         // console.log("Image height now", thumbHeight);
-    },
+    }
 
-    render: function() {
-        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+    _messageContent(contentUrl, thumbUrl, content) {
+        return (
+            <span className="mx_MImageBody" ref="body">
+                <a href={contentUrl} onClick={this.onClick}>
+                    <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+                        alt={content.body}
+                        onError={this.onImageError}
+                        onLoad={this.props.onWidgetLoad}
+                        onMouseEnter={this.onImageEnter}
+                        onMouseLeave={this.onImageLeave} />
+                </a>
+                <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
+          </span>
+      );
+    }
+
+    render() {
         const content = this.props.mxEvent.getContent();
 
         if (this.state.error !== null) {
@@ -265,19 +290,7 @@ module.exports = React.createClass({
         }
 
         if (thumbUrl) {
-            return (
-                <span className="mx_MImageBody" ref="body">
-                    <a href={contentUrl} onClick={this.onClick}>
-                        <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
-                            alt={content.body}
-                            onError={this.onImageError}
-                            onLoad={this.props.onWidgetLoad}
-                            onMouseEnter={this.onImageEnter}
-                            onMouseLeave={this.onImageLeave} />
-                    </a>
-                    <MFileBody {...this.props} decryptedBlob={this.state.decryptedBlob} />
-                </span>
-            );
+            return this._messageContent(contentUrl, thumbUrl, content);
         } else if (content.body) {
             return (
                 <span className="mx_MImageBody">
@@ -291,5 +304,5 @@ module.exports = React.createClass({
                 </span>
             );
         }
-    },
-});
+    }
+}
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index bd86eed568..95f5d827bb 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -16,209 +16,27 @@ limitations under the License.
 
 'use strict';
 
-import React from 'react';
-import MatrixClientPeg from '../../../MatrixClientPeg';
-import ImageUtils from '../../../ImageUtils';
-import dis from '../../../dispatcher';
-import { decryptFile, readBlobAsDataUri } from '../../../utils/DecryptFile';
-import Promise from 'bluebird';
-import { _t } from '../../../languageHandler';
-import SettingsStore from "../../../settings/SettingsStore";
+import MImageBody from "./MImageBody";
 
-module.exports = React.createClass({
-    displayName: 'MStickerBody',
+export default class MStickerBody extends MImageBody {
+    displayName: 'MStickerBody'
 
-    propTypes: {
-        /* the MatrixEvent to show */
-        mxEvent: React.PropTypes.object.isRequired,
+    constructor(props) {
+      super(props);
+    }
 
-        /* called when the image has loaded */
-        onWidgetLoad: React.PropTypes.func.isRequired,
-    },
-
-    getInitialState: function() {
-        return {
-            decryptedUrl: null,
-            decryptedThumbnailUrl: null,
-            decryptedBlob: null,
-            error: null,
-        };
-    },
-
-    _isGif: function() {
-        const content = this.props.mxEvent.getContent();
+    _messageContent(contentUrl, thumbUrl, content) {
         return (
-          content &&
-          content.info &&
-          content.info.mimetype === "image/gif"
+            <span className="mx_MImageBody" ref="body">
+                <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+                    alt={content.body}
+                    onLoad={this.props.onWidgetLoad}
+                    onMouseEnter={this.onImageEnter}
+                    onMouseLeave={this.onImageLeave} />
+            </span>
         );
-    },
+    }
 
-    onImageEnter: function(e) {
-        if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
-            return;
-        }
-        const imgElement = e.target;
-        imgElement.src = this._getContentUrl();
-    },
-
-    onImageLeave: function(e) {
-        if (!this._isGif() || SettingsStore.getValue("autoplayGifsAndVideos")) {
-            return;
-        }
-        const imgElement = e.target;
-        imgElement.src = this._getThumbUrl();
-    },
-
-    _getContentUrl: function() {
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined) {
-            return this.state.decryptedUrl;
-        } else {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.url);
-        }
-    },
-
-    _getThumbUrl: function() {
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined) {
-            // Don't use the thumbnail for clients wishing to autoplay gifs.
-            if (this.state.decryptedThumbnailUrl) {
-                return this.state.decryptedThumbnailUrl;
-            }
-            return this.state.decryptedUrl;
-        } else {
-            return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600);
-        }
-    },
-
-    componentDidMount: function() {
-        this.dispatcherRef = dis.register(this.onAction);
-        this.fixupHeight();
-        const content = this.props.mxEvent.getContent();
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            let thumbnailPromise = Promise.resolve(null);
-            if (content.info.thumbnail_file) {
-                thumbnailPromise = decryptFile(
-                    content.info.thumbnail_file,
-                ).then(function(blob) {
-                    return readBlobAsDataUri(blob);
-                });
-            }
-            let decryptedBlob;
-            thumbnailPromise.then((thumbnailUrl) => {
-                return decryptFile(content.file).then(function(blob) {
-                    decryptedBlob = blob;
-                    return readBlobAsDataUri(blob);
-                }).then((contentUrl) => {
-                    this.setState({
-                        decryptedUrl: contentUrl,
-                        decryptedThumbnailUrl: thumbnailUrl,
-                        decryptedBlob: decryptedBlob,
-                    });
-                    this.props.onWidgetLoad();
-                });
-            }).catch((err) => {
-                console.warn("Unable to decrypt attachment: ", err);
-                // Set a placeholder image when we can't decrypt the image.
-                this.setState({
-                    error: err,
-                });
-            }).done();
-        }
-    },
-
-    componentWillUnmount: function() {
-        dis.unregister(this.dispatcherRef);
-    },
-
-    onAction: function(payload) {
-        if (payload.action === "timeline_resize") {
-            this.fixupHeight();
-        }
-    },
-
-    fixupHeight: function() {
-        if (!this.refs.image) {
-            console.warn("Refusing to fix up height on MStickerBody with no image element");
-            return;
-        }
-
-        const content = this.props.mxEvent.getContent();
-        const timelineWidth = this.refs.body.offsetWidth;
-        const maxHeight = 600; // let images take up as much width as they can so long as the height doesn't exceed 600px.
-        // the alternative here would be 600*timelineWidth/800; to scale them down to fit inside a 4:3 bounding box
-
-        //console.log("trying to fit image into timelineWidth of " + this.refs.body.offsetWidth + " or " + this.refs.body.clientWidth);
-        let thumbHeight = null;
-        if (content.info) {
-            thumbHeight = ImageUtils.thumbHeight(content.info.w, content.info.h, timelineWidth, maxHeight);
-        }
-        this.refs.image.style.height = thumbHeight + "px";
-        // console.log("Image height now", thumbHeight);
-    },
-
-    render: function() {
-        const content = this.props.mxEvent.getContent();
-
-        if (this.state.error !== null) {
-            return (
-                <span className="mx_MImageBody" ref="body">
-                    <img src="img/warning.svg" width="16" height="16" />
-                    { _t("Error decrypting image") }
-                </span>
-            );
-        }
-
-        if (content.file !== undefined && this.state.decryptedUrl === null) {
-            // Need to decrypt the attachment
-            // The attachment is decrypted in componentDidMount.
-            // For now add an img tag with a spinner.
-            return (
-                <span className="mx_MImageBody" ref="body">
-                    <div className="mx_MImageBody_thumbnail" ref="image" style={{
-                        "display": "flex",
-                        "alignItems": "center",
-                        "width": "100%",
-                    }}>
-                        <img src="img/spinner.gif" alt={content.body} width="32" height="32" style={{
-                            "margin": "auto",
-                        }} />
-                    </div>
-                </span>
-            );
-        }
-
-        const contentUrl = this._getContentUrl();
-        let thumbUrl;
-        if (this._isGif() && SettingsStore.getValue("autoplayGifsAndVideos")) {
-          thumbUrl = contentUrl;
-        } else {
-          thumbUrl = this._getThumbUrl();
-        }
-
-        if (thumbUrl) {
-            return (
-                <span className="mx_MImageBody" ref="body">
-                    <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
-                        alt={content.body}
-                        onLoad={this.props.onWidgetLoad}
-                        onMouseEnter={this.onImageEnter}
-                        onMouseLeave={this.onImageLeave} />
-                </span>
-            );
-        } else if (content.body) {
-            return (
-                <span className="mx_MImageBody">
-                    { _t("Image '%(Body)s' cannot be displayed.", {Body: content.body}) }
-                </span>
-            );
-        } else {
-            return (
-                <span className="mx_MImageBody">
-                    { _t("This image cannot be displayed.") }
-                </span>
-            );
-        }
-    },
-});
+    onClick() {
+    }
+}

From 8e7564b9a388b7e63432139e3c3f8e443acb478f Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 26 Feb 2018 17:47:52 +0000
Subject: [PATCH 604/927] Wrap the close menu trigger in a timeout

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index fb9e7dc5f0..656d2826b4 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -231,7 +231,9 @@ export default class Stickerpicker extends React.Component {
         Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
             src: src,
         }, "mx_IntegrationsManager");
-        this.stickersMenu.close();
+
+        // Wrap this in a timeout in order to avoid the DOM node from being pulled from under its feet
+        setTimeout(() => this.stickersMenu.close());
     }
 
     render() {

From bc18aecd1eac6534d78d1952bd455da0b39960e9 Mon Sep 17 00:00:00 2001
From: daniel tygel <dtygel@gmail.com>
Date: Mon, 26 Feb 2018 21:41:09 +0000
Subject: [PATCH 605/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 8c7b6ffbd6..5d7bcd6097 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -58,7 +58,7 @@
     "Failed to change password. Is your password correct?": "Não foi possível mudar a senha. A sua senha está correta?",
     "Failed to leave room": "Falha ao tentar deixar a sala",
     "Failed to reject invitation": "Falha ao tentar rejeitar convite",
-    "Failed to set avatar.": "Falha ao tentar definir foto do perfil.",
+    "Failed to set avatar.": "Falha ao tentar definir a imagem do perfil.",
     "Failed to unban": "Não foi possível desfazer o banimento",
     "Failed to upload file": "Falha ao enviar o arquivo",
     "Favourite": "Favorito",
@@ -155,7 +155,7 @@
     "unencrypted": "não criptografado",
     "unknown device": "dispositivo desconhecido",
     "unknown error code": "código de erro desconhecido",
-    "Upload avatar": "Enviar icone de perfil de usuário",
+    "Upload avatar": "Enviar uma imagem de perfil",
     "Upload Files": "Enviar arquivos",
     "Upload file": "Enviar arquivo",
     "User ID": "Identificador de Usuário",
@@ -492,7 +492,7 @@
     "Drop file here to upload": "Arraste um arquivo aqui para enviar",
     " (unsupported)": " (não suportado)",
     "Ongoing conference call%(supportedText)s.": "Conferência%(supportedText)s em andamento.",
-    "Online": "Online",
+    "Online": "Conectada/o",
     "Idle": "Ocioso",
     "Offline": "Offline",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "O arquivo exportado irá permitir a qualquer pessoa que o acesse a descriptografar qualquer uma das mensagens criptografadas que você veja, portanto seja bastante cuidadosa(o) em manter este arquivo seguro. Para deixar este arquivo mais protegido, recomendamos que você insira uma senha abaixo, que será usada para criptografar o arquivo. Só será possível importar os dados usando exatamente a mesma senha.",
@@ -660,5 +660,330 @@
     "Unpin Message": "Desafixar Mensagem",
     "Add rooms to this community": "Adicionar salas na comunidade",
     "The version of Riot.im": "A Versão do Riot.im",
-    "Whether or not you're logged in (we don't record your user name)": "Se você está ou não conectado (Nos não Gravaremos seu nome de usuário)"
+    "Whether or not you're logged in (we don't record your user name)": "Se você está ou não conectado (Nos não Gravaremos seu nome de usuário)",
+    "The platform you're on": "A plataforma que você está usando",
+    "Your language of choice": "O idioma que você selecionou",
+    "Which officially provided instance you are using, if any": "Qual instância oficial você está usando, se for o caso",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se você está usando o editor de texto visual",
+    "Your homeserver's URL": "A URL do seu Servidor de Base (homeserver)",
+    "Your identity server's URL": "A URL do seu servidor de identidade",
+    "The information being sent to us to help make Riot.im better includes:": "As informações que estão sendo usadas para ajudar a melhorar o Riot.im incluem:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Nós também gravamos cada página que você usa no app (atualmente <CurrentPageHash>), o seu User Agent (<CurrentUserAgent>) e a resolução do seu dispositivo (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Quando esta página tem informação de identificação, como uma sala, ID de usuária/o ou de grupo, estes dados são removidos antes de serem enviados ao servidor.",
+    "Call Failed": "A chamada falhou",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Há dispositivos desconhecidos nesta sala: se você continuar sem verificá-los, será possível alguém espiar sua chamada.",
+    "Review Devices": "Revisar dispositivos",
+    "Call Anyway": "Ligar assim mesmo",
+    "Answer Anyway": "Responder assim mesmo",
+    "Call": "Ligar",
+    "Answer": "Responder",
+    "PM": "PM",
+    "AM": "AM",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s de %(monthName)s de%(fullYear)s",
+    "Who would you like to add to this community?": "Quem você gostaria de adicionar a esta comunidade?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Atenção: qualquer pessoa que você adicionar a esta comunidade estará publicamente visível para todas as pessoas que conheçam o ID da comunidade",
+    "Invite new community members": "Convidar novos integrantes para a comunidade",
+    "Which rooms would you like to add to this community?": "Quais salas você quer adicionar a esta comunidade?",
+    "Show these rooms to non-members on the community page and room list?": "Exibir estas salas para não integrantes na página da comunidade e na lista de salas?",
+    "Room name or alias": "Nome da sala ou apelido",
+    "Unable to create widget.": "Não foi possível criar o widget.",
+    "You are now ignoring %(userId)s": "Você está agora ignorando %(userId)s",
+    "Unignored user": "Usuária/o não está sendo mais ignorada/o",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s alterou o seu nome público para %(displayName)s.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s alterou as mensagens fixas da sala.",
+    "%(widgetName)s widget modified by %(senderName)s": "O widget %(widgetName)s foi modificado por %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "O widget %(widgetName)s foi criado por %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "O widget %(widgetName)s foi removido por %(senderName)s",
+    "%(names)s and %(count)s others are typing|other": "%(names)s e %(count)s outras pessoas estão escrevendo",
+    "%(names)s and %(count)s others are typing|one": "%(names)s e uma outra pessoa estão escrevendo",
+    "Send": "Enviar",
+    "Message Replies": "Respostas",
+    "Message Pinning": "Fixar mensagem",
+    "Presence Management": "Gestão da presença",
+    "Tag Panel": "Painel de tags",
+    "Disable Emoji suggestions while typing": "Desativar sugestões de emojis enquanto estiver escrevendo",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensagens de entrada e de saída (não afeta convites, expulsões e banimentos)",
+    "Hide avatar changes": "Ocultar alterações da imagem de perfil",
+    "Hide display name changes": "Ocultar alterações de nome de usuária/o",
+    "Enable automatic language detection for syntax highlighting": "Ativar detecção automática de idioma para ressaltar erros de ortografia",
+    "Hide avatars in user and room mentions": "Ocultar avatars em menções a usuárias/os e a salas",
+    "Disable big emoji in chat": "Desativar emojis grandes na sala",
+    "Automatically replace plain text Emoji": "Substituir automaticamente os emojis em texto",
+    "Mirror local video feed": "Espelhar o feed de vídeo local",
+    "Enable inline URL previews by default": "Ativar, por padrão, a visualização de resumo de links",
+    "Enable URL previews for this room (only affects you)": "Ativar, para esta sala, a visualização de links (só afeta você)",
+    "Enable URL previews by default for participants in this room": "Ativar, para todas/os as/os integrantes desta sala, a visualização de links",
+    "Delete %(count)s devices|other": "Removar %(count)s dispositivos",
+    "Delete %(count)s devices|one": "Remover dispositivo",
+    "Select devices": "Selecionar dispositivos",
+    "Cannot add any more widgets": "Não é possível adicionar novos widgets",
+    "The maximum permitted number of widgets have already been added to this room.": "O número máximo de widgets permitidos já foi atingido nesta sala.",
+    "Add a widget": "Adicionar um widget",
+    "%(senderName)s sent an image": "%(senderName)s enviou uma imagem",
+    "%(senderName)s sent a video": "%(senderName)s enviou um vídeo",
+    "%(senderName)s uploaded a file": "%(senderName)s enviou um arquivo",
+    "Disinvite this user?": "Desconvidar esta/e usuária/o?",
+    "Kick this user?": "Excluir esta/e usuária/o?",
+    "Unban this user?": "Desfazer o banimento desta/e usuária/o?",
+    "Ban this user?": "Banir esta/e usuária/o?",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Você não poderá desfazer esta alteração, já que está baixando suas próprias permissões. Se você for a última pessoa nesta sala, será impossível recuperar as permissões atuais.",
+    "Unignore": "Não ignorar mais",
+    "Ignore": "Ignorar",
+    "Jump to read receipt": "Ir para a confirmação de leitura",
+    "Mention": "Mencionar",
+    "Invite": "Convidar",
+    "User Options": "Opções de usuária/o",
+    "Hide Apps": "Ocultar Apps",
+    "Show Apps": "Mostrar Apps",
+    "Send an encrypted reply…": "Enviar uma resposta criptografada…",
+    "Send a reply (unencrypted)…": "Enviar uma resposta (não criptografada)…",
+    "Send an encrypted message…": "Enviar mensagem criptografada…",
+    "Send a message (unencrypted)…": "Enviar mensagem (não criptografada)…",
+    "Jump to message": "Pular para mensagem",
+    "No pinned messages.": "Não há mensagens fixas.",
+    "Loading...": "Carregando...",
+    "Pinned Messages": "Mensagens fixas",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sd",
+    "Online for %(duration)s": "Online há %(duration)s",
+    "Idle for %(duration)s": "Inativo há %(duration)s",
+    "Offline for %(duration)s": "Offline há %(duration)s",
+    "Unknown for %(duration)s": "Status desconhecido há %(duration)s",
+    "Unknown": "Desconhecido",
+    "Replying": "Respondendo",
+    "No rooms to show": "Nenhuma sala para mostrar",
+    "Unnamed room": "Sala sem nome",
+    "World readable": "Aberto publicamente à leitura",
+    "Guests can join": "Convidadas/os podem entrar",
+    "Remove avatar": "Remover a imagem de perfil",
+    "Drop here to favourite": "Arraste aqui para favoritar",
+    "Drop here to tag direct chat": "Arraste aqui para marcar como conversa direta",
+    "Drop here to restore": "Arraste aqui para restaurar",
+    "Drop here to demote": "Arraste aqui para reduzir privilégio",
+    "Community Invites": "Convites a comunidades",
+    "You have been kicked from this room by %(userName)s.": "Você foi excluída/o desta sala por %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Você foi banida/o desta sala por %(userName)s.",
+    "You are trying to access a room.": "Você está tentando acessar uma sala.",
+    "To change the room's avatar, you must be a": "Para alterar a imagem da sala, você deve ser um(a)",
+    "To change the room's name, you must be a": "Para mudar o nome da sala, você deve ser um(a)",
+    "To change the room's main address, you must be a": "Para mudar o endereço principal da sala, você deve ser um(a)",
+    "To change the room's history visibility, you must be a": "Para mudar a visibilidade do histórico desta sala, você deve ser um(a)",
+    "To change the permissions in the room, you must be a": "Para mudar as permissões nesta sala, você deve ser um(a)",
+    "To change the topic, you must be a": "Para alterar o tópico desta sala, você deve ser um(a)",
+    "To modify widgets in the room, you must be a": "Para alterar widgets nesta sala, você deve ser um(a)",
+    "Banned by %(displayName)s": "Banida/o por %(displayName)s",
+    "Publish this room to the public in %(domain)s's room directory?": "Quer publicar esta sala na lista pública de salas em %(domain)s's?",
+    "Members only (since the point in time of selecting this option)": "Apenas integrantes (a partir do momento em que esta opção for selecionada)",
+    "Members only (since they were invited)": "Apenas integrantes (desde que foram convidadas/os)",
+    "Members only (since they joined)": "Apenas integrantes (desde que entraram na sala)",
+    "To send messages, you must be a": "Para enviar mensagens, você deve ser um(a)",
+    "To invite users into the room, you must be a": "Para convidar pessoas à sala, você deve ser um(a)",
+    "To configure the room, you must be a": "Para alterar configurações desta sala, você deve ser um(a)",
+    "To kick users, you must be a": "Para excluir pessoas desta sala, você deve ser um(a)",
+    "To ban users, you must be a": "Para banir pessoas desta sala, você deve ser um(a)",
+    "To remove other users' messages, you must be a": "Para apagar mensagens de outras pessoas nesta sala, você deve ser um(a)",
+    "To send events of type <eventType/>, you must be a": "Para enviar eventos do tipo <eventType/>, você deve ser um(a)",
+    "Addresses": "Endereços",
+    "Invalid community ID": "ID de comunidade inválido",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' não é um ID de comunidade válido",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Esta sala mostrará flairs para as seguintes comunidades:",
+    "This room is not showing flair for any communities": "Esta sala não está mostrando fairs para nenhuma comunidade",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Novo ID de comunidade (p.ex: +foo:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "Pré-visualizações de links estão ativadas por padrão para participantes desta sala.",
+    "URL previews are disabled by default for participants in this room.": "Pré-visualizações de links estão desativadas por padrão para participantes desta sala.",
+    "Copied!": "Copiado!",
+    "Failed to copy": "Não foi possível copiar",
+    "Message removed by %(userId)s": "Mensagem removida por %(userId)s",
+    "Message removed": "Mensagem removida",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "A verificação através de robô está atualmente indisponível na versão desktop - utilize um <a>navegador web</a>",
+    "An email has been sent to %(emailAddress)s": "Um email foi enviado para %(emailAddress)s",
+    "A text message has been sent to %(msisdn)s": "Uma mensagem de texto foi enviada para %(msisdn)s",
+    "Username on %(hs)s": "Nome de usuária/o em %(hs)s",
+    "%(serverName)s Matrix ID": "ID Matrix em %(serverName)s",
+    "Remove from community": "Remover da comunidade",
+    "Disinvite this user from community?": "Desconvidar esta pessoa da comunidade?",
+    "Remove this user from community?": "Remover esta pessoa da comunidade?",
+    "Failed to withdraw invitation": "Não foi possível retirar o convite",
+    "Failed to remove user from community": "Não foi possível remover esta pessoa da comunidade",
+    "Filter community members": "Filtrar  participantes da comunidade",
+    "Flair will appear if enabled in room settings": "Os flairs aparecerão se estiverem ativados nas configurações da sala",
+    "Flair will not appear": "Os flairs não aparecerão",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Tem certeza que quer remover a sala '%(roomName)s' do grupo %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "Remover uma sala da comunidade também a removerá da página da comunidade.",
+    "Failed to remove room from community": "Não foi possível remover a sala da comunidade",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Não foi possível remover a sala '%(roomName)s' do grupo %(groupId)s",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "A visibilidade da sala '%(roomName)s' do grupo %(groupId)s não pôde ser atualizada.",
+    "Visibility in Room List": "Visibilidade na lista de salas",
+    "Visible to everyone": "Visível para todo mundo",
+    "Only visible to community members": "Apenas visível para integrantes da comunidade",
+    "Filter community rooms": "Filtrar salas da comunidade",
+    "Something went wrong when trying to get your communities.": "Algo deu errado quando estava carregando suas comunidades.",
+    "Display your community flair in rooms configured to show it.": "Mostrar o flair de sua comunidade em salas configuradas para isso.",
+    "You're not currently a member of any communities.": "Atualmente você não é integrante de nenhuma comunidade.",
+    "NOTE: Apps are not end-to-end encrypted": "Nota: os apps não são criptografados ponta-a-ponta",
+    "Do you want to load widget from URL:": "Você quer carregar o widget da URL:",
+    "Allow": "Permitir",
+    "Delete Widget": "Apagar widget",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Remover um widget o remove para todas as pessoas desta sala. Tem certeza que quer remover este widget?",
+    "Delete widget": "Remover widget",
+    "Revoke widget access": "Retirar acesso ao widget",
+    "Minimize apps": "Minimizar apps",
+    "Communities": "Comunidades",
+    "Integrations Error": "Erro de integração",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)s entraram %(count)s vezes",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)s entraram",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)s entrou %(count)s vezes",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)s entrou",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)s saíram %(count)s vezes",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)s saíram",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)s saiu %(count)s vezes",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)s saiu",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)s entraram e saíram %(count)s vezes",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)s entraram e saíram",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)s entrou e saiu %(count)s vezes",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)s entrou e saiu",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)s saíram e entraram %(count)s vezes",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s saíram e entraram",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s saiu e entrou %(count)s vezes",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)s saiu e entrou",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)s rejeitaram seus convites %(count)s vezes",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)s rejeitaram seus convites",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)s rejeitou seu convite %(count)s vezes",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)s rejeitou seu convite",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)s tiveram seus convites retirados %(count)s vezes",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)s tiveram seus convites retirados",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)s teve seus convites removidos %(count)s vezes",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)s teve seu convite removido",
+    "were invited %(count)s times|other": "foram convidadas/os %(count)s vezes",
+    "were invited %(count)s times|one": "foram convidadas/os",
+    "was invited %(count)s times|other": "foi convidada/o %(count)s vezes",
+    "was invited %(count)s times|one": "foi convidada/o",
+    "were banned %(count)s times|other": "foram banidas/os %(count)s vezes",
+    "were banned %(count)s times|one": "foram banidas/os",
+    "was banned %(count)s times|other": "foi banida/o %(count)s vezes",
+    "was banned %(count)s times|one": "foi banida/o",
+    "were unbanned %(count)s times|other": "tiveram seu banimento desfeito %(count)s vezes",
+    "were unbanned %(count)s times|one": "tiveram seu banimento desfeito",
+    "was unbanned %(count)s times|other": "teve seu banimento desfeito %(count)s vezes",
+    "was unbanned %(count)s times|one": "teve seu banimento desfeito",
+    "were kicked %(count)s times|other": "foram excluídas/os %(count)s vezes",
+    "were kicked %(count)s times|one": "foram excluídas/os",
+    "was kicked %(count)s times|other": "foi excluída/o %(count)s vezes",
+    "was kicked %(count)s times|one": "foi excluída/o",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s alteraram o seu nome %(count)s vezes",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)s alteraram o seu nome",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s alterou o seu nome %(count)s vezes",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s alterou o seu nome",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s alteraram a sua imagem de perfil %(count)s vezes",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)s alteraram a sua imagem de perfil",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)s alterou a sua imagem de perfil %(count)s vezes",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)s alterou a sua imagem de perfil",
+    "%(items)s and %(count)s others|other": "%(items)s e %(count)s outras",
+    "%(items)s and %(count)s others|one": "%(items)s e uma outra",
+    "collapse": "colapsar",
+    "expand": "expandir",
+    "Custom of %(powerLevel)s": "Personalizado de %(powerLevel)s",
+    "<a>In reply to</a> <pill>": "<a>Em resposta a</a> <pill>",
+    "And %(count)s more...|other": "E %(count)s mais...",
+    "Matrix ID": "ID Matrix",
+    "Matrix Room ID": "ID da sala Matrix",
+    "email address": "endereço de e-mail",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Tente usar um dos seguintes tipos de endereço válidos: %(validTypesList)s.",
+    "You have entered an invalid address.": "Você entrou com um endereço inválido.",
+    "Community IDs cannot not be empty.": "IDs de comunidades não podem estar em branco.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "IDs de comunidade podem apenas ter os seguintes caracteres: a-z, 0-9, ou '=_-./'",
+    "Something went wrong whilst creating your community": "Algo deu errado ao criar sua comunidade",
+    "Create Community": "Criar comunidade",
+    "Community Name": "Nome da comunidade",
+    "Example": "Exemplo",
+    "Community ID": "ID da comunidade",
+    "example": "exemplo",
+    "Create": "Criar",
+    "Advanced options": "Opções avançadas",
+    "Block users on other matrix homeservers from joining this room": "Proibir pessoas de outros servidores matrix (homeservers) de ingressarem nesta sala",
+    "This setting cannot be changed later!": "Esta configuração não poderá ser desfeita posteriormente!",
+    "Loading device info...": "Carregando informações do dispositivo...",
+    "To get started, please pick a username!": "Para começar, escolha um nome de usuária/o!",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML para a página da sua comunidade</h1>\n<p>\n    Use a descrição longa para apresentar a comunidade para novas/os integrantes ou partilhe <a href=\"foo\">links</a> importantes.\n</p>\n<p>\n    Você pode até mesmo usar tags 'img' do HTML\n</p>\n",
+    "Add rooms to the community summary": "Adicionar salas para o índice da comunidade",
+    "Which rooms would you like to add to this summary?": "Quais salas você gostaria de adicionar a este índice?",
+    "Add to summary": "Adicionar ao índice",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Não foi possível adicionar as seguintes salas para o índice da comunidade %(groupId)s:",
+    "Add a Room": "Adicionar uma sala",
+    "Failed to remove the room from the summary of %(groupId)s": "Não foi possível remover a sala do índice da comunidade %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' não pôde ser removida do índice",
+    "Add users to the community summary": "Adicionar pessoas para o índice da comunidade",
+    "Who would you like to add to this summary?": "Quem você gostaria de adicionar a este índice?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Não foi possível adicionar as seguintes pessoas para o índice da comunidade %(groupId)s:",
+    "Add a User": "Adicionar uma pessoa",
+    "Failed to remove a user from the summary of %(groupId)s": "Não foi possível remover uma pessoa do índice da comunidade %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "'%(displayName)s' não pôde ser removida/o do índice.",
+    "Failed to upload image": "O envio da imagem falhou",
+    "Failed to update community": "A atualização da comunidade falhou",
+    "Unable to accept invite": "Não foi possível aceitar o convite",
+    "Unable to reject invite": "Não foi possível rejeitar o convite",
+    "Leave Community": "Deixar a comunidade",
+    "Leave %(groupName)s?": "Quer sair da comunidade %(groupName)s?",
+    "Leave": "Sair",
+    "Unable to leave room": "Não foi possível sair da sala",
+    "Community Settings": "Configurações da comunidade",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Estas salas são exibidas para as/os integrantes da comunidade na página da comunidade. Integrantes da comunidade podem entrar nas salas ao clicar nas mesmas.",
+    "Featured Rooms:": "Salas em destaque:",
+    "Featured Users:": "Pessoas em destaque:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s convidou você para entrar nesta comunidade",
+    "You are an administrator of this community": "Você é administrador(a) desta comunidade",
+    "You are a member of this community": "Você é um/a integrante desta comunidade",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Sua comunidade não tem uma descrição longa, ou seja, uma página HTML para ser exibida às pessoas que fazem parte da comunidade.<br />Clique aqui para abrir as configurações e criar uma!",
+    "Long Description (HTML)": "Descrição longa (HTML)",
+    "Description": "Descrição",
+    "Community %(groupId)s not found": "A comunidade %(groupId)s não foi encontrada",
+    "This Home server does not support communities": "Este servidor de base não permite comunidades",
+    "Failed to load %(groupId)s": "Não foi possível carregar a comunidade %(groupId)s",
+    "This room is not public. You will not be able to rejoin without an invite.": "Esta sala não é pública. Você não poderá voltar sem ser convidada/o.",
+    "Cryptography data migrated": "Dados de criptografia migrados",
+    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Uma migração única de dados criptografados foi realizada. A criptografia ponta-a-ponta não vai funcionar se você voltar para uma versão anterior do Riot. Se você necessitar usar criptografia ponta-a-ponta em uma versão anterior, primeiro faça logout do Riot. Para manter o histórico de mensagens, exporte e reimporte suas chaves.",
+    "Old cryptography data detected": "Dados de criptografia antigos foram detectados",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Dados de uma versão anterior do Riot foram detectados. Isso fará com que a criptografia ponta-a-ponta não funcione na versão anterior. Mensagens criptografadas ponta-a-ponta que foram trocadas recentemente usando a versão antiga do Riot talvez não possam ser decriptografadas nesta versão. Isso também pode fazer com que mensagens trocadas com esta versão falhem. Se você tiver problemas desta natureza, faça logout e entre novamente. Para manter o histórico de mensagens, exporte e reimporte suas chaves de criptografia.",
+    "Your Communities": "Suas comunidades",
+    "Error whilst fetching joined communities": "Erro baixando comunidades das quais você faz parte",
+    "Create a new community": "Criar nova comunidade",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crie uma comunidade para agrupar em um mesmo local pessoas e salas! Monte uma página inicial personalizada para dar uma identidade ao seu espaço no universo Matrix.",
+    "Join an existing community": "Entrar numa comunidade existente",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Para entrar em uma comunidade, você terá que conhecer o seu ID; um ID de comunidade normalmente tem este formato: <i>+exemplo:matrix.org</i>.",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Exibir dispositivos</showDevicesText>, <sendAnywayText>enviar assim mesmo</sendAnywayText> ou <cancelText>cancelar</cancelText>.",
+    "%(count)s of your messages have not been sent.|one": "Sua mensagem não foi enviada.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reenviar todas</resendText> ou <cancelText>cancelar todas</cancelText> agora. Você também pode selecionar mensagens individualmente a serem reenviadas ou canceladas.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reenviar mensagem</resendText> ou <cancelText>cancelar mensagem</cancelText> agora.",
+    "Warning": "Atenção",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Não há mais ninguém aqui! Você deseja <inviteText>convidar outras pessoas</inviteText> ou <nowarnText>remover este alerta sobre a sala vazia</nowarnText>?",
+    "Clear filter": "Remover filtro",
+    "Light theme": "Tema claro",
+    "Dark theme": "Tema escuro",
+    "Status.im theme": "Tema Status.im",
+    "Autocomplete Delay (ms):": "Tempo para preenchimento automático (ms):",
+    "Ignored Users": "Usuárias/os ignoradas/os",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "A privacidade é importante para nós, portanto nós não coletamos nenhum dado pessoa ou identificável para nossas estatísticas.",
+    "Learn more about how we use analytics.": "Saiba mais sobre como nós usamos os dados estatísticos.",
+    "Updates": "Atualizações",
+    "Check for update": "Verificar atualizações",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Um email foi enviado para %(emailAddress)s. Quando você tiver seguido o link que está nesta mensagem, clique abaixo.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Note que você está se conectando ao servidor %(hs)s, e não ao servidor matrix.org.",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Este servidor de base (homeserver) não oferece fluxos de login que funcionem neste cliente.",
+    "Sign in to get started": "Conecte-se para começar",
+    "Unbans user with given id": "Retira o banimento para a pessoa com este id",
+    "Define the power level of a user": "Definir o nível de permissões de um(a) usuário(a)",
+    "Sets the room topic": "Define o tópico da sala",
+    "Changes colour scheme of current room": "Altera o esquema de cores da sala atual",
+    "Verifies a user, device, and pubkey tuple": "Verifica um(a) usuário(a), dispositivo ou tuplo da chave pública",
+    "Ignores a user, hiding their messages from you": "Ignora um(a) usuário(a), ocultando suas mensagens de você",
+    "Stops ignoring a user, showing their messages going forward": "Deixa de ignorar um(a) usuário(a), exibindo suas mensagens daqui para frente",
+    "Notify the whole room": "Notifica a sala inteira",
+    "Room Notification": "Notificação da sala",
+    "Failed to set direct chat tag": "Falha ao definir esta conversa como direta",
+    "Failed to remove tag %(tagName)s from room": "Falha ao remover a tag %(tagName)s da sala",
+    "Failed to add tag %(tagName)s to room": "Falha ao adicionar a tag %(tagName)s para a sala"
 }

From 2b49947e1efca44a3106bd2afad551081adb974c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 27 Feb 2018 09:20:06 +0000
Subject: [PATCH 606/927] Add "Did you know:..." microcopy to groups view

To explain how to drag group avatars into the TagPanel
---
 src/components/structures/MyGroups.js | 15 +++++++++++++++
 src/i18n/strings/en_EN.json           |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index 116607fb08..da7bebd16a 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -74,6 +74,21 @@ export default withMatrixClient(React.createClass({
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
                 <GeminiScrollbar>
+                    <div className="mx_MyGroups_microcopy">
+                        <p>
+                            { _t(
+                                "Did you know: you can use communities to filter your Riot.im experience!",
+                            ) }
+                        </p>
+                        <p>
+                            { _t(
+                                "To set up a filter, drag a community avatar over to the filter panel on " +
+                                "the far left hand side of the screen. You can click on an avatar in the " +
+                                "filter panel at any time to see only the rooms and people associated " +
+                                "with that community.",
+                            ) }
+                        </p>
+                    </div>
                     <div className="mx_MyGroups_joinedGroups">
                         { groupNodes }
                     </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ef4bdf343e..5b90973a65 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -787,6 +787,8 @@
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
     "Logout": "Logout",
     "Your Communities": "Your Communities",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.",
     "Error whilst fetching joined communities": "Error whilst fetching joined communities",
     "Create a new community": "Create a new community",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.",

From ef4d13715a3f2fffee32f5400dba5d862ba7f80d Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 27 Feb 2018 11:29:14 +0000
Subject: [PATCH 607/927] Wrap menu close in timeout to avoid element
 disappearing unexpectedly.

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 656d2826b4..37d331943a 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -66,7 +66,7 @@ export default class Stickerpicker extends React.Component {
         }
         Widgets.removeStickerpickerWidgets();
         this._getStickerPickerWidget();
-        this.stickersMenu.close();
+        setTimeout(() => this.stickersMenu.close());
     }
 
     componentDidMount() {
@@ -105,7 +105,7 @@ export default class Stickerpicker extends React.Component {
             this._getStickerPickerWidget();
             return;
         } else if (payload.action === "stickerpicker_close") {
-          this.stickersMenu.close();
+          setTimeout(() => this.stickersMenu.close());
         }
     }
 
@@ -206,7 +206,7 @@ export default class Stickerpicker extends React.Component {
      * @param  {Event} ev Event that triggered the function call
      */
     onHideStickersClick(ev) {
-        this.stickersMenu.close();
+        setTimeout(() => this.stickersMenu.close());
     }
 
     /**

From 57c98d96a577d0d1a2d5fd811def22cc244361d0 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 27 Feb 2018 13:40:21 +0000
Subject: [PATCH 608/927] Update widget type.

---
 src/components/views/rooms/Stickerpicker.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 37d331943a..f75cf50804 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -26,6 +26,8 @@ import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
 
+const widgetType = 'm.stickerpicker';
+
 export default class Stickerpicker extends React.Component {
     constructor(props) {
         super(props);
@@ -56,7 +58,7 @@ export default class Stickerpicker extends React.Component {
     _removeStickerpickerWidgets() {
         console.warn('Removing Stickerpicker widgets');
         if (this.widgetId) {
-            this.scalarClient.disableWidgetAssets('stickerpack', this.widgetId).then(() => {
+            this.scalarClient.disableWidgetAssets(widgetType, this.widgetId).then(() => {
                 console.warn('Assets disabled');
             }).catch((err) => {
                 console.error('Failed to disable assets');
@@ -224,7 +226,7 @@ export default class Stickerpicker extends React.Component {
         const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
                 this.scalarClient.getScalarInterfaceUrlForRoom(
                     this.props.room,
-                    'type_stickerpack',
+                    'type_' + widgetType,
                     this.widgetId,
                 ) :
                 null;

From a92e3eac6cee6983505463d587ca094818a845f8 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Fri, 23 Feb 2018 22:41:38 +0000
Subject: [PATCH 609/927] Translated using Weblate (Basque)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 5c891bcdc4..a149227632 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -121,11 +121,11 @@
     "Import": "Inportatu",
     "Never send encrypted messages to unverified devices from this device": "Ez bidali inoiz zifratutako mezuak egiaztatu gabeko gailuetara gailu honetatik",
     "Verified": "Egiaztatuta",
-    "Blacklisted": "Zerrenda beltzean",
+    "Blacklisted": "Blokeatuta",
     "unknown device": "gailu ezezaguna",
     "Unverify": "Kendu egiaztaketa",
-    "Blacklist": "Sartu zerrenda beltzean",
-    "Unblacklist": "Atera zerrenda beltzean",
+    "Blacklist": "Blokeatu",
+    "Unblacklist": "Desblokeatu",
     "Verify device": "Egiaztatu gailua",
     "I verify that the keys match": "Gakoak bat datozela egiaztatu dut",
     "Room contains unknown devices": "Gelan gailu ezezagunak daude",
@@ -576,7 +576,7 @@
     "This action is irreversible.": "Ez dago ekintza hau atzera egiterik.",
     "To continue, please enter your password.": "Jarraitzeko sartu zure pasahitza.",
     "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:": "Gailu hau fidagarria dela egiaztatzeko, kontaktatu bere jabea beste medio bat erabiliz (adib. aurrez aurre edo telefonoz deituz) eta galdetu beraien erabiltzaile-ezarpenetan bere gailurako ikusten duen gakoa hemen beheko bera den:",
-    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Bat badator sakatu egiaztatu botoia. Bat ez badator, beste inor gailu hau atzematen dago eta zerrenda beltzera gehitu beharko zenuke.",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Bat badator sakatu egiaztatu botoia. Bat ez badator, beste inor gailu hau atzematen dago eta blokeatu beharko zenuke.",
     "In future this verification process will be more sophisticated.": "etorkizunean egiaztaketa metodoa hobetuko da.",
     "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Errore bat gertatu da zure aurreko saioa berreskuratzen saiatzean. Jarraitzen baduzu berriro hasi beharko duzu saioa eta ezin izango duzu irakurri zifratutako historiala.",
     "Unable to restore session": "Ezin izan da saioa berreskuratu",

From 7d0f6584ab5f52ac2fae173ced289059450435c3 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Tue, 27 Feb 2018 14:39:52 +0000
Subject: [PATCH 610/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 685db8d8b6..858015589c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -89,7 +89,7 @@
     "AM": "AM",
     "Who would you like to add to this community?": "Кого бихте желали да добавите в тaзи общност?",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Предупреждение: Всеки човек, който добавяте в дадена общност, ще бъде публично видим за знаещите идентификатора на общността",
-    "Invite new community members": "Покани нови членове в общността",
+    "Invite new community members": "Покана на нови членове в общността",
     "Name or matrix ID": "Име или matrix ID",
     "Invite to Community": "Покани в общността",
     "Which rooms would you like to add to this community?": "Кои стаи бихте желали да добавите в тази общност?",
@@ -114,8 +114,8 @@
     "Who would you like to communicate with?": "С кой бихте желали да си комуникирате?",
     "Email, name or matrix ID": "Имейл, име или matrix ID",
     "Start Chat": "Започни чат",
-    "Invite new room members": "Покани нови членове на стаята",
-    "Who would you like to add to this room?": "Кой бихте желали да добавите в тази стая?",
+    "Invite new room members": "Покана на нови членове в стаята",
+    "Who would you like to add to this room?": "Кого бихте желали да добавите в тази стая?",
     "Send Invites": "Изпрати покани",
     "Failed to invite user": "Неуспешна покана на потребителя",
     "Failed to invite": "Неуспешна покана",
@@ -205,10 +205,10 @@
     "Authentication check failed: incorrect password?": "Неуспешна автентикация: неправилна парола?",
     "Failed to join room": "Неуспешно присъединяване към стаята",
     "Message Replies": "Отговори на съобщението",
-    "Message Pinning": "Закачания на съобщението",
+    "Message Pinning": "Функция за закачане на съобщения",
     "Presence Management": "Управление на присъствието",
     "Tag Panel": "Панел с етикети",
-    "Disable Emoji suggestions while typing": "Деактивиране на предложенията за емотиконите при писане",
+    "Disable Emoji suggestions while typing": "Изключване на предложенията за емотиконите при писане",
     "Use compact timeline layout": "Използване на компактно оформление за списъка със съобщения",
     "Hide removed messages": "Скриване на премахнати съобщения",
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Скриване на съобщения за присъединяване/напускане (не засяга покани/изгонвания/блокирания)",
@@ -218,18 +218,18 @@
     "Show timestamps in 12 hour format (e.g. 2:30pm)": "Показване на времето в 12-часов формат (напр. 2:30pm)",
     "Always show message timestamps": "Винаги показвай часа на съобщението",
     "Autoplay GIFs and videos": "Автоматично възпроизвеждане на GIF-файлове и видеа",
-    "Enable automatic language detection for syntax highlighting": "Активиране на автоматично разпознаване на език за подчертаване на синтаксиса",
-    "Disable big emoji in chat": "Деактивиране на големи емотикони в чата",
+    "Enable automatic language detection for syntax highlighting": "Включване на автоматично разпознаване на език за подчертаване на синтаксиса",
+    "Disable big emoji in chat": "Изключване на големи емотикони в чата",
     "Don't send typing notifications": "Не показвай на другите, че в момента пиша",
     "Automatically replace plain text Emoji": "Автоматично откриване и заместване на емотикони в текста",
     "Mirror local video feed": "Показвай ми огледално моя видео образ",
-    "Disable Peer-to-Peer for 1:1 calls": "Деактивиране на Peer-to-Peer в 1:1 разговор",
+    "Disable Peer-to-Peer for 1:1 calls": "Изключване на Peer-to-Peer в 1:1 разговор",
     "Opt out of analytics": "Отказване от събиране на статистически данни",
     "Never send encrypted messages to unverified devices from this device": "Никога не изпращай шифровани съобщения от това устройство до непотвърдени устройства",
     "Never send encrypted messages to unverified devices in this room from this device": "Никога не изпращай шифровани съобщения от това устройство до непотвърдени устройства в тази стая",
     "Enable inline URL previews by default": "Включване по подразбиране на URL прегледи",
     "Enable URL previews for this room (only affects you)": "Включване на URL прегледи за тази стая (засяга само Вас)",
-    "Enable URL previews by default for participants in this room": "Включване по подразбиране на URL прегледи за участниците в тази стая",
+    "Enable URL previews by default for participants in this room": "Включване по подразбиране на URL прегледи за участници в тази стая",
     "Room Colour": "Цвят на стая",
     "Active call (%(roomName)s)": "Активен разговор (%(roomName)s)",
     "unknown caller": "повикване от непознат",
@@ -238,19 +238,19 @@
     "Incoming call from %(name)s": "Входящо повикване от %(name)s",
     "Decline": "Откажи",
     "Accept": "Приеми",
-    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Съобщение е изпратено до +%(msisdn)s. Моля въведете кода за потвърждение, което то съдържа",
+    "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Съобщение е изпратено до +%(msisdn)s. Моля, въведете кода за потвърждение, което то съдържа",
     "Incorrect verification code": "Неправилен код за потвърждение",
     "Enter Code": "Въведи код",
     "Submit": "Изпрати",
     "Phone": "Телефон",
-    "Add phone number": "Добави телефонен номер",
+    "Add phone number": "Добави номер",
     "Add": "Добави",
     "Failed to upload profile picture!": "Неуспешно качване на профилна снимка!",
     "Upload new:": "Качи нов:",
     "No display name": "Няма име",
     "New passwords don't match": "Новите пароли не съвпадат",
     "Passwords can't be empty": "Полето с парола не може да е празно",
-    "Export E2E room keys": "Експортиране E2E ключове за стая",
+    "Export E2E room keys": "Експортирай E2E ключове за стая",
     "Do you want to set an email address?": "Искате ли да зададете имейл адрес?",
     "Current password": "Текуща парола",
     "Password": "Парола",
@@ -285,7 +285,7 @@
     "Encrypted by a verified device": "Шифровано от потвърдено устройство",
     "Encrypted by an unverified device": "Шифровано от непотвърдено устройство",
     "Unencrypted message": "Нешифровано съобщение",
-    "Please select the destination room for this message": "Моля изберете стаята, в която искате да изпратите това съобщение",
+    "Please select the destination room for this message": "Моля, изберете стаята, в която искате да изпратите това съобщение",
     "Blacklisted": "В черния списък",
     "Verified": "Потвърдено",
     "Unverified": "Непотвърдено",
@@ -306,10 +306,10 @@
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "След като си намалите нивото на достъп, няма да можете да възвърнете тази промяна. Ако сте последния потребител с привилегии в тази стая, ще бъде невъзможно да възвърнете привилегии си.",
     "Are you sure?": "Сигурни ли сте?",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Няма да можете да възвърнете тази промяна, тъй като повишавате този потребител до същото ниво на достъп като Вашето.",
-    "No devices with registered encryption keys": "Няма устройства с регистрирани шифровани ключове",
+    "No devices with registered encryption keys": "Няма устройства с регистрирани ключове за шифроване",
     "Devices": "Устройства",
     "Unignore": "Премахни игнорирането",
-    "Ignore": "Игнориране",
+    "Ignore": "Игнорирай",
     "Mention": "Спомени",
     "Direct chats": "Директни чатове",
     "User Options": "Опции на потребителя",
@@ -321,7 +321,7 @@
     "and %(count)s others...|other": "и %(count)s други...",
     "and %(count)s others...|one": "и още един...",
     "Invited": "Поканен",
-    "Filter room members": "Филтриране на членовете в стаята",
+    "Filter room members": "Филтриране на членовете",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (ниво на достъп %(powerLevelNumber)s)",
     "Attachment": "Прикачване",
     "Upload Files": "Качи файлове",
@@ -377,7 +377,7 @@
     "(~%(count)s results)|other": "(~%(count)s резултати)",
     "(~%(count)s results)|one": "(~%(count)s резултат)",
     "Join Room": "Присъедини се към стаята",
-    "Upload avatar": "Качи профилната снимка",
+    "Upload avatar": "Качи профилна снимка",
     "Remove avatar": "Премахни профилната снимка",
     "Settings": "Настройки",
     "Forget room": "Забрави стаята",
@@ -431,7 +431,7 @@
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Веднъж включено, шифроването в стаята не може да бъде изключено (за сега)",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Шифровани съобщения не са видими за клиенти, които все още не поддържат шифроване",
     "Enable encryption": "Включване на шифроване",
-    "(warning: cannot be disabled again!)": "(внимание: не може да бъде изключено отново!)",
+    "(warning: cannot be disabled again!)": "(внимание: не може да бъде изключено в последствие!)",
     "Encryption is enabled in this room": "Шифроването е включено в тази стая",
     "Encryption is not enabled in this room": "Шифроването не е включено в тази стая",
     "Privileged Users": "Потребители с привилегии",
@@ -440,14 +440,14 @@
     "Banned users": "Блокирани потребители",
     "This room is not accessible by remote Matrix servers": "Тази стая не е достъпна за далечни Matrix сървъри",
     "Leave room": "Напусни стаята",
-    "Tagged as: ": "Означен като: ",
+    "Tagged as: ": "Етикет: ",
     "To link to a room it must have <a>an address</a>.": "За да дадете линк към стаята, тя трябва да има <a>адрес</a>.",
     "Guests cannot join this room even if explicitly invited.": "Гости не могат да се присъединят към тази стая, дори изрично поканени.",
     "Click here to fix": "Натиснете тук за поправяне",
     "Who can access this room?": "Кой има достъп до тази стая?",
     "Only people who have been invited": "Само хора, които са поканени",
-    "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, apart from guests": "Всеки, който знае адреса на стаята (освен гости)",
+    "Anyone who knows the room's link, including guests": "Всеки, който знае адреса на стаята (включително гости)",
     "Publish this room to the public in %(domain)s's room directory?": "Публично публикуване на тази стая в директорията на %(domain)s?",
     "Who can read history?": "Кой може да чете историята?",
     "Anyone": "Всеки",
@@ -502,7 +502,7 @@
     "Disinvite this user from community?": "Оттегляне на поканата към този потребител от общността?",
     "Remove this user from community?": "Премахване на този потребител от общността?",
     "Failed to remove user from community": "Неуспешно премахване на потребителя от тази общност",
-    "Filter community members": "Филтриране на членовете на общността",
+    "Filter community members": "Филтриране на членовете",
     "Removing a room from the community will also remove it from the community page.": "Премахване на стая от общността ще бъде също премахната от страницата с общността.",
     "Failed to remove room from community": "Неуспешно премахване на стаята от общността",
     "Only visible to community members": "Видимо само за членове на общността",
@@ -529,7 +529,7 @@
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "За да се присъедините към вече съществуваща общност, трябва да знаете нейния идентификатор; той изглежда нещо подобно на <i>+example:matrix.org</i>.",
     "Unknown (user, device) pair:": "Непозната двойка (потребител, устройство):",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Подписващият ключ, който сте предоставили, съвпада с подписващия ключ, който сте получили от устройството %(deviceId)s на %(userId)s. Устройството е маркирано като потвърдено.",
-    "Hide avatars in user and room mentions": "Скриване на профилната снимка при споменаване на потребители и стаи",
+    "Hide avatars in user and room mentions": "Скриване на аватара на потребители и стаи при споменаването им",
     "Jump to message": "Отиди до съобщението",
     "Jump to read receipt": "Отиди до потвърждението за прочитане",
     "Revoke Moderator": "Премахване на правата на модератора",
@@ -670,7 +670,7 @@
     "Custom level": "Персонализирано ниво",
     "Custom": "Персонализиран",
     "<a>In reply to</a> <pill>": "<a>В отговор на</a> <pill>",
-    "Room directory": "Директория на стаята",
+    "Room directory": "Директория със стаи",
     "Start chat": "Започни чат",
     "And %(count)s more...|other": "И %(count)s други...",
     "ex. @bob:example.com": "напр. @bob:example.com",
@@ -701,7 +701,7 @@
     "Incorrect password": "Неправилна парола",
     "Deactivate Account": "Деактивация на профила",
     "Deactivate my account": "Деактивирай моя профил",
-    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Това ще направи профил Ви перманентно неизползваем. Няма да можете да се регистрирате отново със същия потребителски идентификатор.",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Това ще направи профила Ви перманентно неизползваем. Няма да можете да се регистрирате отново със същия потребителски идентификатор.",
     "This action is irreversible.": "Това действие е необратимо.",
     "Device name": "Име на устройството",
     "Device key": "Ключ на устройството",
@@ -843,19 +843,19 @@
     "User Interface": "Потребителски интерфейс",
     "Autocomplete Delay (ms):": "Забавяне на визуализацията на автоматичните подсказки (мс):",
     "<not supported>": "<не се поддържа>",
-    "Import E2E room keys": "Импортиране E2E ключове за стая",
+    "Import E2E room keys": "Импортирай E2E ключове за стая",
     "Cryptography": "Криптография",
     "Device ID:": "Идентификатор на устройството:",
     "Device key:": "Ключ на устройството:",
     "Ignored Users": "Игнорирани потребители",
     "Found a bug?": "Намерихте грешка?",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot събира анонимни статистики, за да ни позволи да подобрим приложението.",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Поверителността е важна за нас, затова за нашите статистики не събираме лични или подлежащи на идентифициране данни.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Поверителността е важна за нас, затова за нашите статистики не събираме лични или идентифициращи Вас данни.",
     "Learn more about how we use analytics.": "Научете повече за това как използваме статистическите данни.",
     "Labs": "Експерименти",
     "These are experimental features that may break in unexpected ways": "Това са експериментални функции , които могат да се счупят по неочаквани начини",
     "Clear Cache": "Изчисти кеш",
-    "Clear Cache and Reload": "Изчисти кеш и зареди отново",
+    "Clear Cache and Reload": "Изчисти кеша и зареди отново",
     "Updates": "Нови версии",
     "Check for update": "Провери за нова версия",
     "Bulk Options": "Групови опции",
@@ -879,14 +879,14 @@
     "Logged in as:": "Влезли сте като:",
     "Access Token:": "Token за достъп:",
     "click to reveal": "натиснете за показване",
-    "Homeserver is": "Home сървър е:",
-    "Identity Server is": "Сървър за самоличност е:",
-    "matrix-react-sdk version:": "версия на matrix-react-sdk:",
-    "riot-web version:": "версия на riot-web:",
-    "olm version:": "версия на olm:",
+    "Homeserver is": "Home сървър:",
+    "Identity Server is": "Сървър за самоличност:",
+    "matrix-react-sdk version:": "Версия на matrix-react-sdk:",
+    "riot-web version:": "Версия на riot-web:",
+    "olm version:": "Версия на olm:",
     "Failed to send email": "Неуспешно изпращане на имейл",
     "The email address linked to your account must be entered.": "Имейл адресът, свързан с профила Ви, трябва да бъде въведен.",
-    "A new password must be entered.": "Нова парола трябва да бъде въведена.",
+    "A new password must be entered.": "Трябва да бъде въведена нова парола.",
     "New passwords must match each other.": "Новите пароли трябва да съвпадат една с друга.",
     "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Имейл беше изпратен на %(emailAddress)s. След като проследите връзката, която съдържа, натиснете по-долу.",
     "Your password has been reset": "Вашата парола беше възстановена",
@@ -956,7 +956,7 @@
     "Enter passphrase": "Въведи парола",
     "Confirm passphrase": "Потвърди парола",
     "Export": "Експортирай",
-    "Import room keys": "Импортиране на ключове за стаята",
+    "Import room keys": "Импортиране на ключове за стая",
     "File to import": "Файл за импортиране",
     "Import": "Импортирай",
     "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Също така записваме всяка страница, която използвате в приложението (в момента <CurrentPageHash>), браузъра, който използвате (<CurrentUserAgent>) и резолюцията на устройството (<CurrentDeviceResolution>).",
@@ -965,7 +965,7 @@
     "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ВНИМАНИЕ: НЕУСПЕШНО ПОТВЪРЖДАВАНЕ НА КЛЮЧА! Ключът за подписване за %(userId)s и устройството %(deviceId)s е \"%(fprint)s\", което не съвпада с предоставения ключ \"%(fingerprint)s\". Това може да означава, че Вашата комуникация е прихваната!",
     "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.": "Смяната на парола ще нулира всички ключове за шифроване от край до край на всички устройства, правейки историята на шифрования чат невъзможна за четене, освен ако първо не експортирате ключовете за стаята и ги импортирате отново след това. В бъдеще това ще бъде подобрено.",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "На път сте да бъдете отведени до друг сайт, където можете да удостоверите профила си за използване с %(integrationsUrl)s. Искате ли да продължите?",
-    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Проверка за робот в момента не е налична на работния плот. Моля използвайте <a>уеб браузър</a>",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Проверка за робот в момента не е налична на работния плот. Моля, използвайте <a>уеб браузър</a>",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Можете да използвате опциите за друг сървър, за да влезете в други Matrix сървъри като посочите различен Home сървър.",
     "This allows you to use this app with an existing Matrix account on a different home server.": "Това Ви позволява да използвате това приложение със съществуващ Matrix профил на различен Home сървър.",
     "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Възможно е и да зададете друг сървър за самоличност, но това обикновено предотвратява намирането на други потребители по имейл адрес.",
@@ -982,8 +982,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": "Вие сте излязли от профила си от всички устройства и вече няма да получавате известия. За да включите известията отново, влезте в профила си от всички устройства",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Няма връзка с Home сървъра. Моля, проверете Вашата връзка. Уверете се, че <a>SSL сертификатът на Home сървъра</a> е надежден и че някое разширение на браузъра не блокира заявките.",
     "none": "няма",
-    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате във файл ключове за съобщения в шифровани стаи. Така ще можете да импортирате файла в друг Matrix клиент, така че той също да може да разшифрова тези съобщения.",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате във файл ключовете за съобщения в шифровани стаи. Така ще можете да импортирате файла в друг Matrix клиент, така че той също да може да разшифрова такива съобщения.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите. Трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използване на същата парола.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведе парола тук, за да разшифровате файла."
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла."
 }

From 15f0ae198623aed43496d329ba2b46bbc20d80cf Mon Sep 17 00:00:00 2001
From: Katie Wolfe <katie@dnaf.moe>
Date: Sat, 24 Feb 2018 14:59:29 +0000
Subject: [PATCH 611/927] Translated using Weblate (Esperanto)

Currently translated at 97.2% (960 of 987 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index c6a4b81740..fe731133fd 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -956,5 +956,7 @@
     "Send a message (unencrypted)…": "Sendi mesaĝon (neĉifritan)…",
     "Replying": "Respondanta",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privato gravas al ni, tial ni ne kolektas personajn aŭ spureblajn datumojn por nia analizo.",
-    "Learn more about how we use analytics.": "Lernu pli pri nia uzo de analiziloj."
+    "Learn more about how we use analytics.": "Lernu pli pri nia uzo de analiziloj.",
+    "Your homeserver's URL": "La URL de via servilo",
+    "Your identity server's URL": "La URL de via identigan servilo"
 }

From 624188571b9c545335ba39882fbeffd265395a17 Mon Sep 17 00:00:00 2001
From: Jeff <tukuyomi@nikel.ovh>
Date: Sun, 25 Feb 2018 10:43:55 +0000
Subject: [PATCH 612/927] Translated using Weblate (French)

Currently translated at 100.0% (987 of 987 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 7efbf5f548..be5a600455 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -929,12 +929,12 @@
     "Select devices": "Sélectionner les appareils",
     "Something went wrong when trying to get your communities.": "Une erreur est survenue lors de l'obtention de vos communautés.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Ce serveur d'accueil n'offre aucun flux compatible avec ce client.",
-    "Flair": "Talents",
-    "Showing flair for these communities:": "Montre les talents pour ces communautés :",
-    "This room is not showing flair for any communities": "Ce salon n'affiche de talent pour aucune communauté",
-    "Flair will appear if enabled in room settings": "Les talents apparaîtront s'ils sont activés dans les paramètres du salon",
-    "Flair will not appear": "Les talents n'apparaîtront pas",
-    "Display your community flair in rooms configured to show it.": "Afficher vos talents de communauté dans les salons configurés pour les afficher.",
+    "Flair": "Badge",
+    "Showing flair for these communities:": "Ce salon affichera les badges pour ces communautés :",
+    "This room is not showing flair for any communities": "Ce salon n'affiche de badge pour aucune communauté",
+    "Flair will appear if enabled in room settings": "Les badges n'apparaîtront que s'ils sont activés dans les paramètres du salon",
+    "Flair will not appear": "Les badges n'apparaîtront pas",
+    "Display your community flair in rooms configured to show it.": "Sélectionnez les badges dans les paramètres de chaque salon pour les afficher.",
     "Tag Panel": "Panneau des étiquettes",
     "Addresses": "Adresses",
     "expand": "développer",

From 82592a702432b9100c3aa48148bc4dbe47870a19 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Tue, 27 Feb 2018 17:29:04 +0000
Subject: [PATCH 613/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 858015589c..d4858ce609 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -985,5 +985,7 @@
     "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Този процес Ви позволява да експортирате във файл ключовете за съобщения в шифровани стаи. Така ще можете да импортирате файла в друг Matrix клиент, така че той също да може да разшифрова такива съобщения.",
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите. Трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използване на същата парола.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
-    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла."
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли: можете да използвате общности, за да",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да сложите филтър, плъзнете аватара на общността върху панела за филтриране от лявата част на Вашия екран. Можете да натиснете върху аватара в панела по всяко време, за да видите само стаите и хората асоциирани с тази общност."
 }

From 7d92248ae3a761ecfa5d31339470df116a851c64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 27 Feb 2018 17:44:19 +0000
Subject: [PATCH 614/927] Translated using Weblate (French)

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index be5a600455..297091bb2c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -985,5 +985,7 @@
     "Failed to set direct chat tag": "Échec de l'ajout de l'étiquette discussion directe",
     "Failed to remove tag %(tagName)s from room": "Échec de la suppression de l'étiquette %(tagName)s du salon",
     "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon",
-    "Clear filter": "Supprimer les filtres"
+    "Clear filter": "Supprimer les filtres",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Le saviez-vous : vous pouvez utiliser les communautés pour filtrer votre expérience Riot.im !",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l'écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté."
 }

From d733e38a8f9c84c2b59e386e4197c85a126a0604 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Tue, 27 Feb 2018 19:36:36 +0000
Subject: [PATCH 615/927] Translated using Weblate (Russian)

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index c07ea1e1fb..6ea0af054c 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -985,5 +985,7 @@
     "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
     "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
-    "Clear filter": "Очистить фильтр"
+    "Clear filter": "Очистить фильтр",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Чтобы настроить фильтр, перетащите аватар сообщества на панель фильтров в левой части экрана. Вы можете нажать на аватар в панели фильтров в любое время, чтобы увидеть только комнаты и людей, связанных с этим сообществом.",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в Riot.im!"
 }

From 0fdbddf8fd80a532d0fff084eab8098ea282986c Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 27 Feb 2018 23:07:59 +0000
Subject: [PATCH 616/927] Show sticker description as a tooltip, on hover.

---
 src/components/views/messages/MStickerBody.js | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 95f5d827bb..130b591b56 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -17,22 +17,49 @@ limitations under the License.
 'use strict';
 
 import MImageBody from "./MImageBody";
+import sdk from '../../../index';
 
 export default class MStickerBody extends MImageBody {
     displayName: 'MStickerBody'
 
     constructor(props) {
       super(props);
+
+      this._onMouseEnter = this._onMouseEnter.bind(this);
+      this._onMouseLeave = this._onMouseLeave.bind(this);
+    }
+
+    _onMouseEnter() {
+        this.setState({showTooltip: true});
+    }
+
+    _onMouseLeave() {
+        this.setState({showTooltip: false});
     }
 
     _messageContent(contentUrl, thumbUrl, content) {
+        let tooltip;
+        const tooltipBody = (
+            this.props.mxEvent &&
+            this.props.mxEvent.getContent() &&
+            this.props.mxEvent.getContent().body) ?
+            this.props.mxEvent.getContent().body : null;
+        if (this.state.showTooltip && tooltipBody) {
+            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+            tooltip = <RoomTooltip
+                className="mx_RoleButton_tooltip"
+                label={ tooltipBody } />;
+        }
+
         return (
             <span className="mx_MImageBody" ref="body">
                 <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
                     alt={content.body}
                     onLoad={this.props.onWidgetLoad}
-                    onMouseEnter={this.onImageEnter}
-                    onMouseLeave={this.onImageLeave} />
+                    onMouseEnter={this._onMouseEnter}
+                    onMouseLeave={this._onMouseLeave}
+                />
+                { tooltip }
             </span>
         );
     }

From 753193055b49869d3d55036540a99d5c1a2b44f1 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 28 Feb 2018 00:02:40 +0000
Subject: [PATCH 617/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 8ea32cf99c..fda3dc2bb8 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -984,5 +984,8 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s 變更了他們的顯示名稱為 %(displayName)s 。",
     "Failed to set direct chat tag": "設定直接聊天標籤失敗",
     "Failed to remove tag %(tagName)s from room": "從聊天室移除標籤 %(tagName)s 失敗",
-    "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗"
+    "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗",
+    "Did you know: you can use communities to filter your Riot.im experience!": "您知道嗎：您可以使用社群來強化您的 Riot.im 使用體驗！",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "要設定過濾器，拖曳社群大頭貼到位於螢幕最左邊的過濾器面板。您可以在任何時候在過濾器面板中的大頭貼上點按以檢視與該社群關聯的聊天室與夥伴。",
+    "Clear filter": "清除過濾器"
 }

From bd4b40309dbb07814b1a505aecb1699559188fca Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Feb 2018 00:49:14 +0000
Subject: [PATCH 618/927] fix based on PR review

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

diff --git a/src/shouldHideEvent.js b/src/shouldHideEvent.js
index ae7be56c2e..3aad05a976 100644
--- a/src/shouldHideEvent.js
+++ b/src/shouldHideEvent.js
@@ -27,11 +27,11 @@ function memberEventDiff(ev) {
     const content = ev.getContent();
     const prevContent = ev.getPrevContent();
 
-    const isJoinToJoin = content.membership === prevContent.membership && content.membership === 'join';
-
-    diff.isJoin = !isJoinToJoin && content.membership === 'join' && prevContent.membership !== 'ban';
-    diff.isPart = !isJoinToJoin && content.membership === 'leave' && ev.getStateKey() === ev.getSender();
+    const isMembershipChanged = content.membership !== prevContent.membership;
+    diff.isJoin = isMembershipChanged && content.membership === 'join';
+    diff.isPart = isMembershipChanged && content.membership === 'leave' && ev.getStateKey() === ev.getSender();
 
+    const isJoinToJoin = !isMembershipChanged && content.membership === 'join';
     diff.isDisplaynameChange = isJoinToJoin && content.displayname !== prevContent.displayname;
     diff.isAvatarChange = isJoinToJoin && content.avatar_url !== prevContent.avatar_url;
     return diff;

From 03676a68ac182667fe5f876f9843cb38079b2a4b Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Feb 2018 00:57:14 +0000
Subject: [PATCH 619/927] Add /devtools to Autocomplete and run gen-i18n

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/autocomplete/CommandProvider.js |  5 +++
 src/i18n/strings/en_EN.json         | 61 +++++++++++++++--------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index d47f1a161a..56eefc0d35 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -105,6 +105,11 @@ const COMMANDS = [
         args: '<user-id>',
         description: _td('Stops ignoring a user, showing their messages going forward'),
     },
+    {
+        command: '/devtools',
+        args: '',
+        description: _td('Opens the Developer Tools dialog')
+    },
     // Omitting `/markdown` as it only seems to apply to OldComposer
 ];
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5b90973a65..1d0e02ddea 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -38,6 +38,10 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "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",
     "Upload Failed": "Upload Failed",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -77,6 +81,7 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
+    "Unnamed Room": "Unnamed Room",
     "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",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -174,11 +179,6 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
-    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -252,6 +252,29 @@
     "Failed to set display name": "Failed to set display name",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -342,11 +365,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -468,29 +491,6 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Error decrypting audio": "Error decrypting audio",
     "Error decrypting attachment": "Error decrypting attachment",
     "Decrypt %(text)s": "Decrypt %(text)s",
@@ -950,6 +950,7 @@
     "Verifies a user, device, and pubkey tuple": "Verifies a user, device, and pubkey tuple",
     "Ignores a user, hiding their messages from you": "Ignores a user, hiding their messages from you",
     "Stops ignoring a user, showing their messages going forward": "Stops ignoring a user, showing their messages going forward",
+    "Opens the Developer Tools dialog": "Opens the Developer Tools dialog",
     "Commands": "Commands",
     "Results from DuckDuckGo": "Results from DuckDuckGo",
     "Emoji": "Emoji",

From d66d66b2ec7cae449afa8f82dc60be41e81334b0 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 28 Feb 2018 01:03:58 +0000
Subject: [PATCH 620/927] comment on weirdness

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

diff --git a/src/Analytics.js b/src/Analytics.js
index d18c11bc66..5f4a0d0c77 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -92,6 +92,9 @@ class Analytics {
      */
     disable() {
         this.trackEvent('Analytics', 'opt-out');
+        // disableHeartBeatTimer is undocumented but exists in the piwik code
+        // the _paq.push method will result in an error being printed in the console
+        // if an unknown method signature is passed
         this._paq.push(['disableHeartBeatTimer']);
         this.disabled = true;
     }

From eebf9193ad9a838432069d0d2a57e83a12a0f118 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 28 Feb 2018 00:03:46 +0000
Subject: [PATCH 621/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index fda3dc2bb8..aa5f78e6af 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -188,7 +188,7 @@
     "Sun": "星期日",
     "Mon": "星期一",
     "Tue": "星期二",
-    "Online": "在線",
+    "Online": "線上",
     "Idle": "閒置",
     "Offline": "下線",
     "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s 更改了聊天室的圖像為 <img/>",

From 32c26504522eeb4b8391095c06514fc517747207 Mon Sep 17 00:00:00 2001
From: daniel tygel <dtygel@gmail.com>
Date: Wed, 28 Feb 2018 13:13:51 +0000
Subject: [PATCH 623/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 5d7bcd6097..a655ad995d 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -985,5 +985,7 @@
     "Room Notification": "Notificação da sala",
     "Failed to set direct chat tag": "Falha ao definir esta conversa como direta",
     "Failed to remove tag %(tagName)s from room": "Falha ao remover a tag %(tagName)s da sala",
-    "Failed to add tag %(tagName)s to room": "Falha ao adicionar a tag %(tagName)s para a sala"
+    "Failed to add tag %(tagName)s to room": "Falha ao adicionar a tag %(tagName)s para a sala",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Você sabia? Você pode usar as comunidades para filtrar a sua experiência no Riot!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para criar um filtro, arraste a imagem de uma comunidade sobre o painel de filtros na extrema esquerda da sua tela. Você pode clicar na imagem de uma comunidade no painel de filtros a qualquer momento para ver apenas as salas e pessoas associadas com esta comunidade."
 }

From f3c928a4fcf8e860e39f17d578c5b9272d34bc19 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Wed, 28 Feb 2018 13:43:19 +0000
Subject: [PATCH 624/927] Lint.

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

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 130b591b56..9873717378 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -48,7 +48,7 @@ export default class MStickerBody extends MImageBody {
             const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
             tooltip = <RoomTooltip
                 className="mx_RoleButton_tooltip"
-                label={ tooltipBody } />;
+                label={tooltipBody} />;
         }
 
         return (

From d91d1932f48cc641bf9acc50875a616b1232fa4d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 14:52:53 +0000
Subject: [PATCH 625/927] Add tests for RoomSettings

For setting:
 - name
 - topic
 - history visibility
 - power levels

Testing RoomSettings required more stubbing on the matrix client.

The power level tests should be failing at this commit, with
fixes being made in upcoming commits.

Some tests are marked as known failures that we should fix but
aren't necessarily bugs:
 - SettingStore.setValue is used when saving despite the user not
   having made a change.
 - Testing directory publicity changes cannot be tested because we
   update state asynchronously in componentWillMount (which we do
   not block on in beforeEach).

Also, we needed to use `export default` to make sure everything
uses the same client peg and client.
---
 src/MatrixClientPeg.js                        |   2 +-
 .../views/rooms/RoomSettings-test.js          | 192 ++++++++++++++++++
 test/test-utils.js                            |  14 +-
 3 files changed, 206 insertions(+), 2 deletions(-)
 create mode 100644 test/components/views/rooms/RoomSettings-test.js

diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 14dfa91fa4..99841c986e 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -175,4 +175,4 @@ class MatrixClientPeg {
 if (!global.mxMatrixClientPeg) {
     global.mxMatrixClientPeg = new MatrixClientPeg();
 }
-module.exports = global.mxMatrixClientPeg;
+export default global.mxMatrixClientPeg;
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
new file mode 100644
index 0000000000..12fb734bf4
--- /dev/null
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -0,0 +1,192 @@
+import React from 'react';
+import ReactTestUtils from 'react-addons-test-utils';
+import ReactDOM from 'react-dom';
+import expect, {createSpy} from 'expect';
+import sinon from 'sinon';
+import Promise from 'bluebird';
+import * as testUtils from '../../../test-utils';
+import sdk from 'matrix-react-sdk';
+const WrappedRoomSettings = testUtils.wrapInMatrixClientContext(sdk.getComponent('views.rooms.RoomSettings'));
+import MatrixClientPeg from '../../../../src/MatrixClientPeg';
+import SettingsStore from '../../../../src/settings/SettingsStore';
+
+
+describe('RoomSettings', () => {
+    let parentDiv = null;
+    let sandbox = null;
+    let client = null;
+    let roomSettings = null;
+    const room = testUtils.mkStubRoom('!DdJkzRliezrwpNebLk:matrix.org');
+
+    function expectSentStateEvent(roomId, eventType, expectedEventContent) {
+        let found = false;
+        for (const call of client.sendStateEvent.calls) {
+            const [
+                actualRoomId,
+                actualEventType,
+                actualEventContent,
+            ] = call.arguments.slice(0, 3);
+
+            if (roomId === actualRoomId && actualEventType === eventType) {
+                expect(actualEventContent).toEqual(expectedEventContent);
+                found = true;
+                break;
+            }
+        }
+        expect(found).toBe(true);
+    }
+
+    beforeEach(function(done) {
+        testUtils.beforeEach(this);
+        sandbox = testUtils.stubClient();
+        client = MatrixClientPeg.get();
+        client.credentials = {userId: '@me:domain.com'};
+
+        client.setRoomName = createSpy().andReturn(Promise.resolve());
+        client.setRoomTopic = createSpy().andReturn(Promise.resolve());
+        client.setRoomDirectoryVisibility = createSpy().andReturn(Promise.resolve());
+
+        // Covers any room state event (e.g. name, avatar, topic)
+        client.sendStateEvent = createSpy().andReturn(Promise.resolve());
+
+        // Covers room tagging
+        client.setRoomTag = createSpy().andReturn(Promise.resolve());
+        client.deleteRoomTag = createSpy().andReturn(Promise.resolve());
+
+        // Covers any setting in the SettingsStore
+        // (including local client settings not stored via matrix)
+        SettingsStore.setValue = createSpy().andReturn(Promise.resolve());
+
+        parentDiv = document.createElement('div');
+        document.body.appendChild(parentDiv);
+
+        const gatherWrappedRef = (r) => {roomSettings = r;};
+
+        // get use wrappedRef because we're using wrapInMatrixClientContext
+        ReactDOM.render(
+            <WrappedRoomSettings
+                wrappedRef={gatherWrappedRef}
+                room={room}
+            />,
+            parentDiv,
+            done,
+        );
+    });
+
+    afterEach((done) => {
+        if (parentDiv) {
+            ReactDOM.unmountComponentAtNode(parentDiv);
+            parentDiv.remove();
+            parentDiv = null;
+        }
+        sandbox.restore();
+        done();
+    });
+
+    it('should not set when no setting is changed', (done) => {
+        roomSettings.save().then(() => {
+            expect(client.sendStateEvent).toNotHaveBeenCalled();
+            expect(client.setRoomTag).toNotHaveBeenCalled();
+            expect(client.deleteRoomTag).toNotHaveBeenCalled();
+            done();
+        });
+    });
+
+    // XXX: Apparently we do call SettingsStore.setValue
+    xit('should not settings via the SettingsStore when no setting is changed', (done) => {
+        roomSettings.save().then(() => {
+            expect(SettingsStore.setValue).toNotHaveBeenCalled();
+            done();
+        });
+    });
+
+    it('should set room name when it has changed', (done) => {
+        const name = "My Room Name";
+        roomSettings.setName(name);
+
+        roomSettings.save().then(() => {
+            expect(client.setRoomName.calls[0].arguments.slice(0, 2))
+                .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', name]);
+
+            done();
+        });
+    });
+
+    it('should set room topic when it has changed', (done) => {
+        const topic = "this is a topic";
+        roomSettings.setTopic(topic);
+
+        roomSettings.save().then(() => {
+            expect(client.setRoomTopic.calls[0].arguments.slice(0, 2))
+                .toEqual(['!DdJkzRliezrwpNebLk:matrix.org', topic]);
+
+            done();
+        });
+    });
+
+    it('should set history visibility when it has changed', (done) => {
+        const historyVisibility = "translucent";
+        roomSettings.setState({
+            history_visibility: historyVisibility,
+        });
+
+        roomSettings.save().then(() => {
+            expectSentStateEvent(
+                "!DdJkzRliezrwpNebLk:matrix.org",
+                "m.room.history_visibility", {history_visibility: historyVisibility},
+            );
+            done();
+        });
+    });
+
+    // XXX: Can't test this because we `getRoomDirectoryVisibility` in `componentWillMount`
+    xit('should set room directory publicity when set to true', (done) => {
+        const isRoomPublished = true;
+        roomSettings.setState({
+            isRoomPublished,
+        }, () => {
+            roomSettings.save().then(() => {
+                expect(client.setRoomDirectoryVisibility.calls[0].arguments.slice(0, 2))
+                    .toEqual("!DdJkzRliezrwpNebLk:matrix.org", isRoomPublished ? "public" : "private");
+                done();
+            });
+        });
+    });
+
+    it('should set power levels when changed', (done) => {
+        roomSettings.onPowerLevelsChanged(42, "invite");
+
+        roomSettings.save().then(() => {
+            expectSentStateEvent(
+                "!DdJkzRliezrwpNebLk:matrix.org",
+                "m.room.power_levels", { invite: 42 },
+            );
+            done();
+        });
+    });
+
+    it('should set event power levels when changed', (done) => {
+        roomSettings.onPowerLevelsChanged(42, "event_levels_m.room.message");
+
+        roomSettings.save().then(() => {
+            // We expect all state events to be set to the state_default (50)
+            // See powerLevelDescriptors in RoomSettings
+            expectSentStateEvent(
+                "!DdJkzRliezrwpNebLk:matrix.org",
+                "m.room.power_levels", {
+                    events: {
+                        'm.room.message': 42,
+                        'm.room.avatar': 50,
+                        'm.room.name': 50,
+                        'm.room.canonical_alias': 50,
+                        'm.room.history_visibility': 50,
+                        'm.room.power_levels': 50,
+                        'm.room.topic': 50,
+                        'im.vector.modular.widgets': 50,
+                    },
+                },
+            );
+            done();
+        });
+    });
+});
diff --git a/test/test-utils.js b/test/test-utils.js
index 5753c02665..b593761bd4 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -68,6 +68,8 @@ export function createTestClient() {
     return {
         getHomeserverUrl: sinon.stub(),
         getIdentityServerUrl: sinon.stub(),
+        getDomain: sinon.stub().returns("matrix.rog"),
+        getUserId: sinon.stub().returns("@userId:matrix.rog"),
 
         getPushActionsForEvent: sinon.stub(),
         getRoom: sinon.stub().returns(mkStubRoom()),
@@ -81,6 +83,7 @@ export function createTestClient() {
         paginateEventTimeline: sinon.stub().returns(Promise.resolve()),
         sendReadReceipt: sinon.stub().returns(Promise.resolve()),
         getRoomIdForAlias: sinon.stub().returns(Promise.resolve()),
+        getRoomDirectoryVisibility: sinon.stub().returns(Promise.resolve()),
         getProfileInfo: sinon.stub().returns(Promise.resolve({})),
         getAccountData: (type) => {
             return mkEvent({
@@ -244,6 +247,7 @@ export function mkStubRoom(roomId = null) {
             roomId: roomId,
             getAvatarUrl: () => 'mxc://avatar.url/image.png',
         }),
+        getMembersWithMembership: sinon.stub().returns([]),
         getJoinedMembers: sinon.stub().returns([]),
         getPendingEvents: () => [],
         getLiveTimeline: () => stubTimeline,
@@ -252,8 +256,16 @@ export function mkStubRoom(roomId = null) {
         hasMembershipState: () => null,
         currentState: {
             getStateEvents: sinon.stub(),
+            mayClientSendStateEvent: sinon.stub().returns(true),
+            maySendStateEvent: sinon.stub().returns(true),
             members: [],
         },
+        tags: {
+            "m.favourite": {
+                order: 0.5,
+            },
+        },
+        setBlacklistUnverifiedDevices: sinon.stub(),
     };
 }
 
@@ -284,7 +296,7 @@ export function wrapInMatrixClientContext(WrappedComponent) {
         }
 
         render() {
-            return <WrappedComponent {...this.props} />;
+            return <WrappedComponent ref={this.props.wrappedRef} {...this.props} />;
         }
     }
     return Wrapper;

From dd529791fbbf1e4fdcdf508e8ba79ede75db4234 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 16:13:01 +0000
Subject: [PATCH 626/927] Remove unused prop

---
 src/components/views/rooms/RoomSettings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index ea4a29615e..3a5075ba92 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -117,7 +117,6 @@ module.exports = React.createClass({
 
     propTypes: {
         room: PropTypes.object.isRequired,
-        onSaveClick: PropTypes.func,
     },
 
     getInitialState: function() {

From 9a72e69a43b092ff4425934cfe10fb1e291500be Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 16:14:18 +0000
Subject: [PATCH 627/927] Handle lack of room directory visibility response

---
 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 3a5075ba92..2bd2fbb8f1 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -150,7 +150,7 @@ module.exports = React.createClass({
 
         MatrixClientPeg.get().getRoomDirectoryVisibility(
             this.props.room.roomId,
-        ).done((result) => {
+        ).done((result = {}) => {
             this.setState({ isRoomPublished: result.visibility === "public" });
             this._originalIsRoomPublished = result.visibility === "public";
         }, (err) => {

From 567d83ba52719ea0f05ed01d2dcd301c713fad6e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 16:15:20 +0000
Subject: [PATCH 628/927] Update PowerSelector to support powerLevelKey prop

As a key to send as second argument to onChange. This is useful
when passing the same callback to multiple PowerSelectors.
---
 src/components/views/elements/PowerSelector.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/PowerSelector.js b/src/components/views/elements/PowerSelector.js
index f8443c6ecd..d1f102d9fe 100644
--- a/src/components/views/elements/PowerSelector.js
+++ b/src/components/views/elements/PowerSelector.js
@@ -42,6 +42,9 @@ module.exports = React.createClass({
         // should the user be able to change the value? false by default.
         disabled: PropTypes.bool,
         onChange: PropTypes.func,
+
+        // Optional key to pass as the second argument to `onChange`
+        powerLevelKey: PropTypes.string,
     },
 
     getInitialState: function() {
@@ -84,17 +87,17 @@ module.exports = React.createClass({
     onSelectChange: function(event) {
         this.setState({ custom: event.target.value === "SELECT_VALUE_CUSTOM" });
         if (event.target.value !== "SELECT_VALUE_CUSTOM") {
-            this.props.onChange(event.target.value);
+            this.props.onChange(event.target.value, this.props.powerLevelKey);
         }
     },
 
     onCustomBlur: function(event) {
-        this.props.onChange(parseInt(this.refs.custom.value));
+        this.props.onChange(parseInt(this.refs.custom.value), this.props.powerLevelKey);
     },
 
     onCustomKeyDown: function(event) {
         if (event.key == "Enter") {
-            this.props.onChange(parseInt(this.refs.custom.value));
+            this.props.onChange(parseInt(this.refs.custom.value), this.props.powerLevelKey);
         }
     },
 

From d3dc2a33b48861139b3ecee0eb31537b6a58b4cf Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 16:16:44 +0000
Subject: [PATCH 629/927] Fix bug preventing setting room power levels

 - don't use refs, use onChange of PowerSelector
 - store power levels as state in the RoomSetting component
---
 src/components/views/rooms/RoomSettings.js    | 222 ++++++++++--------
 .../views/rooms/RoomSettings-test.js          |   2 -
 2 files changed, 128 insertions(+), 96 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 2bd2fbb8f1..e2dad93698 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -131,7 +131,8 @@ module.exports = React.createClass({
             join_rule: this._yankValueFromEvent("m.room.join_rules", "join_rule"),
             history_visibility: this._yankValueFromEvent("m.room.history_visibility", "history_visibility"),
             guest_access: this._yankValueFromEvent("m.room.guest_access", "guest_access"),
-            power_levels_changed: false,
+            powerLevels: this._yankContentFromEvent("m.room.power_levels", {}),
+            powerLevelsChanged: false,
             tags_changed: false,
             tags: tags,
             // isRoomPublished is loaded async in componentWillMount so when the component
@@ -271,8 +272,8 @@ module.exports = React.createClass({
 
 
         // power levels
-        const powerLevels = this._getPowerLevels();
-        if (powerLevels) {
+        const powerLevels = this.state.powerLevels;
+        if (this.state.powerLevelsChanged) {
             promises.push(MatrixClientPeg.get().sendStateEvent(
                 roomId, "m.room.power_levels", powerLevels, "",
             ));
@@ -383,36 +384,32 @@ module.exports = React.createClass({
         return strA !== strB;
     },
 
-    _getPowerLevels: function() {
-        if (!this.state.power_levels_changed) return undefined;
+    onPowerLevelsChanged: function(value, powerLevelKey) {
+        const powerLevels = Object.assign({}, this.state.powerLevels);
+        const eventsLevelPrefix = "event_levels_";
 
-        let powerLevels = this.props.room.currentState.getStateEvents('m.room.power_levels', '');
-        powerLevels = powerLevels ? powerLevels.getContent() : {};
+        value = parseInt(value);
 
-        for (const key of Object.keys(this.refs).filter((k) => k.startsWith("event_levels_"))) {
-            const eventType = key.substring("event_levels_".length);
-            powerLevels.events[eventType] = parseInt(this.refs[key].getValue());
+        if (powerLevelKey.startsWith(eventsLevelPrefix)) {
+            // deep copy "events" object, Object.assign itself won't deep copy
+            powerLevels["events"] = Object.assign({}, this.state.powerLevels["events"] || {});
+            powerLevels["events"][powerLevelKey.slice(eventsLevelPrefix.length)] = value;
+        } else {
+            powerLevels[powerLevelKey] = value;
         }
-
-        const newPowerLevels = {
-            ban: parseInt(this.refs.ban.getValue()),
-            kick: parseInt(this.refs.kick.getValue()),
-            redact: parseInt(this.refs.redact.getValue()),
-            invite: parseInt(this.refs.invite.getValue()),
-            events_default: parseInt(this.refs.events_default.getValue()),
-            state_default: parseInt(this.refs.state_default.getValue()),
-            users_default: parseInt(this.refs.users_default.getValue()),
-            users: powerLevels.users,
-            events: powerLevels.events,
-        };
-
-        return newPowerLevels;
+        this.setState({
+            powerLevels,
+            powerLevelsChanged: true,
+        });
     },
 
-    onPowerLevelsChanged: function() {
-        this.setState({
-            power_levels_changed: true,
-        });
+    _yankContentFromEvent: function(stateEventType, defaultValue) {
+        // E.g.("m.room.name") would yank the content of "m.room.name"
+        const event = this.props.room.currentState.getStateEvents(stateEventType, '');
+        if (!event) {
+            return defaultValue;
+        }
+        return event.getContent() || defaultValue;
     },
 
     _yankValueFromEvent: function(stateEventType, keyName, defaultValue) {
@@ -632,29 +629,61 @@ module.exports = React.createClass({
 
         const cli = MatrixClientPeg.get();
         const roomState = this.props.room.currentState;
-        const user_id = cli.credentials.userId;
+        const myUserId = cli.credentials.userId;
 
-        const power_level_event = roomState.getStateEvents('m.room.power_levels', '');
-        const power_levels = power_level_event ? power_level_event.getContent() : {};
-        const events_levels = power_levels.events || {};
-        const user_levels = power_levels.users || {};
+        const powerLevels = this.state.powerLevels;
+        const eventsLevels = powerLevels.events || {};
+        const userLevels = powerLevels.users || {};
 
-        const ban_level = parseIntWithDefault(power_levels.ban, 50);
-        const kick_level = parseIntWithDefault(power_levels.kick, 50);
-        const redact_level = parseIntWithDefault(power_levels.redact, 50);
-        const invite_level = parseIntWithDefault(power_levels.invite, 50);
-        const send_level = parseIntWithDefault(power_levels.events_default, 0);
-        const state_level = power_level_event ? parseIntWithDefault(power_levels.state_default, 50) : 0;
-        const default_user_level = parseIntWithDefault(power_levels.users_default, 0);
+        const powerLevelDescriptors = {
+            users_default: {
+                desc: _t('The default role for new room members is'),
+                defaultValue: 0,
+            },
+            events_default: {
+                desc: _t('To send messages, you must be a'),
+                defaultValue: 0,
+            },
+            invite: {
+                desc: _t('To invite users into the room, you must be a'),
+                defaultValue: 50,
+            },
+            state_default: {
+                desc: _t('To configure the room, you must be a'),
+                defaultValue: 50,
+            },
+            kick: {
+                desc: _t('To kick users, you must be a'),
+                defaultValue: 50,
+            },
+            ban: {
+                desc: _t('To ban users, you must be a'),
+                defaultValue: 50,
+            },
+            redact: {
+                desc: _t('To remove other users\' messages, you must be a'),
+                defaultValue: 50,
+            },
+        };
 
-        this._populateDefaultPlEvents(events_levels, state_level, send_level);
+        const banLevel = parseIntWithDefault(powerLevels.ban, powerLevelDescriptors.ban.defaultValue);
+        const defaultUserLevel = parseIntWithDefault(
+            powerLevels.users_default,
+            powerLevelDescriptors.users_default.defaultValue,
+        );
 
-        let current_user_level = user_levels[user_id];
-        if (current_user_level === undefined) {
-            current_user_level = default_user_level;
+        this._populateDefaultPlEvents(
+            eventsLevels,
+            parseIntWithDefault(powerLevels.state_default, powerLevelDescriptors.state_default.defaultValue),
+            parseIntWithDefault(powerLevels.events_default, powerLevelDescriptors.events_default.defaultValue),
+        );
+
+        let currentUserLevel = userLevels[myUserId];
+        if (currentUserLevel === undefined) {
+            currentUserLevel = defaultUserLevel;
         }
 
-        const can_change_levels = roomState.mayClientSendStateEvent("m.room.power_levels", cli);
+        const canChangeLevels = roomState.mayClientSendStateEvent("m.room.power_levels", cli);
 
         const canSetTag = !cli.isGuest();
 
@@ -667,15 +696,16 @@ module.exports = React.createClass({
         />;
 
         let userLevelsSection;
-        if (Object.keys(user_levels).length) {
+        if (Object.keys(userLevels).length) {
             userLevelsSection =
                 <div>
                     <h3>{ _t('Privileged Users') }</h3>
                     <ul className="mx_RoomSettings_userLevels">
-                        { Object.keys(user_levels).map(function(user, i) {
+                        { Object.keys(userLevels).map(function(user, i) {
                             return (
                                 <li className="mx_RoomSettings_userLevel" key={user}>
-                                    { _t("%(user)s is a", {user: user}) } <PowerSelector value={user_levels[user]} disabled={true} />
+                                    { _t("%(user)s is a", {user: user}) }
+                                    <PowerSelector value={userLevels[user]} disabled={true} />
                                 </li>
                             );
                         }) }
@@ -688,7 +718,7 @@ module.exports = React.createClass({
         const banned = this.props.room.getMembersWithMembership("ban");
         let bannedUsersSection;
         if (banned.length) {
-            const canBanUsers = current_user_level >= ban_level;
+            const canBanUsers = currentUserLevel >= banLevel;
             bannedUsersSection =
                 <div>
                     <h3>{ _t('Banned users') }</h3>
@@ -710,13 +740,13 @@ module.exports = React.createClass({
         if (this._yankValueFromEvent("m.room.create", "m.federate", true) === false) {
              unfederatableSection = (
                 <div className="mx_RoomSettings_powerLevel">
-                { _t('This room is not accessible by remote Matrix servers') }.
+                    { _t('This room is not accessible by remote Matrix servers') }.
                 </div>
             );
         }
 
         let leaveButton = null;
-        const myMember = this.props.room.getMember(user_id);
+        const myMember = this.props.room.getMember(myUserId);
         if (myMember) {
             if (myMember.membership === "join") {
                 leaveButton = (
@@ -799,6 +829,50 @@ module.exports = React.createClass({
                 </div>;
         }
 
+        const powerSelectors = Object.keys(powerLevelDescriptors).map((key, index) => {
+            const descriptor = powerLevelDescriptors[key];
+
+            const value = parseIntWithDefault(powerLevels[key], descriptor.defaultValue);
+            return <div key={index} className="mx_RoomSettings_powerLevel">
+                <span className="mx_RoomSettings_powerLevelKey">
+                    { descriptor.desc }
+                </span>
+                <PowerSelector
+                    value={value}
+                    usersDefault={defaultUserLevel}
+                    controlled={false}
+                    disabled={!canChangeLevels || currentUserLevel < value}
+                    powerLevelKey={key} // Will be sent as the second parameter to `onChange`
+                    onChange={this.onPowerLevelsChanged}
+                />
+            </div>;
+        });
+
+        const eventPowerSelectors = Object.keys(eventsLevels).map(function(eventType, i) {
+            let label = plEventsToLabels[eventType];
+            if (label) {
+                label = _t(label);
+            } else {
+                label = _t(
+                    "To send events of type <eventType/>, you must be a", {},
+                    { 'eventType': <code>{ eventType }</code> },
+                );
+            }
+            return (
+                <div className="mx_RoomSettings_powerLevel" key={eventType}>
+                    <span className="mx_RoomSettings_powerLevelKey">{ label } </span>
+                    <PowerSelector
+                        value={eventsLevels[eventType]}
+                        usersDefault={defaultUserLevel}
+                        controlled={false}
+                        disabled={!canChangeLevels || currentUserLevel < eventsLevels[eventType]}
+                        powerLevelKey={"event_levels_" + eventType}
+                        onChange={self.onPowerLevelsChanged}
+                    />
+                </div>
+            );
+        });
+
         return (
             <div className="mx_RoomSettings">
 
@@ -898,49 +972,9 @@ module.exports = React.createClass({
 
                 <h3>{ _t('Permissions') }</h3>
                 <div className="mx_RoomSettings_powerLevels mx_RoomSettings_settings">
-                    <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('The default role for new room members is') } </span>
-                        <PowerSelector ref="users_default" value={default_user_level} usersDefault={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < default_user_level} onChange={this.onPowerLevelsChanged} />
-                    </div>
-                    <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To send messages, you must be a') } </span>
-                        <PowerSelector ref="events_default" value={send_level} usersDefault={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < send_level} onChange={this.onPowerLevelsChanged} />
-                    </div>
-                    <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To invite users into the room, you must be a') } </span>
-                        <PowerSelector ref="invite" value={invite_level} usersDefault={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < invite_level} onChange={this.onPowerLevelsChanged} />
-                    </div>
-                    <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To configure the room, you must be a') } </span>
-                        <PowerSelector ref="state_default" value={state_level} usersDefault={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < state_level} onChange={this.onPowerLevelsChanged} />
-                    </div>
-                    <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To kick users, you must be a') } </span>
-                        <PowerSelector ref="kick" value={kick_level} usersDefault={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < kick_level} onChange={this.onPowerLevelsChanged} />
-                    </div>
-                    <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To ban users, you must be a') } </span>
-                        <PowerSelector ref="ban" value={ban_level} usersDefault={default_user_level} controlled={false} disabled={!can_change_levels || current_user_level < ban_level} onChange={this.onPowerLevelsChanged} />
-                    </div>
-                    <div className="mx_RoomSettings_powerLevel">
-                        <span className="mx_RoomSettings_powerLevelKey">{ _t('To remove other users\' messages, you must be a') } </span>
-                        <PowerSelector ref="redact" value={redact_level} usersDefault={default_user_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) {
-                        let label = plEventsToLabels[event_type];
-                        if (label) label = _t(label);
-                        else label = _t("To send events of type <eventType/>, you must be a", {}, { 'eventType': <code>{ event_type }</code> });
-                        return (
-                            <div className="mx_RoomSettings_powerLevel" key={event_type}>
-                                <span className="mx_RoomSettings_powerLevelKey">{ label } </span>
-                                <PowerSelector ref={"event_levels_"+event_type} value={events_levels[event_type]} usersDefault={default_user_level} onChange={self.onPowerLevelsChanged}
-                                               controlled={false} disabled={!can_change_levels || current_user_level < events_levels[event_type]} />
-                            </div>
-                        );
-                    }) }
-
-                { unfederatableSection }
+                    { powerSelectors }
+                    { eventPowerSelectors }
+                    { unfederatableSection }
                 </div>
 
                 { userLevelsSection }
diff --git a/test/components/views/rooms/RoomSettings-test.js b/test/components/views/rooms/RoomSettings-test.js
index 12fb734bf4..ffcecf1725 100644
--- a/test/components/views/rooms/RoomSettings-test.js
+++ b/test/components/views/rooms/RoomSettings-test.js
@@ -1,8 +1,6 @@
 import React from 'react';
-import ReactTestUtils from 'react-addons-test-utils';
 import ReactDOM from 'react-dom';
 import expect, {createSpy} from 'expect';
-import sinon from 'sinon';
 import Promise from 'bluebird';
 import * as testUtils from '../../../test-utils';
 import sdk from 'matrix-react-sdk';

From a36ff75da7c71a3f067b67978010b3f112b582a1 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Wed, 28 Feb 2018 15:35:19 +0000
Subject: [PATCH 630/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index d4858ce609..2a29992c94 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -257,7 +257,7 @@
     "New Password": "Нова парола",
     "Confirm password": "Потвърждаване на парола",
     "Change Password": "Смяна на парола",
-    "Your home server does not support device management.": "Вашият home сървър не поддръжа управление на устройства.",
+    "Your home server does not support device management.": "Вашият Home сървър не поддръжа управление на устройства.",
     "Unable to load device list": "Неуспешно зареждане на списък с устройства",
     "Authentication": "Автентикация",
     "Delete %(count)s devices|other": "Изтрий %(count)s устройства",
@@ -397,7 +397,7 @@
     "Low priority": "Нисък приоритет",
     "Historical": "Архив",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Не може да се потвърди, че адреса към който е изпратена тази покана е обвързан с акаунта Ви.",
-    "This invitation was sent to an email address which is not associated with this account:": "Поканата е изпратена на имейл адрес, който не е свързан с този профил:",
+    "This invitation was sent to an email address which is not associated with this account:": "Поканата беше изпратена на имейл адрес, който не е свързан с този профил:",
     "You may wish to login with a different account, or add this email to this account.": "Може да искате да влезете с друг профил или да добавите имейл адреса в този.",
     "You have been invited to join this room by %(inviterName)s": "Вие сте поканен да се присъедините към тази стая от %(inviterName)s",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Желаете да <acceptText>приемете</acceptText> или да <declineText>откажете</declineText> тази покана?",
@@ -425,7 +425,7 @@
     "Banned by %(displayName)s": "Блокиран от %(displayName)s",
     "Privacy warning": "Предупреждение за сигурност",
     "Changes to who can read history will only apply to future messages in this room": "Промени по това кой може да чете историята ще се отнасят само за бъдещи съобщения в тази стая",
-    "The visibility of existing history will be unchanged": "Видимостта на история до сега ще остане непроменена",
+    "The visibility of existing history will be unchanged": "Видимостта на историята до сега ще остане непроменена",
     "End-to-end encryption is in beta and may not be reliable": "Шифроване от край до край е в бета версия и може да не е надеждно",
     "Devices will not yet be able to decrypt history from before they joined the room": "Устройства все още не могат да разшифроват история от преди присъединяването към стая",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Веднъж включено, шифроването в стаята не може да бъде изключено (за сега)",
@@ -445,7 +445,7 @@
     "Guests cannot join this room even if explicitly invited.": "Гости не могат да се присъединят към тази стая, дори изрично поканени.",
     "Click here to fix": "Натиснете тук за поправяне",
     "Who can access this room?": "Кой има достъп до тази стая?",
-    "Only people who have been invited": "Само хора, които са поканени",
+    "Only people who have been invited": "Само хора, които са били поканени",
     "Anyone who knows the room's link, apart from guests": "Всеки, който знае адреса на стаята (освен гости)",
     "Anyone who knows the room's link, including guests": "Всеки, който знае адреса на стаята (включително гости)",
     "Publish this room to the public in %(domain)s's room directory?": "Публично публикуване на тази стая в директорията на %(domain)s?",
@@ -492,7 +492,7 @@
     "URL previews are disabled by default for participants in this room.": "URL прегледи са изключени по подразбиране за участниците в тази стая.",
     "URL Previews": "URL прегледи",
     "Error decrypting audio": "Грешка при разшифроване на аудио файл",
-    "Error decrypting attachment": "Грешка при разшифроване на прикачване",
+    "Error decrypting attachment": "Грешка при разшифроване на прикачен файл",
     "Decrypt %(text)s": "Разшифровай %(text)s",
     "Download %(text)s": "Изтегли %(text)s",
     "(could not connect media)": "(неуспешно свързване на медийните устройства)",
@@ -572,7 +572,7 @@
     "Mobile phone number (optional)": "Мобилен номер (по избор)",
     "Default server": "Сървър по подразбиране",
     "Custom server": "Потребителски сървър",
-    "Home server URL": "Адрес на home сървър",
+    "Home server URL": "Адрес на Home сървър",
     "Identity server URL": "Адрес на сървър за самоличност",
     "What does this mean?": "Какво означава това?",
     "Failed to withdraw invitation": "Неуспешно оттегляне на поканата",
@@ -695,7 +695,7 @@
     "Create Room": "Създай стая",
     "Room name (optional)": "Име на стая (по избор)",
     "Advanced options": "Разширени настройки",
-    "Block users on other matrix homeservers from joining this room": "Не позволявай на потребители от други matrix home сървъри да се присъединяват към тази стая",
+    "Block users on other matrix homeservers from joining this room": "Не позволявай на потребители от други matrix Home сървъри да се присъединяват към тази стая",
     "This setting cannot be changed later!": "Тази настройка не може да бъде променена по-късно!",
     "Unknown error": "Неизвестна грешка",
     "Incorrect password": "Неправилна парола",
@@ -703,8 +703,8 @@
     "Deactivate my account": "Деактивирай моя профил",
     "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Това ще направи профила Ви перманентно неизползваем. Няма да можете да се регистрирате отново със същия потребителски идентификатор.",
     "This action is irreversible.": "Това действие е необратимо.",
-    "Device name": "Име на устройството",
-    "Device key": "Ключ на устройството",
+    "Device name": "Име на устройство",
+    "Device key": "Ключ на устройство",
     "In future this verification process will be more sophisticated.": "В бъдеще този процес на потвърждение ще бъде по-лесен.",
     "Verify device": "Потвърди устройството",
     "Start verification": "Започни потвърждението",
@@ -986,6 +986,6 @@
     "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Експортираният файл ще позволи на всеки, който може да го прочете, да разшифрова всяко шифровано съобщение, което можете да видите. Трябва да го държите на сигурно място. За да направите това, трябва да въведете парола по-долу, която ще се използва за шифроване на експортираните данни. Ще бъде възможно да се импортират данните само с използване на същата парола.",
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли: можете да използвате общности, за да",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да сложите филтър, плъзнете аватара на общността върху панела за филтриране от лявата част на Вашия екран. Можете да натиснете върху аватара в панела по всяко време, за да видите само стаите и хората асоциирани с тази общност."
+    "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли, че: може да използвате общности, за да филтрирате Вашето Riot.im преживяване!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност."
 }

From 758bc2976cff1e7c69bd556da206e0f9fa4fa8fe Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Wed, 28 Feb 2018 06:16:23 +0000
Subject: [PATCH 631/927] Translated using Weblate (Chinese (Simplified))

Currently translated at 76.3% (755 of 989 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 14e5a0712f..cb58fb6803 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -125,7 +125,7 @@
     "Success": "成功",
     "The default role for new room members is": "此聊天室新成员的默认角色是",
     "The main address for this room is": "此聊天室的主要地址是",
-    "This email address is already in use": "此邮箱地址已经被使用",
+    "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' exceeds this home server's size limit for uploads": "文件 '%(fileName)s' 超过了此主服务器的上传大小限制",
@@ -422,7 +422,7 @@
     "This room has no local addresses": "这个聊天室没有本地地址",
     "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 phone number is already in use": "此电话号码已被使用",
     "This room": "这个聊天室",
     "This room is not accessible by remote Matrix servers": "这个聊天室无法被远程 Matrix 服务器访问",
     "This room's internal ID is": "这个聊天室的内部 ID 是",
@@ -646,7 +646,7 @@
     "Answer Anyway": "无论如何接听",
     "Call": "呼叫",
     "Answer": "接听",
-    "Invite new community members": "邀请新的社区成员",
+    "Invite new community members": "邀请新社区成员",
     "Invite to Community": "邀请到社区",
     "Room name or alias": "聊天室名称或别名",
     "Ignored user": "忽视用户",
@@ -735,5 +735,24 @@
     "Dark theme": "深色主题",
     "Status.im theme": "Status.im 主题",
     "Ignored Users": "忽视用户",
-    "Room Notification": "聊天室通知"
+    "Room Notification": "聊天室通知",
+    "The platform you're on": "您使用的平台是",
+    "The version of Riot.im": "Riot.im 的版本是",
+    "Whether or not you're logged in (we don't record your user name)": "您是否登录了（我们不会记录你的用户名）",
+    "Your language of choice": "您选择的语言是",
+    "Which officially provided instance you are using, if any": "您正在使用的任何官方 Riot 实现（如果有的话）",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "您是否正在使用富文本编辑器的富文本模式",
+    "Your homeserver's URL": "您的主服务器的链接",
+    "Your identity server's URL": "您的身份认证服务器的链接",
+    "The information being sent to us to help make Riot.im better includes:": "将要为帮助 Riot.im 发展而发送的信息包含：",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "我们也记录了您在本应用中使用的页面（目前为 <CurrentPageHash>）， User Agent（<CurrentUserAgent>）和设备的分辨率（<CurrentDeviceResolution>）。",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "这个页面中含有可能能用于识别您身份的信息，比如聊天室、用户或群组 ID，在它们发送到服务器上之前，这些数据会被移除。",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s，%(monthName)s %(day)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s，%(monthName)s %(day)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s，%(monthName)s %(day)s %(fullYear)s %(time)s",
+    "Who would you like to add to this community?": "您想把谁添加到这个社区内？",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：您添加的用户对一切知道这个社区的 ID 的人公开",
+    "Name or matrix ID": "名称或 Matrix ID",
+    "Which rooms would you like to add to this community?": "您想把哪个聊天室添加到这个社区中？"
 }

From a48d17258a044667286798346c90c9cea9717d03 Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Wed, 28 Feb 2018 06:17:18 +0000
Subject: [PATCH 632/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index aa5f78e6af..f62cf999d0 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -700,7 +700,7 @@
     "Name or matrix ID": "名稱或 matrix ID",
     "Invite to Community": "邀請到社群",
     "Which rooms would you like to add to this community?": "您想要新增哪個聊天室到此社群？",
-    "Show these rooms to non-members on the community page and room list?": "在社群頁面與聊天室清單上顯示這些聊天室給非成員？",
+    "Show these rooms to non-members on the community page and room list?": "在社群頁面與聊天室清單上顯示這些聊天室給非社群成員？",
     "Add rooms to the community": "新增聊天室到社群",
     "Room name or alias": "聊天室名稱或別名",
     "Add to community": "新增到社群",

From 14d7e5e73d995c24907731c42a77b4a1dcbf7e7d Mon Sep 17 00:00:00 2001
From: Klaus Marx <km@slsx.de>
Date: Tue, 27 Feb 2018 15:14:12 +0000
Subject: [PATCH 633/927] Translated using Weblate (German)

Currently translated at 99.6% (986 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
---
 src/i18n/strings/de_DE.json | 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 f92b7b479a..26cf85c0af 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -936,7 +936,7 @@
     "Display your community flair in rooms configured to show it.": "Zeige deinen Community-Flair in den Räumen, die es erlauben.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Dieser Heimserver verfügt über keinen, von diesem Client unterstütztes Anmeldeverfahren.",
     "Call Failed": "Anruf fehlgeschlagen",
-    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "In diesem Raum befinden sich nicht verifizierte Geräte. Wenn du ohne Verifizierung fortfährst, könnten Angreifer den Anruf mithören.",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "In diesem Raum befinden sich nicht verifizierte Geräte. Wenn du fortfährst, ohne sie zu verifizieren, könnten Angreifer den Anruf mithören.",
     "Review Devices": "Geräte ansehen",
     "Call Anyway": "Trotzdem anrufen",
     "Answer Anyway": "Trotzdem annehmen",

From 27c71f15b9a00fd61200070842870510bc9af557 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 18:16:01 +0000
Subject: [PATCH 634/927] Add setting to disable TagPanel

---
 src/components/structures/UserSettings.js | 1 +
 src/settings/Settings.js                  | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index b1eedd1a90..51b6ff5bc1 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -79,6 +79,7 @@ const SIMPLE_SETTINGS = [
     { id: "Pill.shouldHidePillAvatar" },
     { id: "TextualBody.disableBigEmoji" },
     { id: "VideoView.flipVideoHorizontally" },
+    { id: "TagPanel.disableTagPanel" },
 ];
 
 // These settings must be defined in SettingsStore
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 519d2dd39a..cd37c00fa8 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -188,6 +188,11 @@ export const SETTINGS = {
         displayName: _td('Mirror local video feed'),
         default: false,
     },
+    "TagPanel.disableTagPanel": {
+        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
+        displayName: _td('Disable Community Filter Panel'),
+        default: false,
+    },
     "theme": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         default: "light",

From f29918b766c345ec1c146ca67b56223ed522bec2 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 18:18:59 +0000
Subject: [PATCH 635/927] gen-i18n

---
 src/i18n/strings/en_EN.json | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5b90973a65..6a8ec64ffa 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -203,6 +203,7 @@
     "Don't send typing notifications": "Don't send typing notifications",
     "Automatically replace plain text Emoji": "Automatically replace plain text Emoji",
     "Mirror local video feed": "Mirror local video feed",
+    "Disable Community Filter Panel": "Disable Community Filter Panel",
     "Disable Peer-to-Peer for 1:1 calls": "Disable Peer-to-Peer for 1:1 calls",
     "Opt out of analytics": "Opt out of analytics",
     "Never send encrypted messages to unverified devices from this device": "Never send encrypted messages to unverified devices from this device",
@@ -431,6 +432,13 @@
     "(warning: cannot be disabled again!)": "(warning: cannot be disabled again!)",
     "Encryption is enabled in this room": "Encryption is enabled in this room",
     "Encryption is not enabled in this room": "Encryption is not enabled in this room",
+    "The default role for new room members is": "The default role for new room members is",
+    "To send messages, you must be a": "To send messages, you must be a",
+    "To invite users into the room, you must be a": "To invite users into the room, you must be a",
+    "To configure the room, you must be a": "To configure the room, you must be a",
+    "To kick users, you must be a": "To kick users, you must be a",
+    "To ban users, you must be a": "To ban users, you must be a",
+    "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
     "Privileged Users": "Privileged Users",
     "%(user)s is a": "%(user)s is a",
     "No users have specific privileges in this room": "No users have specific privileges in this room",
@@ -442,6 +450,7 @@
     "To link to a room it must have <a>an address</a>.": "To link to a room it must have <a>an address</a>.",
     "Guests cannot join this room even if explicitly invited.": "Guests cannot join this room even if explicitly invited.",
     "Click here to fix": "Click here to fix",
+    "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Who can access this room?": "Who can access this room?",
     "Only people who have been invited": "Only people who have been invited",
     "Anyone who knows the room's link, apart from guests": "Anyone who knows the room's link, apart from guests",
@@ -453,14 +462,6 @@
     "Members only (since they were invited)": "Members only (since they were invited)",
     "Members only (since they joined)": "Members only (since they joined)",
     "Permissions": "Permissions",
-    "The default role for new room members is": "The default role for new room members is",
-    "To send messages, you must be a": "To send messages, you must be a",
-    "To invite users into the room, you must be a": "To invite users into the room, you must be a",
-    "To configure the room, you must be a": "To configure the room, you must be a",
-    "To kick users, you must be a": "To kick users, you must be a",
-    "To ban users, you must be a": "To ban users, you must be a",
-    "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
-    "To send events of type <eventType/>, you must be a": "To send events of type <eventType/>, you must be a",
     "Advanced": "Advanced",
     "This room's internal ID is": "This room's internal ID is",
     "Add a topic": "Add a topic",

From 35b42ad729f7e7688ec2e3c10de2c70fc314f64e Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 1 Mar 2018 10:33:46 +0000
Subject: [PATCH 636/927] Translated using Weblate (German)

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 26cf85c0af..df9eaa8ab0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -950,7 +950,7 @@
     "Old cryptography data detected": "Alte Kryptografiedaten erkannt",
     "Warning": "Warnung",
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Eine tiefgreifende Migration im Kontext der Verschlüsselungsdaten wurde durchgeführt. Ende-zu-Ende-Verschlüsselung wird nicht mehr funktionieren, wenn du zu einer älteren Version von Riot zurückkehrst. Wenn du Ende-zu-Ende-Verschlüssung bei einer älteren Version von Riot brauchst, melde dich bitte vorher ab. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
-    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wurden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
     "Send an encrypted reply…": "Verschlüsselte Antwort senden…",
     "Send a reply (unencrypted)…": "Antwort senden (unverschlüsselt)…",
     "Send an encrypted message…": "Verschlüsselte Nachricht senden…",
@@ -984,5 +984,8 @@
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s änderte den Anzeigenamen auf %(displayName)s.",
     "Failed to set direct chat tag": "Fehler beim Setzen der Direkt-Chat-Markierung",
     "Failed to remove tag %(tagName)s from room": "Fehler beim Entfernen des \"%(tagName)s\"-Tags von dem Raum",
-    "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum"
+    "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Um einen Filter zu setzen, siehe einen Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
+    "Clear filter": "Filter zurücksetzen"
 }

From 64332b302178abce5163c36205046f8e62047127 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Feb 2018 18:31:45 +0000
Subject: [PATCH 637/927] Workaround for atlassian/react-beautiful-dnd#273

Fix two bugs in Riot due to a single bug in react-b-dnd

Fixes vector-im/riot-web#6253
Fixes vector-im/riot-web#6156
---
 src/components/structures/TagPanel.js    | 6 ++++--
 src/components/views/groups/GroupTile.js | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 3d76a967a2..8db2a12aff 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -84,7 +84,7 @@ const TagPanel = React.createClass({
         }
     },
 
-    onClick(e) {
+    onMouseDown(e) {
         dis.dispatch({action: 'deselect_tags'});
     },
 
@@ -128,7 +128,9 @@ const TagPanel = React.createClass({
             <GeminiScrollbar
                 className="mx_TagPanel_scroller"
                 autoshow={true}
-                onClick={this.onClick}
+                // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
+                // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6253
+                onMouseDown={this.onMouseDown}
             >
                 <Droppable
                     droppableId="tag-panel-droppable"
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index f1dbb75988..8794fe4f36 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -59,7 +59,7 @@ const GroupTile = React.createClass({
         });
     },
 
-    onClick: function(e) {
+    onMouseDown: function(e) {
         e.preventDefault();
         dis.dispatch({
             action: 'view_group',
@@ -79,7 +79,9 @@ const GroupTile = React.createClass({
         const httpUrl = profile.avatarUrl ? this.context.matrixClient.mxcUrlToHttp(
             profile.avatarUrl, avatarHeight, avatarHeight, "crop",
         ) : null;
-        return <AccessibleButton className="mx_GroupTile" onClick={this.onClick}>
+        // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
+        // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6156
+        return <AccessibleButton className="mx_GroupTile" onMouseDown={this.onMouseDown}>
             <Droppable droppableId="my-groups-droppable" type="draggable-TagTile">
                 { (droppableProvided, droppableSnapshot) => (
                     <div ref={droppableProvided.innerRef}>

From 4037a22492dcde5383ef6d3570b1ed8819e27abf Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 1 Mar 2018 14:40:03 +0000
Subject: [PATCH 638/927] Fix bug where avatar change not reflected in LLP

Fixes vector-im/riot-web#6189
---
 src/components/structures/GroupView.js   | 15 +++++++++++++
 src/components/views/elements/TagTile.js | 27 ++++++++++++++++--------
 src/stores/FlairStore.js                 | 17 +++++++++++++--
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index de96935838..4a28faaac4 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -29,6 +29,7 @@ import classnames from 'classnames';
 
 import GroupStoreCache from '../../stores/GroupStoreCache';
 import GroupStore from '../../stores/GroupStore';
+import FlairStore from '../../stores/FlairStore';
 import { showGroupAddRoomDialog } from '../../GroupAddressPicker';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 import {makeGroupPermalink, makeUserPermalink} from "../../matrix-to";
@@ -429,6 +430,7 @@ export default React.createClass({
             editing: false,
             saving: false,
             uploadingAvatar: false,
+            avatarChanged: false,
             membershipBusy: false,
             publicityBusy: false,
             inviterProfile: null,
@@ -590,6 +592,10 @@ export default React.createClass({
             this.setState({
                 uploadingAvatar: false,
                 profileForm: newProfileForm,
+
+                // Indicate that FlairStore needs to be poked to show this change
+                // in TagTile (TagPanel), Flair and GroupTile (MyGroups).
+                avatarChanged: true,
             });
         }).catch((e) => {
             this.setState({uploadingAvatar: false});
@@ -615,6 +621,11 @@ export default React.createClass({
             });
             dis.dispatch({action: 'panel_disable'});
             this._initGroupStore(this.props.groupId);
+
+            if (this.state.avatarChanged) {
+                // XXX: Evil - poking a store should be done from an async action
+                FlairStore.refreshGroupProfile(this._matrixClient, this.props.groupId);
+            }
         }).catch((e) => {
             this.setState({
                 saving: false,
@@ -625,6 +636,10 @@ export default React.createClass({
                 title: _t('Error'),
                 description: _t('Failed to update community'),
             });
+        }).finally(() => {
+            this.setState({
+                avatarChanged: false,
+            });
         }).done();
     },
 
diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 8d801d986d..0a328bed57 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -55,20 +55,29 @@ export default React.createClass({
     componentWillMount() {
         this.unmounted = false;
         if (this.props.tag[0] === '+') {
-            FlairStore.getGroupProfileCached(
-                this.context.matrixClient,
-                this.props.tag,
-            ).then((profile) => {
-                if (this.unmounted) return;
-                this.setState({profile});
-            }).catch((err) => {
-                console.warn('Could not fetch group profile for ' + this.props.tag, err);
-            });
+            FlairStore.addListener('updateGroupProfile', this._onFlairStoreUpdated);
+            this._onFlairStoreUpdated();
         }
     },
 
     componentWillUnmount() {
         this.unmounted = true;
+        if (this.props.tag[0] === '+') {
+            FlairStore.removeListener('updateGroupProfile', this._onFlairStoreUpdated);
+        }
+    },
+
+    _onFlairStoreUpdated() {
+        if (this.unmounted) return;
+        FlairStore.getGroupProfileCached(
+            this.context.matrixClient,
+            this.props.tag,
+        ).then((profile) => {
+            if (this.unmounted) return;
+            this.setState({profile});
+        }).catch((err) => {
+            console.warn('Could not fetch group profile for ' + this.props.tag, err);
+        });
     },
 
     onClick: function(e) {
diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 7a3aa31e4e..5d3a43b222 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import EventEmitter from 'events';
 import Promise from 'bluebird';
 
 const BULK_REQUEST_DEBOUNCE_MS = 200;
@@ -28,8 +29,9 @@ const GROUP_PROFILES_CACHE_BUST_MS = 1800000; // 30 mins
 /**
  * Stores data used by <Flair/>
  */
-class FlairStore {
+class FlairStore extends EventEmitter {
     constructor(matrixClient) {
+        super();
         this._matrixClient = matrixClient;
         this._userGroups = {
             // $userId: ['+group1:domain', '+group2:domain', ...]
@@ -175,12 +177,23 @@ class FlairStore {
         };
         delete this._groupProfilesPromise[groupId];
 
+        /// XXX: This is verging on recreating a third "Flux"-looking Store. We really
+        /// should replace FlairStore with a Flux store and some async actions.
+        this.emit('updateGroupProfile');
+
         setTimeout(() => {
-            delete this._groupProfiles[groupId];
+            this.refreshGroupProfile(groupId);
         }, GROUP_PROFILES_CACHE_BUST_MS);
 
         return this._groupProfiles[groupId];
     }
+
+    refreshGroupProfile(matrixClient, groupId) {
+        // Invalidate the cache
+        delete this._groupProfiles[groupId];
+        // Fetch new profile data, and cache it
+        return this.getGroupProfileCached(matrixClient, groupId);
+    }
 }
 
 if (global.singletonFlairStore === undefined) {

From 61a6f140f593dfee51d3c283e7bab6d5cb9ad83d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 1 Mar 2018 14:43:26 +0000
Subject: [PATCH 639/927] onClientSync -> _onClientSync

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 3d76a967a2..74089d2161 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -45,7 +45,7 @@ const TagPanel = React.createClass({
     componentWillMount: function() {
         this.unmounted = false;
         this.context.matrixClient.on("Group.myMembership", this._onGroupMyMembership);
-        this.context.matrixClient.on("sync", this.onClientSync);
+        this.context.matrixClient.on("sync", this._onClientSync);
 
         this._tagOrderStoreToken = TagOrderStore.addListener(() => {
             if (this.unmounted) {
@@ -63,7 +63,7 @@ const TagPanel = React.createClass({
     componentWillUnmount() {
         this.unmounted = true;
         this.context.matrixClient.removeListener("Group.myMembership", this._onGroupMyMembership);
-        this.context.matrixClient.removeListener("sync", this.onClientSync);
+        this.context.matrixClient.removeListener("sync", this._onClientSync);
         if (this._filterStoreToken) {
             this._filterStoreToken.remove();
         }
@@ -74,7 +74,7 @@ const TagPanel = React.createClass({
         dis.dispatch(GroupActions.fetchJoinedGroups(this.context.matrixClient));
     },
 
-    onClientSync(syncState, prevState) {
+    _onClientSync(syncState, prevState) {
         // Consider the client reconnected if there is no error with syncing.
         // This means the state could be RECONNECTING, SYNCING or PREPARED.
         const reconnected = syncState !== "ERROR" && prevState !== syncState;

From 8b51ad7053a256d184e88a46d0a1cac44492220f Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 1 Mar 2018 08:15:44 +0000
Subject: [PATCH 640/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (989 of 989 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 2a29992c94..9355cbe465 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -151,7 +151,7 @@
     "Reason": "Причина",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s прие поканата за %(displayName)s.",
     "%(targetName)s accepted an invitation.": "%(targetName)s прие поканата.",
-    "%(senderName)s requested a VoIP conference.": "%(senderName)s заяви VoIP конферентен разговор.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s заяви VoIP групов разговор.",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s покани %(targetName)s.",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s блокира %(targetName)s.",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s смени своето име на %(displayName)s.",

From d5908fbc1ef8b5535cf9921e334beb4cfc11bc20 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 1 Mar 2018 15:06:05 +0000
Subject: [PATCH 641/927] Fix FlairStore cache busting

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

diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 5d3a43b222..4ef29ae4e1 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -182,7 +182,7 @@ class FlairStore extends EventEmitter {
         this.emit('updateGroupProfile');
 
         setTimeout(() => {
-            this.refreshGroupProfile(groupId);
+            this.refreshGroupProfile(matrixClient, groupId);
         }, GROUP_PROFILES_CACHE_BUST_MS);
 
         return this._groupProfiles[groupId];

From 25e8272d2caa41ba68dbbab699a77c0d9e287b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Tue, 27 Feb 2018 17:46:29 +0000
Subject: [PATCH 642/927] Translated using Weblate (French)

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 297091bb2c..5510d2fc25 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -987,5 +987,6 @@
     "Failed to add tag %(tagName)s to room": "Échec de l'ajout de l'étiquette %(tagName)s au salon",
     "Clear filter": "Supprimer les filtres",
     "Did you know: you can use communities to filter your Riot.im experience!": "Le saviez-vous : vous pouvez utiliser les communautés pour filtrer votre expérience Riot.im !",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l'écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté."
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l'écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté.",
+    "Disable Community Filter Panel": "Désactiver le panneau de filtre de communauté"
 }

From 379690bcc2042ea445d500eba5595e097f5a9fca Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Tue, 27 Feb 2018 19:38:08 +0000
Subject: [PATCH 643/927] Translated using Weblate (Russian)

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 6ea0af054c..0f4f51b73b 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -987,5 +987,6 @@
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
     "Clear filter": "Очистить фильтр",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Чтобы настроить фильтр, перетащите аватар сообщества на панель фильтров в левой части экрана. Вы можете нажать на аватар в панели фильтров в любое время, чтобы увидеть только комнаты и людей, связанных с этим сообществом.",
-    "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в Riot.im!"
+    "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в Riot.im!",
+    "Disable Community Filter Panel": "Отключить панель фильтра сообщества"
 }

From 94c1baa25d78afa1f6a58d4f40be2660f3587b14 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 1 Mar 2018 15:42:22 +0000
Subject: [PATCH 644/927] Fix varying default group avatar colour for given
 group

---
 src/components/views/elements/TagTile.js |  8 +++++++-
 src/components/views/groups/GroupTile.js | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js
index 8d801d986d..b69571f23b 100644
--- a/src/components/views/elements/TagTile.js
+++ b/src/components/views/elements/TagTile.js
@@ -145,7 +145,13 @@ export default React.createClass({
             </div> : <div />;
         return <AccessibleButton className={className} onClick={this.onClick}>
             <div className="mx_TagTile_avatar" onMouseOver={this.onMouseOver} onMouseOut={this.onMouseOut}>
-                <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
+                <BaseAvatar
+                    name={name}
+                    idName={this.props.tag}
+                    url={httpUrl}
+                    width={avatarHeight}
+                    height={avatarHeight}
+                />
                 { tip }
                 { contextButton }
             </div>
diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js
index 8794fe4f36..c1554cd9ed 100644
--- a/src/components/views/groups/GroupTile.js
+++ b/src/components/views/groups/GroupTile.js
@@ -99,13 +99,23 @@ const GroupTile = React.createClass({
                                         {...provided.dragHandleProps}
                                     >
                                         <div className="mx_GroupTile_avatar">
-                                            <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
+                                            <BaseAvatar
+                                                name={name}
+                                                idName={this.props.groupId}
+                                                url={httpUrl}
+                                                width={avatarHeight}
+                                                height={avatarHeight} />
                                         </div>
                                     </div>
                                     { /* Instead of a blank placeholder, use a copy of the avatar itself. */ }
                                     { provided.placeholder ?
                                         <div className="mx_GroupTile_avatar">
-                                            <BaseAvatar name={name} url={httpUrl} width={avatarHeight} height={avatarHeight} />
+                                            <BaseAvatar
+                                                name={name}
+                                                idName={this.props.groupId}
+                                                url={httpUrl}
+                                                width={avatarHeight}
+                                                height={avatarHeight} />
                                         </div> :
                                         <div />
                                     }

From ffcf58b14495f8b3398f799cc21632dc0f02b63d Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Thu, 1 Mar 2018 08:15:44 +0000
Subject: [PATCH 645/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 9355cbe465..7e8a5b1c3d 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -987,5 +987,6 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Този процес позволява да импортирате ключове за шифроване, които преди сте експортирали от друг Matrix клиент. Тогава ще можете да разшифровате всяко съобщение, което другият клиент може да разшифрова.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли, че: може да използвате общности, за да филтрирате Вашето Riot.im преживяване!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност."
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност.",
+    "Disable Community Filter Panel": "Изключи панела за филтриране на общности"
 }

From 8d8d73942eef354bc764cfc164842feceaead42d Mon Sep 17 00:00:00 2001
From: RainSlide <RainSlide@outlook.com>
Date: Wed, 28 Feb 2018 06:17:18 +0000
Subject: [PATCH 646/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f62cf999d0..454bdf8f2e 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -987,5 +987,6 @@
     "Failed to add tag %(tagName)s to room": "新增標籤 %(tagName)s 到聊天室失敗",
     "Did you know: you can use communities to filter your Riot.im experience!": "您知道嗎：您可以使用社群來強化您的 Riot.im 使用體驗！",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "要設定過濾器，拖曳社群大頭貼到位於螢幕最左邊的過濾器面板。您可以在任何時候在過濾器面板中的大頭貼上點按以檢視與該社群關聯的聊天室與夥伴。",
-    "Clear filter": "清除過濾器"
+    "Clear filter": "清除過濾器",
+    "Disable Community Filter Panel": "停用社群過濾面板"
 }

From 73768a7afc6ed400fc7e763d3382564a65cebe10 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sat, 3 Mar 2018 08:32:51 +0000
Subject: [PATCH 647/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f691a12f1c..3a9c6bfad2 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -985,5 +985,8 @@
     "Failed to set direct chat tag": "Nem sikerült a közvetlen beszélgetés jelzést beállítani",
     "Failed to remove tag %(tagName)s from room": "Nem sikerült a szobáról eltávolítani ezt: %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Nem sikerült hozzáadni a szobához ezt: %(tagName)s",
-    "Clear filter": "Szűrő törlése"
+    "Clear filter": "Szűrő törlése",
+    "Disable Community Filter Panel": "Közösség keresési panel tiltása",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Tudtad, hogy a közösségeket használhatod a Riot.im élmény fokozásához?",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "A szűrő beállításához húzd a közösség avatarját a szűrő panel fölé a képernyő bal szélén. A szűrő panelen az avatarra kattintva bármikor leszűrheted azokat a szobákat és embereket akik a megadott közösséghez tartoznak."
 }

From a95f6a9804313912ff57b142660a47a33c4080b9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 5 Mar 2018 12:36:02 +0000
Subject: [PATCH 648/927] Implement transparent RoomTile for use in some places

where a transparent appearance is required (i.e. in MemberInfo
or ChatCreateOrReuseDialog)
---
 src/components/views/dialogs/ChatCreateOrReuseDialog.js | 1 +
 src/components/views/rooms/MemberInfo.js                | 1 +
 src/components/views/rooms/RoomTile.js                  | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
index dc4f3f77db..0a909d9906 100644
--- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js
+++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js
@@ -59,6 +59,7 @@ export default class ChatCreateOrReuseDialog extends React.Component {
                 );
                 tiles.push(
                     <RoomTile key={room.roomId} room={room}
+                        transparent={true}
                         collapsed={false}
                         selected={false}
                         unread={Unread.doesRoomHaveUnreadMessages(room)}
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 816246a2de..19afe8e388 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -754,6 +754,7 @@ module.exports = withMatrixClient(React.createClass({
 
                     tiles.push(
                         <RoomTile key={room.roomId} room={room}
+                            transparent={true}
                             collapsed={false}
                             selected={false}
                             unread={Unread.doesRoomHaveUnreadMessages(room)}
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 43bc69dea2..6c0c2497b3 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -41,6 +41,8 @@ module.exports = React.createClass({
         collapsed: PropTypes.bool.isRequired,
         unread: PropTypes.bool.isRequired,
         highlight: PropTypes.bool.isRequired,
+        // If true, apply mx_RoomTile_transparent class
+        transparent: PropTypes.bool,
         isInvite: PropTypes.bool.isRequired,
         incomingCall: PropTypes.object,
     },
@@ -188,6 +190,7 @@ module.exports = React.createClass({
             'mx_RoomTile_invited': (me && me.membership == 'invite'),
             'mx_RoomTile_menuDisplayed': this.state.menuDisplayed,
             'mx_RoomTile_noBadges': !badges,
+            'mx_RoomTile_transparent': this.props.transparent,
         });
 
         const avatarClasses = classNames({

From ecad9b9dd3f003619517f16a0c8b796384429740 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Sat, 3 Mar 2018 10:24:45 +0000
Subject: [PATCH 649/927] Translated using Weblate (German)

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index df9eaa8ab0..7cbf4a7eea 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -987,5 +987,6 @@
     "Failed to add tag %(tagName)s to room": "Fehler beim Hinzufügen des \"%(tagName)s\"-Tags an dem Raum",
     "Did you know: you can use communities to filter your Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Um einen Filter zu setzen, siehe einen Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
-    "Clear filter": "Filter zurücksetzen"
+    "Clear filter": "Filter zurücksetzen",
+    "Disable Community Filter Panel": "Deaktivere Community-Filter-Panel"
 }

From bd8f78526e0f0c1a15aefbcbde11eec59cc55006 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Mon, 5 Mar 2018 09:11:15 +0000
Subject: [PATCH 650/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 7e8a5b1c3d..6acf7da82c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -80,7 +80,7 @@
     "Warning!": "Внимание!",
     "Conference calling is in development and may not be reliable.": "Груповите разговори са в процес на разработка и не са надеждни.",
     "Review Devices": "Преглед на устройства",
-    "Failed to set up conference call": "Неуспешно осъществяване на групов чат",
+    "Failed to set up conference call": "Неуспешно осъществяване на групов разговор",
     "Conference call failed.": "Неуспешен групов разговор.",
     "The file '%(fileName)s' failed to upload": "Неуспешно качване на файл '%(fileName)s'",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Файлът '%(fileName)s' надхвърля ограничението на размера за качване на този Home сървър",
@@ -160,9 +160,9 @@
     "%(senderName)s removed their profile picture.": "%(senderName)s премахна своята профилна снимка.",
     "%(senderName)s changed their profile picture.": "%(senderName)s промени своята профилна снимка.",
     "%(senderName)s set a profile picture.": "%(senderName)s зададе снимка на профила си.",
-    "VoIP conference started.": "Започна VoIP конференция.",
+    "VoIP conference started.": "Започна VoIP групов разговор.",
     "%(targetName)s joined the room.": "%(targetName)s се присъедини към стаята.",
-    "VoIP conference finished.": "VoIP конференцията приключи.",
+    "VoIP conference finished.": "Груповият разговор приключи.",
     "%(targetName)s rejected the invitation.": "%(targetName)s отхвърли поканата.",
     "%(targetName)s left the room.": "%(targetName)s напусна стаята.",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s отблокира %(targetName)s.",
@@ -767,7 +767,7 @@
     "Add a User": "Добавяне на потребител",
     "Failed to remove a user from the summary of %(groupId)s": "Неуспешно премахване на потребител от обобщението на %(groupId)s",
     "The user '%(displayName)s' could not be removed from the summary.": "Потребителят '%(displayName)s' не може да бъде премахнат от обобщението.",
-    "Failed to upload image": "Неуспешно качване на снимка",
+    "Failed to upload image": "Неуспешно качване на снимката",
     "Leave %(groupName)s?": "Напускане на %(groupName)s?",
     "Featured Rooms:": "Препоръчани стаи:",
     "Featured Users:": "Препоръчани потребители:",
@@ -833,7 +833,7 @@
     "Status.im theme": "Тема Status.im",
     "Can't load user settings": "Потребителските настройки не могат да бъдат заредени",
     "Server may be unavailable or overloaded": "Сървърът може би е недостъпен или претоварен",
-    "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.": "За сигурност, излизането ще изтрие ключовете за разшифроване от край до край от този браузър. Ако искате да бъде възможно да разшифровате Вашата история на разговорите от бъдещи Riot сесии, моля експортирайте Вашите ключове за стаите.",
+    "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.": "За сигурност, излизането ще изтрие ключовете за шифроване от край до край от този браузър. Ако искате да бъде възможно да разшифровате Вашата история на разговорите от бъдещи Riot сесии, моля експортирайте Вашите ключове за стаите.",
     "Success": "Успешно",
     "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Вашата парола беше успешно сменена. Няма да получавате известия на други устройства, докато не влезете отново в профила си от тях",
     "Remove Contact Information?": "Премахване на информацията за контакти?",

From 7755a3ce9002a145ff88836f1d35ff5c4ba42be3 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 6 Mar 2018 10:48:32 +0000
Subject: [PATCH 651/927] Nest sticker image element for correct positioning of
 tooltips.

---
 src/components/views/messages/MStickerBody.js |   16 +-
 yarn.lock                                     | 4392 +++++++++++++++++
 2 files changed, 4401 insertions(+), 7 deletions(-)
 create mode 100644 yarn.lock

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 9873717378..af39b1bd2d 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -53,13 +53,15 @@ export default class MStickerBody extends MImageBody {
 
         return (
             <span className="mx_MImageBody" ref="body">
-                <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
-                    alt={content.body}
-                    onLoad={this.props.onWidgetLoad}
-                    onMouseEnter={this._onMouseEnter}
-                    onMouseLeave={this._onMouseLeave}
-                />
-                { tooltip }
+                <div className="mx_MImageBody_thumbnail_container">
+                    <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+                        alt={content.body}
+                        onLoad={this.props.onWidgetLoad}
+                        onMouseEnter={this._onMouseEnter}
+                        onMouseLeave={this._onMouseLeave}
+                    />
+                    { tooltip }
+                </div>
             </span>
         );
     }
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000000..27533e876b
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4392 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+
+accepts@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
+  dependencies:
+    mime-types "~2.1.11"
+    negotiator "0.6.1"
+
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  dependencies:
+    acorn "^3.0.4"
+
+acorn@^3.0.0, acorn@^3.0.4:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+acorn@^5.5.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298"
+
+after@0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
+
+ajv-keywords@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+
+ajv@^4.7.0, ajv@^4.9.1:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+ajv@^5.1.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+another-json@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
+
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  dependencies:
+    color-convert "^1.9.0"
+
+anymatch@^1.3.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+  dependencies:
+    micromatch "^2.1.5"
+    normalize-path "^2.0.0"
+
+aproba@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+
+array-includes@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.7.0"
+
+array-slice@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+
+array-union@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+  dependencies:
+    array-uniq "^1.0.1"
+
+array-uniq@^1.0.1, array-uniq@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+arraybuffer.slice@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+
+async@^0.9.0, async@~0.9.0:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+
+async@^1.3.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+async@~0.2.6:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws-sign2@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+
+aws4@^1.2.1, aws4@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-cli@^6.5.2:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-polyfill "^6.26.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    commander "^2.11.0"
+    convert-source-map "^1.5.0"
+    fs-readdir-recursive "^1.0.0"
+    glob "^7.1.2"
+    lodash "^4.17.4"
+    output-file-sync "^1.1.2"
+    path-is-absolute "^1.0.1"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+    v8flags "^2.1.1"
+  optionalDependencies:
+    chokidar "^1.6.1"
+
+babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
+
+babel-core@^6.14.0, babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
+    slash "^1.0.0"
+    source-map "^0.5.6"
+
+babel-eslint@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-6.1.2.tgz#5293419fe3672d66598d327da9694567ba6a5f2f"
+  dependencies:
+    babel-traverse "^6.0.20"
+    babel-types "^6.0.19"
+    babylon "^6.0.18"
+    lodash.assign "^4.0.0"
+    lodash.pickby "^4.0.0"
+
+babel-generator@^6.26.0:
+  version "6.26.1"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.7"
+    trim-right "^1.0.1"
+
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+  dependencies:
+    babel-helper-explode-assignable-expression "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-builder-react-jsx@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    esutils "^2.0.2"
+
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-function-name@^6.24.1, babel-helper-function-name@^6.8.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+  dependencies:
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-loader@^6.2.5:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
+  dependencies:
+    find-cache-dir "^0.1.1"
+    loader-utils "^0.2.16"
+    mkdirp "^0.5.1"
+    object-assign "^4.0.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-add-module-exports@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-syntax-async-functions@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+
+babel-plugin-syntax-class-properties@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+
+babel-plugin-syntax-exponentiation-operator@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+
+babel-plugin-syntax-flow@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
+
+babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+
+babel-plugin-syntax-object-rest-spread@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+
+babel-plugin-syntax-trailing-function-commas@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+
+babel-plugin-transform-async-to-bluebird@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-bluebird/-/babel-plugin-transform-async-to-bluebird-1.1.1.tgz#46ea3e7c5af629782ac9f1ed1b7cd38f8425afd4"
+  dependencies:
+    babel-helper-function-name "^6.8.0"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-template "^6.9.0"
+    babel-traverse "^6.10.4"
+
+babel-plugin-transform-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+  dependencies:
+    babel-helper-remap-async-to-generator "^6.24.1"
+    babel-plugin-syntax-async-functions "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-class-properties@^6.16.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-plugin-transform-es2015-classes@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+  dependencies:
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-computed-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-destructuring@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-for-of@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
+  dependencies:
+    babel-helper-hoist-variables "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-modules-umd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
+babel-plugin-transform-es2015-object-super@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
+  dependencies:
+    babel-helper-replace-supers "^6.24.1"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+  dependencies:
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+  dependencies:
+    babel-helper-regex "^6.24.1"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-exponentiation-operator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+  dependencies:
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
+    babel-plugin-syntax-exponentiation-operator "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-flow-strip-types@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
+  dependencies:
+    babel-plugin-syntax-flow "^6.18.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-object-rest-spread@^6.16.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.26.0"
+
+babel-plugin-transform-react-display-name@^6.23.0:
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx-self@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx-source@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
+  dependencies:
+    babel-helper-builder-react-jsx "^6.24.1"
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
+  dependencies:
+    regenerator-transform "^0.10.0"
+
+babel-plugin-transform-runtime@^6.15.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.24.1"
+
+babel-polyfill@^6.26.0, babel-polyfill@^6.5.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
+babel-preset-es2015@^6.14.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.24.1"
+    babel-plugin-transform-es2015-classes "^6.24.1"
+    babel-plugin-transform-es2015-computed-properties "^6.24.1"
+    babel-plugin-transform-es2015-destructuring "^6.22.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
+    babel-plugin-transform-es2015-for-of "^6.22.0"
+    babel-plugin-transform-es2015-function-name "^6.24.1"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-umd "^6.24.1"
+    babel-plugin-transform-es2015-object-super "^6.24.1"
+    babel-plugin-transform-es2015-parameters "^6.24.1"
+    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
+    babel-plugin-transform-regenerator "^6.24.1"
+
+babel-preset-es2016@^6.11.3:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.24.1.tgz#f900bf93e2ebc0d276df9b8ab59724ebfd959f8b"
+  dependencies:
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
+
+babel-preset-es2017@^6.14.0:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.24.1.tgz#597beadfb9f7f208bcfd8a12e9b2b29b8b2f14d1"
+  dependencies:
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.24.1"
+
+babel-preset-flow@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
+  dependencies:
+    babel-plugin-transform-flow-strip-types "^6.22.0"
+
+babel-preset-react@^6.11.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.3.13"
+    babel-plugin-transform-react-display-name "^6.23.0"
+    babel-plugin-transform-react-jsx "^6.24.1"
+    babel-plugin-transform-react-jsx-self "^6.22.0"
+    babel-plugin-transform-react-jsx-source "^6.22.0"
+    babel-preset-flow "^6.23.0"
+
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+  dependencies:
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.17.4"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.15"
+
+babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.9.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.0.20, babel-traverse@^6.10.4, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.0.19, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@^6.0.18, babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
+backo2@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+base64-arraybuffer@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
+
+base64-js@^1.0.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
+
+base64id@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+better-assert@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
+  dependencies:
+    callsite "1.0.0"
+
+big.js@^3.1.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+
+binary-extensions@^1.0.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+
+blob@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+bluebird@^3.3.0, bluebird@^3.5.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+
+blueimp-canvas-to-blob@^3.5.0:
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.14.0.tgz#ea075ffbfb1436607b0c75e951fb1ceb3ca0288e"
+
+body-parser@^1.16.1:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
+  dependencies:
+    bytes "3.0.0"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.1"
+    http-errors "~1.6.2"
+    iconv-lite "0.4.19"
+    on-finished "~2.3.0"
+    qs "6.5.1"
+    raw-body "2.3.2"
+    type-is "~1.6.15"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+boom@4.x.x:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
+  dependencies:
+    hoek "4.x.x"
+
+boom@5.x.x:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
+  dependencies:
+    hoek "4.x.x"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^0.1.2:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
+  dependencies:
+    expand-range "^0.1.0"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+browser-encrypt-attachment@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz#205a94caadf0dc7e81413941812f655bd190ff1c"
+
+browser-request@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
+
+browserify-aes@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c"
+  dependencies:
+    inherits "^2.0.1"
+
+browserify-zlib@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  dependencies:
+    pako "~0.2.0"
+
+buffer@^4.9.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+
+bytes@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  dependencies:
+    callsites "^0.2.0"
+
+callsite@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+"chalk@^1.1.3 || 2.x", chalk@^2.3.0, chalk@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.6.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+
+classnames@^2.1.2:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
+
+cli-cursor@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  dependencies:
+    restore-cursor "^1.0.1"
+
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+clone@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+color-convert@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+
+colors@^1.1.0, colors@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
+combine-lists@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
+  dependencies:
+    lodash "^4.5.0"
+
+combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commander@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
+
+commander@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
+
+commander@^2.11.0:
+  version "2.14.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+commonmark@^0.28.1:
+  version "0.28.1"
+  resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.28.1.tgz#06eab8d52338b839fa1a2d75af0085eed1b1beae"
+  dependencies:
+    entities "~ 1.1.1"
+    mdurl "~ 1.0.1"
+    minimist "~ 1.2.0"
+    string.prototype.repeat "^0.2.0"
+
+component-bind@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
+
+component-emitter@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
+
+component-emitter@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
+
+component-inherit@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+concat-stream@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+connect@^3.6.0:
+  version "3.6.6"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.0"
+    parseurl "~1.3.2"
+    utils-merge "1.0.1"
+
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  dependencies:
+    date-now "^0.1.4"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+
+content-type@^1.0.2, content-type@~1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+
+convert-source-map@^1.5.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
+cookie@0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
+
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+
+core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+
+core-util-is@1.0.2, core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+counterpart@^0.18.0:
+  version "0.18.6"
+  resolved "https://registry.yarnpkg.com/counterpart/-/counterpart-0.18.6.tgz#cf6b60d8ef99a4b44b8bf6445fa99b4bd1b2f9dd"
+  dependencies:
+    date-names "^0.1.11"
+    except "^0.1.3"
+    extend "^3.0.0"
+    pluralizers "^0.1.7"
+    sprintf-js "^1.0.3"
+
+create-react-class@^15.6.0:
+  version "15.6.3"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+cryptiles@3.x.x:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
+  dependencies:
+    boom "5.x.x"
+
+crypto-browserify@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"
+  dependencies:
+    browserify-aes "0.4.0"
+    pbkdf2-compat "2.0.1"
+    ripemd160 "0.2.0"
+    sha.js "2.2.6"
+
+custom-event@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  dependencies:
+    es5-ext "^0.10.9"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-names@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.12.tgz#e60fe316de1547c9d9e7f14bd350130e4b7f9ef8"
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
+debug@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
+  dependencies:
+    ms "0.7.1"
+
+debug@2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
+  dependencies:
+    ms "0.7.2"
+
+debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.6.8:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+decamelize@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-extend@~0.4.0:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
+
+deep-is@~0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+
+define-properties@^1.1.2, define-properties@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  dependencies:
+    foreach "^2.0.5"
+    object-keys "^1.0.8"
+
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+depd@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+
+depd@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  dependencies:
+    repeating "^2.0.0"
+
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+
+di@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+
+diff@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
+
+doctrine@^2.0.0, doctrine@^2.0.2:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  dependencies:
+    esutils "^2.0.2"
+
+dom-serialize@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  dependencies:
+    custom-event "~1.0.0"
+    ent "~2.2.0"
+    extend "^3.0.0"
+    void-elements "^2.0.0"
+
+dom-serializer@0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
+  dependencies:
+    domelementtype "~1.1.1"
+    entities "~1.1.1"
+
+domain-browser@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+
+domelementtype@1, domelementtype@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+
+domelementtype@~1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+
+domhandler@^2.3.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
+  dependencies:
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+draft-js-export-html@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz#cc80f0544c43d0a7fedbc53c0cb0914e8090f769"
+  dependencies:
+    draft-js-utils ">=0.2.0"
+
+draft-js-export-markdown@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz#86390e03ceaf1d347fc616867ab7f535eb76bf42"
+  dependencies:
+    draft-js-utils ">=0.2.0"
+
+draft-js-utils@>=0.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/draft-js-utils/-/draft-js-utils-1.2.0.tgz#f5cb23eb167325ffed3d79882fdc317721d2fd12"
+
+draft-js@^0.11.0-alpha:
+  version "0.11.0-alpha"
+  resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.11.0-alpha.tgz#32db2108f927e9b8446da1f79e4475c2b7f868ae"
+  dependencies:
+    fbjs "^0.8.12"
+    immutable "~3.7.4"
+    object-assign "^4.1.0"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+
+emojione@2.2.7:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.7.tgz#46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+encodeurl@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  dependencies:
+    iconv-lite "~0.4.13"
+
+engine.io-client@1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab"
+  dependencies:
+    component-emitter "1.2.1"
+    component-inherit "0.0.3"
+    debug "2.3.3"
+    engine.io-parser "1.3.2"
+    has-cors "1.1.0"
+    indexof "0.0.1"
+    parsejson "0.0.3"
+    parseqs "0.0.5"
+    parseuri "0.0.5"
+    ws "1.1.2"
+    xmlhttprequest-ssl "1.5.3"
+    yeast "0.1.2"
+
+engine.io-parser@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.2.tgz#937b079f0007d0893ec56d46cb220b8cb435220a"
+  dependencies:
+    after "0.8.2"
+    arraybuffer.slice "0.0.6"
+    base64-arraybuffer "0.1.5"
+    blob "0.0.4"
+    has-binary "0.1.7"
+    wtf-8 "1.0.0"
+
+engine.io@1.8.3:
+  version "1.8.3"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4"
+  dependencies:
+    accepts "1.3.3"
+    base64id "1.0.0"
+    cookie "0.3.1"
+    debug "2.3.3"
+    engine.io-parser "1.3.2"
+    ws "1.1.2"
+
+enhanced-resolve@~0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.2.0"
+    tapable "^0.1.8"
+
+ent@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+
+entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
+
+errno@^0.1.3:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+  dependencies:
+    prr "~1.0.1"
+
+es-abstract@^1.6.1, es-abstract@^1.7.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
+  dependencies:
+    es-to-primitive "^1.1.1"
+    function-bind "^1.1.1"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.39"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87"
+  dependencies:
+    es6-iterator "~2.0.3"
+    es6-symbol "~3.1.1"
+
+es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-map@^0.1.3:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
+
+es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
+
+es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+es6-weak-map@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+  dependencies:
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+
+escape-string-regexp@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
+
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-config-google@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz#5598f8498e9e078420f34b80495b8d959f651fb2"
+
+eslint-plugin-babel@^4.0.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.2.tgz#79202a0e35757dd92780919b2336f1fa2fe53c1e"
+
+eslint-plugin-flowtype@^2.30.0:
+  version "2.46.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.46.1.tgz#c4f81d580cd89c82bc3a85a1ccf4ae3a915143a4"
+  dependencies:
+    lodash "^4.15.0"
+
+eslint-plugin-react@^7.4.0:
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
+  dependencies:
+    doctrine "^2.0.2"
+    has "^1.0.1"
+    jsx-ast-utils "^2.0.1"
+    prop-types "^15.6.0"
+
+eslint@^3.13.1:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  dependencies:
+    babel-code-frame "^6.16.0"
+    chalk "^1.1.3"
+    concat-stream "^1.5.2"
+    debug "^2.1.1"
+    doctrine "^2.0.0"
+    escope "^3.6.0"
+    espree "^3.4.0"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    glob "^7.0.3"
+    globals "^9.14.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    inquirer "^0.12.0"
+    is-my-json-valid "^2.10.0"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.5.1"
+    json-stable-stringify "^1.0.0"
+    levn "^0.3.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.1"
+    pluralize "^1.2.1"
+    progress "^1.1.8"
+    require-uncached "^1.0.2"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
+    table "^3.7.8"
+    text-table "~0.2.0"
+    user-home "^2.0.0"
+
+espree@^3.4.0:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+  dependencies:
+    acorn "^5.5.0"
+    acorn-jsx "^3.0.0"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+esquery@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  dependencies:
+    estraverse "^4.0.0"
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  dependencies:
+    estraverse "^4.1.0"
+
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+
+estree-walker@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854"
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
+eventemitter3@1.x.x:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+except@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/except/-/except-0.1.3.tgz#98261c91958551536b44482238e9783fb73d292a"
+  dependencies:
+    indexof "0.0.1"
+
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+
+expand-braces@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
+  dependencies:
+    array-slice "^0.2.3"
+    array-unique "^0.2.1"
+    braces "^0.1.2"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
+  dependencies:
+    is-number "^0.1.1"
+    repeat-string "^0.2.2"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+expect@^1.16.0:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-1.20.2.tgz#d458fe4c56004036bae3232416a3f6361f04f965"
+  dependencies:
+    define-properties "~1.1.2"
+    has "^1.0.1"
+    is-equal "^1.5.1"
+    is-regex "^1.0.3"
+    object-inspect "^1.1.0"
+    object-keys "^1.0.9"
+    tmatch "^2.0.1"
+
+extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extsprintf@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+
+extsprintf@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+
+fast-levenshtein@~2.0.4:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+
+fbemitter@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-2.1.1.tgz#523e14fdaf5248805bb02f62efc33be703f51865"
+  dependencies:
+    fbjs "^0.8.4"
+
+fbjs@0.1.0-alpha.7:
+  version "0.1.0-alpha.7"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.1.0-alpha.7.tgz#ad4308b8f232fb3c73603349ea725d1e9c39323c"
+  dependencies:
+    core-js "^1.0.0"
+    promise "^7.0.3"
+    whatwg-fetch "^0.9.0"
+
+fbjs@^0.8.12, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.9"
+
+figures@^1.3.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
+file-saver@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.3.tgz#cdd4c44d3aa264eac2f68ec165bc791c34af1232"
+
+filename-regex@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
+
+filesize@3.5.6:
+  version "3.5.6"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.3.1"
+    unpipe "~1.0.0"
+
+find-cache-dir@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  dependencies:
+    commondir "^1.0.1"
+    mkdirp "^0.5.1"
+    pkg-dir "^1.0.0"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+flat-cache@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
+flow-parser@^0.57.3:
+  version "0.57.3"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.57.3.tgz#b8d241a1b1cbae043afa7976e39f269988d8fe34"
+
+flux@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/flux/-/flux-2.1.1.tgz#2c6ac652d4337488968489c6586f3aff26a38ea4"
+  dependencies:
+    fbemitter "^2.0.0"
+    fbjs "0.1.0-alpha.7"
+    immutable "^3.7.4"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
+foreachasync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+form-data@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "1.0.6"
+    mime-types "^2.1.12"
+
+formatio@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
+  dependencies:
+    samsam "~1.1"
+
+fs-access@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+  dependencies:
+    null-check "^1.0.0"
+
+fs-readdir-recursive@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fsevents@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.39"
+
+fstream-ignore@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  dependencies:
+    fstream "^1.0.0"
+    inherits "2"
+    minimatch "^3.0.0"
+
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+fuse.js@^2.2.0:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gemini-scrollbar@matrix-org/gemini-scrollbar#b302279:
+  version "1.4.3"
+  resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/b302279810d05319ac5ff1bd34910bff32325c7b"
+
+generate-function@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  dependencies:
+    is-property "^1.0.0"
+
+getpass@^0.1.1:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob@3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
+  dependencies:
+    inherits "2"
+    minimatch "0.3"
+
+glob@^5.0.14:
+  version "5.0.15"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^9.14.0, globals@^9.18.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.4:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+growl@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-schema@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+har-validator@~5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
+  dependencies:
+    ajv "^5.1.0"
+    har-schema "^2.0.0"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-binary@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
+  dependencies:
+    isarray "0.0.1"
+
+has-cors@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hawk@3.1.3, hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+hawk@~6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
+  dependencies:
+    boom "4.x.x"
+    cryptiles "3.x.x"
+    hoek "4.x.x"
+    sntp "2.x.x"
+
+highlight.js@^8.9.1:
+  version "8.9.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-8.9.1.tgz#b8a9c5493212a9392f0222b649c9611497ebfb88"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+hoek@4.x.x:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
+
+hoist-non-react-statics@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+htmlparser2@^3.9.0:
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+  dependencies:
+    domelementtype "^1.3.0"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^2.0.2"
+
+http-errors@1.6.2, http-errors@~1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
+  dependencies:
+    depd "1.1.1"
+    inherits "2.0.3"
+    setprototypeof "1.0.3"
+    statuses ">= 1.3.1 < 2"
+
+http-proxy@^1.13.0:
+  version "1.16.2"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
+  dependencies:
+    eventemitter3 "1.x.x"
+    requires-port "1.x.x"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+http-signature@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+  dependencies:
+    assert-plus "^1.0.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+
+iconv-lite@0.4.19, iconv-lite@~0.4.13:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
+
+ieee754@^1.1.4:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+
+ignore@^3.2.0:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+
+immutable@^3.7.4:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+
+immutable@~3.7.4:
+  version "3.7.6"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
+ini@~1.3.0:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+
+inquirer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^2.0.0"
+    figures "^1.3.5"
+    lodash "^4.3.0"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+interpret@^0.6.4:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"
+
+interpret@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
+invariant@^2.0.0, invariant@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688"
+  dependencies:
+    loose-envify "^1.0.0"
+
+is-arrow-function@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-arrow-function/-/is-arrow-function-2.0.3.tgz#29be2c2d8d9450852b8bbafb635ba7b8d8e87ec2"
+  dependencies:
+    is-callable "^1.0.4"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-boolean-object@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-callable@^1.0.4, is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
+is-dotfile@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-equal@^1.5.1:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.5.5.tgz#5e85f1957e052883247feb386965a3bba15fbb3d"
+  dependencies:
+    has "^1.0.1"
+    is-arrow-function "^2.0.3"
+    is-boolean-object "^1.0.0"
+    is-callable "^1.1.3"
+    is-date-object "^1.0.1"
+    is-generator-function "^1.0.6"
+    is-number-object "^1.0.3"
+    is-regex "^1.0.3"
+    is-string "^1.0.4"
+    is-symbol "^1.0.1"
+    object.entries "^1.0.4"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+
+is-generator-function@^1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+
+is-my-json-valid@^2.10.0:
+  version "2.17.2"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
+is-number-object@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
+
+is-number@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
+
+is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-path-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+
+is-path-in-cwd@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
+  dependencies:
+    is-path-inside "^1.0.0"
+
+is-path-inside@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+  dependencies:
+    path-is-inside "^1.0.1"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-property@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+
+is-regex@^1.0.3, is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+
+is-stream@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-string@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+
+is-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+isarray@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isbinaryfile@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jade@0.26.3:
+  version "0.26.3"
+  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
+  dependencies:
+    commander "0.6.1"
+    mkdirp "0.3.0"
+
+"jquery@>= 1.4.3", jquery@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
+
+js-tokens@^3.0.0, js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+
+js-yaml@^3.5.1:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+
+json-loader@^0.5.3:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json3@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+
+json5@^0.5.0, json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+
+jsprim@^1.2.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.3.0"
+    json-schema "0.2.3"
+    verror "1.10.0"
+
+jsx-ast-utils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
+  dependencies:
+    array-includes "^3.0.3"
+
+karma-chrome-launcher@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz#4c6d700d163a9d34c618efd87918be49e7a4a8c9"
+  dependencies:
+    fs-access "^1.0.0"
+    which "^1.2.1"
+
+karma-cli@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-0.1.2.tgz#cacea84371ece19876265c8fa102ebbb9fee4a8c"
+  dependencies:
+    resolve "^1.1.6"
+
+karma-junit-reporter@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/karma-junit-reporter/-/karma-junit-reporter-0.4.2.tgz#492a236728fe4c92aacf419fcd0110a4327e9d7f"
+  dependencies:
+    path-is-absolute "^1.0.0"
+    xmlbuilder "3.1.0"
+
+karma-logcapture-reporter@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/karma-logcapture-reporter/-/karma-logcapture-reporter-0.0.1.tgz#bf1b0b1c915e0de295a15fe2f0179d4281bacddc"
+
+karma-mocha@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-0.2.2.tgz#388ed917da15dcb196d1b915c1934ef803193f8e"
+
+karma-sourcemap-loader@^0.3.7:
+  version "0.3.7"
+  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
+  dependencies:
+    graceful-fs "^4.1.2"
+
+karma-spec-reporter@^0.0.31:
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz#4830dc7148a155c7d7a186e632339a0d80fadec3"
+  dependencies:
+    colors "^1.1.2"
+
+karma-summary-reporter@^1.3.3:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/karma-summary-reporter/-/karma-summary-reporter-1.5.0.tgz#dc570299c7074774e388e10fa5f9e58f7a45ec14"
+  dependencies:
+    chalk "^1.1.3 || 2.x"
+
+karma-webpack@^1.7.0:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-1.8.1.tgz#39d5fd2edeea3cc3ef5b405989b37d5b0e6a3b4e"
+  dependencies:
+    async "~0.9.0"
+    loader-utils "^0.2.5"
+    lodash "^3.8.0"
+    source-map "^0.1.41"
+    webpack-dev-middleware "^1.0.11"
+
+karma@^1.7.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
+  dependencies:
+    bluebird "^3.3.0"
+    body-parser "^1.16.1"
+    chokidar "^1.4.1"
+    colors "^1.1.0"
+    combine-lists "^1.0.0"
+    connect "^3.6.0"
+    core-js "^2.2.0"
+    di "^0.0.1"
+    dom-serialize "^2.2.0"
+    expand-braces "^0.1.1"
+    glob "^7.1.1"
+    graceful-fs "^4.1.2"
+    http-proxy "^1.13.0"
+    isbinaryfile "^3.0.0"
+    lodash "^3.8.0"
+    log4js "^0.6.31"
+    mime "^1.3.4"
+    minimatch "^3.0.2"
+    optimist "^0.6.1"
+    qjobs "^1.1.4"
+    range-parser "^1.2.0"
+    rimraf "^2.6.0"
+    safe-buffer "^5.0.1"
+    socket.io "1.7.3"
+    source-map "^0.5.3"
+    tmp "0.0.31"
+    useragent "^2.1.12"
+
+kind-of@^3.0.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
+linkifyjs@^2.1.3:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.6.tgz#f1cc88a86ff8863196615857fd47eb193c0a26cb"
+  optionalDependencies:
+    jquery "^3.3.1"
+    react "^16.2.0"
+    react-dom "^16.2.0"
+
+loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@~0.2.2:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
+lodash-es@^4.17.5, lodash-es@^4.2.1:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.5.tgz#9fc6e737b1c4d151d8f9cae2247305d552ce748f"
+
+lodash.assign@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+
+lodash.escaperegexp@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
+
+lodash.isplainobject@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+
+lodash.isstring@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
+
+lodash.mergewith@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
+
+lodash.pickby@^4.0.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
+
+lodash@^3.5.0, lodash@^3.8.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+
+lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0:
+  version "4.17.5"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+
+log4js@^0.6.31:
+  version "0.6.38"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd"
+  dependencies:
+    readable-stream "~1.0.2"
+    semver "~4.3.3"
+
+lolex@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+lru-cache@2:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
+
+lru-cache@4.1.x:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
+
+matrix-js-sdk@0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-0.9.2.tgz#2a521bddcf637cbefde9138784e627ea43645b77"
+  dependencies:
+    another-json "^0.2.0"
+    babel-runtime "^6.26.0"
+    bluebird "^3.5.0"
+    browser-request "^0.3.3"
+    content-type "^1.0.2"
+    request "^2.53.0"
+
+matrix-react-test-utils@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.1.1.tgz#b548844d0ebe338ea1b9c8f16474c30d17c3bdf4"
+  dependencies:
+    react "^15.6.1"
+    react-dom "^15.6.1"
+
+"mdurl@~ 1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+
+memoize-one@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.0.1.tgz#7b599850bb41be8beed305f4eefd963c8cea9a0a"
+
+memory-fs@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"
+
+memory-fs@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+memory-fs@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+micromatch@^2.1.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+mime-db@~1.33.0:
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
+
+mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
+mime@^1.3.4, mime@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+
+minimatch@0.3:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
+  dependencies:
+    lru-cache "2"
+    sigmund "~1.0.0"
+
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.2.0, "minimist@~ 1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+mkdirp@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+
+mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+mocha@^2.4.5:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
+  dependencies:
+    commander "2.3.0"
+    debug "2.2.0"
+    diff "1.4.0"
+    escape-string-regexp "1.0.2"
+    glob "3.2.11"
+    growl "1.9.2"
+    jade "0.26.3"
+    mkdirp "0.5.1"
+    supports-color "1.2.0"
+    to-iso-string "0.0.2"
+
+ms@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+
+mute-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+
+nan@^2.3.0:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
+
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+
+negotiator@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
+
+node-fetch@^1.0.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
+node-libs-browser@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-0.7.0.tgz#3e272c0819e308935e26674408d7af0e1491b83b"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.1.4"
+    buffer "^4.9.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "3.3.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "0.0.1"
+    os-browserify "^0.2.0"
+    path-browserify "0.0.0"
+    process "^0.11.0"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.0.5"
+    stream-browserify "^2.0.1"
+    stream-http "^2.3.1"
+    string_decoder "^0.10.25"
+    timers-browserify "^2.0.2"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-pre-gyp@^0.6.39:
+  version "0.6.39"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
+  dependencies:
+    detect-libc "^1.0.2"
+    hawk "3.1.3"
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-path@^2.0.0, normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+npmlog@^4.0.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+null-check@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+oauth-sign@~0.8.1, oauth-sign@~0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
+
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object-component@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
+
+object-inspect@^1.1.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.5.0.tgz#9d876c11e40f485c79215670281b767488f9bfe3"
+
+object-keys@^1.0.8, object-keys@^1.0.9:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+
+object.entries@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.6.1"
+    function-bind "^1.1.0"
+    has "^1.0.1"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0, once@^1.3.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+
+optimist@^0.6.1, optimist@~0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+optionator@^0.8.2:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.4"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    wordwrap "~1.0.0"
+
+options@>=0.0.5:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
+
+os-browserify@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+output-file-sync@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
+  dependencies:
+    graceful-fs "^4.1.4"
+    mkdirp "^0.5.1"
+    object-assign "^4.1.0"
+
+pako@~0.2.0:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+
+parallelshell@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/parallelshell/-/parallelshell-3.0.2.tgz#fffc55aaa145bdd44b5381cf7fd5e521fc21aa7b"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+parsejson@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
+  dependencies:
+    better-assert "~1.0.0"
+
+parseqs@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
+  dependencies:
+    better-assert "~1.0.0"
+
+parseuri@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
+  dependencies:
+    better-assert "~1.0.0"
+
+parseurl@~1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-is-inside@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+pbkdf2-compat@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz#b6e0c8fa99494d94e0511575802a59a5c142f288"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+performance-now@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+
+pify@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  dependencies:
+    find-up "^1.0.0"
+
+pluralize@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+
+pluralizers@^0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
+
+postcss@^6.0.14:
+  version "6.0.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
+  dependencies:
+    chalk "^2.3.1"
+    source-map "^0.6.1"
+    supports-color "^5.2.0"
+
+prelude-ls@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+private@^0.1.6, private@^0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+
+process@^0.11.0:
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+
+progress@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+
+promise@^7.0.3, promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  dependencies:
+    asap "~2.0.3"
+
+prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+prr@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+
+pseudomap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+qjobs@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+
+qs@6.5.1, qs@~6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+
+querystring@0.2.0, querystring@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
+raf-schd@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-2.1.0.tgz#64d645723380ec25cc1714e909b953ef1cf254bf"
+
+raf@^3.1.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
+  dependencies:
+    performance-now "^2.1.0"
+
+randomatic@^1.1.3:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+range-parser@^1.0.3, range-parser@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+
+raw-body@2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
+  dependencies:
+    bytes "3.0.0"
+    http-errors "1.6.2"
+    iconv-lite "0.4.19"
+    unpipe "1.0.0"
+
+rc@^1.1.7:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+react-addons-css-transition-group@15.3.2:
+  version "15.3.2"
+  resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.3.2.tgz#d8fa52bec9bb61bdfde8b9e4652b80297cbff667"
+
+react-addons-test-utils@^15.4.0:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"
+
+react-beautiful-dnd@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz#3b0a49bf6be75af351176c904f012611dd292b81"
+  dependencies:
+    babel-runtime "^6.26.0"
+    invariant "^2.2.2"
+    memoize-one "^3.0.1"
+    prop-types "^15.6.0"
+    raf-schd "^2.1.0"
+    react-motion "^0.5.2"
+    react-redux "^5.0.6"
+    redux "^3.7.2"
+    redux-thunk "^2.2.0"
+    reselect "^3.0.1"
+
+react-dom@^15.4.0, react-dom@^15.6.1:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
+
+react-dom@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
+react-gemini-scrollbar@matrix-org/react-gemini-scrollbar#5e97aef:
+  version "2.1.5"
+  resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/5e97aef7e034efc8db1431f4b0efe3b26e249ae9"
+  dependencies:
+    gemini-scrollbar matrix-org/gemini-scrollbar#b302279
+
+react-motion@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316"
+  dependencies:
+    performance-now "^0.2.0"
+    prop-types "^15.5.8"
+    raf "^3.1.0"
+
+react-redux@^5.0.6:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
+  dependencies:
+    hoist-non-react-statics "^2.5.0"
+    invariant "^2.0.0"
+    lodash "^4.17.5"
+    lodash-es "^4.17.5"
+    loose-envify "^1.1.0"
+    prop-types "^15.6.0"
+
+react@^15.4.0, react@^15.6.1:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
+  dependencies:
+    create-react-class "^15.6.0"
+    fbjs "^0.8.9"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
+
+react@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    prop-types "^15.6.0"
+
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.3:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
+readdirp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  dependencies:
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    readable-stream "^2.0.2"
+    set-immediate-shim "^1.0.1"
+
+readline2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    mute-stream "0.0.5"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+redux-thunk@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
+
+redux@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
+  dependencies:
+    lodash "^4.2.1"
+    lodash-es "^4.2.1"
+    loose-envify "^1.1.0"
+    symbol-observable "^1.0.3"
+
+regenerate@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
+
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  dependencies:
+    jsesc "~0.5.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+request@2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+request@^2.53.0:
+  version "2.83.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
+require-json@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/require-json/-/require-json-0.0.1.tgz#3c8914f93d7442de8cbf4e681ac62a72aa3367fe"
+
+require-uncached@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
+requires-port@1.x.x:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+
+reselect@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+
+resolve@^1.1.6:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
+ripemd160@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce"
+
+run-async@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  dependencies:
+    once "^1.3.0"
+
+rx-lite@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+
+samsam@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
+
+samsam@~1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
+
+sanitize-html@^1.14.1:
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.18.2.tgz#61877ba5a910327e42880a28803c2fbafa8e4642"
+  dependencies:
+    chalk "^2.3.0"
+    htmlparser2 "^3.9.0"
+    lodash.clonedeep "^4.5.0"
+    lodash.escaperegexp "^4.1.2"
+    lodash.isplainobject "^4.0.6"
+    lodash.isstring "^4.0.1"
+    lodash.mergewith "^4.6.0"
+    postcss "^6.0.14"
+    srcset "^1.0.0"
+    xtend "^4.0.0"
+
+semver@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+
+semver@~4.3.3:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
+
+set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-immediate-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+
+setimmediate@^1.0.4, setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
+setprototypeof@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+
+sha.js@2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"
+
+shelljs@^0.7.5:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+sigmund@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+sinon@^1.17.3:
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
+  dependencies:
+    formatio "1.1.1"
+    lolex "1.3.2"
+    samsam "1.1.2"
+    util ">=0.10.3 <1"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+sntp@2.x.x:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
+  dependencies:
+    hoek "4.x.x"
+
+socket.io-adapter@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
+  dependencies:
+    debug "2.3.3"
+    socket.io-parser "2.3.1"
+
+socket.io-client@1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377"
+  dependencies:
+    backo2 "1.0.2"
+    component-bind "1.0.0"
+    component-emitter "1.2.1"
+    debug "2.3.3"
+    engine.io-client "1.8.3"
+    has-binary "0.1.7"
+    indexof "0.0.1"
+    object-component "0.0.3"
+    parseuri "0.0.5"
+    socket.io-parser "2.3.1"
+    to-array "0.1.4"
+
+socket.io-parser@2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
+  dependencies:
+    component-emitter "1.1.2"
+    debug "2.2.0"
+    isarray "0.0.1"
+    json3 "3.3.2"
+
+socket.io@1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b"
+  dependencies:
+    debug "2.3.3"
+    engine.io "1.8.3"
+    has-binary "0.1.7"
+    object-assign "4.1.0"
+    socket.io-adapter "0.5.0"
+    socket.io-client "1.7.3"
+    socket.io-parser "2.3.1"
+
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+
+source-map-loader@^0.1.5:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.1.6.tgz#c09903da6d73b9e53b7ed8ee5245597051e98e91"
+  dependencies:
+    async "^0.9.0"
+    loader-utils "~0.2.2"
+    source-map "~0.1.33"
+
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@^0.1.41, source-map@~0.1.33:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
+source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+
+source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+sprintf-js@^1.0.3:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+srcset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz#a5669de12b42f3b1d5e83ed03c71046fc48f41ef"
+  dependencies:
+    array-uniq "^1.0.2"
+    number-is-nan "^1.0.0"
+
+sshpk@^1.7.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+"statuses@>= 1.3.1 < 2":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
+
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-http@^2.3.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.3.3"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+string-width@^1.0.1, string-width@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string-width@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+  dependencies:
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^4.0.0"
+
+string.prototype.repeat@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
+
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+string_decoder@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+stringstream@~0.0.4, stringstream@~0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+supports-color@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.1.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+supports-color@^5.2.0, supports-color@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  dependencies:
+    has-flag "^3.0.0"
+
+symbol-observable@^1.0.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+
+table@^3.7.8:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
+tapable@^0.1.8, tapable@~0.1.8:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
+
+tar-pack@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+text-encoding-utf-8@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
+
+text-table@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
+time-stamp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
+
+timers-browserify@^2.0.2:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
+  dependencies:
+    setimmediate "^1.0.4"
+
+tmatch@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
+
+tmp@0.0.31:
+  version "0.0.31"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
+  dependencies:
+    os-tmpdir "~1.0.1"
+
+tmp@0.0.x:
+  version "0.0.33"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  dependencies:
+    os-tmpdir "~1.0.2"
+
+to-array@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+
+to-iso-string@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
+
+tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+  dependencies:
+    punycode "^1.4.1"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+type-check@~0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  dependencies:
+    prelude-ls "~1.1.2"
+
+type-is@~1.6.15:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+
+ua-parser-js@^0.7.9:
+  version "0.7.17"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
+
+uglify-js@~2.7.3:
+  version "2.7.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
+  dependencies:
+    async "~0.2.6"
+    source-map "~0.5.1"
+    uglify-to-browserify "~1.0.0"
+    yargs "~3.10.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+ultron@1.0.x:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+user-home@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
+
+user-home@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  dependencies:
+    os-homedir "^1.0.0"
+
+useragent@^2.1.12:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  dependencies:
+    lru-cache "4.1.x"
+    tmp "0.0.x"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+
+uuid@^3.0.0, uuid@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+
+v8flags@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
+  dependencies:
+    user-home "^1.1.1"
+
+velocity-vector@vector-im/velocity#059e3b2:
+  version "1.2.3"
+  resolved "https://codeload.github.com/vector-im/velocity/tar.gz/059e3b2348f1110888d033974d3109fd5a3af00f"
+  dependencies:
+    jquery ">= 1.4.3"
+
+verror@1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+  dependencies:
+    assert-plus "^1.0.0"
+    core-util-is "1.0.2"
+    extsprintf "^1.2.0"
+
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  dependencies:
+    indexof "0.0.1"
+
+void-elements@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+
+walk@^2.3.9:
+  version "2.3.9"
+  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.9.tgz#31b4db6678f2ae01c39ea9fb8725a9031e558a7b"
+  dependencies:
+    foreachasync "^3.0.0"
+
+watchpack@^0.2.1:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-0.2.9.tgz#62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"
+  dependencies:
+    async "^0.9.0"
+    chokidar "^1.0.0"
+    graceful-fs "^4.1.2"
+
+webpack-core@~0.6.9:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.4.1"
+
+webpack-dev-middleware@^1.0.11:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.5.0"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+    time-stamp "^2.0.0"
+
+webpack@^1.12.14:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-1.15.0.tgz#4ff31f53db03339e55164a9d468ee0324968fe98"
+  dependencies:
+    acorn "^3.0.0"
+    async "^1.3.0"
+    clone "^1.0.2"
+    enhanced-resolve "~0.9.0"
+    interpret "^0.6.4"
+    loader-utils "^0.2.11"
+    memory-fs "~0.3.0"
+    mkdirp "~0.5.0"
+    node-libs-browser "^0.7.0"
+    optimist "~0.6.0"
+    supports-color "^3.1.0"
+    tapable "~0.1.8"
+    uglify-js "~2.7.3"
+    watchpack "^0.2.1"
+    webpack-core "~0.6.9"
+
+whatwg-fetch@>=0.10.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+
+whatwg-fetch@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0"
+
+whatwg-fetch@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
+
+which@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
+  dependencies:
+    string-width "^1.0.2"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
+  dependencies:
+    options ">=0.0.5"
+    ultron "1.0.x"
+
+wtf-8@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
+
+xmlbuilder@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-3.1.0.tgz#2c86888f2d4eade850fa38ca7f7223f7209516e1"
+  dependencies:
+    lodash "^3.5.0"
+
+xmlhttprequest-ssl@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
+
+xtend@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+yallist@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"
+
+yeast@0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"

From d5465cf2fa05d51da6f4fa941bf70f16851b9164 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 6 Mar 2018 10:55:59 +0000
Subject: [PATCH 652/927] Prefix and clarify global variable naming.

---
 src/IntegrationManager.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index d85b89f744..fdc45660a0 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -20,22 +20,22 @@ import ScalarMessaging from './ScalarMessaging';
 import ScalarAuthClient from './ScalarAuthClient';
 import RoomViewStore from './stores/RoomViewStore';
 
-if (!global.im) {
-  global.im = {};
+if (!global.mxIntegrationManager) {
+  global.mxIntegrationManager = {};
 }
 
 export default class IntegrationManager {
   static async _init() {
-    if (!global.im.client || !global.im.connected) {
+    if (!global.mxIntegrationManager.client || !global.mxIntegrationManager.connected) {
       if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
         ScalarMessaging.startListening();
-        global.im.client = new ScalarAuthClient();
+        global.mxIntegrationManager.client = new ScalarAuthClient();
 
-        await global.im.client.connect().then(() => {
-          global.im.connected = true;
+        await global.mxIntegrationManager.client.connect().then(() => {
+          global.mxIntegrationManager.connected = true;
         }).catch((e) => {
           console.error("Failed to connect to integrations server", e);
-          global.im.error = e;
+          global.mxIntegrationManager.error = e;
         });
       } else {
         console.error('Invalid integration manager config', SdkConfig.get());
@@ -52,13 +52,13 @@ export default class IntegrationManager {
   static async open(integType, integId, onClose) {
     await IntegrationManager._init();
     const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-    if (global.im.error || !(global.im.client && global.im.client.hasCredentials())) {
-      console.error("Scalar error", global.im);
+    if (global.mxIntegrationManager.error || !(global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials())) {
+      console.error("Scalar error", global.mxIntegrationManager);
       return;
     }
     integType = 'type_' + integType;
-    const src = (global.im.client && global.im.client.hasCredentials()) ?
-      global.im.client.getScalarInterfaceUrlForRoom(
+    const src = (global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials()) ?
+      global.mxIntegrationManager.client.getScalarInterfaceUrlForRoom(
         RoomViewStore.getRoomId(),
         integType,
         integId,

From b529edb5cc732b6c7eea7372f4199b7038aab471 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 6 Mar 2018 11:02:36 +0000
Subject: [PATCH 653/927] Linting

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

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index fdc45660a0..e9486138c7 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -52,7 +52,8 @@ export default class IntegrationManager {
   static async open(integType, integId, onClose) {
     await IntegrationManager._init();
     const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
-    if (global.mxIntegrationManager.error || !(global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials())) {
+    if (global.mxIntegrationManager.error ||
+        !(global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials())) {
       console.error("Scalar error", global.mxIntegrationManager);
       return;
     }

From afbd563810180e65bb6815e66748a0517d1d0a4d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 6 Mar 2018 11:33:56 +0000
Subject: [PATCH 654/927] Potentially fix a memory leak in FlairStore

For each successful request of a group profile, we previously
emitted an `updateGroupProfile` event per caller of
`getGroupProfileCached`. This is sub-optimal because only a single
event emit is required to update the views listening.

It's possible that this was enabling some race to cause a memory
leak but this is not certain, hence the extra logging for future
debugging.
---
 src/stores/FlairStore.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 4ef29ae4e1..f8f76dd9af 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -154,16 +154,26 @@ class FlairStore extends EventEmitter {
             return this._groupProfiles[groupId];
         }
 
-        // No request yet, start one
-        if (!this._groupProfilesPromise[groupId]) {
-            this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId);
+        // A request is ongoing, wait for it to complete and return the group profile.
+        if (this._groupProfilesPromise[groupId]) {
+            try {
+                await this._groupProfilesPromise[groupId];
+            } catch (e) {
+                // Don't log the error; this is done below
+                return undefined;
+            }
+            return this._groupProfiles[groupId];
         }
 
+        // No request yet, start one
+        console.log('FlairStore: Request group profile of ' + groupId);
+        this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId).delay(5000);
+
         let profile;
         try {
             profile = await this._groupProfilesPromise[groupId];
         } catch (e) {
-            console.log('Failed to get group profile for ' + groupId, e);
+            console.log('FlairStore: Failed to get group profile for ' + groupId, e);
             // Don't retry, but allow a retry when the profile is next requested
             delete this._groupProfilesPromise[groupId];
             return;
@@ -179,6 +189,7 @@ class FlairStore extends EventEmitter {
 
         /// XXX: This is verging on recreating a third "Flux"-looking Store. We really
         /// should replace FlairStore with a Flux store and some async actions.
+        console.log('FlairStore: Emit updateGroupProfile for ' + groupId);
         this.emit('updateGroupProfile');
 
         setTimeout(() => {

From 0fc79a4a0dc8746e763822b31bb4aa9dd617ccd1 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 6 Mar 2018 12:13:46 +0000
Subject: [PATCH 655/927] Remove delay used in testing

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

diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index f8f76dd9af..36b284664a 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -167,7 +167,7 @@ class FlairStore extends EventEmitter {
 
         // No request yet, start one
         console.log('FlairStore: Request group profile of ' + groupId);
-        this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId).delay(5000);
+        this._groupProfilesPromise[groupId] = matrixClient.getGroupProfile(groupId);
 
         let profile;
         try {

From faf517419ff13691928653e9d8a23dc07d1fbdbe Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 6 Mar 2018 12:14:41 +0000
Subject: [PATCH 656/927] Return null instead of undefined on failure

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

diff --git a/src/stores/FlairStore.js b/src/stores/FlairStore.js
index 36b284664a..c8b4d75010 100644
--- a/src/stores/FlairStore.js
+++ b/src/stores/FlairStore.js
@@ -160,7 +160,7 @@ class FlairStore extends EventEmitter {
                 await this._groupProfilesPromise[groupId];
             } catch (e) {
                 // Don't log the error; this is done below
-                return undefined;
+                return null;
             }
             return this._groupProfiles[groupId];
         }
@@ -176,7 +176,7 @@ class FlairStore extends EventEmitter {
             console.log('FlairStore: Failed to get group profile for ' + groupId, e);
             // Don't retry, but allow a retry when the profile is next requested
             delete this._groupProfilesPromise[groupId];
-            return;
+            return null;
         }
 
         this._groupProfiles[groupId] = {

From a97e7375d5d4f30cae4844a26f746762d5d4d813 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 6 Mar 2018 17:48:21 +0000
Subject: [PATCH 657/927] Don't reset the presence timer on every dispatch

Only on user activity (there's now a dispatch every time we set a
member event, ie. A LOT, hence this now being a problem)
---
 src/Presence.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Presence.js b/src/Presence.js
index 2652c64c96..fd9bcf516d 100644
--- a/src/Presence.js
+++ b/src/Presence.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,7 +32,7 @@ class Presence {
         this.running = true;
         if (undefined === this.state) {
             this._resetTimer();
-            this.dispatcherRef = dis.register(this._onUserActivity.bind(this));
+            this.dispatcherRef = dis.register(this._onAction.bind(this));
         }
     }
 
@@ -125,9 +126,10 @@ class Presence {
         this.setState("unavailable");
     }
 
-    _onUserActivity(payload) {
-        if (payload.action === "sync_state" || payload.action === "self_presence_updated") return;
-        this._resetTimer();
+    _onAction(payload) {
+        if (payload.action === "user_activity") {
+            this._resetTimer();
+        }
     }
 
     /**

From 7f91b475981df108843e42074446f8728371c456 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Wed, 7 Mar 2018 11:52:42 +0000
Subject: [PATCH 658/927] Move sticker picker icon.

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

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 70971e2299..0f98e6b526 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -340,11 +340,11 @@ export default class MessageComposer extends React.Component {
                     onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
                 formattingButton,
+                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
                 uploadButton,
                 hangupButton,
                 callButton,
                 videoCallButton,
-                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
             );
         } else {
             controls.push(

From b2bb15beb3931e26ba8b1c49babe2c9f90ed0a7a Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Wed, 7 Mar 2018 11:59:44 +0000
Subject: [PATCH 659/927] Remove accidentally checked in yarn.lock

---
 yarn.lock | 4392 -----------------------------------------------------
 1 file changed, 4392 deletions(-)
 delete mode 100644 yarn.lock

diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index 27533e876b..0000000000
--- a/yarn.lock
+++ /dev/null
@@ -1,4392 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-abbrev@1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-
-accepts@1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"
-  dependencies:
-    mime-types "~2.1.11"
-    negotiator "0.6.1"
-
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  dependencies:
-    acorn "^3.0.4"
-
-acorn@^3.0.0, acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-
-acorn@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.0.tgz#1abb587fbf051f94e3de20e6b26ef910b1828298"
-
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-
-ajv-keywords@^1.0.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-
-ajv@^4.7.0, ajv@^4.9.1:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^5.1.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-align-text@^0.1.1, align-text@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
-  dependencies:
-    kind-of "^3.0.2"
-    longest "^1.0.1"
-    repeat-string "^1.5.2"
-
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-
-another-json@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc"
-
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  dependencies:
-    color-convert "^1.9.0"
-
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-
-are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
-argparse@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  dependencies:
-    sprintf-js "~1.0.2"
-
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  dependencies:
-    arr-flatten "^1.0.1"
-
-arr-flatten@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
-
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  dependencies:
-    array-uniq "^1.0.1"
-
-array-uniq@^1.0.1, array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-
-arraybuffer.slice@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
-
-arrify@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-
-asap@~2.0.3:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-
-asn1@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
-
-assert-plus@1.0.0, assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
-assert-plus@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
-
-assert@^1.1.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
-  dependencies:
-    util "0.10.3"
-
-async-each@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
-
-async@^0.9.0, async@~0.9.0:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-
-async@^1.3.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-async@~0.2.6:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-
-asynckit@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-
-aws-sign2@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
-
-aws-sign2@~0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-
-aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
-
-babel-cli@^6.5.2:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1"
-  dependencies:
-    babel-core "^6.26.0"
-    babel-polyfill "^6.26.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    commander "^2.11.0"
-    convert-source-map "^1.5.0"
-    fs-readdir-recursive "^1.0.0"
-    glob "^7.1.2"
-    lodash "^4.17.4"
-    output-file-sync "^1.1.2"
-    path-is-absolute "^1.0.1"
-    slash "^1.0.0"
-    source-map "^0.5.6"
-    v8flags "^2.1.1"
-  optionalDependencies:
-    chokidar "^1.6.1"
-
-babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
-babel-core@^6.14.0, babel-core@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-generator "^6.26.0"
-    babel-helpers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-register "^6.26.0"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    convert-source-map "^1.5.0"
-    debug "^2.6.8"
-    json5 "^0.5.1"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-    path-is-absolute "^1.0.1"
-    private "^0.1.7"
-    slash "^1.0.0"
-    source-map "^0.5.6"
-
-babel-eslint@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-6.1.2.tgz#5293419fe3672d66598d327da9694567ba6a5f2f"
-  dependencies:
-    babel-traverse "^6.0.20"
-    babel-types "^6.0.19"
-    babylon "^6.0.18"
-    lodash.assign "^4.0.0"
-    lodash.pickby "^4.0.0"
-
-babel-generator@^6.26.0:
-  version "6.26.1"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
-  dependencies:
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.17.4"
-    source-map "^0.5.7"
-    trim-right "^1.0.1"
-
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-builder-react-jsx@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    esutils "^2.0.2"
-
-babel-helper-call-delegate@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-define-map@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-helper-explode-assignable-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-function-name@^6.24.1, babel-helper-function-name@^6.8.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
-  dependencies:
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-get-function-arity@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-hoist-variables@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-optimise-call-expression@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-helper-regex@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-helper-remap-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helper-replace-supers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
-  dependencies:
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-helpers@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-loader@^6.2.5:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
-  dependencies:
-    find-cache-dir "^0.1.1"
-    loader-utils "^0.2.16"
-    mkdirp "^0.5.1"
-    object-assign "^4.0.1"
-
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-add-module-exports@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25"
-
-babel-plugin-check-es2015-constants@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-syntax-async-functions@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
-
-babel-plugin-syntax-class-properties@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
-
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
-
-babel-plugin-syntax-flow@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
-
-babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
-
-babel-plugin-syntax-object-rest-spread@^6.8.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
-
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-
-babel-plugin-transform-async-to-bluebird@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-bluebird/-/babel-plugin-transform-async-to-bluebird-1.1.1.tgz#46ea3e7c5af629782ac9f1ed1b7cd38f8425afd4"
-  dependencies:
-    babel-helper-function-name "^6.8.0"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-template "^6.9.0"
-    babel-traverse "^6.10.4"
-
-babel-plugin-transform-async-to-generator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.24.1"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-class-properties@^6.16.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-block-scoping@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    lodash "^4.17.4"
-
-babel-plugin-transform-es2015-classes@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
-  dependencies:
-    babel-helper-define-map "^6.24.1"
-    babel-helper-function-name "^6.24.1"
-    babel-helper-optimise-call-expression "^6.24.1"
-    babel-helper-replace-supers "^6.24.1"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-computed-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-destructuring@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-for-of@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-function-name@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
-  dependencies:
-    babel-helper-function-name "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-modules-amd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-types "^6.26.0"
-
-babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
-  dependencies:
-    babel-helper-hoist-variables "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-modules-umd@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-
-babel-plugin-transform-es2015-object-super@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
-  dependencies:
-    babel-helper-replace-supers "^6.24.1"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-parameters@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
-  dependencies:
-    babel-helper-call-delegate "^6.24.1"
-    babel-helper-get-function-arity "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-template "^6.24.1"
-    babel-traverse "^6.24.1"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-sticky-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-plugin-transform-es2015-template-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-es2015-unicode-regex@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
-  dependencies:
-    babel-helper-regex "^6.24.1"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
-
-babel-plugin-transform-exponentiation-operator@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-flow-strip-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
-  dependencies:
-    babel-plugin-syntax-flow "^6.18.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-object-rest-spread@^6.16.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.26.0"
-
-babel-plugin-transform-react-display-name@^6.23.0:
-  version "6.25.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-self@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx-source@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-react-jsx@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
-  dependencies:
-    babel-helper-builder-react-jsx "^6.24.1"
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-regenerator@^6.24.1:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
-  dependencies:
-    regenerator-transform "^0.10.0"
-
-babel-plugin-transform-runtime@^6.15.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
-  dependencies:
-    babel-runtime "^6.22.0"
-
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
-babel-polyfill@^6.26.0, babel-polyfill@^6.5.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
-  dependencies:
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    regenerator-runtime "^0.10.5"
-
-babel-preset-es2015@^6.14.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.24.1"
-    babel-plugin-transform-es2015-classes "^6.24.1"
-    babel-plugin-transform-es2015-computed-properties "^6.24.1"
-    babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
-    babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.24.1"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.24.1"
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
-    babel-plugin-transform-es2015-modules-umd "^6.24.1"
-    babel-plugin-transform-es2015-object-super "^6.24.1"
-    babel-plugin-transform-es2015-parameters "^6.24.1"
-    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
-    babel-plugin-transform-regenerator "^6.24.1"
-
-babel-preset-es2016@^6.11.3:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.24.1.tgz#f900bf93e2ebc0d276df9b8ab59724ebfd959f8b"
-  dependencies:
-    babel-plugin-transform-exponentiation-operator "^6.24.1"
-
-babel-preset-es2017@^6.14.0:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.24.1.tgz#597beadfb9f7f208bcfd8a12e9b2b29b8b2f14d1"
-  dependencies:
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.24.1"
-
-babel-preset-flow@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
-  dependencies:
-    babel-plugin-transform-flow-strip-types "^6.22.0"
-
-babel-preset-react@^6.11.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-react-display-name "^6.23.0"
-    babel-plugin-transform-react-jsx "^6.24.1"
-    babel-plugin-transform-react-jsx-self "^6.22.0"
-    babel-plugin-transform-react-jsx-source "^6.22.0"
-    babel-preset-flow "^6.23.0"
-
-babel-register@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
-  dependencies:
-    babel-core "^6.26.0"
-    babel-runtime "^6.26.0"
-    core-js "^2.5.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.17.4"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.15"
-
-babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.9.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.0.20, babel-traverse@^6.10.4, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.0.19, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
-babylon@^6.0.18, babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-
-balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-
-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-
-base64-js@^1.0.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
-
-base64id@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-
-bcrypt-pbkdf@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
-  dependencies:
-    tweetnacl "^0.14.3"
-
-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  dependencies:
-    callsite "1.0.0"
-
-big.js@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-
-binary-extensions@^1.0.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
-
-blob@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
-
-block-stream@*:
-  version "0.0.9"
-  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
-  dependencies:
-    inherits "~2.0.0"
-
-bluebird@^3.3.0, bluebird@^3.5.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-
-blueimp-canvas-to-blob@^3.5.0:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.14.0.tgz#ea075ffbfb1436607b0c75e951fb1ceb3ca0288e"
-
-body-parser@^1.16.1:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
-  dependencies:
-    bytes "3.0.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    http-errors "~1.6.2"
-    iconv-lite "0.4.19"
-    on-finished "~2.3.0"
-    qs "6.5.1"
-    raw-body "2.3.2"
-    type-is "~1.6.15"
-
-boom@2.x.x:
-  version "2.10.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
-  dependencies:
-    hoek "2.x.x"
-
-boom@4.x.x:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31"
-  dependencies:
-    hoek "4.x.x"
-
-boom@5.x.x:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02"
-  dependencies:
-    hoek "4.x.x"
-
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  dependencies:
-    expand-range "^0.1.0"
-
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-browser-encrypt-attachment@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz#205a94caadf0dc7e81413941812f655bd190ff1c"
-
-browser-request@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
-
-browserify-aes@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c"
-  dependencies:
-    inherits "^2.0.1"
-
-browserify-zlib@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
-  dependencies:
-    pako "~0.2.0"
-
-buffer@^4.9.0:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-    isarray "^1.0.0"
-
-builtin-status-codes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
-
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  dependencies:
-    callsites "^0.2.0"
-
-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-
-camelcase@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
-caseless@~0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-center-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
-  dependencies:
-    align-text "^0.1.3"
-    lazy-cache "^1.0.3"
-
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-"chalk@^1.1.3 || 2.x", chalk@^2.3.0, chalk@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.6.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-
-classnames@^2.1.2:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
-
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-
-cliui@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
-  dependencies:
-    center-align "^0.1.1"
-    right-align "^0.1.1"
-    wordwrap "0.0.2"
-
-clone@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f"
-
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-
-color-convert@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
-  dependencies:
-    color-name "^1.1.1"
-
-color-name@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-
-colors@^1.1.0, colors@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  dependencies:
-    lodash "^4.5.0"
-
-combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  dependencies:
-    delayed-stream "~1.0.0"
-
-commander@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-
-commander@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-
-commander@^2.11.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa"
-
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-
-commonmark@^0.28.1:
-  version "0.28.1"
-  resolved "https://registry.yarnpkg.com/commonmark/-/commonmark-0.28.1.tgz#06eab8d52338b839fa1a2d75af0085eed1b1beae"
-  dependencies:
-    entities "~ 1.1.1"
-    mdurl "~ 1.0.1"
-    minimist "~ 1.2.0"
-    string.prototype.repeat "^0.2.0"
-
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-
-component-emitter@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-concat-stream@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-connect@^3.6.0:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  dependencies:
-    debug "2.6.9"
-    finalhandler "1.1.0"
-    parseurl "~1.3.2"
-    utils-merge "1.0.1"
-
-console-browserify@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
-  dependencies:
-    date-now "^0.1.4"
-
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
-constants-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
-
-content-type@^1.0.2, content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-
-convert-source-map@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
-
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
-
-core-util-is@1.0.2, core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-counterpart@^0.18.0:
-  version "0.18.6"
-  resolved "https://registry.yarnpkg.com/counterpart/-/counterpart-0.18.6.tgz#cf6b60d8ef99a4b44b8bf6445fa99b4bd1b2f9dd"
-  dependencies:
-    date-names "^0.1.11"
-    except "^0.1.3"
-    extend "^3.0.0"
-    pluralizers "^0.1.7"
-    sprintf-js "^1.0.3"
-
-create-react-class@^15.6.0:
-  version "15.6.3"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
-  dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-cryptiles@2.x.x:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
-  dependencies:
-    boom "2.x.x"
-
-cryptiles@3.x.x:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe"
-  dependencies:
-    boom "5.x.x"
-
-crypto-browserify@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"
-  dependencies:
-    browserify-aes "0.4.0"
-    pbkdf2-compat "2.0.1"
-    ripemd160 "0.2.0"
-    sha.js "2.2.6"
-
-custom-event@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  dependencies:
-    es5-ext "^0.10.9"
-
-dashdash@^1.12.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  dependencies:
-    assert-plus "^1.0.0"
-
-date-names@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/date-names/-/date-names-0.1.12.tgz#e60fe316de1547c9d9e7f14bd350130e4b7f9ef8"
-
-date-now@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
-
-debug@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
-debug@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
-  dependencies:
-    ms "0.7.2"
-
-debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.6.8:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-decamelize@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-deep-extend@~0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
-
-deep-is@~0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-
-define-properties@^1.1.2, define-properties@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
-  dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
-
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
-delayed-stream@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
-depd@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
-
-depd@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-
-detect-indent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
-  dependencies:
-    repeating "^2.0.0"
-
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-
-di@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-
-doctrine@^2.0.0, doctrine@^2.0.2:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  dependencies:
-    esutils "^2.0.2"
-
-dom-serialize@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  dependencies:
-    custom-event "~1.0.0"
-    ent "~2.2.0"
-    extend "^3.0.0"
-    void-elements "^2.0.0"
-
-dom-serializer@0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
-
-domain-browser@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-
-domelementtype@1, domelementtype@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz#892e47000a99be55bbf3774ffea0561d8879c259"
-  dependencies:
-    domelementtype "1"
-
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
-draft-js-export-html@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz#cc80f0544c43d0a7fedbc53c0cb0914e8090f769"
-  dependencies:
-    draft-js-utils ">=0.2.0"
-
-draft-js-export-markdown@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz#86390e03ceaf1d347fc616867ab7f535eb76bf42"
-  dependencies:
-    draft-js-utils ">=0.2.0"
-
-draft-js-utils@>=0.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/draft-js-utils/-/draft-js-utils-1.2.0.tgz#f5cb23eb167325ffed3d79882fdc317721d2fd12"
-
-draft-js@^0.11.0-alpha:
-  version "0.11.0-alpha"
-  resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.11.0-alpha.tgz#32db2108f927e9b8446da1f79e4475c2b7f868ae"
-  dependencies:
-    fbjs "^0.8.12"
-    immutable "~3.7.4"
-    object-assign "^4.1.0"
-
-ecc-jsbn@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
-  dependencies:
-    jsbn "~0.1.0"
-
-ee-first@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-
-emojione@2.2.7:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.7.tgz#46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"
-
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-
-encodeurl@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  dependencies:
-    iconv-lite "~0.4.13"
-
-engine.io-client@1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.3.tgz#1798ed93451246453d4c6f635d7a201fe940d5ab"
-  dependencies:
-    component-emitter "1.2.1"
-    component-inherit "0.0.3"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parsejson "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "1.1.2"
-    xmlhttprequest-ssl "1.5.3"
-    yeast "0.1.2"
-
-engine.io-parser@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-1.3.2.tgz#937b079f0007d0893ec56d46cb220b8cb435220a"
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "0.0.6"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.4"
-    has-binary "0.1.7"
-    wtf-8 "1.0.0"
-
-engine.io@1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-1.8.3.tgz#8de7f97895d20d39b85f88eeee777b2bd42b13d4"
-  dependencies:
-    accepts "1.3.3"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "2.3.3"
-    engine.io-parser "1.3.2"
-    ws "1.1.2"
-
-enhanced-resolve@~0.9.0:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e"
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.2.0"
-    tapable "^0.1.8"
-
-ent@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-
-entities@^1.1.1, "entities@~ 1.1.1", entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-
-errno@^0.1.3:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
-  dependencies:
-    prr "~1.0.1"
-
-es-abstract@^1.6.1, es-abstract@^1.7.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
-  dependencies:
-    is-callable "^1.1.1"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
-
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.39"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87"
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.1"
-
-es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-map@^0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-set "~0.1.5"
-    es6-symbol "~3.1.1"
-    event-emitter "~0.3.5"
-
-es6-set@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-    es6-iterator "~2.0.1"
-    es6-symbol "3.1.1"
-    event-emitter "~0.3.5"
-
-es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-es6-weak-map@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
-  dependencies:
-    d "1"
-    es5-ext "^0.10.14"
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
-
-escape-html@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-
-escape-string-regexp@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-escope@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
-  dependencies:
-    es6-map "^0.1.3"
-    es6-weak-map "^2.0.1"
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
-eslint-config-google@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.7.1.tgz#5598f8498e9e078420f34b80495b8d959f651fb2"
-
-eslint-plugin-babel@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.1.2.tgz#79202a0e35757dd92780919b2336f1fa2fe53c1e"
-
-eslint-plugin-flowtype@^2.30.0:
-  version "2.46.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.46.1.tgz#c4f81d580cd89c82bc3a85a1ccf4ae3a915143a4"
-  dependencies:
-    lodash "^4.15.0"
-
-eslint-plugin-react@^7.4.0:
-  version "7.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.7.0.tgz#f606c719dbd8a1a2b3d25c16299813878cca0160"
-  dependencies:
-    doctrine "^2.0.2"
-    has "^1.0.1"
-    jsx-ast-utils "^2.0.1"
-    prop-types "^15.6.0"
-
-eslint@^3.13.1:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
-  dependencies:
-    babel-code-frame "^6.16.0"
-    chalk "^1.1.3"
-    concat-stream "^1.5.2"
-    debug "^2.1.1"
-    doctrine "^2.0.0"
-    escope "^3.6.0"
-    espree "^3.4.0"
-    esquery "^1.0.0"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    glob "^7.0.3"
-    globals "^9.14.0"
-    ignore "^3.2.0"
-    imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
-    levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.7.5"
-    strip-bom "^3.0.0"
-    strip-json-comments "~2.0.1"
-    table "^3.7.8"
-    text-table "~0.2.0"
-    user-home "^2.0.0"
-
-espree@^3.4.0:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-
-esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
-
-esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
-  dependencies:
-    estraverse "^4.0.0"
-
-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  dependencies:
-    estraverse "^4.1.0"
-
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-
-estree-walker@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854"
-
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-
-event-emitter@~0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  dependencies:
-    d "1"
-    es5-ext "~0.10.14"
-
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
-
-events@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-
-except@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/except/-/except-0.1.3.tgz#98261c91958551536b44482238e9783fb73d292a"
-  dependencies:
-    indexof "0.0.1"
-
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  dependencies:
-    fill-range "^2.1.0"
-
-expect@^1.16.0:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-1.20.2.tgz#d458fe4c56004036bae3232416a3f6361f04f965"
-  dependencies:
-    define-properties "~1.1.2"
-    has "^1.0.1"
-    is-equal "^1.5.1"
-    is-regex "^1.0.3"
-    object-inspect "^1.1.0"
-    object-keys "^1.0.9"
-    tmatch "^2.0.1"
-
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  dependencies:
-    is-extglob "^1.0.0"
-
-extsprintf@1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-
-extsprintf@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-
-fast-json-stable-stringify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-
-fast-levenshtein@~2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-
-fbemitter@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/fbemitter/-/fbemitter-2.1.1.tgz#523e14fdaf5248805bb02f62efc33be703f51865"
-  dependencies:
-    fbjs "^0.8.4"
-
-fbjs@0.1.0-alpha.7:
-  version "0.1.0-alpha.7"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.1.0-alpha.7.tgz#ad4308b8f232fb3c73603349ea725d1e9c39323c"
-  dependencies:
-    core-js "^1.0.0"
-    promise "^7.0.3"
-    whatwg-fetch "^0.9.0"
-
-fbjs@^0.8.12, fbjs@^0.8.16, fbjs@^0.8.4, fbjs@^0.8.9:
-  version "0.8.16"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
-
-figures@^1.3.5:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
-file-saver@^1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.3.tgz#cdd4c44d3aa264eac2f68ec165bc791c34af1232"
-
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-
-filesize@3.5.6:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
-
-fill-range@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^1.1.3"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.3.1"
-    unpipe "~1.0.0"
-
-find-cache-dir@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
-  dependencies:
-    commondir "^1.0.1"
-    mkdirp "^0.5.1"
-    pkg-dir "^1.0.0"
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-flat-cache@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
-  dependencies:
-    circular-json "^0.3.1"
-    del "^2.0.2"
-    graceful-fs "^4.1.2"
-    write "^0.2.1"
-
-flow-parser@^0.57.3:
-  version "0.57.3"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.57.3.tgz#b8d241a1b1cbae043afa7976e39f269988d8fe34"
-
-flux@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/flux/-/flux-2.1.1.tgz#2c6ac652d4337488968489c6586f3aff26a38ea4"
-  dependencies:
-    fbemitter "^2.0.0"
-    fbjs "0.1.0-alpha.7"
-    immutable "^3.7.4"
-
-for-in@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  dependencies:
-    for-in "^1.0.1"
-
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
-foreachasync@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6"
-
-forever-agent@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-form-data@~2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.5"
-    mime-types "^2.1.12"
-
-form-data@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "1.0.6"
-    mime-types "^2.1.12"
-
-formatio@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
-  dependencies:
-    samsam "~1.1"
-
-fs-access@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
-  dependencies:
-    null-check "^1.0.0"
-
-fs-readdir-recursive@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.39"
-
-fstream-ignore@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
-  dependencies:
-    fstream "^1.0.0"
-    inherits "2"
-    minimatch "^3.0.0"
-
-fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
-  dependencies:
-    graceful-fs "^4.1.2"
-    inherits "~2.0.0"
-    mkdirp ">=0.5 0"
-    rimraf "2"
-
-function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-
-fuse.js@^2.2.0:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-2.7.4.tgz#96e420fde7ef011ac49c258a621314fe576536f9"
-
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
-gemini-scrollbar@matrix-org/gemini-scrollbar#b302279:
-  version "1.4.3"
-  resolved "https://codeload.github.com/matrix-org/gemini-scrollbar/tar.gz/b302279810d05319ac5ff1bd34910bff32325c7b"
-
-generate-function@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  dependencies:
-    is-property "^1.0.0"
-
-getpass@^0.1.1:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  dependencies:
-    assert-plus "^1.0.0"
-
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  dependencies:
-    is-glob "^2.0.0"
-
-glob@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
-glob@^5.0.14:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-globals@^9.14.0, globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
-graceful-fs@^4.1.2, graceful-fs@^4.1.4:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-growl@1.9.2:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
-
-har-schema@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
-
-har-schema@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
-  dependencies:
-    ajv "^4.9.1"
-    har-schema "^1.0.5"
-
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-has-binary@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-binary/-/has-binary-0.1.7.tgz#68e61eb16210c9545a0a5cce06a873912fe1e68c"
-  dependencies:
-    isarray "0.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-
-has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-  dependencies:
-    function-bind "^1.0.2"
-
-hawk@3.1.3, hawk@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
-  dependencies:
-    boom "2.x.x"
-    cryptiles "2.x.x"
-    hoek "2.x.x"
-    sntp "1.x.x"
-
-hawk@~6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038"
-  dependencies:
-    boom "4.x.x"
-    cryptiles "3.x.x"
-    hoek "4.x.x"
-    sntp "2.x.x"
-
-highlight.js@^8.9.1:
-  version "8.9.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-8.9.1.tgz#b8a9c5493212a9392f0222b649c9611497ebfb88"
-
-hoek@2.x.x:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hoek@4.x.x:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-
-hoist-non-react-statics@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
-
-home-or-tmp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.1"
-
-htmlparser2@^3.9.0:
-  version "3.9.2"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
-  dependencies:
-    domelementtype "^1.3.0"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^2.0.2"
-
-http-errors@1.6.2, http-errors@~1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
-  dependencies:
-    depd "1.1.1"
-    inherits "2.0.3"
-    setprototypeof "1.0.3"
-    statuses ">= 1.3.1 < 2"
-
-http-proxy@^1.13.0:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
-  dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
-
-http-signature@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
-  dependencies:
-    assert-plus "^0.2.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-http-signature@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  dependencies:
-    assert-plus "^1.0.0"
-    jsprim "^1.2.2"
-    sshpk "^1.7.0"
-
-https-browserify@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
-
-iconv-lite@0.4.19, iconv-lite@~0.4.13:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-ieee754@^1.1.4:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
-
-ignore@^3.2.0:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
-
-immutable@^3.7.4:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-
-immutable@~3.7.4:
-  version "3.7.6"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
-
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-inherits@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
-
-ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-interpret@^0.6.4:
-  version "0.6.6"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"
-
-interpret@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
-
-invariant@^2.0.0, invariant@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688"
-  dependencies:
-    loose-envify "^1.0.0"
-
-is-arrow-function@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-arrow-function/-/is-arrow-function-2.0.3.tgz#29be2c2d8d9450852b8bbafb635ba7b8d8e87ec2"
-  dependencies:
-    is-callable "^1.0.4"
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
-  dependencies:
-    binary-extensions "^1.0.0"
-
-is-boolean-object@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-callable@^1.0.4, is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
-
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  dependencies:
-    is-primitive "^2.0.0"
-
-is-equal@^1.5.1:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/is-equal/-/is-equal-1.5.5.tgz#5e85f1957e052883247feb386965a3bba15fbb3d"
-  dependencies:
-    has "^1.0.1"
-    is-arrow-function "^2.0.3"
-    is-boolean-object "^1.0.0"
-    is-callable "^1.1.3"
-    is-date-object "^1.0.1"
-    is-generator-function "^1.0.6"
-    is-number-object "^1.0.3"
-    is-regex "^1.0.3"
-    is-string "^1.0.4"
-    is-symbol "^1.0.1"
-    object.entries "^1.0.4"
-
-is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
-is-finite@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  dependencies:
-    number-is-nan "^1.0.0"
-
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-generator-function@^1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.7.tgz#d2132e529bb0000a7f80794d4bdf5cd5e5813522"
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  dependencies:
-    is-extglob "^1.0.0"
-
-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-
-is-my-json-valid@^2.10.0:
-  version "2.17.2"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
-is-number-object@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
-
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-
-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  dependencies:
-    kind-of "^3.0.2"
-
-is-path-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
-
-is-path-in-cwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc"
-  dependencies:
-    is-path-inside "^1.0.0"
-
-is-path-inside@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
-  dependencies:
-    path-is-inside "^1.0.1"
-
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
-is-property@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-
-is-regex@^1.0.3, is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
-
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-
-is-stream@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-string@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
-
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
-
-is-typedarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-isbinaryfile@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621"
-
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  dependencies:
-    isarray "1.0.0"
-
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
-isstream@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-jade@0.26.3:
-  version "0.26.3"
-  resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
-  dependencies:
-    commander "0.6.1"
-    mkdirp "0.3.0"
-
-"jquery@>= 1.4.3", jquery@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
-
-js-tokens@^3.0.0, js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-
-js-yaml@^3.5.1:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-jsbn@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-jsesc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
-
-jsesc@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-
-json-loader@^0.5.3:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
-
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-
-json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
-  dependencies:
-    jsonify "~0.0.0"
-
-json-stringify-safe@~5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-json3@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
-
-json5@^0.5.0, json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-
-jsonify@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-
-jsprim@^1.2.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
-  dependencies:
-    assert-plus "1.0.0"
-    extsprintf "1.3.0"
-    json-schema "0.2.3"
-    verror "1.10.0"
-
-jsx-ast-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz#e801b1b39985e20fffc87b40e3748080e2dcac7f"
-  dependencies:
-    array-includes "^3.0.3"
-
-karma-chrome-launcher@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz#4c6d700d163a9d34c618efd87918be49e7a4a8c9"
-  dependencies:
-    fs-access "^1.0.0"
-    which "^1.2.1"
-
-karma-cli@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-0.1.2.tgz#cacea84371ece19876265c8fa102ebbb9fee4a8c"
-  dependencies:
-    resolve "^1.1.6"
-
-karma-junit-reporter@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/karma-junit-reporter/-/karma-junit-reporter-0.4.2.tgz#492a236728fe4c92aacf419fcd0110a4327e9d7f"
-  dependencies:
-    path-is-absolute "^1.0.0"
-    xmlbuilder "3.1.0"
-
-karma-logcapture-reporter@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/karma-logcapture-reporter/-/karma-logcapture-reporter-0.0.1.tgz#bf1b0b1c915e0de295a15fe2f0179d4281bacddc"
-
-karma-mocha@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-0.2.2.tgz#388ed917da15dcb196d1b915c1934ef803193f8e"
-
-karma-sourcemap-loader@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
-  dependencies:
-    graceful-fs "^4.1.2"
-
-karma-spec-reporter@^0.0.31:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz#4830dc7148a155c7d7a186e632339a0d80fadec3"
-  dependencies:
-    colors "^1.1.2"
-
-karma-summary-reporter@^1.3.3:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/karma-summary-reporter/-/karma-summary-reporter-1.5.0.tgz#dc570299c7074774e388e10fa5f9e58f7a45ec14"
-  dependencies:
-    chalk "^1.1.3 || 2.x"
-
-karma-webpack@^1.7.0:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-1.8.1.tgz#39d5fd2edeea3cc3ef5b405989b37d5b0e6a3b4e"
-  dependencies:
-    async "~0.9.0"
-    loader-utils "^0.2.5"
-    lodash "^3.8.0"
-    source-map "^0.1.41"
-    webpack-dev-middleware "^1.0.11"
-
-karma@^1.7.0:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-1.7.1.tgz#85cc08e9e0a22d7ce9cca37c4a1be824f6a2b1ae"
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    chokidar "^1.4.1"
-    colors "^1.1.0"
-    combine-lists "^1.0.0"
-    connect "^3.6.0"
-    core-js "^2.2.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^3.8.0"
-    log4js "^0.6.31"
-    mime "^1.3.4"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "1.7.3"
-    source-map "^0.5.3"
-    tmp "0.0.31"
-    useragent "^2.1.12"
-
-kind-of@^3.0.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  dependencies:
-    is-buffer "^1.1.5"
-
-lazy-cache@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
-
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
-linkifyjs@^2.1.3:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-2.1.6.tgz#f1cc88a86ff8863196615857fd47eb193c0a26cb"
-  optionalDependencies:
-    jquery "^3.3.1"
-    react "^16.2.0"
-    react-dom "^16.2.0"
-
-loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.5, loader-utils@~0.2.2:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-lodash-es@^4.17.5, lodash-es@^4.2.1:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.5.tgz#9fc6e737b1c4d151d8f9cae2247305d552ce748f"
-
-lodash.assign@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
-lodash.clonedeep@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-
-lodash.escaperegexp@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-
-lodash.mergewith@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-
-lodash.pickby@^4.0.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
-
-lodash@^3.5.0, lodash@^3.8.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-
-lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.0:
-  version "4.17.5"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-
-log4js@^0.6.31:
-  version "0.6.38"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd"
-  dependencies:
-    readable-stream "~1.0.2"
-    semver "~4.3.3"
-
-lolex@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
-
-longest@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
-
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
-  dependencies:
-    js-tokens "^3.0.0"
-
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-
-lru-cache@4.1.x:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55"
-  dependencies:
-    pseudomap "^1.0.2"
-    yallist "^2.1.2"
-
-matrix-js-sdk@0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-0.9.2.tgz#2a521bddcf637cbefde9138784e627ea43645b77"
-  dependencies:
-    another-json "^0.2.0"
-    babel-runtime "^6.26.0"
-    bluebird "^3.5.0"
-    browser-request "^0.3.3"
-    content-type "^1.0.2"
-    request "^2.53.0"
-
-matrix-react-test-utils@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-test-utils/-/matrix-react-test-utils-0.1.1.tgz#b548844d0ebe338ea1b9c8f16474c30d17c3bdf4"
-  dependencies:
-    react "^15.6.1"
-    react-dom "^15.6.1"
-
-"mdurl@~ 1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-
-memoize-one@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.0.1.tgz#7b599850bb41be8beed305f4eefd963c8cea9a0a"
-
-memory-fs@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"
-
-memory-fs@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-memory-fs@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
-mime-db@~1.33.0:
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
-
-mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-  dependencies:
-    mime-db "~1.33.0"
-
-mime@^1.3.4, mime@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.2.0, "minimist@~ 1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-
-mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-mocha@^2.4.5:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58"
-  dependencies:
-    commander "2.3.0"
-    debug "2.2.0"
-    diff "1.4.0"
-    escape-string-regexp "1.0.2"
-    glob "3.2.11"
-    growl "1.9.2"
-    jade "0.26.3"
-    mkdirp "0.5.1"
-    supports-color "1.2.0"
-    to-iso-string "0.0.2"
-
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
-ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-
-nan@^2.3.0:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866"
-
-natural-compare@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-
-node-fetch@^1.0.1:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
-node-libs-browser@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-0.7.0.tgz#3e272c0819e308935e26674408d7af0e1491b83b"
-  dependencies:
-    assert "^1.1.1"
-    browserify-zlib "^0.1.4"
-    buffer "^4.9.0"
-    console-browserify "^1.1.0"
-    constants-browserify "^1.0.0"
-    crypto-browserify "3.3.0"
-    domain-browser "^1.1.1"
-    events "^1.0.0"
-    https-browserify "0.0.1"
-    os-browserify "^0.2.0"
-    path-browserify "0.0.0"
-    process "^0.11.0"
-    punycode "^1.2.4"
-    querystring-es3 "^0.2.0"
-    readable-stream "^2.0.5"
-    stream-browserify "^2.0.1"
-    stream-http "^2.3.1"
-    string_decoder "^0.10.25"
-    timers-browserify "^2.0.2"
-    tty-browserify "0.0.0"
-    url "^0.11.0"
-    util "^0.10.3"
-    vm-browserify "0.0.4"
-
-node-pre-gyp@^0.6.39:
-  version "0.6.39"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649"
-  dependencies:
-    detect-libc "^1.0.2"
-    hawk "3.1.3"
-    mkdirp "^0.5.1"
-    nopt "^4.0.1"
-    npmlog "^4.0.2"
-    rc "^1.1.7"
-    request "2.81.0"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^2.2.1"
-    tar-pack "^3.4.0"
-
-nopt@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
-  dependencies:
-    abbrev "1"
-    osenv "^0.1.4"
-
-normalize-path@^2.0.0, normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-null-check@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-
-object-assign@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-
-object-inspect@^1.1.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.5.0.tgz#9d876c11e40f485c79215670281b767488f9bfe3"
-
-object-keys@^1.0.8, object-keys@^1.0.9:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
-
-object.entries@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.6.1"
-    function-bind "^1.1.0"
-    has "^1.0.1"
-
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  dependencies:
-    ee-first "1.1.1"
-
-once@^1.3.0, once@^1.3.3:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-
-optimist@^0.6.1, optimist@~0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-optionator@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-options@>=0.0.5:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
-
-os-browserify@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
-
-os-homedir@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-
-osenv@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  dependencies:
-    os-homedir "^1.0.0"
-    os-tmpdir "^1.0.0"
-
-output-file-sync@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
-  dependencies:
-    graceful-fs "^4.1.4"
-    mkdirp "^0.5.1"
-    object-assign "^4.1.0"
-
-pako@~0.2.0:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
-
-parallelshell@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/parallelshell/-/parallelshell-3.0.2.tgz#fffc55aaa145bdd44b5381cf7fd5e521fc21aa7b"
-
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parsejson@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/parsejson/-/parsejson-0.0.3.tgz#ab7e3759f209ece99437973f7d0f1f64ae0e64ab"
-  dependencies:
-    better-assert "~1.0.0"
-
-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  dependencies:
-    better-assert "~1.0.0"
-
-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  dependencies:
-    better-assert "~1.0.0"
-
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-
-path-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  dependencies:
-    pinkie-promise "^2.0.0"
-
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-path-is-inside@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
-
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-
-pbkdf2-compat@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz#b6e0c8fa99494d94e0511575802a59a5c142f288"
-
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
-performance-now@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-
-pkg-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
-  dependencies:
-    find-up "^1.0.0"
-
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
-
-pluralizers@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/pluralizers/-/pluralizers-0.1.7.tgz#8d38dd0a1b660e739b10ab2eab10b684c9d50142"
-
-postcss@^6.0.14:
-  version "6.0.19"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555"
-  dependencies:
-    chalk "^2.3.1"
-    source-map "^0.6.1"
-    supports-color "^5.2.0"
-
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-
-private@^0.1.6, private@^0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-
-process@^0.11.0:
-  version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
-
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-
-promise@^7.0.3, promise@^7.1.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-  dependencies:
-    asap "~2.0.3"
-
-prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0:
-  version "15.6.1"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-prr@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-
-pseudomap@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
-
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
-qjobs@^1.1.4:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
-
-qs@6.5.1, qs@~6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
-
-qs@~6.4.0:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
-
-querystring-es3@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-
-querystring@0.2.0, querystring@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-
-raf-schd@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-2.1.0.tgz#64d645723380ec25cc1714e909b953ef1cf254bf"
-
-raf@^3.1.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
-  dependencies:
-    performance-now "^2.1.0"
-
-randomatic@^1.1.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-range-parser@^1.0.3, range-parser@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-
-raw-body@2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
-  dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.2"
-    iconv-lite "0.4.19"
-    unpipe "1.0.0"
-
-rc@^1.1.7:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd"
-  dependencies:
-    deep-extend "~0.4.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
-react-addons-css-transition-group@15.3.2:
-  version "15.3.2"
-  resolved "https://registry.yarnpkg.com/react-addons-css-transition-group/-/react-addons-css-transition-group-15.3.2.tgz#d8fa52bec9bb61bdfde8b9e4652b80297cbff667"
-
-react-addons-test-utils@^15.4.0:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"
-
-react-beautiful-dnd@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-4.0.1.tgz#3b0a49bf6be75af351176c904f012611dd292b81"
-  dependencies:
-    babel-runtime "^6.26.0"
-    invariant "^2.2.2"
-    memoize-one "^3.0.1"
-    prop-types "^15.6.0"
-    raf-schd "^2.1.0"
-    react-motion "^0.5.2"
-    react-redux "^5.0.6"
-    redux "^3.7.2"
-    redux-thunk "^2.2.0"
-    reselect "^3.0.1"
-
-react-dom@^15.4.0, react-dom@^15.6.1:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
-  dependencies:
-    fbjs "^0.8.9"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-    prop-types "^15.5.10"
-
-react-dom@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.0"
-
-react-gemini-scrollbar@matrix-org/react-gemini-scrollbar#5e97aef:
-  version "2.1.5"
-  resolved "https://codeload.github.com/matrix-org/react-gemini-scrollbar/tar.gz/5e97aef7e034efc8db1431f4b0efe3b26e249ae9"
-  dependencies:
-    gemini-scrollbar matrix-org/gemini-scrollbar#b302279
-
-react-motion@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/react-motion/-/react-motion-0.5.2.tgz#0dd3a69e411316567927917c6626551ba0607316"
-  dependencies:
-    performance-now "^0.2.0"
-    prop-types "^15.5.8"
-    raf "^3.1.0"
-
-react-redux@^5.0.6:
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
-  dependencies:
-    hoist-non-react-statics "^2.5.0"
-    invariant "^2.0.0"
-    lodash "^4.17.5"
-    lodash-es "^4.17.5"
-    loose-envify "^1.1.0"
-    prop-types "^15.6.0"
-
-react@^15.4.0, react@^15.6.1:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
-  dependencies:
-    create-react-class "^15.6.0"
-    fbjs "^0.8.9"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-    prop-types "^15.5.10"
-
-react@^16.2.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.0"
-
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.3:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
-    util-deprecate "~1.0.1"
-
-readable-stream@~1.0.2:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readdirp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
-  dependencies:
-    graceful-fs "^4.1.2"
-    minimatch "^3.0.2"
-    readable-stream "^2.0.2"
-    set-immediate-shim "^1.0.1"
-
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  dependencies:
-    resolve "^1.1.6"
-
-redux-thunk@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
-
-redux@^3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
-  dependencies:
-    lodash "^4.2.1"
-    lodash-es "^4.2.1"
-    loose-envify "^1.1.0"
-    symbol-observable "^1.0.3"
-
-regenerate@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
-
-regenerator-runtime@^0.10.5:
-  version "0.10.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
-
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-
-regenerator-transform@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
-  dependencies:
-    babel-runtime "^6.18.0"
-    babel-types "^6.19.0"
-    private "^0.1.6"
-
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
-regexpu-core@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
-  dependencies:
-    regenerate "^1.2.1"
-    regjsgen "^0.2.0"
-    regjsparser "^0.1.4"
-
-regjsgen@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
-
-regjsparser@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
-  dependencies:
-    jsesc "~0.5.0"
-
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-
-repeat-element@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-
-repeat-string@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  dependencies:
-    is-finite "^1.0.0"
-
-request@2.81.0:
-  version "2.81.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    aws4 "^1.2.1"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~2.1.1"
-    har-validator "~4.2.1"
-    hawk "~3.1.3"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    oauth-sign "~0.8.1"
-    performance-now "^0.2.0"
-    qs "~6.4.0"
-    safe-buffer "^5.0.1"
-    stringstream "~0.0.4"
-    tough-cookie "~2.3.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.0.0"
-
-request@^2.53.0:
-  version "2.83.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-require-json@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/require-json/-/require-json-0.0.1.tgz#3c8914f93d7442de8cbf4e681ac62a72aa3367fe"
-
-require-uncached@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
-requires-port@1.x.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-
-reselect@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
-
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-
-resolve@^1.1.6:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
-  dependencies:
-    path-parse "^1.0.5"
-
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-right-align@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
-  dependencies:
-    align-text "^0.1.1"
-
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.5.1, rimraf@^2.6.0, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  dependencies:
-    glob "^7.0.5"
-
-ripemd160@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce"
-
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  dependencies:
-    once "^1.3.0"
-
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-
-safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-
-samsam@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
-
-samsam@~1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.3.tgz#9f5087419b4d091f232571e7fa52e90b0f552621"
-
-sanitize-html@^1.14.1:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.18.2.tgz#61877ba5a910327e42880a28803c2fbafa8e4642"
-  dependencies:
-    chalk "^2.3.0"
-    htmlparser2 "^3.9.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.escaperegexp "^4.1.2"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.0"
-    postcss "^6.0.14"
-    srcset "^1.0.0"
-    xtend "^4.0.0"
-
-semver@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
-
-semver@~4.3.3:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-
-set-blocking@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-immediate-shim@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-
-setimmediate@^1.0.4, setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
-setprototypeof@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
-
-sha.js@2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"
-
-shelljs@^0.7.5:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
-signal-exit@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-
-sinon@^1.17.3:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-1.17.7.tgz#4542a4f49ba0c45c05eb2e9dd9d203e2b8efe0bf"
-  dependencies:
-    formatio "1.1.1"
-    lolex "1.3.2"
-    samsam "1.1.2"
-    util ">=0.10.3 <1"
-
-slash@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
-
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-
-sntp@1.x.x:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
-  dependencies:
-    hoek "2.x.x"
-
-sntp@2.x.x:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8"
-  dependencies:
-    hoek "4.x.x"
-
-socket.io-adapter@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b"
-  dependencies:
-    debug "2.3.3"
-    socket.io-parser "2.3.1"
-
-socket.io-client@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-1.7.3.tgz#b30e86aa10d5ef3546601c09cde4765e381da377"
-  dependencies:
-    backo2 "1.0.2"
-    component-bind "1.0.0"
-    component-emitter "1.2.1"
-    debug "2.3.3"
-    engine.io-client "1.8.3"
-    has-binary "0.1.7"
-    indexof "0.0.1"
-    object-component "0.0.3"
-    parseuri "0.0.5"
-    socket.io-parser "2.3.1"
-    to-array "0.1.4"
-
-socket.io-parser@2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-2.3.1.tgz#dd532025103ce429697326befd64005fcfe5b4a0"
-  dependencies:
-    component-emitter "1.1.2"
-    debug "2.2.0"
-    isarray "0.0.1"
-    json3 "3.3.2"
-
-socket.io@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-1.7.3.tgz#b8af9caba00949e568e369f1327ea9be9ea2461b"
-  dependencies:
-    debug "2.3.3"
-    engine.io "1.8.3"
-    has-binary "0.1.7"
-    object-assign "4.1.0"
-    socket.io-adapter "0.5.0"
-    socket.io-client "1.7.3"
-    socket.io-parser "2.3.1"
-
-source-list-map@~0.1.7:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
-
-source-map-loader@^0.1.5:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.1.6.tgz#c09903da6d73b9e53b7ed8ee5245597051e98e91"
-  dependencies:
-    async "^0.9.0"
-    loader-utils "~0.2.2"
-    source-map "~0.1.33"
-
-source-map-support@^0.4.15:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  dependencies:
-    source-map "^0.5.6"
-
-source-map@^0.1.41, source-map@~0.1.33:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-
-source-map@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
-
-source-map@~0.4.1:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  dependencies:
-    amdefine ">=0.0.4"
-
-sprintf-js@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-
-srcset@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz#a5669de12b42f3b1d5e83ed03c71046fc48f41ef"
-  dependencies:
-    array-uniq "^1.0.2"
-    number-is-nan "^1.0.0"
-
-sshpk@^1.7.0:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"
-  dependencies:
-    asn1 "~0.2.3"
-    assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-  optionalDependencies:
-    bcrypt-pbkdf "^1.0.0"
-    ecc-jsbn "~0.1.1"
-    jsbn "~0.1.0"
-    tweetnacl "~0.14.0"
-
-"statuses@>= 1.3.1 < 2":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-
-stream-browserify@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "^2.0.2"
-
-stream-http@^2.3.1:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10"
-  dependencies:
-    builtin-status-codes "^3.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.3.3"
-    to-arraybuffer "^1.0.0"
-    xtend "^4.0.0"
-
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-string-width@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string.prototype.repeat@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
-
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
-stringstream@~0.0.4, stringstream@~0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  dependencies:
-    ansi-regex "^2.0.0"
-
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  dependencies:
-    ansi-regex "^3.0.0"
-
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-
-supports-color@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e"
-
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^3.1.0:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  dependencies:
-    has-flag "^1.0.0"
-
-supports-color@^5.2.0, supports-color@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
-  dependencies:
-    has-flag "^3.0.0"
-
-symbol-observable@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
-
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
-  dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
-
-tapable@^0.1.8, tapable@~0.1.8:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
-
-tar-pack@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f"
-  dependencies:
-    debug "^2.2.0"
-    fstream "^1.0.10"
-    fstream-ignore "^1.0.5"
-    once "^1.3.3"
-    readable-stream "^2.1.4"
-    rimraf "^2.5.1"
-    tar "^2.2.1"
-    uid-number "^0.0.6"
-
-tar@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  dependencies:
-    block-stream "*"
-    fstream "^1.0.2"
-    inherits "2"
-
-text-encoding-utf-8@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
-
-text-table@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
-time-stamp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
-
-timers-browserify@^2.0.2:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
-  dependencies:
-    setimmediate "^1.0.4"
-
-tmatch@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/tmatch/-/tmatch-2.0.1.tgz#0c56246f33f30da1b8d3d72895abaf16660f38cf"
-
-tmp@0.0.31:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
-  dependencies:
-    os-tmpdir "~1.0.1"
-
-tmp@0.0.x:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  dependencies:
-    os-tmpdir "~1.0.2"
-
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-
-to-arraybuffer@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
-
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-
-to-iso-string@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1"
-
-tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  dependencies:
-    punycode "^1.4.1"
-
-trim-right@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-
-tty-browserify@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
-
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  dependencies:
-    safe-buffer "^5.0.1"
-
-tweetnacl@^0.14.3, tweetnacl@~0.14.0:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  dependencies:
-    prelude-ls "~1.1.2"
-
-type-is@~1.6.15:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.18"
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
-ua-parser-js@^0.7.9:
-  version "0.7.17"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
-
-uglify-js@~2.7.3:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
-  dependencies:
-    async "~0.2.6"
-    source-map "~0.5.1"
-    uglify-to-browserify "~1.0.0"
-    yargs "~3.10.0"
-
-uglify-to-browserify@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
-
-uid-number@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
-
-ultron@1.0.x:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
-
-unpipe@1.0.0, unpipe@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-
-url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
-user-home@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  dependencies:
-    os-homedir "^1.0.0"
-
-useragent@^2.1.12:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
-  dependencies:
-    lru-cache "4.1.x"
-    tmp "0.0.x"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-util@0.10.3, "util@>=0.10.3 <1", util@^0.10.3:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
-  dependencies:
-    inherits "2.0.1"
-
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-
-uuid@^3.0.0, uuid@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
-
-v8flags@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
-  dependencies:
-    user-home "^1.1.1"
-
-velocity-vector@vector-im/velocity#059e3b2:
-  version "1.2.3"
-  resolved "https://codeload.github.com/vector-im/velocity/tar.gz/059e3b2348f1110888d033974d3109fd5a3af00f"
-  dependencies:
-    jquery ">= 1.4.3"
-
-verror@1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  dependencies:
-    assert-plus "^1.0.0"
-    core-util-is "1.0.2"
-    extsprintf "^1.2.0"
-
-vm-browserify@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
-  dependencies:
-    indexof "0.0.1"
-
-void-elements@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-
-walk@^2.3.9:
-  version "2.3.9"
-  resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.9.tgz#31b4db6678f2ae01c39ea9fb8725a9031e558a7b"
-  dependencies:
-    foreachasync "^3.0.0"
-
-watchpack@^0.2.1:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-0.2.9.tgz#62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"
-  dependencies:
-    async "^0.9.0"
-    chokidar "^1.0.0"
-    graceful-fs "^4.1.2"
-
-webpack-core@~0.6.9:
-  version "0.6.9"
-  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
-  dependencies:
-    source-list-map "~0.1.7"
-    source-map "~0.4.1"
-
-webpack-dev-middleware@^1.0.11:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^1.5.0"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-    time-stamp "^2.0.0"
-
-webpack@^1.12.14:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-1.15.0.tgz#4ff31f53db03339e55164a9d468ee0324968fe98"
-  dependencies:
-    acorn "^3.0.0"
-    async "^1.3.0"
-    clone "^1.0.2"
-    enhanced-resolve "~0.9.0"
-    interpret "^0.6.4"
-    loader-utils "^0.2.11"
-    memory-fs "~0.3.0"
-    mkdirp "~0.5.0"
-    node-libs-browser "^0.7.0"
-    optimist "~0.6.0"
-    supports-color "^3.1.0"
-    tapable "~0.1.8"
-    uglify-js "~2.7.3"
-    watchpack "^0.2.1"
-    webpack-core "~0.6.9"
-
-whatwg-fetch@>=0.10.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
-
-whatwg-fetch@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0"
-
-whatwg-fetch@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz#ac3c9d39f320c6dce5339969d054ef43dd333319"
-
-which@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"
-  dependencies:
-    string-width "^1.0.2"
-
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-
-wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.2.tgz#8a244fa052401e08c9886cf44a85189e1fd4067f"
-  dependencies:
-    options ">=0.0.5"
-    ultron "1.0.x"
-
-wtf-8@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a"
-
-xmlbuilder@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-3.1.0.tgz#2c86888f2d4eade850fa38ca7f7223f7209516e1"
-  dependencies:
-    lodash "^3.5.0"
-
-xmlhttprequest-ssl@1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
-
-xtend@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-
-yallist@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
-yargs@~3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
-  dependencies:
-    camelcase "^1.0.2"
-    cliui "^2.1.0"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"

From d919c1a41d3d3e6bb5ac0af69b9a7ce4762bcc78 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 8 Mar 2018 09:47:42 +0000
Subject: [PATCH 660/927] Remove spurious console.trace

There's no comment to say why this is here and the commit that
add it (e91e94fd4) doesn't mention it either, so it's presumably
unintentional.
---
 src/Tinter.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Tinter.js b/src/Tinter.js
index c7402c15be..7667e6d912 100644
--- a/src/Tinter.js
+++ b/src/Tinter.js
@@ -252,7 +252,6 @@ class Tinter {
 
 
     setTheme(theme) {
-        console.trace("setTheme " + theme);
         this.theme = theme;
 
         // update keyRgb from the current theme CSS itself, if it defines it

From d5ced62b90d1d7ac565adb28587f4c534b8ba883 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 7 Mar 2018 12:29:17 +0000
Subject: [PATCH 661/927] Translated using Weblate (Esperanto)

Currently translated at 97.7% (968 of 990 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index fe731133fd..c5c2c0d20b 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -958,5 +958,13 @@
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privato gravas al ni, tial ni ne kolektas personajn aŭ spureblajn datumojn por nia analizo.",
     "Learn more about how we use analytics.": "Lernu pli pri nia uzo de analiziloj.",
     "Your homeserver's URL": "La URL de via servilo",
-    "Your identity server's URL": "La URL de via identigan servilo"
+    "Your identity server's URL": "La URL de via identigan servilo",
+    "The platform you're on": "Via sistemtipo",
+    "Which officially provided instance you are using, if any": "Kiun oficiale disponeblan aperon vi uzas, se iun ajn",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Ĉu vi uzas la riĉtekstan reĝimon de la riĉteksta redaktilo aŭ ne",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Ni ankaŭ registras ĉiun paĝon, kiun vi uzas en la programo (nun <CurrentPageHash>), vian klientan aplikaĵon (<CurrentUserAgent>) kaj vian aparatan distingon (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kiam ĉi tiu paĝo enhavas identigeblajn informojn, ekzemple ĉambron, uzantan aŭ grupan identigilon, ĝi sendiĝas al la servilo sen tiuj.",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "Disable Community Filter Panel": "Malŝalti komunuman filtran breton",
+    "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al ĉambro"
 }

From 7f44f236e052d5acd57c736c2434834538f7645e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Wed, 7 Mar 2018 19:52:00 +0000
Subject: [PATCH 662/927] Translated using Weblate (Serbian)

Currently translated at 99.8% (989 of 990 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 6f1958094a..8b609d3bde 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -985,5 +985,8 @@
     "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Ова радња вам омогућава да увезете кључеве за шифровање које сте претходно извезли из другог Матрикс клијента. Након тога ћете моћи да дешифрујете било коју поруку коју је други клијент могао да дешифрује.",
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Извезена датотека ће бити заштићена са фразом. Требало би да унесете фразу овде, да бисте дешифровали датотеку.",
     "File to import": "Датотека за увоз",
-    "Import": "Увези"
+    "Import": "Увези",
+    "Disable Community Filter Panel": "Онемогући површ за филтрирање  заједнице",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Да ли сте знали: можете користити заједнице за филтрирање вашег Riot.im искуства!",
+    "Clear filter": "Очисти филтер"
 }

From e864dc97bae1434a248e5b7d4db9a0e257f62869 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 8 Mar 2018 10:15:15 +0000
Subject: [PATCH 663/927] Translated using Weblate (Basque)

Currently translated at 100.0% (990 of 990 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index a149227632..b17da787b9 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -985,5 +985,8 @@
     "Failed to set direct chat tag": "Huts egin du txat zuzenarenaren etiketa jartzean",
     "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
     "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean",
-    "Clear filter": "Garbitu iragazkia"
+    "Clear filter": "Garbitu iragazkia",
+    "Disable Community Filter Panel": "Desgaitu komunitate-iragazi panela",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Ba al zenekien? Komunitateak erabili ditzakezu zure Riot.im esperientzia iragazteko!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Iragazki bat ezartzeko, arrastatu komunitate baten abatarra pantailaren ezkerrean dagoen  iragazki-panelera. Iragazki-paneleko abatar batean klik egin dezakezu komunitate horri lotutako gelak eta pertsonak besterik ez ikusteko."
 }

From c59dd5b840840ccbec02b7d8b252f02317313dfd Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Thu, 8 Mar 2018 12:31:01 +0000
Subject: [PATCH 664/927] Add placeholders for sticker images (and fancy
 transitions).

---
 src/components/views/messages/MImageBody.js   |  6 ++
 src/components/views/messages/MStickerBody.js | 79 +++++++++++++++++--
 2 files changed, 79 insertions(+), 6 deletions(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index 55d5a18a25..ceede48554 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -192,6 +192,12 @@ export default class extends React.Component {
                 });
             }).done();
         }
+        this._afterComponentDidMount();
+    }
+
+    // To be overridden by subclasses (e.g. MStickerBody) for further
+    // initialisation after componentDidMount
+    _afterComponentDidMount() {
     }
 
     componentWillUnmount() {
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index af39b1bd2d..ad6326a6a2 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -16,8 +16,9 @@ limitations under the License.
 
 'use strict';
 
-import MImageBody from "./MImageBody";
+import MImageBody from './MImageBody';
 import sdk from '../../../index';
+import TintableSVG from '../elements/TintableSvg';
 
 export default class MStickerBody extends MImageBody {
     displayName: 'MStickerBody'
@@ -27,6 +28,7 @@ export default class MStickerBody extends MImageBody {
 
       this._onMouseEnter = this._onMouseEnter.bind(this);
       this._onMouseLeave = this._onMouseLeave.bind(this);
+      this._onImageLoad = this._onImageLoad.bind(this);
     }
 
     _onMouseEnter() {
@@ -37,6 +39,36 @@ export default class MStickerBody extends MImageBody {
         this.setState({showTooltip: false});
     }
 
+    _onImageLoad() {
+        this.setState({
+            placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
+        });
+        setTimeout(() => {
+            this.setState({
+                placeholderVisible: false,
+                thumbnailClasses: 'mx_MStickerBody_thumbnail_visible',
+            });
+        }, 500);
+    }
+
+    _afterComponentDidMount() {
+        if (this.refs.image.complete) {
+            // Image already loaded
+            this.setState({
+                placeholderVisible: false,
+                placeholderClasses: '.mx_MStickerBody_placeholder_invisible',
+                thumbnailClasses: 'mx_MStickerBody_thumbnail_visible',
+            });
+        } else {
+            // Image not already loaded
+            this.setState({
+                placeholderVisible: true,
+                placeholderClasses: '',
+                thumbnailClasses: '',
+            });
+        }
+    }
+
     _messageContent(contentUrl, thumbUrl, content) {
         let tooltip;
         const tooltipBody = (
@@ -45,18 +77,53 @@ export default class MStickerBody extends MImageBody {
             this.props.mxEvent.getContent().body) ?
             this.props.mxEvent.getContent().body : null;
         if (this.state.showTooltip && tooltipBody) {
-            const RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
+            const RoomTooltip = sdk.getComponent('rooms.RoomTooltip');
             tooltip = <RoomTooltip
-                className="mx_RoleButton_tooltip"
+                className='mx_RoleButton_tooltip'
                 label={tooltipBody} />;
         }
 
+        const gutterSize = 0;
+        let placeholderSize = 75;
+        let placeholderFixupHeight = '100px';
+        let placeholderTop = 0;
+        let placeholderLeft = 0;
+
+        if (content.info) {
+            placeholderTop = Math.floor((content.info.h/2) - (placeholderSize/2)) + 'px';
+            placeholderLeft = Math.floor((content.info.w/2) - (placeholderSize/2) + gutterSize) + 'px';
+            placeholderFixupHeight = content.info.h + 'px';
+        }
+
+        placeholderSize = placeholderSize + 'px';
+        console.warn('placeholder classes', this.state.placeholderClasses);
+
         return (
-            <span className="mx_MImageBody" ref="body">
-                <div className="mx_MImageBody_thumbnail_container">
-                    <img className="mx_MImageBody_thumbnail" src={thumbUrl} ref="image"
+            <span className='mx_MStickerBody' ref='body'
+                style={{
+                    height: placeholderFixupHeight,
+                }}>
+                <div className={'mx_MStickerBody_thumbnail_container'}>
+
+                    <div
+                        className={'mx_MStickerBody_placeholder ' + this.state.placeholderClasses}
+                        style={{
+                            top: placeholderTop,
+                            left: placeholderLeft,
+                        }}
+                    >
+                        <TintableSVG
+                            src={'img/icons-show-stickers.svg'}
+                            width={placeholderSize}
+                            height={placeholderSize} />
+                    </div>
+                    <img
+                        className={'mx_MStickerBody_thumbnail ' + this.state.thumbnailClasses}
+                        src={thumbUrl}
+                        ref='image'
                         alt={content.body}
                         onLoad={this.props.onWidgetLoad}
+                        onLoad={this._onImageLoad}
                         onMouseEnter={this._onMouseEnter}
                         onMouseLeave={this._onMouseLeave}
                     />

From 3a3cced90543f73fafda914c5656cce5cf47fed5 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 8 Mar 2018 11:48:04 +0000
Subject: [PATCH 665/927] E2E "fudge-button"

Implement a UI to expose a JS-SDK API for cancelling and resending
a room key request for an event.

This is useful in scenarios where the user has dismissed the request
on their other devices and would like to send the restart the
verification dance manually.

Depends on JS-SDK PR https://github.com/matrix-org/matrix-js-sdk/pull/624
---
 src/components/views/rooms/EventTile.js | 63 ++++++++++++++++++++++++-
 src/i18n/strings/en_EN.json             |  5 ++
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 1d8df4c7a6..62af1ad2db 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -152,7 +152,17 @@ module.exports = withMatrixClient(React.createClass({
     },
 
     getInitialState: function() {
-        return {menu: false, allReadAvatars: false, verified: null};
+        return {
+            // Whether the context menu is being displayed.
+            menu: false,
+            // Whether all read receipts are being displayed. If not, only display
+            // a truncation of them.
+            allReadAvatars: false,
+            // Whether the event's sender has been verified.
+            verified: null,
+            // Whether onRequestKeysClick has been called since mounting.
+            previouslyRequestedKeys: false,
+        };
     },
 
     componentWillMount: function() {
@@ -393,6 +403,19 @@ module.exports = withMatrixClient(React.createClass({
         });
     },
 
+    onRequestKeysClick: function() {
+        this.setState({
+            // Indicate in the UI that the keys have been requested (this is expected to
+            // be reset if the component is mounted in the future).
+            previouslyRequestedKeys: true,
+        });
+
+        // Cancel any outgoing key request for this event and resend it. If a response
+        // is received for the request with the required keys, the event could be
+        // decrypted successfully.
+        this.props.matrixClient.cancelAndResendEventRoomKeyRequest(this.props.mxEvent);
+    },
+
     onPermalinkClicked: function(e) {
         // This allows the permalink to be opened in a new tab/window or copied as
         // matrix.to, but also for it to enable routing within Riot when clicked.
@@ -458,6 +481,7 @@ module.exports = withMatrixClient(React.createClass({
 
         const isSending = (['sending', 'queued', 'encrypting'].indexOf(this.props.eventSendStatus) !== -1);
         const isRedacted = (eventType === 'm.room.message') && this.props.isRedacted;
+        const isEncryptionFailure = this.props.mxEvent.isDecryptionFailure();
 
         const classes = classNames({
             mx_EventTile: true,
@@ -474,7 +498,7 @@ 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: msgtype === 'm.bad.encrypted',
+            mx_EventTile_bad: isEncryptionFailure,
             mx_EventTile_emote: msgtype === 'm.emote',
             mx_EventTile_redacted: isRedacted,
         });
@@ -534,6 +558,40 @@ module.exports = withMatrixClient(React.createClass({
         const timestamp = this.props.mxEvent.getTs() ?
             <MessageTimestamp showTwelveHour={this.props.isTwelveHour} ts={this.props.mxEvent.getTs()} /> : null;
 
+        const keyRequestHelpText =
+            <div className="mx_EventTile_keyRequestInfo_tooltip_contents">
+                <p>
+                    { this.state.previouslyRequestedKeys ?
+                        _t( 'Your key share request has been sent - please check your other devices ' +
+                            'for key share requests.') :
+                        _t( 'Key share requests are sent to your other devices automatically. If you ' +
+                            'rejected or dismissed the key share request on your other devices, click ' +
+                            'here to request the keys for this session again.')
+                    }
+                </p>
+                <p>
+                    { _t( 'If your other devices do not have the key for this message you will not ' +
+                            'be able to decrypt them.')
+                    }
+                </p>
+            </div>;
+        const keyRequestInfoContent = this.state.previouslyRequestedKeys ?
+            _t('Key request sent.') :
+            _t(
+                '<requestLink>Re-request encryption keys</requestLink> from your other devices.',
+                {},
+                {'requestLink': (sub) => <a onClick={this.onRequestKeysClick}>{ sub }</a>},
+            );
+
+        const ToolTipButton = sdk.getComponent('elements.ToolTipButton');
+        const keyRequestInfo = isEncryptionFailure ?
+            <div className="mx_EventTile_keyRequestInfo">
+                <span className="mx_EventTile_keyRequestInfo_text">
+                    { keyRequestInfoContent }
+                </span>
+                <ToolTipButton helpText={keyRequestHelpText} />
+            </div> : null;
+
         switch (this.props.tileShape) {
             case 'notif': {
                 const room = this.props.matrixClient.getRoom(this.props.mxEvent.getRoomId());
@@ -627,6 +685,7 @@ module.exports = withMatrixClient(React.createClass({
                                            highlightLink={this.props.highlightLink}
                                            showUrlPreview={this.props.showUrlPreview}
                                            onWidgetLoad={this.props.onWidgetLoad} />
+                            { keyRequestInfo }
                             { editButton }
                         </div>
                     </div>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6a8ec64ffa..5ef919179d 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -265,6 +265,11 @@
     "%(senderName)s sent a video": "%(senderName)s sent a video",
     "%(senderName)s uploaded a file": "%(senderName)s uploaded a file",
     "Options": "Options",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Your key share request has been sent - please check your other devices for key share requests.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "If your other devices do not have the key for this message you will not be able to decrypt them.",
+    "Key request sent.": "Key request sent.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-request encryption keys</requestLink> from your other devices.",
     "Undecryptable": "Undecryptable",
     "Encrypted by a verified device": "Encrypted by a verified device",
     "Encrypted by an unverified device": "Encrypted by an unverified device",

From a1d0cf65d6d8422fe26e8341ab2d94790254b6c3 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 8 Mar 2018 16:34:19 +0000
Subject: [PATCH 666/927] Fix missing space between "...is a" and user ID

---
 src/components/views/rooms/RoomSettings.js | 6 ++++--
 src/i18n/strings/en_EN.json                | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index e2dad93698..658f99223e 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -704,8 +704,10 @@ module.exports = React.createClass({
                         { Object.keys(userLevels).map(function(user, i) {
                             return (
                                 <li className="mx_RoomSettings_userLevel" key={user}>
-                                    { _t("%(user)s is a", {user: user}) }
-                                    <PowerSelector value={userLevels[user]} disabled={true} />
+                                    { _t("%(user)s is a %(userRole)s", {
+                                        user: user,
+                                        userRole: <PowerSelector value={userLevels[user]} disabled={true} />,
+                                    }) }
                                 </li>
                             );
                         }) }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 5ef919179d..064062f5e7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -445,7 +445,7 @@
     "To ban users, you must be a": "To ban users, you must be a",
     "To remove other users' messages, you must be a": "To remove other users' messages, you must be a",
     "Privileged Users": "Privileged Users",
-    "%(user)s is a": "%(user)s is a",
+    "%(user)s is a %(userRole)s": "%(user)s is a %(userRole)s",
     "No users have specific privileges in this room": "No users have specific privileges in this room",
     "Banned users": "Banned users",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",

From 99c15be7667a0a5bf01efbd8e3d42bcf6a4a2718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 8 Mar 2018 16:57:41 +0000
Subject: [PATCH 667/927] Translated using Weblate (French)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 5510d2fc25..33a5a2ee45 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -988,5 +988,11 @@
     "Clear filter": "Supprimer les filtres",
     "Did you know: you can use communities to filter your Riot.im experience!": "Le saviez-vous : vous pouvez utiliser les communautés pour filtrer votre expérience Riot.im !",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Pour activer un filtre, faites glisser un avatar de communauté sur le panneau des filtres tout à gauche de l'écran. Vous pouvez cliquer sur un avatar dans ce panneau quand vous le souhaitez afin de ne voir que les salons et les personnes associés à cette communauté.",
-    "Disable Community Filter Panel": "Désactiver le panneau de filtre de communauté"
+    "Disable Community Filter Panel": "Désactiver le panneau de filtre de communauté",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Votre demande de partage de clé a été envoyée - veuillez vérifier les demandes de partage de clé sur vos autres appareils.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Les demandes de partage de clé sont envoyées à vos autres appareils automatiquement. Si vous rejetez ou supprimez la demande de partage de clé sur vos autres appareils, cliquez ici pour redemander les clés pour cette session.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si vos autres appareils n'ont pas la clé pour ce message, vous ne pourrez pas le déchiffrer.",
+    "Key request sent.": "Demande de clé envoyée.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-demander les clés de chiffrement</requestLink> depuis vos autres appareils.",
+    "%(user)s is a %(userRole)s": "%(user)s est %(userRole)s"
 }

From 5ba55858e8d299af6d62f7385a0ab010c6a7179c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 8 Mar 2018 17:06:48 +0000
Subject: [PATCH 668/927] Use TintableSvg for TagPanel clear filter button

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 4bfebc59b8..7a187e4298 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -101,6 +101,7 @@ const TagPanel = React.createClass({
         const GroupsButton = sdk.getComponent('elements.GroupsButton');
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
+        const TintableSvg = sdk.getComponent('elements.TintableSvg');
 
         const tags = this.state.orderedTags.map((tag, index) => {
             return <DNDTagTile
@@ -112,12 +113,10 @@ const TagPanel = React.createClass({
         });
 
         const clearButton = this.state.selectedTags.length > 0 ?
-            <img
-                src="img/icons-close.svg"
+            <TintableSvg src="img/icons-close.svg" width="24" height="24"
                 alt={_t("Clear filter")}
                 title={_t("Clear filter")}
-                width="24"
-                height="24" /> :
+            /> :
             <div />;
 
         return <div className="mx_TagPanel">

From 3ab8b1f8662fcc6c537ba78fbf23de0851feba46 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Thu, 8 Mar 2018 17:20:42 +0000
Subject: [PATCH 669/927] Hide sticker picker delete button and show minimise
 button.

---
 src/components/views/elements/AppTile.js      | 22 ++++++++++++++++---
 src/components/views/messages/MStickerBody.js |  1 -
 src/components/views/rooms/Stickerpicker.js   |  5 ++++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 6c9ea55142..0d209b1293 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -49,6 +49,7 @@ export default class AppTile extends React.Component {
         this._onDeleteClick = this._onDeleteClick.bind(this);
         this._onSnapshotClick = this._onSnapshotClick.bind(this);
         this.onClickMenuBar = this.onClickMenuBar.bind(this);
+        this._onMinimiseClick = this._onMinimiseClick.bind(this);
     }
 
     /**
@@ -448,6 +449,12 @@ export default class AppTile extends React.Component {
         );
     }
 
+    _onMinimiseClick(e) {
+        if (this.props.onMinimiseClick) {
+            this.props.onMinimiseClick();
+        }
+    }
+
     render() {
         let appTileBody;
 
@@ -536,13 +543,14 @@ export default class AppTile extends React.Component {
             <div className={this.props.fullWidth ? "mx_AppTileFullWidth" : "mx_AppTile"} id={this.props.id}>
                 { this.props.showMenubar &&
                 <div ref="menu_bar" className="mx_AppTileMenuBar" onClick={this.onClickMenuBar}>
-                    <span className="mx_AppTileMenuBarTitle">
+                    <span className="mx_AppTileMenuBarTitle" style={{pointerEvents: (this.props.handleMinimisePointerEvents ? 'all' : false)}}>
                         { this.props.showMinimise && <TintableSvgButton
                             src={windowStateIcon}
                             className="mx_AppTileMenuBarWidget mx_AppTileMenuBarWidgetPadding"
                             title={_t('Minimize apps')}
                             width="10"
                             height="10"
+                            onClick={this._onMinimiseClick}
                         /> }
                         { this.props.showTitle && this._getTileTitle() }
                     </span>
@@ -568,14 +576,14 @@ export default class AppTile extends React.Component {
                         /> }
 
                         { /* Delete widget */ }
-                        <TintableSvgButton
+                        { this.props.showDelete && <TintableSvgButton
                             src={deleteIcon}
                             className={deleteClasses}
                             title={_t(deleteWidgetLabel)}
                             onClick={this._onDeleteClick}
                             width="10"
                             height="10"
-                        />
+                        /> }
                     </span>
                 </div> }
                 { appTileBody }
@@ -607,10 +615,16 @@ AppTile.propTypes = {
     onEditClick: PropTypes.func,
     // Optional onDeleteClickHandler (overrides default behaviour)
     onDeleteClick: PropTypes.func,
+    // Optional onMinimiseClickHandler
+    onMinimiseClick: PropTypes.func,
     // Optionally hide the tile title
     showTitle: PropTypes.bool,
     // Optionally hide the tile minimise icon
     showMinimise: PropTypes.bool,
+    // Optionally handle minimise button pointer events (default false)
+    handleMinimisePointerEvents: PropTypes.bool,
+    // Optionally hide the delete icon
+    showDelete: PropTypes.bool,
 };
 
 AppTile.defaultProps = {
@@ -619,4 +633,6 @@ AppTile.defaultProps = {
     showMenubar: true,
     showTitle: true,
     showMinimise: true,
+    showDelete: true,
+    handleMinimisePointerEvents: false,
 };
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index ad6326a6a2..71a808a3b7 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -96,7 +96,6 @@ export default class MStickerBody extends MImageBody {
         }
 
         placeholderSize = placeholderSize + 'px';
-        console.warn('placeholder classes', this.state.placeholderClasses);
 
         return (
             <span className='mx_MStickerBody' ref='body'
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index f75cf50804..11074976d9 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -155,7 +155,10 @@ export default class Stickerpicker extends React.Component {
                             onEditClick={this._launchManageIntegrations}
                             onDeleteClick={this._removeStickerpickerWidgets}
                             showTitle={false}
-                            showMinimise={false}
+                            showMinimise={true}
+                            showDelete={false}
+                            onMinimiseClick={this.onHideStickersClick}
+                            handleMinimisePointerEvents={true}
                         />
                     </div>
                 </div>

From fdec4b36c928f803db9f0ab686fb02c35cdff9bc Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Thu, 8 Mar 2018 17:25:28 +0000
Subject: [PATCH 670/927] Hide padding if last control.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 0d209b1293..01008b4f8e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -568,7 +568,8 @@ export default class AppTile extends React.Component {
                         { /* Edit widget */ }
                         { showEditButton && <TintableSvgButton
                             src="img/edit_green.svg"
-                            className="mx_AppTileMenuBarWidget mx_AppTileMenuBarWidgetPadding"
+                            className={"mx_AppTileMenuBarWidget " +
+                              (this.props.showDelete ? "mx_AppTileMenuBarWidgetPadding" : "")}
                             title={_t('Edit')}
                             onClick={this._onEditClick}
                             width="10"

From e36ae3cedeb75c119cf19fba967d65255a3df622 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Thu, 8 Mar 2018 17:33:07 +0000
Subject: [PATCH 671/927] Fix context menu offset.

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 11074976d9..76ef0a8753 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -187,7 +187,7 @@ export default class Stickerpicker extends React.Component {
         const buttonRect = e.target.getBoundingClientRect();
 
         // The window X and Y offsets are to adjust position when zoomed in to page
-        const x = buttonRect.right + window.pageXOffset - 37;
+        const x = buttonRect.right + window.pageXOffset - 42;
         const y = (buttonRect.top + (buttonRect.height / 2) + window.pageYOffset) - 19;
         // const self = this;
         this.stickersMenu = ContextualMenu.createMenu(GenericElementContextMenu, {

From e7c19fd83b271a1895266e5418c9bcdfeec3a498 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Thu, 8 Mar 2018 23:12:12 +0000
Subject: [PATCH 672/927] Don't render placeholder when image is visible.

---
 src/components/views/messages/MStickerBody.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 71a808a3b7..8b5e0d1043 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -103,7 +103,7 @@ export default class MStickerBody extends MImageBody {
                     height: placeholderFixupHeight,
                 }}>
                 <div className={'mx_MStickerBody_thumbnail_container'}>
-
+                  { this.state.placeholderVisible &&
                     <div
                         className={'mx_MStickerBody_placeholder ' + this.state.placeholderClasses}
                         style={{
@@ -115,7 +115,7 @@ export default class MStickerBody extends MImageBody {
                             src={'img/icons-show-stickers.svg'}
                             width={placeholderSize}
                             height={placeholderSize} />
-                    </div>
+                    </div> }
                     <img
                         className={'mx_MStickerBody_thumbnail ' + this.state.thumbnailClasses}
                         src={thumbUrl}

From a33859326e21d1c3b7ff650d50f20c155174e2f8 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 9 Mar 2018 09:15:16 +0000
Subject: [PATCH 673/927] Use getUserWidgets where possible.

---
 src/ScalarMessaging.js |  7 ++-----
 src/utils/widgets.js   | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 7a9f85a9e0..2411fc6e6d 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -335,10 +335,7 @@ function setWidget(event, roomId) {
 
     if (userWidget) {
         const client = MatrixClientPeg.get();
-        let userWidgets = {};
-        if (client.getAccountData('m.widgets')) {
-          userWidgets = client.getAccountData('m.widgets').getContent();
-        }
+        const userWidgets = Widgets.getUserWidgets();
 
         // Delete existing widget with ID
         try {
@@ -408,7 +405,7 @@ function getWidgets(event, roomId) {
     }
 
     // Add user widgets (not linked to a specific room)
-    const userWidgets = Widgets.getUserWidgets();
+    const userWidgets = Widgets.getUserWidgetsArray();
     widgetStateEvents = widgetStateEvents.concat(userWidgets);
 
     sendResponse(event, widgetStateEvents);
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index da68abb4a9..c2eae88b17 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -7,7 +7,7 @@ import MatrixClientPeg from '../MatrixClientPeg';
  */
 function getWidgets(room) {
     const widgets = getRoomWidgets(room);
-    widgets.concat(getUserWidgets());
+    widgets.concat(getUserWidgetsArray());
     return widgets;
 }
 
@@ -29,7 +29,7 @@ function getRoomWidgets(room) {
 
 /**
  * Get user specific widgets (not linked to a specific room)
- * @return {[object]} Array containing current / active user widgets
+ * @return {object} Event content object containing current / active user widgets
  */
 function getUserWidgets() {
     const client = MatrixClientPeg.get();
@@ -41,7 +41,16 @@ function getUserWidgets() {
     if (userWidgets && userWidgets.getContent()) {
       userWidgetContent = userWidgets.getContent();
     }
-    return Object.keys(userWidgetContent).map((key) => userWidgetContent[key]);
+    return userWidgetContent;
+}
+
+/**
+ * Get user specific widgets (not linked to a specific room) as an array
+ * @return {[object]} Array containing current / active user widgets
+ */
+function getUserWidgetsArray() {
+  const userWidgetContent = getUserWidgets();
+  return Object.keys(userWidgetContent).map((key) => userWidgetContent[key]);
 }
 
 /**
@@ -49,7 +58,7 @@ function getUserWidgets() {
  * @return {[object]} Array containing current / active stickerpicker widgets
  */
 function getStickerpickerWidgets() {
-    const widgets = getUserWidgets();
+    const widgets = getUserWidgetsArray();
     const stickerpickerWidgets = widgets.filter((widget) => widget.type='m.stickerpicker');
     return stickerpickerWidgets;
 }
@@ -76,6 +85,7 @@ export default {
     getWidgets,
     getRoomWidgets,
     getUserWidgets,
+    getUserWidgetsArray,
     getStickerpickerWidgets,
     removeStickerpickerWidgets,
 };

From d4d8ed7797ce87bb48b276af71280877aa929fe1 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Fri, 9 Mar 2018 14:22:46 +0000
Subject: [PATCH 674/927] Translated using Weblate (Dutch)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 7ad3207162..d6fe9da118 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -981,5 +981,19 @@
     "Your identity server's URL": "De URL van je thuisserver",
     "<a>In reply to</a> <pill>": "<a>Als antwoord op</a> <pill>",
     "This room is not public. You will not be able to rejoin without an invite.": "Deze ruimte is niet publiekelijk. Je zal niet opnieuw kunnen toetreden zonder een uitnodiging.",
-    "were unbanned %(count)s times|one": "waren ontbant"
+    "were unbanned %(count)s times|one": "waren ontbant",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s heeft zijn/haar weergavenaam veranderd naar %(displayName)s.",
+    "Disable Community Filter Panel": "Gemeenschapsfilterpaneel uitzetten",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Je verzoek om sleutels te delen is verzonden - controleer je andere apparaten voor het verzoek.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Verzoeken om sleutels te delen worden automatisch naar andere apparaten verstuurd. Als je het verzoek hebt afgewezen of weg hebt geklikt, klik dan hier voor een nieuwe verzoek voor de sleutels van deze sessie.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Het is niet mogelijk om dit bericht te ontsleutelen als je andere apparaten er geen sleutel voor hebben.",
+    "Key request sent.": "Sleutel verzoek verstuurd.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Versleutelingssleutels opnieuw aanvragen</requestLink> van je andere apparaten.",
+    "%(user)s is a %(userRole)s": "%(user)s is een %(userRole)s",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Wist je dat: je gemeenschappen kan gebruiken om je Riot.im ervaring te filteren!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Sleep een gemeenschapsavatar naar het filterpaneel helemaal aan de linkerkant van het scherm om een filter te maken. Je kan dan altijd op de avatar in het filterpaneel klikken om alleen de ruimtes en mensen te zien die met die gemeenschap geassocieerd zijn.",
+    "Clear filter": "Filter vrijmaken",
+    "Failed to set direct chat tag": "Het is niet gelukt om de 'privégesprek' label in te stellen",
+    "Failed to remove tag %(tagName)s from room": "Het is niet gelukt om de label %(tagName)s van de ruimte te verwijderen",
+    "Failed to add tag %(tagName)s to room": "Het is niet gelukt om de label %(tagName)s aan deze ruimte toe te voegen"
 }

From b92e74bc60f468c90dd9e57befd96d6af3a7e405 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 9 Mar 2018 19:14:25 +0000
Subject: [PATCH 675/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 3a9c6bfad2..1eb3535ec9 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -988,5 +988,11 @@
     "Clear filter": "Szűrő törlése",
     "Disable Community Filter Panel": "Közösség keresési panel tiltása",
     "Did you know: you can use communities to filter your Riot.im experience!": "Tudtad, hogy a közösségeket használhatod a Riot.im élmény fokozásához?",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "A szűrő beállításához húzd a közösség avatarját a szűrő panel fölé a képernyő bal szélén. A szűrő panelen az avatarra kattintva bármikor leszűrheted azokat a szobákat és embereket akik a megadott közösséghez tartoznak."
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "A szűrő beállításához húzd a közösség avatarját a szűrő panel fölé a képernyő bal szélén. A szűrő panelen az avatarra kattintva bármikor leszűrheted azokat a szobákat és embereket akik a megadott közösséghez tartoznak.",
+    "Your key share request has been sent - please check your other devices for key share requests.": "A kulcs megosztási kérést elküldtük - ellenőrizd a többi eszközödön a kulcs megosztási kéréseket.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "A kulcs megosztási kérelem automatikusan el lett küldve a többi eszközödre. Ha elutasítottad vagy törölted a kérést a másik eszközön ide kattintva újra kérheted a kulcsokat.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ha a másik eszközödön nincs meg a kulcs az üzenet visszafejtéséhez akkor nem tudod visszafejteni.",
+    "Key request sent.": "Kulcs kérés elküldve.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Kulcsok újrakérése</requestLink> a többi eszközödtől.",
+    "%(user)s is a %(userRole)s": "%(user)s egy %(userRole)s"
 }

From 7e062090dec9e37de11e86868dd5cfb85143aad5 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 9 Mar 2018 21:12:56 +0000
Subject: [PATCH 676/927] Cleanup timeout before unmount.

---
 src/components/views/messages/MImageBody.js   |  6 ++++++
 src/components/views/messages/MStickerBody.js | 10 +++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js
index ceede48554..6a95b3c16e 100644
--- a/src/components/views/messages/MImageBody.js
+++ b/src/components/views/messages/MImageBody.js
@@ -204,6 +204,12 @@ export default class extends React.Component {
         this.unmounted = true;
         dis.unregister(this.dispatcherRef);
         this.context.matrixClient.removeListener('sync', this.onClientSync);
+        this._afterComponentWillUnmount();
+    }
+
+    // To be overridden by subclasses (e.g. MStickerBody) for further
+    // cleanup after componentWillUnmount
+    _afterComponentWillUnmount() {
     }
 
     onAction(payload) {
diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 8b5e0d1043..e1039ae66b 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -43,12 +43,13 @@ export default class MStickerBody extends MImageBody {
         this.setState({
             placeholderClasses: 'mx_MStickerBody_placeholder_invisible',
         });
-        setTimeout(() => {
+        const hidePlaceholderTimer = setTimeout(() => {
             this.setState({
                 placeholderVisible: false,
                 thumbnailClasses: 'mx_MStickerBody_thumbnail_visible',
             });
         }, 500);
+        this.setState({hidePlaceholderTimer});
     }
 
     _afterComponentDidMount() {
@@ -69,6 +70,13 @@ export default class MStickerBody extends MImageBody {
         }
     }
 
+    _afterComponentWillUnmount() {
+        if (this.state.hidePlaceholderTimer) {
+            clearTimeout(this.state.hidePlaceholderTimer);
+            this.setState({hidePlaceholderTimer: null});
+        }
+    }
+
     _messageContent(contentUrl, thumbUrl, content) {
         let tooltip;
         const tooltipBody = (

From 46f46ee2946b8a6253ebcbb2d893b25e2255a2de Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 9 Mar 2018 23:04:00 +0000
Subject: [PATCH 677/927] Simplify request mapping.

---
 src/MatrixPostMessageApi.js | 72 +++++++++++--------------------------
 1 file changed, 20 insertions(+), 52 deletions(-)

diff --git a/src/MatrixPostMessageApi.js b/src/MatrixPostMessageApi.js
index d6417f8764..303c7f596d 100644
--- a/src/MatrixPostMessageApi.js
+++ b/src/MatrixPostMessageApi.js
@@ -16,36 +16,6 @@ limitations under the License.
 
 import Promise from "bluebird";
 
-function defer() {
-    let resolve;
-    let reject;
-    let isPending = true;
-    const promise = new Promise(function(...args) {
-        resolve = args[0];
-        reject = args[1];
-    });
-    return {
-        resolve: function(...args) {
-            if (!isPending) {
-                return;
-            }
-            isPending = false;
-            resolve(args[0]);
-        },
-        reject: function(...args) {
-            if (!isPending) {
-                return;
-            }
-            isPending = false;
-            reject(args[0]);
-        },
-        isPending: function() {
-            return isPending;
-        },
-        promise: promise,
-    };
-}
-
 // NOTE: PostMessageApi only handles message events with a data payload with a
 // response field
 export default class PostMessageApi {
@@ -53,8 +23,8 @@ export default class PostMessageApi {
         this._window = targetWindow || window.parent; // default to parent window
         this._timeoutMs = timeoutMs || 5000; // default to 5s timer
         this._counter = 0;
-        this._pending = {
-            // $ID: Deferred
+        this._requestMap = {
+            // $ID: {resolve, reject}
         };
     }
 
@@ -82,15 +52,12 @@ export default class PostMessageApi {
             if (payload.response === undefined) {
                 return;
             }
-            const deferred = self._pending[payload._id];
-            if (!deferred) {
+            const promise = self._requestMap[payload._id];
+            if (!promise) {
                 return;
             }
-            if (!deferred.isPending()) {
-                return;
-            }
-            delete self._pending[payload._id];
-            deferred.resolve(payload);
+            delete self._requestMap[payload._id];
+            promise.resolve(payload);
         };
         return this._onMsgCallback;
     }
@@ -99,19 +66,20 @@ export default class PostMessageApi {
         this._counter += 1;
         target = target || "*";
         action._id = Date.now() + "-" + Math.random().toString(36) + "-" + this._counter;
-        const d = defer();
-        this._pending[action._id] = d;
-        this._window.postMessage(action, target);
 
-        if (this._timeoutMs > 0) {
-            setTimeout(function() {
-                if (!d.isPending()) {
-                    return;
-                }
-                console.error("postMessage request timed out. Sent object: " + JSON.stringify(action));
-                d.reject(new Error("Timed out"));
-            }, this._timeoutMs);
-        }
-        return d.promise;
+        return new Promise((resolve, reject) => {
+            this._requestMap[action._id] = {resolve, reject};
+            this._window.postMessage(action, target);
+
+            if (this._timeoutMs > 0) {
+                setTimeout(() => {
+                    if (!this._requestMap[action._id]) {
+                        return;
+                    }
+                    console.error("postMessage request timed out. Sent object: " + JSON.stringify(action));
+                    this._requestMap[action._id].reject(new Error("Timed out"));
+                }, this._timeoutMs);
+            }
+        });
     }
 }

From bf41b7b91f960f4e38f5c5234cda87793d4d3665 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Sat, 10 Mar 2018 10:37:18 +0000
Subject: [PATCH 678/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 6acf7da82c..ea4c485494 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -988,5 +988,11 @@
     "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Експортираният файл може да бъде предпазен с парола. Трябва да въведете парола тук, за да разшифровате файла.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли, че: може да използвате общности, за да филтрирате Вашето Riot.im преживяване!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност.",
-    "Disable Community Filter Panel": "Изключи панела за филтриране на общности"
+    "Disable Community Filter Panel": "Изключи панела за филтриране на общности",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Заявката за споделяне на ключ е изпратена. Моля, проверете другите си устройства за заявка за споделяне.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Заявки за споделяне на ключове са изпратени автоматично към другите Ви устройства. Ако ги откажете на другите устройства, натиснете тук, за да заявите нови за тази сесия.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ако другите Ви устройства нямат ключ за това съобщение, няма да можете да ги разшифровате.",
+    "Key request sent.": "Заявката за ключ е изпратена.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Отново заявени ключове за шифроване</requestLink> от Вашите други устройства.",
+    "%(user)s is a %(userRole)s": "%(user)s е %(userRole)s"
 }

From 46d1328af4254ae198295399ebc2635df2398b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA=D0=BE=20=D0=9C=2E=20=D0=9A=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=9B?= <marko.m.kostic@gmail.com>
Date: Sun, 11 Mar 2018 14:07:51 +0000
Subject: [PATCH 679/927] Translated using Weblate (Serbian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index 8b609d3bde..59a5695bfe 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -988,5 +988,12 @@
     "Import": "Увези",
     "Disable Community Filter Panel": "Онемогући површ за филтрирање  заједнице",
     "Did you know: you can use communities to filter your Riot.im experience!": "Да ли сте знали: можете користити заједнице за филтрирање вашег Riot.im искуства!",
-    "Clear filter": "Очисти филтер"
+    "Clear filter": "Очисти филтер",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Ваш захтев за дељење кључа је послат. Проверите да ли има захтева за дељење кључа на осталим вашим уређајима.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Захтеви за дељење кључа се самостално шаљу на остале ваше уређаје. Ако сте одбили или одбацили захтев за дељење кључа на неком другом вашем уређају, кликните овде да бисте затражили поново кључеве за ову сесију.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ако остали ваши уређаји немају кључ за ову поруку, нећете моћи да је дешифрујете.",
+    "Key request sent.": "Захтев за дељење кључа послат.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Поново затражи кључеве за шифровање</requestLink> са осталих ваших уређаја.",
+    "%(user)s is a %(userRole)s": "Корисник %(user)s је у улози %(userRole)s",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Да бисте поставили филтер, повуците аватар заједнице на површ филтрирања скроз на леву страну екрана. Можете кликнути на аватар у површи филтрирања било када да бисте видели само собе и особе везане за ту заједницу."
 }

From d1961ab111f93132220c5d32f9d0c3208a9a51a0 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Mon, 12 Mar 2018 12:00:43 +0000
Subject: [PATCH 680/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index ea4c485494..7b8a1e32d0 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -990,9 +990,9 @@
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност.",
     "Disable Community Filter Panel": "Изключи панела за филтриране на общности",
     "Your key share request has been sent - please check your other devices for key share requests.": "Заявката за споделяне на ключ е изпратена. Моля, проверете другите си устройства за заявка за споделяне.",
-    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Заявки за споделяне на ключове са изпратени автоматично към другите Ви устройства. Ако ги откажете на другите устройства, натиснете тук, за да заявите нови за тази сесия.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Заявки за споделяне на ключове са изпратени автоматично към другите Ви устройства. Ако ги откажете, натиснете тук, за да заявите нови за тази сесия.",
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ако другите Ви устройства нямат ключ за това съобщение, няма да можете да ги разшифровате.",
     "Key request sent.": "Заявката за ключ е изпратена.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Отново заявени ключове за шифроване</requestLink> от Вашите други устройства.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Заяви отново ключове за шифроване</requestLink> от Вашите други устройства.",
     "%(user)s is a %(userRole)s": "%(user)s е %(userRole)s"
 }

From 5854c5f42c575bf62b2ec54e3c75a2e850203283 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Sat, 10 Mar 2018 15:46:34 +0000
Subject: [PATCH 681/927] Translated using Weblate (Russian)

Currently translated at 99.7% (993 of 995 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 0f4f51b73b..1f36b1af0d 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -988,5 +988,9 @@
     "Clear filter": "Очистить фильтр",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Чтобы настроить фильтр, перетащите аватар сообщества на панель фильтров в левой части экрана. Вы можете нажать на аватар в панели фильтров в любое время, чтобы увидеть только комнаты и людей, связанных с этим сообществом.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли вы: вы можете использовать сообщества, чтобы фильтровать в Riot.im!",
-    "Disable Community Filter Panel": "Отключить панель фильтра сообщества"
+    "Disable Community Filter Panel": "Отключить панель фильтра сообщества",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Если у других устройств нет ключа для этого сообщения, вы не сможете его расшифровать.",
+    "Key request sent.": "Запрос ключа отправлен.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Повторно запросить ключи шифрования</requestLink> с других устройств.",
+    "%(user)s is a %(userRole)s": "%(user)s яаляется %(userRole)s"
 }

From b2d23b6999333ae1922cfa66857e0311944c6392 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 12 Mar 2018 13:56:02 +0000
Subject: [PATCH 682/927] Switch to 'm.sticker' message events. Allow
 whitelisting of wisget capabilities.

---
 src/WidgetMessaging.js                        |  4 +-
 src/components/structures/FilePanel.js        |  2 +-
 src/components/views/elements/AppTile.js      | 43 +++++++++++++++----
 src/components/views/messages/MessageEvent.js |  2 +-
 src/components/views/rooms/EventTile.js       |  2 +-
 src/components/views/rooms/Stickerpicker.js   |  1 +
 6 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 50013a1c30..93fee6133b 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -195,8 +195,8 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
                 api: INBOUND_API_NAME,
                 version: WIDGET_API_VERSION,
             });
-        } else if (action === 'sticker_message') {
-            dis.dispatch({action: 'sticker_message', data: event.data.widgetData, widgetId: event.data.widgetId});
+        } else if (action === 'm.sticker') {
+            dis.dispatch({action: 'm.sticker', data: event.data.widgetData, widgetId: event.data.widgetId});
         } else if (action === 'integration_manager_open') {
             // Close the stickerpicker
             dis.dispatch({action: 'stickerpicker_close'});
diff --git a/src/components/structures/FilePanel.js b/src/components/structures/FilePanel.js
index bd03683830..3249cae22c 100644
--- a/src/components/structures/FilePanel.js
+++ b/src/components/structures/FilePanel.js
@@ -69,7 +69,7 @@ const FilePanel = React.createClass({
                         "timeline": {
                             "contains_url": true,
                             "not_types": [
-                                "m.room.sticker",
+                                "m.sticker",
                             ],
                         },
                     },
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 01008b4f8e..e408d752a8 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -72,7 +72,9 @@ export default class AppTile extends React.Component {
             error: null,
             deleting: false,
             widgetPageTitle: newProps.widgetPageTitle,
-            capabilities: [],
+            allowedCapabilities: (this.props.whitelistCapabilities && this.props.whitelistCapabilities.length > 0) ?
+                this.props.whitelistCapabilities : [],
+            requestedCapabilities: [],
         };
     }
 
@@ -82,7 +84,7 @@ export default class AppTile extends React.Component {
      * @return {Boolean}            True if capability supported
      */
     _hasCapability(capability) {
-        return this.state.capabilities.some((c) => {return c === capability;});
+        return this.state.allowedCapabilities.some((c) => {return c === capability;});
     }
 
     /**
@@ -341,10 +343,27 @@ export default class AppTile extends React.Component {
         this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
         this.widgetMessaging.startListening();
         this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
-        this.widgetMessaging.getCapabilities().then((capabilities) => {
-            console.log("Got widget capabilities", this.props.id, capabilities);
-            capabilities = capabilities || [];
-            this.setState({capabilities});
+        this.widgetMessaging.getCapabilities().then((requestedCapabilities) => {
+            console.log(`Widget ${this.props.id} requested capabilities:`, requestedCapabilities);
+            requestedCapabilities = requestedCapabilities || [];
+
+            // Allow whitelisted capabilities
+            const requestedWhitelistCapabilies =
+                requestedCapabilities.filter(function(e) {
+                    return this.indexOf(e)>=0;
+                }, this.props.whitelistCapabilities);
+            console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties:`,
+                requestedWhitelistCapabilies);
+
+            // TODO -- Add UI to warn about and optionally allow requested capabilities
+            this.setState({
+                requestedCapabilities,
+                allowedCapabilities: this.state.allowedCapabilities.concat(requestedWhitelistCapabilies),
+            });
+
+            if (this.props.onCapabilityRequest) {
+                this.props.onCapabilityRequest(requestedCapabilities);
+            }
         }).catch((err) => {
             console.log("Failed to get widget capabilities", this.widgetId, err);
         });
@@ -354,8 +373,8 @@ export default class AppTile extends React.Component {
     _onWidgetAction(payload) {
         if (payload.widgetId === this.props.id) {
             switch (payload.action) {
-                case 'sticker_message':
-                if (this._hasCapability('sticker_message')) {
+                case 'm.sticker':
+                if (this._hasCapability('m.sticker')) {
                     dis.dispatch({action: 'post_sticker_message', data: payload.data});
                 } else {
                     console.warn('Ignoring sticker message. Invalid capability');
@@ -626,6 +645,13 @@ AppTile.propTypes = {
     handleMinimisePointerEvents: PropTypes.bool,
     // Optionally hide the delete icon
     showDelete: PropTypes.bool,
+    // Widget apabilities to allow by default (without user confirmation)
+    // NOTE -- Use with caution. This is intended to aid better integration / UX
+    // basic widget capabilities, e.g. injecting sticker message events.
+    whitelistCapabilities: PropTypes.array,
+    // Optional function to be called on widget capability request
+    // Called with an array of the requested capabilities
+    onCapabilityRequest: PropTypes.func,
 };
 
 AppTile.defaultProps = {
@@ -636,4 +662,5 @@ AppTile.defaultProps = {
     showMinimise: true,
     showDelete: true,
     handleMinimisePointerEvents: false,
+    whitelistCapabilities: [],
 };
diff --git a/src/components/views/messages/MessageEvent.js b/src/components/views/messages/MessageEvent.js
index 080a756db7..7358e297c7 100644
--- a/src/components/views/messages/MessageEvent.js
+++ b/src/components/views/messages/MessageEvent.js
@@ -65,7 +65,7 @@ module.exports = React.createClass({
         let BodyType = UnknownBody;
         if (msgtype && bodyTypes[msgtype]) {
             BodyType = bodyTypes[msgtype];
-        } else if (this.props.mxEvent.getType() === 'm.room.sticker') {
+        } else if (this.props.mxEvent.getType() === 'm.sticker') {
             BodyType = sdk.getComponent('messages.MStickerBody');
         } else if (content.url) {
             // Fallback to MFileBody if there's a content URL
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 50c8ddd67e..0d587b0e7b 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -36,7 +36,7 @@ const ObjectUtils = require('../../../ObjectUtils');
 
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
-    'm.room.sticker': 'messages.MessageEvent',
+    'm.sticker': 'messages.MessageEvent',
     'm.call.invite': 'messages.TextualEvent',
     'm.call.answer': 'messages.TextualEvent',
     'm.call.hangup': 'messages.TextualEvent',
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 76ef0a8753..1171ad1ee0 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -159,6 +159,7 @@ export default class Stickerpicker extends React.Component {
                             showDelete={false}
                             onMinimiseClick={this.onHideStickersClick}
                             handleMinimisePointerEvents={true}
+                            whitelistCapabilities={['m.sticker']}
                         />
                     </div>
                 </div>

From ac859381867b3b2d3cf1686b6c9168b8a242769e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Mar 2018 15:23:22 +0000
Subject: [PATCH 683/927] Fix syntax fail

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

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 5735a99125..334ecdc984 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -82,7 +82,7 @@ module.exports = React.createClass({
         }
     },
 
-    onClientSync(syncState, prevState) {
+    onClientSync: function(syncState, prevState) {
         if (this.unmounted) return;
 
         // Consider the client reconnected if there is no error with syncing.

From d416b9d7d1f1efd49022c6f163af5df748487e2d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Mar 2018 15:24:32 +0000
Subject: [PATCH 684/927] Copyright

---
 src/components/views/avatars/BaseAvatar.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/avatars/BaseAvatar.js b/src/components/views/avatars/BaseAvatar.js
index 334ecdc984..6fb86c9cd8 100644
--- a/src/components/views/avatars/BaseAvatar.js
+++ b/src/components/views/avatars/BaseAvatar.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 5885104c3a284dc0b4b3472e73ea763d7253272f Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 12 Mar 2018 12:10:13 +0000
Subject: [PATCH 685/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 7b8a1e32d0..50092f595f 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -989,10 +989,10 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "Знаете ли, че: може да използвате общности, за да филтрирате Вашето Riot.im преживяване!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "За да създадете филтър, дръпнете и пуснете аватара на общността върху панела за филтриране в най-лявата част на екрана. По всяко време може да натиснете върху аватар от панела, за да видите само стаите и хората от тази общност.",
     "Disable Community Filter Panel": "Изключи панела за филтриране на общности",
-    "Your key share request has been sent - please check your other devices for key share requests.": "Заявката за споделяне на ключ е изпратена. Моля, проверете другите си устройства за заявка за споделяне.",
-    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Заявки за споделяне на ключове са изпратени автоматично към другите Ви устройства. Ако ги откажете, натиснете тук, за да заявите нови за тази сесия.",
-    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ако другите Ви устройства нямат ключ за това съобщение, няма да можете да ги разшифровате.",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Заявката за споделяне на ключ е изпратена. Моля, проверете заявките за споделяне на другите Ви устройства.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Заявки за споделяне на ключове се изпращат автоматично към другите Ви устройства. Ако сте ги отхвърлили от другите устройства, натиснете тук, за да заявите нови за тази сесия.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ако другите Ви устройства нямат ключа за това съобщение, няма да можете да го разшифровате.",
     "Key request sent.": "Заявката за ключ е изпратена.",
-    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Заяви отново ключове за шифроване</requestLink> от Вашите други устройства.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Заявете отново ключове за шифроване</requestLink> от другите Ви устройства.",
     "%(user)s is a %(userRole)s": "%(user)s е %(userRole)s"
 }

From 791ef027152c3db30931919246a18798a3e7f4c7 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 12 Mar 2018 12:09:57 +0000
Subject: [PATCH 686/927] Translated using Weblate (Russian)

Currently translated at 99.7% (993 of 995 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1f36b1af0d..39908e6f9f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -992,5 +992,5 @@
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Если у других устройств нет ключа для этого сообщения, вы не сможете его расшифровать.",
     "Key request sent.": "Запрос ключа отправлен.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Повторно запросить ключи шифрования</requestLink> с других устройств.",
-    "%(user)s is a %(userRole)s": "%(user)s яаляется %(userRole)s"
+    "%(user)s is a %(userRole)s": "%(user)s является %(userRole)s"
 }

From 0a480b05aa5d289bc79d078b05f20aa68dd71241 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 12 Mar 2018 17:23:31 +0000
Subject: [PATCH 687/927] Show GroupMemberList after inviting a group member

because we might be looking at a member when inviting a new
member.

See https://github.com/vector-im/riot-web/pull/6303
---
 src/GroupAddressPicker.js | 44 ++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/GroupAddressPicker.js b/src/GroupAddressPicker.js
index ef9010cbf2..c45a335ab6 100644
--- a/src/GroupAddressPicker.js
+++ b/src/GroupAddressPicker.js
@@ -22,28 +22,30 @@ import MatrixClientPeg from './MatrixClientPeg';
 import GroupStoreCache from './stores/GroupStoreCache';
 
 export function showGroupInviteDialog(groupId) {
-    const description = <div>
-        <div>{ _t("Who would you like to add to this community?") }</div>
-        <div className="warning">
-            { _t(
-                "Warning: any person you add to a community will be publicly "+
-                "visible to anyone who knows the community ID",
-            ) }
-        </div>
-    </div>;
+    return new Promise((resolve, reject) => {
+        const description = <div>
+            <div>{ _t("Who would you like to add to this community?") }</div>
+            <div className="warning">
+                { _t(
+                    "Warning: any person you add to a community will be publicly "+
+                    "visible to anyone who knows the community ID",
+                ) }
+            </div>
+        </div>;
 
-    const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
-    Modal.createTrackedDialog('Group Invite', '', AddressPickerDialog, {
-        title: _t("Invite new community members"),
-        description: description,
-        placeholder: _t("Name or matrix ID"),
-        button: _t("Invite to Community"),
-        validAddressTypes: ['mx-user-id'],
-        onFinished: (success, addrs) => {
-            if (!success) return;
+        const AddressPickerDialog = sdk.getComponent("dialogs.AddressPickerDialog");
+        Modal.createTrackedDialog('Group Invite', '', AddressPickerDialog, {
+            title: _t("Invite new community members"),
+            description: description,
+            placeholder: _t("Name or matrix ID"),
+            button: _t("Invite to Community"),
+            validAddressTypes: ['mx-user-id'],
+            onFinished: (success, addrs) => {
+                if (!success) return;
 
-            _onGroupInviteFinished(groupId, addrs);
-        },
+                _onGroupInviteFinished(groupId, addrs).then(resolve, reject);
+            },
+        });
     });
 }
 
@@ -87,7 +89,7 @@ function _onGroupInviteFinished(groupId, addrs) {
 
     const addrTexts = addrs.map((addr) => addr.address);
 
-    multiInviter.invite(addrTexts).then((completionStates) => {
+    return multiInviter.invite(addrTexts).then((completionStates) => {
         // Show user any errors
         const errorList = [];
         for (const addr of Object.keys(completionStates)) {

From 8ddbd09f4f92ad664eeef1096c38ec28e6483a4b Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 12 Mar 2018 19:51:22 +0000
Subject: [PATCH 688/927] Translated using Weblate (Russian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 39908e6f9f..dfb1fb5da7 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -992,5 +992,7 @@
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Если у других устройств нет ключа для этого сообщения, вы не сможете его расшифровать.",
     "Key request sent.": "Запрос ключа отправлен.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Повторно запросить ключи шифрования</requestLink> с других устройств.",
-    "%(user)s is a %(userRole)s": "%(user)s является %(userRole)s"
+    "%(user)s is a %(userRole)s": "%(user)s является %(userRole)s",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Ваш запрос на передачу ключей отправлен - пожалуйста, проверьте другие ваши устройства на запросы передачи ключей.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Запросы передачи ключей автоматически отправляются на другие устройства. Если вы отклонили или отменили запрос на передачу ключей на других устройствах, нажмите здесь, чтобы запросить ключи для этого сеанса повторно."
 }

From a81269cba850f6def5bb50bfcd3eeb9dc4efd538 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 13 Mar 2018 10:07:27 +0000
Subject: [PATCH 689/927] Check if user widget.

---
 src/ScalarMessaging.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 2411fc6e6d..fdb163d81d 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -628,12 +628,14 @@ const onMessage = function(event) {
     // Get and set user widgets (not associated with a specific room)
     // If roomId is specified, it must be validated, so room-based widgets agreed
     // handled further down.
-    if (event.data.action === "get_widgets") {
-        getWidgets(event, null);
-        return;
-    } else if (event.data.action === "set_widget") {
-        setWidget(event, null);
-        return;
+    if (event.data.userWidget) {
+        if (event.data.action === "get_widgets") {
+            getWidgets(event, null);
+            return;
+        } else if (event.data.action === "set_widget") {
+            setWidget(event, null);
+            return;
+        }
     }
 
     if (!roomId) {
@@ -661,10 +663,10 @@ const onMessage = function(event) {
 
         // Get and set room-based widgets
         if (event.data.action === "get_widgets") {
-            getWidgets(event, null);
+            getWidgets(event, roomId);
             return;
         } else if (event.data.action === "set_widget") {
-            setWidget(event, null);
+            setWidget(event, roomId);
             return;
         }
 

From de3329400090302b2c4ac7c794a62e82adc5b098 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 13 Mar 2018 10:07:49 +0000
Subject: [PATCH 690/927] Center loading spinner.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index e408d752a8..afed9289f8 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -496,7 +496,7 @@ export default class AppTile extends React.Component {
 
         if (this.props.show) {
             const loadingElement = (
-                <div className='mx_AppTileBody mx_AppLoading'>
+                <div>
                     <MessageSpinner msg='Loading...' />
                 </div>
             );
@@ -511,7 +511,7 @@ export default class AppTile extends React.Component {
                     );
                 } else {
                     appTileBody = (
-                        <div className={this.state.loading ? 'mx_AppTileBody mx_AppLoading' : 'mx_AppTileBody'}>
+                        <div className={'mx_AppTileBody ' + (this.state.loading ? 'mx_AppLoading' : '')}>
                             { this.state.loading && loadingElement }
                             { /*
                                 The "is" attribute in the following iframe tag is needed in order to enable rendering of the

From 53b716bad648f2ad3148e31816a5ecf9f61f4b48 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 13 Mar 2018 10:51:01 +0000
Subject: [PATCH 691/927] Throw capability request exception.

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

diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index 93fee6133b..bae71bdc8f 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -277,8 +277,7 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
         return this.exec({
                 api: OUTBOUND_API_NAME,
                 action: "capabilities",
-            }).then((response) => response.capabilities)
-            .catch((error) => new Error("Failed to get capabilities: " + error.message));
+            }).then((response) => response.capabilities);
     }
 }
 

From f820374f9fd27433eb831192e83765998d2a08f4 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 13 Mar 2018 11:01:51 +0000
Subject: [PATCH 692/927] Logging.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index afed9289f8..b29b2ae8a2 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -365,7 +365,7 @@ export default class AppTile extends React.Component {
                 this.props.onCapabilityRequest(requestedCapabilities);
             }
         }).catch((err) => {
-            console.log("Failed to get widget capabilities", this.widgetId, err);
+            console.log(`Failed to get capabilities for widget type ${this.props.type}`, this.props.id, err);
         });
         this.setState({loading: false});
     }

From 35cc443562903b286e2e92ca550fbc9eb33fa83c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Mar 2018 11:35:15 +0000
Subject: [PATCH 693/927] Limit group requests to 3 at once

using a FIFO queue.

This is needed in order to lower the priority of getting group
state and prioritise everything else, namely initial sync.

It should be noted that this by no means guarantees that the
first incremental sync will happen sooner; the client could
end up doing some other requests first instead.
---
 src/stores/GroupStore.js | 65 +++++++++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index c3465b684c..2ea69b61aa 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -27,6 +27,48 @@ function parseRoomsResponse(response) {
     return response.chunk.map((apiRoom) => groupRoomFromApiObject(apiRoom));
 }
 
+// The number of ongoing group requests
+let ongoingRequestCount = 0;
+
+// This has arbitrarily been set to a small number to lower the priority
+// of doing group-related requests because we care about other important
+// requests like hitting /sync.
+const LIMIT = 3; // Maximum number of ongoing group requests
+
+// FIFO queue of functions to call in the backlog
+const backlogQueue = [
+    // () => {...}
+];
+
+// Pull from the FIFO queue
+function checkBacklog() {
+    const item = backlogQueue.shift();
+    if (typeof item === 'function') item();
+}
+
+// Limit the maximum number of ongoing promises returned by fn to LIMIT and
+// use a FIFO queue to handle the backlog.
+function limitConcurrency(fn) {
+    return new Promise((resolve, reject) => {
+        const item = () => {
+            ongoingRequestCount++;
+            resolve();
+        };
+        if (ongoingRequestCount >= LIMIT) {
+            // Enqueue this request for later execution
+            backlogQueue.push(item);
+        } else {
+            item();
+        }
+    })
+    .then(fn)
+    .then((result) => {
+        ongoingRequestCount--;
+        checkBacklog();
+        return result;
+    });
+}
+
 /**
  * Stores the group summary for a room and provides an API to change it and
  * other useful group APIs that may have an effect on the group summary.
@@ -56,23 +98,24 @@ export default class GroupStore extends EventEmitter {
         this._fetchResourcePromise = {};
         this._resourceFetcher = {
             [GroupStore.STATE_KEY.Summary]: () => {
-                return MatrixClientPeg.get()
-                    .getGroupSummary(this.groupId);
+                return limitConcurrency(
+                    () => MatrixClientPeg.get().getGroupSummary(this.groupId),
+                );
             },
             [GroupStore.STATE_KEY.GroupRooms]: () => {
-                return MatrixClientPeg.get()
-                    .getGroupRooms(this.groupId)
-                    .then(parseRoomsResponse);
+                return limitConcurrency(
+                    () => MatrixClientPeg.get().getGroupRooms(this.groupId).then(parseRoomsResponse),
+                );
             },
             [GroupStore.STATE_KEY.GroupMembers]: () => {
-                return MatrixClientPeg.get()
-                    .getGroupUsers(this.groupId)
-                    .then(parseMembersResponse);
+                return limitConcurrency(
+                    () => MatrixClientPeg.get().getGroupUsers(this.groupId).then(parseMembersResponse),
+                );
             },
             [GroupStore.STATE_KEY.GroupInvitedMembers]: () => {
-                return MatrixClientPeg.get()
-                    .getGroupInvitedUsers(this.groupId)
-                    .then(parseMembersResponse);
+                return limitConcurrency(
+                    () => MatrixClientPeg.get().getGroupInvitedUsers(this.groupId).then(parseMembersResponse),
+                );
             },
         };
 

From 917960449b10181b7f91ac00dbd67746d6cdd1cc Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Mon, 12 Mar 2018 19:33:57 +0000
Subject: [PATCH 694/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 50092f595f..4968907a81 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -554,7 +554,7 @@
     "Password:": "Парола:",
     "An email has been sent to %(emailAddress)s": "Имейл беше изпратен на %(emailAddress)s",
     "Please check your email to continue registration.": "Моля, проверете имейла си, за да продължите регистрацията.",
-    "Token incorrect": "Неправителен token",
+    "Token incorrect": "Неправителен тоукън",
     "A text message has been sent to %(msisdn)s": "Текстово съобщение беше изпратено на %(msisdn)s",
     "Please enter the code it contains:": "Моля, въведете кода, който то съдържа:",
     "Start authentication": "Започни автентикация",
@@ -877,7 +877,7 @@
     "Account": "Акаунт",
     "To return to your account in future you need to set a password": "За да се върнете в профила си в бъдеще, трябва да зададете парола",
     "Logged in as:": "Влезли сте като:",
-    "Access Token:": "Token за достъп:",
+    "Access Token:": "Тоукън за достъп:",
     "click to reveal": "натиснете за показване",
     "Homeserver is": "Home сървър:",
     "Identity Server is": "Сървър за самоличност:",

From 65e60676eb80ccf7a008024cae6196dccf998c75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n?= <fordrio.libfrid@antichef.com>
Date: Tue, 13 Mar 2018 09:07:14 +0000
Subject: [PATCH 695/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 1eb3535ec9..5e0e5ac9fa 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -2,18 +2,18 @@
     "Cancel": "Mégse",
     "Search": "Keresés",
     "OK": "Rendben",
-    "Custom Server Options": "Egyedi szerver beállítások",
-    "Dismiss": "Eltűntet",
+    "Custom Server Options": "Egyedi szerverbeállítások",
+    "Dismiss": "Eltüntet",
     "Error": "Hiba",
-    "Failed to forget room %(errCode)s": "Nem lehet eltávolítani a szobát: %(errCode)s",
+    "Failed to forget room %(errCode)s": "Nem sikerült elfelejteni a szobát: %(errCode)s",
     "Favourite": "Kedvenc",
     "Mute": "Elnémít",
     "Notifications": "Értesítések",
-    "Operation failed": "Művelet sikertelen",
-    "powered by Matrix": "Matrixon alapul",
-    "Remove": "Törlés",
+    "Operation failed": "Sikertelen művelet",
+    "powered by Matrix": "A Matrix hajtja",
+    "Remove": "Eltávolítás",
     "Settings": "Beállítások",
-    "unknown error code": "ismeretlen hiba kód",
+    "unknown error code": "ismeretlen hibakód",
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Elküldtük a szöveges üzenetet ide: +%(msisdn)s. Kérlek add meg az ellenőrző kódot ami benne van",
     "Accept": "Elfogad",
     "%(targetName)s accepted an invitation.": "%(targetName)s elfogadta a meghívást.",
@@ -45,7 +45,7 @@
     "Failed to change password. Is your password correct?": "Nem sikerült megváltoztatni a jelszót. Helyesen írtad be a jelszavadat?",
     "Continue": "Folytatás",
     "Create new room": "Új szoba létrehozása",
-    "Close": "Bezár",
+    "Close": "Bezárás",
     "Room directory": "Szobák listája",
     "Start chat": "Csevegés indítása",
     "%(items)s and %(lastItem)s": "%(items)s és %(lastItem)s",
@@ -598,7 +598,7 @@
     "Drop file here to upload": "Feltöltéshez húzz ide egy fájlt",
     " (unsupported)": " (nem támogatott)",
     "Ongoing conference call%(supportedText)s.": "Folyamatban lévő konferencia hívás %(supportedText)s.",
-    "Online": "Elérhető",
+    "Online": "Online",
     "Idle": "Várakozik",
     "Offline": "Nem érhető el",
     "Start chatting": "Csevegés indítása",
@@ -771,7 +771,7 @@
     "Unnamed room": "Névtelen szoba",
     "World readable": "Nyilvános",
     "Guests can join": "Vendégek is csatlakozhatnak",
-    "No rooms to show": "Nincsenek megjelenítendő szobák",
+    "No rooms to show": "Nincsenek megjeleníthető szobák",
     "Invalid community ID": "Érvénytelen közösségi azonosító",
     "'%(groupId)s' is not a valid community ID": "%(groupId)s nem egy érvényes közösségi azonosító",
     "New community ID (e.g. +foo:%(localDomain)s)": "Új közösségi azonosító (pl.: +foo:%(localDomain)s)",

From 7d13edc67a84f746a62f9324ab947fe69733058f Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 13 Mar 2018 11:58:18 +0000
Subject: [PATCH 696/927] Get user widgets by default (if roomID is not
 specified).

---
 src/ScalarMessaging.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index fdb163d81d..351c178da4 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -624,24 +624,22 @@ const onMessage = function(event) {
     const roomId = event.data.room_id;
     const userId = event.data.user_id;
 
-    // These APIs don't require roomId
-    // Get and set user widgets (not associated with a specific room)
-    // If roomId is specified, it must be validated, so room-based widgets agreed
-    // handled further down.
-    if (event.data.userWidget) {
+    if (!roomId) {
+        // These APIs don't require roomId
+        // Get and set user widgets (not associated with a specific room)
+        // If roomId is specified, it must be validated, so room-based widgets agreed
+        // handled further down.
         if (event.data.action === "get_widgets") {
             getWidgets(event, null);
             return;
         } else if (event.data.action === "set_widget") {
             setWidget(event, null);
             return;
+        } else {
+            sendError(event, _t('Missing room_id in request'));
+            return;
         }
     }
-
-    if (!roomId) {
-        sendError(event, _t('Missing room_id in request'));
-        return;
-    }
     let promise = Promise.resolve(currentRoomId);
     if (!currentRoomId) {
         if (!currentRoomAlias) {

From 8b311c706c0b0aa8c8b105cb7597f638094117d3 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 13 Mar 2018 11:58:47 +0000
Subject: [PATCH 697/927] Null guard widget listener

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index b29b2ae8a2..bedc9b09b9 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -170,8 +170,10 @@ export default class AppTile extends React.Component {
 
         // Widget postMessage listeners
         try {
-            this.widgetMessaging.stopListening();
-            this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+            if (this.widgetMessaging) {
+                this.widgetMessaging.stopListening();
+                this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+            }
         } catch (e) {
             console.error('Failed to stop listening for widgetMessaging events', e.message);
         }

From 66ea78de6562468d07c916eb922b6047790bc5e5 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Tue, 13 Mar 2018 11:59:15 +0000
Subject: [PATCH 698/927] Clean up whitelisted permission addition / logging.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index bedc9b09b9..02f6beba9e 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -350,12 +350,18 @@ export default class AppTile extends React.Component {
             requestedCapabilities = requestedCapabilities || [];
 
             // Allow whitelisted capabilities
-            const requestedWhitelistCapabilies =
-                requestedCapabilities.filter(function(e) {
+            let requestedWhitelistCapabilies = [];
+
+            if (this.props.whitelistCapabilities && this.props.whitelistCapabilities.length > 0) {
+                requestedWhitelistCapabilies = requestedCapabilities.filter(function(e) {
                     return this.indexOf(e)>=0;
                 }, this.props.whitelistCapabilities);
-            console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties:`,
-                requestedWhitelistCapabilies);
+
+                if (requestedWhitelistCapabilies.length > 0 ) {
+                    console.warn(`Widget ${this.props.id} allowing requested, whitelisted properties:`,
+                        requestedWhitelistCapabilies);
+                }
+            }
 
             // TODO -- Add UI to warn about and optionally allow requested capabilities
             this.setState({

From 4f4441fb07dcdfb831e4b54b9f8d7e611c172f29 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 13 Mar 2018 17:15:16 +0000
Subject: [PATCH 699/927] Only use `dangerouslySetInnerHTML` for HTML messages

...and plain messages with emoji that we replace with <img> tags
amonst the html-escaped `content.body`.
---
 src/HtmlUtils.js | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/HtmlUtils.js b/src/HtmlUtils.js
index 5c6cbd6c1b..e3b7ba47f5 100644
--- a/src/HtmlUtils.js
+++ b/src/HtmlUtils.js
@@ -410,8 +410,7 @@ class TextHighlighter extends BaseHighlighter {
      * opts.disableBigEmoji: optional argument to disable the big emoji class.
      */
 export function bodyToHtml(content, highlights, opts={}) {
-    const isHtml = (content.format === "org.matrix.custom.html");
-    const body = isHtml ? content.formatted_body : escape(content.body);
+    let isHtml = (content.format === "org.matrix.custom.html");
 
     let bodyHasEmoji = false;
 
@@ -431,9 +430,27 @@ export function bodyToHtml(content, highlights, opts={}) {
                 return highlighter.applyHighlights(safeText, safeHighlights).join('');
             };
         }
-        safeBody = sanitizeHtml(body, sanitizeHtmlParams);
-        bodyHasEmoji = containsEmoji(body);
-        if (bodyHasEmoji) safeBody = unicodeToImage(safeBody);
+
+        bodyHasEmoji = containsEmoji(isHtml ? content.formatted_body : content.body);
+
+        // Only generate safeBody if the message was sent as org.matrix.custom.html
+        if (isHtml) {
+            safeBody = sanitizeHtml(content.formatted_body, sanitizeHtmlParams);
+        } else {
+            // ... or if there are emoji, which we insert as HTML alongside the
+            // escaped plaintext body.
+            if (bodyHasEmoji) {
+                isHtml = true;
+                safeBody = sanitizeHtml(escape(content.body), sanitizeHtmlParams);
+            }
+        }
+
+        // An HTML message with emoji
+        //  or a plaintext message with emoji that was escaped and sanitized into
+        //  HTML.
+        if (bodyHasEmoji) {
+            safeBody = unicodeToImage(safeBody);
+        }
     } finally {
         delete sanitizeHtmlParams.textFilter;
     }
@@ -451,7 +468,10 @@ export function bodyToHtml(content, highlights, opts={}) {
         'mx_EventTile_bigEmoji': emojiBody,
         'markdown-body': isHtml,
     });
-    return <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" />;
+
+    return isHtml ?
+        <span className={className} dangerouslySetInnerHTML={{ __html: safeBody }} dir="auto" /> :
+        <span className={className} dir="auto">{ content.body }</span>;
 }
 
 export function emojifyText(text) {

From 953a520f38f6df474d2225c97368bb499fd127cc Mon Sep 17 00:00:00 2001
From: Anatoliy Sablin <sablintolya@gmail.com>
Date: Wed, 14 Mar 2018 00:33:19 +0300
Subject: [PATCH 700/927] Enable autocompletion for non-English languages.

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

diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index bceec3f144..2706498d52 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -44,6 +44,7 @@ export default class UserProvider extends AutocompleteProvider {
         this.matcher = new FuzzyMatcher([], {
             keys: ['name', 'userId'],
             shouldMatchPrefix: true,
+            shouldMatchWordsOnly: false
         });
 
         this._onRoomTimelineBound = this._onRoomTimeline.bind(this);

From 57d4ae6e0e6843e6370da2ae789564880ea4cb20 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 14 Mar 2018 02:32:56 +0000
Subject: [PATCH 701/927] Translated using Weblate (Basque)

Currently translated at 99.7% (993 of 995 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index b17da787b9..4384368034 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -988,5 +988,9 @@
     "Clear filter": "Garbitu iragazkia",
     "Disable Community Filter Panel": "Desgaitu komunitate-iragazi panela",
     "Did you know: you can use communities to filter your Riot.im experience!": "Ba al zenekien? Komunitateak erabili ditzakezu zure Riot.im esperientzia iragazteko!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Iragazki bat ezartzeko, arrastatu komunitate baten abatarra pantailaren ezkerrean dagoen  iragazki-panelera. Iragazki-paneleko abatar batean klik egin dezakezu komunitate horri lotutako gelak eta pertsonak besterik ez ikusteko."
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Iragazki bat ezartzeko, arrastatu komunitate baten abatarra pantailaren ezkerrean dagoen  iragazki-panelera. Iragazki-paneleko abatar batean klik egin dezakezu komunitate horri lotutako gelak eta pertsonak besterik ez ikusteko.",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Zure gakoa partekatzeko eskaria bidali da - egiaztatu zure beste gailuetan gakoa partekatzeko eskariak.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Gakoa partekatzeko eskariak automatikoki bidaltzen dira zure beste gailuetara. Zure beste gailuetan gakoa partekatzeko eskaria ukatu edo baztertu baduzu, egin klik hemen saio honetarako gakoak eskatzeko berriz ere.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Zure beste gailuek mezu honetarako gakoa ez badute ezin izango dute deszifratu.",
+    "Key request sent.": "Gako eskaria bidalita."
 }

From fa966971e77650221776c21f169caf658cf343b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n?= <fordrio.libfrid@antichef.com>
Date: Tue, 13 Mar 2018 22:55:49 +0000
Subject: [PATCH 702/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 5e0e5ac9fa..97262f34de 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -299,7 +299,7 @@
     "Reason: %(reasonText)s": "Ok: %(reasonText)s",
     "Revoke Moderator": "Moderátor visszahívása",
     "Refer a friend to Riot:": "Ismerős meghívása a Riotba:",
-    "Register": "Regisztrál",
+    "Register": "Regisztráció",
     "%(targetName)s rejected the invitation.": "%(targetName)s elutasította a meghívót.",
     "Reject invitation": "Meghívó elutasítása",
     "Rejoin": "Újracsatlakozás",

From 83412acbe7c1b3a593b4a1dae66faa1948c2f472 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Wed, 14 Mar 2018 11:11:21 +0000
Subject: [PATCH 703/927] Display sticker content (URL), rather than thumbnail.

---
 src/components/views/messages/MStickerBody.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index e1039ae66b..83d8309cf9 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -46,7 +46,7 @@ export default class MStickerBody extends MImageBody {
         const hidePlaceholderTimer = setTimeout(() => {
             this.setState({
                 placeholderVisible: false,
-                thumbnailClasses: 'mx_MStickerBody_thumbnail_visible',
+                imageClasses: 'mx_MStickerBody_image_visible',
             });
         }, 500);
         this.setState({hidePlaceholderTimer});
@@ -58,14 +58,14 @@ export default class MStickerBody extends MImageBody {
             this.setState({
                 placeholderVisible: false,
                 placeholderClasses: '.mx_MStickerBody_placeholder_invisible',
-                thumbnailClasses: 'mx_MStickerBody_thumbnail_visible',
+                imageClasses: 'mx_MStickerBody_image_visible',
             });
         } else {
             // Image not already loaded
             this.setState({
                 placeholderVisible: true,
                 placeholderClasses: '',
-                thumbnailClasses: '',
+                imageClasses: '',
             });
         }
     }
@@ -110,7 +110,7 @@ export default class MStickerBody extends MImageBody {
                 style={{
                     height: placeholderFixupHeight,
                 }}>
-                <div className={'mx_MStickerBody_thumbnail_container'}>
+                <div className={'mx_MStickerBody_image_container'}>
                   { this.state.placeholderVisible &&
                     <div
                         className={'mx_MStickerBody_placeholder ' + this.state.placeholderClasses}
@@ -125,8 +125,8 @@ export default class MStickerBody extends MImageBody {
                             height={placeholderSize} />
                     </div> }
                     <img
-                        className={'mx_MStickerBody_thumbnail ' + this.state.thumbnailClasses}
-                        src={thumbUrl}
+                        className={'mx_MStickerBody_image ' + this.state.imageClasses}
+                        src={contentUrl}
                         ref='image'
                         alt={content.body}
                         onLoad={this.props.onWidgetLoad}

From 8672b97f9a57ad879492f05024578ce944991cfd Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Mar 2018 14:29:55 +0000
Subject: [PATCH 704/927] Improve room list performance when receiving messages

In summary this makes RoomTiles (and RoomAvatars) do more for
themselves in terms of reacting individually to state changes in
the js-sdk.

Instead of force updating the entire room list for avatar changes
and room name changes, do this in the RoomTile and RoomAvatar
instead. This increases the number of listeners listening to the
matrix client, but allows us to properly implement a
shouldComponentUpdate for RoomTile (because the avatar, name and
notification count are now in component state)
---
 src/components/structures/TimelinePanel.js |  1 +
 src/components/views/avatars/RoomAvatar.js | 18 +++++++
 src/components/views/rooms/RoomList.js     | 18 -------
 src/components/views/rooms/RoomTile.js     | 60 ++++++++++++++++++++--
 4 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 12f745146e..1a03b5d994 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -624,6 +624,7 @@ var TimelinePanel = React.createClass({
                 this.props.timelineSet.room.setUnreadNotificationCount('highlight', 0);
                 dis.dispatch({
                     action: 'on_room_read',
+                    roomId: this.props.timelineSet.room.roomId,
                 });
             }
         }
diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index cae02ac408..0ccf9c66fe 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -48,12 +48,30 @@ module.exports = React.createClass({
         };
     },
 
+    componentWillMount: function() {
+        MatrixClientPeg.get().on("RoomState.events", this.onRoomStateEvents);
+    },
+
+    componentWillUnmount: function() {
+        MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
+    },
+
     componentWillReceiveProps: function(newProps) {
         this.setState({
             urls: this.getImageUrls(newProps),
         });
     },
 
+    onRoomStateEvents: function(ev) {
+        if (ev.getRoomId() !== this.props.room.roomId ||
+            ev.getType() !== 'm.room.avatar'
+        ) return;
+
+        this.setState({
+            urls: this.getImageUrls(this.props),
+        });
+    },
+
     getImageUrls: function(props) {
         return [
             ContentRepo.getHttpUriForMxc(
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index e48f19d143..6ccf04c5d8 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -77,9 +77,7 @@ module.exports = React.createClass({
 
         cli.on("Room", this.onRoom);
         cli.on("deleteRoom", this.onDeleteRoom);
-        cli.on("Room.name", this.onRoomName);
         cli.on("Room.receipt", this.onRoomReceipt);
-        cli.on("RoomState.events", this.onRoomStateEvents);
         cli.on("RoomMember.name", this.onRoomMemberName);
         cli.on("Event.decrypted", this.onEventDecrypted);
         cli.on("accountData", this.onAccountData);
@@ -161,12 +159,6 @@ module.exports = React.createClass({
                     });
                 }
                 break;
-            case 'on_room_read':
-                // 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;
         }
     },
 
@@ -177,9 +169,7 @@ module.exports = React.createClass({
         if (MatrixClientPeg.get()) {
             MatrixClientPeg.get().removeListener("Room", this.onRoom);
             MatrixClientPeg.get().removeListener("deleteRoom", this.onDeleteRoom);
-            MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
             MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
-            MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
             MatrixClientPeg.get().removeListener("RoomMember.name", this.onRoomMemberName);
             MatrixClientPeg.get().removeListener("Event.decrypted", this.onEventDecrypted);
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
@@ -243,14 +233,6 @@ module.exports = React.createClass({
         }
     },
 
-    onRoomName: function(room) {
-        this._delayedRefreshRoomList();
-    },
-
-    onRoomStateEvents: function(ev, state) {
-        this._delayedRefreshRoomList();
-    },
-
     onRoomMemberName: function(ev, member) {
         this._delayedRefreshRoomList();
     },
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 6c0c2497b3..448810e2ea 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -21,6 +21,7 @@ const React = require('react');
 const ReactDOM = require("react-dom");
 import PropTypes from 'prop-types';
 const classNames = require('classnames');
+import dis from '../../../dispatcher';
 const MatrixClientPeg = require('../../../MatrixClientPeg');
 import DMRoomMap from '../../../utils/DMRoomMap';
 const sdk = require('../../../index');
@@ -58,7 +59,9 @@ module.exports = React.createClass({
             hover: false,
             badgeHover: false,
             menuDisplayed: false,
+            roomName: this.props.room.name,
             notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
+            notificationCount: this.props.room.getUnreadNotificationCount(),
             selected: this.props.room.roomId === RoomViewStore.getRoomId(),
         });
     },
@@ -81,6 +84,20 @@ module.exports = React.createClass({
         }
     },
 
+    onRoomTimeline: function(ev, room) {
+        if (room !== this.props.room) return;
+        this.setState({
+            notificationCount: this.props.room.getUnreadNotificationCount(),
+        });
+    },
+
+    onRoomName: function(room) {
+        if (room !== this.props.room) return;
+        this.setState({
+            roomName: this.props.room.name,
+        });
+    },
+
     onAccountData: function(accountDataEvent) {
         if (accountDataEvent.getType() == 'm.push_rules') {
             this.setState({
@@ -89,6 +106,21 @@ module.exports = React.createClass({
         }
     },
 
+    onAction: function(payload) {
+        switch (payload.action) {
+            // XXX: slight hack in order to zero the notification count when a room
+            // is read. Ideally this state would be given to this via props (as we
+            // do with `unread`). This is still better than forceUpdating the entire
+            // RoomList when a room is read.
+            case 'on_room_read':
+                if (payload.roomId !== this.props.room.roomId) break;
+                this.setState({
+                    notificationCount: this.props.room.getUnreadNotificationCount(),
+                });
+            break;
+        }
+    },
+
     _onActiveRoomChange: function() {
         this.setState({
             selected: this.props.room.roomId === RoomViewStore.getRoomId(),
@@ -97,15 +129,37 @@ module.exports = React.createClass({
 
     componentWillMount: function() {
         MatrixClientPeg.get().on("accountData", this.onAccountData);
+        MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
+        MatrixClientPeg.get().on("Room.name", this.onRoomName);
         ActiveRoomObserver.addListener(this.props.room.roomId, this._onActiveRoomChange);
+        this.dispatcherRef = dis.register(this.onAction);
     },
 
     componentWillUnmount: function() {
         const cli = MatrixClientPeg.get();
         if (cli) {
             MatrixClientPeg.get().removeListener("accountData", this.onAccountData);
+            MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
+            MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
         }
         ActiveRoomObserver.removeListener(this.props.room.roomId, this._onActiveRoomChange);
+        dis.unregister(this.dispatcherRef);
+    },
+
+    // Do a simple shallow comparison of props and state to avoid unnecessary
+    // renders. The assumption made here is that only state and props are used
+    // in rendering this component and children.
+    //
+    // RoomList is frequently made to forceUpdate, so this decreases number of
+    // RoomTile renderings.
+    shouldComponentUpdate: function(newProps, newState) {
+        if (Object.keys(newProps).some((k) => newProps[k] !== this.props[k])) {
+            return true;
+        }
+        if (Object.keys(newState).some((k) => newState[k] !== this.state[k])) {
+            return true;
+        }
+        return false;
     },
 
     onClick: function(ev) {
@@ -174,7 +228,7 @@ module.exports = React.createClass({
         const myUserId = MatrixClientPeg.get().credentials.userId;
         const me = this.props.room.currentState.members[myUserId];
 
-        const notificationCount = this.props.room.getUnreadNotificationCount();
+        const notificationCount = this.state.notificationCount;
         // var highlightCount = this.props.room.getUnreadNotificationCount("highlight");
 
         const notifBadges = notificationCount > 0 && this._shouldShowNotifBadge();
@@ -202,9 +256,7 @@ module.exports = React.createClass({
             'mx_RoomTile_badgeButton': this.state.badgeHover || this.state.menuDisplayed,
         });
 
-        // XXX: We should never display raw room IDs, but sometimes the
-        // room name js sdk gives is undefined (cannot repro this -- k)
-        let name = this.props.room.name || this.props.room.roomId;
+        let name = this.state.roomName;
         name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
 
         let badge;

From 0b974979e240027e3a4e69bc60441c18018e4420 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 14 Mar 2018 14:33:59 +0000
Subject: [PATCH 705/927] Translated using Weblate (German)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7cbf4a7eea..d144f342b7 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -988,5 +988,11 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "Wusstest du: Du kannst Communities nutzen um deine Riot.im-Erfahrung zu filtern!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Um einen Filter zu setzen, siehe einen Community-Bild auf das Filter-Panel ganz links. Du kannst jederzeit auf einen Avatar im Filter-Panel klicken um nur die Räume und Personen aus der Community zu sehen.",
     "Clear filter": "Filter zurücksetzen",
-    "Disable Community Filter Panel": "Deaktivere Community-Filter-Panel"
+    "Disable Community Filter Panel": "Deaktivere Community-Filter-Panel",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Deine Schlüssel-Teil-Anfragen wurden gesendet. Bitte prüfe deine anderen Geräte auf die Schlüssel-Teil-Anfragen.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Schlüssel-Anfragen wurden automatisch zu den anderen Geräten gesendet. Wenn du diese Anfragen auf deinen anderen Geräten abgelehnt oder verpasst hast, klicke hier um die Schlüssel für diese Sitzung erneut anzufragen.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Geräte keine Schlüssel für diese Nachricht haben, wirst du diese nicht entschlüsseln können.",
+    "Key request sent.": "Schlüssel-Anfragen gesendet.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "Verschlüsselungs-Schlüssel von deinen anderen Geräten <requestLink>erneut anfragen</requestLink>.",
+    "%(user)s is a %(userRole)s": "%(user)s ist ein %(userRole)s"
 }

From c903cc63756d83a087f00a6709fa843868804874 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Mar 2018 14:55:36 +0000
Subject: [PATCH 706/927] Fix tests

---
 src/components/views/avatars/RoomAvatar.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index 0ccf9c66fe..e547cf0fa7 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -53,7 +53,10 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
-        MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
+        const cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener("RoomState.events", this.onRoomStateEvents);
+        }
     },
 
     componentWillReceiveProps: function(newProps) {

From bc5699b3d79b9d16ae7286ec09e4233208a25e2b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Mar 2018 18:13:39 +0000
Subject: [PATCH 707/927] Add change delay warning in GroupView settings

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 4a28faaac4..30e897e5dc 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -707,8 +707,15 @@ export default React.createClass({
         });
 
         const header = this.state.editing ? <h2> { _t('Community Settings') } </h2> : <div />;
+        const changeDelayWarning = this.state.editing && this.state.isUserPrivileged ?
+            <div className="mx_GroupView_changeDelayWarning">
+                { _t( 'Changes made to your community might not be seen by other users ' +
+                      'for up to 30 minutes.',
+                ) }
+            </div> : <div />;
         return <div className={groupSettingsSectionClasses}>
             { header }
+            { changeDelayWarning }
             { this._getLongDescriptionNode() }
             { this._getRoomsNode() }
         </div>;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 064062f5e7..ce55241a85 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -766,6 +766,7 @@
     "Leave": "Leave",
     "Unable to leave room": "Unable to leave room",
     "Community Settings": "Community Settings",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Changes made to your community might not be seen by other users for up to 30 minutes.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
     "Add rooms to this community": "Add rooms to this community",
     "Featured Rooms:": "Featured Rooms:",

From 117129bcacd1120c0fd8bce80cedc7fc0394a29d Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 15 Mar 2018 08:52:39 +0000
Subject: [PATCH 708/927] Translated using Weblate (Basque)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 4384368034..095e32d3ed 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -992,5 +992,7 @@
     "Your key share request has been sent - please check your other devices for key share requests.": "Zure gakoa partekatzeko eskaria bidali da - egiaztatu zure beste gailuetan gakoa partekatzeko eskariak.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Gakoa partekatzeko eskariak automatikoki bidaltzen dira zure beste gailuetara. Zure beste gailuetan gakoa partekatzeko eskaria ukatu edo baztertu baduzu, egin klik hemen saio honetarako gakoak eskatzeko berriz ere.",
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Zure beste gailuek mezu honetarako gakoa ez badute ezin izango dute deszifratu.",
-    "Key request sent.": "Gako eskaria bidalita."
+    "Key request sent.": "Gako eskaria bidalita.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Berriz eskatu zifratze-gakoak</requestLink> zure beste gailuetatik.",
+    "%(user)s is a %(userRole)s": "%(user)s %(userRole)s da"
 }

From f788ef280f221d0304fc16b4c56e873f71e10c21 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 15 Mar 2018 08:54:46 +0000
Subject: [PATCH 709/927] Translated using Weblate (Basque)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 095e32d3ed..a4bb9cccd4 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -782,13 +782,13 @@
     "You have been kicked from this room by %(userName)s.": "Gela honetatik kanporatu zaitu %(userName)s erabiltzaileak.",
     "You have been banned from this room by %(userName)s.": "Gela honetatik debekatu zaitu %(userName)s erabiltzaileak.",
     "You are trying to access a room.": "Gela bat atzitzen saiatzen ari zara.",
-    "To change the room's avatar, you must be a": "Gelaren abatara aldatzeko, hau izan behar zara:",
-    "To change the room's name, you must be a": "Gelaren izena aldatzeko, hau izan behar zara:",
-    "To change the room's main address, you must be a": "Gelaren helbide nagusia aldatzeko, hau izan behar zara:",
-    "To change the room's history visibility, you must be a": "Gelaren ikusgaitasuna aldatzeko, hau izan behar zara:",
-    "To change the permissions in the room, you must be a": "Gelaren baimenak aldatzeko, hau izan behar zara:",
-    "To change the topic, you must be a": "Mintzagaia aldatzeko, hau izan behar zara:",
-    "To modify widgets in the room, you must be a": "Gelaren trepetak aldatzeko, hau izan behar zara:",
+    "To change the room's avatar, you must be a": "Gelaren abatara aldatzeko:",
+    "To change the room's name, you must be a": "Gelaren izena aldatzeko:",
+    "To change the room's main address, you must be a": "Gelaren helbide nagusia aldatzeko:",
+    "To change the room's history visibility, you must be a": "Gelaren ikusgaitasuna aldatzeko:",
+    "To change the permissions in the room, you must be a": "Gelaren baimenak aldatzeko:",
+    "To change the topic, you must be a": "Mintzagaia aldatzeko:",
+    "To modify widgets in the room, you must be a": "Gelaren trepetak aldatzeko:",
     "Members only (since the point in time of selecting this option)": "Kideek besterik ez (aukera hau hautatzen den unetik)",
     "Members only (since they were invited)": "Kideek besterik ez (gonbidatu zaienetik)",
     "Members only (since they joined)": "Kideek besterik ez (elkartu zirenetik)",

From 8af3bfa8f3abbfacfd1656675633eb062e87b8e1 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 15 Mar 2018 09:17:28 +0000
Subject: [PATCH 710/927] Translated using Weblate (Italian)

Currently translated at 17.6% (176 of 995 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 369db6f123..d9aedf315f 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -53,7 +53,7 @@
     "You cannot place VoIP calls in this browser.": "Non puoi effettuare chiamate VoIP con questo browser.",
     "You cannot place a call with yourself.": "Non puoi chiamare te stesso.",
     "Conference calls are not supported in this client": "Le chiamate di gruppo non sono supportate da questo client",
-    "Conference calls are not supported in encrypted rooms": "Le chiamate di gruppo non sono supportate nelle stanze con crittografia",
+    "Conference calls are not supported in encrypted rooms": "Le chiamate di gruppo non sono supportate nelle stanze criptate",
     "Warning!": "Attenzione!",
     "Sun": "Dom",
     "Mon": "Lun",
@@ -89,5 +89,91 @@
     "Unpin Message": "Sblocca messaggio",
     "Add rooms to this community": "Aggiungi stanze a questa community",
     "Warning": "Attenzione",
-    "Unnamed room": "Stanza senza nome"
+    "Unnamed room": "Stanza senza nome",
+    "Online": "Online",
+    "The platform you're on": "La piattaforma in cui sei",
+    "The version of Riot.im": "La versione di Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Se hai eseguito l'accesso o meno (non registriamo il tuo nome utente)",
+    "Your language of choice": "La lingua scelta",
+    "Which officially provided instance you are using, if any": "Quale istanza fornita ufficialmente stai usando, se presente",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se stai usando o meno la modalità Richtext dell'editor Rich Text",
+    "Your homeserver's URL": "L'URL del tuo homeserver",
+    "Your identity server's URL": "L'URL del tuo server di identità",
+    "Analytics": "Analitiche",
+    "The information being sent to us to help make Riot.im better includes:": "Le informazioni inviate per aiutarci a migliorare Riot.im includono:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Registriamo anche ogni pagina che usi nell'app (attualmente <CurrentPageHash>), il tuo User Agent (<CurrentUserAgent>) e la risoluzione del dispositivo (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se questa pagina include informazioni identificabili, come una stanza, utente o ID di gruppo, questi dati sono rimossi prima che vengano inviati al server.",
+    "Call Failed": "Chiamata fallita",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Ci sono dispositivi sconosciuti in questa stanza: se procedi senza verificarli, qualcuno avrà la possibilità di intercettare la tua chiamata.",
+    "Review Devices": "Revisiona i dispositivi",
+    "Call Anyway": "Chiama comunque",
+    "Answer Anyway": "Rispondi comunque",
+    "Call Timeout": "Scadenza chiamata",
+    "Existing Call": "Chiamata esistente",
+    "You are already in a call.": "Partecipi già ad una chiamata.",
+    "Conference calling is in development and may not be reliable.": "Le chiamate di gruppo sono in sviluppo e potrebbero essere inaffidabili.",
+    "Failed to set up conference call": "Impostazione della chiamata di gruppo fallita",
+    "Conference call failed.": "Chiamata di gruppo fallita.",
+    "%(senderName)s requested a VoIP conference.": "%(senderName)s ha richiesto una conferenza VoIP.",
+    "VoIP conference started.": "Conferenza VoIP iniziata.",
+    "VoIP conference finished.": "Conferenza VoIP terminata.",
+    "Ongoing conference call%(supportedText)s.": "Chiamata di gruppo in corso%(supportedText)s.",
+    "The file '%(fileName)s' failed to upload": "Invio del file '%(fileName)s' fallito",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Il file '%(fileName)s' supera il limite di dimensione inviabile da questo home server",
+    "Upload Failed": "Invio fallito",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
+    "Who would you like to add to this community?": "Chi vuoi aggiungere a questa comunità?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Attenzione: qualsiasi persona aggiungi ad una comunità sarà visibile pubblicamente a chiunque conosca l'ID della comunità",
+    "Invite new community members": "Invita nuovi membri nella comunità",
+    "Name or matrix ID": "Nome o ID matrix",
+    "Which rooms would you like to add to this community?": "Quali stanze vuoi aggiungere a questa comunità?",
+    "Show these rooms to non-members on the community page and room list?": "Mostrare queste stanze ai non membri nella pagina comunità e all'elenco stanze?",
+    "Add rooms to the community": "Aggiungi stanze alla comunità",
+    "Room name or alias": "Nome stanza o alias",
+    "Add to community": "Aggiungi alla comunità",
+    "Failed to invite the following users to %(groupId)s:": "Invito ad unirsi in %(groupId)s fallito per i seguenti utenti:",
+    "Failed to invite users to community": "Invito degli utenti alla comunità fallito",
+    "Failed to invite users to %(groupId)s": "Invito degli utenti a %(groupId)s fallito",
+    "Failed to add the following rooms to %(groupId)s:": "Aggiunta a %(groupId)s fallita per le seguenti stanze:",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot non ha l'autorizzazione ad inviarti notifiche - controlla le impostazioni del browser",
+    "Riot was not given permission to send notifications - please try again": "Non è stata data a Riot l'autorizzazione ad inviare notifiche - riprova",
+    "Unable to enable Notifications": "Impossibile attivare le notifiche",
+    "This email address was not found": "Indirizzo email non trovato",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Il tuo indirizzo email sembra non essere associato ad un ID Matrix su questo homeserver.",
+    "Default": "Predefinito",
+    "Restricted": "Limitato",
+    "Moderator": "Moderatore",
+    "Start a chat": "Inizia una conversazione",
+    "Who would you like to communicate with?": "Con chi vorresti comunicare?",
+    "Email, name or matrix ID": "Email, nome o ID matrix",
+    "Start Chat": "Inizia conversazione",
+    "Invite new room members": "Invita nuovi membri nella stanza",
+    "Who would you like to add to this room?": "Chi vorresti aggiungere a questa stanza?",
+    "Send Invites": "Manda inviti",
+    "Failed to invite user": "Invito dell'utente fallito",
+    "Failed to invite": "Invito fallito",
+    "Failed to invite the following users to the %(roomName)s room:": "Invito nella stanza %(roomName)s fallito per i seguenti utenti:",
+    "You need to be logged in.": "Devi aver eseguito l'accesso.",
+    "You need to be able to invite users to do that.": "Devi potere invitare utenti per completare l'azione.",
+    "Unable to create widget.": "Impossibile creare il widget.",
+    "Failed to send request.": "Invio della richiesta fallito.",
+    "This room is not recognised.": "Stanza non riconosciuta.",
+    "You are not in this room.": "Non sei in questa stanza.",
+    "You do not have permission to do that in this room.": "Non hai l'autorizzazione per farlo in questa stanza.",
+    "Missing room_id in request": "Manca l'id_stanza nella richiesta",
+    "Must be viewing a room": "Devi vedere una stanza",
+    "Room %(roomId)s not visible": "Stanza %(roomId)s non visibile",
+    "Missing user_id in request": "Manca l'id_utente nella richiesta",
+    "Failed to lookup current room": "Impossibile cercare la stanza attuale",
+    "Usage": "Utilizzo",
+    "/ddg is not a command": "/ddg non è un comando",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Per usarlo, attendi l'autocompletamento dei risultati e selezionali con tab.",
+    "Unrecognised room alias:": "Alias della stanza non riconosciuto:",
+    "Ignored user": "Utente ignorato",
+    "You are now ignoring %(userId)s": "Ora stai ignorando %(userId)s",
+    "Unignored user": "Utente ripreso in considerazione",
+    "You are no longer ignoring %(userId)s": "Non stai più ignorando %(userId)s",
+    "Unknown (user, device) pair:": "Coppia (utente, dispositivo) sconosciuta:",
+    "Device already verified!": "Dispositivo già verificato!",
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENZIONE: dispositivo già verificato, ma le chiavi NON CORRISPONDONO!"
 }

From 12d2bab5448b99cfc94895f49684171fc4e7c554 Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Thu, 15 Mar 2018 07:54:39 +0000
Subject: [PATCH 711/927] Translated using Weblate (Swedish)

Currently translated at 42.5% (423 of 995 strings)

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

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index ac0c9503f3..600ff36f6b 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -364,7 +364,7 @@
     "Delete widget": "Ta bort widget",
     "Define the power level of a user": "Definiera anseende för en användare",
     "Do you want to load widget from URL:": "Vill du ladda widgeten från URL:",
-    "Edit": "Redigera",
+    "Edit": "Editera",
     "Enable automatic language detection for syntax highlighting": "Aktivera automatisk språkdetektering för syntaxmarkering",
     "Hide Apps": "Dölj Appar",
     "Integrations Error": "Integrationsfel",
@@ -382,8 +382,46 @@
     "The phone number entered looks invalid": "Telefonnumret ser felaktigt ut",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Signeringsnyckeln du angav matchar signeringsnyckeln som mottogs från enheten %(deviceId)s som tillhör %(userId)s. Enheten är markerad som verifierad.",
     "This email address is already in use": "Den här epostadressen är redan i bruk",
-    "This email address was not found": "Den här epostadressen fanns inte",
+    "This email address was not found": "Den här epostadressen finns inte",
     "The email address linked to your account must be entered.": "Epostadressen som är kopplad till ditt konto måste anges.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Filen '%(fileName)s' överskrider serverns största tillåtna filstorlek",
-    "The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunde inte laddas upp"
+    "The file '%(fileName)s' failed to upload": "Filen '%(fileName)s' kunde inte laddas upp",
+    "Online": "Aktiv",
+    "Unnamed room": "Namnlöst rum",
+    "World readable": "Alla kan läsa",
+    "Guests can join": "Gäster kan bli medlem i rummet",
+    "No rooms to show": "Inga fler rum att visa",
+    "This phone number is already in use": "Detta telefonnummer är redan i bruk",
+    "The version of Riot.im": "Versionen av Riot.im",
+    "Call Failed": "Samtal misslyckades",
+    "Call Anyway": "Ring ändå",
+    "Call": "Ring",
+    "Answer": "Svara",
+    "You are already in a call.": "Du är redan i ett samtal.",
+    "You cannot place a call with yourself.": "Du kan inte ringa till dig själv.",
+    "Warning!": "Varning!",
+    "Upload Failed": "Uppladdning misslyckades",
+    "Sun": "Sön",
+    "Mon": "Mån",
+    "Tue": "Tis",
+    "Wed": "Ons",
+    "Thu": "Tors",
+    "Fri": "Fre",
+    "Sat": "Lör",
+    "Jan": "Jan",
+    "Feb": "Feb",
+    "Mar": "Mar",
+    "Apr": "Apr",
+    "May": "Maj",
+    "Jun": "Jun",
+    "Jul": "Juli",
+    "Aug": "Aug",
+    "Sep": "Sep",
+    "Oct": "Okt",
+    "Nov": "Nov",
+    "Dec": "Dec",
+    "Name or matrix ID": "Namn eller matrix ID",
+    "Invite to Community": "",
+    "Unable to enable Notifications": "Det går inte att aktivera Notifieringar",
+    "Failed to invite user": "Misslyckades med att bjuda in användaren"
 }

From f043dc32dc414fbf0db3f373274da0918563416e Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 15 Mar 2018 08:54:46 +0000
Subject: [PATCH 712/927] Translated using Weblate (Basque)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index a4bb9cccd4..e781dd2fa4 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -994,5 +994,6 @@
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Zure beste gailuek mezu honetarako gakoa ez badute ezin izango dute deszifratu.",
     "Key request sent.": "Gako eskaria bidalita.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Berriz eskatu zifratze-gakoak</requestLink> zure beste gailuetatik.",
-    "%(user)s is a %(userRole)s": "%(user)s %(userRole)s da"
+    "%(user)s is a %(userRole)s": "%(user)s %(userRole)s da",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Zure komunitateari egindako aldaketak agian ez dira beste erabiltzaileentzat ikusgai egongo 30 minutu pasatu arte."
 }

From ba4626521f2413c81c2d0b1f167b9e0dd161819f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Mar 2018 10:09:12 +0000
Subject: [PATCH 713/927] Remove the message on migrating crypto data

This was for when the new and old versions were available
concurrently on /develop and /app.

The various migration steps are still logged to the console in
js-sdk.
---
 src/components/structures/MatrixChat.js | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b37da0144f..4bfe5d0b34 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1171,18 +1171,6 @@ export default React.createClass({
         cli.on("crypto.warning", (type) => {
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             switch (type) {
-                case 'CRYPTO_WARNING_ACCOUNT_MIGRATED':
-                    Modal.createTrackedDialog('Crypto migrated', '', ErrorDialog, {
-                        title: _t('Cryptography data migrated'),
-                        description: _t(
-                            "A one-off migration of cryptography data has been performed. "+
-                            "End-to-end encryption will not work if you go back to an older "+
-                            "version of Riot. If you need to use end-to-end cryptography on "+
-                            "an older version, log out of Riot first. To retain message history, "+
-                            "export and re-import your keys.",
-                        ),
-                    });
-                    break;
                 case 'CRYPTO_WARNING_OLD_VERSION_DETECTED':
                     Modal.createTrackedDialog('Crypto migrated', '', ErrorDialog, {
                         title: _t('Old cryptography data detected'),

From cca0fd2489ac5578172464719a278cee8802dab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 8 Mar 2018 16:57:53 +0000
Subject: [PATCH 714/927] Translated using Weblate (French)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 33a5a2ee45..950d9b3fe6 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -994,5 +994,6 @@
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si vos autres appareils n'ont pas la clé pour ce message, vous ne pourrez pas le déchiffrer.",
     "Key request sent.": "Demande de clé envoyée.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-demander les clés de chiffrement</requestLink> depuis vos autres appareils.",
-    "%(user)s is a %(userRole)s": "%(user)s est %(userRole)s"
+    "%(user)s is a %(userRole)s": "%(user)s est %(userRole)s",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Les changements effectués sur votre communauté peuvent ne pas apparaître pour les autres utilisateurs avant 30 minutes."
 }

From 82afe6db8610a800d9616b8fd6618d3cdffe52dd Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Mon, 12 Mar 2018 19:52:49 +0000
Subject: [PATCH 715/927] Translated using Weblate (Russian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index dfb1fb5da7..9bd15085f5 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -994,5 +994,6 @@
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Повторно запросить ключи шифрования</requestLink> с других устройств.",
     "%(user)s is a %(userRole)s": "%(user)s является %(userRole)s",
     "Your key share request has been sent - please check your other devices for key share requests.": "Ваш запрос на передачу ключей отправлен - пожалуйста, проверьте другие ваши устройства на запросы передачи ключей.",
-    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Запросы передачи ключей автоматически отправляются на другие устройства. Если вы отклонили или отменили запрос на передачу ключей на других устройствах, нажмите здесь, чтобы запросить ключи для этого сеанса повторно."
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Запросы передачи ключей автоматически отправляются на другие устройства. Если вы отклонили или отменили запрос на передачу ключей на других устройствах, нажмите здесь, чтобы запросить ключи для этого сеанса повторно.",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Изменения, сделанные в вашем сообществе, могут не отображаться для других пользователей в течение 30 минут."
 }

From badd4dbf7ddbd0a31288448e7f7d2702aa8b6274 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 15 Mar 2018 11:42:43 +0000
Subject: [PATCH 716/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 454bdf8f2e..7e07d21099 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -988,5 +988,12 @@
     "Did you know: you can use communities to filter your Riot.im experience!": "您知道嗎：您可以使用社群來強化您的 Riot.im 使用體驗！",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "要設定過濾器，拖曳社群大頭貼到位於螢幕最左邊的過濾器面板。您可以在任何時候在過濾器面板中的大頭貼上點按以檢視與該社群關聯的聊天室與夥伴。",
     "Clear filter": "清除過濾器",
-    "Disable Community Filter Panel": "停用社群過濾面板"
+    "Disable Community Filter Panel": "停用社群過濾面板",
+    "Your key share request has been sent - please check your other devices for key share requests.": "您的金鑰分享請求已傳送，請檢查您的其他裝置來看看金鑰分享請求。",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "金鑰分享請求已自動傳送到您的其他裝置。若您在您的其他裝置上回絕了金鑰分享請求，點按這裡以再次請求這個工作階段的金鑰。",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "若您的其他裝置沒有這個訊息的金鑰，您將無法將它們解密。",
+    "Key request sent.": "金鑰請求已傳送。",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "從您的其他裝置<requestLink>重新請求加密金鑰</requestLink>。",
+    "%(user)s is a %(userRole)s": "%(user)s 是 %(userRole)s",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "其他使用者在最多 30 分鐘內可能不會慨到您對社群所做的變更。"
 }

From 00f6deeb46cae17261af1b6ffdc4e0d1dc3d11db Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Mar 2018 12:03:00 +0000
Subject: [PATCH 717/927] gen/prune i18n

---
 src/i18n/strings/ca.json      | 3 ---
 src/i18n/strings/cs.json      | 3 ---
 src/i18n/strings/de_DE.json   | 3 ---
 src/i18n/strings/el.json      | 1 -
 src/i18n/strings/en_EN.json   | 2 --
 src/i18n/strings/en_US.json   | 1 -
 src/i18n/strings/eo.json      | 3 ---
 src/i18n/strings/es.json      | 1 -
 src/i18n/strings/eu.json      | 3 ---
 src/i18n/strings/fi.json      | 2 --
 src/i18n/strings/fr.json      | 3 ---
 src/i18n/strings/gl.json      | 3 ---
 src/i18n/strings/hu.json      | 3 ---
 src/i18n/strings/ko.json      | 1 -
 src/i18n/strings/lv.json      | 1 -
 src/i18n/strings/nl.json      | 1 -
 src/i18n/strings/pl.json      | 1 -
 src/i18n/strings/pt.json      | 1 -
 src/i18n/strings/pt_BR.json   | 1 -
 src/i18n/strings/ru.json      | 3 ---
 src/i18n/strings/sk.json      | 3 ---
 src/i18n/strings/sr.json      | 1 -
 src/i18n/strings/th.json      | 1 -
 src/i18n/strings/tr.json      | 1 -
 src/i18n/strings/zh_Hans.json | 1 -
 src/i18n/strings/zh_Hant.json | 3 ---
 26 files changed, 50 deletions(-)

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 0aba649fde..b182af621f 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -445,7 +445,6 @@
     "Encryption is enabled in this room": "L'encriptació està activada en aquesta sala",
     "Encryption is not enabled in this room": "L'encriptació no està activada en aquesta sala",
     "Privileged Users": "Usuaris amb privilegis",
-    "%(user)s is a": "L'usuari %(user)s és",
     "No users have specific privileges in this room": "Cap usuari té privilegis específics en aquesta sala",
     "Banned users": "Usuaris expulsats",
     "This room is not accessible by remote Matrix servers": "Aquesta sala no és accessible per a servidors de Matrix remots",
@@ -778,8 +777,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Esteu segur que voleu sortir de la sala '%(roomName)s'?",
     "Failed to leave room": "No s'ha pogut sortir de la sala",
     "For security, this session has been signed out. Please sign in again.": "Per seguretat, aquesta sessió s'ha tancat. Torna a iniciar la sessió.",
-    "Cryptography data migrated": "S'han migrat les dades criptogràfiques",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "S'ha realitzat una migració puntual de les dades criptogràfiques. L'encriptació d'extrem a extrem no funcionarà si torneu a una versió anterior de Riot. Si necessiteu utilitzar l'encriptació d'extrem a extrem en una versió anterior, primer sortiu de Riot. Per poder llegir l'historial dels missatges encriptats, exporteu i torneu a importar les vostres claus.",
     "Old cryptography data detected": "S'han detectat dades de criptografia antigues",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "S'han detectat dades d'una versió antiga de Riot. Això pot provocar que l'encriptació d'extrem a extrem no funcioni correctament a la versió anterior. Els missatges encriptats d'extrem a extrem que s'han intercanviat recentment mentre s'utilitzava la versió anterior no es poden desencriptar en aquesta versió. També pot provocar que els missatges intercanviats amb aquesta versió fallin. Si teniu problemes, tanqueu-lo i torneu-ho a engegar. Per poder llegir l'historial dels missatges encriptats, exporteu i torneu a importar les vostres claus.",
     "Logout": "Surt",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index fe2c9bd249..4267954d4c 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -417,7 +417,6 @@
     "Use with caution": "Používejte s opatrností",
     "User ID": "Uživatelské ID",
     "User Interface": "Uživatelské rozhraní",
-    "%(user)s is a": "%(user)s je",
     "User name": "Uživatelské jméno",
     "Username invalid: %(errMessage)s": "Neplatné uživatelské jméno: %(errMessage)s",
     "Users": "Uživatelé",
@@ -947,8 +946,6 @@
     "Addresses": "Adresy",
     "collapse": "sbalit",
     "expand": "rozbalit",
-    "Cryptography data migrated": "Šifrovaná data byla převedena",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Jednorázová migrace šifrovaných údajů dokončena. E2E šifrovaní vám nebude fungovat jakmile se vrátíte ke starší verzi programu Riot. Pokud plánujete používat šifrovaní ve starší verzi Riot, doporučujeme vám se nejdříve odhlásit. Aby jste si zachovali historii šifrovaných konverzací, exportujte a znovu importujte klíče místností.",
     "Old cryptography data detected": "Nalezeny starší šifrované datové zprávy",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nalezeny datové zprávy ze starší verze Riot. Důsledkem bude, že E2E šifrování nebude ve starší verzi Riot správně fungovat. Šifrované zprávy ze starší verze nemusí být čitelné v nové verzi. Může dojít i k selhání zasílaní zpráv s touto verzí Riot. Pokud zaznamenáte některý z uvedených problému, odhlaste se a přihlaste znovu. Pro zachování historie zpráv exportujte a znovu importujte vaše klíče.",
     "Warning": "Upozornění"
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d118d50d56..e7f439b260 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -615,7 +615,6 @@
     "Unnamed Room": "Unbenannter Raum",
     "Unverified": "Nicht verifiziert",
     "Upload new:": "Neue(s) hochladen:",
-    "%(user)s is a": "%(user)s ist ein",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)",
     "Verified": "Verifiziert",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Möchtest du diese Einladung <acceptText>akzeptieren</acceptText> oder <declineText>ablehnen</declineText>?",
@@ -946,10 +945,8 @@
     "Addresses": "Adressen",
     "collapse": "Verbergen",
     "expand": "Erweitern",
-    "Cryptography data migrated": "Kryptographie-Schlüssel wurden übertragen",
     "Old cryptography data detected": "Alte Kryptografiedaten erkannt",
     "Warning": "Warnung",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Eine tiefgreifende Migration im Kontext der Verschlüsselungsdaten wurde durchgeführt. Ende-zu-Ende-Verschlüsselung wird nicht mehr funktionieren, wenn du zu einer älteren Version von Riot zurückkehrst. Wenn du Ende-zu-Ende-Verschlüssung bei einer älteren Version von Riot brauchst, melde dich bitte vorher ab. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
     "Send an encrypted reply…": "Verschlüsselte Antwort senden…",
     "Send a reply (unencrypted)…": "Antwort senden (unverschlüsselt)…",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index c17c49eb7c..ab16f215bc 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -316,7 +316,6 @@
     "Use with caution": "Χρησιμοποιήστε τα με προσοχή",
     "User ID": "Αναγνωριστικό χρήστη",
     "User Interface": "Διεπαφή χρήστη",
-    "%(user)s is a": "Ο %(user)s είναι",
     "User name": "Όνομα χρήστη",
     "Username invalid: %(errMessage)s": "Μη έγκυρο όνομα χρήστη: %(errMessage)s",
     "Users": "Χρήστες",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index ce55241a85..49b9b641b0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -788,8 +788,6 @@
     "Failed to leave room": "Failed to leave room",
     "Signed Out": "Signed Out",
     "For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
-    "Cryptography data migrated": "Cryptography data migrated",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.",
     "Old cryptography data detected": "Old cryptography data detected",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
     "Logout": "Logout",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 2375e6ad2e..2ce5cb541b 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -639,7 +639,6 @@
     "Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
     "Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
     "Upload new:": "Upload new:",
-    "%(user)s is a": "%(user)s is a",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
     "Verified": "Verified",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index a50d16a2b3..7511b5dbe5 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -417,7 +417,6 @@
     "Encryption is enabled in this room": "Ĉifrado estas ŝaltita en tiu ĉi ĉambro",
     "Encryption is not enabled in this room": "Ĉifrado ne estas ŝaltita en tiu ĉi ĉambro",
     "Privileged Users": "Privilegiuloj",
-    "%(user)s is a": "%(user)s estas",
     "No users have specific privileges in this room": "Neniuj uzantoj havas specialajn privilegiojn en tiu ĉi ĉambro",
     "Banned users": "Forbaritaj uzantoj",
     "This room is not accessible by remote Matrix servers": "Ĉi tiu ĉambro ne atingeblas por foraj serviloj de Matrix",
@@ -752,8 +751,6 @@
     "Are you sure you want to leave the room '%(roomName)s'?": "Ĉu vi certe volas forlasi la ĉambron ‹%(roomName)s›?",
     "Failed to leave room": "Malsukcesis forlasi la ĉambron",
     "Signed Out": "Adiaŭinta",
-    "Cryptography data migrated": "Kriptografiaj datumoj transmetiĝis",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Unufoja transmeto de kriptografiaj datumoj fariĝis. Ĝiscela ĉifrado ne funkcios se vi revenos al pli malnova versio de Riot. Se vi bezonas ĝiscelan ĉifradon ĉe pli malnova versio, adiaŭu unue. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
     "Old cryptography data detected": "Malnovaj kriptografiaj datumoj troviĝis",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Datumoj el malnova versio de Riot troviĝis. Ĉi tio malfunkciigos ĝiscelan ĉifradon en la malnova versio. Ĝiscele ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
     "Logout": "Adiaŭi",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 1b513cc51f..6d14f75567 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -472,7 +472,6 @@
     "Use with caution": "Usar con precaución",
     "User ID": "Identificación de usuario",
     "User Interface": "Interfaz de usuario",
-    "%(user)s is a": "%(user)s es un",
     "User name": "Nombre de usuario",
     "Username invalid: %(errMessage)s": "Nombre de usuario no válido: %(errMessage)s",
     "Users": "Usuarios",
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 8ec181d879..0a18a758f0 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -451,7 +451,6 @@
     "Use with caution": "Erabili kontuz",
     "User ID": "Erabiltzaile ID-a",
     "User Interface": "Erabiltzaile interfazea",
-    "%(user)s is a": "%(user)s hau da:",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Erabiltzaile-izen baliogabea: %(errMessage)s",
     "Users": "Erabiltzaileak",
@@ -821,7 +820,6 @@
     "Long Description (HTML)": "Deskripzio luzea (HTML)",
     "Description": "Deskripzioa",
     "Community %(groupId)s not found": "Ez da %(groupId)s komunitatea aurkitu",
-    "Cryptography data migrated": "Kriptografia datuak migratuta",
     "Old cryptography data detected": "Kriptografia datu zaharrak atzeman dira",
     "Your Communities": "Zure komunitateak",
     "Create a new community": "Sortu komunitate berria",
@@ -942,7 +940,6 @@
     "Try using one of the following valid address types: %(validTypesList)s.": "Saiatu baliozko helbide mota hauetako bat erabiltzen: %(validTypesList)s.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Komunitate IDak a-z, 0-9, edo '=_-./' karaktereak besterik ez ditu onartzen",
     "Custom of %(powerLevel)s": "%(powerLevel)s pertsonalizatua",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Kriptografia datuen migrazio bat egon da. Muturretik muturrerako zifratzeak ez du funtzionatuko Riot bertsio zaharrago bat erabiltzen baduzu. Muturretik muturrerako zifratzea erabili behar baduzu bertsio zaharrago batean amaitu saioa Rioten lehenbizi. Mezuen historiala gordetzeko esportatu eta berriro inportatu zure gakoak.",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean  muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du <i>+adibidea:matrix.org</i>.",
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index fc7eac51a7..152fc41079 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -514,7 +514,6 @@
     "Use with caution": "Käytä varoen",
     "User ID": "Käyttäjätunniste",
     "User Interface": "Käyttöliittymä",
-    "%(user)s is a": "%(user)s on",
     "User name": "Käyttäjänimi",
     "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s asetti aiheeksi \"%(topic)s\".",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Salasanan muuttaminen uudelleenalustaa myös päästä päähän-salausavaimet kaikilla laitteilla, jolloin vanhojen viestien lukeminen ei ole enään mahdollista, ellet ensin vie huoneavaimet ja tuo ne takaisin jälkeenpäin. Tämä tulee muuttumaan tulevaisuudessa.",
@@ -934,7 +933,6 @@
     "Custom of %(powerLevel)s": "Valinnaiset %(powerLevel)s",
     "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:": "Varmistaaksesi että tähän laitteeseen voidaan luottaa, ole yhteydessä omistajaan jollain muulla tavalla (henkilökohtaisesti tai puhelimitse) ja pyydä heitä varmistamaan näkyykö Käyttäjäasetuksissa laite jolla on alla oleva avain:",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Jos avain täsmää, valitse painike alla. Jos avain ei täsmää, niin joku muu salakuuntelee laitetta ja haluat todennäköisesti painaa estopainiketta.",
-    "Cryptography data migrated": "Salaustiedot siirretty",
     "Old cryptography data detected": "Vanhat salaustiedot havaittu",
     "Warning": "Varoitus",
     "Access Token:": "Pääsykoodi:"
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 36620c2894..7caa60b5df 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -602,7 +602,6 @@
     "unknown caller": "appelant inconnu",
     "Unnamed Room": "Salon anonyme",
     "Unverified": "Non vérifié",
-    "%(user)s is a": "%(user)s est un(e)",
     "Username invalid: %(errMessage)s": "Nom d'utilisateur non valide : %(errMessage)s",
     "Verified": "Vérifié",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Souhaitez-vous <acceptText>accepter</acceptText> ou <declineText>refuser</declineText> cette invitation ?",
@@ -947,8 +946,6 @@
     "Call": "Appel",
     "Answer": "Répondre",
     "Send": "Envoyer",
-    "Cryptography data migrated": "Données de chiffrement migrées",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Une migration unique des données de chiffrement a été effectuée. Le chiffrement de bout-en-bout ne fonctionnera pas si vous revenez sur une version antérieure de Riot. Si vous avez besoin d'utiliser le chiffrement de bout-en-bout sur une ancienne version, déconnectez-vous de Riot. Pour conserver l'historique des messages, exportez et réimportez vos clés de chiffrement.",
     "Old cryptography data detected": "Anciennes données de chiffrement détectées",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nous avons détecté des données d'une ancienne version de Riot. Le chiffrement de bout-en-bout n'aura pas fonctionné correctement sur l'ancienne version. Les messages chiffrés échangés récemment dans l'ancienne version ne sont peut-être pas déchiffrables dans cette version. Les échanges de message avec cette version peuvent aussi échouer. Si vous rencontrez des problèmes, déconnectez-vous puis reconnectez-vous. Pour conserver l'historique des messages, exportez puis réimportez vos clés de chiffrement.",
     "Warning": "Attention",
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 7a1fd567ee..9bb6ba9347 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -417,7 +417,6 @@
     "Encryption is enabled in this room": "O cifrado está habilitado en esta sala",
     "Encryption is not enabled in this room": "O cifrado non se habilitou para esta sala",
     "Privileged Users": "Usuarios con privilexios",
-    "%(user)s is a": "%(user)s é un",
     "No users have specific privileges in this room": "Non hai usuarias con privilexios específicos en esta sala",
     "Banned users": "Usuarias non permitidas",
     "This room is not accessible by remote Matrix servers": "Esta sala non é accesible por servidores Matrix remotos",
@@ -759,8 +758,6 @@
     "Failed to leave room": "Algo fallou ao saír da sala",
     "Signed Out": "Desconectada",
     "For security, this session has been signed out. Please sign in again.": "Por seguridade, pechouse a sesión. Por favor, conéctese de novo.",
-    "Cryptography data migrated": "Migráronse os datos de cifrado",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Levouse a fin a mudanza de datos criptográficos. O cifrado extremo-a-extremo si volta a unha versión máis antiga de Riot. Si precisa utilizar criptografía de extremo-a-extremo en unha versión anterior, primeiro desconéctese de Riot. Para manter o histórico de mensaxes, exporte e volte a importar as súas chaves.",
     "Old cryptography data detected": "Detectouse o uso de criptografía sobre datos antigos",
     "Logout": "Desconectar",
     "Your Communities": "As súas Comunidades",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 29067f0bb4..ded4053177 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -423,7 +423,6 @@
     "Use with caution": "Használd körültekintéssel",
     "User ID": "Felhasználói azonosító",
     "User Interface": "Felhasználói felület",
-    "%(user)s is a": "%(user)s egy",
     "User name": "Felhasználói név",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (szint: %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Felhasználói név érvénytelen: %(errMessage)s",
@@ -947,8 +946,6 @@
     "Call": "Hívás",
     "Answer": "Felvesz",
     "Send": "Elküld",
-    "Cryptography data migrated": "Titkosítási adatok migrálva",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "A titkosítási adatok egyszeri migrációja megtörtént. Ha egy régebbi Riot verzióra állsz vissza a végponttól-végpontig titkosítás nem fog működni. Ha régi verzióval szeretnéd használni a végponttól-végpontig titkosítást először jelentkezz ki a Riotból. A régi üzenetek későbbi eléréséhez először mentsd ki a kulcsokat majd töltsd be újra.",
     "Old cryptography data detected": "Régi titkosítási adatot találhatók",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Régebbi Riot verzióból származó adatok találhatók. Ezek hibás működéshez vezethettek a végponttól-végpontig titkosításban régebbi verzióknál. A nemrég küldött/fogadott titkosított üzenetek ha a régi adatokat használták lehetséges hogy nem lesznek visszafejthetők ebben a verzióban. Ha problémákba ütközöl jelentkezz ki és vissza. A régi üzenetek elérésének biztosításához mentsd ki a kulcsokat és töltsd be újra.",
     "Warning": "Figyelmeztetés",
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 82174ad5d0..183a519320 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -427,7 +427,6 @@
     "Use with caution": "조심해주세요",
     "User ID": "사용자 ID",
     "User Interface": "사용자 인터페이스",
-    "%(user)s is a": "%(user)s는",
     "User name": "사용자 이름",
     "Username invalid: %(errMessage)s": "사용자 이름을 인식할 수 없어요: %(errMessage)s",
     "Users": "사용자들",
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index ae290d4d5f..6c05448c6e 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -333,7 +333,6 @@
     "Uploading %(filename)s and %(count)s others|zero": "Tiek augšuplādēts %(filename)s",
     "Uploading %(filename)s and %(count)s others|one": "Tiek augšuplādēts %(filename)s un %(count)s citi",
     "Uploading %(filename)s and %(count)s others|other": "Tiek augšuplādēts %(filename)s un %(count)s citi",
-    "%(user)s is a": "%(user)s ir",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
     "(unknown failure: %(reason)s)": "(nezināma kļūda: %(reason)s)",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index bb1e45c730..a11727c3cf 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -450,7 +450,6 @@
     "Use with caution": "Gebruik met behoedzaamheid",
     "User ID": "Gebruikers-ID",
     "User Interface": "Gebruikersinterface",
-    "%(user)s is a": "%(user)s is een",
     "User name": "Gebruikersnaam",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (macht %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Gebruikersnaam ongeldig: %(errMessage)s",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 0933b77dee..ae410232e3 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -492,7 +492,6 @@
     "Upload Files": "Prześlij pliki",
     "Upload new:": "Prześlij nowy:",
     "Use with caution": "Używać ostrożnie",
-    "%(user)s is a": "%(user)s jest",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (moc uprawnień administratorskich %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Niepoprawna nazwa użytkownika: %(errMessage)s",
     "Verification Pending": "Oczekuje weryfikacji",
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index a91a66bdbd..2a99cd191c 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -611,7 +611,6 @@
     "Decline": "Recusar",
     "Custom": "Personalizado",
     "Add": "Adicionar",
-    "%(user)s is a": "%(user)s é um(a)",
     "Unnamed Room": "Sala sem nome",
     "The phone number entered looks invalid": "O número de telefone inserido parece ser inválido",
     "Rejoin": "Voltar a participar da sala",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index d58a78160b..516f36ee6b 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -615,7 +615,6 @@
     "Unnamed Room": "Sala sem nome",
     "Unverified": "Não verificado",
     "Upload new:": "Enviar novo:",
-    "%(user)s is a": "%(user)s é um(a)",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (nível de permissão %(powerLevelNumber)s)",
     "Verified": "Verificado",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Você gostaria de <acceptText>aceitar</acceptText> ou <declineText>recusar</declineText> este convite?",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5f82177a2f..08216bb973 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -615,7 +615,6 @@
     "Unnamed Room": "Комната без имени",
     "Unverified": "Не проверено",
     "Upload new:": "Отправить новый:",
-    "%(user)s is a": "%(user)s является",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (уровень доступа %(powerLevelNumber)s)",
     "Verified": "Проверено",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Вы хотели бы <acceptText>подтвердить</acceptText> или <declineText>отклонить</declineText> это приглашение?",
@@ -941,8 +940,6 @@
     "Addresses": "Адреса",
     "collapse": "свернуть",
     "expand": "развернуть",
-    "Cryptography data migrated": "Миграция данных криптографии",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Выполнена одноразовая миграция данных криптографии. Сквозное шифрование не будет работать, если вы вернетесь к старой версии Riot. Если требуется использовать сквозную криптографию для более старой версии, сначала выйдите из Riot. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
     "Old cryptography data detected": "Обнаружены старые криптографические данные",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Обнаружены данные из более старой версии Riot. Это приведет к сбою криптографии в более ранней версии. В этой версии не могут быть расшифрованы сообщения, которые использовались недавно при использовании старой версии. Это также может привести к сбою обмена сообщениями с этой версией. Если возникают неполадки, выйдите и снова войдите в систему. Чтобы сохранить журнал сообщений, экспортируйте и повторно импортируйте ключи.",
     "Warning": "Предупреждение",
diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index fa118beca4..5c57d89439 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -366,7 +366,6 @@
     "Encryption is enabled in this room": "V tejto miestnosti je povolené šifrovanie",
     "Encryption is not enabled in this room": "V tejto miestnosti nie je povolené šifrovanie",
     "Privileged Users": "Poverení používatelia",
-    "%(user)s is a": "%(user)s je",
     "No users have specific privileges in this room": "Žiadny používatelia nemajú v tejto miestnosti pridelené konkrétne poverenia",
     "Banned users": "Používatelia, ktorým bol zakázaný vstup",
     "This room is not accessible by remote Matrix servers": "Táto miestnosť nie je prístupná cez vzdialené Matrix servery",
@@ -940,8 +939,6 @@
     "Something went wrong when trying to get your communities.": "Niečo sa pokazilo pri získavaní vašich komunít.",
     "collapse": "zbaliť",
     "expand": "rozbaliť",
-    "Cryptography data migrated": "Kryptografické údaje zmigrované",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Práve bola vykonaná jednorázová migrácia kryptografických údajov. E2E šifrovanie vám nebude fungovať, ak sa vrátite k staršej verzii programu Riot. Ak plánujete použiť šifrovanie v staršej verzii Riot, mali by ste sa pred tým odhlásiť. Aby ste si zachovali históriu šifrovaných konverzácií, exportujte a znovu importujte kľúče miestností.",
     "Old cryptography data detected": "Nájdené zastaralé kryptografické údaje",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Boli nájdené údaje zo staršej verzie Riot. Toto spôsobí, že E2E šifrovanie nebude v staršej verzii Riot fungovať. Zašifrované správy prijaté a odoslané v poslednom čase cez staršiu verziu Riot nemusia byť čitateľné v tejto verzii Riot. Môže to tiež spôsobiť, že šifrované konverzácie nebudú s touto verziou Riot čitateľné. Ak spozorujete niektoré s týchto problémov, odhláste sa a opätovne sa prihláste prosím. Históriu šifrovaných konverzácií zachováte tak, že si exportujete a znovu importujete kľúče miestností.",
     "Warning": "Upozornenie",
diff --git a/src/i18n/strings/sr.json b/src/i18n/strings/sr.json
index efac9b9e84..8ac774fe1b 100644
--- a/src/i18n/strings/sr.json
+++ b/src/i18n/strings/sr.json
@@ -419,7 +419,6 @@
     "Encryption is enabled in this room": "Шифровање је омогућено у овој соби",
     "Encryption is not enabled in this room": "Шифровање није омогућено у овој соби",
     "Privileged Users": "Овлашћени корисници",
-    "%(user)s is a": "%(user)s је",
     "No users have specific privileges in this room": "Нема корисника са посебним овлашћењима у овој соби",
     "Banned users": "Корисници са забраном приступа",
     "This room is not accessible by remote Matrix servers": "Овој соби не могу приступити удаљени Матрикс сервери",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index adb351f1c2..540902c8f1 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -392,7 +392,6 @@
     "Rejoin": "กลับเข้าร่วม",
     "This room": "ห้องนี้",
     "Unnamed Room": "ห้องที่ยังไม่ได้ตั้งชื่อ",
-    "%(user)s is a": "%(user)s เป็น",
     "(~%(count)s results)|one": "(~%(count)s ผลลัพท์)",
     "(~%(count)s results)|other": "(~%(count)s ผลลัพท์)",
     "Missing Media Permissions, click here to request.": "ไม่มีสิทธิ์เข้าถึงสื่อ, คลิกที่นี่เพื่อขอสิทธิ์",
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 51c7a44dd4..922bdc33a1 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -418,7 +418,6 @@
     "Use with caution": "Dikkatli kullan",
     "User ID": "Kullanıcı ID",
     "User Interface": "Kullanıcı Arayüzü",
-    "%(user)s is a": "%(user)s bir",
     "User name": "Kullanıcı ismi",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (güç %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Kullanıcı ismi geçersiz : %(errMessage)s",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 14e5a0712f..dd56629cb0 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -507,7 +507,6 @@
     "Unrecognised room alias:": "无法识别的聊天室别名：",
     "Use with caution": "谨慎使用",
     "User Interface": "用户界面",
-    "%(user)s is a": "%(user)s 是一个",
     "User name": "用户名",
     "(no answer)": "（没有回答）",
     "(warning: cannot be disabled again!)": "（警告：无法再被禁用！）",
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 93a324aba0..d3548c929c 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -453,7 +453,6 @@
     "Use with caution": "謹慎使用",
     "User ID": "使用者 ID",
     "User Interface": "使用者介面",
-    "%(user)s is a": "%(user)s 是一個",
     "User name": "使用者名稱",
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s（權限等級 %(powerLevelNumber)s）",
     "Username invalid: %(errMessage)s": "使用者名稱無效：%(errMessage)s",
@@ -936,8 +935,6 @@
     "Community %(groupId)s not found": "找不到社群 %(groupId)s",
     "This Home server does not support communities": "這個家伺服器不支援社群",
     "Failed to load %(groupId)s": "載入 %(groupId)s 失敗",
-    "Cryptography data migrated": "加密資料已遷移",
-    "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "加密資料的一次性遷移已經執行。若您回到舊版本的 Riot，端到端加密將不會運作。若您需要在舊版本上使用端到端加密，先登出 Riot。要保留訊息歷史，匯出再重新匯入您的金鑰。",
     "Old cryptography data detected": "偵測到舊的加密資料",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "偵測到來自舊版 Riot 的資料。這將會造成舊版的端到端加密失敗。在此版本中使用最近在舊版本交換的金鑰可能無法解密訊息。這也會造成與此版本的訊息交換失敗。若您遇到問題，請登出並重新登入。要保留訊息歷史，請匯出並重新匯入您的金鑰。",
     "Your Communities": "您的社群",

From 6ae30b41e7cae8aea919f47e5ac92a26be758cc0 Mon Sep 17 00:00:00 2001
From: Jeff <tukuyomi@nikel.ovh>
Date: Thu, 15 Mar 2018 10:22:54 +0000
Subject: [PATCH 718/927] Translated using Weblate (French)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 950d9b3fe6..d961f066ee 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -932,7 +932,7 @@
     "Flair": "Badge",
     "Showing flair for these communities:": "Ce salon affichera les badges pour ces communautés :",
     "This room is not showing flair for any communities": "Ce salon n'affiche de badge pour aucune communauté",
-    "Flair will appear if enabled in room settings": "Les badges n'apparaîtront que s'ils sont activés dans les paramètres du salon",
+    "Flair will appear if enabled in room settings": "Les badges n'apparaîtront que s'ils sont activés dans les paramètres de chaque salon",
     "Flair will not appear": "Les badges n'apparaîtront pas",
     "Display your community flair in rooms configured to show it.": "Sélectionnez les badges dans les paramètres de chaque salon pour les afficher.",
     "Tag Panel": "Panneau des étiquettes",

From 1521aee4fa011aa4b693913845fc5195ee8529e2 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 15 Mar 2018 10:20:56 +0000
Subject: [PATCH 719/927] Translated using Weblate (Italian)

Currently translated at 30.6% (305 of 996 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index d9aedf315f..b518dd866b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -175,5 +175,134 @@
     "You are no longer ignoring %(userId)s": "Non stai più ignorando %(userId)s",
     "Unknown (user, device) pair:": "Coppia (utente, dispositivo) sconosciuta:",
     "Device already verified!": "Dispositivo già verificato!",
-    "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENZIONE: dispositivo già verificato, ma le chiavi NON CORRISPONDONO!"
+    "WARNING: Device already verified, but keys do NOT MATCH!": "ATTENZIONE: dispositivo già verificato, ma le chiavi NON CORRISPONDONO!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "ATTENZIONE: VERIFICA CHIAVI FALLITA! La chiave per %(userId)s e il dispositivo %(deviceId)s è \"%(fprint)s\" , la quale non corrisponde con la chiave fornita \"%(fingerprint)s\". Potrebbe significare che le tue comunicazioni vengono intercettate!",
+    "Verified key": "Chiave verificata",
+    "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La chiave che hai fornito corrisponde alla chiave che hai ricevuto dal dispositivo %(deviceId)s di %(userId)s . Dispositivo segnato come verificato.",
+    "Unrecognised command:": "Comando non riconosciuto:",
+    "Reason": "Motivo",
+    "%(senderName)s invited %(targetName)s.": "%(senderName)s ha invitato %(targetName)s.",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s ha bandito %(targetName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s ha modificato il proprio nome in %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s ha impostato il proprio nome a %(displayName)s.",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s ha rimosso il proprio nome visibile (%(oldDisplayName)s).",
+    "%(senderName)s removed their profile picture.": "%(senderName)s ha rimosso la propria immagine del profilo.",
+    "%(senderName)s changed their profile picture.": "%(senderName)s ha cambiato la propria immagine del profilo.",
+    "%(senderName)s set a profile picture.": "%(senderName)s ha impostato un'immagine del profilo.",
+    "%(targetName)s joined the room.": "%(targetName)s è entrato nella stanza.",
+    "%(targetName)s rejected the invitation.": "%(targetName)s ha rifiutato l'invito.",
+    "%(targetName)s left the room.": "%(targetName)s è uscito dalla stanza.",
+    "%(senderName)s unbanned %(targetName)s.": "%(senderName)s ha rimosso il ban a %(targetName)s.",
+    "%(senderName)s kicked %(targetName)s.": "%(senderName)s ha cacciato %(targetName)s.",
+    "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s ha revocato l'invito per %(targetName)s.",
+    "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ha modificato l'argomento in \"%(topic)s\".",
+    "%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s ha rimosso il nome della stanza.",
+    "%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ha modificato il nome della stanza in %(roomName)s.",
+    "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s ha inviato un'immagine.",
+    "Someone": "Qualcuno",
+    "(not supported by this browser)": "(non supportato da questo browser)",
+    "%(senderName)s answered the call.": "%(senderName)s ha risposto alla chiamata.",
+    "(could not connect media)": "(connessione del media non riuscita)",
+    "(no answer)": "(nessuna risposta)",
+    "(unknown failure: %(reason)s)": "(errore sconosciuto: %(reason)s)",
+    "%(senderName)s ended the call.": "%(senderName)s ha terminato la chiamata.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s ha avviato una chiamata %(callType)s .",
+    "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s ha mandato un invito a %(targetDisplayName)s per unirsi alla stanza.",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento del loro invito.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza, dal momento in cui sono entrati.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti i membri della stanza.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s ha reso visibile la futura cronologia della stanza a tutti.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s ha reso visibile la futura cronologia della stanza a (%(visibility)s) sconosciuto.",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ha attivato la crottografia end-to-end (algoritmo %(algorithm)s).",
+    "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s da %(fromPowerLevel)s a %(toPowerLevel)s",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s ha cambiato il messaggio ancorato della stanza.",
+    "%(widgetName)s widget modified by %(senderName)s": "Widget %(widgetName)s modificato da %(senderName)s",
+    "%(widgetName)s widget added by %(senderName)s": "Widget %(widgetName)s aggiunto da %(senderName)s",
+    "%(widgetName)s widget removed by %(senderName)s": "Widget %(widgetName)s rimosso da %(senderName)s",
+    "%(displayName)s is typing": "%(displayName)s sta scrivendo",
+    "%(names)s and %(count)s others are typing|other": "%(names)s e altri %(count)s stanno scrivendo",
+    "%(names)s and %(count)s others are typing|one": "%(names)s e un altro stanno scrivendo",
+    "%(names)s and %(lastPerson)s are typing": "%(names)s e %(lastPerson)s stanno scrivendo",
+    "Failure to create room": "Creazione della stanza fallita",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Il server potrebbe essere non disponibile, sovraccarico o hai trovato un errore.",
+    "Send anyway": "Invia comunque",
+    "Send": "Invia",
+    "Unnamed Room": "Stanza senza nome",
+    "Your browser does not support the required cryptography extensions": "Il tuo browser non supporta l'estensione crittografica richiesta",
+    "Not a valid Riot keyfile": "Non è una chiave di Riot valida",
+    "Authentication check failed: incorrect password?": "Controllo di autenticazione fallito: password sbagliata?",
+    "Failed to join room": "Accesso alla stanza fallito",
+    "Presence Management": "Gestione della presenza",
+    "Tag Panel": "Pannello etichette",
+    "Disable Emoji suggestions while typing": "Disattiva i suggerimenti delle emoji durante la digitazione",
+    "Use compact timeline layout": "Usa impaginazione cronologia compatta",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Nascondi i messaggi di entrata/uscita (inviti/kick/ban esclusi)",
+    "Hide avatar changes": "Nascondi le modifiche dell'avatar",
+    "Hide display name changes": "Nascondi le modifiche del nome",
+    "Hide read receipts": "Nascondi le ricevute di lettura",
+    "Show timestamps in 12 hour format (e.g. 2:30pm)": "Mostra gli orari nel formato 12 ore (es. 2:30pm)",
+    "Autoplay GIFs and videos": "Riproduzione automatica di GIF e video",
+    "Enable automatic language detection for syntax highlighting": "Attiva la rilevazione automatica della lingua per l'evidenziazione della sintassi",
+    "Hide avatars in user and room mentions": "Nascondi gli avatar nelle citazioni di utente e stanza",
+    "Disable big emoji in chat": "Disattiva gli emoji grandi in chat",
+    "Don't send typing notifications": "Non inviare notifiche di composizione",
+    "Automatically replace plain text Emoji": "Sostituisci automaticamente le emoji testuali",
+    "Disable Community Filter Panel": "Disattiva il pannello filtro comunità",
+    "Disable Peer-to-Peer for 1:1 calls": "Disattiva il peer-to-peer per chiamate 1:1",
+    "Opt out of analytics": "Rifiuta le analitiche",
+    "Never send encrypted messages to unverified devices from this device": "Non inviare mai da questo dispositivo messaggi cifrati a dispositivi non verificati",
+    "Never send encrypted messages to unverified devices in this room from this device": "Non inviare mai da questo dispositivo messaggi cifrati a dispositivi non verificati in questa stanza",
+    "Enable inline URL previews by default": "Attiva le anteprime URL in modo predefinito",
+    "Enable URL previews for this room (only affects you)": "Attiva le anteprime URL in questa stanza (riguarda solo te)",
+    "Enable URL previews by default for participants in this room": "Attiva le anteprime URL in modo predefinito per i partecipanti in questa stanza",
+    "Room Colour": "Colore della stanza",
+    "Active call (%(roomName)s)": "Chiamata attiva (%(roomName)s)",
+    "unknown caller": "Chiamante sconosciuto",
+    "Incoming voice call from %(name)s": "Chiamata vocale in arrivo da %(name)s",
+    "Incoming video call from %(name)s": "Chiamata video in arrivo da %(name)s",
+    "Incoming call from %(name)s": "Chiamata in arrivo da %(name)s",
+    "Decline": "Rifiuta",
+    "Accept": "Accetta",
+    "Incorrect verification code": "Codice di verifica sbagliato",
+    "Enter Code": "Inserisci il codice",
+    "Submit": "Invia",
+    "Phone": "Telefono",
+    "Failed to upload profile picture!": "Invio dell'immagine profilo fallito!",
+    "Upload new:": "Invia nuovo:",
+    "No display name": "Nessun nome visibile",
+    "New passwords don't match": "Le nuove password non corrispondono",
+    "Passwords can't be empty": "Le password non possono essere vuote",
+    "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.": "La modifica della password ripristinerà qualsiasi chiave di cifratura end-to-end su tutti i dispositivi, rendendo illeggibile la cronologia delle chat, a meno che prima non esporti le tue chiavi della stanza e poi le importi. In futuro ciò verrà migliorato.",
+    "Export E2E room keys": "Esporta chiavi E2E della stanza",
+    "Do you want to set an email address?": "Vuoi impostare un indirizzo email?",
+    "Current password": "Password attuale",
+    "Password": "Password",
+    "New Password": "Nuova password",
+    "Confirm password": "Conferma password",
+    "Change Password": "Modifica password",
+    "Your home server does not support device management.": "Il tuo home server non supporta la gestione dei dispositivi.",
+    "Unable to load device list": "Impossibile caricare l'elenco dei dispositivi",
+    "Delete %(count)s devices|other": "Elimina %(count)s dispositivi",
+    "Delete %(count)s devices|one": "Elimina dispositivo",
+    "Device ID": "ID dispositivo",
+    "Device Name": "Nome dispositivo",
+    "Last seen": "Visto l'ultima volta",
+    "Select devices": "Seleziona i dispositivi",
+    "Failed to set display name": "Impostazione nome visibile fallita",
+    "Disable Notifications": "Disattiva le notifiche",
+    "Enable Notifications": "Attiva le notifiche",
+    "Cannot add any more widgets": "Impossibile aggiungere altri widget",
+    "The maximum permitted number of widgets have already been added to this room.": "Il numero massimo consentito di widget è già stato raggiunto in questa stanza.",
+    "Drop File Here": "Trascina file qui",
+    "Drop file here to upload": "Trascina un file qui per l'invio",
+    " (unsupported)": " (non supportato)",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Unisciti come <voiceText>voce</voiceText> o <videoText>video</videoText>.",
+    "%(senderName)s sent an image": "%(senderName)s ha inviato un'immagine",
+    "%(senderName)s sent a video": "%(senderName)s ha inviato un video",
+    "%(senderName)s uploaded a file": "%(senderName)s ha inviato un file",
+    "Options": "Opzioni",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Richiesta di condivisione chiavi inviata - controlla i tuoi altri dispositivi per richieste di condivisione chiavi.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Le richieste di condivisione chiavi sono inviate automaticamente ai tuoi altri dispositivi. Se hai rifiutato o annullato la richiesta negli altri dispositivi, clicca qui per richiederle nuovamente.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se i tuoi altri dispositivi non hanno la chiave per questo messaggio non potrai decriptarli.",
+    "Key request sent.": "Richiesta chiave inviata."
 }

From 8bda87aece2f06700ef92db0c62d0dfc6fb00220 Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Thu, 15 Mar 2018 09:45:21 +0000
Subject: [PATCH 720/927] Translated using Weblate (Swedish)

Currently translated at 42.4% (423 of 996 strings)

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

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 600ff36f6b..482233e2b4 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -10,7 +10,7 @@
     "VoIP": "VoIP",
     "Missing Media Permissions, click here to request.": "Saknar mediebehörigheter, klicka för att begära.",
     "No Microphones detected": "Ingen mikrofon hittades",
-    "No Webcams detected": "Ingen kamera hittades",
+    "No Webcams detected": "Ingen webbkamera hittades",
     "No media permissions": "Inga mediebehörigheter",
     "You may need to manually permit Riot to access your microphone/webcam": "Du måste manuellt tillåta Riot att komma åt din mikrofon/kamera",
     "Default Device": "Standardenhet",

From b834a257517520bf6630330742ecdd28c9b6da96 Mon Sep 17 00:00:00 2001
From: Geeman9 <geeman9@gmail.com>
Date: Thu, 15 Mar 2018 13:54:39 +0000
Subject: [PATCH 721/927] Added translation using Weblate (Lithuanian)

---
 src/i18n/strings/lt.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/lt.json

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/lt.json
@@ -0,0 +1 @@
+{}

From 8c1e025d2404d8fb04daab4e181ed690bb71b613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n?= <fordrio.libfrid@antichef.com>
Date: Tue, 13 Mar 2018 22:55:49 +0000
Subject: [PATCH 722/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 97262f34de..87e81eab39 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -994,5 +994,6 @@
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ha a másik eszközödön nincs meg a kulcs az üzenet visszafejtéséhez akkor nem tudod visszafejteni.",
     "Key request sent.": "Kulcs kérés elküldve.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Kulcsok újrakérése</requestLink> a többi eszközödtől.",
-    "%(user)s is a %(userRole)s": "%(user)s egy %(userRole)s"
+    "%(user)s is a %(userRole)s": "%(user)s egy %(userRole)s",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "A közösségedben végrehajtott változtatás valószínűleg legalább 30 percig nem lesz látható mások számára."
 }

From b68da579f0a93659c88e892ab34ee72f36f026d8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 16 Mar 2018 01:21:46 +0000
Subject: [PATCH 723/927] don't crash on missing room members

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

diff --git a/src/autocomplete/UserProvider.js b/src/autocomplete/UserProvider.js
index bceec3f144..b11c79f9c2 100644
--- a/src/autocomplete/UserProvider.js
+++ b/src/autocomplete/UserProvider.js
@@ -72,6 +72,7 @@ export default class UserProvider extends AutocompleteProvider {
         // updates from pagination will happen when the paginate completes.
         if (toStartOfTimeline || !data || !data.liveEvent) return;
 
+        // TODO: lazyload if we have no ev.sender room member?
         this.onUserSpoke(ev.sender);
     }
 
@@ -147,6 +148,7 @@ export default class UserProvider extends AutocompleteProvider {
 
     onUserSpoke(user: RoomMember) {
         if (this.users === null) return;
+        if (!user) return;
         if (user.userId === MatrixClientPeg.get().credentials.userId) return;
 
         // Move the user that spoke to the front of the array

From 6821e77bfc1f8a2de1a1f2fc4c79ab9230f71905 Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <ButterflyOfFire@protonmail.com>
Date: Thu, 15 Mar 2018 22:38:43 +0000
Subject: [PATCH 724/927] Translated using Weblate (Arabic)

Currently translated at 1.5% (15 of 996 strings)

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

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 807629ef64..96d51109d3 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1,11 +1,17 @@
 {
-    "Continue": "استمر",
+    "Continue": "إستمر",
     "Username available": "اسم المستخدم متاح",
     "Username not available": "الإسم المستخدم غير موجود",
     "Something went wrong!": "هناك خطأ ما!",
     "Cancel": "إلغاء",
     "Close": "إغلاق",
     "Create new room": "إنشاء غرفة جديدة",
-    "Custom Server Options": "إعدادات السيرفر خاصة",
-    "Dismiss": "صرف النظر"
+    "Custom Server Options": "الإعدادات الشخصية للخادوم",
+    "Dismiss": "تجاهل",
+    "Failed to change password. Is your password correct?": "فشلت عملية تعديل الكلمة السرية. هل كلمتك السرية صحيحة ؟",
+    "Warning": "تنبيه",
+    "Error": "خطأ",
+    "Remove": "حذف",
+    "Send": "إرسال",
+    "Edit": "تعديل"
 }

From e3de1a8a18d1b435aedc402d9342d04ba4f0eb35 Mon Sep 17 00:00:00 2001
From: "Iru Cai (vimacs)" <mytbk920423@gmail.com>
Date: Fri, 16 Mar 2018 05:13:58 +0000
Subject: [PATCH 725/927] Translated using Weblate (Chinese (Simplified))

Currently translated at 80.7% (804 of 996 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index cb58fb6803..d933f54572 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -754,5 +754,54 @@
     "Who would you like to add to this community?": "您想把谁添加到这个社区内？",
     "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "警告：您添加的用户对一切知道这个社区的 ID 的人公开",
     "Name or matrix ID": "名称或 Matrix ID",
-    "Which rooms would you like to add to this community?": "您想把哪个聊天室添加到这个社区中？"
+    "Which rooms would you like to add to this community?": "您想把哪个聊天室添加到这个社区中？",
+    "Add rooms to the community": "添加聊天室到社区",
+    "Add to community": "添加到社区",
+    "Failed to invite users to community": "添加用户到社区失败",
+    "Message Replies": "消息回复",
+    "Disable Peer-to-Peer for 1:1 calls": "在1:1通话中禁用点到点",
+    "Enable inline URL previews by default": "默认启用自动网址预览",
+    "Disinvite this user?": "取消邀请这个用户？",
+    "Kick this user?": "踢出这个用户？",
+    "Unban this user?": "解除这个用户的封禁？",
+    "Ban this user?": "封紧这个用户？",
+    "Send an encrypted reply…": "发送一条加密的回复...",
+    "Send a reply (unencrypted)…": "发送一条回复（未加密）...",
+    "Send an encrypted message…": "发送一条加密消息…",
+    "Send a message (unencrypted)…": "发送一条消息 （未加密）…",
+    "Replying": "正在回复",
+    "Community Invites": "社区邀请",
+    "You are trying to access a room.": "你正在尝试访问一个聊天室。",
+    "To change the topic, you must be a": "要修改主题，你必须是",
+    "To modify widgets in the room, you must be a": "要修改聊天室中的小组件，你必须是",
+    "Banned by %(displayName)s": "被 %(displayName)s 封禁",
+    "To send messages, you must be a": "要发送消息，你必须是",
+    "To invite users into the room, you must be a": "要邀请用户到聊天室，你必须是",
+    "To configure the room, you must be a": "要配置聊天室，你必须是",
+    "To kick users, you must be a": "要踢出用户，你必须是",
+    "To ban users, you must be a": "要封禁用户，你必须是",
+    "To remove other users' messages, you must be a": "要删除其他用户的消息，你必须是",
+    "%(user)s is a %(userRole)s": "%(user)s 是一个 %(userRole)s",
+    "To link to a room it must have <a>an address</a>.": "要链接一个聊天室，它必须有一个<a>地址</a>。",
+    "To send events of type <eventType/>, you must be a": "要发送类型为 <eventType/> 的事件，你必须是",
+    "Members only (since the point in time of selecting this option)": "只有成员（从选择这个选项的时间开始）",
+    "Members only (since they were invited)": "只有成员（从他们被邀请开始）",
+    "Members only (since they joined)": "只有成员（从他们加入开始）",
+    "Invalid community ID": "无效的社区 ID",
+    "Create Community": "创建社区",
+    "Community Name": "社区名",
+    "Community ID": "社区 ID",
+    "example": "例子",
+    "This setting cannot be changed later!": "这个设置以后不能被修改！",
+    "Add a Room": "添加一个聊天室",
+    "Add a User": "添加一个用户",
+    "Unable to accept invite": "无法接受邀请",
+    "Unable to reject invite": "无法拒绝邀请",
+    "Leave Community": "离开社区",
+    "Community Settings": "社区设置",
+    "Community %(groupId)s not found": "找不到社区 %(groupId)s",
+    "Your Communities": "你的社区",
+    "Failed to set direct chat tag": "无法设定私聊标签",
+    "Failed to remove tag %(tagName)s from room": "移除聊天室标签 %(tagName)s 失败",
+    "Failed to add tag %(tagName)s to room": "无法为聊天室新增标签 %(tagName)s"
 }

From 4d8f5072f72778e7e452d9723e0a8ef05f69d7cc Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Fri, 16 Mar 2018 10:20:14 +0000
Subject: [PATCH 726/927] Allow react performance profiling on widget iframes.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 02f6beba9e..e7f44a8840 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -36,6 +36,7 @@ import WidgetUtils from '../../../WidgetUtils';
 import dis from '../../../dispatcher';
 
 const ALLOWED_APP_URL_SCHEMES = ['https:', 'http:'];
+const ENABLE_REACT_PERF = false;
 
 export default class AppTile extends React.Component {
     constructor(props) {
@@ -452,7 +453,11 @@ export default class AppTile extends React.Component {
     }
 
     _getSafeUrl() {
-        const parsedWidgetUrl = url.parse(this.state.widgetUrl);
+        const parsedWidgetUrl = url.parse(this.state.widgetUrl, true);
+        if (ENABLE_REACT_PERF) {
+            parsedWidgetUrl.search = null;
+            parsedWidgetUrl.query.react_perf = true;
+        }
         let safeWidgetUrl = '';
         if (ALLOWED_APP_URL_SCHEMES.indexOf(parsedWidgetUrl.protocol) !== -1) {
             safeWidgetUrl = url.format(parsedWidgetUrl);

From c866534a98b8d708d5a3b94dcd6b83ae2906aa27 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Wed, 14 Mar 2018 14:34:10 +0000
Subject: [PATCH 727/927] Translated using Weblate (German)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d144f342b7..1b567a9700 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -994,5 +994,6 @@
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Wenn deine anderen Geräte keine Schlüssel für diese Nachricht haben, wirst du diese nicht entschlüsseln können.",
     "Key request sent.": "Schlüssel-Anfragen gesendet.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "Verschlüsselungs-Schlüssel von deinen anderen Geräten <requestLink>erneut anfragen</requestLink>.",
-    "%(user)s is a %(userRole)s": "%(user)s ist ein %(userRole)s"
+    "%(user)s is a %(userRole)s": "%(user)s ist ein %(userRole)s",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Änderungen, die an deiner Community gemacht werden, können bis zu 30 Minuten brauchen, bis sie für andere sichtbar sind."
 }

From 1a3721e24c703de2f0eae0c12296e2d091bbbd84 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Fri, 16 Mar 2018 15:04:51 +0000
Subject: [PATCH 728/927] Translated using Weblate (Italian)

Currently translated at 42.4% (423 of 996 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index b518dd866b..7e8c4ef85d 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -304,5 +304,123 @@
     "Your key share request has been sent - please check your other devices for key share requests.": "Richiesta di condivisione chiavi inviata - controlla i tuoi altri dispositivi per richieste di condivisione chiavi.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Le richieste di condivisione chiavi sono inviate automaticamente ai tuoi altri dispositivi. Se hai rifiutato o annullato la richiesta negli altri dispositivi, clicca qui per richiederle nuovamente.",
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se i tuoi altri dispositivi non hanno la chiave per questo messaggio non potrai decriptarli.",
-    "Key request sent.": "Richiesta chiave inviata."
+    "Key request sent.": "Richiesta chiave inviata.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Chiedi di nuovo le chiavi di cifratura</requestLink> dai tuoi altri dispositivi.",
+    "Undecryptable": "Indecifrabile",
+    "Encrypted by a verified device": "Criptato da un dispositivo verificato",
+    "Encrypted by an unverified device": "Criptato da un dispositivo non verificato",
+    "Unencrypted message": "Messaggio non criptato",
+    "Please select the destination room for this message": "Seleziona la stanza di destinazione per questo messaggio",
+    "Blacklisted": "In lista nera",
+    "Verified": "Verificato",
+    "Unverified": "Non verificato",
+    "device id: ": "ID dispositivo: ",
+    "Disinvite": "Revoca invito",
+    "Kick": "Caccia fuori",
+    "Disinvite this user?": "Revocare l'invito a questo utente?",
+    "Kick this user?": "Cacciare questo utente?",
+    "Failed to kick": "Espulsione fallita",
+    "Unban": "Togli ban",
+    "Ban": "Bandisci",
+    "Unban this user?": "Togliere il ban a questo utente?",
+    "Ban this user?": "Bandire questo utente?",
+    "Failed to ban user": "Ban utente fallito",
+    "Failed to mute user": "Impossibile silenziare l'utente",
+    "Failed to toggle moderator status": "Cambio di stato moderatore fallito",
+    "Failed to change power level": "Cambio di livello poteri fallito",
+    "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Non potrai annullare questa modifica dato che ti stai declassando, se sei l'ultimo utente privilegiato nella stanza sarà impossibile ottenere di nuovo i privilegi.",
+    "Are you sure?": "Sei sicuro?",
+    "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non potrai annullare questa modifica dato che stai promuovendo l'utente al tuo stesso grado.",
+    "No devices with registered encryption keys": "Nessun dispositivo con chiavi di cifratura registrate",
+    "Devices": "Dispositivi",
+    "Unignore": "Togli ignora",
+    "Ignore": "Ignora",
+    "Mention": "Cita",
+    "Invite": "Invita",
+    "User Options": "Opzioni utente",
+    "Direct chats": "Conversazioni dirette",
+    "Unmute": "Togli silenzio",
+    "Revoke Moderator": "Declassa moderatore",
+    "Make Moderator": "Promuovi a moderatore",
+    "Level:": "Livello:",
+    "and %(count)s others...|other": "e altri %(count)s ...",
+    "and %(count)s others...|one": "e un altro...",
+    "Invited": "Invitato",
+    "Filter room members": "Filtra membri della stanza",
+    "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (poteri %(powerLevelNumber)s)",
+    "Attachment": "Allegato",
+    "Upload Files": "Invia file",
+    "Are you sure you want to upload the following files?": "Sei sicuro di volere inviare i seguenti file?",
+    "Encrypted room": "Stanza criptata",
+    "Unencrypted room": "Stanza non criptata",
+    "Hangup": "Riaggancia",
+    "Voice call": "Chiamata vocale",
+    "Video call": "Chiamata video",
+    "Hide Apps": "Nascondi apps",
+    "Show Apps": "Mostra apps",
+    "Upload file": "Invia file",
+    "Show Text Formatting Toolbar": "Mostra barra di formattazione testo",
+    "Send an encrypted reply…": "Invia una risposta criptata…",
+    "Send a reply (unencrypted)…": "Invia una risposta (non criptata)…",
+    "Send an encrypted message…": "Invia un messaggio criptato…",
+    "Send a message (unencrypted)…": "Invia un messaggio (non criptato)…",
+    "You do not have permission to post to this room": "Non hai il permesso di inviare in questa stanza",
+    "Turn Markdown on": "Attiva markdown",
+    "Turn Markdown off": "Disattiva markdown",
+    "Hide Text Formatting Toolbar": "Nascondi barra di formattazione testo",
+    "Server error": "Errore del server",
+    "Server unavailable, overloaded, or something else went wrong.": "Server non disponibile, sovraccarico o qualcos'altro è andato storto.",
+    "Command error": "Errore nel comando",
+    "bold": "grassetto",
+    "italic": "corsivo",
+    "strike": "barrato",
+    "underline": "sottolineato",
+    "code": "codice",
+    "quote": "citazione",
+    "bullet": "elenco",
+    "numbullet": "elenco numerato",
+    "Markdown is disabled": "Il markdown è disattivato",
+    "Markdown is enabled": "Il markdown è attivato",
+    "Jump to message": "Salta al messaggio",
+    "No pinned messages.": "Nessun messaggio ancorato.",
+    "Loading...": "Caricamento...",
+    "Pinned Messages": "Messaggi ancorati",
+    "%(duration)ss": "%(duration)ss",
+    "%(duration)sm": "%(duration)sm",
+    "%(duration)sh": "%(duration)sh",
+    "%(duration)sd": "%(duration)sg",
+    "Online for %(duration)s": "Online per %(duration)s",
+    "Idle for %(duration)s": "Inattivo per %(duration)s",
+    "Offline for %(duration)s": "Offline per %(duration)s",
+    "Unknown for %(duration)s": "Sconosciuto per %(duration)s",
+    "Idle": "Inattivo",
+    "Offline": "Offline",
+    "Unknown": "Sconosciuto",
+    "Seen by %(userName)s at %(dateTime)s": "Visto da %(userName)s alle %(dateTime)s",
+    "No rooms to show": "Nessuna stanza da mostrare",
+    "World readable": "Leggibile da tutti",
+    "Guests can join": "Gli ospiti possono entrare",
+    "Failed to set avatar.": "Impostazione avatar fallita.",
+    "Save": "Salva",
+    "(~%(count)s results)|other": "(~%(count)s risultati)",
+    "(~%(count)s results)|one": "(~%(count)s risultato)",
+    "Join Room": "Entra nella stanza",
+    "Upload avatar": "Invia avatar",
+    "Remove avatar": "Rimuovi avatar",
+    "Forget room": "Dimentica la stanza",
+    "Show panel": "Mostra il pannello",
+    "Drop here to favourite": "Trascina qui per i preferiti",
+    "Drop here to tag direct chat": "Trascina qui per taggare chat diretta",
+    "Drop here to restore": "Trascina qui per ripristinare",
+    "Drop here to demote": "Trascina qui per declassare",
+    "Drop here to tag %(section)s": "Trascina qui per taggare %(section)s",
+    "Press <StartChatButton> to start a chat with someone": "Premi <StartChatButton> per iniziare una conversazione con qualcuno",
+    "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Non sei ancora in alcuna stanza! Premi <CreateRoomButton> per crearne una o <RoomDirectoryButton> per sfogliare l'elenco",
+    "Community Invites": "Inviti della comunità",
+    "Invites": "Inviti",
+    "Favourites": "Preferiti",
+    "People": "Persone",
+    "Low priority": "Bassa priorità",
+    "Historical": "Storico",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Impossibile verificare che l'indirizzo al quale questo invito è stato inviato corrisponda a uno associato al tuo account."
 }

From aaff32d25814ac9adf3121c55ab068e7bd4922f1 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Mon, 12 Mar 2018 19:33:57 +0000
Subject: [PATCH 729/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (994 of 994 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 4968907a81..a3dd53ea8c 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -994,5 +994,6 @@
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ако другите Ви устройства нямат ключа за това съобщение, няма да можете да го разшифровате.",
     "Key request sent.": "Заявката за ключ е изпратена.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Заявете отново ключове за шифроване</requestLink> от другите Ви устройства.",
-    "%(user)s is a %(userRole)s": "%(user)s е %(userRole)s"
+    "%(user)s is a %(userRole)s": "%(user)s е %(userRole)s",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Промени, направени във общността Ви, може да не бъдат видяни от другите потребители за най-много 30 минути."
 }

From 076afeb4eb9713630727a02dbca413ea2f38ad88 Mon Sep 17 00:00:00 2001
From: Heitor <heitorpbittencourt@gmail.com>
Date: Sun, 18 Mar 2018 16:46:42 +0000
Subject: [PATCH 730/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.1% (986 of 994 strings)

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

fix typo (avatars -> avatares)
---
 src/i18n/strings/pt_BR.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 3b37b1ab80..1a74354f52 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -705,7 +705,7 @@
     "Hide avatar changes": "Ocultar alterações da imagem de perfil",
     "Hide display name changes": "Ocultar alterações de nome de usuária/o",
     "Enable automatic language detection for syntax highlighting": "Ativar detecção automática de idioma para ressaltar erros de ortografia",
-    "Hide avatars in user and room mentions": "Ocultar avatars em menções a usuárias/os e a salas",
+    "Hide avatars in user and room mentions": "Ocultar avatares em menções a usuárias/os e a salas",
     "Disable big emoji in chat": "Desativar emojis grandes na sala",
     "Automatically replace plain text Emoji": "Substituir automaticamente os emojis em texto",
     "Mirror local video feed": "Espelhar o feed de vídeo local",

From 611cf119b7f713303a996944fc6a83697da1d278 Mon Sep 17 00:00:00 2001
From: Heitor <heitorpbittencourt@gmail.com>
Date: Sun, 18 Mar 2018 16:54:50 +0000
Subject: [PATCH 731/927] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (994 of 994 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 1a74354f52..fc0899873a 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -112,7 +112,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:",
     "Reject invitation": "Rejeitar convite",
     "Remove Contact Information?": "Remover informação de contato?",
     "Remove": "Remover",
@@ -914,7 +914,7 @@
     "Failed to add the following rooms to the summary of %(groupId)s:": "Não foi possível adicionar as seguintes salas para o índice da comunidade %(groupId)s:",
     "Add a Room": "Adicionar uma sala",
     "Failed to remove the room from the summary of %(groupId)s": "Não foi possível remover a sala do índice da comunidade %(groupId)s",
-    "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' não pôde ser removida do índice",
+    "The room '%(roomName)s' could not be removed from the summary.": "A sala '%(roomName)s' não pôde ser removida do índice.",
     "Add users to the community summary": "Adicionar pessoas para o índice da comunidade",
     "Who would you like to add to this summary?": "Quem você gostaria de adicionar a este índice?",
     "Failed to add the following users to the summary of %(groupId)s:": "Não foi possível adicionar as seguintes pessoas para o índice da comunidade %(groupId)s:",
@@ -986,5 +986,13 @@
     "Failed to remove tag %(tagName)s from room": "Falha ao remover a tag %(tagName)s da sala",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar a tag %(tagName)s para a sala",
     "Did you know: you can use communities to filter your Riot.im experience!": "Você sabia? Você pode usar as comunidades para filtrar a sua experiência no Riot!",
-    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para criar um filtro, arraste a imagem de uma comunidade sobre o painel de filtros na extrema esquerda da sua tela. Você pode clicar na imagem de uma comunidade no painel de filtros a qualquer momento para ver apenas as salas e pessoas associadas com esta comunidade."
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para criar um filtro, arraste a imagem de uma comunidade sobre o painel de filtros na extrema esquerda da sua tela. Você pode clicar na imagem de uma comunidade no painel de filtros a qualquer momento para ver apenas as salas e pessoas associadas com esta comunidade.",
+    "Disable Community Filter Panel": "Desativar painel de filtros de Comunidades",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Seu pedido de confirmação de chaves foi realizado - favor verificar seus outros dispositivos.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Pedidos de confirmação de chaves são enviados aos outros dispositivos automaticamente. Se você rejeitou ou negou uma confirmação de chaves em seus outros dispositivos, clique aqui para enviar novamente.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Se seus outros dispositivos não têm a chave para esta mensagem, você não poderá decriptá-las.",
+    "Key request sent.": "Requisição de chave enviada.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Requisitar novamente chaves de encriptação</requestLink> de seus outros dispositivos.",
+    "%(user)s is a %(userRole)s": "%(user)s é %(userRole)s",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Mudanças feitas para sua comunidade podem não chegar aos outros usuários por até 30 minutos."
 }

From 6e5226625439786be70b61b14185be69a66e2eed Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Mon, 19 Mar 2018 06:05:25 +0000
Subject: [PATCH 732/927] Translated using Weblate (Galician)

Currently translated at 100.0% (994 of 994 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 7c6e221f5a..fa290a33f1 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -236,7 +236,7 @@
     "Enable Notifications": "Habilitar notificacións",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s  %(fullYear)s",
     "Message Replies": "Respostas a mensaxe",
-    "Mirror local video feed": "",
+    "Mirror local video feed": "Espellar fonte de vídeo local",
     "Opt out of analytics": "Saírse de analytics",
     "Cannot add any more widgets": "Non pode engadir máis widgets",
     "The maximum permitted number of widgets have already been added to this room.": "Xa se engadeu o número máximo de widgets a esta sala.",
@@ -975,5 +975,22 @@
     "Clear filter": "Quitar filtro",
     "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
     "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar a etiqueta %(tagName)s da sala",
-    "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala"
+    "Failed to add tag %(tagName)s to room": "Fallo ao engadir a etiqueta %(tagName)s a sala",
+    "Failed to lookup current room": "Fallo ao bloquear a sala actual",
+    "Disable Community Filter Panel": "Deshabilitar o panel de filtro de comunidades",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Enviouse a solicitude de compartir chave -  por favor comprobe as peticións de compartir chaves nos seus outros dispositivos.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "As peticións de compartir chaves envíanse de xeito automático aos seus outros dispositivos. Si rexeita o obvia estas peticións nos outros dispositivos, pulse aquí para solicitar novamente as chaves para esta sesión.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Si os seus outros dispositivos non teñen as chaves para est mensaxe non poderán descifrala.",
+    "Key request sent.": "Petición de chave enviada.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Voltar a pedir chaves de cifrado</requestLink> desde os outros dispositivos.",
+    "%(user)s is a %(userRole)s": "%(user)s é  %(userRole)s",
+    "Flair": "Aura",
+    "Showing flair for these communities:": "Mostrar o aura para estas comunidades:",
+    "Flair will appear if enabled in room settings": "O Aura aparecerá si está habilitada nas preferencias da sala",
+    "Flair will not appear": "O Aura non aparecerá",
+    "Display your community flair in rooms configured to show it.": "Mostrar o aura da súa comunidade en salas configuradas para mostralo.",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Os cambios feitos a súa comunidade poderían tardar uns 30 minutos en ser visibles para os membros.",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquer moemento para ver só salas e xente asociada a esa comunidade.",
+    "Deops user with given id": "Degradar usuaria co id dado"
 }

From 2c81588937cdd3a5763e8aa133a3a74efbb8952c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Mar 2018 12:11:08 +0000
Subject: [PATCH 733/927] bump js-sdk version

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

diff --git a/package.json b/package.json
index bb8db64d28..c33babceb0 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.9.2",
+    "matrix-js-sdk": "0.10.0-rc.1",
     "optimist": "^0.6.1",
     "prop-types": "^15.5.8",
     "querystring": "^0.2.0",

From 85f81e81539f5782993957441b9acf2f6cbd2ee9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Mar 2018 12:16:32 +0000
Subject: [PATCH 734/927] Prepare changelog for v0.12.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 055e25b805..a0ad559922 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,338 @@
+Changes in [0.12.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.1) (2018-03-19)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.11.4...v0.12.0-rc.1)
+
+ * Remove the message on migrating crypto data
+   [\#1803](https://github.com/matrix-org/matrix-react-sdk/pull/1803)
+ * Update from Weblate.
+   [\#1804](https://github.com/matrix-org/matrix-react-sdk/pull/1804)
+ * Improve room list performance when receiving messages
+   [\#1801](https://github.com/matrix-org/matrix-react-sdk/pull/1801)
+ * Add change delay warning in GroupView settings
+   [\#1802](https://github.com/matrix-org/matrix-react-sdk/pull/1802)
+ * Only use `dangerouslySetInnerHTML` for HTML messages
+   [\#1799](https://github.com/matrix-org/matrix-react-sdk/pull/1799)
+ * Limit group requests to 3 at once
+   [\#1798](https://github.com/matrix-org/matrix-react-sdk/pull/1798)
+ * Show GroupMemberList after inviting a group member
+   [\#1796](https://github.com/matrix-org/matrix-react-sdk/pull/1796)
+ * Fix syntax fail
+   [\#1794](https://github.com/matrix-org/matrix-react-sdk/pull/1794)
+ * Use TintableSvg for TagPanel clear filter button
+   [\#1793](https://github.com/matrix-org/matrix-react-sdk/pull/1793)
+ * Fix missing space between "...is a" and user ID
+   [\#1792](https://github.com/matrix-org/matrix-react-sdk/pull/1792)
+ * E2E "fudge-button"
+   [\#1791](https://github.com/matrix-org/matrix-react-sdk/pull/1791)
+ * Remove spurious console.trace
+   [\#1790](https://github.com/matrix-org/matrix-react-sdk/pull/1790)
+ * Don't reset the presence timer on every dispatch
+   [\#1789](https://github.com/matrix-org/matrix-react-sdk/pull/1789)
+ * Potentially fix a memory leak in FlairStore
+   [\#1788](https://github.com/matrix-org/matrix-react-sdk/pull/1788)
+ * Implement transparent RoomTile for use in some places
+   [\#1785](https://github.com/matrix-org/matrix-react-sdk/pull/1785)
+ * Fix varying default group avatar colour for given group
+   [\#1784](https://github.com/matrix-org/matrix-react-sdk/pull/1784)
+ * Fix bug where avatar change not reflected in LLP
+   [\#1783](https://github.com/matrix-org/matrix-react-sdk/pull/1783)
+ * Workaround for atlassian/react-beautiful-dnd#273
+   [\#1782](https://github.com/matrix-org/matrix-react-sdk/pull/1782)
+ * Add setting to disable TagPanel
+   [\#1781](https://github.com/matrix-org/matrix-react-sdk/pull/1781)
+ * [DO NOT MERGE] Tests proven to fail
+   [\#1780](https://github.com/matrix-org/matrix-react-sdk/pull/1780)
+ * Fix room power level settings
+   [\#1779](https://github.com/matrix-org/matrix-react-sdk/pull/1779)
+ * fix shouldHideEvent saying an event is a leave/join when a profile ch…
+   [\#1769](https://github.com/matrix-org/matrix-react-sdk/pull/1769)
+ * Add "Did you know:..." microcopy to groups view
+   [\#1777](https://github.com/matrix-org/matrix-react-sdk/pull/1777)
+ * Give emptySubListTip a container for correct bg colour
+   [\#1753](https://github.com/matrix-org/matrix-react-sdk/pull/1753)
+ * Do proper null-checks on decypted events to fix NPEs
+   [\#1776](https://github.com/matrix-org/matrix-react-sdk/pull/1776)
+ * Reorder the RoomListStore lists on Event.decrypted
+   [\#1775](https://github.com/matrix-org/matrix-react-sdk/pull/1775)
+ * Fix bug where global "Never send to unverified..." is ignored
+   [\#1772](https://github.com/matrix-org/matrix-react-sdk/pull/1772)
+ * Fix bug that prevented tint updates
+   [\#1767](https://github.com/matrix-org/matrix-react-sdk/pull/1767)
+ * Fix group member spinner being out of flex order
+   [\#1765](https://github.com/matrix-org/matrix-react-sdk/pull/1765)
+ * Allow widget iframes to request camera and microphone permissions.
+   [\#1766](https://github.com/matrix-org/matrix-react-sdk/pull/1766)
+ * Change icon from "R" to "X"
+   [\#1764](https://github.com/matrix-org/matrix-react-sdk/pull/1764)
+ * Regenerate room lists on Room event
+   [\#1762](https://github.com/matrix-org/matrix-react-sdk/pull/1762)
+ *  Fix DMs being marked as with the current user ("me")
+   [\#1761](https://github.com/matrix-org/matrix-react-sdk/pull/1761)
+ * Make RoomListStore aware of Room.timeline events
+   [\#1756](https://github.com/matrix-org/matrix-react-sdk/pull/1756)
+ * improve origin check of ScalarMessaging postmessage API.
+   [\#1760](https://github.com/matrix-org/matrix-react-sdk/pull/1760)
+ * Implement global filter to deselect all tags
+   [\#1759](https://github.com/matrix-org/matrix-react-sdk/pull/1759)
+ * Don't show empty custom tags when filtering tags
+   [\#1758](https://github.com/matrix-org/matrix-react-sdk/pull/1758)
+ * Do not assume that tags have been removed
+   [\#1757](https://github.com/matrix-org/matrix-react-sdk/pull/1757)
+ * Change CSS class for message panel spinner
+   [\#1747](https://github.com/matrix-org/matrix-react-sdk/pull/1747)
+ * Remove RoomListStore listener
+   [\#1752](https://github.com/matrix-org/matrix-react-sdk/pull/1752)
+ * Implement GroupTile avatar dragging to TagPanel
+   [\#1751](https://github.com/matrix-org/matrix-react-sdk/pull/1751)
+ * Fix custom tags not being ordered manually
+   [\#1750](https://github.com/matrix-org/matrix-react-sdk/pull/1750)
+ * Store component state for editors
+   [\#1746](https://github.com/matrix-org/matrix-react-sdk/pull/1746)
+ * Give the login page its spinner back
+   [\#1745](https://github.com/matrix-org/matrix-react-sdk/pull/1745)
+ * Add context menu to TagTile
+   [\#1743](https://github.com/matrix-org/matrix-react-sdk/pull/1743)
+ * If a tag is unrecognised, assume manual ordering
+   [\#1748](https://github.com/matrix-org/matrix-react-sdk/pull/1748)
+ * Move RoomList state to RoomListStore
+   [\#1719](https://github.com/matrix-org/matrix-react-sdk/pull/1719)
+ * Move groups button to TagPanel
+   [\#1744](https://github.com/matrix-org/matrix-react-sdk/pull/1744)
+ * Add seconds to timestamp on hover
+   [\#1738](https://github.com/matrix-org/matrix-react-sdk/pull/1738)
+ * Do not truncate autocompleted users in composer
+   [\#1739](https://github.com/matrix-org/matrix-react-sdk/pull/1739)
+ * RoomView: guard against unmounting during peeking
+   [\#1737](https://github.com/matrix-org/matrix-react-sdk/pull/1737)
+ * Fix HS/IS URL reset when switching to Registration
+   [\#1736](https://github.com/matrix-org/matrix-react-sdk/pull/1736)
+ * Fix the reject/accept call buttons in canary (mk2)
+   [\#1734](https://github.com/matrix-org/matrix-react-sdk/pull/1734)
+ * Make ratelimitedfunc time from the function's end
+   [\#1731](https://github.com/matrix-org/matrix-react-sdk/pull/1731)
+ * Give dialogs a matrixClient context
+   [\#1735](https://github.com/matrix-org/matrix-react-sdk/pull/1735)
+ * Fix key bindings in address picker dialog
+   [\#1732](https://github.com/matrix-org/matrix-react-sdk/pull/1732)
+ * Try upgrading eslint-plugin-react
+   [\#1712](https://github.com/matrix-org/matrix-react-sdk/pull/1712)
+ * Fix display name change text
+   [\#1730](https://github.com/matrix-org/matrix-react-sdk/pull/1730)
+ * Persist contentState when sending SlashCommand via MessageComposerInput
+   [\#1721](https://github.com/matrix-org/matrix-react-sdk/pull/1721)
+ * This is actually MFileBody not MImageBody, change classname
+   [\#1726](https://github.com/matrix-org/matrix-react-sdk/pull/1726)
+ * Use invite_3pid prop of createRoom instead of manual invite after create
+   [\#1717](https://github.com/matrix-org/matrix-react-sdk/pull/1717)
+ * guard against m.room.aliases events with no keys (redaction?)
+   [\#1729](https://github.com/matrix-org/matrix-react-sdk/pull/1729)
+ * Fix not showing Invited section if all invites are 3PID
+   [\#1718](https://github.com/matrix-org/matrix-react-sdk/pull/1718)
+ * Fix Rich Replies on files
+   [\#1720](https://github.com/matrix-org/matrix-react-sdk/pull/1720)
+ * Update from Weblate.
+   [\#1728](https://github.com/matrix-org/matrix-react-sdk/pull/1728)
+ * Null guard against falsey (non-null) props.node, to make react happy
+   [\#1724](https://github.com/matrix-org/matrix-react-sdk/pull/1724)
+ * Use correct condition for getting account data after first sync
+   [\#1722](https://github.com/matrix-org/matrix-react-sdk/pull/1722)
+ * Fix order calculation logic when reordering a room
+   [\#1725](https://github.com/matrix-org/matrix-react-sdk/pull/1725)
+ * Linear Rich Quoting
+   [\#1715](https://github.com/matrix-org/matrix-react-sdk/pull/1715)
+ * Fix CreateGroupDialog issues
+   [\#1714](https://github.com/matrix-org/matrix-react-sdk/pull/1714)
+ * Show a warning if the user attempts to leave a room that is invite only
+   [\#1713](https://github.com/matrix-org/matrix-react-sdk/pull/1713)
+ * Swap RoomList to react-beautiful-dnd
+   [\#1711](https://github.com/matrix-org/matrix-react-sdk/pull/1711)
+ * don't pass back {} when we have no `org.matrix.room.color_scheme`
+   [\#1710](https://github.com/matrix-org/matrix-react-sdk/pull/1710)
+ * Don't paginate whilst decrypting events
+   [\#1700](https://github.com/matrix-org/matrix-react-sdk/pull/1700)
+ * Fall back for missing i18n plurals
+   [\#1699](https://github.com/matrix-org/matrix-react-sdk/pull/1699)
+ * Fix group store redundant requests
+   [\#1709](https://github.com/matrix-org/matrix-react-sdk/pull/1709)
+ * Ignore remote echos caused by this client
+   [\#1708](https://github.com/matrix-org/matrix-react-sdk/pull/1708)
+ * Replace TagPanel react-dnd with react-beautiful-dnd
+   [\#1705](https://github.com/matrix-org/matrix-react-sdk/pull/1705)
+ * Only set selected tags state when updating rooms
+   [\#1704](https://github.com/matrix-org/matrix-react-sdk/pull/1704)
+ * Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
+   [\#1702](https://github.com/matrix-org/matrix-react-sdk/pull/1702)
+ * Fix autofocus on QuestionDialog
+   [\#1698](https://github.com/matrix-org/matrix-react-sdk/pull/1698)
+ * Iterative fixes on Rich Quoting
+   [\#1697](https://github.com/matrix-org/matrix-react-sdk/pull/1697)
+ * Fix missing negation
+   [\#1696](https://github.com/matrix-org/matrix-react-sdk/pull/1696)
+ * Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
+   [\#1625](https://github.com/matrix-org/matrix-react-sdk/pull/1625)
+ * Attempt to re-register for a scalar token if ours is invalid
+   [\#1668](https://github.com/matrix-org/matrix-react-sdk/pull/1668)
+ * Normalise dialogs
+   [\#1674](https://github.com/matrix-org/matrix-react-sdk/pull/1674)
+ * Add 'send without verifying' to status bar
+   [\#1695](https://github.com/matrix-org/matrix-react-sdk/pull/1695)
+ * Implement Rich Quoting/Replies
+   [\#1660](https://github.com/matrix-org/matrix-react-sdk/pull/1660)
+ * Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
+   [\#1694](https://github.com/matrix-org/matrix-react-sdk/pull/1694)
+ * Cache isConfCallRoom
+   [\#1693](https://github.com/matrix-org/matrix-react-sdk/pull/1693)
+ * Improve performance of tag panel selection (when tags are selected)
+   [\#1687](https://github.com/matrix-org/matrix-react-sdk/pull/1687)
+ * Hide status bar on visible->hidden transition
+   [\#1680](https://github.com/matrix-org/matrix-react-sdk/pull/1680)
+ * [revived] Singularise unsent message prompt, if applicable
+   [\#1692](https://github.com/matrix-org/matrix-react-sdk/pull/1692)
+ * small refactor && warn on self-demotion
+   [\#1683](https://github.com/matrix-org/matrix-react-sdk/pull/1683)
+ * Remove use of deprecated React.PropTypes
+   [\#1677](https://github.com/matrix-org/matrix-react-sdk/pull/1677)
+ * only save RelatedGroupSettings if it was modified. Otherwise perms issue
+   [\#1691](https://github.com/matrix-org/matrix-react-sdk/pull/1691)
+ * Fix a couple more issues with granular settings
+   [\#1675](https://github.com/matrix-org/matrix-react-sdk/pull/1675)
+ * Allow argument to op slashcommand to be negative as PLs can be -ve
+   [\#1673](https://github.com/matrix-org/matrix-react-sdk/pull/1673)
+ * Update from Weblate.
+   [\#1645](https://github.com/matrix-org/matrix-react-sdk/pull/1645)
+ * make RoomDetailRow reusable for the Room Directory
+   [\#1624](https://github.com/matrix-org/matrix-react-sdk/pull/1624)
+ * Prefetch group data for all joined groups when RoomList mounts
+   [\#1686](https://github.com/matrix-org/matrix-react-sdk/pull/1686)
+ * Remove unused selectedRoom prop
+   [\#1690](https://github.com/matrix-org/matrix-react-sdk/pull/1690)
+ * Fix shift and shift-ctrl click in TagPanel
+   [\#1684](https://github.com/matrix-org/matrix-react-sdk/pull/1684)
+ * skip direct chats which either you or the target have left
+   [\#1344](https://github.com/matrix-org/matrix-react-sdk/pull/1344)
+ * Make scroll on paste in RTE compatible with https://github.com/vector-im
+   /riot-web/pull/5900
+   [\#1682](https://github.com/matrix-org/matrix-react-sdk/pull/1682)
+ * Remove extra full stop
+   [\#1685](https://github.com/matrix-org/matrix-react-sdk/pull/1685)
+ * Dedupe requests to fetch group profile data
+   [\#1666](https://github.com/matrix-org/matrix-react-sdk/pull/1666)
+ * Get Group profile from TagTile instead of TagPanel
+   [\#1667](https://github.com/matrix-org/matrix-react-sdk/pull/1667)
+ *  Fix leaking of GroupStore listeners in RoomList
+   [\#1664](https://github.com/matrix-org/matrix-react-sdk/pull/1664)
+ * Add option to also output untranslated string
+   [\#1658](https://github.com/matrix-org/matrix-react-sdk/pull/1658)
+ * Give the current theme to widgets and the integration manager
+   [\#1669](https://github.com/matrix-org/matrix-react-sdk/pull/1669)
+ * Fixes #1953 Allow multiple file uploads using drag & drop for RoomView
+   [\#1671](https://github.com/matrix-org/matrix-react-sdk/pull/1671)
+ * Fix issue with preview of phone number on register and waiting for sms code
+   confirmation code
+   [\#1670](https://github.com/matrix-org/matrix-react-sdk/pull/1670)
+ * Attempt to improve TagPanel performance
+   [\#1647](https://github.com/matrix-org/matrix-react-sdk/pull/1647)
+ * Fix one variant of a scroll jump that occurs when decrypting an m.text
+   [\#1656](https://github.com/matrix-org/matrix-react-sdk/pull/1656)
+ * Avoid NPEs by using ref method for collecting loggedInView in MatrixChat
+   [\#1665](https://github.com/matrix-org/matrix-react-sdk/pull/1665)
+ * DnD Ordered TagPanel
+   [\#1653](https://github.com/matrix-org/matrix-react-sdk/pull/1653)
+ * Update widget title on edit.
+   [\#1663](https://github.com/matrix-org/matrix-react-sdk/pull/1663)
+ * Set widget title
+   [\#1661](https://github.com/matrix-org/matrix-react-sdk/pull/1661)
+ * Display custom widget content titles
+   [\#1650](https://github.com/matrix-org/matrix-react-sdk/pull/1650)
+ * Add maximize / minimize apps drawer icons.
+   [\#1649](https://github.com/matrix-org/matrix-react-sdk/pull/1649)
+ * Warn when migrating e2e data to indexeddb
+   [\#1654](https://github.com/matrix-org/matrix-react-sdk/pull/1654)
+ * Don't Auto-show UnknownDeviceDialog
+   [\#1600](https://github.com/matrix-org/matrix-react-sdk/pull/1600)
+ * Remove logging.
+   [\#1655](https://github.com/matrix-org/matrix-react-sdk/pull/1655)
+ * Add messaging endpoint for room encryption status.
+   [\#1648](https://github.com/matrix-org/matrix-react-sdk/pull/1648)
+ * Add some missing translatable strings
+   [\#1588](https://github.com/matrix-org/matrix-react-sdk/pull/1588)
+ * Add widget -> riot postMessage API
+   [\#1640](https://github.com/matrix-org/matrix-react-sdk/pull/1640)
+ * Add some null checks
+   [\#1646](https://github.com/matrix-org/matrix-react-sdk/pull/1646)
+ * Implement shift-click and ctrl-click semantics for TP
+   [\#1641](https://github.com/matrix-org/matrix-react-sdk/pull/1641)
+ * Don't show group when clicking tag panel
+   [\#1642](https://github.com/matrix-org/matrix-react-sdk/pull/1642)
+ * Implement TagPanel (or LeftLeftPanel) for group filtering
+   [\#1639](https://github.com/matrix-org/matrix-react-sdk/pull/1639)
+ * Implement UI for using bulk device deletion API
+   [\#1638](https://github.com/matrix-org/matrix-react-sdk/pull/1638)
+ * Replace (IRC) with flair
+   [\#1637](https://github.com/matrix-org/matrix-react-sdk/pull/1637)
+ * Allow guests to view individual groups
+   [\#1635](https://github.com/matrix-org/matrix-react-sdk/pull/1635)
+ * Allow guest to see MyGroups, show ILAG when creating a group
+   [\#1636](https://github.com/matrix-org/matrix-react-sdk/pull/1636)
+ * Move group publication toggles to UserSettings
+   [\#1634](https://github.com/matrix-org/matrix-react-sdk/pull/1634)
+ * Pull the theme through the default process
+   [\#1617](https://github.com/matrix-org/matrix-react-sdk/pull/1617)
+ * Rebase ConfirmRedactDialog on QuestionDialog
+   [\#1630](https://github.com/matrix-org/matrix-react-sdk/pull/1630)
+ * Fix logging of missing substitution variables
+   [\#1629](https://github.com/matrix-org/matrix-react-sdk/pull/1629)
+ * Rename Related Groups to improve readability
+   [\#1632](https://github.com/matrix-org/matrix-react-sdk/pull/1632)
+ * Make PresenceLabel more easily translatable
+   [\#1616](https://github.com/matrix-org/matrix-react-sdk/pull/1616)
+ * Perform substitution on all parts, not just the last one
+   [\#1618](https://github.com/matrix-org/matrix-react-sdk/pull/1618)
+ * Send Access Token in Headers to help prevent it being spit out in errors
+   [\#1552](https://github.com/matrix-org/matrix-react-sdk/pull/1552)
+ * Add aria-labels to ActionButtons
+   [\#1628](https://github.com/matrix-org/matrix-react-sdk/pull/1628)
+ * MemberPresenceAvatar: fix null references
+   [\#1620](https://github.com/matrix-org/matrix-react-sdk/pull/1620)
+ * Disable presence controls if there's no presence
+   [\#1623](https://github.com/matrix-org/matrix-react-sdk/pull/1623)
+ * Fix GroupMemberList search for users without displayname
+   [\#1627](https://github.com/matrix-org/matrix-react-sdk/pull/1627)
+ * Remove redundant super class EventEmitter for FlairStore
+   [\#1626](https://github.com/matrix-org/matrix-react-sdk/pull/1626)
+ * Fix granular URL previews
+   [\#1622](https://github.com/matrix-org/matrix-react-sdk/pull/1622)
+ * Flairstore: Fix broken reference
+   [\#1619](https://github.com/matrix-org/matrix-react-sdk/pull/1619)
+ * Do something more sensible for sender profile name/aux opacity
+   [\#1615](https://github.com/matrix-org/matrix-react-sdk/pull/1615)
+ * Add eslint rule keyword-spacing
+   [\#1614](https://github.com/matrix-org/matrix-react-sdk/pull/1614)
+ * Fix various issues surrounding granular settings to date
+   [\#1613](https://github.com/matrix-org/matrix-react-sdk/pull/1613)
+ * differentiate between state events and message events
+   [\#1612](https://github.com/matrix-org/matrix-react-sdk/pull/1612)
+ * Refactor translations
+   [\#1608](https://github.com/matrix-org/matrix-react-sdk/pull/1608)
+ * Make TintableSvg links behave like normal image links
+   [\#1611](https://github.com/matrix-org/matrix-react-sdk/pull/1611)
+ * Fix linting errors.
+   [\#1610](https://github.com/matrix-org/matrix-react-sdk/pull/1610)
+ * Granular settings
+   [\#1516](https://github.com/matrix-org/matrix-react-sdk/pull/1516)
+ * Implement user-controlled presence
+   [\#1482](https://github.com/matrix-org/matrix-react-sdk/pull/1482)
+ * Edit widget icon styling
+   [\#1609](https://github.com/matrix-org/matrix-react-sdk/pull/1609)
+ * Attempt to improve textual power levels
+   [\#1607](https://github.com/matrix-org/matrix-react-sdk/pull/1607)
+ * Determine whether power level is custom once Roles have been determined
+   [\#1606](https://github.com/matrix-org/matrix-react-sdk/pull/1606)
+ * Status.im theme
+   [\#1605](https://github.com/matrix-org/matrix-react-sdk/pull/1605)
+ * Revert "Lowercase all usernames"
+   [\#1604](https://github.com/matrix-org/matrix-react-sdk/pull/1604)
+
 Changes in [0.11.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.11.4) (2018-02-09)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.11.3...v0.11.4)

From 6fbd4e04fa3ab4330ae0b6e88118974721177e6d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Mar 2018 12:16:32 +0000
Subject: [PATCH 735/927] v0.12.0-rc.1

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

diff --git a/package.json b/package.json
index c33babceb0..373d889a22 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.11.4",
+  "version": "0.12.0-rc.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 1b28ab136b0b12fd4851b3440bd6664b3e75f849 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 19 Mar 2018 14:12:06 +0000
Subject: [PATCH 736/927] Take TagPanel out of labs

---
 src/settings/Settings.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index cd37c00fa8..e33aed1a6c 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -94,12 +94,6 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
-    "feature_tag_panel": {
-        isFeature: true,
-        displayName: _td("Tag Panel"),
-        supportedLevels: LEVELS_FEATURE,
-        default: false,
-    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),

From b7c1982a0f3f89d03283fb3af6d52743468c9600 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 19 Mar 2018 12:01:15 +0000
Subject: [PATCH 737/927] Translated using Weblate (Italian)

Currently translated at 46.6% (464 of 994 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 7e8c4ef85d..976c85892e 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -422,5 +422,46 @@
     "People": "Persone",
     "Low priority": "Bassa priorità",
     "Historical": "Storico",
-    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Impossibile verificare che l'indirizzo al quale questo invito è stato inviato corrisponda a uno associato al tuo account."
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Impossibile verificare che l'indirizzo al quale questo invito è stato inviato corrisponda a uno associato al tuo account.",
+    "Power level must be positive integer.": "Il livello di poteri deve essere un intero positivo.",
+    "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha modificato il livello di poteri di %(powerLevelDiffText)s.",
+    "Jump to read receipt": "Salta alla ricevuta di lettura",
+    "This invitation was sent to an email address which is not associated with this account:": "Questo invito è stato mandato a un indirizzo email non associato a questo account:",
+    "You may wish to login with a different account, or add this email to this account.": "Dovresti accedere con un account diverso, o aggiungere questa email all'account.",
+    "You have been invited to join this room by %(inviterName)s": "Sei stato invitato ad entrare in questa stanza da %(inviterName)s",
+    "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Vuoi <acceptText>accettare</acceptText> o <declineText>rifiutare</declineText> l'invito?",
+    "Reason: %(reasonText)s": "Motivo: %(reasonText)s",
+    "Rejoin": "Rientra",
+    "You have been kicked from %(roomName)s by %(userName)s.": "Sei stato cacciato fuori da %(roomName)s da %(userName)s.",
+    "You have been kicked from this room by %(userName)s.": "Sei stato cacciato fuori da questa stanza da %(userName)s.",
+    "You have been banned from %(roomName)s by %(userName)s.": "Sei stato bandito da %(roomName)s da %(userName)s.",
+    "You have been banned from this room by %(userName)s.": "Sei stato bandito da questa stanza da %(userName)s.",
+    "This room": "Questa stanza",
+    "%(roomName)s does not exist.": "%(roomName)s non esiste.",
+    "%(roomName)s is not accessible at this time.": "%(roomName)s non è al momento accessibile.",
+    "You are trying to access %(roomName)s.": "Stai provando ad entrare in %(roomName)s.",
+    "You are trying to access a room.": "Stai provando ad entrare in questa stanza.",
+    "<a>Click here</a> to join the discussion!": "<a>Clicca qui</a> per unirti alla discussione!",
+    "This is a preview of this room. Room interactions have been disabled": "Questa è un'anteprima della stanza. Le interazioni nella stanza sono state disattivate",
+    "To change the room's avatar, you must be a": "Per cambiare l'avatar della stanza, devi essere un",
+    "To change the room's name, you must be a": "Per modificare il nome della stanza, devi essere un",
+    "To change the room's main address, you must be a": "Per modificare l'indirizzo principale della stanza, devi essere un",
+    "To change the room's history visibility, you must be a": "Per cambiare la visibilità della cronologia della stanza, devi essere un",
+    "To change the permissions in the room, you must be a": "Per cambiare le autorizzazioni nella stanza, devi essere un",
+    "To change the topic, you must be a": "Per cambiare l'argomento, devi essere un",
+    "To modify widgets in the room, you must be a": "Per modificare i widget nella stanza, devi essere un",
+    "Failed to unban": "Rimozione ban fallita",
+    "Banned by %(displayName)s": "Bandito da %(displayName)s",
+    "Privacy warning": "Avviso sulla privacy",
+    "Changes to who can read history will only apply to future messages in this room": "Le modifiche a chi può leggere la cronologia sono applicate solo ai messaggi futuri della stanza",
+    "The visibility of existing history will be unchanged": "La visibilità della cronologia esistente rimarrà invariata",
+    "End-to-end encryption is in beta and may not be reliable": "La cifratura end-to-end è in beta e potrebbe essere inaffidabile",
+    "You should not yet trust it to secure data": "Non dovresti ancora fidartene per proteggere i dati",
+    "Devices will not yet be able to decrypt history from before they joined the room": "I dispositivi non potranno ancora decifrare la cronologia da prima che entrassero nella stanza",
+    "Once encryption is enabled for a room it cannot be turned off again (for now)": "Una volta attivata la cifratura per una stanza non può più essere disattivata (per ora)",
+    "Encrypted messages will not be visible on clients that do not yet implement encryption": "I messaggi criptati non saranno visibili nei client che non implementano ancora la cifratura",
+    "Enable encryption": "Attiva la cifratura",
+    "(warning: cannot be disabled again!)": "(attenzione: non può più essere disattivato!)",
+    "Encryption is enabled in this room": "La cifratura è attiva in questa stanza",
+    "Encryption is not enabled in this room": "La cifratura non è attiva in questa stanza"
 }

From cbbacb7b96647d45c1885d8d2f984248468b5bce Mon Sep 17 00:00:00 2001
From: Geeman9 <geeman9@gmail.com>
Date: Mon, 19 Mar 2018 08:04:06 +0000
Subject: [PATCH 738/927] Translated using Weblate (Lithuanian)

Currently translated at 1.4% (14 of 994 strings)

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

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 0967ef424b..23ea52cb96 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1 +1,16 @@
-{}
+{
+    "This email address is already in use": "Šis el. pašto adresas jau naudojamas",
+    "This phone number is already in use": "Šis telefono numeris jau naudojamas",
+    "Failed to verify email address: make sure you clicked the link in the email": "Nepavyko patvirtinti el. pašto adreso: patikrinkite ar paspaudėte nuorodą atsiųstame el. laiške",
+    "The platform you're on": "Jūsų platforma",
+    "The version of Riot.im": "Riot.im versija",
+    "Whether or not you're logged in (we don't record your user name)": "Nesvarbu jūs prisijungę ar ne (mes nesaugome jūsų slapyvardžio)",
+    "Your language of choice": "Jūsų pasirinkta kalba",
+    "Which officially provided instance you are using, if any": "Kurį oficialiai pateiktą pavyzdį jūs naudojate, jei naudojate",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Nesvarbu jūs naudojate ar ne raiškiojo teksto režimą Raiškiojo tekto redaktoriuje",
+    "Your homeserver's URL": "Jūsų serverio URL adresas",
+    "Your identity server's URL": "Jūsų identifikavimo serverio URL adresas",
+    "Analytics": "Statistika",
+    "The information being sent to us to help make Riot.im better includes:": "Informacijoje, kuri yra siunčiama Riot.im tobulinimui yra:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Mes taip pat saugome kiekvieną puslapį, kurį jūs naudojate programėlėje (dabartinis <CurrentPageHash>), jūsų paskyros agentas (<CurrentUserAgent>) ir jūsų įrenginio rezoliucija (<CurrentDeviceResolution>)."
+}

From cf0b22542c77b5a2f3280ad2fce19f5b3b13da4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?=
 <daniel.olsen99+GitHub@gmail.com>
Date: Mon, 19 Mar 2018 14:32:24 +0000
Subject: [PATCH 739/927] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegi?=
 =?UTF-8?q?an=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 0.9% (9 of 994 strings)

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

diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 4d52e606eb..3919993663 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -1,3 +1,11 @@
 {
-    "Room directory": "Romkatalog"
+    "Room directory": "Romkatalog",
+    "This email address is already in use": "Denne e-post adressen er allerede i bruk",
+    "This phone number is already in use": "Dette mobilnummeret er allerede i bruk",
+    "Failed to verify email address: make sure you clicked the link in the email": "Klarte ikke verifisere e-post adressen: dobbelsjekk at du trykket på lenken i e-posten",
+    "The platform you're on": "Platformen du bruker",
+    "The version of Riot.im": "Versjonen av Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Om du er logget inn eller ei (vi loggfører ikke brukernavnet ditt)",
+    "Your language of choice": "Ditt valgte språk",
+    "Your homeserver's URL": "Din hjemservers URL"
 }

From 610e12e2a2ab88c3f3bf7ebf387ef450f6c333c9 Mon Sep 17 00:00:00 2001
From: stuve20 <stuve20@gmail.com>
Date: Mon, 19 Mar 2018 14:45:11 +0000
Subject: [PATCH 740/927] Translated using Weblate (Swedish)

Currently translated at 43.5% (433 of 994 strings)

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

diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 482233e2b4..8c0c722bdd 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -423,5 +423,15 @@
     "Name or matrix ID": "Namn eller matrix ID",
     "Invite to Community": "",
     "Unable to enable Notifications": "Det går inte att aktivera Notifieringar",
-    "Failed to invite user": "Misslyckades med att bjuda in användaren"
+    "Failed to invite user": "Misslyckades med att bjuda in användaren",
+    "The information being sent to us to help make Riot.im better includes:": "Informationen som skickas till oss för att hjälpa Riot.im att bli bättre inkluderar:",
+    "Review Devices": "Granska enheter",
+    "Answer Anyway": "Svara ändå",
+    "VoIP is unsupported": "VoIP stöds ej",
+    "Who would you like to add to this room?": "Vem vill du lägga till i det här rummet?",
+    "Failed to invite": "Misslyckades med att bjuda in",
+    "You need to be logged in.": "Du måste vara inloggad.",
+    "You need to be able to invite users to do that.": "Du måste kunna bjuda in användare för att göra det.",
+    "You are not in this room.": "Du är inte i det här rummet.",
+    "You do not have permission to do that in this room.": "Du har inte behörighet att göra det i det här rummet."
 }

From aed7c2039d7c43ad0099e64c7b301be72176ae56 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 19 Mar 2018 14:54:50 +0000
Subject: [PATCH 741/927] Update debug logs submission explanation

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

diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 4237cd78eb..92ad2a4c20 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -796,7 +796,14 @@ module.exports = React.createClass({
             <div>
                 <h3>{ _t("Debug Logs Submission") }</h3>
                 <div className="mx_UserSettings_section">
-                    <p>{ _t("Want to send logs?") }</p>
+                    <p>{
+                        _t( "If you've submitted a bug via GitHub, debug logs can help " +
+                            "us track down the problem. Debug logs contain application " +
+                            "usage data including your username, the IDs or aliases of " +
+                            "the rooms or groups you have visited and the usernames of " +
+                            "other users. They do not contian messages."
+                        )
+                    }</p>
                     <button className="mx_UserSettings_button danger"
                         onClick={this._onBugReportClicked}>{ _t('Submit debug logs') }
                     </button>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d51f20dbd0..b9c0813e40 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -856,7 +856,7 @@
     "Device key:": "Device key:",
     "Ignored Users": "Ignored Users",
     "Debug Logs Submission": "Debug Logs Submission",
-    "Want to send logs?": "Want to send logs?",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.",
     "Submit debug logs": "Submit debug logs",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot collects anonymous analytics to allow us to improve the application.",
     "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.",

From 6789a6ec25ad4f629d9387f1929a7b9347748982 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 19 Mar 2018 14:57:41 +0000
Subject: [PATCH 742/927] Add missing trailing comma

---
 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 19ce1a6994..f6629b4b09 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -802,7 +802,7 @@ module.exports = React.createClass({
                             "us track down the problem. Debug logs contain application " +
                             "usage data including your username, the IDs or aliases of " +
                             "the rooms or groups you have visited and the usernames of " +
-                            "other users. They do not contian messages."
+                            "other users. They do not contian messages.",
                         )
                     }</p>
                     <button className="mx_UserSettings_button danger"

From 7b1d73ca57014282daf2233ea5d675645787adbc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Mar 2018 14:58:59 +0000
Subject: [PATCH 743/927] Prepare changelog for v0.12.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0ad559922..462674dd4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.12.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.2) (2018-03-19)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.1...v0.12.0-rc.2)
+
+ * Take TagPanel out of labs
+   [\#1805](https://github.com/matrix-org/matrix-react-sdk/pull/1805)
+
 Changes in [0.12.0-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.1) (2018-03-19)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.11.4...v0.12.0-rc.1)

From 12e468a31473f491c7d6e4f60619f5b9eb4353e2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Mar 2018 14:59:00 +0000
Subject: [PATCH 744/927] v0.12.0-rc.2

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

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

From 31b772997e643025a04edb3347aa97fbc95da5d8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Mar 2018 16:47:12 +0000
Subject: [PATCH 745/927] Option to remove the presence feature by HS

Adds a config option that disables showing presence for certain
HS URLs, so we can disable it on matrix.org where the feature is
turned off.
---
 src/components/views/rooms/EntityTile.js | 25 ++++++++++++++++++------
 src/components/views/rooms/MemberInfo.js | 21 ++++++++++++++++----
 src/components/views/rooms/MemberList.js | 18 ++++++++++++++---
 src/components/views/rooms/MemberTile.js |  9 ++++++++-
 4 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/src/components/views/rooms/EntityTile.js b/src/components/views/rooms/EntityTile.js
index 949eebada0..6b3264d123 100644
--- a/src/components/views/rooms/EntityTile.js
+++ b/src/components/views/rooms/EntityTile.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,7 +33,11 @@ const PRESENCE_CLASS = {
 };
 
 
-function presenceClassForMember(presenceState, lastActiveAgo) {
+function presenceClassForMember(presenceState, lastActiveAgo, showPresence) {
+    if (showPresence === false) {
+        return 'mx_EntityTile_online_beenactive';
+    }
+
     // offline is split into two categories depending on whether we have
     // a last_active_ago for them.
     if (presenceState == 'offline') {
@@ -64,6 +69,7 @@ const EntityTile = React.createClass({
         shouldComponentUpdate: PropTypes.func,
         onClick: PropTypes.func,
         suppressOnHover: PropTypes.bool,
+        showPresence: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -75,6 +81,7 @@ const EntityTile = React.createClass({
             presenceLastTs: 0,
             showInviteButton: false,
             suppressOnHover: false,
+            showPresence: true,
         };
     },
 
@@ -99,7 +106,7 @@ const EntityTile = React.createClass({
 
     render: function() {
         const presenceClass = presenceClassForMember(
-            this.props.presenceState, this.props.presenceLastActiveAgo,
+            this.props.presenceState, this.props.presenceLastActiveAgo, this.props.showPresence,
         );
 
         let mainClassName = "mx_EntityTile ";
@@ -114,15 +121,21 @@ const EntityTile = React.createClass({
 
             mainClassName += " mx_EntityTile_hover";
             const PresenceLabel = sdk.getComponent("rooms.PresenceLabel");
+            let presenceLabel = null;
+            let nameClasses = 'mx_EntityTile_name';
+            if (this.props.showPresence) {
+                presenceLabel = <PresenceLabel activeAgo={activeAgo}
+                    currentlyActive={this.props.presenceCurrentlyActive}
+                    presenceState={this.props.presenceState} />;
+                nameClasses += ' mx_EntityTile_name_hover';
+            }
             nameEl = (
                 <div className="mx_EntityTile_details">
                     <img className="mx_EntityTile_chevron" src="img/member_chevron.png" width="8" height="12" />
-                    <EmojiText element="div" className="mx_EntityTile_name mx_EntityTile_name_hover" dir="auto">
+                    <EmojiText element="div" className={nameClasses} dir="auto">
                         { name }
                     </EmojiText>
-                    <PresenceLabel activeAgo={activeAgo}
-                        currentlyActive={this.props.presenceCurrentlyActive}
-                        presenceState={this.props.presenceState} />
+                    {presenceLabel}
                 </div>
             );
         } else {
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 19afe8e388..dd260933be 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd
+Copyright 2017, 2018 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.
@@ -41,6 +41,7 @@ import withMatrixClient from '../../../wrappers/withMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 import RoomViewStore from '../../../stores/RoomViewStore';
+import SdkConfig from '../../../SdkConfig';
 
 module.exports = withMatrixClient(React.createClass({
     displayName: 'MemberInfo',
@@ -861,6 +862,20 @@ module.exports = withMatrixClient(React.createClass({
         const powerLevelEvent = room ? room.currentState.getStateEvents("m.room.power_levels", "") : null;
         const powerLevelUsersDefault = powerLevelEvent ? powerLevelEvent.getContent().users_default : 0;
 
+        const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
+        const hsUrl = this.props.matrixClient.baseUrl;
+        let showPresence = true;
+        if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
+            showPresence = enablePresenceByHsUrl[hsUrl];
+        }
+
+        let presenceLabel = null;
+        if (showPresence) {
+            presenceLabel = <PresenceLabel activeAgo={presenceLastActiveAgo}
+                currentlyActive={presenceCurrentlyActive}
+                presenceState={presenceState} />;
+        }
+
         let roomMemberDetails = null;
         if (this.props.member.roomId) { // is in room
             const PowerSelector = sdk.getComponent('elements.PowerSelector');
@@ -877,9 +892,7 @@ module.exports = withMatrixClient(React.createClass({
                     </b>
                 </div>
                 <div className="mx_MemberInfo_profileField">
-                    <PresenceLabel activeAgo={presenceLastActiveAgo}
-                        currentlyActive={presenceCurrentlyActive}
-                        presenceState={presenceState} />
+                    {presenceLabel}
                 </div>
             </div>;
         }
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 1c5eba7fbc..620cfe33fc 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ limitations under the License.
 
 import React from 'react';
 import { _t } from '../../../languageHandler';
+import SdkConfig from '../../../SdkConfig';
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const sdk = require('../../../index');
 const GeminiScrollbar = require('react-gemini-scrollbar');
@@ -59,6 +60,14 @@ module.exports = React.createClass({
         // the information contained in presence events).
         cli.on("User.lastPresenceTs", this.onUserLastPresenceTs);
         // cli.on("Room.timeline", this.onRoomTimeline);
+
+        const enablePresenceByHsUrl = SdkConfig.get()["enable_presence_by_hs_url"];
+        const hsUrl = MatrixClientPeg.get().baseUrl;
+
+        this._showPresence = true;
+        if (enablePresenceByHsUrl && enablePresenceByHsUrl[hsUrl] !== undefined) {
+            this._showPresence = enablePresenceByHsUrl[hsUrl];
+        }
     },
 
     componentWillUnmount: function() {
@@ -345,7 +354,7 @@ module.exports = React.createClass({
         const memberList = members.map((userId) => {
             const m = this.memberDict[userId];
             return (
-                <MemberTile key={userId} member={m} ref={userId} />
+                <MemberTile key={userId} member={m} ref={userId} showPresence={this._showPresence} />
             );
         });
 
@@ -358,7 +367,10 @@ module.exports = React.createClass({
         if (membership === "invite") {
             const EntityTile = sdk.getComponent("rooms.EntityTile");
             memberList.push(...this._getPending3PidInvites().map((e) => {
-                return <EntityTile key={e.getStateKey()} name={e.getContent().display_name} suppressOnHover={true} />;
+                return <EntityTile key={e.getStateKey()}
+                    name={e.getContent().display_name}
+                    suppressOnHover={true}
+                />;
             }));
         }
 
diff --git a/src/components/views/rooms/MemberTile.js b/src/components/views/rooms/MemberTile.js
index 50ee6befa8..2359bc242c 100644
--- a/src/components/views/rooms/MemberTile.js
+++ b/src/components/views/rooms/MemberTile.js
@@ -30,6 +30,13 @@ module.exports = React.createClass({
 
     propTypes: {
         member: PropTypes.any.isRequired, // RoomMember
+        showPresence: PropTypes.bool,
+    },
+
+    getDefaultProps: function() {
+        return {
+            showPresence: true,
+        };
     },
 
     getInitialState: function() {
@@ -99,7 +106,7 @@ module.exports = React.createClass({
                 presenceLastTs={member.user ? member.user.lastPresenceTs : 0}
                 presenceCurrentlyActive={member.user ? member.user.currentlyActive : false}
                 avatarJsx={av} title={this.getPowerLabel()} onClick={this.onClick}
-                name={name} powerStatus={powerStatus} />
+                name={name} powerStatus={powerStatus} showPresence={this.props.showPresence} />
         );
     },
 });

From 131a27c711788a65e55578512968b63ea76f11b0 Mon Sep 17 00:00:00 2001
From: Safa Alfulaij <safa1996alfulaij@gmail.com>
Date: Tue, 20 Mar 2018 06:25:51 +0000
Subject: [PATCH 746/927] Translated using Weblate (Arabic)

Currently translated at 2.5% (25 of 994 strings)

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

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 96d51109d3..f7f674cf9a 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -13,5 +13,15 @@
     "Error": "خطأ",
     "Remove": "حذف",
     "Send": "إرسال",
-    "Edit": "تعديل"
+    "Edit": "تعديل",
+    "This email address is already in use": "عنوان البريد هذا مستخدم بالفعل",
+    "This phone number is already in use": "رقم الهاتف هذا مستخدم بالفعل",
+    "Failed to verify email address: make sure you clicked the link in the email": "فشل تأكيد عنوان البريد الإلكتروني: تحقق من نقر الرابط في البريد",
+    "The version of Riot.im": "إصدارة Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "فيما إذا كنت والجا أم لا (لا نسجّل اسم المستخدم)",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "فيما إذا كنت تستخدم وضع النص الغني لمحرر النصوص الغني أم لا",
+    "Your homeserver's URL": "عنوان خادوم المنزل",
+    "Your identity server's URL": "عنوان خادوم التعريف",
+    "Analytics": "التحاليل",
+    "The information being sent to us to help make Riot.im better includes:": "تحتوي المعلومات التي تُرسل إلينا للمساعدة بتحسين جودة Riot.im الآتي:"
 }

From a1bf7546d476fe8dbfe0777b86d6ce5735e92341 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 20 Mar 2018 11:35:34 +0000
Subject: [PATCH 747/927] Translated using Weblate (Italian)

Currently translated at 54.2% (539 of 994 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 976c85892e..f8d02bac2b 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -463,5 +463,79 @@
     "Enable encryption": "Attiva la cifratura",
     "(warning: cannot be disabled again!)": "(attenzione: non può più essere disattivato!)",
     "Encryption is enabled in this room": "La cifratura è attiva in questa stanza",
-    "Encryption is not enabled in this room": "La cifratura non è attiva in questa stanza"
+    "Encryption is not enabled in this room": "La cifratura non è attiva in questa stanza",
+    "The default role for new room members is": "Il ruolo predefinito per i nuovi membri della stanza è",
+    "To send messages, you must be a": "Per inviare messaggi, devi essere un",
+    "To invite users into the room, you must be a": "Per invitare utenti nella stanza, devi essere un",
+    "To configure the room, you must be a": "Per configurare la stanza, devi essere un",
+    "To kick users, you must be a": "Per cacciare fuori utenti, devi essere un",
+    "To ban users, you must be a": "Per bandire utenti, devi essere un",
+    "To remove other users' messages, you must be a": "Per rimuovere messaggi di altri utenti, devi essere un",
+    "Privileged Users": "Utenti privilegiati",
+    "%(user)s is a %(userRole)s": "%(user)s è un %(userRole)s",
+    "No users have specific privileges in this room": "Nessun utente ha privilegi specifici in questa stanza",
+    "Banned users": "Utenti banditi",
+    "This room is not accessible by remote Matrix servers": "Questa stanza non è accessibile da server di Matrix remoti",
+    "Leave room": "Esci dalla stanza",
+    "Tagged as: ": "Etichettato come: ",
+    "To link to a room it must have <a>an address</a>.": "Per linkare una stanza deve avere <a>un indirizzo</a>.",
+    "Guests cannot join this room even if explicitly invited.": "Gli ospiti non possono entrare in questa stanza anche se esplicitamente invitati.",
+    "Click here to fix": "Clicca qui per correggere",
+    "To send events of type <eventType/>, you must be a": "Per inviare eventi di tipo <eventType/>, devi essere un",
+    "Who can access this room?": "Chi può accedere a questa stanza?",
+    "Only people who have been invited": "Solo chi è stato invitato",
+    "Anyone who knows the room's link, apart from guests": "Chiunque conosca il link della stanza, eccetto gli ospiti",
+    "Anyone who knows the room's link, including guests": "Chiunque conosca il link della stanza, inclusi gli ospiti",
+    "Publish this room to the public in %(domain)s's room directory?": "Pubblicare questa stanza nell'elenco pubblico delle stanze in %(domain)s ?",
+    "Who can read history?": "Chi può leggere la cronologia?",
+    "Anyone": "Chiunque",
+    "Members only (since the point in time of selecting this option)": "Solo i membri (dal momento in cui selezioni questa opzione)",
+    "Members only (since they were invited)": "Solo i membri (da quando sono stati invitati)",
+    "Members only (since they joined)": "Solo i membri (da quando sono entrati)",
+    "Permissions": "Autorizzazioni",
+    "This room's internal ID is": "L'ID interno di questa stanza è",
+    "Scroll to unread messages": "Scorri ai messaggi non letti",
+    "Jump to first unread message.": "Salta al primo messaggio non letto.",
+    "Invalid alias format": "Formato alias non valido",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' non è un formato valido per un alias",
+    "Invalid address format": "Formato indirizzo non valido",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' non è un formato valido per un indirizzo",
+    "not specified": "non specificato",
+    "not set": "non impostato",
+    "Remote addresses for this room:": "Indirizzi remoti di questa stanza:",
+    "Addresses": "Indirizzi",
+    "The main address for this room is": "L'indirizzo principale di questa stanza è",
+    "Local addresses for this room:": "Indirizzi locali di questa stanza:",
+    "This room has no local addresses": "Questa stanza non ha indirizzi locali",
+    "New address (e.g. #foo:%(localDomain)s)": "Nuovo indirizzo (es. #foo:%(localDomain)s)",
+    "Invalid community ID": "ID comunità non valido",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' non è un ID comunità valido",
+    "Showing flair for these communities:": "Predisposizione della stanza per queste comunità:",
+    "Flair": "Predisposizione",
+    "This room is not showing flair for any communities": "Questa stanza non mostra predisposizione per alcuna comunità",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Nuovo ID comunità (es. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "Hai <a>attivato</a> le anteprime degli URL in modo predefinito.",
+    "You have <a>disabled</a> URL previews by default.": "Hai <a>disattivato</a> le anteprime degli URL in modo predefinito.",
+    "URL previews are enabled by default for participants in this room.": "Le anteprime degli URL sono attive in modo predefinito per i partecipanti di questa stanza.",
+    "URL previews are disabled by default for participants in this room.": "Le anteprime degli URL sono inattive in modo predefinito per i partecipanti di questa stanza.",
+    "URL Previews": "Anteprime URL",
+    "Error decrypting audio": "Errore decifratura audio",
+    "Error decrypting attachment": "Errore decifratura allegato",
+    "Decrypt %(text)s": "Decifra %(text)s",
+    "Download %(text)s": "Scarica %(text)s",
+    "Invalid file%(extra)s": "File non valido %(extra)s",
+    "Error decrypting image": "Errore decifratura immagine",
+    "This image cannot be displayed.": "Questa immagine non può essere visualizzata.",
+    "Image '%(Body)s' cannot be displayed.": "L'immagine '%(Body)s' non può essere visualizzata.",
+    "Error decrypting video": "Errore decifratura video",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s ha cambiato l'avatar per %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s ha rimosso l'avatar della stanza.",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s ha cambiato l'avatar della stanza a <img/>",
+    "Copied!": "Copiato!",
+    "Failed to copy": "Copia fallita",
+    "Add an Integration": "Aggiungi un'integrazione",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Stai per essere portato in un sito di terze parti per autenticare il tuo account da usare con %(integrationsUrl)s. Vuoi continuare?",
+    "Removed or unknown message type": "Tipo messaggio rimosso o sconosciuto",
+    "Message removed by %(userId)s": "Messaggio rimosso da %(userId)s",
+    "Message removed": "Messaggio rimosso"
 }

From 4b4b5e179995944871d0c13a026b81c85d06d325 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 20 Mar 2018 11:47:35 +0000
Subject: [PATCH 748/927] Translated using Weblate (Italian)

Currently translated at 57.5% (573 of 995 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index f8d02bac2b..1bc966e6d8 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -537,5 +537,39 @@
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Stai per essere portato in un sito di terze parti per autenticare il tuo account da usare con %(integrationsUrl)s. Vuoi continuare?",
     "Removed or unknown message type": "Tipo messaggio rimosso o sconosciuto",
     "Message removed by %(userId)s": "Messaggio rimosso da %(userId)s",
-    "Message removed": "Messaggio rimosso"
+    "Message removed": "Messaggio rimosso",
+    "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Il controllo robot non è al momento disponibile per desktop - usa un <a>browser web</a>",
+    "This Home Server would like to make sure you are not a robot": "Questo home server vorrebbe assicurarsi che non sei un robot",
+    "Sign in with CAS": "Accedi con CAS",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Puoi usare l'opzione server personalizzato per accedere ai server Matrix specificando un URL di home server diverso.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Ciò ti consente di usare questa app con un account di Matrix esistente su un home server diverso.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Puoi anche specificare un server di identità diverso ma ciò solitamente impedisce l'interazione con utenti basandosi sull'indirizzo email.",
+    "To continue, please enter your password.": "Per continuare, inserisci la tua password.",
+    "Password:": "Password:",
+    "An email has been sent to %(emailAddress)s": "È stata inviata un'email a %(emailAddress)s",
+    "Please check your email to continue registration.": "Controlla la tua email per continuare la registrazione.",
+    "Token incorrect": "Token errato",
+    "A text message has been sent to %(msisdn)s": "È stato inviato un messaggio di testo a %(msisdn)s",
+    "Please enter the code it contains:": "Inserisci il codice contenuto:",
+    "Start authentication": "Inizia l'autenticazione",
+    "Username on %(hs)s": "Nome utente su %(hs)s",
+    "User name": "Nome utente",
+    "Mobile phone number": "Numero di cellulare",
+    "Forgot your password?": "Hai dimenticato la password?",
+    "%(serverName)s Matrix ID": "%(serverName)s ID Matrix",
+    "Sign in with": "Accedi con",
+    "Email address": "Indirizzo email",
+    "Sign in": "Accedi",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Se non specifichi un indirizzo email, non potrai reimpostare la password. Sei sicuro?",
+    "Email address (optional)": "Indirizzo email (facoltativo)",
+    "You are registering with %(SelectedTeamName)s": "Ti stai registrando con %(SelectedTeamName)s",
+    "Mobile phone number (optional)": "Numero di cellulare (facoltativo)",
+    "Default server": "Server predefinito",
+    "Custom server": "Server personalizzato",
+    "Home server URL": "URL home server",
+    "Identity server URL": "URL server di identità",
+    "What does this mean?": "Cosa significa?",
+    "Remove from community": "Rimuovi dalla comunità",
+    "Disinvite this user from community?": "Revocare l'invito di questo utente alla comunità?",
+    "Remove this user from community?": "Rimuovere questo utente dalla comunità?"
 }

From 856c499541570b641dce6e2262b898f832eb4882 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 20 Mar 2018 17:19:49 +0000
Subject: [PATCH 749/927] Fix room tile badge not disappearing when receiving a
 read receipt

Fixes https://github.com/vector-im/riot-web/issues/6357
---
 src/components/views/rooms/RoomTile.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 448810e2ea..05aaf79e0b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -146,6 +146,15 @@ module.exports = React.createClass({
         dis.unregister(this.dispatcherRef);
     },
 
+    componentWillReceiveProps: function(props) {
+        // XXX: This could be a lot better - this makes the assumption that
+        // the notification count may have changed when the properties of
+        // the room tile change.
+        this.setState({
+            notificationCount: this.props.room.getUnreadNotificationCount(),
+        });
+    },
+
     // Do a simple shallow comparison of props and state to avoid unnecessary
     // renders. The assumption made here is that only state and props are used
     // in rendering this component and children.

From f0b130a04ba0fcf8378c16d254d8718b0085be36 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 20 Mar 2018 17:19:49 +0000
Subject: [PATCH 750/927] Fix room tile badge not disappearing when receiving a
 read receipt

Fixes https://github.com/vector-im/riot-web/issues/6357
---
 src/components/views/rooms/RoomTile.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 448810e2ea..05aaf79e0b 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -146,6 +146,15 @@ module.exports = React.createClass({
         dis.unregister(this.dispatcherRef);
     },
 
+    componentWillReceiveProps: function(props) {
+        // XXX: This could be a lot better - this makes the assumption that
+        // the notification count may have changed when the properties of
+        // the room tile change.
+        this.setState({
+            notificationCount: this.props.room.getUnreadNotificationCount(),
+        });
+    },
+
     // Do a simple shallow comparison of props and state to avoid unnecessary
     // renders. The assumption made here is that only state and props are used
     // in rendering this component and children.

From 9d6cd28661bee3cf8881077f6f9babf03324b87f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Mar 2018 17:34:23 +0000
Subject: [PATCH 751/927] Prepare changelog for v0.12.0-rc.3

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 462674dd4b..581464000d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.12.0-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.3) (2018-03-20)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.2...v0.12.0-rc.3)
+
+ * Fix room tile badge not disappearing when receiving a read receipt
+   [\#1807](https://github.com/matrix-org/matrix-react-sdk/pull/1807)
+
 Changes in [0.12.0-rc.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.2) (2018-03-19)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.1...v0.12.0-rc.2)

From 3a8f38011372335a369e43b5567868cd3b0c1534 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Mar 2018 17:38:12 +0000
Subject: [PATCH 752/927] v0.12.0-rc.3

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

diff --git a/package.json b/package.json
index f3ad6a54f9..09016fd87f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.0-rc.2",
+  "version": "0.12.0-rc.3",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 9df5638c8ec998161604728aa4cf76b751336af5 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 21 Mar 2018 11:00:07 +0000
Subject: [PATCH 753/927] make linter happy - add missing trailing comma

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

diff --git a/src/autocomplete/CommandProvider.js b/src/autocomplete/CommandProvider.js
index 56eefc0d35..e33fa7861f 100644
--- a/src/autocomplete/CommandProvider.js
+++ b/src/autocomplete/CommandProvider.js
@@ -108,7 +108,7 @@ const COMMANDS = [
     {
         command: '/devtools',
         args: '',
-        description: _td('Opens the Developer Tools dialog')
+        description: _td('Opens the Developer Tools dialog'),
     },
     // Omitting `/markdown` as it only seems to apply to OldComposer
 ];

From e06783c5c71ecb08dc70761f41b0ed4c3531b875 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Mar 2018 12:45:09 +0000
Subject: [PATCH 754/927] Fix PresenceLabel in MemberInfo

Which crashing when clicking on a member if presence was still
enabled.
---
 src/components/views/rooms/MemberInfo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index dd260933be..c449ad2683 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -871,6 +871,7 @@ module.exports = withMatrixClient(React.createClass({
 
         let presenceLabel = null;
         if (showPresence) {
+            const PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
             presenceLabel = <PresenceLabel activeAgo={presenceLastActiveAgo}
                 currentlyActive={presenceCurrentlyActive}
                 presenceState={presenceState} />;
@@ -879,7 +880,6 @@ module.exports = withMatrixClient(React.createClass({
         let roomMemberDetails = null;
         if (this.props.member.roomId) { // is in room
             const PowerSelector = sdk.getComponent('elements.PowerSelector');
-            const PresenceLabel = sdk.getComponent('rooms.PresenceLabel');
             roomMemberDetails = <div>
                 <div className="mx_MemberInfo_profileField">
                     { _t("Level:") } <b>

From e3916bb84ca1c00bf7873b8652b2e0b069f9d2dd Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 20 Mar 2018 21:08:15 +0000
Subject: [PATCH 755/927] Translated using Weblate (German)

Currently translated at 99.8% (994 of 995 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 7ecfd3ffbe..07ba851c3d 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -992,5 +992,9 @@
     "Key request sent.": "Schlüssel-Anfragen gesendet.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "Verschlüsselungs-Schlüssel von deinen anderen Geräten <requestLink>erneut anfragen</requestLink>.",
     "%(user)s is a %(userRole)s": "%(user)s ist ein %(userRole)s",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Änderungen, die an deiner Community gemacht werden, können bis zu 30 Minuten brauchen, bis sie für andere sichtbar sind."
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Änderungen, die an deiner Community gemacht werden, können bis zu 30 Minuten brauchen, bis sie für andere sichtbar sind.",
+    "Debug Logs Submission": "Einsenden des Fehlerprotokolls",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Wenn du einen Fehler via GitHub gemeldet hast, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
+    "Submit debug logs": "Fehlerberichte einreichen",
+    "Code": ""
 }

From 3c139636f3a1e0c5328608a2a64e04a3c332e37e Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 21 Mar 2018 14:06:51 +0000
Subject: [PATCH 756/927] Translated using Weblate (Italian)

Currently translated at 67.4% (671 of 995 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 1bc966e6d8..1f83e56e91 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -571,5 +571,103 @@
     "What does this mean?": "Cosa significa?",
     "Remove from community": "Rimuovi dalla comunità",
     "Disinvite this user from community?": "Revocare l'invito di questo utente alla comunità?",
-    "Remove this user from community?": "Rimuovere questo utente dalla comunità?"
+    "Remove this user from community?": "Rimuovere questo utente dalla comunità?",
+    "Code": "Codice",
+    "Failed to withdraw invitation": "Revoca dell'invito fallita",
+    "Failed to remove user from community": "Rimozione utente dalla comunità fallita",
+    "Filter community members": "Filtra i membri della comunità",
+    "Flair will appear if enabled in room settings": "La predisposizione apparirà se attiva nelle impostazioni della stanza",
+    "Flair will not appear": "La predisposizione non apparirà",
+    "Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Sei sicuro di volere rimuovere '%(roomName)s' da %(groupId)s?",
+    "Removing a room from the community will also remove it from the community page.": "La rimozione di una stanza dalla comunità la toglierà anche dalla pagina della comunità.",
+    "Failed to remove room from community": "Rimozione della stanza dalla comunità fallita",
+    "Failed to remove '%(roomName)s' from %(groupId)s": "Rimozione di '%(roomName)s' da %(groupId)s fallita",
+    "Something went wrong!": "Qualcosa è andato storto!",
+    "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Impossibile aggiornare la visibilità di '%(roomName)s' in %(groupId)s .",
+    "Visibility in Room List": "Visibilità nell'elenco stanze",
+    "Visible to everyone": "Visibile a chiunque",
+    "Only visible to community members": "Visibile solo ai membri della comunità",
+    "Filter community rooms": "Filtra stanze della comunità",
+    "Something went wrong when trying to get your communities.": "Qualcosa è andato storto cercando di ricevere le tue comunità.",
+    "Display your community flair in rooms configured to show it.": "Mostra la tua predisposizione di comunità nelle stanze configurate per mostrarla.",
+    "You're not currently a member of any communities.": "Attualmente non sei membro di alcuna comunità.",
+    "Unknown Address": "Indirizzo sconosciuto",
+    "NOTE: Apps are not end-to-end encrypted": "NOTA: le app non sono criptate end-to-end",
+    "Do you want to load widget from URL:": "Vuoi caricare il widget dall'URL:",
+    "Allow": "Permetti",
+    "Delete Widget": "Elimina widget",
+    "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "L'eliminazione di un widget lo rimuove per tutti gli utenti della stanza. Sei sicuro di eliminare il widget?",
+    "Delete widget": "Elimina widget",
+    "Revoke widget access": "Revoca l'accesso al widget",
+    "Minimize apps": "Riduci le app",
+    "Unblacklist": "Togli dalla lista nera",
+    "Blacklist": "Lista nera",
+    "Unverify": "Togli la verifica",
+    "Verify...": "Verifica...",
+    "No results": "Nessun risultato",
+    "Delete": "Elimina",
+    "Communities": "Comunità",
+    "Home": "Inizio",
+    "Integrations Error": "Errore di integrazioni",
+    "Could not connect to the integration server": "Impossibile connettere al server di integrazione",
+    "Manage Integrations": "Gestisci integrazioni",
+    "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
+    "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)ssono entrati %(count)s volte",
+    "%(severalUsers)sjoined %(count)s times|one": "%(severalUsers)ssono entrati",
+    "%(oneUser)sjoined %(count)s times|other": "%(oneUser)sè entrato %(count)s volte",
+    "%(oneUser)sjoined %(count)s times|one": "%(oneUser)sè entrato",
+    "%(severalUsers)sleft %(count)s times|other": "%(severalUsers)ssono usciti %(count)s volte",
+    "%(severalUsers)sleft %(count)s times|one": "%(severalUsers)ssono usciti",
+    "%(oneUser)sleft %(count)s times|other": "%(oneUser)sè uscito %(count)s volte",
+    "%(oneUser)sleft %(count)s times|one": "%(oneUser)sè uscito",
+    "%(severalUsers)sjoined and left %(count)s times|other": "%(severalUsers)ssono entrati e usciti %(count)s volte",
+    "%(severalUsers)sjoined and left %(count)s times|one": "%(severalUsers)ssono entrati e usciti",
+    "%(oneUser)sjoined and left %(count)s times|other": "%(oneUser)sè entrato e uscito %(count)s volte",
+    "%(oneUser)sjoined and left %(count)s times|one": "%(oneUser)sè entrato e uscito",
+    "%(severalUsers)sleft and rejoined %(count)s times|other": "%(severalUsers)ssono usciti e rientrati %(count)s volte",
+    "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)ssono usciti e rientrati",
+    "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)sè uscito e rientrato %(count)s volte",
+    "%(oneUser)sleft and rejoined %(count)s times|one": "%(oneUser)sè uscito e rientrato",
+    "%(severalUsers)srejected their invitations %(count)s times|other": "%(severalUsers)shanno rifiutato i loro inviti %(count)s volte",
+    "%(severalUsers)srejected their invitations %(count)s times|one": "%(severalUsers)shanno rifiutato i loro inviti",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)sha rifiutato il suo invito %(count)s volte",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)sha rifiutato il suo invito",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|other": "%(severalUsers)shanno visto revocato il loro invito %(count)s volte",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)shanno visto revocato il loro invito",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)sha visto revocato il suo invito %(count)s volte",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)sha visto revocato il suo invito",
+    "were invited %(count)s times|other": "sono stati invitati %(count)s volte",
+    "were invited %(count)s times|one": "sono stati invitati",
+    "was invited %(count)s times|other": "è stato invitato %(count)s volte",
+    "was invited %(count)s times|one": "è stato invitato",
+    "were banned %(count)s times|other": "sono stati banditi %(count)s volte",
+    "were banned %(count)s times|one": "sono stati banditi",
+    "was banned %(count)s times|other": "è stato bandito %(count)s volte",
+    "was banned %(count)s times|one": "è stato bandito",
+    "were unbanned %(count)s times|other": "sono stati riammessi %(count)s volte",
+    "were unbanned %(count)s times|one": "sono stati riammessi",
+    "was unbanned %(count)s times|other": "è stato riammesso %(count)s volte",
+    "was unbanned %(count)s times|one": "è stato riammesso",
+    "were kicked %(count)s times|other": "sono stati cacciati via %(count)s volte",
+    "were kicked %(count)s times|one": "sono stati cacciati via",
+    "was kicked %(count)s times|other": "è stato cacciato via %(count)s volte",
+    "was kicked %(count)s times|one": "è stato cacciato via",
+    "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)shanno modificato il loro nome %(count)s volte",
+    "%(severalUsers)schanged their name %(count)s times|one": "%(severalUsers)shanno modificato il loro nome",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)sha modificato il suo nome %(count)s volte",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)sha modificato il suo nome",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)shanno cambiato il loro avatar %(count)s volte",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)shanno cambiato il loro avatar",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)sha cambiato il suo avatar %(count)s volte",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)sha cambiato il suo avatar",
+    "%(items)s and %(count)s others|other": "%(items)s e altri %(count)s",
+    "%(items)s and %(count)s others|one": "%(items)s e un altro",
+    "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
+    "collapse": "richiudi",
+    "expand": "espandi",
+    "Custom of %(powerLevel)s": "Personalizzato di %(powerLevel)s",
+    "Custom level": "Livello personalizzato",
+    "<a>In reply to</a> <pill>": "<a>In risposta a</a> <pill>",
+    "And %(count)s more...|other": "E altri %(count)s ...",
+    "ex. @bob:example.com": "es. @mario:esempio.it"
 }

From f3955af5a93d3a7065e9bb0cb28aaa102b7906aa Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 21 Mar 2018 16:01:04 +0000
Subject: [PATCH 757/927] Translated using Weblate (Basque)

Currently translated at 100.0% (995 of 995 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 5d90b7f219..946550d4bb 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -992,5 +992,9 @@
     "Key request sent.": "Gako eskaria bidalita.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Berriz eskatu zifratze-gakoak</requestLink> zure beste gailuetatik.",
     "%(user)s is a %(userRole)s": "%(user)s %(userRole)s da",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Zure komunitateari egindako aldaketak agian ez dira beste erabiltzaileentzat ikusgai egongo 30 minutu pasatu arte."
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Zure komunitateari egindako aldaketak agian ez dira beste erabiltzaileentzat ikusgai egongo 30 minutu pasatu arte.",
+    "Code": "Kodea",
+    "Debug Logs Submission": "Arazte-egunkarien bidalketak",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Akats bat bidali baduzu GitHub bidez, arazte-egunkariek arazoa aurkitzen lagundu gaitzakete. Arazte-egunkariek aplikazioak darabilen datuak dauzkate, zure erabiltzaile izena barne, bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
+    "Submit debug logs": "Bidali arazte-txostenak"
 }

From bac4f29c689e7306668d7759507d40b5e7bed65f Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 22 Mar 2018 09:53:27 +0000
Subject: [PATCH 758/927] Translated using Weblate (Italian)

Currently translated at 72.4% (721 of 995 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 1f83e56e91..6392af86a2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -669,5 +669,55 @@
     "Custom level": "Livello personalizzato",
     "<a>In reply to</a> <pill>": "<a>In risposta a</a> <pill>",
     "And %(count)s more...|other": "E altri %(count)s ...",
-    "ex. @bob:example.com": "es. @mario:esempio.it"
+    "ex. @bob:example.com": "es. @mario:esempio.it",
+    "Add User": "Aggiungi utente",
+    "Matrix ID": "ID Matrix",
+    "Matrix Room ID": "ID stanza Matrix",
+    "email address": "indirizzo email",
+    "Try using one of the following valid address types: %(validTypesList)s.": "Prova ad usare uno dei seguenti tipi di indirizzo validi: %(validTypesList)s.",
+    "You have entered an invalid address.": "Hai inserito un indirizzo non valido.",
+    "Create a new chat or reuse an existing one": "Crea una nuova conversazione o riutilizzane una esistente",
+    "Start new chat": "Inizia una nuova conversazione",
+    "You already have existing direct chats with this user:": "Hai già conversazioni dirette con questo utente:",
+    "Start chatting": "Inizia a chattare",
+    "Click on the button below to start chatting!": "Clicca sul pulsante sotto per iniziare a chattare!",
+    "Start Chatting": "Inizia a chattare",
+    "Confirm Removal": "Conferma la rimozione",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Sei sicuro di volere rimuovere (eliminare) questo evento? Nota che se elimini il nome di una stanza o modifica di un argomento, potrebbe annullare la modifica.",
+    "Community IDs cannot not be empty.": "Gli ID della comunità non possono essere vuoti.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Gli ID della comunità devono contenere solo caratteri a-z, 0-9, or '=_-./'",
+    "Something went wrong whilst creating your community": "Qualcosa è andato storto nella creazione della tua comunità",
+    "Create Community": "Crea una comunità",
+    "Community Name": "Nome della comunità",
+    "Example": "Esempio",
+    "Community ID": "ID comunità",
+    "example": "esempio",
+    "Create": "Crea",
+    "Create Room": "Crea una stanza",
+    "Room name (optional)": "Nome della stanza (facoltativo)",
+    "Advanced options": "Opzioni avanzate",
+    "Block users on other matrix homeservers from joining this room": "Vieta agli utenti degli altri homeserver di matrix di entrare in questa stanza",
+    "This setting cannot be changed later!": "Questa impostazione non potrà più essere cambiata!",
+    "Unknown error": "Errore sconosciuto",
+    "Incorrect password": "Password sbagliata",
+    "Deactivate Account": "Disattiva l'account",
+    "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Ciò renderà il tuo account definitivamente inutilizzabile. Non potrai registrare di nuovo lo stesso ID utente.",
+    "This action is irreversible.": "Questa azione è irreversibile.",
+    "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:": "Per verificare se questo dispositivo è fidato, contatta il suo proprietario usando altri metodi (es. di persona o telefonando) e chiedigli se la chiave che vede nelle sue impostazioni utente per questo dispositivo coincide con la chiave sotto:",
+    "Device name": "Nome del dispositivo",
+    "Device key": "Chiave del dispositivo",
+    "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Se coincide, premi il pulsante di verifica sotto. Se non coincide, allora qualcuno sta intercettando questo dispositivo e dovresti premere il pulsante di lista nera.",
+    "In future this verification process will be more sophisticated.": "In futuro questo processo di verifica sarà più sofisticato.",
+    "Verify device": "Verifica dispositivo",
+    "I verify that the keys match": "Confermo che le chiavi coincidono",
+    "An error has occurred.": "Si è verificato un errore.",
+    "You added a new device '%(displayName)s', which is requesting encryption keys.": "Hai aggiunto un nuovo dispositivo '%(displayName)s', che sta richiedendo chiavi di cifratura.",
+    "Your unverified device '%(displayName)s' is requesting encryption keys.": "Il dispositivo non verificato '%(displayName)s' sta richiedendo chiavi di cifratura.",
+    "Start verification": "Inizia la verifica",
+    "Share without verifying": "Condividi senza verificare",
+    "Ignore request": "Ignora la richiesta",
+    "Loading device info...": "Caricamento info dispositivo...",
+    "Encryption key request": "Richiesta chiave di cifratura",
+    "Otherwise, <a>click here</a> to send a bug report.": "Altrimenti <a>clicca qui</a> per inviare una segnalazione di errore.",
+    "Unable to restore session": "Impossibile ripristinare la sessione"
 }

From 4b6140b6c57adcb4e31625f887c22aa45624cad8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 22 Mar 2018 10:23:34 +0000
Subject: [PATCH 760/927] Fix broken import preventing people tag

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

diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index a92bd1ebaf..e5911c4e32 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -18,7 +18,7 @@ import { asyncAction } from './actionCreators';
 import RoomListStore from '../stores/RoomListStore';
 
 import Modal from '../Modal';
-import Rooms from '../Rooms';
+import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
 import sdk from '../index';
 

From a464c3f63204663c00359929ebc57a78f832c830 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 22 Mar 2018 10:21:26 +0000
Subject: [PATCH 761/927] Translated using Weblate (Italian)

Currently translated at 78.2% (779 of 996 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 6392af86a2..5d5a42cbc4 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -719,5 +719,63 @@
     "Loading device info...": "Caricamento info dispositivo...",
     "Encryption key request": "Richiesta chiave di cifratura",
     "Otherwise, <a>click here</a> to send a bug report.": "Altrimenti <a>clicca qui</a> per inviare una segnalazione di errore.",
-    "Unable to restore session": "Impossibile ripristinare la sessione"
+    "Unable to restore session": "Impossibile ripristinare la sessione",
+    "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente. Se continui, dovrai accedere di nuovo e la cronologia della chat criptata sarà illeggibile.",
+    "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Se hai usato precedentemente una versione più recente di Riot, la tua sessione potrebbe essere incompatibile con questa versione. Chiudi questa finestra e torna alla versione più recente.",
+    "Continue anyway": "Continua comunque",
+    "Invalid Email Address": "Indirizzo email non valido",
+    "This doesn't appear to be a valid email address": "Questo non sembra essere un indirizzo email valido",
+    "Verification Pending": "In attesa di verifica",
+    "Please check your email and click on the link it contains. Once this is done, click continue.": "Controlla la tua email e clicca il link contenuto. Una volta fatto, clicca continua.",
+    "Unable to add email address": "Impossibile aggiungere l'indirizzo email",
+    "Unable to verify email address.": "Impossibile verificare l'indirizzo email.",
+    "This will allow you to reset your password and receive notifications.": "Ciò ti permetterà di reimpostare la tua password e ricevere notifiche.",
+    "Skip": "Salta",
+    "User names may only contain letters, numbers, dots, hyphens and underscores.": "I nomi utente devono contenere solo lettere, numeri, punti, trattini alti e bassi.",
+    "Username not available": "Nome utente non disponibile",
+    "Username invalid: %(errMessage)s": "Nome utente non valido: %(errMessage)s",
+    "An error occurred: %(error_string)s": "Si è verificato un errore: %(error_string)s",
+    "Username available": "Nome utente disponibile",
+    "To get started, please pick a username!": "Per iniziare, scegli un nome utente!",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Questo sarà il tuo account nell'homeserver <span></span>, o puoi scegliere un <a>server diverso</a>.",
+    "If you already have a Matrix account you can <a>log in</a> instead.": "Se invece hai già un account Matrix puoi <a>accedere</a>.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Attualmente stai bloccando i dispositivi non verificati; per inviare messaggi a questi dispositivi devi verificarli.",
+    "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ti consigliamo di eseguire il processo di verifica per ogni dispositivo per confermare che appartiene al legittimo proprietario, ma puoi reinviare il messaggio senza verifica se lo preferisci.",
+    "Room contains unknown devices": "La stanza contiene dispositivi sconosciuti",
+    "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" contiene dispositivi che non hai mai visto prima.",
+    "Unknown devices": "Dispositivi sconosciuti",
+    "Private Chat": "Conversazione privata",
+    "Public Chat": "Chat pubblica",
+    "Custom": "Personalizzato",
+    "Name": "Nome",
+    "Topic": "Argomento",
+    "Make this room private": "Rendi privata questa stanza",
+    "Share message history with new users": "Condividi la cronologia dei messaggi con i nuovi utenti",
+    "Encrypt room": "Cripta la stanza",
+    "You must <a>register</a> to use this functionality": "Devi <a>registrarti</a> per usare questa funzionalità",
+    "You must join the room to see its files": "Devi entrare nella stanza per vederne i file",
+    "There are no visible files in this room": "Non ci sono file visibili in questa stanza",
+    "<h1>HTML for your community's page</h1>\n<p>\n    Use the long description to introduce new members to the community, or distribute\n    some important <a href=\"foo\">links</a>\n</p>\n<p>\n    You can even use 'img' tags\n</p>\n": "<h1>HTML per la pagina della tua comunità</h1>\n<p>\n    Usa la descrizione estesa per introdurre i nuovi membri alla comunità, o distribuisci\n    alcuni <a href=\"foo\">link</a> importanti\n</p>\n<p>\n    Puoi anche usare i tag 'img'\n</p>\n",
+    "Add rooms to the community summary": "Aggiungi stanze nel sommario della comunità",
+    "Which rooms would you like to add to this summary?": "Quali stanze vorresti aggiungere a questo sommario?",
+    "Add to summary": "Aggiungi al sommario",
+    "Failed to add the following rooms to the summary of %(groupId)s:": "Impossibile aggiungere le seguenti stanze al sommario di %(groupId)s:",
+    "Add a Room": "Aggiungi una stanza",
+    "Failed to remove the room from the summary of %(groupId)s": "Impossibile rimuovere la stanza dal sommario di %(groupId)s",
+    "The room '%(roomName)s' could not be removed from the summary.": "Non è stato possibile rimuovere la stanza '%(roomName)s' dal sommario.",
+    "Add users to the community summary": "Aggiungi utenti al sommario della comunità",
+    "Who would you like to add to this summary?": "Chi vorresti aggiungere a questo sommario?",
+    "Failed to add the following users to the summary of %(groupId)s:": "Impossibile aggiungere i seguenti utenti al sommario di %(groupId)s:",
+    "Add a User": "Aggiungi un utente",
+    "Failed to remove a user from the summary of %(groupId)s": "Impossibile rimuovere un utente dal sommario di %(groupId)s",
+    "The user '%(displayName)s' could not be removed from the summary.": "Non è stato possibile rimuovere l'utente '%(displayName)s' dal sommario.",
+    "Failed to upload image": "Invio dell'immagine fallito",
+    "Failed to update community": "Aggiornamento comunità fallito",
+    "Unable to accept invite": "Impossibile accettare l'invito",
+    "Unable to reject invite": "Impossibile rifiutare l'invito",
+    "Leave Community": "Esci dalla comunità",
+    "Leave %(groupName)s?": "Uscire da %(groupName)s?",
+    "Leave": "Esci",
+    "Unable to leave room": "Impossibile uscire dalla stanza",
+    "Community Settings": "Impostazioni comunità"
 }

From d99478b51367261dc0a811ca2d1a0088730822c3 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 22 Mar 2018 10:23:34 +0000
Subject: [PATCH 762/927] Fix broken import preventing people tag

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

diff --git a/src/actions/RoomListActions.js b/src/actions/RoomListActions.js
index a92bd1ebaf..e5911c4e32 100644
--- a/src/actions/RoomListActions.js
+++ b/src/actions/RoomListActions.js
@@ -18,7 +18,7 @@ import { asyncAction } from './actionCreators';
 import RoomListStore from '../stores/RoomListStore';
 
 import Modal from '../Modal';
-import Rooms from '../Rooms';
+import * as Rooms from '../Rooms';
 import { _t } from '../languageHandler';
 import sdk from '../index';
 

From 6c0a7bf1ce3be661aa9eded21db5a20a37963e9e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 22 Mar 2018 13:17:47 +0000
Subject: [PATCH 763/927] Prepare changelog for v0.12.0-rc.4

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 581464000d..36709caf62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.12.0-rc.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.4) (2018-03-22)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.3...v0.12.0-rc.4)
+
+ * Fix broken import preventing people tag
+   [\#1811](https://github.com/matrix-org/matrix-react-sdk/pull/1811)
+
 Changes in [0.12.0-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.3) (2018-03-20)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.2...v0.12.0-rc.3)

From 72b9cb0be419a4a0b406a49f5d374900cbc1d583 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 22 Mar 2018 13:17:48 +0000
Subject: [PATCH 764/927] v0.12.0-rc.4

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

diff --git a/package.json b/package.json
index 09016fd87f..6b74c7eed6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.0-rc.3",
+  "version": "0.12.0-rc.4",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 452cbeaacc8d746e1777f274416e3b477bd418ed Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 21 Mar 2018 16:01:18 +0000
Subject: [PATCH 765/927] Translated using Weblate (Basque)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 946550d4bb..b8e207e022 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -996,5 +996,6 @@
     "Code": "Kodea",
     "Debug Logs Submission": "Arazte-egunkarien bidalketak",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Akats bat bidali baduzu GitHub bidez, arazte-egunkariek arazoa aurkitzen lagundu gaitzakete. Arazte-egunkariek aplikazioak darabilen datuak dauzkate, zure erabiltzaile izena barne, bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
-    "Submit debug logs": "Bidali arazte-txostenak"
+    "Submit debug logs": "Bidali arazte-txostenak",
+    "Opens the Developer Tools dialog": "Garatzailearen tresnen elkarrizketa-koadroa irekitzen du"
 }

From 51ea4ca9f19e8166d11148606002356b4bdc84d4 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 22 Mar 2018 14:42:42 +0000
Subject: [PATCH 766/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 1b385278df..2cfd672687 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -992,5 +992,10 @@
     "Key request sent.": "Kulcs kérés elküldve.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Kulcsok újrakérése</requestLink> a többi eszközödtől.",
     "%(user)s is a %(userRole)s": "%(user)s egy %(userRole)s",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "A közösségedben végrehajtott változtatás valószínűleg legalább 30 percig nem lesz látható mások számára."
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "A közösségedben végrehajtott változtatás valószínűleg legalább 30 percig nem lesz látható mások számára.",
+    "Code": "Kód",
+    "Debug Logs Submission": "Hibakeresési napló elküldése",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
+    "Submit debug logs": "Hibakeresési napló küldése",
+    "Opens the Developer Tools dialog": "Megnyitja a fejlesztői eszközök ablakát"
 }

From d468c1b10fd4a1e5ef715a706615357b3ff2846a Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 22 Mar 2018 15:40:32 +0000
Subject: [PATCH 767/927] Translated using Weblate (Russian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index a8ffc6d086..78b17f6ecc 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -992,5 +992,10 @@
     "%(user)s is a %(userRole)s": "%(user)s является %(userRole)s",
     "Your key share request has been sent - please check your other devices for key share requests.": "Ваш запрос на передачу ключей отправлен - пожалуйста, проверьте другие ваши устройства на запросы передачи ключей.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Запросы передачи ключей автоматически отправляются на другие устройства. Если вы отклонили или отменили запрос на передачу ключей на других устройствах, нажмите здесь, чтобы запросить ключи для этого сеанса повторно.",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Изменения, сделанные в вашем сообществе, могут не отображаться для других пользователей в течение 30 минут."
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Изменения, сделанные в вашем сообществе, могут не отображаться для других пользователей в течение 30 минут.",
+    "Code": "Код",
+    "Debug Logs Submission": "Отправка журналов отладки",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Если вы отправили ошибку через GitHub, журналы отладки могут помочь нам выявить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
+    "Submit debug logs": "Отправка журналов отладки",
+    "Opens the Developer Tools dialog": "Открывает Инструменты разработчика"
 }

From 6327741838afb8b616adbf421fb72a1c7c9a6ab3 Mon Sep 17 00:00:00 2001
From: Oskars <oskars@lanet.lv>
Date: Thu, 22 Mar 2018 23:25:52 +0000
Subject: [PATCH 768/927] Translated using Weblate (Latvian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 752f5e84b6..1575fca7d3 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -40,7 +40,7 @@
     "Are you sure you want to reject the invitation?": "Vai tiešām vēlies noraidīt šo uzaicinājumu?",
     "Are you sure you want to upload the following files?": "Vai tiešām vēlies augšuplādēt sekojošos failus?",
     "Attachment": "Pielikums",
-    "Autoplay GIFs and videos": "Automātiski atskaņot GIF animācijas un video",
+    "Autoplay GIFs and videos": "Automātiski rādīt GIF animācijas un video",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
     "Ban": "Liegt pieeju (Bans)",
     "Banned users": "Lietotāji, kuriem ir liegta pieeja (banotie)",
@@ -113,7 +113,7 @@
     "Disinvite": "Atsaukt",
     "Display name": "Attēlojamais vārds",
     "Displays action": "Parāda darbību",
-    "Don't send typing notifications": "Nesūtīt paziņojumus",
+    "Don't send typing notifications": "Nerādīt, kad es rakstu",
     "Download %(text)s": "Lejupielādēt tekstu: %(text)s",
     "Drop File Here": "Ievelc failu šeit",
     "Drop here to tag %(section)s": "Nomest šeit, lai birkotu %(section)s",
@@ -678,7 +678,7 @@
     "Featured Users:": "Ieteiktie lietotāji:",
     "Automatically replace plain text Emoji": "Automātiski aizvieto tekstu ar emocijikonu (emoji)",
     "Failed to upload image": "Neizdevās augšupielādēt attēlu",
-    "Hide avatars in user and room mentions": "Slēpt profila attēlus lietotāja un istabas pieminējumatzīmēs (@mention)",
+    "Hide avatars in user and room mentions": "Slēpt profila attēlus lietotāja un istabas pieminējumos",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pievienoja %(widgetName)s vidžetu",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotu pārbaude šobrīd nav pieejama darbvirsmas versijā. Lūdzu izmanto <a>web pārlūku</a>",
@@ -949,5 +949,55 @@
     "Ignores a user, hiding their messages from you": "Ignorē lietotāju, Tev nerādot viņa sūtītās ziņas",
     "Stops ignoring a user, showing their messages going forward": "Atceļ lietotāja ignorēšanu, rādot viņa turpmāk sūtītās ziņas",
     "Notify the whole room": "Paziņot visai istabai",
-    "Room Notification": "Istabas paziņojums"
+    "Room Notification": "Istabas paziņojums",
+    "Disable Community Filter Panel": "Atslēgt kopienas filtra paneli",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Tavs atslēgu apmaiņas pieprasījums nosūtīts - lūdzu pārbaudi citas savas ierīces attiecībā uz atslēgu apmaiņu.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Atslēgu apmaiņas pieprasījumi Tavām citām ierīcēm tiek nosūtīti automātiski. Ja citās savās ierīcēs atslēdzi vai noraidīji atslēgu apmaiņas pieprasījumu, spiediet šeit lai pieprasītu atslēgas šai sesijai atkārtoti.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ja citās Tavās ierīcēs nav atslēgas priekš šīs ziņas, Tu nevarēsi to atšifrēt.",
+    "Key request sent.": "Atslēgas pieprasījums nosūtīts.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Atkārtoti pieprasīt šifrēšanas atslēgas</requestLink> no citām savām ierīcēm.",
+    "%(user)s is a %(userRole)s": "%(user)s ir %(userRole)s",
+    "Code": "Kods",
+    "%(oneUser)srejected their invitation %(count)s times|other": "%(oneUser)snoraidīja viņu uzaicinājumu %(count)s reizes",
+    "%(oneUser)srejected their invitation %(count)s times|one": "%(oneUser)snoraidīja uzaicinājumu",
+    "%(severalUsers)shad their invitations withdrawn %(count)s times|one": "%(severalUsers)satsauca uzaicinājumus",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|other": "%(oneUser)satsauca savus uzaicinājumus %(count)s reizes",
+    "%(oneUser)shad their invitation withdrawn %(count)s times|one": "%(oneUser)satsauca savu uzaicinājumu",
+    "were invited %(count)s times|other": "bija uzaicināti %(count)s reizes",
+    "%(oneUser)schanged their name %(count)s times|other": "%(oneUser)s izmainīja savu vārdu %(count)s reizes",
+    "%(oneUser)schanged their name %(count)s times|one": "%(oneUser)s izmainīja savu vārdu",
+    "%(severalUsers)schanged their avatar %(count)s times|other": "%(severalUsers)s nomainīja savu avataru %(count)s reizes",
+    "%(severalUsers)schanged their avatar %(count)s times|one": "%(severalUsers)snomainīja savu avataru",
+    "%(items)s and %(count)s others|one": "%(items)s un viens cits",
+    "%(oneUser)schanged their avatar %(count)s times|other": "%(oneUser)snomainīja savu avataru %(count)s reizes",
+    "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)snomainīja savu avataru",
+    "%(items)s and %(count)s others|other": "%(items)s un %(count)s citus",
+    "Add users to the community summary": "Pievienot lietotājus kopienas kopsavilkumam",
+    "Who would you like to add to this summary?": "Kuru personu Tu vēlies pievienot šim kopsavilkumam?",
+    "Failed to add the following users to the summary of %(groupId)s:": "%(groupId)s kopsavilkumam neizdevās pievienot šādus lietotājus:",
+    "Add a User": "Pievienot lietotāju",
+    "Failed to remove a user from the summary of %(groupId)s": "Neizdevās dzēst lietotāju no %(groupId)s kopsavilkuma",
+    "The user '%(displayName)s' could not be removed from the summary.": "Lietotājs '%(displayName)s' nevarēja tikt dzēsts no kopsavilkuma.",
+    "Failed to update community": "Neizdevās aktualizēt kopienu",
+    "Unable to accept invite": "Nav iespējams pieņemt uzaicinājumu",
+    "Unable to reject invite": "Nav iespējams noraidīt uzaicinājumu",
+    "Leave %(groupName)s?": "Atstāt %(groupName)s?",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Izmaiņas, kuras izdarītas Tavā kopienā, var neparādīties citiem lietotājiem līdz pat 30 minūtēm.",
+    "%(inviter)s has invited you to join this community": "%(inviter)s uzaicina Tevi pievienoties šai kopienai",
+    "You are an administrator of this community": "Tu esi šīs kopienas administrators",
+    "You are a member of this community": "Tu esi šīs kopienas biedrs",
+    "Long Description (HTML)": "Garais apraksts (HTML)",
+    "Community %(groupId)s not found": "Kopiena %(groupId)s nav atrasta",
+    "Your Communities": "Tavas kopienas",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Vai zināji: Tu vari izmantot kopienas, lai filtrētu (atlasītu) savu Riot.im pieredzi!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Lai uzstādītu filtru, uzvelc kopienas avataru uz filtru paneļa ekrāna kreisajā malā. Lai redzētu tikai istabas un cilvēkus, kas saistīti ar šo kopienu, Tu vari klikšķināt uz avatara filtru panelī jebkurā brīdī.",
+    "Create a new community": "Izveidot jaunu kopienu",
+    "Join an existing community": "Pievienoties esošai kopienai",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Lai pievienotos esošai kopienai Tev jāzina tā ID; tas izskatīties piemēram šādi <i>+paraugs:matrix.org</i>.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Tagad<resendText>visus atkārtoti nosūtīt</resendText> vai <cancelText>visus atcelt</cancelText>. Tu vari arī atzīmēt individuālus ziņojumus, kurus atkārtoti nosūtīt vai atcelt.",
+    "Clear filter": "Attīrīt filtru",
+    "Debug Logs Submission": "Iesniegt atutošanas žurnālierakstus",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ja esi paziņojis par kļūdu caur GitHub, atutošanas žurnāli var mums palīdzēt identificēt problēmu. Atutošanas žurnāli satur programmas lietošanas datus, tostarp Tavu lietotājvārdu, istabu/grupu ID vai aliases, kuras esi apmeklējis un citu lietotāju lietotājvārdus. Tie nesatur pašas ziņas.",
+    "Submit debug logs": "Iesniegt atutošanas žurnālu",
+    "Opens the Developer Tools dialog": "Atver Izstrādātāja instrumentus"
 }

From 3d4feac75b63cef7b688492fb096f10236fcf3fc Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Fri, 23 Mar 2018 17:14:29 +1300
Subject: [PATCH 769/927] Don't try to show unset display name

In the ReadReceiptMarker title, show the display name only when it is not the
same as the user ID.
---
 .../views/rooms/ReadReceiptMarker.js          | 22 ++++++++++++++-----
 src/i18n/strings/en_EN.json                   |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 8dc3c0f7d0..8b66cfd808 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -185,12 +185,22 @@ module.exports = React.createClass({
 
         let title;
         if (this.props.timestamp) {
-            title = _t(
-                "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
-                {displayName: this.props.member.rawDisplayName,
-                 userName: this.props.member.userId,
-                 dateTime: formatDate(new Date(this.props.timestamp), this.props.showTwelveHour)},
-            );
+            const dateString = formatDate(new Date(this.props.timestamp), this.props.showTwelveHour);
+            if (this.props.member.userId === this.props.member.rawDisplayName) {
+                title = _t(
+                    "Seen by %(userName)s at %(dateTime)s",
+                    {userName: this.props.member.userId,
+                    dateTime: dateString},
+                );
+            }
+            else {
+                title = _t(
+                    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
+                    {displayName: this.props.member.rawDisplayName,
+                    userName: this.props.member.userId,
+                    dateTime: dateString},
+                );
+            }
         }
 
         return (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2754880ed7..2d3ef836e0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -389,6 +389,7 @@
     "Offline": "Offline",
     "Unknown": "Unknown",
     "Replying": "Replying",
+    "Seen by %(userName)s at %(dateTime)s": "Seen by %(userName)s at %(dateTime)s",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
     "No rooms to show": "No rooms to show",
     "Unnamed room": "Unnamed room",

From fb314c76945797e838957ebb20fd08f9580e5d69 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Sat, 24 Mar 2018 10:07:08 +0000
Subject: [PATCH 770/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index a3dd53ea8c..d66bdba77b 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -995,5 +995,10 @@
     "Key request sent.": "Заявката за ключ е изпратена.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Заявете отново ключове за шифроване</requestLink> от другите Ви устройства.",
     "%(user)s is a %(userRole)s": "%(user)s е %(userRole)s",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Промени, направени във общността Ви, може да не бъдат видяни от другите потребители за най-много 30 минути."
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Промени, направени във общността Ви, може да не бъдат видяни от другите потребители за най-много 30 минути.",
+    "Code": "Код",
+    "Debug Logs Submission": "Изпращане на логове за дебъгване",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ако сте изпратили грешка чрез GitHub, логовете за дебъгване могат да ни помогнат да проследим проблема. Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
+    "Submit debug logs": "Изпрати дебъг логове",
+    "Opens the Developer Tools dialog": "Отваря прозорец с инструменти на разработчика"
 }

From c377486648ad18f52bc92a4109111589f328eb95 Mon Sep 17 00:00:00 2001
From: Yao Wei <mwei@lxde.org>
Date: Sun, 25 Mar 2018 04:51:46 +0000
Subject: [PATCH 771/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 759ef2bac8..df9d607896 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -173,7 +173,7 @@
     "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' exceeds this home server's size limit for uploads": "文件 '%(fileName)s' 超過了此主伺服器的上傳大小限制",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "文件 '%(fileName)s' 超過了這個家伺服器的上傳大小限制",
     "The file '%(fileName)s' failed to upload": "文件 '%(fileName)s' 上傳失敗",
     "Turn Markdown off": "關閉Markdown 語法",
     "Turn Markdown on": "啟用Markdown 語法",
@@ -219,7 +219,7 @@
     "Register": "註冊",
     "Default server": "預設伺服器",
     "Custom server": "自定的伺服器",
-    "Home server URL": "自家伺服器網址",
+    "Home server URL": "家伺服器網址",
     "Identity server URL": "識別伺服器網址",
     "What does this mean?": "它代表什麼意思？",
     "Error decrypting audio": "解密音檔出錯",
@@ -301,7 +301,7 @@
     "Failed to change power level": "變更權限等級失敗",
     "Failed to fetch avatar URL": "擷取大頭貼 URL 失敗",
     "Failed to upload profile picture!": "上傳基本資料圖片失敗！",
-    "Guest access is disabled on this Home Server.": "此家伺服器的訪客存取已停用。",
+    "Guest access is disabled on this Home Server.": "這個家伺服器的訪客存取已停用。",
     "Home": "家",
     "Import": "匯入",
     "Incoming call from %(name)s": "從 %(name)s 而來的來電",
@@ -608,7 +608,7 @@
     "Verify...": "驗證...",
     "ex. @bob:example.com": "例如：@bob:example.com",
     "Add User": "新增使用者",
-    "This Home Server would like to make sure you are not a robot": "此家伺服器想要確定您不是機器人",
+    "This Home Server would like to make sure you are not a robot": "這個家伺服器想要確定您不是機器人",
     "Sign in with CAS": "使用 CAS 登入",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "您可以使用自訂伺服器選項來指定不同的家伺服器 URL 以登入到其他的 Matrix 伺服器。",
     "This allows you to use this app with an existing Matrix account on a different home server.": "這讓您可以利用在不同的家伺服器上既有的 Matrix 帳號使用此應用程式。",
@@ -992,5 +992,10 @@
     "Key request sent.": "金鑰請求已傳送。",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "從您的其他裝置<requestLink>重新請求加密金鑰</requestLink>。",
     "%(user)s is a %(userRole)s": "%(user)s 是 %(userRole)s",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "其他使用者在最多 30 分鐘內可能不會慨到您對社群所做的變更。"
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "其他使用者在最多 30 分鐘內可能不會慨到您對社群所做的變更。",
+    "Code": "代碼",
+    "Debug Logs Submission": "除錯訊息傳送",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "如果您透過 GitHub 來回報錯誤，除錯訊息可以用來追蹤問題。除錯訊息包含應用程式的使用資料，包括您的使用者名稱、您所造訪的房間/群組的 ID 或別名、其他使用者的使用者名稱等，其中不包含訊息本身。",
+    "Submit debug logs": "傳送除錯訊息",
+    "Opens the Developer Tools dialog": "開啟開發者工具對話視窗"
 }

From ca6b259911f089324abd33de1cc49517ab7fcf85 Mon Sep 17 00:00:00 2001
From: riotimbuggggg <x__gramos@hotmail.com>
Date: Mon, 26 Mar 2018 12:27:24 +0000
Subject: [PATCH 772/927] Added translation using Weblate (Albanian)

---
 src/i18n/strings/sq.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/i18n/strings/sq.json

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/i18n/strings/sq.json
@@ -0,0 +1 @@
+{}

From 0a920ae8012b69f9363a8463aa12e9a97521fedc Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 26 Mar 2018 13:33:47 +0100
Subject: [PATCH 773/927] Indenting fix

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

diff --git a/src/components/views/rooms/ReadReceiptMarker.js b/src/components/views/rooms/ReadReceiptMarker.js
index 8b66cfd808..0029395d3d 100644
--- a/src/components/views/rooms/ReadReceiptMarker.js
+++ b/src/components/views/rooms/ReadReceiptMarker.js
@@ -192,8 +192,7 @@ module.exports = React.createClass({
                     {userName: this.props.member.userId,
                     dateTime: dateString},
                 );
-            }
-            else {
+            } else {
                 title = _t(
                     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s",
                     {displayName: this.props.member.rawDisplayName,

From 891bc77c8d588ebc946e5b058e5331b79d318665 Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Sat, 24 Mar 2018 10:16:01 +0000
Subject: [PATCH 774/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index d66bdba77b..6d963ab3e3 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -999,6 +999,6 @@
     "Code": "Код",
     "Debug Logs Submission": "Изпращане на логове за дебъгване",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ако сте изпратили грешка чрез GitHub, логовете за дебъгване могат да ни помогнат да проследим проблема. Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
-    "Submit debug logs": "Изпрати дебъг логове",
+    "Submit debug logs": "Изпрати логове за дебъгване",
     "Opens the Developer Tools dialog": "Отваря прозорец с инструменти на разработчика"
 }

From c6f5bd05bd37ec1a2e3bef8c0a0e96aec1f248c8 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 22 Mar 2018 12:59:31 +0000
Subject: [PATCH 775/927] Translated using Weblate (German)

Currently translated at 99.8% (995 of 996 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 07ba851c3d..fe489472f0 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -996,5 +996,6 @@
     "Debug Logs Submission": "Einsenden des Fehlerprotokolls",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Wenn du einen Fehler via GitHub gemeldet hast, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
     "Submit debug logs": "Fehlerberichte einreichen",
-    "Code": ""
+    "Code": "",
+    "Opens the Developer Tools dialog": "Öffnet den Entwicklerwerkzeugkasten"
 }

From 900a72a1de229387e7a3a715ae947f8fc0796918 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Mon, 26 Mar 2018 12:38:57 +0000
Subject: [PATCH 776/927] Translated using Weblate (Italian)

Currently translated at 93.5% (932 of 996 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 5d5a42cbc4..86c518c8aa 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -777,5 +777,158 @@
     "Leave %(groupName)s?": "Uscire da %(groupName)s?",
     "Leave": "Esci",
     "Unable to leave room": "Impossibile uscire dalla stanza",
-    "Community Settings": "Impostazioni comunità"
+    "Community Settings": "Impostazioni comunità",
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Le modifiche fatte alla tua comunità potrebbero non essere visibili agli altri utenti per i prossimi 30 minuti.",
+    "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "Queste stanze sono mostrate ai membri della comunità nella pagina della stessa. I membri della comunità possono entrare nelle stanze cliccandoci sopra.",
+    "Featured Rooms:": "Stanze in evidenza:",
+    "Featured Users:": "Utenti in evidenza:",
+    "%(inviter)s has invited you to join this community": "%(inviter)s ti ha invitato ad unirti a questa comunità",
+    "You are an administrator of this community": "Sei un amministratore di questa comunità",
+    "You are a member of this community": "Sei un membro di questa comunità",
+    "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "La tua comunità non ha una descrizione estesa, una pagina HTML da mostrare ai membri della comunità.<br />Clicca qui per aprire le impostazioni e scriverne una!",
+    "Long Description (HTML)": "Descrizione estesa (HTML)",
+    "Description": "Descrizione",
+    "Community %(groupId)s not found": "Comunità %(groupId)s non trovata",
+    "This Home server does not support communities": "Questo Home server non supporta le comunità",
+    "Failed to load %(groupId)s": "Caricamento %(groupId)s fallito",
+    "Reject invitation": "Rifiuta l'invito",
+    "Are you sure you want to reject the invitation?": "Sei sicuro di volere rifiutare l'invito?",
+    "Failed to reject invitation": "Rifiuto dell'invito fallito",
+    "This room is not public. You will not be able to rejoin without an invite.": "Questa stanza non è pubblica. Non potrai rientrare senza un invito.",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Sei sicuro di volere uscire dalla stanza '%(roomName)s'?",
+    "Failed to leave room": "Uscita dalla stanza fallita",
+    "Signed Out": "Disconnesso",
+    "For security, this session has been signed out. Please sign in again.": "Per sicurezza questa sessione è stata disconnessa. Accedi di nuovo.",
+    "Old cryptography data detected": "Rilevati dati di crittografia obsoleti",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Sono stati rilevati dati da una vecchia versione di Riot. Ciò avrà causato malfunzionamenti della crittografia end-to-end nella vecchia versione. I messaggi cifrati end-to-end scambiati di recente usando la vecchia versione potrebbero essere indecifrabili in questa versione. Anche i messaggi scambiati con questa versione possono fallire. Se riscontri problemi, disconnettiti e riaccedi. Per conservare la cronologia, esporta e re-importa le tue chiavi.",
+    "Logout": "Disconnetti",
+    "Your Communities": "Le tue comunità",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Sapevi che: puoi usare le comunità per filtrare la tua esperienza su Riot.im!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Per impostare un filtro, trascina l'avatar di una comunità sul pannello dei filtri a sinistra dello schermo. Puoi cliccare un avatar nel pannello dei filtri quando vuoi per vedere solo le stanze e le persone associate a quella comunità.",
+    "Error whilst fetching joined communities": "Errore nella rilevazione delle comunità a cui ti sei unito",
+    "Create a new community": "Crea una nuova comunità",
+    "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Crea una comunità per raggruppare utenti e stanze! Crea una pagina iniziale personalizzata per stabilire il tuo spazio nell'universo di Matrix.",
+    "Join an existing community": "Unisciti ad una comunità esistente",
+    "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Per unirti ad una comunità esistente devi conoscere il suo identificativo; è qualcosa del tipo <i>+esempio:matrix.org</i>.",
+    "You have no visible notifications": "Non hai alcuna notifica visibile",
+    "Scroll to bottom of page": "Scorri in fondo alla pagina",
+    "Message not sent due to unknown devices being present": "Messaggio non inviato data la presenza di dispositivi sconosciuti",
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Mostra dispositivi</showDevicesText>, <sendAnywayText>invia comunque</sendAnywayText> o <cancelText>annulla</cancelText>.",
+    "%(count)s of your messages have not been sent.|other": "Alcuni dei tuoi messaggi non sono stati inviati.",
+    "%(count)s of your messages have not been sent.|one": "Il tuo messaggio non è stato inviato.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "<resendText>Reinvia tutti</resendText> o <cancelText>annulla tutti</cancelText> adesso. Puoi anche selezionare i singoli messaggi da reinviare o annullare.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Reinvia messaggio</resendText> o <cancelText>annulla messaggio</cancelText> adesso.",
+    "Connectivity to the server has been lost.": "Connessione al server persa.",
+    "Sent messages will be stored until your connection has returned.": "I messaggi inviati saranno salvati fino al ritorno della connessione.",
+    "%(count)s new messages|other": "%(count)s messaggi nuovi",
+    "%(count)s new messages|one": "%(count)s messaggio nuovo",
+    "Active call": "Chiamata attiva",
+    "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Non c'è nessun altro qui! Vorresti <inviteText>invitare altri</inviteText> o <nowarnText>fermare l'avviso sulla stanza vuota</nowarnText>?",
+    "You seem to be uploading files, are you sure you want to quit?": "Sembra che tu stia inviando file, sei sicuro di volere uscire?",
+    "You seem to be in a call, are you sure you want to quit?": "Sembra che tu sia in una chiamata, sei sicuro di volere uscire?",
+    "Failed to upload file": "Invio del file fallito",
+    "Server may be unavailable, overloaded, or the file too big": "Il server potrebbe essere non disponibile, sovraccarico o il file è troppo grande",
+    "Search failed": "Ricerca fallita",
+    "Server may be unavailable, overloaded, or search timed out :(": "Il server potrebbe essere non disponibile, sovraccarico o la ricerca è scaduta :(",
+    "No more results": "Nessun altro risultato",
+    "Unknown room %(roomId)s": "Stanza %(roomId)s sconosciuta",
+    "Room": "Stanza",
+    "Failed to save settings": "Salvataggio impostazioni fallito",
+    "Failed to reject invite": "Rifiuto dell'invito fallito",
+    "Fill screen": "Riempi schermo",
+    "Click to unmute video": "Clicca per attivare l'audio del video",
+    "Click to mute video": "Clicca per silenziare il video",
+    "Click to unmute audio": "Clicca per attivare l'audio",
+    "Click to mute audio": "Clicca per silenziare l'audio",
+    "Clear filter": "Annulla filtro",
+    "Tried to load a specific point in this room's timeline, but you do not have permission to view the message in question.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non hai l'autorizzazione per vedere il messaggio in questione.",
+    "Tried to load a specific point in this room's timeline, but was unable to find it.": "Si è tentato di caricare un punto specifico nella cronologia della stanza, ma non si è trovato.",
+    "Failed to load timeline position": "Caricamento posizione cronologica fallito",
+    "Uploading %(filename)s and %(count)s others|other": "Invio di %(filename)s e altri %(count)s",
+    "Uploading %(filename)s and %(count)s others|zero": "Invio di %(filename)s",
+    "Uploading %(filename)s and %(count)s others|one": "Invio di %(filename)s e altri %(count)s",
+    "Light theme": "Tema chiaro",
+    "Dark theme": "Tema scuro",
+    "Status.im theme": "Tema Status.im",
+    "Can't load user settings": "Impossibile caricare le impostazioni utente",
+    "Server may be unavailable or overloaded": "Il server potrebbe non essere disponibile o sovraccarico",
+    "Sign out": "Disconnetti",
+    "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.": "Per sicurezza la disconnessione eliminerà le chiavi di cifratura end-to-end da questo browser. Se desideri decifrare la tua cronologia di conversazione da sessioni future di Riot, esporta e conserva le tue chiavi della stanza.",
+    "Success": "Successo",
+    "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "La tua password è stata cambiata correttamente. Non riceverai notifiche push su altri dispositivi finchè non riesegui l'accesso su di essi",
+    "Remove Contact Information?": "Rimuovere le informazioni di contatto?",
+    "Remove %(threePid)s?": "Rimuovere %(threePid)s?",
+    "Unable to remove contact information": "Impossibile rimuovere le informazioni di contatto",
+    "Refer a friend to Riot:": "Informa un amico riguardo Riot:",
+    "Interface Language": "Lingua dell'interfaccia",
+    "User Interface": "Interfaccia utente",
+    "Autocomplete Delay (ms):": "Ritardo autocompletamento (ms):",
+    "<not supported>": "<non supportato>",
+    "Import E2E room keys": "Importa chiavi E2E stanza",
+    "Cryptography": "Crittografia",
+    "Device ID:": "ID dispositivo:",
+    "Device key:": "Chiave dispositivo:",
+    "Ignored Users": "Utenti ignorati",
+    "Debug Logs Submission": "Invio dei log di debug",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Se hai segnalato un errore via Github, i log di debug possono aiutarci a identificare il problema. I log di debug contengono dati di utilizzo dell'applicazione inclusi il nome utente, gli ID o alias delle stanze o gruppi visitati e i nomi degli altri utenti. Non contengono messaggi.",
+    "Submit debug logs": "Invia log di debug",
+    "Riot collects anonymous analytics to allow us to improve the application.": "Riot raccoglie statistiche anonime per permetterci di migliorare l'applicazione.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Diamo importanza alla privacy, perciò non raccogliamo dati personali o identificabili per le nostre statistiche.",
+    "Learn more about how we use analytics.": "Ulteriori informazioni su come usiamo le statistiche.",
+    "Labs": "Laboratori",
+    "These are experimental features that may break in unexpected ways": "Queste sono funzioni sperimentali che potrebbero fallire in modi imprevisti",
+    "Use with caution": "Usa con prudenza",
+    "Deactivate my account": "Disattiva il mio account",
+    "Clear Cache": "Svuota la cache",
+    "Clear Cache and Reload": "Svuota la cache e ricarica",
+    "Updates": "Aggiornamenti",
+    "Check for update": "Controlla aggiornamenti",
+    "Reject all %(invitedRooms)s invites": "Rifiuta tutti gli inviti da %(invitedRooms)s",
+    "Desktop specific": "Specifico per desktop",
+    "Start automatically after system login": "Esegui automaticamente all'avvio del sistema",
+    "No media permissions": "Nessuna autorizzazione per i media",
+    "Missing Media Permissions, click here to request.": "Autorizzazioni per i media mancanti, clicca qui per richiederle.",
+    "Email": "Email",
+    "Profile": "Profilo",
+    "Display name": "Nome visualizzato",
+    "To return to your account in future you need to set a password": "Per tornare al tuo account in futuro, devi impostare una password",
+    "Logged in as:": "Acceduto come:",
+    "click to reveal": "clicca per mostrare",
+    "Homeserver is": "L'homeserver è",
+    "Identity Server is": "Il server di identità è",
+    "matrix-react-sdk version:": "versione matrix-react-sdk:",
+    "riot-web version:": "versione riot-web:",
+    "olm version:": "versione olm:",
+    "Failed to send email": "Invio dell'email fallito",
+    "The email address linked to your account must be entered.": "Deve essere inserito l'indirizzo email collegato al tuo account.",
+    "A new password must be entered.": "Deve essere inserita una nuova password.",
+    "New passwords must match each other.": "Le nuove password devono coincidere.",
+    "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.": "Ripristinando la password si reimposteranno le chiavi di cifratura end-to-end su tutti i dispositivi, rendendo illeggibile la cronologia chat, a meno che prima non esporti le tue chiavi della stanza e le importi successivamente. In futuro questo verrà migliorato.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "È stata inviata un'email a %(emailAddress)s. Una volta seguito il link contenuto, clicca sotto.",
+    "I have verified my email address": "Ho verificato il mio indirizzo email",
+    "Your password has been reset": "La tua password è stata ripristinata",
+    "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": "Sei stato disconnesso da tutti i dispositivi e non riceverai più notifiche push. Per riattivare le notifiche, accedi di nuovo in ogni dispositivo",
+    "Return to login screen": "Torna alla schermata di accesso",
+    "To reset your password, enter the email address linked to your account": "Per ripristinare la password, inserisci l'indirizzo email collegato al tuo account",
+    "New password": "Nuova password",
+    "Confirm your new password": "Conferma la tua nuova password",
+    "Send Reset Email": "Invia email di ripristino",
+    "Create an account": "Crea un account",
+    "This Home Server does not support login using email address.": "Questo home server non supporta l'accesso tramite indirizzo email.",
+    "Incorrect username and/or password.": "Nome utente e/o password sbagliati.",
+    "Please note you are logging into the %(hs)s server, not matrix.org.": "Nota che stai accedendo nel server %(hs)s , non matrix.org.",
+    "Guest access is disabled on this Home Server.": "L'accesso ospiti è disattivato in questo home server.",
+    "The phone number entered looks invalid": "Il numero di telefono inserito sembra non valido",
+    "This homeserver doesn't offer any login flows which are supported by this client.": "Questo home server non offre alcuna procedura di accesso supportata da questo client.",
+    "Error: Problem communicating with the given homeserver.": "Errore: problema di comunicazione con l'homeserver dato.",
+    "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Impossibile connettersi all'homeserver via HTTP quando c'è un URL HTTPS nella barra del tuo browser. Usa HTTPS o <a>attiva gli script non sicuri</a>.",
+    "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Impossibile connettersi all'homeserver - controlla la tua connessione, assicurati che il <a>certificato SSL dell'homeserver</a> sia fidato e che un'estensione del browser non stia bloccando le richieste.",
+    "Login as guest": "Accedi come ospite",
+    "Sign in to get started": "Accedi per iniziare",
+    "Failed to fetch avatar URL": "Ricezione URL dell'avatar fallita",
+    "Set a display name:": "Imposta un nome visualizzato:",
+    "Upload an avatar:": "Invia un avatar:",
+    "This server does not support authentication with a phone number.": "Questo server non supporta l'autenticazione tramite numero di telefono.",
+    "Missing password.": "Password mancante.",
+    "Passwords don't match.": "Le password non coincidono."
 }

From 0be9c13d3c30a8281f90688761237afcdb83eb6b Mon Sep 17 00:00:00 2001
From: Oskars <oskars@lanet.lv>
Date: Fri, 23 Mar 2018 12:27:02 +0000
Subject: [PATCH 777/927] Translated using Weblate (Latvian)

Currently translated at 100.0% (996 of 996 strings)

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

diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 1575fca7d3..98ad475e0c 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -1,15 +1,15 @@
 {
     "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains": "Teksta ziņa tika nosūtīta +%(msisdn)s. Lūdzu ievadi tajā atrodamo verifikācijas kodu",
-    "Accept": "Apstiprināt",
+    "Accept": "Pieņemt",
     "%(targetName)s accepted an invitation.": "%(targetName)s apstiprināja uzaicinājumu.",
     "%(targetName)s accepted the invitation for %(displayName)s.": "%(targetName)s apstiprināja uzaicinājumu no %(displayName)s.",
     "Account": "Konts",
     "Access Token:": "Pieejas tokens:",
     "Active call (%(roomName)s)": "Aktīvs zvans (%(roomName)s)",
     "Add": "Pievienot",
-    "Add a topic": "Pievieno tematu",
-    "Add email address": "Pievieno epasta adresi",
-    "Add phone number": "Pievieno tālruņa numuru",
+    "Add a topic": "Pievienot tematu",
+    "Add email address": "šeit ieraksti savu epasta adresi",
+    "Add phone number": "šeit ieraksti telefona numuru",
     "Admin": "Administrators",
     "Admin Tools": "Administratora rīki",
     "VoIP": "VoIP",
@@ -36,13 +36,13 @@
     "Anyone who knows the room's link, apart from guests": "Ikviens, kurš zina adreses saiti uz istabu, izņemot viesus",
     "Anyone who knows the room's link, including guests": "Ikviens, kurš zina adreses saiti uz istabu, tai skaitā arī viesi",
     "Are you sure?": "Vai tiešām to vēlies?",
-    "Are you sure you want to leave the room '%(roomName)s'?": "Vai tiešām vēlies pamest istabas:  '%(roomName)s'?",
+    "Are you sure you want to leave the room '%(roomName)s'?": "Vai tiešām vēlies pamest istabu:  '%(roomName)s'?",
     "Are you sure you want to reject the invitation?": "Vai tiešām vēlies noraidīt šo uzaicinājumu?",
     "Are you sure you want to upload the following files?": "Vai tiešām vēlies augšuplādēt sekojošos failus?",
     "Attachment": "Pielikums",
     "Autoplay GIFs and videos": "Automātiski rādīt GIF animācijas un video",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
-    "Ban": "Liegt pieeju (Bans)",
+    "Ban": "Liegt pieeju (nobanot, nobloķēt)",
     "Banned users": "Lietotāji, kuriem ir liegta pieeja (banotie)",
     "Bans user with given id": "Bloķē (liedz pieeju) lietotāju pēc uzdotā ID (nobano)",
     "Blacklisted": "Melnajā sarakstā iekļautie",
@@ -81,7 +81,7 @@
     "Confirm password": "Apstiprini paroli",
     "Confirm your new password": "Apstiprini jauno paroli",
     "Continue": "Turpināt",
-    "Could not connect to the integration server": "Neizdevās savienoties ar integrācijas serveri",
+    "Could not connect to the integration server": "Neizdevās savienoties ar Integrācijas serveri",
     "%(count)s new messages|one": "jaunu ziņu skaits: %(count)s",
     "%(count)s new messages|other": "%(count)s jaunas ziņas",
     "Create a new chat or reuse an existing one": "Izveidot jaunu čalu vai izmantot jau esošu",
@@ -99,17 +99,17 @@
     "Decrypt %(text)s": "Atšifrēt %(text)s",
     "Decryption error": "Atšifrēšanas kļūda",
     "Delete": "Dzēst",
-    "Deops user with given id": "Atceļ operatora statusu lietotājam ar norādīto ID",
+    "Deops user with given id": "Atceļ operatora statusu lietotājam ar norādīto Id",
     "Default": "Noklusējuma",
     "Device already verified!": "Ierīce ir jau verificēta!",
-    "Device ID": "Ierīces ID",
-    "Device ID:": "Ierīces ID:",
+    "Device ID": "Ierīces Id",
+    "Device ID:": "Ierīces Id:",
     "device id: ": "ierīces id: ",
     "Device key:": "Ierīces atslēga:",
     "Devices": "Ierīces",
     "Devices will not yet be able to decrypt history from before they joined the room": "Ierīces nevarēs atšifrēt to ziņu vēsturi, kuras ir tikušas pievienotas, pirms ierīce pieslēdzās istabai",
     "Direct chats": "Tiešie čati",
-    "Disable Notifications": "Atslēgt paziņojumus",
+    "Disable Notifications": "Atspējot paziņojumus",
     "Disinvite": "Atsaukt",
     "Display name": "Attēlojamais vārds",
     "Displays action": "Parāda darbību",
@@ -122,7 +122,7 @@
     "Email address": "Epasta adrese",
     "Email address (optional)": "Epasta adrese (neobligāta)",
     "Email, name or matrix ID": "Epasts, vārds vai Matrix identifikators (ID)",
-    "Emoji": "Emocijzīmes (Emoji)",
+    "Emoji": "Emocīši (emoji)",
     "Enable encryption": "Iespējot šifrēšanu",
     "Enable Notifications": "Iespējot paziņojumus",
     "Encrypted by a verified device": "Šifrēts ar verificētu ierīci",
@@ -132,8 +132,8 @@
     "Encryption is enabled in this room": "Šajā istabā ir iespējota šifrēšana",
     "Encryption is not enabled in this room": "Šajā istabā nav iespējota šifrēšana",
     "%(senderName)s ended the call.": "%(senderName)s beidza zvanu.",
-    "End-to-end encryption information": "Ierīce-ierīce šifrēšanas informācija",
-    "End-to-end encryption is in beta and may not be reliable": "Ierīce-ierīce šifrēšana šobrīd ir beta stadijā, un var nebūt stabila",
+    "End-to-end encryption information": "\"End-to-End\" (ierīce-ierīce) šifrēšanas informācija",
+    "End-to-end encryption is in beta and may not be reliable": "\"End-to-end\" (ierīce-ierīce) šifrēšana šobrīd ir beta stadijā, un var nebūt stabila",
     "Enter Code": "Ievadi kodu",
     "Enter passphrase": "Ievadi paroles frāzi",
     "Error": "Kļūda",
@@ -154,7 +154,7 @@
     "Failed to kick": "Neizdevās veikt \"kick\" darbību",
     "Failed to leave room": "Neizdevās pamest istabu",
     "Failed to load timeline position": "Neizdevās ielādēt laikpaziņojumu pozīciju",
-    "Failed to lookup current room": "Neizdevās pārlūkot pašreizējo istabu",
+    "Failed to lookup current room": "Neizdevās uziet pašreizējo istabu",
     "Failed to mute user": "Neizdevās apklusināt lietotāju",
     "Failed to reject invite": "Neizdevās noraidīt uzaicinājumu",
     "Failed to reject invitation": "Neizdevās noraidīt uzaicinājumu",
@@ -170,7 +170,7 @@
     "Failed to upload profile picture!": "Neizdevās augšuplādēt profila attēlu!",
     "Failed to verify email address: make sure you clicked the link in the email": "Neizdevās apstiprināt epasta adresi. Pārbaudi, vai Tu esi noklikšķinājis/usi saiti epasta ziņā",
     "Failure to create room": "Neizdevās izveidot istabu",
-    "Favourite": "Tava izlase (favorīti)",
+    "Favourite": "Favorīti (Tava izlase)",
     "Favourites": "Favorīti",
     "Fill screen": "Aizpildīt ekrānu",
     "Filter room members": "Filtrēt istabas biedrus",
@@ -180,12 +180,12 @@
     "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.": "Drošības nolūkos, izrakstīšanās dzēsīs jebkādas ierīce-ierīce šifrēšanas atslēgas no šī pārlūka. Ja Tu vēlies  saglabāt iespēju atšifrēt tavu saziņas vēsturi no Riot nākotnes sesijām, lūdzu eksportē tavas istabas atslēgas, saglabājot tās drošā vietā.",
     "Found a bug?": "Pamanīji kļūdu?",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
-    "Guest access is disabled on this Home Server.": "Šajā bāzes serverī viesu pierakstīšanās nav iespējama.",
+    "Guest access is disabled on this Home Server.": "Šajā Bāzes serverī viesu pierakstīšanās nav iespējama.",
     "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai pat ja ir uzaicināti.",
     "Hangup": "Aizturēt",
-    "Hide read receipts": "Slēpt izlasītās receptes",
+    "Hide read receipts": "Slēpt atzīmes par izlasīšanu",
     "Hide Text Formatting Toolbar": "Slēpt teksta formatēšanas rīkjoslu",
-    "Historical": "Vēsturiskais",
+    "Historical": "Bijušie",
     "Home": "Mājup",
     "Homeserver is": "Bāzes serveris ir",
     "Identity Server is": "Indentifikācijas serveris ir",
@@ -193,15 +193,15 @@
     "Import": "Importēt",
     "Import E2E room keys": "Importēt E2E istabas atslēgas",
     "Incoming call from %(name)s": "Ienākošs zvans no %(name)s",
-    "Incoming video call from %(name)s": "Ienākošs video zvans no %(name)s",
-    "Incoming voice call from %(name)s": "Ienākošs balss zvans no %(name)s",
+    "Incoming video call from %(name)s": "Ienākošs VIDEO zvans no %(name)s",
+    "Incoming voice call from %(name)s": "Ienākošs AUDIO zvans no %(name)s",
     "Incorrect username and/or password.": "Nepareizs lietotājvārds un/vai parole.",
     "Incorrect verification code": "Nepareizs verifikācijas kods",
     "Interface Language": "Saskarnes valoda",
     "Invalid alias format": "Nepareizs aizstājējvārda (aliases) formāts",
     "Invalid address format": "Nepareizs adreses formāts",
     "Invalid Email Address": "Nepareiza epasta adrese",
-    "Invalid file%(extra)s": "Nepareizs faila %(extra)s",
+    "Invalid file%(extra)s": "Nederīgs fails %(extra)s",
     "%(senderName)s invited %(targetName)s.": "%(senderName)s uzaicināja %(targetName)s.",
     "Invite new room members": "Uzaicināt jaunus istabas biedrus",
     "Invited": "Uzaicināts/a",
@@ -211,35 +211,35 @@
     "'%(alias)s' is not a valid format for an alias": "'%(alias)s' nav pareizā aizstājējvārda formātā",
     "%(displayName)s is typing": "%(displayName)s šobrīd raksta",
     "Sign in with": "Pierakstīties ar",
-    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>balss</voiceText> vai <videoText>video</videoText>.",
+    "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>AUDIO</voiceText> vai <videoText>VIDEO</videoText>.",
     "Join Room": "Pievienoties istabai",
     "%(targetName)s joined the room.": "%(targetName)s pievienojās istabai.",
     "Joins room with given alias": "Pievienojas istabai ar minēto aliasi (pseidonīmu)",
     "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s iespēra (kick) %(targetName)s.",
     "Kick": "Iespert (kick)",
-    "Kicks user with given id": "Padzen (kick) lietotāju ar norādīto ID",
-    "Labs": "Laboratorija",
+    "Kicks user with given id": "Padzen (kick) lietotāju ar norādīto Id",
+    "Labs": "Izmēģinājumu lauciņš",
     "Last seen": "Pēdējo reizi redzēts/a",
-    "Leave room": "Pamest istabu",
+    "Leave room": "Doties prom no istabas",
     "%(targetName)s left the room.": "%(targetName)s atstāja istabu.",
     "Level:": "Līmenis:",
     "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logged in as:": "Pierakstījās kā:",
     "Login as guest": "Pierakstīties kā viesim",
     "Logout": "Izrakstīties",
-    "Low priority": "Zema prioritāte",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uzstādīja nākotnes istabas ziņu vēsturi redzamu visi istabas biedri secībā, kādā tika uzaicināti.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uzstādīja nākotnes istabas ziņu vēsturi redzamu visi istabas biedri secībā, kādā ir pievienojušies.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s uzstādīja nākotnes istabas ziņu vēsturi redzamu visi istabas biedri.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s uzstādīja nākotnes istabas ziņu vēsturi redzamu ikviens.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uzstādīja nākotnes istabas ziņu vēsturi redzamu nezināms (%(visibility)s).",
+    "Low priority": "Zemas prioritātes",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
     "Manage Integrations": "Pārvaldīt integrācijas",
     "Markdown is disabled": "Formatēšanas iespēja ir atslēgta",
     "Markdown is enabled": "Formatēšanas iespēja ir iespējota",
     "Turn Markdown off": "Izslēgt formatēšanas iespēju",
     "Turn Markdown on": "Ieslēgt formatēšanas iespēju",
-    "matrix-react-sdk version:": "matrix-react-sdk versija:",
+    "matrix-react-sdk version:": "Matrix-react-sdk versija:",
     "The default role for new room members is": "Jauna istabas biedra statuss pēc noklusējuma ir",
     "Message not sent due to unknown devices being present": "Ziņa nav nosūtīta, jo tika konstatēta nezināmu ierīču klātbūtne",
     "Missing room_id in request": "Iztrūkstošs room_id pieprasījumā",
@@ -248,17 +248,17 @@
     "Mobile phone number (optional)": "Mobilā telefona numurs (nav obligāts)",
     "Moderator": "Moderators",
     "Must be viewing a room": "Jāapskata istaba",
-    "Mute": "Kluss (noklusināt)",
-    "%(serverName)s Matrix ID": "%(serverName)s Matrix ID",
+    "Mute": "Noklusināt",
+    "%(serverName)s Matrix ID": "%(serverName)s Matrix Id",
     "Name": "Vārds",
-    "Never send encrypted messages to unverified devices from this device": "Nekad nesūti no šīs ierīces šifrētas ziņas uz neverificētām ierīcēm",
-    "Never send encrypted messages to unverified devices in this room from this device": "Nekad nesūti no šīs ierīces šifrētas ziņas neverificētām ierīcēm šajā istabā",
-    "New address (e.g. #foo:%(localDomain)s)": "Jauna adrese (piemēram #kautkas:%(localDomain)s)",
-    "New password": "Jauna parole",
+    "Never send encrypted messages to unverified devices from this device": "Nekad nesūtīt no šīs ierīces šifrētas ziņas uz neverificētām ierīcēm",
+    "Never send encrypted messages to unverified devices in this room from this device": "Nekad nesūtīt no šīs ierīces šifrētas ziņas neverificētām ierīcēm šajā istabā",
+    "New address (e.g. #foo:%(localDomain)s)": "Jaunā adrese (piemēram #kautkas:%(localDomain)s)",
+    "New password": "Jaunā parole",
     "New passwords don't match": "Jaunās paroles nesakrīt",
     "New passwords must match each other.": "Jaunajām parolēm ir jāsakrīt vienai ar otru.",
     "none": "neviens",
-    "not set": "nav iestatījuma",
+    "not set": "nav iestatīts",
     "not specified": "nav noteikts",
     "Notifications": "Paziņojumi",
     "(not supported by this browser)": "(netiek atbalstīts šajā pārlūkā)",
@@ -270,18 +270,18 @@
     "No results": "Nav rezultātu",
     "No users have specific privileges in this room": "Nav lietotāju ar īpašām privilēģijām šajā istabā",
     "OK": "Labs ir",
-    "olm version:": "olm versija:",
+    "olm version:": "Olm versija:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Tiklīdz istabai tiks iespējota šifrēšana, tā vairs nebūs atslēdzama (pašlaik)",
-    "Only people who have been invited": "Vienīgi personas, kuras ir tikušas uzaicinātas",
+    "Only people who have been invited": "Vienīgi cilvēki, kuri uzaicināti",
     "Operation failed": "Darbība neizdevās",
     "Otherwise, <a>click here</a> to send a bug report.": "pretējā gadījumā, <a>klikšķini šeit</a>, lai nosūtītu paziņojumu par kļūdu.",
     "Password": "Parole",
     "Password:": "Parole:",
     "Passwords can't be empty": "Paroles nevar būt tukšas",
-    "People": "Personas",
+    "People": "Cilvēki",
     "Permissions": "Atļaujas",
     "Phone": "Telefons",
-    "%(senderName)s placed a %(callType)s call.": "%(senderName)s nolika %(callType)s zvanu.",
+    "%(senderName)s placed a %(callType)s call.": "%(senderName)s veica %(callType)s zvanu.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Lūdzu pārbaudi savu epastu un noklikšķini tajā esošo saiti. Tiklīdz tas ir izdarīts, klikšķini \"turpināt\".",
     "Press <StartChatButton> to start a chat with someone": "Nospied <StartChatButton>, lai ar kādu uzsāktu čalošanu",
     "Privacy warning": "Privātuma brīdinājums",
@@ -310,7 +310,7 @@
     "Return to login screen": "Atgriezties uz pierakstīšanās lapu",
     "Riot does not have permission to send you notifications - please check your browser settings": "Riot nav atļauts nosūtīt Tev paziņojumus. Lūdzu pārbaudi sava pārlūka iestatījumus",
     "Riot was not given permission to send notifications - please try again": "Riot nav piešķirta atļauja nosūtīt paziņojumus. Lūdzu mēģini vēlreiz",
-    "riot-web version:": "riot-web versija:",
+    "riot-web version:": "Riot-web versija:",
     "Unable to enable Notifications": "Nav iespējams iespējot paziņojumus",
     "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": "Tu izrakstījies no visām ierīcēm un vairs nesaņemsi pašpiegādes (push) paziņojumus. Lai iespējotu paziņojumus, pieraksties atkārtoti katrā no ierīcēm",
     "You have no visible notifications": "Tev nav redzamo paziņojumu",
@@ -325,7 +325,7 @@
     "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
     "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s uzstādīja redzamo vārdu uz: %(displayName)s.",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Tevis uzdotā pierakstīšanās atslēga sakrīt ar atslēgu, kuru Tu saņēmi no %(userId)s ierīces %(deviceId)s. Ierīce tika atzīmēta kā verificēta.",
-    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Faila '%(fileName)s' izmērs pārsniedz šī mājas servera augšupielādes lieluma ierobežojumu",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Faila '%(fileName)s' izmērs pārsniedz šī Bāzes servera augšupielādes lieluma ierobežojumu",
     "The file '%(fileName)s' failed to upload": "Failu '%(fileName)s' neizdevās nosūtīt (augšuplādēt)",
     "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza ierīce-ierīce šifrēšanu (algorithm %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
@@ -354,10 +354,10 @@
     "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" atrodas ierīces, kuras Tu neesi iepriekš redzējis/usi.",
     "You are registering with %(SelectedTeamName)s": "Tu reģistrējies ar %(SelectedTeamName)s",
     "Image '%(Body)s' cannot be displayed.": "Attēlu '%(Body)s' nav iespējams parādīt.",
-    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
+    "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
     "Ongoing conference call%(supportedText)s.": "Ienākošs konferences zvans %(supportedText)s.",
-    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas attēlu.",
-    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas attēlu %(roomName)s",
+    "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
+    "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas avataru %(roomName)s",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "Tu pievienoji jaunu ierīci '%(displayName)s', kas prasa šifrēšanas atslēgas.",
     "Your unverified device '%(displayName)s' is requesting encryption keys.": "Tava neverificētā ierīce '%(displayName)s' pieprasa šifrēšanas atslēgas.",
     "Room Colour": "Istabas krāsa",
@@ -375,12 +375,12 @@
     "Send Invites": "Nosūtīt uzaicinājumus",
     "Send Reset Email": "Nosūtīt atiestatīšanas epastu",
     "Server error": "Servera kļūda",
-    "Server may be unavailable or overloaded": "Serveris var nebūt pieejams vai ir pārslogots",
-    "Server may be unavailable, overloaded, or search timed out :(": "Serveris izskatās nepieejams, ir pārslogots, vai arī meklēšana beidzās ar savienojuma noildzi :(",
-    "Server may be unavailable, overloaded, or the file too big": "Serveris var nebūt pieejams, ir pārslogots, vai arī faila izmērs ir par lielu",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Serveris var nebūt pieejams, ir pārslogots, vai arī sastapi neparedzētu kļūdu.",
-    "Server unavailable, overloaded, or something else went wrong.": "Serveris nav pieejams, ir pārslogots, vai arī ir notikusi cita, neparedzēta, kļūda.",
-    "Session ID": "Sesijas identifikators (ID)",
+    "Server may be unavailable or overloaded": "Serveris ir nesasniedzams vai pārslogots",
+    "Server may be unavailable, overloaded, or search timed out :(": "Serveris izskatās nesasniedzams, ir pārslogots, vai arī meklēšana beigusies ar savienojuma noildzi :(",
+    "Server may be unavailable, overloaded, or the file too big": "Serveris ir nesasniedzams, ir pārslogots, vai arī faila izmērs ir par lielu",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Serveris ir nesasniedzams, ir pārslogots, vai arī esi uzdūries kļūdai programmā.",
+    "Server unavailable, overloaded, or something else went wrong.": "Serveris ir nesasniedzams, ir pārslogots, vai arī esi uzdūries kļūdai.",
+    "Session ID": "Sesijas Id",
     "Settings": "Iestatījumi",
     "Show panel": "Rādīt paneli",
     "Show Text Formatting Toolbar": "Rādīt teksta formatēšanas rīkjoslu",
@@ -395,25 +395,25 @@
     "Start Chat": "Sākt čatu",
     "Submit": "Iesniegt",
     "Success": "Izdevās",
-    "Tagged as: ": "Atzīmēts,kā: ",
+    "Tagged as: ": "Pievienotas birkas: ",
     "The main address for this room is": "Galvenā šīs istabas adrese ir",
     "The phone number entered looks invalid": "Ievadītais telefona numurs izskatās nepareizs",
     "This email address is already in use": "Šī epasta adrese jau tiek izmantota",
     "This email address was not found": "Šāda epasta adrese nav atrasta",
     "The email address linked to your account must be entered.": "Ir jāievada Tavam kontam piesaistītā epasta adrese.",
     "The remote side failed to pick up": "Zvana adresāts  neatbild",
-    "This Home Server does not support login using email address.": "Šis bāzes serveris neatbalsta pierakstīšanos ar epasta adresi.",
+    "This Home Server does not support login using email address.": "Šis Bāzes serveris nenodrošina pierakstīšanos ar epasta adresi.",
     "This invitation was sent to an email address which is not associated with this account:": "Šis uzaicinājums tika nosūtīts uz epasta adresi, kura nav piesaistīta šim kontam:",
     "This room has no local addresses": "Šai istabai nav lokālo adrešu",
     "This room is not recognised.": "Šī istaba netika atpazīta.",
-    "These are experimental features that may break in unexpected ways": "Šīs ir eksperimentālas funkcijas, kuras reizēm var novest pie negaidītiem rezultātiem",
+    "These are experimental features that may break in unexpected ways": "Šīs ir eksperimentālas funkcijas, kuras reizēm var novest pie pārsteidzošiem rezultātiem",
     "The visibility of existing history will be unchanged": "Esošās ziņu vēstures redzamība paliks nemainīga",
     "This doesn't appear to be a valid email address": "Šī neizskatās pēc derīgas epasta adreses",
     "This is a preview of this room. Room interactions have been disabled": "Šis ir esošās istabas priekšskatījums. Istabas mijiedarbība ir atspējota",
     "This phone number is already in use": "Šis telefona numurs jau tiek izmantots",
-    "This room": "Šī istaba",
+    "This room": "šajā istabā",
     "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no attālinātajiem Matrix serveriem",
-    "This room's internal ID is": "Šīs istabas iekšējais ID ir",
+    "This room's internal ID is": "Šīs istabas iekšējais Id ir",
     "To link to a room it must have <a>an address</a>.": "Lai ieliktu saiti uz istabu, tai ir jābūt piešķirtai <a>adresei</a>.",
     "To reset your password, enter the email address linked to your account": "Lai atiestatītu savu paroli, ievadi savam kontam piesaistīto epasta adresi",
     "To use it, just wait for autocomplete results to load and tab through them.": "Lai to izmantotu, vienkārši gaidi, kamēr ielādējas automātiski ieteiktie rezultāti, un pārvietojies caur tiem.",
@@ -438,21 +438,21 @@
     "Unnamed Room": "Istaba bez nosaukuma",
     "Cancel": "Atcelt",
     "Create new room": "Izveidot jaunu istabu",
-    "Custom Server Options": "Iestatāmie servera uzstādījumi",
-    "Dismiss": "Atteikums",
-    "You have <a>enabled</a> URL previews by default.": "Tev ir pēc noklusējuma <a>iespējots</a> URL adrešu priekšskatījums.",
+    "Custom Server Options": "Iestatāmās servera opcijas",
+    "Dismiss": "Atteikt",
+    "You have <a>enabled</a> URL previews by default.": "URL priekšskats pēc noklusējuma Tev ir<a>iespējots</a> .",
     "Unrecognised command:": "Neatpazīta komanda:",
-    "Unrecognised room alias:": "Neatpazīts istabas aizstājējvārds:",
+    "Unrecognised room alias:": "Neatpazīta istabas aliase:",
     "Unverified": "Neverificēts",
-    "Upload avatar": "Augšuplādē profila attēlu",
-    "Upload Failed": "Nosūtīšana (augšupielāde) neizdevās",
-    "Upload Files": "Augšuplādē failus",
+    "Upload avatar": "Augšuplādēt avataru (profila attēlu)",
+    "Upload Failed": "Augšupielāde (nosūtīšana) neizdevās",
+    "Upload Files": "Augšuplādēt failus",
     "Upload file": "Augšuplādē failu",
-    "Upload new:": "Augšuplādē jaunu:",
+    "Upload new:": "Augšuplādēt jaunu:",
     "Usage": "Lietojums",
     "Use compact timeline layout": "Izmanto kompaktu laikpaziņojumu skatu",
     "Use with caution": "Izmanto piesardzīgi",
-    "User ID": "Lietotāja ID",
+    "User ID": "Lietotāja Id",
     "User Interface": "Lietotāja saskarne",
     "User name": "Lietotāja vārds",
     "Users": "Lietotāji",
@@ -463,13 +463,13 @@
     "Verified key": "Verificēta atslēga",
     "WARNING: Device already verified, but keys do NOT MATCH!": "BRĪDINĀJUMS: Ierīce ir jau verificēta, bet NESAKRĪT atslēgas!",
     "In future this verification process will be more sophisticated.": "Nākotnē šis verifikācijas process būs draudzīgāks.",
-    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Tu šobrīd esi iekļāvis/usi neverificētas ierīces melnajā sarakstā. Lai nosūtītu ziņas uz šādām ierīcēm, Tev viņas ir jāverificē.",
+    "You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Tu šobrīd esi iekļāvis/usi neverificētas ierīces melnajā sarakstā. Lai nosūtītu ziņas uz šādām ierīcēm, Tev tās ir jāverificē.",
     "We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Mēs rekomendējam Tev pārskatīt verifikācijas procesu katrai ierīcei, lai apstiprinātu tās piederību īstajam īpašniekam, bet Tu vari nosūtīt ziņu vēlreiz bez verificēšanas, ja vēlies.",
     "Start verification": "Sākt verifikāciju",
-    "Video call": "Video zvans",
-    "Voice call": "Balss zvans",
-    "VoIP conference finished.": "VoIP konference ir beigusies.",
-    "VoIP conference started.": "VoIP konference ir sākusies.",
+    "Video call": "VIDEO zvans",
+    "Voice call": "AUDIO zvans",
+    "VoIP conference finished.": "VoIP konference beidzās.",
+    "VoIP conference started.": "VoIP konference sākās.",
     "VoIP is unsupported": "VoIP netiek atbalstīts",
     "(could not connect media)": "(nav iespējams savienoties ar mediju)",
     "(no answer)": "(nav atbildes)",
@@ -486,18 +486,18 @@
     "You cannot place a call with yourself.": "Nav iespējams piezvanīt sev.",
     "You cannot place VoIP calls in this browser.": "VoIP zvani šajā pārlūkā netiek atbalstīti.",
     "You do not have permission to post to this room": "Tev nav vajadzīgās atļaujas pievienot ziņas šajā istabā",
-    "You have <a>disabled</a> URL previews by default.": "URL priekšskatījums pēc noklusējuma Tev ir <a>atspējots</a>.",
+    "You have <a>disabled</a> URL previews by default.": "URL priekšskats pēc noklusējuma Tev ir <a>atspējots</a>.",
     "You may wish to login with a different account, or add this email to this account.": "Tu varētu, iespējams, vēlēties pierakstīties no cita konta vai piesaistīt šo epastu šim kontam.",
     "You must <a>register</a> to use this functionality": "Lai izmantotu šo funkcionalitāti, Tev ir <a>jāreģistrējas</a>",
     "You need to be able to invite users to do that.": "Lai to darītu, Tev ir jāspēj uzaicināt lietotājus.",
     "You need to be logged in.": "Tev ir jāpierakstās.",
     "You need to enter a user name.": "Tev ir jāievada lietotāja vārds.",
-    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tava epasta adrese nav piesaistīta pie Matrix ID šajā mājas serverī.",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Tava epasta adrese nav piesaistīta pie Matrix Id šajā Bāzes serverī.",
     "Your password has been reset": "Tava parole tika atiestatīta",
     "You seem to be in a call, are you sure you want to quit?": "Izskatās, ka atrodies zvana režīmā. Vai tiešām vēlies iziet?",
     "You seem to be uploading files, are you sure you want to quit?": "Izskatās, ka šobrīd augšuplādē failus. Vai tiešām vēlies iziet?",
     "You should not yet trust it to secure data": "Tev nevajadzētu uz to vēl paļauties, lai saglabātu datu drošību",
-    "Your home server does not support device management.": "Tavs mājas serveris neatbalsta ierīču pārvaldīšanu.",
+    "Your home server does not support device management.": "Tavs Bāzes serveris neatbalsta ierīču pārvaldīšanu.",
     "Sun": "Sv.",
     "Mon": "P.",
     "Tue": "O.",
@@ -519,7 +519,7 @@
     "Dec": "Dec.",
     "Set a display name:": "Iestatīt attēloto vārdu:",
     "This image cannot be displayed.": "Šo attēlu nav iespējams parādīt.",
-    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s nomainīja istabas attēlu uz <img/>",
+    "%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s nomainīja istabas avataru uz <img/>",
     "Upload an avatar:": "Augšuplādē avataru (profila attēlu):",
     "This server does not support authentication with a phone number.": "Šis serveris neatbalsta autentifikāciju pēc telefona numura.",
     "Missing password.": "Trūkst parole.",
@@ -539,19 +539,19 @@
     "Connectivity to the server has been lost.": "Savienojums ar serveri pārtrūka.",
     "Sent messages will be stored until your connection has returned.": "Nosūtītās ziņas tiks saglabātas tiklīdz savienojums tiks atjaunots.",
     "Active call": "Aktīvs zvans",
-    "bold": "trekns",
-    "italic": "itāļu",
-    "strike": "svītrots",
+    "bold": "treknraksts",
+    "italic": "kursīvs",
+    "strike": "caursvītrots",
     "underline": "pasvītrots",
     "code": "kods",
     "quote": "citāts",
     "bullet": "lode",
-    "numbullet": "lode ar numuru",
+    "numbullet": "numurēta lode",
     "Please select the destination room for this message": "Lūdzu izvēlies šīs ziņas mērķa istabu",
     "Room directory": "Istabu katalogs",
     "Start chat": "Uzsākt čalošanu",
-    "New Password": "Jauna parole",
-    "Start automatically after system login": "Palaist programmu automātiski pie sistēmas ielādes",
+    "New Password": "Jaunā parole",
+    "Start automatically after system login": "Startēt pie ierīces ielādes",
     "Desktop specific": "Darbvirsmai specifiskie",
     "Analytics": "Analītika",
     "Opt out of analytics": "Atteikties no analītikas",
@@ -584,7 +584,7 @@
     "Device key": "Ierīces atslēga",
     "If it matches, press the verify button below. If it doesn't, then someone else is intercepting this device and you probably want to press the blacklist button instead.": "Ja tā sakrīt, tad nospied zemāk esošo verifikācijas pogu . Ja nesakrīt, tad kāds cits ir piekļuvis šai ierīcei un šādā gadījumā Tu, iespējams, vēlies izmantot \"melnais saraksts\" iespēju.",
     "Verify device": "Verificēt ierīci",
-    "I verify that the keys match": "Es pārbaudu, vai atslēgas sakrīt",
+    "I verify that the keys match": "Es apstiprinu, ka atslēgas sakrīt",
     "We encountered an error trying to restore your previous session. If you continue, you will need to log in again, and encrypted chat history will be unreadable.": "Atgadījās kļūda, mēģinot atjaunot tavu iepriekšējo sesiju. Ja vēlies turpināt, Tev ir jāpierakstās no jauna, taču šifrētā čata ziņu vēsture nebūs izlasāma.",
     "Unable to restore session": "Nav iespējams atjaunot sesiju",
     "If you have previously used a more recent version of Riot, your session may be incompatible with this version. Close this window and return to the more recent version.": "Ja Tu iepriekš izmantoji jaunāku Riot versiju, tava sesija var nebūt saderīga ar šo versiju. Aizver šo logu un atgriezies jaunākajā versijā.",
@@ -597,19 +597,19 @@
     "Verify...": "Verificē...",
     "ex. @bob:example.com": "piemēram, @valters:smaidu.lv",
     "Add User": "Pievienot lietotāju",
-    "This Home Server would like to make sure you are not a robot": "Šis mājas serveris vēlas pārliecināties, ka Tu neesi robots",
+    "This Home Server would like to make sure you are not a robot": "Šis Bāzes serveris vēlas pārliecināties, ka neesi robots",
     "Sign in with CAS": "Pierakstīties ar CAS",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Tu vari izmantot īpašos servera uzstādījumus, lai pierakstītos citos Matrix serveros, norādot citu mājas servera URL adresi.",
-    "This allows you to use this app with an existing Matrix account on a different home server.": "Tas atļauj Tev izmantot šo aplikāciju ar eksistējošu Matrix kontu citā mājas serverī.",
-    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tu vari arī iestatīt īpašu identitātes serveri, bet tas parasti liedz iespēju mijiedarboties ar lietotājiem, kuri izmanto epasta adresi.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.": "Tu vari izmantot īpašos servera uzstādījumus, lai pierakstītos citos Matrix serveros, norādot citu Bāzes servera URL adresi.",
+    "This allows you to use this app with an existing Matrix account on a different home server.": "Tas atļauj Tev izmantot šo aplikāciju ar esošu Matrix kontu citā Bāzes serverī.",
+    "You can also set a custom identity server but this will typically prevent interaction with users based on email address.": "Tu vari arī iestatīt īpašu Identitātes serveri, bet tas parasti liedz iespēju mijiedarboties ar lietotājiem, kuri izmanto epasta adresi.",
     "Please check your email to continue registration.": "Lūdzu pārbaudi savu epastu lai turpinātu reģistrāciju.",
-    "Token incorrect": "Nepareizs autentifikācijas kods",
+    "Token incorrect": "Nepareizs autentifikācijas tokens",
     "Please enter the code it contains:": "Lūdzu ievadi tajā ietverto kodu:",
-    "powered by Matrix": "Tiek darbināts ar Matrix",
-    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ja Tu nenorādīsi epasta adresi, tev nebūs iespējams izmantot paroles atiestatīšanu. Vai esi pārliecināts/a?",
-    "Default server": "Noklusējuma serveris",
-    "Custom server": "Īpašs serveris",
-    "Home server URL": "Mājas servera URL adrese",
+    "powered by Matrix": "Tiek darbināta ar Matrix",
+    "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "Ja Tu nenorādīsi epasta adresi, tev nebūs iespējams izmantot paroles atiestatīšanu. Vai to vēlies?",
+    "Default server": "Serveris pēc noklusējuma",
+    "Custom server": "Nestandarta serveris",
+    "Home server URL": "Bāzes servera URL adrese",
     "Identity server URL": "Identitātes servera URL adrese",
     "What does this mean?": "Ko tas nozīmē?",
     "Error decrypting audio": "Kļūda atšifrējot audio",
@@ -617,11 +617,11 @@
     "Error decrypting video": "Kļūda atšifrējot video",
     "Add an Integration": "Pievienot integrāciju",
     "Removed or unknown message type": "Dzēsts vai nezināms ziņas tips",
-    "URL Previews": "URL adrešu priekšskatījumi",
+    "URL Previews": "URL priekšskats",
     "Drop file here to upload": "Ievelc failu šeit lai augšuplādētu",
     " (unsupported)": " (netiek atbalstīts)",
-    "Online": "Tiešsaistē (pieslēgumā)",
-    "Idle": "Dīkstāve",
+    "Online": "Onlainā",
+    "Idle": "Dīkstāvē",
     "Offline": "Atsaistē (ārpus tīkla)",
     "Updates": "Aktualizācijas",
     "Check for update": "Pārbaudīt, vai ir aktualizācijas",
@@ -631,39 +631,39 @@
     "Username available": "Lietotājvārds ir pieejams",
     "Username not available": "Lietotājvārds nav pieejams",
     "Something went wrong!": "Kaut kas nogāja greizi!",
-    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Tas būs tava konta vārds <span></span> mājas serverī, vai arī vari izvēlēties <a>citu serveri</a>.",
+    "This will be your account name on the <span></span> homeserver, or you can pick a <a>different server</a>.": "Šis būs Tavs konta vārds <span></span> Bāzes serverī, vai arī vari izvēlēties <a>citu serveri</a>.",
     "If you already have a Matrix account you can <a>log in</a> instead.": "Vai arī, ja Tev jau ir Matrix konts, tu vari  <a>pierakstīties</a> tajā.",
     "Your browser does not support the required cryptography extensions": "Tavs pārlūks neatbalsta vajadzīgos kriptogrāfijas paplašinājumus",
     "Not a valid Riot keyfile": "Nederīgs Riot atslēgfails",
     "Authentication check failed: incorrect password?": "Autentifikācijas pārbaude neizdevās. Nepareiza parole?",
     "Disable Peer-to-Peer for 1:1 calls": "Atspējot Peer-to-Peer iespēju 1:1 zvaniem",
-    "Do you want to set an email address?": "Vai vēlies iestatīt epasta adresi?",
+    "Do you want to set an email address?": "Vai vēlies norādīt epasta adresi?",
     "To return to your account in future you need to set a password": "Lai nākotnē atgrieztos savā kontā, tev ir nepieciešams iestatīt paroli",
     "Skip": "Izlaist",
     "Share without verifying": "Kopīgot bez verificēšanas",
     "Ignore request": "Ignorēt pieprasījumu",
     "Encryption key request": "Šifrēšanas atslēgas pieprasījums",
-    "Add a widget": "Pievienot Widžetu",
+    "Add a widget": "Pievienot vidžetu",
     "Allow": "Atļaut",
     "and %(count)s others...|other": "un vēl %(count)s citi...",
     "and %(count)s others...|one": "un vēl viens cits...",
-    "Cannot add any more widgets": "Nav iespējams pievienot vairāk vidžetu",
+    "Cannot add any more widgets": "Nav iespējams pievienot vairāk vidžetus",
     "Changes colour scheme of current room": "Nomaina pašreizējās istabas krāsu paleti",
-    "Delete widget": "Dzēst widžetu",
+    "Delete widget": "Dzēst vidžetu",
     "Define the power level of a user": "Definē lietotāja statusu",
     "Do you want to load widget from URL:": "Vai vēlies ielādēt widžetu no URL:",
     "Edit": "Rediģēt",
     "Enable automatic language detection for syntax highlighting": "Iespējot automātisko valodas noteikšanu sintakses iezīmējumiem",
     "Hide Apps": "Slēpt aplikācijas",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "Slēpt pievienoties/pamest ziņas (tas neietekmē uzaicinājumus, vai kick/bana darbības)",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "Slēpt ziņas par pievienošanos istabai vai došanos prom no tās (tas neietekmē uzaicinājumus, vai izsperšanas/banošanas darbības)",
     "Integrations Error": "Integrācijas kļūda",
     "Publish this room to the public in %(domain)s's room directory?": "Publicēt šo istabu publiskajā %(domain)s katalogā?",
     "AM": "AM",
     "PM": "PM",
     "NOTE: Apps are not end-to-end encrypted": "PIEZĪME: Aplikācijās nav ierīce-ierīce šifrēšanas",
-    "Sets the room topic": "Uzstāda istabas tematu",
+    "Sets the room topic": "Iestata istabas tematu",
     "Show Apps": "Rādīt aplikācijas",
-    "The maximum permitted number of widgets have already been added to this room.": "Atļautais vidžetu skaits jau ir sasniegts šai istabai.",
+    "The maximum permitted number of widgets have already been added to this room.": "Maksimāli atļautais vidžetu skaits šai istabai jau sasniegts.",
     "To get started, please pick a username!": "Lai sāktu, lūdzu izvēlies lietotājvārdu!",
     "Unable to create widget.": "Nav iespējams izveidot widžetu.",
     "Unbans user with given id": "Atbloķē (atceļ pieejas liegumu) lietotāju pēc norādītā ID (atbano)",
@@ -676,19 +676,19 @@
     "Create": "Izveidot",
     "Featured Rooms:": "Ieteiktās istabas:",
     "Featured Users:": "Ieteiktie lietotāji:",
-    "Automatically replace plain text Emoji": "Automātiski aizvieto tekstu ar emocijikonu (emoji)",
+    "Automatically replace plain text Emoji": "Automātiski aizvietot tekstu ar emocīšiem (emoji)",
     "Failed to upload image": "Neizdevās augšupielādēt attēlu",
     "Hide avatars in user and room mentions": "Slēpt profila attēlus lietotāja un istabas pieminējumos",
     "%(widgetName)s widget added by %(senderName)s": "%(senderName)s pievienoja %(widgetName)s vidžetu",
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotu pārbaude šobrīd nav pieejama darbvirsmas versijā. Lūdzu izmanto <a>web pārlūku</a>",
     "Revoke widget access": "Atsaukt vidžeta piekļuvi",
-    "Unpin Message": "Atkabināt ziņu",
+    "Unpin Message": "Atstiprināt ziņu",
     "Add rooms to this community": "Pievienot istabas šai kopienai",
     "Failed to set direct chat tag": "Neizdevās tiešajam čatam uzstādīt birku",
     "Warning": "Brīdinājums",
     "Send": "Sūtīt",
-    "Leave": "Atstāt",
+    "Leave": "Doties prom (atstāt)",
     "Unnamed room": "Nenosaukta istaba",
     "Guests can join": "Var pievienoties viesi",
     "The platform you're on": "Izmantotā operētājsistēma",
@@ -697,11 +697,11 @@
     "Your language of choice": "Izvēlētā valoda",
     "Which officially provided instance you are using, if any": "Kuru oficiāli izlaisto versiju izmantojat (ja to darat)",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Neatkarīgi no tā, vai izmantojat Richtext režīmu redaktorā Rich Text Editor",
-    "Your homeserver's URL": "Mājasservera URL adrese",
-    "Your identity server's URL": "Tava identitātes servera URL adrese",
+    "Your homeserver's URL": "Bāzes servera URL adrese",
+    "Your identity server's URL": "Tava Identitātes servera URL adrese",
     "The information being sent to us to help make Riot.im better includes:": "Informācija, kura mums tiek nosūtīta, lai ļautu padarīt Riot.im labāku, ietver:",
     "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Mēs arī fiksējam katru lapu, kuru tu izmanto programmā (currently <CurrentPageHash>), Tavu lietotāja aģentu (<CurrentUserAgent>) un Tavas ierīces ekrāna izšķirtspēju (<CurrentDeviceResolution>).",
-    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ja šī lapa ietver identificējamu informāciju, tādu kā istaba, lietotājs, grupas ID, šie dati tiek noņemti pirms nosūtīšanas uz serveri.",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Ja šī lapa ietver identificējamu informāciju, tādu kā istaba, lietotājs, grupas Id, šie dati tiek noņemti pirms nosūtīšanas uz serveri.",
     "Call Failed": "Zvans neizdevās",
     "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Šajā istabā ir nepazīstamas ierīces: ja Tu turpināsi bez to pārbaudes, ir iespējams, ka kāda nepiederoša persona var noklausīties Tavas sarunas.",
     "Review Devices": "Ierīču pārskats",
@@ -710,19 +710,19 @@
     "Call": "Zvans",
     "Answer": "Atbildēt",
     "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s",
-    "Who would you like to add to this community?": "Kurus cilvēkus Tu vēlētos pievienot šai komūnai?",
-    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Brīdinājums: ikviens, kurš tiek pievienots komūnai būs publiski redzams visiem, kuri zin komūnas ID",
-    "Invite new community members": "Uzaicināt jaunus komūnas biedrus",
-    "Name or matrix ID": "Vārds vai Matrix ID",
-    "Invite to Community": "Uzaicināt komūnā",
-    "Which rooms would you like to add to this community?": "Kuras istabas vēlies pievienot šai komūnai?",
-    "Show these rooms to non-members on the community page and room list?": "Vai ne-biedriem rādīt komūnas lapā un istabu sarakstā šīs istabas?",
-    "Add rooms to the community": "Istabu pievienošana komūnai",
+    "Who would you like to add to this community?": "Kurus cilvēkus Tu vēlētos pievienot šai kopienai?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Brīdinājums: ikviens, kurš tiek pievienots kopienai būs publiski redzams visiem, kuri zin kopienas Id",
+    "Invite new community members": "Uzaicināt jaunus kopienas biedrus",
+    "Name or matrix ID": "Vārds vai Matrix Id",
+    "Invite to Community": "Uzaicināt kopienā",
+    "Which rooms would you like to add to this community?": "Kuras istabas vēlies pievienot šai kopienai?",
+    "Show these rooms to non-members on the community page and room list?": "Vai ne-biedriem rādīt kopienas lapā un istabu sarakstā šīs istabas?",
+    "Add rooms to the community": "Istabu pievienošana kopienai",
     "Room name or alias": "Istabas nosaukums vai aliase",
-    "Add to community": "Pievienot komūnai",
+    "Add to community": "Pievienot kopienai",
     "Failed to invite the following users to %(groupId)s:": "Neizdevās uzaicināt sekojošus lietotājus grupā %(groupId)s:",
     "Failed to invite users to community": "Neizdevās uzaicināt lietotājus komūnā",
-    "Failed to invite users to %(groupId)s": "Neizdevās uzaicināt lietotājus grupā %(groupId)s:",
+    "Failed to invite users to %(groupId)s": "Neizdevās uzaicināt lietotājus grupā %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Neizdevās pievienot sekojošas istabas grupai %(groupId)s:",
     "Restricted": "Ierobežots",
     "Ignored user": "Ignorējams lietotājs",
@@ -730,22 +730,22 @@
     "Unignored user": "Neignorējams lietotājs",
     "You are no longer ignoring %(userId)s": "Tu vairāk neignorē %(userId)s",
     "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu attēlojamo vārdu uz %(displayName)s.",
-    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s šai istabai nomainīja piekabinātās ziņas.",
+    "%(senderName)s changed the pinned messages for the room.": "%(senderName)s šai istabai nomainīja piestiprinātās ziņas.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta",
     "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
     "Message Replies": "Atbildes uz ziņām",
-    "Message Pinning": "Ziņu piekabināšana",
-    "Presence Management": "Klātbūtnes vadība",
+    "Message Pinning": "Ziņu piestiprināšana",
+    "Presence Management": "Klātesamības vadība",
     "Tag Panel": "Birku panelis",
     "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā",
     "Hide avatar changes": "Slēpt avatara izmaiņas",
     "Hide display name changes": "Slēpt attēlojamā vārda izmaiņas",
-    "Disable big emoji in chat": "Atspējot čatā lielos emoji",
-    "Mirror local video feed": "Spoguļots vietējā video attēlojums",
-    "Enable inline URL previews by default": "Ieslēgt URL adrešu priekšskatījumu pēc noklusējuma",
-    "Enable URL previews for this room (only affects you)": "Ieslēgt URL adrešu priekšskatījumus šai istabai (ietekmē tikai Tevi pašu)",
-    "Enable URL previews by default for participants in this room": "Ieslēgt URL adrešu priekšskatījumus pēc noklusējuma visiem šīs istabas dalībniekiem",
+    "Disable big emoji in chat": "Atspējot čatā lielos emocīšus (emoji)",
+    "Mirror local video feed": "Spoguļot vietējā video barotni",
+    "Enable inline URL previews by default": "URL priekšskats pēc noklusējuma",
+    "Enable URL previews for this room (only affects you)": "URL priekšskatījumi šai istabai (ietekmē tikai Tevi pašu)",
+    "Enable URL previews by default for participants in this room": "URL priekšskatījumi pēc noklusējuma visiem šīs istabas dalībniekiem",
     "Delete %(count)s devices|other": "Dzēst %(count)s ierīces",
     "Delete %(count)s devices|one": "Dzēst ierīci",
     "Select devices": "Izvēlēties ierīces",
@@ -765,8 +765,8 @@
     "User Options": "Lietotāja uzstādījumi",
     "Send an encrypted reply…": "Sūtīt šifrētu atbildi…",
     "Send a reply (unencrypted)…": "Sūtīt nešifrētu atbildi…",
-    "Send an encrypted message…": "Sūtīt šifrētu ziņu…",
-    "Send a message (unencrypted)…": "Sūtīt NEšifrētu ziņu…",
+    "Send an encrypted message…": "rakstīt ziņu (šifrētu)…",
+    "Send a message (unencrypted)…": "rakstīt ziņu (NEšifrētu)…",
     "Jump to message": "Pāriet uz ziņu",
     "No pinned messages.": "Nav piestiprinātu ziņu.",
     "Loading...": "Ielāde...",
@@ -783,14 +783,14 @@
     "Replying": "Atbildot uz",
     "No rooms to show": "Nav istabu, kuras parādīt",
     "World readable": "Pieejams ikvienam no visurienes",
-    "Remove avatar": "Dzēst avataru",
+    "Remove avatar": "Dzēst avataru (profila attēlu)",
     "Drop here to favourite": "Nomest šeit (atvilt uz šejieni), lai iekļautu izlasē (favorītos)",
     "Drop here to tag direct chat": "Nomest šeit, lai pievienotu atzīmi \"Tiešais čats\"",
     "Drop here to restore": "Nomest šeit, lai atgrieztu",
     "Drop here to demote": "Nomest šeit, lai pazeminātu",
     "Failed to remove tag %(tagName)s from room": "Neizdevās istabai noņemt birku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Neizdevās istabai pievienot birku %(tagName)s",
-    "Community Invites": "Uzaicinājums uz komūnu",
+    "Community Invites": "Uzaicinājums uz kopienu",
     "You have been kicked from this room by %(userName)s.": "%(userName)s padzina Tevi no šīs istabas.",
     "You have been banned from this room by %(userName)s.": "%(userName)s nobloķēja Tevi (liedza piekļuvi) šajā istabā.",
     "You are trying to access a room.": "Tu centies gūt piekļuvi istabai.",
@@ -813,23 +813,23 @@
     "To remove other users' messages, you must be a": "Lai dzēstu citu lietotāju ziņas, ir jābūt",
     "To send events of type <eventType/>, you must be a": "Lai sūtītu <eventType/> tipa notikumus, ir jābūt",
     "Addresses": "Adreses",
-    "Invalid community ID": "Nederīgs komūnas ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nav derīgs komūnas ID",
+    "Invalid community ID": "Nederīgs kopienas Id",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nav derīgs kopienas Id",
     "Flair": "Gaidas (nojauta)",
     "Showing flair for these communities:": "Parādīt Tavas gaidas šajās komūnās:",
     "This room is not showing flair for any communities": "Šajā istabā neparādās gaidas, kas uzstādītas komūnās",
-    "New community ID (e.g. +foo:%(localDomain)s)": "Jaunās komūnas ID (piem. +foo:%(localDomain)s)",
-    "URL previews are enabled by default for participants in this room.": "URL adrešu priekšskats šīs istabas dalībniekiem ir iespējots pēc noklusējuma.",
-    "URL previews are disabled by default for participants in this room.": "ULR adrešu priešskats šīs istabas dalībniekiem pēc noklusējuma ir atspējots.",
+    "New community ID (e.g. +foo:%(localDomain)s)": "Jaunās kopienas Id (piem. +foo:%(localDomain)s)",
+    "URL previews are enabled by default for participants in this room.": "URL priekšskats šīs istabas dalībniekiem pēc noklusējuma ir iespējots.",
+    "URL previews are disabled by default for participants in this room.": "ULR priešskats šīs istabas dalībniekiem pēc noklusējuma ir atspējots.",
     "Copied!": "Nokopēts!",
     "Failed to copy": "Nokopēt neizdevās",
     "Message removed by %(userId)s": "Ziņu dzēsis %(userId)s",
     "Message removed": "Ziņa dzēsta",
     "An email has been sent to %(emailAddress)s": "Vēstule tika nosūtīta uz %(emailAddress)s",
-    "A text message has been sent to %(msisdn)s": "Teksta ziņa tika nosūtīts uz %(msisdn)s",
+    "A text message has been sent to %(msisdn)s": "Teksta ziņa tika nosūtīta uz %(msisdn)s",
     "Username on %(hs)s": "Lietotājvārds uz %(hs)s",
-    "Remove from community": "Izdzēst no komūnas",
-    "Disinvite this user from community?": "Atcelt šim lietotājam nosūtīto uzaicinājumu pievienoties komūnai?",
+    "Remove from community": "Izdzēst no kopienas",
+    "Disinvite this user from community?": "Atcelt šim lietotājam nosūtīto uzaicinājumu pievienoties kopienai?",
     "Remove this user from community?": "Izdzēst šo lietotāju no kopienas?",
     "Failed to withdraw invitation": "Neizdevās atcelt uzaicinājumu",
     "Failed to remove user from community": "Neizdevās izdzēst lietotāju no kopienas",
@@ -843,14 +843,14 @@
     "The visibility of '%(roomName)s' in %(groupId)s could not be updated.": "Istabas '%(roomName)s' redzamību %(groupId)s nebija iespējams atjaunot.",
     "Visibility in Room List": "Redzamība istabu sarakstā",
     "Visible to everyone": "Redzama visiem",
-    "Only visible to community members": "Tikai komūnas dalībniekiem",
+    "Only visible to community members": "Tikai kopienas dalībniekiem",
     "Filter community rooms": "Kopienas istabu filtrs",
     "Something went wrong when trying to get your communities.": "Kaut kas nogāja greizi, kad tika mēģināts attēlot Tavas kopienas.",
     "Display your community flair in rooms configured to show it.": "Parādīt Tavas gaidas istabās, kurās to parādīšana iespējota.",
-    "You're not currently a member of any communities.": "Pašreiz Tu neesi neesi nevienas komūnas piederīgais.",
+    "You're not currently a member of any communities.": "Pašreiz Tu neesi neesi nevienas kopienas piederīgais.",
     "Delete Widget": "Dzēst vidžetu",
     "Deleting a widget removes it for all users in this room. Are you sure you want to delete this widget?": "Vidžeta dzēšana to dzēš visiem šīs istabas lietotājiem. Vai tiešām vēlies dzēst šo vidžetu?",
-    "Minimize apps": "Minimizēt lietotājprogrammas",
+    "Minimize apps": "Minimizēt programmas",
     "Communities": "Kopienas",
     "%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
     "%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)spievienojās %(count)s reizes",
@@ -877,20 +877,20 @@
     "Custom of %(powerLevel)s": "Lietotāja līmenis %(powerLevel)s",
     "<a>In reply to</a> <pill>": "<a>Atbildē uz</a> <pill>",
     "And %(count)s more...|other": "Un par %(count)s vairāk...",
-    "Matrix ID": "Matrix ID",
-    "Matrix Room ID": "Matrix istabas ID",
+    "Matrix ID": "Matrix Id",
+    "Matrix Room ID": "Matrix istabas Id",
     "email address": "e-pasta adrese",
     "Try using one of the following valid address types: %(validTypesList)s.": "Mēģiniet izmantot vienu no sekojošiem pieļautajiem adrešu tipiem: %(validTypesList)s.",
     "You have entered an invalid address.": "Ievadīta nederīga adrese.",
-    "Community IDs cannot not be empty.": "Kopienas IDs nevar būt tukšs.",
-    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Kopienas IDs var saturēt tikai simbolus a-z, 0-9, or '=_-./'",
+    "Community IDs cannot not be empty.": "Kopienu IDs nevar būt tukši.",
+    "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Kopienas ID var saturēt tikai simbolus a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Radot Tavu kopienu kaut kas nogāja greizi",
     "Create Community": "Radīt kopienu",
     "Community Name": "Kopienas nosaukums",
     "Community ID": "Kopienas ID",
     "example": "piemērs",
-    "Advanced options": "Papildus parametri",
-    "Block users on other matrix homeservers from joining this room": "Neļaut lietotājiem no citiem mājasserveriem pievienoties šai istabai",
+    "Advanced options": "Papildus opcijas",
+    "Block users on other matrix homeservers from joining this room": "Neļaut lietotājiem no citiem Bāzes serveriem pievienoties šai istabai",
     "This setting cannot be changed later!": "Šo parametru vēlāk izmainīt nebūs iespējams!",
     "%(severalUsers)sleft and rejoined %(count)s times|one": "%(severalUsers)s aizgājuši un atgriezušies",
     "%(oneUser)sleft and rejoined %(count)s times|other": "%(oneUser)s aizgājis un atgriezies %(count)s reizes",
@@ -904,7 +904,7 @@
     "was banned %(count)s times|one": "tika bloķēts",
     "were banned %(count)s times|one": "tika bloķēti",
     "was unbanned %(count)s times|one": "tika atbloķēts",
-    "were kicked %(count)s times|one": "tika padzīti",
+    "were kicked %(count)s times|one": "tika padzīti (izsperti)",
     "was kicked %(count)s times|other": "tika padzīts %(count)s reizes",
     "was kicked %(count)s times|one": "tika padzīts",
     "%(severalUsers)schanged their name %(count)s times|other": "%(severalUsers)s izmainīja savu lietotājvārdu %(count)s reizes",
@@ -924,25 +924,25 @@
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Jūsu kopienai nav plašāka HTML-lapas apraksta ko parādīt dalībniekiem.<br />Klikšķini šeit, lai atvērtu iestatījumus un to pievienotu!",
     "Description": "Apraksts",
     "Failed to load %(groupId)s": "Neizdevās  ielādēt %(groupId)s",
-    "This Home server does not support communities": "Šis mitināšanas serveris neatbalsta kopienas",
+    "This Home server does not support communities": "Šis Bāzes serveris neatbalsta kopienas",
     "This room is not public. You will not be able to rejoin without an invite.": "Šīs istaba nav publiska. Tu nevari tajā ieiet bez uzaicinājuma.",
     "Cryptography data migrated": "Sifrēšanas dati tika pārnesti",
     "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Veikta vienreizēja šifrēšanas datu pārnese. Sifrēšana (end-to-end) nedarbosies, ja Tu atgriezīses pie vecākas Riot versijas. Ja nepieciešams izmantot end-to-end šifrēšanu, izmantojot vecāku versija, vispirms izraksties no Riot. Lai saglabātu ziņu vēsturi, eksportē un tad importē savas kripto-atslēgas.",
     "Old cryptography data detected": "Tika uzieti novecojuši šifrēšanas dati",
-    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Uzieti dati no vecākas Riot versijas. Tas novedīs pie end-to-end šifrēšanas problēmām vecākajā versijā. Šajā versijā nevar tikt atšifrēti ziņojumi, kuri radīti izmantojot vecākajā versijā end-to-end šifrētas ziņas. Tas var arī novest pie ziņapmaiņas, kas veikta ar šo versiju. Ja rodas ķibeles, izraksties un par jaunu pieraksties sistēmā. Lai saglabātu ziņu vēsturi, eksportē un tad importē savas šifrēšanas atslēgas.",
+    "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Uzieti dati no vecākas Riot versijas. Tas novedīs pie \"end-to-end\" šifrēšanas problēmām vecākajā versijā. Šajā versijā nevar tikt atšifrēti ziņojumi, kuri radīti izmantojot vecākajā versijā \"end-to-end\" šifrētas ziņas. Tas var arī novest pie ziņapmaiņas, kas veikta ar šo versiju, neizdošanās. Ja rodas ķibeles, izraksties un par jaunu pieraksties sistēmā. Lai saglabātu ziņu vēsturi, eksportē un tad importē savas šifrēšanas atslēgas.",
     "Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Radi kopienu, lai apvienotu lietotājus un istabas. Izveido mājaslapu, lai iezīmētu Matrix visumā savu klātbūtni, vietu un telpu.",
     "Error whilst fetching joined communities": "Ielādējot kopienas radās kļūda",
     "%(count)s of your messages have not been sent.|one": "Tava ziņa netika nosūtīta.",
     "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Parādīt ierīces</showDevicesText>, <sendAnywayText>vienalga nosūtīt</sendAnywayText> vai <cancelText>sūtīšanu atcelt</cancelText>.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Atkārtoti nosūtīt ziņu</resendText> vai <cancelText>atcelt sūtīšanu</cancelText>.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|one": "<resendText>Atkārtoti sūtīt ziņu</resendText> vai <cancelText>atcelt sūtīšanu</cancelText>.",
     "There's no one else here! Would you like to <inviteText>invite others</inviteText> or <nowarnText>stop warning about the empty room</nowarnText>?": "Šeit neviena nav. Ja vēlies <inviteText>kādu uzaicināt</inviteText> vai <nowarnText>atslēgt paziņojumu par tukšu istabu</nowarnText>?",
-    "Light theme": "Gaiša tēma",
-    "Dark theme": "Tumša tēma",
-    "Status.im theme": "Status.im tēma",
+    "Light theme": "Gaiša ādiņa",
+    "Dark theme": "Tumša ādiņa",
+    "Status.im theme": "Status.im ādiņa",
     "Ignored Users": "Ignorētie lietotāji",
-    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privātumu augstu respektējam, tādēļ nevācam nekādus personas un identificējamus datus analītikas mērķiem.",
+    "Privacy is important to us, so we don't collect any personal or identifiable data for our analytics.": "Privātumu augstu respektējam, tādēļ analītikas mērķiem nevācam nekādus personas un identificējamus datus.",
     "Learn more about how we use analytics.": "Sīkāk par to, kā tiek izmantota analītika.",
-    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Epasts ir nosūtīts uz %(emailAddress)s. Izmantojiet epastā nosūtīto tīmekļa saiti un tad noklišķiniet šeit zemāk.",
+    "An email has been sent to %(emailAddress)s. Once you've followed the link it contains, click below.": "Epasts ir nosūtīts uz %(emailAddress)s. Izmanto epastā nosūtīto tīmekļa saiti un tad noklikšķini zemāk.",
     "Please note you are logging into the %(hs)s server, not matrix.org.": "Lūdzu ņem vērā, ka Tu pieraksties %(hs)s serverī, nevis matrix.org serverī.",
     "This homeserver doesn't offer any login flows which are supported by this client.": "Šis bāzes serveris neatbalsta nevienu pierakstīšanās metodi, kuru piedāvā šis Riot klients.",
     "Sign in to get started": "Pierakstīties, lai sāktu",
@@ -950,7 +950,7 @@
     "Stops ignoring a user, showing their messages going forward": "Atceļ lietotāja ignorēšanu, rādot viņa turpmāk sūtītās ziņas",
     "Notify the whole room": "Paziņot visai istabai",
     "Room Notification": "Istabas paziņojums",
-    "Disable Community Filter Panel": "Atslēgt kopienas filtra paneli",
+    "Disable Community Filter Panel": "Atspējot kopienas filtra paneli",
     "Your key share request has been sent - please check your other devices for key share requests.": "Tavs atslēgu apmaiņas pieprasījums nosūtīts - lūdzu pārbaudi citas savas ierīces attiecībā uz atslēgu apmaiņu.",
     "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Atslēgu apmaiņas pieprasījumi Tavām citām ierīcēm tiek nosūtīti automātiski. Ja citās savās ierīcēs atslēdzi vai noraidīji atslēgu apmaiņas pieprasījumu, spiediet šeit lai pieprasītu atslēgas šai sesijai atkārtoti.",
     "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ja citās Tavās ierīcēs nav atslēgas priekš šīs ziņas, Tu nevarēsi to atšifrēt.",
@@ -973,7 +973,7 @@
     "%(oneUser)schanged their avatar %(count)s times|one": "%(oneUser)snomainīja savu avataru",
     "%(items)s and %(count)s others|other": "%(items)s un %(count)s citus",
     "Add users to the community summary": "Pievienot lietotājus kopienas kopsavilkumam",
-    "Who would you like to add to this summary?": "Kuru personu Tu vēlies pievienot šim kopsavilkumam?",
+    "Who would you like to add to this summary?": "Kuru lietotāju Tu vēlies pievienot šim kopsavilkumam?",
     "Failed to add the following users to the summary of %(groupId)s:": "%(groupId)s kopsavilkumam neizdevās pievienot šādus lietotājus:",
     "Add a User": "Pievienot lietotāju",
     "Failed to remove a user from the summary of %(groupId)s": "Neizdevās dzēst lietotāju no %(groupId)s kopsavilkuma",
@@ -994,10 +994,10 @@
     "Create a new community": "Izveidot jaunu kopienu",
     "Join an existing community": "Pievienoties esošai kopienai",
     "To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Lai pievienotos esošai kopienai Tev jāzina tā ID; tas izskatīties piemēram šādi <i>+paraugs:matrix.org</i>.",
-    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Tagad<resendText>visus atkārtoti nosūtīt</resendText> vai <cancelText>visus atcelt</cancelText>. Tu vari arī atzīmēt individuālus ziņojumus, kurus atkārtoti nosūtīt vai atcelt.",
+    "%(count)s <resendText>Resend all</resendText> or <cancelText>cancel all</cancelText> now. You can also select individual messages to resend or cancel.|other": "Tagad<resendText>visas atkārtoti sūtīt</resendText> vai <cancelText>visas atcelt</cancelText>. Tu vari atzīmēt arī individuālas ziņas, kuras atkārtoti sūtīt vai atcelt.",
     "Clear filter": "Attīrīt filtru",
-    "Debug Logs Submission": "Iesniegt atutošanas žurnālierakstus",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ja esi paziņojis par kļūdu caur GitHub, atutošanas žurnāli var mums palīdzēt identificēt problēmu. Atutošanas žurnāli satur programmas lietošanas datus, tostarp Tavu lietotājvārdu, istabu/grupu ID vai aliases, kuras esi apmeklējis un citu lietotāju lietotājvārdus. Tie nesatur pašas ziņas.",
-    "Submit debug logs": "Iesniegt atutošanas žurnālu",
+    "Debug Logs Submission": "Iesniegt atutošanas logfailus",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ja esi paziņojis par kļūdu caur GitHub, atutošanas logfaili var mums palīdzēt identificēt problēmu. Atutošanas logfaili satur programmas lietošanas datus, tostarp Tavu lietotājvārdu, istabu/grupu Id vai aliases, kuras esi apmeklējis un citu lietotāju lietotājvārdus. Tie nesatur pašas ziņas.",
+    "Submit debug logs": "Iesniegt atutošanas logfailus",
     "Opens the Developer Tools dialog": "Atver Izstrādātāja instrumentus"
 }

From cd92cea2330915265aa950515d69e701c520fbe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Mon, 26 Mar 2018 12:52:56 +0000
Subject: [PATCH 778/927] Translated using Weblate (French)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index a07a6fbbc9..f365d8e273 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -992,5 +992,11 @@
     "Key request sent.": "Demande de clé envoyée.",
     "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Re-demander les clés de chiffrement</requestLink> depuis vos autres appareils.",
     "%(user)s is a %(userRole)s": "%(user)s est %(userRole)s",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Les changements effectués sur votre communauté peuvent ne pas apparaître pour les autres utilisateurs avant 30 minutes."
+    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Les changements effectués sur votre communauté peuvent ne pas apparaître pour les autres utilisateurs avant 30 minutes.",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Vu par %(displayName)s (%(userName)s) à %(dateTime)s",
+    "Code": "Code",
+    "Debug Logs Submission": "Envoi des journaux de débogage",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Si vous avez signalé un bug via GitHub, les journaux de débogage peuvent nous aider à identifier le problème. Les journaux de débogage contiennent des données d'utilisation de l'application dont votre nom d'utilisateur, les identifiants ou alias des salons ou groupes que vous avez visité et les noms d'utilisateur des autres participants. Ils ne contiennent pas les messages.",
+    "Submit debug logs": "Envoyer les journaux de débogage",
+    "Opens the Developer Tools dialog": "Ouvre la fenêtre des Outils de développeur"
 }

From 80959564d9d2711d64a1fe2fa8c918888f88c371 Mon Sep 17 00:00:00 2001
From: Yao Wei <mwei@lxde.org>
Date: Sun, 25 Mar 2018 04:52:02 +0000
Subject: [PATCH 779/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index df9d607896..9fded62d18 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -997,5 +997,6 @@
     "Debug Logs Submission": "除錯訊息傳送",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "如果您透過 GitHub 來回報錯誤，除錯訊息可以用來追蹤問題。除錯訊息包含應用程式的使用資料，包括您的使用者名稱、您所造訪的房間/群組的 ID 或別名、其他使用者的使用者名稱等，其中不包含訊息本身。",
     "Submit debug logs": "傳送除錯訊息",
-    "Opens the Developer Tools dialog": "開啟開發者工具對話視窗"
+    "Opens the Developer Tools dialog": "開啟開發者工具對話視窗",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "被 %(displayName)s (%(userName)s) 於 %(dateTime)s 看過"
 }

From 2361df8f36bf6ad267247efd72abfb7856d64104 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 22 Mar 2018 14:45:00 +0000
Subject: [PATCH 780/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2cfd672687..2e65ba3e12 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -997,5 +997,6 @@
     "Debug Logs Submission": "Hibakeresési napló elküldése",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
     "Submit debug logs": "Hibakeresési napló küldése",
-    "Opens the Developer Tools dialog": "Megnyitja a fejlesztői eszközök ablakát"
+    "Opens the Developer Tools dialog": "Megnyitja a fejlesztői eszközök ablakát",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Látta: %(displayName)s (%(userName)s) az alábbi időpontban: %(dateTime)s"
 }

From 7bfbc0b3890a8de52d42ef90269cbb9026741284 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Thu, 22 Mar 2018 13:38:25 +0000
Subject: [PATCH 781/927] Translated using Weblate (Basque)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index b8e207e022..b2954e3c13 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -997,5 +997,6 @@
     "Debug Logs Submission": "Arazte-egunkarien bidalketak",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Akats bat bidali baduzu GitHub bidez, arazte-egunkariek arazoa aurkitzen lagundu gaitzakete. Arazte-egunkariek aplikazioak darabilen datuak dauzkate, zure erabiltzaile izena barne, bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
     "Submit debug logs": "Bidali arazte-txostenak",
-    "Opens the Developer Tools dialog": "Garatzailearen tresnen elkarrizketa-koadroa irekitzen du"
+    "Opens the Developer Tools dialog": "Garatzailearen tresnen elkarrizketa-koadroa irekitzen du",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s)(e)k ikusita %(dateTime)s(e)tan"
 }

From ed60d22a14ad777ebf79a75680fb395c95df5e12 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 22 Mar 2018 15:41:13 +0000
Subject: [PATCH 782/927] Translated using Weblate (Russian)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 78b17f6ecc..f06bb8c00c 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -997,5 +997,6 @@
     "Debug Logs Submission": "Отправка журналов отладки",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Если вы отправили ошибку через GitHub, журналы отладки могут помочь нам выявить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
     "Submit debug logs": "Отправка журналов отладки",
-    "Opens the Developer Tools dialog": "Открывает Инструменты разработчика"
+    "Opens the Developer Tools dialog": "Открывает Инструменты разработчика",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Просмотрено %(displayName)s (%(userName)s) в %(dateTime)s"
 }

From e48de56449670673dcb427105830b781b9c0f3c2 Mon Sep 17 00:00:00 2001
From: Oskars <oskars@lanet.lv>
Date: Fri, 23 Mar 2018 12:27:02 +0000
Subject: [PATCH 783/927] Translated using Weblate (Latvian)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 98ad475e0c..3880e75fbb 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -999,5 +999,6 @@
     "Debug Logs Submission": "Iesniegt atutošanas logfailus",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ja esi paziņojis par kļūdu caur GitHub, atutošanas logfaili var mums palīdzēt identificēt problēmu. Atutošanas logfaili satur programmas lietošanas datus, tostarp Tavu lietotājvārdu, istabu/grupu Id vai aliases, kuras esi apmeklējis un citu lietotāju lietotājvārdus. Tie nesatur pašas ziņas.",
     "Submit debug logs": "Iesniegt atutošanas logfailus",
-    "Opens the Developer Tools dialog": "Atver Izstrādātāja instrumentus"
+    "Opens the Developer Tools dialog": "Atver Izstrādātāja instrumentus",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Skatījis %(displayName)s (%(userName)s) %(dateTime)s"
 }

From c393b14cb9bad8093df0ddea7cb78ced4bf2559e Mon Sep 17 00:00:00 2001
From: Ralitsa Bozhkova <ralitsa.bozhkova@gmail.com>
Date: Sat, 24 Mar 2018 10:16:01 +0000
Subject: [PATCH 784/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 6d963ab3e3..40b0eda0a4 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1000,5 +1000,6 @@
     "Debug Logs Submission": "Изпращане на логове за дебъгване",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ако сте изпратили грешка чрез GitHub, логовете за дебъгване могат да ни помогнат да проследим проблема. Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
     "Submit debug logs": "Изпрати логове за дебъгване",
-    "Opens the Developer Tools dialog": "Отваря прозорец с инструменти на разработчика"
+    "Opens the Developer Tools dialog": "Отваря прозорец с инструменти на разработчика",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Видяно от %(displayName)s (%(userName)s) в %(dateTime)s"
 }

From 2887835a1f2a31a35c941862237a09e824d4d16a Mon Sep 17 00:00:00 2001
From: riotimbuggggg <x__gramos@hotmail.com>
Date: Tue, 27 Mar 2018 08:47:45 +0000
Subject: [PATCH 785/927] Translated using Weblate (Albanian)

Currently translated at 4.7% (47 of 997 strings)

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

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 0967ef424b..93af2327d7 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -1 +1,49 @@
-{}
+{
+    "This email address is already in use": "Kjo adresë e-mail-i tashmë është në përdorim",
+    "This phone number is already in use": "Ky numër telefoni tashmë është në përdorim",
+    "Failed to verify email address: make sure you clicked the link in the email": "Vërtetimi i adresës e-mail i pasukseshëm: Sigurohu që ke klikuar lidhjen në e-mail",
+    "The platform you're on": "Platforma që jë duke përdorur",
+    "The version of Riot.im": "Versioni i Riot.im-it",
+    "Whether or not you're logged in (we don't record your user name)": "A je i lajmëruar apo jo (ne nuk do të inçizojmë emrin përdorues tëndë)",
+    "Your language of choice": "Gjuha jote e zgjedhur",
+    "Which officially provided instance you are using, if any": "Cilën instancë zyrtarisht të ofruar je duke përdorur, në rast që je",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "A je duke e përdorur mënyrën e tekstit të pasuruar të redaktionuesit të tekstit të pasuruar apo jo",
+    "Your homeserver's URL": "URL-ja e server-it shtëpiak tëndë",
+    "Your identity server's URL": "URL-ja e server-it identiteti tëndë",
+    "Analytics": "Analiza",
+    "The information being sent to us to help make Riot.im better includes:": "Informacionet që dërgohen për t'i ndihmuar Riot.im-it të përmirësohet përmbajnë:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Ne gjithashtu inçizojmë çdo faqe që përdorë në aplikacion (në këtë çast <CurrentPageHash>), agjentin e përdoruesit tëndë (<CurrentUserAgent>) dhe rezolucionin e pajisjes tënde (<CurrentDeviceResolution>).",
+    "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Kur kjo faqe pëmban informacione që mund të të identifikojnë, sikur një dhomë, përdorues apo identifikatues grupi, këto të dhëna do të mënjanohen para se t‘i dërgohën një server-it.",
+    "Call Failed": "Thirrja nuk mundej të realizohet",
+    "There are unknown devices in this room: if you proceed without verifying them, it will be possible for someone to eavesdrop on your call.": "Pajisje të panjohura ndodhen në këtë dhomë: nësë vazhdon pa i vërtetuar, është e mundshme që dikush të jua përgjon thirrjen.",
+    "Review Devices": "Rishiko pajisjet",
+    "Call Anyway": "Thirr prapëseprapë",
+    "Answer Anyway": "Prano prapëseprapë",
+    "Call": "Thirr",
+    "Answer": "Prano",
+    "Call Timeout": "Skadim kohe thirrjeje",
+    "The remote side failed to pick up": "Ana e kundërt nuk arriti të pranojë",
+    "Unable to capture screen": "Ekrani nuk mundi të inçizohej",
+    "Existing Call": "Thirrje aktuale",
+    "You are already in a call.": "Tashmë je në thirrje.",
+    "VoIP is unsupported": "VoIP nuk mbulohet",
+    "You cannot place VoIP calls in this browser.": "Thirrjet me VoIP nuk mbulohen nga ky kërkues uebi.",
+    "You cannot place a call with yourself.": "Nuk mund të realizosh thirrje me vetveten.",
+    "Conference calls are not supported in this client": "Thirrjet konference nuk mbulohen nga ky klienti",
+    "Conference calls are not supported in encrypted rooms": "Thirrjet konference nuk mbulohen në dhoma të shifruara",
+    "Warning!": "Paralajmërim!",
+    "Conference calling is in development and may not be reliable.": "Thirrja konference ende është në zhvillim dhe mund të jetë e paqëndrueshme.",
+    "Failed to set up conference call": "Thirrja konference nuk mundi të realizohej",
+    "Conference call failed.": "Thirrja konference dështoi.",
+    "The file '%(fileName)s' failed to upload": "Fajli '%(fileName)s' nuk mundi të mbartet",
+    "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Fajli '%(fileName)s' tejkalon kufirin madhësie për mbartje e këtij server-i shtëpiak",
+    "Upload Failed": "Mbartja dështoi",
+    "Failure to create room": "Dhoma nuk mundi të krijohet",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server-i është i padisponueshëm, i ngarkuar tej mase, apo ka një gabim.",
+    "Send anyway": "Dërgo prapëseprapë",
+    "Send": "Dërgo",
+    "Sun": "Die",
+    "Mon": "Hën",
+    "Tue": "Mar",
+    "Wed": "Mër"
+}

From 4f488e9e89f78bcd2cea7fb8247f300eb1d130f7 Mon Sep 17 00:00:00 2001
From: Besnik Bleta <besnik@programeshqip.org>
Date: Tue, 27 Mar 2018 08:47:58 +0000
Subject: [PATCH 786/927] Translated using Weblate (Albanian)

Currently translated at 4.7% (47 of 997 strings)

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

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 93af2327d7..896dd07363 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -41,7 +41,7 @@
     "Failure to create room": "Dhoma nuk mundi të krijohet",
     "Server may be unavailable, overloaded, or you hit a bug.": "Server-i është i padisponueshëm, i ngarkuar tej mase, apo ka një gabim.",
     "Send anyway": "Dërgo prapëseprapë",
-    "Send": "Dërgo",
+    "Send": "Dërgoje",
     "Sun": "Die",
     "Mon": "Hën",
     "Tue": "Mar",

From 69d9080dd5207fffe59e306540b24ece6e90f0dd Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 27 Mar 2018 11:17:49 +0100
Subject: [PATCH 787/927] Track duration of page changes

The duration measured is between
 - componentWillUpdate of MatrixChat and
 - componentDidUpdate of MatrixChat.

This does not account for *all* changes to the view that occur
when a room switch happens, for example. But it does at least
capture the difference between switching to a "big" room and
switching to a small test room.
---
 src/Analytics.js                        | 21 +++++++++++++++++++++
 src/components/structures/MatrixChat.js | 19 +++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index 5f4a0d0c77..ab47d30c1d 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -74,6 +74,7 @@ class Analytics {
         this._paq = null;
         this.disabled = true;
         this.firstPage = true;
+        this.generationTimeMs = null;
     }
 
     /**
@@ -147,6 +148,23 @@ class Analytics {
         return true;
     }
 
+    startPageChangeTimer() {
+        performance.clearMarks('riot_page_change_start');
+        performance.mark('riot_page_change_start');
+    }
+
+    stopPageChangeTimer() {
+        performance.mark('riot_page_change_stop');
+        performance.measure(
+            'riot_page_change_delta',
+            'riot_page_change_start',
+            'riot_page_change_stop',
+        );
+
+        const measurement = performance.getEntriesByName('riot_page_change_delta').pop();
+        this.generationTimeMs = measurement.duration;
+    }
+
     trackPageChange() {
         if (this.disabled) return;
         if (this.firstPage) {
@@ -156,6 +174,9 @@ class Analytics {
             return;
         }
         this._paq.push(['setCustomUrl', getRedactedUrl()]);
+        if (typeof this.generationTimeMs === 'number') {
+            this._paq.push(['setGenerationTimeMs', this.generationTimeMs]);
+        }
         this._paq.push(['trackPageView']);
     }
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 1312abda09..a898808141 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -368,13 +368,29 @@ export default React.createClass({
         window.removeEventListener('resize', this.handleResize);
     },
 
-    componentDidUpdate: function() {
+    componentWillUpdate: function(props, state) {
+        if (this.shouldTrackPageChange(this.state, state)) {
+            Analytics.startPageChangeTimer();
+        }
+    },
+
+    componentDidUpdate: function(prevProps, prevState) {
+        if (this.shouldTrackPageChange(prevState, this.state)) {
+            Analytics.stopPageChangeTimer();
+            Analytics.trackPageChange();
+        }
         if (this.focusComposer) {
             dis.dispatch({action: 'focus_composer'});
             this.focusComposer = false;
         }
     },
 
+    shouldTrackPageChange(prevState, state) {
+        return prevState.currentRoomId !== state.currentRoomId ||
+            prevState.view !== state.view ||
+            prevState.page_type !== state.page_type;
+    },
+
     setStateForNewView: function(state) {
         if (state.view === undefined) {
             throw new Error("setStateForNewView with no view!");
@@ -1341,7 +1357,6 @@ export default React.createClass({
         if (this.props.onNewScreen) {
             this.props.onNewScreen(screen);
         }
-        Analytics.trackPageChange();
     },
 
     onAliasClick: function(event, alias) {

From b80568b1c50351d5571ac9fcd2157c9ba0c87499 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 21 Mar 2018 12:00:56 +0000
Subject: [PATCH 788/927] Wrap GeminiScrollbar in a component, enabled
 forceGemini

Fixes https://github.com/vector-im/riot-web/issues/6294
---
 src/components/structures/GroupView.js        |  6 ++--
 src/components/structures/MyGroups.js         |  7 ++--
 src/components/structures/ScrollPanel.js      |  6 ++--
 src/components/structures/TagPanel.js         |  7 ++--
 src/components/structures/UserSettings.js     |  9 ++---
 .../views/dialogs/UnknownDeviceDialog.js      |  5 +--
 .../views/elements/GeminiScrollbarWrapper.js  | 36 +++++++++++++++++++
 .../views/groups/GroupMemberInfo.js           |  6 ++--
 .../views/groups/GroupMemberList.js           |  6 ++--
 src/components/views/groups/GroupRoomInfo.js  |  6 ++--
 src/components/views/groups/GroupRoomList.js  |  6 ++--
 src/components/views/rooms/MemberInfo.js      |  6 ++--
 src/components/views/rooms/MemberList.js      |  6 ++--
 src/components/views/rooms/RoomList.js        |  8 ++---
 .../views/rooms/SearchableEntityList.js       |  6 ++--
 15 files changed, 83 insertions(+), 43 deletions(-)
 create mode 100644 src/components/views/elements/GeminiScrollbarWrapper.js

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 30e897e5dc..2b5b3d5353 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -31,7 +31,6 @@ import GroupStoreCache from '../../stores/GroupStoreCache';
 import GroupStore from '../../stores/GroupStore';
 import FlairStore from '../../stores/FlairStore';
 import { showGroupAddRoomDialog } from '../../GroupAddressPicker';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import {makeGroupPermalink, makeUserPermalink} from "../../matrix-to";
 
 const LONG_DESC_PLACEHOLDER = _td(
@@ -969,6 +968,7 @@ export default React.createClass({
         const GroupAvatar = sdk.getComponent("avatars.GroupAvatar");
         const Spinner = sdk.getComponent("elements.Spinner");
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
         if (this.state.summaryLoading && this.state.error === null || this.state.saving) {
             return <Spinner />;
@@ -1119,9 +1119,9 @@ export default React.createClass({
                             { rightButtons }
                         </div>
                     </div>
-                    <GeminiScrollbar className="mx_GroupView_body">
+                    <GeminiScrollbarWrapper className="mx_GroupView_body">
                         { bodyNodes }
-                    </GeminiScrollbar>
+                    </GeminiScrollbarWrapper>
                 </div>
             );
         } else if (this.state.error) {
diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js
index da7bebd16a..7a93cfb886 100644
--- a/src/components/structures/MyGroups.js
+++ b/src/components/structures/MyGroups.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import sdk from '../../index';
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
@@ -63,6 +62,8 @@ export default withMatrixClient(React.createClass({
         const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
         const GroupTile = sdk.getComponent("groups.GroupTile");
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
+
 
         let content;
         let contentHeader;
@@ -73,7 +74,7 @@ export default withMatrixClient(React.createClass({
             });
             contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
             content = groupNodes.length > 0 ?
-                <GeminiScrollbar>
+                <GeminiScrollbarWrapper>
                     <div className="mx_MyGroups_microcopy">
                         <p>
                             { _t(
@@ -92,7 +93,7 @@ export default withMatrixClient(React.createClass({
                     <div className="mx_MyGroups_joinedGroups">
                         { groupNodes }
                     </div>
-                </GeminiScrollbar> :
+                </GeminiScrollbarWrapper> :
                 <div className="mx_MyGroups_placeholder">
                     { _t(
                         "You're not currently a member of any communities.",
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index cbb6001d5f..722dc2251f 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -17,7 +17,6 @@ limitations under the License.
 const React = require("react");
 const ReactDOM = require("react-dom");
 import PropTypes from 'prop-types';
-const GeminiScrollbar = require('react-gemini-scrollbar');
 import Promise from 'bluebird';
 import { KeyCode } from '../../Keyboard';
 
@@ -669,10 +668,11 @@ module.exports = React.createClass({
     },
 
     render: function() {
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         // TODO: the classnames on the div and ol could do with being updated to
         // reflect the fact that we don't necessarily contain a list of messages.
         // it's not obvious why we have a separate div and ol anyway.
-        return (<GeminiScrollbar autoshow={true} ref="geminiPanel"
+        return (<GeminiScrollbarWrapper autoshow={true} ref="geminiPanel"
                 onScroll={this.onScroll} onResize={this.onResize}
                 className={this.props.className} style={this.props.style}>
                     <div className="mx_RoomView_messageListWrapper">
@@ -680,7 +680,7 @@ module.exports = React.createClass({
                             { this.props.children }
                         </ol>
                     </div>
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
                );
     },
 });
diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 7a187e4298..790c497a67 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -17,7 +17,6 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import { MatrixClient } from 'matrix-js-sdk';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import TagOrderStore from '../../stores/TagOrderStore';
 
 import GroupActions from '../../actions/GroupActions';
@@ -102,6 +101,8 @@ const TagPanel = React.createClass({
         const DNDTagTile = sdk.getComponent('elements.DNDTagTile');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const TintableSvg = sdk.getComponent('elements.TintableSvg');
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
+
 
         const tags = this.state.orderedTags.map((tag, index) => {
             return <DNDTagTile
@@ -124,7 +125,7 @@ const TagPanel = React.createClass({
                 { clearButton }
             </AccessibleButton>
             <div className="mx_TagPanel_divider" />
-            <GeminiScrollbar
+            <GeminiScrollbarWrapper
                 className="mx_TagPanel_scroller"
                 autoshow={true}
                 // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273
@@ -145,7 +146,7 @@ const TagPanel = React.createClass({
                             </div>
                     ) }
                 </Droppable>
-            </GeminiScrollbar>
+            </GeminiScrollbarWrapper>
             <div className="mx_TagPanel_divider" />
             <div className="mx_TagPanel_createGroupButton">
                 <GroupsButton tooltip={true} />
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index f6629b4b09..85223c4eef 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -30,7 +30,6 @@ import Promise from 'bluebird';
 const packageJson = require('../../../package.json');
 const UserSettingsStore = require('../../UserSettingsStore');
 const CallMediaHandler = require('../../CallMediaHandler');
-const GeminiScrollbar = require('react-gemini-scrollbar');
 const Email = require('../../email');
 const AddThreepid = require('../../AddThreepid');
 const SdkConfig = require('../../SdkConfig');
@@ -1118,6 +1117,7 @@ module.exports = React.createClass({
         const ChangeAvatar = sdk.getComponent('settings.ChangeAvatar');
         const Notifications = sdk.getComponent("settings.Notifications");
         const EditableText = sdk.getComponent('elements.EditableText');
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
         const avatarUrl = (
             this.state.avatarUrl ? MatrixClientPeg.get().mxcUrlToHttp(this.state.avatarUrl) : null
@@ -1213,8 +1213,9 @@ module.exports = React.createClass({
                     onCancelClick={this.props.onClose}
                 />
 
-                <GeminiScrollbar className="mx_UserSettings_body"
-                                 autoshow={true}>
+                <GeminiScrollbarWrapper
+                    className="mx_UserSettings_body"
+                    autoshow={true}>
 
                 <h3>{ _t("Profile") }</h3>
 
@@ -1327,7 +1328,7 @@ module.exports = React.createClass({
 
                 { this._renderDeactivateAccount() }
 
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>
         );
     },
diff --git a/src/components/views/dialogs/UnknownDeviceDialog.js b/src/components/views/dialogs/UnknownDeviceDialog.js
index 26aa5d3ecb..07f8b6187f 100644
--- a/src/components/views/dialogs/UnknownDeviceDialog.js
+++ b/src/components/views/dialogs/UnknownDeviceDialog.js
@@ -146,6 +146,7 @@ export default React.createClass({
     },
 
     render: function() {
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         if (this.props.devices === null) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return <Spinner />;
@@ -191,7 +192,7 @@ export default React.createClass({
                 title={_t('Room contains unknown devices')}
                 contentId='mx_Dialog_content'
             >
-                <GeminiScrollbar autoshow={false} className="mx_Dialog_content" id='mx_Dialog_content'>
+                <GeminiScrollbarWrapper autoshow={false} className="mx_Dialog_content" id='mx_Dialog_content'>
                     <h4>
                         { _t('"%(RoomName)s" contains devices that you haven\'t seen before.', {RoomName: this.props.room.name}) }
                     </h4>
@@ -199,7 +200,7 @@ export default React.createClass({
                     { _t("Unknown devices") }:
 
                     <UnknownDeviceList devices={this.props.devices} />
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
                 <DialogButtons primaryButton={sendButtonLabel}
                     onPrimaryButtonClick={sendButtonOnClick}
                     onCancel={this._onDismissClicked} />
diff --git a/src/components/views/elements/GeminiScrollbarWrapper.js b/src/components/views/elements/GeminiScrollbarWrapper.js
new file mode 100644
index 0000000000..1de82bebc2
--- /dev/null
+++ b/src/components/views/elements/GeminiScrollbarWrapper.js
@@ -0,0 +1,36 @@
+/*
+Copyright 2018 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import GeminiScrollbar from 'react-gemini-scrollbar';
+
+class GeminiScrollbarWrapper extends React.Component {
+    render() {
+        // Enable forceGemini so that gemini is always enabled. This is
+        // to avoid future issues where a feature is implemented without
+        // doing QA on every OS/browser combination.
+        //
+        // By default GeminiScrollbar allows native scrollbars to be used
+        // on macOS. Use forceGemini to enable Gemini's non-native
+        // scrollbars on all OSs.
+        return <GeminiScrollbar forceGemini={true} {...this.props}>
+            { this.props.children }
+        </GeminiScrollbar>;
+    }
+}
+
+export default GeminiScrollbarWrapper;
+
diff --git a/src/components/views/groups/GroupMemberInfo.js b/src/components/views/groups/GroupMemberInfo.js
index 097fb1f7db..4970a26e5b 100644
--- a/src/components/views/groups/GroupMemberInfo.js
+++ b/src/components/views/groups/GroupMemberInfo.js
@@ -25,7 +25,6 @@ import { _t } from '../../../languageHandler';
 import { GroupMemberType } from '../../../groups';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
 import AccessibleButton from '../elements/AccessibleButton';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 
 module.exports = React.createClass({
     displayName: 'GroupMemberInfo',
@@ -180,9 +179,10 @@ module.exports = React.createClass({
         );
 
         const EmojiText = sdk.getComponent('elements.EmojiText');
+        const GeminiScrollbarWrapper = sdk.getComponent('elements.GeminiScrollbarWrapper');
         return (
             <div className="mx_MemberInfo">
-                <GeminiScrollbar autoshow={true}>
+                <GeminiScrollbarWrapper autoshow={true}>
                     <AccessibleButton className="mx_MemberInfo_cancel"onClick={this._onCancel}>
                         <img src="img/cancel.svg" width="18" height="18" className="mx_filterFlipColor" />
                     </AccessibleButton>
@@ -199,7 +199,7 @@ module.exports = React.createClass({
                     </div>
 
                     { adminTools }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>
         );
     },
diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js
index 71c168f5e6..17a91d83fa 100644
--- a/src/components/views/groups/GroupMemberList.js
+++ b/src/components/views/groups/GroupMemberList.js
@@ -18,7 +18,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import PropTypes from 'prop-types';
 
 const INITIAL_LOAD_NUM_MEMBERS = 30;
@@ -134,6 +133,7 @@ export default React.createClass({
     },
 
     render: function() {
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         if (this.state.fetching || this.state.fetchingInvitedMembers) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return (<div className="mx_MemberList">
@@ -162,10 +162,10 @@ export default React.createClass({
         return (
             <div className="mx_MemberList">
                 { inputBox }
-                <GeminiScrollbar autoshow={true} className="mx_MemberList_outerWrapper">
+                <GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_outerWrapper">
                     { joined }
                     { invited }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>
         );
     },
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index fa4ed89ae0..2d2b4e655c 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -22,7 +22,6 @@ import Modal from '../../../Modal';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 
 module.exports = React.createClass({
     displayName: 'GroupRoomInfo',
@@ -157,6 +156,7 @@ module.exports = React.createClass({
         const EmojiText = sdk.getComponent('elements.EmojiText');
         const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const InlineSpinner = sdk.getComponent('elements.InlineSpinner');
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         if (this.state.groupRoomRemoveLoading || !this.state.groupRoom) {
             const Spinner = sdk.getComponent("elements.Spinner");
             return <div className="mx_MemberInfo">
@@ -216,7 +216,7 @@ module.exports = React.createClass({
         const avatar = <BaseAvatar name={groupRoomName} width={36} height={36} url={avatarUrl} />;
         return (
             <div className="mx_MemberInfo">
-                <GeminiScrollbar autoshow={true}>
+                <GeminiScrollbarWrapper autoshow={true}>
                     <AccessibleButton className="mx_MemberInfo_cancel" onClick={this._onCancel}>
                         <img src="img/cancel.svg" width="18" height="18" className="mx_filterFlipColor" />
                     </AccessibleButton>
@@ -233,7 +233,7 @@ module.exports = React.createClass({
                     </div>
 
                     { adminTools }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>
         );
     },
diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js
index 189fa944e2..0515865c6b 100644
--- a/src/components/views/groups/GroupRoomList.js
+++ b/src/components/views/groups/GroupRoomList.js
@@ -17,7 +17,6 @@ import React from 'react';
 import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import GroupStoreCache from '../../../stores/GroupStoreCache';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import PropTypes from 'prop-types';
 
 const INITIAL_LOAD_NUM_ROOMS = 30;
@@ -120,16 +119,17 @@ export default React.createClass({
             </form>
         );
 
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         const TruncatedList = sdk.getComponent("elements.TruncatedList");
         return (
             <div className="mx_GroupRoomList">
                 { inputBox }
-                <GeminiScrollbar autoshow={true} className="mx_GroupRoomList_joined mx_GroupRoomList_outerWrapper">
+                <GeminiScrollbarWrapper autoshow={true} className="mx_GroupRoomList_joined mx_GroupRoomList_outerWrapper">
                     <TruncatedList className="mx_GroupRoomList_wrapper" truncateAt={this.state.truncateAt}
                             createOverflowElement={this._createOverflowTile}>
                         { this.makeGroupRoomTiles(this.state.searchQuery) }
                     </TruncatedList>
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>
         );
     },
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index c449ad2683..2789c0e4cd 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -39,7 +39,6 @@ import Unread from '../../../Unread';
 import { findReadReceiptFromUserId } from '../../../utils/Receipt';
 import withMatrixClient from '../../../wrappers/withMatrixClient';
 import AccessibleButton from '../elements/AccessibleButton';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import RoomViewStore from '../../../stores/RoomViewStore';
 import SdkConfig from '../../../SdkConfig';
 
@@ -897,11 +896,12 @@ module.exports = withMatrixClient(React.createClass({
             </div>;
         }
 
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
         const MemberAvatar = sdk.getComponent('avatars.MemberAvatar');
         const EmojiText = sdk.getComponent('elements.EmojiText');
         return (
             <div className="mx_MemberInfo">
-                <GeminiScrollbar autoshow={true}>
+                <GeminiScrollbarWrapper autoshow={true}>
                     <AccessibleButton className="mx_MemberInfo_cancel" onClick={this.onCancel}> <img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
                     <div className="mx_MemberInfo_avatar">
                         <MemberAvatar onClick={this.onMemberAvatarClick} member={this.props.member} width={48} height={48} />
@@ -925,7 +925,7 @@ module.exports = withMatrixClient(React.createClass({
                     { this._renderDevices() }
 
                     { spinner }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>
         );
     },
diff --git a/src/components/views/rooms/MemberList.js b/src/components/views/rooms/MemberList.js
index 620cfe33fc..3dfcd38cbd 100644
--- a/src/components/views/rooms/MemberList.js
+++ b/src/components/views/rooms/MemberList.js
@@ -21,7 +21,6 @@ import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const sdk = require('../../../index');
-const GeminiScrollbar = require('react-gemini-scrollbar');
 const rate_limited_func = require('../../../ratelimitedfunc');
 const CallHandler = require("../../../CallHandler");
 
@@ -395,6 +394,7 @@ module.exports = React.createClass({
 
     render: function() {
         const TruncatedList = sdk.getComponent("elements.TruncatedList");
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
         let invitedSection = null;
         if (this._getChildCountInvited() > 0) {
@@ -423,14 +423,14 @@ module.exports = React.createClass({
         return (
             <div className="mx_MemberList">
                 { inputBox }
-                <GeminiScrollbar autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper">
+                <GeminiScrollbarWrapper autoshow={true} className="mx_MemberList_joined mx_MemberList_outerWrapper">
                     <TruncatedList className="mx_MemberList_wrapper" truncateAt={this.state.truncateAtJoined}
                             createOverflowElement={this._createOverflowTileJoined}
                             getChildren={this._getChildrenJoined}
                             getChildCount={this._getChildCountJoined}
                     />
                     { invitedSection }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>
         );
     },
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index 6ccf04c5d8..ef1a3adc1d 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -20,7 +20,6 @@ const React = require("react");
 const ReactDOM = require("react-dom");
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
-const GeminiScrollbar = require('react-gemini-scrollbar');
 const MatrixClientPeg = require("../../../MatrixClientPeg");
 const CallHandler = require('../../../CallHandler');
 const dis = require("../../../dispatcher");
@@ -351,7 +350,7 @@ module.exports = React.createClass({
 
                 return Boolean(isRoomVisible[taggedRoom.roomId]);
             });
-            
+
             if (filteredRooms.length > 0 || tagName.match(STANDARD_TAGS_REGEX)) {
                 filteredLists[tagName] = filteredRooms;
             }
@@ -601,10 +600,11 @@ module.exports = React.createClass({
 
     render: function() {
         const RoomSubList = sdk.getComponent('structures.RoomSubList');
+        const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
 
         const self = this;
         return (
-            <GeminiScrollbar className="mx_RoomList_scrollbar"
+            <GeminiScrollbarWrapper className="mx_RoomList_scrollbar"
                  autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
             <div className="mx_RoomList">
                 <RoomSubList list={[]}
@@ -711,7 +711,7 @@ module.exports = React.createClass({
                              searchFilter={self.props.searchFilter}
                              onShowMoreRooms={self.onShowMoreRooms} />
             </div>
-            </GeminiScrollbar>
+            </GeminiScrollbarWrapper>
         );
     },
 });
diff --git a/src/components/views/rooms/SearchableEntityList.js b/src/components/views/rooms/SearchableEntityList.js
index ff75524a5d..321f365da7 100644
--- a/src/components/views/rooms/SearchableEntityList.js
+++ b/src/components/views/rooms/SearchableEntityList.js
@@ -19,7 +19,6 @@ const MatrixClientPeg = require("../../../MatrixClientPeg");
 const Modal = require("../../../Modal");
 const sdk = require("../../../index");
 import { _t } from '../../../languageHandler';
-const GeminiScrollbar = require('react-gemini-scrollbar');
 
 // A list capable of displaying entities which conform to the SearchableEntity
 // interface which is an object containing getJsx(): Jsx and matches(query: string): boolean
@@ -164,11 +163,12 @@ const SearchableEntityList = React.createClass({
                     </div>
                 );
             }
+            const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
             list = (
-                <GeminiScrollbar autoshow={true}
+                <GeminiScrollbarWrapper autoshow={true}
                                  className="mx_SearchableEntityList_listWrapper">
                     { list }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             );
         }
 

From 39e9d52c042521aa430bc6a66a517887b598a6d8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 21 Mar 2018 15:58:14 +0000
Subject: [PATCH 789/927] Make sure to proxy special prop `ref`

---
 src/components/structures/ScrollPanel.js        | 17 ++++++++++++++---
 .../views/elements/GeminiScrollbarWrapper.js    |  2 +-
 src/components/views/rooms/RoomList.js          |  9 +++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 722dc2251f..0fdbc9a349 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -19,6 +19,7 @@ const ReactDOM = require("react-dom");
 import PropTypes from 'prop-types';
 import Promise from 'bluebird';
 import { KeyCode } from '../../Keyboard';
+import sdk from '../../index.js';
 
 const DEBUG_SCROLL = false;
 // var DEBUG_SCROLL = true;
@@ -223,7 +224,7 @@ module.exports = React.createClass({
     onResize: function() {
         this.props.onResize();
         this.checkScroll();
-        this.refs.geminiPanel.forceUpdate();
+        if (this._gemScroll) this._gemScroll.forceUpdate();
     },
 
     // after an update to the contents of the panel, check that the scroll is
@@ -664,7 +665,17 @@ module.exports = React.createClass({
             throw new Error("ScrollPanel._getScrollNode called when unmounted");
         }
 
-        return this.refs.geminiPanel.scrollbar.getViewElement();
+        if (!this._gemScroll) {
+            // Likewise, we should have the ref by this point, but if not
+            // turn the NPE into something meaningful.
+            throw new Error("ScrollPanel._getScrollNode called before gemini ref collected");
+        }
+
+        return this._gemScroll.scrollbar.getViewElement();
+    },
+
+    _collectGeminiScroll: function(gemScroll) {
+        this._gemScroll = gemScroll;
     },
 
     render: function() {
@@ -672,7 +683,7 @@ module.exports = React.createClass({
         // TODO: the classnames on the div and ol could do with being updated to
         // reflect the fact that we don't necessarily contain a list of messages.
         // it's not obvious why we have a separate div and ol anyway.
-        return (<GeminiScrollbarWrapper autoshow={true} ref="geminiPanel"
+        return (<GeminiScrollbarWrapper autoshow={true} wrappedRef={this._collectGeminiScroll}
                 onScroll={this.onScroll} onResize={this.onResize}
                 className={this.props.className} style={this.props.style}>
                     <div className="mx_RoomView_messageListWrapper">
diff --git a/src/components/views/elements/GeminiScrollbarWrapper.js b/src/components/views/elements/GeminiScrollbarWrapper.js
index 1de82bebc2..c56ff67c9c 100644
--- a/src/components/views/elements/GeminiScrollbarWrapper.js
+++ b/src/components/views/elements/GeminiScrollbarWrapper.js
@@ -26,7 +26,7 @@ class GeminiScrollbarWrapper extends React.Component {
         // By default GeminiScrollbar allows native scrollbars to be used
         // on macOS. Use forceGemini to enable Gemini's non-native
         // scrollbars on all OSs.
-        return <GeminiScrollbar forceGemini={true} {...this.props}>
+        return <GeminiScrollbar ref={this.props.wrappedRef} forceGemini={true} {...this.props}>
             { this.props.children }
         </GeminiScrollbar>;
     }
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ef1a3adc1d..acf04831e8 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -507,7 +507,8 @@ module.exports = React.createClass({
     onShowMoreRooms: function() {
         // kick gemini in the balls to get it to wake up
         // XXX: uuuuuuugh.
-        this.refs.gemscroll.forceUpdate();
+        if (!this._gemScroll) return;
+        this._gemScroll.forceUpdate();
     },
 
     _getEmptyContent: function(section) {
@@ -598,6 +599,10 @@ module.exports = React.createClass({
         return ret;
     },
 
+    _collectGemini(gemScroll) {
+        this._gemScroll = gemScroll;
+    },
+
     render: function() {
         const RoomSubList = sdk.getComponent('structures.RoomSubList');
         const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
@@ -605,7 +610,7 @@ module.exports = React.createClass({
         const self = this;
         return (
             <GeminiScrollbarWrapper className="mx_RoomList_scrollbar"
-                 autoshow={true} onScroll={self._whenScrolling} ref="gemscroll">
+                autoshow={true} onScroll={self._whenScrolling} wrappedRef={this._collectGemini}>
             <div className="mx_RoomList">
                 <RoomSubList list={[]}
                              extraTiles={this._makeGroupInviteTiles()}

From 2ffcad0981cb2cb732f8640af91307a93c1c147d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 21 Mar 2018 16:00:50 +0000
Subject: [PATCH 790/927] Convert GeminiScrollbarWrapper to stateless component

---
 .../views/elements/GeminiScrollbarWrapper.js  | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/views/elements/GeminiScrollbarWrapper.js b/src/components/views/elements/GeminiScrollbarWrapper.js
index c56ff67c9c..445b1a2596 100644
--- a/src/components/views/elements/GeminiScrollbarWrapper.js
+++ b/src/components/views/elements/GeminiScrollbarWrapper.js
@@ -14,23 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React from 'react';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 
-class GeminiScrollbarWrapper extends React.Component {
-    render() {
-        // Enable forceGemini so that gemini is always enabled. This is
-        // to avoid future issues where a feature is implemented without
-        // doing QA on every OS/browser combination.
-        //
-        // By default GeminiScrollbar allows native scrollbars to be used
-        // on macOS. Use forceGemini to enable Gemini's non-native
-        // scrollbars on all OSs.
-        return <GeminiScrollbar ref={this.props.wrappedRef} forceGemini={true} {...this.props}>
-            { this.props.children }
-        </GeminiScrollbar>;
-    }
+function GeminiScrollbarWrapper(props) {
+    // Enable forceGemini so that gemini is always enabled. This is
+    // to avoid future issues where a feature is implemented without
+    // doing QA on every OS/browser combination.
+    //
+    // By default GeminiScrollbar allows native scrollbars to be used
+    // on macOS. Use forceGemini to enable Gemini's non-native
+    // scrollbars on all OSs.
+    return <GeminiScrollbar ref={props.wrappedRef} forceGemini={true} {...props}>
+        { props.children }
+    </GeminiScrollbar>;
 }
-
 export default GeminiScrollbarWrapper;
 

From 944940057eb25b9af4a1d1f5628e5251aa9efcb0 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 21 Mar 2018 17:23:19 +0000
Subject: [PATCH 791/927] Remember that React needs React

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

diff --git a/src/components/views/elements/GeminiScrollbarWrapper.js b/src/components/views/elements/GeminiScrollbarWrapper.js
index 445b1a2596..af801c0113 100644
--- a/src/components/views/elements/GeminiScrollbarWrapper.js
+++ b/src/components/views/elements/GeminiScrollbarWrapper.js
@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from 'react';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 
 function GeminiScrollbarWrapper(props) {

From ef4e446418bfcc81474d227ac934fdf4cb5f4bde Mon Sep 17 00:00:00 2001
From: riotimbuggggg <x__gramos@hotmail.com>
Date: Tue, 27 Mar 2018 11:27:37 +0000
Subject: [PATCH 792/927] Translated using Weblate (Albanian)

Currently translated at 11.8% (118 of 997 strings)

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

diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 896dd07363..3d8e6553ed 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -45,5 +45,76 @@
     "Sun": "Die",
     "Mon": "Hën",
     "Tue": "Mar",
-    "Wed": "Mër"
+    "Wed": "Mër",
+    "Thu": "Enj",
+    "Fri": "Pre",
+    "Sat": "Sht",
+    "%(weekDayName)s, %(monthName)s %(day)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(time)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s",
+    "%(weekDayName)s, %(monthName)s %(day)s %(fullYear)s %(time)s": "%(weekDayName)s, %(day)s %(monthName)s %(fullYear)s %(time)s",
+    "Who would you like to add to this community?": "Kë kishe dashur të shtosh në këtë komunitet?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Paralajmërim: se cili që e shton në një komunitet do t‘i doket se cilit që e di identifikatuesin e komunitetit",
+    "Invite new community members": "Fto anëtar të ri komuniteti",
+    "Name or matrix ID": "Emri apo identifikatuesi matrix-i",
+    "Invite to Community": "Fto në komunitet",
+    "Which rooms would you like to add to this community?": "Cilët dhoma kishe dashur t‘i shtosh në këtë komunitet?",
+    "Show these rooms to non-members on the community page and room list?": "A t‘i duken dhomat joanëtarëvë ne faqën komuniteti si dhe listën dhome?",
+    "Add rooms to the community": "Shto dhoma komunitetit",
+    "Add to community": "Shto në komunitet",
+    "Jan": "Jan",
+    "Feb": "Shk",
+    "Mar": "Mar",
+    "Apr": "Pri",
+    "May": "Maj",
+    "Jun": "Qer",
+    "Jul": "Kor",
+    "Aug": "Gus",
+    "Sep": "Sht",
+    "Oct": "Tet",
+    "Nov": "Nën",
+    "Dec": "Dhj",
+    "%(weekDayName)s %(time)s": "%(weekDayName)s %(time)s",
+    "Failed to invite the following users to %(groupId)s:": "Ky përdorues vijues nuk mundi të ftohet në %(groupId)s:",
+    "Failed to invite users to community": "Përdoruesit nuk mundën të ftohën",
+    "Failed to invite users to %(groupId)s": "Nuk mundën të ftohën përdoruesit në %(groupId)s",
+    "Failed to add the following rooms to %(groupId)s:": "Nuk mundën të shtohen dhomat vijuese në %(groupId)s:",
+    "Unnamed Room": "Dhomë paemër",
+    "Riot does not have permission to send you notifications - please check your browser settings": "Riot nuk ka lejim të të dergojë lajmërime - të lutem kontrollo rregullimet e kërkuesit ueb tëndë",
+    "Riot was not given permission to send notifications - please try again": "Riot-it nuk i është dhënë leje të dërgojë lajmërime - të lutëm përpjeku serish",
+    "Unable to enable Notifications": "Lajmërimet nuk mundën të lëshohen",
+    "This email address was not found": "Kjo adresë e-mail-i nuk është gjetur",
+    "Your email address does not appear to be associated with a Matrix ID on this Homeserver.": "Adresa e-mail-i yt nuk duket së është lidhur më një indentifikatues matrix në këtë server shtëpiak.",
+    "Default": "Standardi",
+    "Restricted": "Kufizuar",
+    "Moderator": "Moderator",
+    "Admin": "Administrator",
+    "Start a chat": "Fillo bisedë",
+    "Who would you like to communicate with?": "Me kë kishe dashur të bisedosh?",
+    "Email, name or matrix ID": "E-mail-i, emri apo identifikatuesi matrix",
+    "Start Chat": "Fillo bisedë",
+    "Invite new room members": "Fto anëtar dhome të rinjë",
+    "Who would you like to add to this room?": "Kë kishe dashur të shtosh në këtë dhomë?",
+    "Send Invites": "Dërgo ftesa",
+    "Failed to invite user": "Përdoruesi nuk mundi të ftohej",
+    "Operation failed": "Veprimi dështoi",
+    "Failed to invite": "Nuk mundi të ftohet",
+    "Failed to invite the following users to the %(roomName)s room:": "Përdoruesit vijuesë nuk mundën të ftohen në dhomën %(roomName)s:",
+    "You need to be logged in.": "Duhesh të jesh i lajmëruar.",
+    "You need to be able to invite users to do that.": "Duhesh të kesh aftësinë të ftosh përdorues për të bërë këtë.",
+    "Unable to create widget.": "Widget-i nuk mundi të krijohet.",
+    "Failed to send request.": "Lutja nuk mundi të dërgohej.",
+    "This room is not recognised.": "Kjo dhomë nuk është e njohur.",
+    "Power level must be positive integer.": "Niveli fuqie duhet të jetë numër i plotë pozitiv.",
+    "You are not in this room.": "Ti nuk je në këtë dhomë.",
+    "You do not have permission to do that in this room.": "Nuk ke leje të bësh këtë në këtë dhomë.",
+    "Must be viewing a room": "Duhet të shikohet një dhomë",
+    "Room %(roomId)s not visible": "Dhoma %(roomId)s e padukshme",
+    "Failed to lookup current room": "Dhoma aktuale nuk mundi të kërkohej",
+    "Usage": "Përdorimi",
+    "/ddg is not a command": "/ddg s'është komandë",
+    "To use it, just wait for autocomplete results to load and tab through them.": "Për të përdorur, thjesht prit derisa të mbushën rezultatat vetëplotësuese dhe pastaj shfletoji.",
+    "Unrecognised room alias:": "Emri i dhomës të panjohur:",
+    "Ignored user": "Përdoruesë të shpërfillur",
+    "You are now ignoring %(userId)s": "Tash %(userId)s shpërfillet prej teje",
+    "Unignored user": "Përdorues jo më i shpërfillur"
 }

From 3131d14b644844612e7f65c9daa1282a4f48fde0 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 26 Mar 2018 16:01:22 +0000
Subject: [PATCH 793/927] Translated using Weblate (Basque)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index b2954e3c13..d8f81f653d 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -701,12 +701,12 @@
     "Disable Emoji suggestions while typing": "Desgaitu Emoji proposamenak idaztean",
     "Banned by %(displayName)s": "%(displayName)s erabiltzaileak debekatuta",
     "Message removed by %(userId)s": "%(userId)s erabiltzaileak kendu du mezua",
-    "To send messages, you must be a": "Mezuak bidaltzeko hau izan behar zara:",
-    "To invite users into the room, you must be a": "Erabiltzaileak gonbidatzeko hau izan behar zara:",
-    "To configure the room, you must be a": "Gela konfiguratzeko hau izan behar zara:",
-    "To kick users, you must be a": "Erabiltzaileak kanporatzeko hau izan behar zara:",
-    "To ban users, you must be a": "Erabiltzaileak debekatzeko hau izan behar zara:",
-    "To remove other users' messages, you must be a": "Beste erabiltzaileen mezuak kentzeko hau izan behar zara:",
+    "To send messages, you must be a": "Mezuak bidaltzeko:",
+    "To invite users into the room, you must be a": "Erabiltzaileak gonbidatzeko:",
+    "To configure the room, you must be a": "Gela konfiguratzeko:",
+    "To kick users, you must be a": "Erabiltzaileak kanporatzeko:",
+    "To ban users, you must be a": "Erabiltzaileak debekatzeko:",
+    "To remove other users' messages, you must be a": "Beste erabiltzaileen mezuak kentzeko:",
     "Unpin Message": "Desfinkatu mezua",
     "Add rooms to this community": "Gehitu gelak komunitate honetara",
     "Call Failed": "Deiak huts egin du",
@@ -791,7 +791,7 @@
     "Members only (since the point in time of selecting this option)": "Kideek besterik ez (aukera hau hautatzen den unetik)",
     "Members only (since they were invited)": "Kideek besterik ez (gonbidatu zaienetik)",
     "Members only (since they joined)": "Kideek besterik ez (elkartu zirenetik)",
-    "To send events of type <eventType/>, you must be a": "<eventType/> motako gertaerak bidaltzeko, hau izan behar zara:",
+    "To send events of type <eventType/>, you must be a": "<eventType/> motako gertaerak bidaltzeko:",
     "Addresses": "Helbideak",
     "Invalid community ID": "Komunitate ID baliogabea",
     "'%(groupId)s' is not a valid community ID": "%(groupId)s ez da baliozko komunitate ID bat",

From 5bd852ee8f0228402d523563e419e025307e9780 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Mon, 26 Mar 2018 15:10:50 +0000
Subject: [PATCH 794/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 2e65ba3e12..d8e13c9ae3 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -998,5 +998,5 @@
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
     "Submit debug logs": "Hibakeresési napló küldése",
     "Opens the Developer Tools dialog": "Megnyitja a fejlesztői eszközök ablakát",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Látta: %(displayName)s (%(userName)s) az alábbi időpontban: %(dateTime)s"
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) az alábbi időpontban látta: %(dateTime)s"
 }

From 99d038d753e593132d3a7fdffe905b2c89b2c015 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Tue, 27 Mar 2018 12:58:54 +0000
Subject: [PATCH 795/927] Translated using Weblate (Italian)

Currently translated at 99.4% (992 of 997 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 86c518c8aa..5bcd2114f1 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -171,7 +171,7 @@
     "Unrecognised room alias:": "Alias della stanza non riconosciuto:",
     "Ignored user": "Utente ignorato",
     "You are now ignoring %(userId)s": "Ora stai ignorando %(userId)s",
-    "Unignored user": "Utente ripreso in considerazione",
+    "Unignored user": "Utente non più ignorato",
     "You are no longer ignoring %(userId)s": "Non stai più ignorando %(userId)s",
     "Unknown (user, device) pair:": "Coppia (utente, dispositivo) sconosciuta:",
     "Device already verified!": "Dispositivo già verificato!",
@@ -333,7 +333,7 @@
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Non potrai annullare questa modifica dato che stai promuovendo l'utente al tuo stesso grado.",
     "No devices with registered encryption keys": "Nessun dispositivo con chiavi di cifratura registrate",
     "Devices": "Dispositivi",
-    "Unignore": "Togli ignora",
+    "Unignore": "Non ignorare più",
     "Ignore": "Ignora",
     "Mention": "Cita",
     "Invite": "Invita",
@@ -387,7 +387,7 @@
     "Pinned Messages": "Messaggi ancorati",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
-    "%(duration)sh": "%(duration)sh",
+    "%(duration)sh": "%(duration)so",
     "%(duration)sd": "%(duration)sg",
     "Online for %(duration)s": "Online per %(duration)s",
     "Idle for %(duration)s": "Inattivo per %(duration)s",
@@ -409,7 +409,7 @@
     "Remove avatar": "Rimuovi avatar",
     "Forget room": "Dimentica la stanza",
     "Show panel": "Mostra il pannello",
-    "Drop here to favourite": "Trascina qui per i preferiti",
+    "Drop here to favourite": "Trascina qui per preferire",
     "Drop here to tag direct chat": "Trascina qui per taggare chat diretta",
     "Drop here to restore": "Trascina qui per ripristinare",
     "Drop here to demote": "Trascina qui per declassare",
@@ -665,7 +665,7 @@
     "%(items)s and %(lastItem)s": "%(items)s e %(lastItem)s",
     "collapse": "richiudi",
     "expand": "espandi",
-    "Custom of %(powerLevel)s": "Personalizzato di %(powerLevel)s",
+    "Custom of %(powerLevel)s": "%(powerLevel)s personalizzato",
     "Custom level": "Livello personalizzato",
     "<a>In reply to</a> <pill>": "<a>In risposta a</a> <pill>",
     "And %(count)s more...|other": "E altri %(count)s ...",
@@ -683,7 +683,7 @@
     "Click on the button below to start chatting!": "Clicca sul pulsante sotto per iniziare a chattare!",
     "Start Chatting": "Inizia a chattare",
     "Confirm Removal": "Conferma la rimozione",
-    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Sei sicuro di volere rimuovere (eliminare) questo evento? Nota che se elimini il nome di una stanza o modifica di un argomento, potrebbe annullare la modifica.",
+    "Are you sure you wish to remove (delete) this event? Note that if you delete a room name or topic change, it could undo the change.": "Sei sicuro di volere rimuovere (eliminare) questo evento? Nota che se elimini il nome di una stanza o la modifica di un argomento, potrebbe annullare la modifica.",
     "Community IDs cannot not be empty.": "Gli ID della comunità non possono essere vuoti.",
     "Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Gli ID della comunità devono contenere solo caratteri a-z, 0-9, or '=_-./'",
     "Something went wrong whilst creating your community": "Qualcosa è andato storto nella creazione della tua comunità",
@@ -799,7 +799,7 @@
     "Failed to leave room": "Uscita dalla stanza fallita",
     "Signed Out": "Disconnesso",
     "For security, this session has been signed out. Please sign in again.": "Per sicurezza questa sessione è stata disconnessa. Accedi di nuovo.",
-    "Old cryptography data detected": "Rilevati dati di crittografia obsoleti",
+    "Old cryptography data detected": "Rilevati dati di cifratura obsoleti",
     "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Sono stati rilevati dati da una vecchia versione di Riot. Ciò avrà causato malfunzionamenti della crittografia end-to-end nella vecchia versione. I messaggi cifrati end-to-end scambiati di recente usando la vecchia versione potrebbero essere indecifrabili in questa versione. Anche i messaggi scambiati con questa versione possono fallire. Se riscontri problemi, disconnettiti e riaccedi. Per conservare la cronologia, esporta e re-importa le tue chiavi.",
     "Logout": "Disconnetti",
     "Your Communities": "Le tue comunità",
@@ -930,5 +930,65 @@
     "Upload an avatar:": "Invia un avatar:",
     "This server does not support authentication with a phone number.": "Questo server non supporta l'autenticazione tramite numero di telefono.",
     "Missing password.": "Password mancante.",
-    "Passwords don't match.": "Le password non coincidono."
+    "Passwords don't match.": "Le password non coincidono.",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto da %(displayName)s (%(userName)s) alle %(dateTime)s",
+    "Password too short (min %(MIN_PASSWORD_LENGTH)s).": "Password troppo corta (min %(MIN_PASSWORD_LENGTH)s).",
+    "This doesn't look like a valid email address.": "Questo non sembra un indirizzo email valido.",
+    "This doesn't look like a valid phone number.": "Questo non sembra un numero di telefono valido.",
+    "You need to enter a user name.": "Devi inserire un nome utente.",
+    "An unknown error occurred.": "Si è verificato un errore sconosciuto.",
+    "I already have an account": "Ho già un account",
+    "Displays action": "Mostra l'azione",
+    "Bans user with given id": "Bandisce l'utente per ID",
+    "Unbans user with given id": "Toglie il ban di un utente per ID",
+    "Define the power level of a user": "Definisce il livello di poteri di un utente",
+    "Deops user with given id": "Toglie privilegi all'utente per ID",
+    "Invites user with given id to current room": "Invita l'utente per ID alla stanza attuale",
+    "Joins room with given alias": "Entra nella stanza con l'alias definito",
+    "Sets the room topic": "Imposta l'argomento della stanza",
+    "Kicks user with given id": "Caccia un utente per ID",
+    "Changes your display nickname": "Modifica il tuo nick visualizzato",
+    "Searches DuckDuckGo for results": "Cerca risultati su DuckDuckGo",
+    "Changes colour scheme of current room": "Cambia lo schema di colori della stanza attuale",
+    "Verifies a user, device, and pubkey tuple": "Verifica una tupla di utente, dispositivo e chiave pubblica",
+    "Ignores a user, hiding their messages from you": "Ignora un utente, non mostrandoti i suoi messaggi",
+    "Stops ignoring a user, showing their messages going forward": "Smetti di ignorare un utente, mostrando i suoi messaggi successivi",
+    "Opens the Developer Tools dialog": "Apre la finestra di strumenti per sviluppatori",
+    "Commands": "Comandi",
+    "Results from DuckDuckGo": "Risultati da DuckDuckGo",
+    "Emoji": "Emoji",
+    "Notify the whole room": "Notifica l'intera stanza",
+    "Room Notification": "Notifica della stanza",
+    "Users": "Utenti",
+    "unknown device": "dispositivo sconosciuto",
+    "NOT verified": "NON verificato",
+    "verified": "verificato",
+    "Verification": "Verifica",
+    "Ed25519 fingerprint": "Impronta ed25519",
+    "User ID": "ID utente",
+    "Curve25519 identity key": "Chiave di identità curve25519",
+    "none": "nessuno",
+    "Claimed Ed25519 fingerprint key": "Chiave di impronta ed25519 dichiarata",
+    "unencrypted": "non criptato",
+    "Decryption error": "Errore di decifrazione",
+    "Session ID": "ID sessione",
+    "End-to-end encryption information": "Informazioni di cifratura end-to-end",
+    "Event information": "Informazioni evento",
+    "Sender device information": "Informazioni dispositivo mittente",
+    "Passphrases must match": "Le password devono coincidere",
+    "Passphrase must not be empty": "La password non può essere vuota",
+    "Export room keys": "Esporta chiavi della stanza",
+    "This process allows you to export the keys for messages you have received in encrypted rooms to a local file. You will then be able to import the file into another Matrix client in the future, so that client will also be able to decrypt these messages.": "Questa procedura ti permette di esportare in un file locale le chiavi per i messaggi che hai ricevuto nelle stanze criptate. Potrai poi importare il file in un altro client Matrix in futuro, in modo che anche quel client possa decifrare quei messaggi.",
+    "The exported file will allow anyone who can read it to decrypt any encrypted messages that you can see, so you should be careful to keep it secure. To help with this, you should enter a passphrase below, which will be used to encrypt the exported data. It will only be possible to import the data by using the same passphrase.": "Il file esportato permetterà a chiunque possa leggerlo di decifrare tutti i messaggi criptati che vedi, quindi dovresti conservarlo in modo sicuro. Per aiutarti, potresti inserire una password sotto, che verrà usata per criptare i dati esportati. Sarà possibile importare i dati solo usando la stessa password.",
+    "Enter passphrase": "Inserisci password",
+    "Confirm passphrase": "Conferma password",
+    "Export": "Esporta",
+    "Import room keys": "Importa chiavi della stanza",
+    "This process allows you to import encryption keys that you had previously exported from another Matrix client. You will then be able to decrypt any messages that the other client could decrypt.": "Questa procedura ti permette di importare le chiavi di cifratura precedentemente esportate da un altro client Matrix. Potrai poi decifrare tutti i messaggi che quel client poteva decifrare.",
+    "The export file will be protected with a passphrase. You should enter the passphrase here, to decrypt the file.": "Il file esportato sarà protetto da una password. Dovresti inserire la password qui, per decifrarlo.",
+    "File to import": "File da importare",
+    "Import": "Importa",
+    "Failed to set direct chat tag": "Impostazione etichetta chat diretta fallita",
+    "Failed to remove tag %(tagName)s from room": "Rimozione etichetta %(tagName)s dalla stanza fallita",
+    "Failed to add tag %(tagName)s to room": "Aggiunta etichetta %(tagName)s alla stanza fallita"
 }

From 7333349772cb9f033af08e91d22a0b2f898b2a68 Mon Sep 17 00:00:00 2001
From: Oskars <oskars@lanet.lv>
Date: Mon, 26 Mar 2018 22:19:23 +0000
Subject: [PATCH 796/927] Translated using Weblate (Latvian)

Currently translated at 100.0% (997 of 997 strings)

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

diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
index 3880e75fbb..8bb4d0a9bc 100644
--- a/src/i18n/strings/lv.json
+++ b/src/i18n/strings/lv.json
@@ -42,13 +42,13 @@
     "Attachment": "Pielikums",
     "Autoplay GIFs and videos": "Automātiski rādīt GIF animācijas un video",
     "%(senderName)s banned %(targetName)s.": "%(senderName)s liedza pieeju %(targetName)s.",
-    "Ban": "Liegt pieeju (nobanot, nobloķēt)",
-    "Banned users": "Lietotāji, kuriem ir liegta pieeja (banotie)",
+    "Ban": "Nobanot/liegt pieeju",
+    "Banned users": "Banotie/bloķētie lietotāji (kuriem liegta pieeja)",
     "Bans user with given id": "Bloķē (liedz pieeju) lietotāju pēc uzdotā ID (nobano)",
     "Blacklisted": "Melnajā sarakstā iekļautie",
     "Bug Report": "Paziņojums par kļūdu",
     "Bulk Options": "Grupveida darbību parametri",
-    "Call Timeout": "Zvana gaidīšanas noilgums",
+    "Call Timeout": "Savienojuma gaidīšanas noilgums",
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Neizdodas savienoties ar bāzes serveri. Pārbaudi tīkla savienojumu un pārliecinies, ka <a> bāzes servera SSL sertifikāts</a> ir uzticams, kā arī pārlūkā instalētie paplašinājumi nebloķē pieprasījumus.",
     "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or <a>enable unsafe scripts</a>.": "Neizdodas savienoties ar bāzes serveri izmantojot HTTP protokolu, kad Tava pārlūka adreses laukā norādīts HTTPS protokols. Tā vietā izmanto HTTPS vai <a>iespējo nedrošos skriptus</a>.",
     "Can't load user settings": "Neizdevās ielādēt lietotāja iestatījumus",
@@ -65,7 +65,7 @@
     "Clear Cache and Reload": "Iztīri kešatmiņu un pārlādē",
     "Clear Cache": "Iztīri kešatmiņu",
     "<a>Click here</a> to join the discussion!": "<a>Klikšķini šeit</a> lai pievienotos diskusijai!",
-    "Click here to fix": "Klikšķini šeit, lai izlabotu",
+    "Click here to fix": "Klikšķini šeit, lai salabotu",
     "Click to mute audio": "Klikšķini, lai audio skaņu izslēgtu",
     "Click to mute video": "Klikšķini, lai video skaņu izslēgtu",
     "click to reveal": "Klikšķini, lai atsegtu",
@@ -109,28 +109,28 @@
     "Devices": "Ierīces",
     "Devices will not yet be able to decrypt history from before they joined the room": "Ierīces nevarēs atšifrēt to ziņu vēsturi, kuras ir tikušas pievienotas, pirms ierīce pieslēdzās istabai",
     "Direct chats": "Tiešie čati",
-    "Disable Notifications": "Atspējot paziņojumus",
+    "Disable Notifications": "Izslēgt paziņojumus",
     "Disinvite": "Atsaukt",
     "Display name": "Attēlojamais vārds",
     "Displays action": "Parāda darbību",
     "Don't send typing notifications": "Nerādīt, kad es rakstu",
     "Download %(text)s": "Lejupielādēt tekstu: %(text)s",
     "Drop File Here": "Ievelc failu šeit",
-    "Drop here to tag %(section)s": "Nomest šeit, lai birkotu %(section)s",
+    "Drop here to tag %(section)s": "Atvilkt uz šejieni (nomest šeit), lai birkotu %(section)s",
     "Ed25519 fingerprint": "Ed25519 nospiedums (fingerprint), zīmju virkne",
     "Email": "Epasts",
     "Email address": "Epasta adrese",
     "Email address (optional)": "Epasta adrese (neobligāta)",
     "Email, name or matrix ID": "Epasts, vārds vai Matrix identifikators (ID)",
     "Emoji": "Emocīši (emoji)",
-    "Enable encryption": "Iespējot šifrēšanu",
-    "Enable Notifications": "Iespējot paziņojumus",
+    "Enable encryption": "Ieslēgt šifrēšanu",
+    "Enable Notifications": "Ieslēgt paziņojumus",
     "Encrypted by a verified device": "Šifrēts ar verificētu ierīci",
     "Encrypted by an unverified device": "Šifrēts ar neverificētu ierīci",
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "Šifrētas ziņas nebūs redzamas tajās klienta programmās, kuras neatbalsta šifrēšanu",
     "Encrypted room": "Šifrēta istaba",
-    "Encryption is enabled in this room": "Šajā istabā ir iespējota šifrēšana",
-    "Encryption is not enabled in this room": "Šajā istabā nav iespējota šifrēšana",
+    "Encryption is enabled in this room": "Šajā istabā šifrēšana ir ieslēgta",
+    "Encryption is not enabled in this room": "Šajā istabā šifrēšana ir izslēgta",
     "%(senderName)s ended the call.": "%(senderName)s beidza zvanu.",
     "End-to-end encryption information": "\"End-to-End\" (ierīce-ierīce) šifrēšanas informācija",
     "End-to-end encryption is in beta and may not be reliable": "\"End-to-end\" (ierīce-ierīce) šifrēšana šobrīd ir beta stadijā, un var nebūt stabila",
@@ -143,15 +143,15 @@
     "Existing Call": "Pašreizējā saruna (zvans)",
     "Export": "Eksportēt",
     "Export E2E room keys": "Eksportēt E2E istabas atslēgas",
-    "Failed to ban user": "Neizdevās bloķēt (liegt pieeju) lietotāju",
+    "Failed to ban user": "Neizdevās nobanot/bloķēt (liegt pieeju) lietotāju",
     "Failed to change password. Is your password correct?": "Neizdevās nomainīt paroli. Vai tā ir pareiza?",
-    "Failed to change power level": "Neizdevās mainīt statusa līmeni",
+    "Failed to change power level": "Neizdevās nomainīt statusa līmeni",
     "Power level must be positive integer.": "Statusa līmenim ir jābūt pozitīvam skaitlim.",
     "You will not be able to undo this change as you are promoting the user to have the same power level as yourself.": "Tu nevarēsi atcelt šo darbību, jo šim lietotājam piešķir tādu pašu statusa līmeni, kāds ir Tev.",
     "Failed to fetch avatar URL": "Neizdevās noteikt avatara URL adresi",
     "Failed to forget room %(errCode)s": "Neizdevās \"aizmirst\" istabu %(errCode)s",
     "Failed to join room": "Neizdevās pievienoties istabai",
-    "Failed to kick": "Neizdevās veikt \"kick\" darbību",
+    "Failed to kick": "Neizdevās izspert/padzīt (kick)",
     "Failed to leave room": "Neizdevās pamest istabu",
     "Failed to load timeline position": "Neizdevās ielādēt laikpaziņojumu pozīciju",
     "Failed to lookup current room": "Neizdevās uziet pašreizējo istabu",
@@ -161,16 +161,16 @@
     "Failed to save settings": "Neizdevās saglabāt uzstādījumus",
     "Failed to send email": "Neizdevās nosūtīt epastu",
     "Failed to send request.": "Neizdevās nosūtīt pieprasījumu.",
-    "Failed to set avatar.": "Neizdevās iestatīt profila attēlu.",
+    "Failed to set avatar.": "Neizdevās iestatīt avataru (profila attēlu).",
     "Failed to set display name": "Neizdevās iestatīt redzamo vārdu",
     "Failed to set up conference call": "Neizdevās iestatīt konferences zvanu",
-    "Failed to toggle moderator status": "Neizdevās pārslēgt moderatora statusu",
-    "Failed to unban": "Neizdevās atcelt pieejas liegumu (atbanot)",
+    "Failed to toggle moderator status": "Neizdevās nomainīt moderatora statusu",
+    "Failed to unban": "Neizdevās atbanot/atbloķēt (atcelt pieejas liegumu)",
     "Failed to upload file": "Neizdevās augšupielādēt failu",
     "Failed to upload profile picture!": "Neizdevās augšuplādēt profila attēlu!",
     "Failed to verify email address: make sure you clicked the link in the email": "Neizdevās apstiprināt epasta adresi. Pārbaudi, vai Tu esi noklikšķinājis/usi saiti epasta ziņā",
     "Failure to create room": "Neizdevās izveidot istabu",
-    "Favourite": "Favorīti (Tava izlase)",
+    "Favourite": "Favorīti (izlase)",
     "Favourites": "Favorīti",
     "Fill screen": "Aizpildīt ekrānu",
     "Filter room members": "Filtrēt istabas biedrus",
@@ -181,8 +181,8 @@
     "Found a bug?": "Pamanīji kļūdu?",
     "%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s no %(fromPowerLevel)s uz %(toPowerLevel)s",
     "Guest access is disabled on this Home Server.": "Šajā Bāzes serverī viesu pierakstīšanās nav iespējama.",
-    "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai pat ja ir uzaicināti.",
-    "Hangup": "Aizturēt",
+    "Guests cannot join this room even if explicitly invited.": "Viesi nevar pievienoties šai istabai, pat ja ir uzaicināti.",
+    "Hangup": "Beigt zvanu",
     "Hide read receipts": "Slēpt atzīmes par izlasīšanu",
     "Hide Text Formatting Toolbar": "Slēpt teksta formatēšanas rīkjoslu",
     "Historical": "Bijušie",
@@ -198,7 +198,7 @@
     "Incorrect username and/or password.": "Nepareizs lietotājvārds un/vai parole.",
     "Incorrect verification code": "Nepareizs verifikācijas kods",
     "Interface Language": "Saskarnes valoda",
-    "Invalid alias format": "Nepareizs aizstājējvārda (aliases) formāts",
+    "Invalid alias format": "Nepareizs aliases (aizstājējvārda) formāts",
     "Invalid address format": "Nepareizs adreses formāts",
     "Invalid Email Address": "Nepareiza epasta adrese",
     "Invalid file%(extra)s": "Nederīgs fails %(extra)s",
@@ -208,7 +208,7 @@
     "Invites": "Uzaicinājumi",
     "Invites user with given id to current room": "Uzaicina lietotāju ar norādīto id uz pašreizējo istabu",
     "'%(alias)s' is not a valid format for an address": "'%(alias)s' nav pareizā adreses formātā",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' nav pareizā aizstājējvārda formātā",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' nav pareizā aliases (aizstājējvārda) formātā",
     "%(displayName)s is typing": "%(displayName)s šobrīd raksta",
     "Sign in with": "Pierakstīties ar",
     "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Pievienoties kā <voiceText>AUDIO</voiceText> vai <videoText>VIDEO</videoText>.",
@@ -217,26 +217,26 @@
     "Joins room with given alias": "Pievienojas istabai ar minēto aliasi (pseidonīmu)",
     "Jump to first unread message.": "Pāriet uz pirmo neizlasīto ziņu.",
     "%(senderName)s kicked %(targetName)s.": "%(senderName)s iespēra (kick) %(targetName)s.",
-    "Kick": "Iespert (kick)",
+    "Kick": "Izspert/padzīt no istabas (kick)",
     "Kicks user with given id": "Padzen (kick) lietotāju ar norādīto Id",
     "Labs": "Izmēģinājumu lauciņš",
     "Last seen": "Pēdējo reizi redzēts/a",
     "Leave room": "Doties prom no istabas",
-    "%(targetName)s left the room.": "%(targetName)s atstāja istabu.",
+    "%(targetName)s left the room.": "%(targetName)s devās prom no istabas.",
     "Level:": "Līmenis:",
     "Local addresses for this room:": "Šīs istabas lokālās adreses:",
     "Logged in as:": "Pierakstījās kā:",
     "Login as guest": "Pierakstīties kā viesim",
     "Logout": "Izrakstīties",
     "Low priority": "Zemas prioritātes",
-    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
-    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
-    "%(senderName)s made future room history visible to all room members.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
-    "%(senderName)s made future room history visible to anyone.": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
-    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s uzstādīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
+    "%(senderName)s made future room history visible to all room members, from the point they are invited.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem no brīža, kad tie tika uzaicināti.",
+    "%(senderName)s made future room history visible to all room members, from the point they joined.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem ar brīdi, kad tie pievienojās.",
+    "%(senderName)s made future room history visible to all room members.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu visiem istabas biedriem.",
+    "%(senderName)s made future room history visible to anyone.": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu ikvienam.",
+    "%(senderName)s made future room history visible to unknown (%(visibility)s).": "%(senderName)s padarīja istabas ziņu turpmāko vēsturi redzamu nepazīstamajiem (%(visibility)s).",
     "Manage Integrations": "Pārvaldīt integrācijas",
-    "Markdown is disabled": "Formatēšanas iespēja ir atslēgta",
-    "Markdown is enabled": "Formatēšanas iespēja ir iespējota",
+    "Markdown is disabled": "\"Markdown\" formatēšana izslēgta",
+    "Markdown is enabled": "\"Markdown\" formatēšana ieslēgta",
     "Turn Markdown off": "Izslēgt formatēšanas iespēju",
     "Turn Markdown on": "Ieslēgt formatēšanas iespēju",
     "matrix-react-sdk version:": "Matrix-react-sdk versija:",
@@ -248,7 +248,7 @@
     "Mobile phone number (optional)": "Mobilā telefona numurs (nav obligāts)",
     "Moderator": "Moderators",
     "Must be viewing a room": "Jāapskata istaba",
-    "Mute": "Noklusināt",
+    "Mute": "Noklusināt (izslēgt skaņu)",
     "%(serverName)s Matrix ID": "%(serverName)s Matrix Id",
     "Name": "Vārds",
     "Never send encrypted messages to unverified devices from this device": "Nekad nesūtīt no šīs ierīces šifrētas ziņas uz neverificētām ierīcēm",
@@ -268,8 +268,8 @@
     "No display name": "Nav publiski redzamā vārda",
     "No more results": "Nav tālāko rezultātu",
     "No results": "Nav rezultātu",
-    "No users have specific privileges in this room": "Nav lietotāju ar īpašām privilēģijām šajā istabā",
-    "OK": "Labs ir",
+    "No users have specific privileges in this room": "Šajā istabā nav lietotāju ar īpašām privilēģijām",
+    "OK": "Lai notiek",
     "olm version:": "Olm versija:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Tiklīdz istabai tiks iespējota šifrēšana, tā vairs nebūs atslēdzama (pašlaik)",
     "Only people who have been invited": "Vienīgi cilvēki, kuri uzaicināti",
@@ -299,7 +299,7 @@
     "Rejoin": "Pievienoties atkārtoti",
     "Remote addresses for this room:": "Attālinātā adrese šai istabai:",
     "Remove Contact Information?": "Dzēst kontaktinformāciju?",
-    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s dzēsa redzamo vārdu (%(oldDisplayName)s).",
+    "%(senderName)s removed their display name (%(oldDisplayName)s).": "%(senderName)s dzēsa attēlojamo/redzamo vārdu (%(oldDisplayName)s).",
     "%(senderName)s removed their profile picture.": "%(senderName)s dzēsa profila attēlu.",
     "Remove": "Dzēst",
     "Remove %(threePid)s?": "Dzēst %(threePid)s?",
@@ -323,11 +323,11 @@
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s nosūtīja attēlu.",
     "%(senderName)s sent an invitation to %(targetDisplayName)s to join the room.": "%(senderName)s nosūtīja uzaicinājumu %(targetDisplayName)s pievienoties istabai.",
     "%(senderName)s set a profile picture.": "%(senderName)s uzstādīja profila attēlu.",
-    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s uzstādīja redzamo vārdu uz: %(displayName)s.",
+    "%(senderName)s set their display name to %(displayName)s.": "%(senderName)s nomainīja attēlojamo/redzamo vārdu uz: %(displayName)s.",
     "The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "Tevis uzdotā pierakstīšanās atslēga sakrīt ar atslēgu, kuru Tu saņēmi no %(userId)s ierīces %(deviceId)s. Ierīce tika atzīmēta kā verificēta.",
     "The file '%(fileName)s' exceeds this home server's size limit for uploads": "Faila '%(fileName)s' izmērs pārsniedz šī Bāzes servera augšupielādes lieluma ierobežojumu",
     "The file '%(fileName)s' failed to upload": "Failu '%(fileName)s' neizdevās nosūtīt (augšuplādēt)",
-    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza ierīce-ierīce šifrēšanu (algorithm %(algorithm)s).",
+    "%(senderName)s turned on end-to-end encryption (algorithm %(algorithm)s).": "%(senderName)s ieslēdza \"end-to-end\" (ierīce-ierīce) šifrēšanu (algorithm %(algorithm)s).",
     "%(senderName)s unbanned %(targetName)s.": "%(senderName)s atcēla pieejas ierobežojumu (atbanoja) %(targetName)s.",
     "Unknown room %(roomId)s": "Nezināma istaba %(roomId)s",
     "Uploading %(filename)s and %(count)s others|zero": "Tiek augšuplādēts %(filename)s",
@@ -336,7 +336,7 @@
     "%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
     "Username invalid: %(errMessage)s": "Neatbilstošs lietotājvārds: %(errMessage)s",
     "(unknown failure: %(reason)s)": "(nezināma kļūda: %(reason)s)",
-    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "BRĪDINĀJUMS: NEIZDEVĀS VERIFICĒT ATSLĒGU! Pierakstīšanās atslēga priekš %(userId)s un ierīces %(deviceId)s ir \"%(fprint)s\", kura nesakrīt ar uzdoto atslēgu \"%(fingerprint)s\". Tas var nozīmēt, ka Tava saziņa var tikt pārtverta!",
+    "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "BRĪDINĀJUMS: NEIZDEVĀS VERIFICĒT ATSLĒGU! Pierakstīšanās atslēga priekš %(userId)s un ierīces %(deviceId)s ir \"%(fprint)s\", kura nesakrīt ar ievadīto atslēgu \"%(fingerprint)s\". Tas var nozīmēt, ka Tava saziņa var tikt pārtverta!",
     "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s atsauca %(targetName)s uzaicinājumu.",
     "You are trying to access %(roomName)s.": "Tu mēģini piekļūt %(roomName)s.",
     "You have been banned from %(roomName)s by %(userName)s.": "Tev ir liegta pieeja istabai %(roomName)s no %(userName)s.",
@@ -355,7 +355,7 @@
     "You are registering with %(SelectedTeamName)s": "Tu reģistrējies ar %(SelectedTeamName)s",
     "Image '%(Body)s' cannot be displayed.": "Attēlu '%(Body)s' nav iespējams parādīt.",
     "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Notiek Tevis novirzīšana uz ārēju trešās puses vietni. Tu vari atļaut savam kontam piekļuvi ar %(integrationsUrl)s. Vai vēlies turpināt?",
-    "Ongoing conference call%(supportedText)s.": "Ienākošs konferences zvans %(supportedText)s.",
+    "Ongoing conference call%(supportedText)s.": "Notiekošs konferences zvans %(supportedText)s.",
     "%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s dzēsa istabas avataru.",
     "%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s nomainīja istabas avataru %(roomName)s",
     "You added a new device '%(displayName)s', which is requesting encryption keys.": "Tu pievienoji jaunu ierīci '%(displayName)s', kas prasa šifrēšanas atslēgas.",
@@ -378,8 +378,8 @@
     "Server may be unavailable or overloaded": "Serveris ir nesasniedzams vai pārslogots",
     "Server may be unavailable, overloaded, or search timed out :(": "Serveris izskatās nesasniedzams, ir pārslogots, vai arī meklēšana beigusies ar savienojuma noildzi :(",
     "Server may be unavailable, overloaded, or the file too big": "Serveris ir nesasniedzams, ir pārslogots, vai arī faila izmērs ir par lielu",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Serveris ir nesasniedzams, ir pārslogots, vai arī esi uzdūries kļūdai programmā.",
-    "Server unavailable, overloaded, or something else went wrong.": "Serveris ir nesasniedzams, ir pārslogots, vai arī esi uzdūries kļūdai.",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Serveris ir nesasniedzams, pārslogots, vai arī esi uzdūries kļūdai programmā.",
+    "Server unavailable, overloaded, or something else went wrong.": "Serveris ir nesasniedzams, pārslogots, vai arī esi uzdūries kļūdai.",
     "Session ID": "Sesijas Id",
     "Settings": "Iestatījumi",
     "Show panel": "Rādīt paneli",
@@ -409,7 +409,7 @@
     "These are experimental features that may break in unexpected ways": "Šīs ir eksperimentālas funkcijas, kuras reizēm var novest pie pārsteidzošiem rezultātiem",
     "The visibility of existing history will be unchanged": "Esošās ziņu vēstures redzamība paliks nemainīga",
     "This doesn't appear to be a valid email address": "Šī neizskatās pēc derīgas epasta adreses",
-    "This is a preview of this room. Room interactions have been disabled": "Šis ir esošās istabas priekšskatījums. Istabas mijiedarbība ir atspējota",
+    "This is a preview of this room. Room interactions have been disabled": "Šis ir esošās istabas priekšskats. Istabas mijiedarbība ir atspējota",
     "This phone number is already in use": "Šis telefona numurs jau tiek izmantots",
     "This room": "šajā istabā",
     "This room is not accessible by remote Matrix servers": "Šī istaba nav pieejama no attālinātajiem Matrix serveriem",
@@ -422,8 +422,8 @@
     "Unable to add email address": "Nav iespējams pievienot epasta adresi",
     "Unable to remove contact information": "Nav iespējams dzēst kontaktinformāciju",
     "Unable to verify email address.": "Nav iespējams apstiprināt epasta adresi.",
-    "Unban": "Atbanot",
-    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Nav iespējams pārliecināties, ka šis uzaicinājums tika nosūtīts uz to pašu adresi, kura ir piesaistīta tavam kontam.",
+    "Unban": "Atbanot/atcelt pieejas liegumu",
+    "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Nav iespējams pārliecināties, ka šis uzaicinājums tika nosūtīts uz to pašu adresi, kura ir piesaistīta Tavam kontam.",
     "Unable to capture screen": "Neizdevās uzņemt ekrānattēlu",
     "Unable to load device list": "Nav iespējams ielādēt ierīču sarakstu",
     "Undecryptable": "Neatšifrējams",
@@ -447,7 +447,7 @@
     "Upload avatar": "Augšuplādēt avataru (profila attēlu)",
     "Upload Failed": "Augšupielāde (nosūtīšana) neizdevās",
     "Upload Files": "Augšuplādēt failus",
-    "Upload file": "Augšuplādē failu",
+    "Upload file": "Augšuplādēt failu",
     "Upload new:": "Augšuplādēt jaunu:",
     "Usage": "Lietojums",
     "Use compact timeline layout": "Izmanto kompaktu laikpaziņojumu skatu",
@@ -473,11 +473,11 @@
     "VoIP is unsupported": "VoIP netiek atbalstīts",
     "(could not connect media)": "(nav iespējams savienoties ar mediju)",
     "(no answer)": "(nav atbildes)",
-    "(warning: cannot be disabled again!)": "(brīdinājums: nav iespējams atspējot atkārtoti!)",
+    "(warning: cannot be disabled again!)": "(brīdinājums: to nebūs iespējams atslēgt!)",
     "Warning!": "Brīdinājums!",
     "Who can access this room?": "Kurš var piekļūt istabai?",
-    "Who can read history?": "Kurš var lasīt vēsturi?",
-    "Who would you like to add to this room?": "Kuru vēlies pievienot šai istabai?",
+    "Who can read history?": "Kas var lasīt vēsturi?",
+    "Who would you like to add to this room?": "Ko Tu vēlies pievienot šai istabai?",
     "Who would you like to communicate with?": "Ar kuru vēlies komunicēt?",
     "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Vai vēlies <acceptText>apstiprināt</acceptText> vai <declineText>noraidīt</declineText> šo uzaicinājumu?",
     "You already have existing direct chats with this user:": "Tev jau ir viens tiešais čats ar šo lietotāju:",
@@ -485,7 +485,7 @@
     "You're not in any rooms yet! Press <CreateRoomButton> to make a room or <RoomDirectoryButton> to browse the directory": "Šobrīd Tu vēl neatrodies nevienā istabā! Klikšķini <CreateRoomButton> lai izveidotu istabu, vai <RoomDirectoryButton>, lai skatītu istabu katalogu",
     "You cannot place a call with yourself.": "Nav iespējams piezvanīt sev.",
     "You cannot place VoIP calls in this browser.": "VoIP zvani šajā pārlūkā netiek atbalstīti.",
-    "You do not have permission to post to this room": "Tev nav vajadzīgās atļaujas pievienot ziņas šajā istabā",
+    "You do not have permission to post to this room": "Tev nav vajadzīgo atļauju, lai rakstītu ziņas šajā istabā",
     "You have <a>disabled</a> URL previews by default.": "URL priekšskats pēc noklusējuma Tev ir <a>atspējots</a>.",
     "You may wish to login with a different account, or add this email to this account.": "Tu varētu, iespējams, vēlēties pierakstīties no cita konta vai piesaistīt šo epastu šim kontam.",
     "You must <a>register</a> to use this functionality": "Lai izmantotu šo funkcionalitāti, Tev ir <a>jāreģistrējas</a>",
@@ -545,8 +545,8 @@
     "underline": "pasvītrots",
     "code": "kods",
     "quote": "citāts",
-    "bullet": "lode",
-    "numbullet": "numurēta lode",
+    "bullet": "bumbulis",
+    "numbullet": "numurēts bumbulis",
     "Please select the destination room for this message": "Lūdzu izvēlies šīs ziņas mērķa istabu",
     "Room directory": "Istabu katalogs",
     "Start chat": "Uzsākt čalošanu",
@@ -555,7 +555,7 @@
     "Desktop specific": "Darbvirsmai specifiskie",
     "Analytics": "Analītika",
     "Opt out of analytics": "Atteikties no analītikas",
-    "Options": "Iespējas",
+    "Options": "Opcijas/iestatījumi",
     "Riot collects anonymous analytics to allow us to improve the application.": "Riot ievāc anonīmus analītikas datus, lai varētu uzlabot aplikācijas darbību.",
     "Passphrases must match": "Paroles frāzēm ir jāsakrīt",
     "Passphrase must not be empty": "Paroles frāze nevar būt tukša",
@@ -683,7 +683,7 @@
     "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s dzēsa vidžetu %(widgetName)s",
     "Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robotu pārbaude šobrīd nav pieejama darbvirsmas versijā. Lūdzu izmanto <a>web pārlūku</a>",
     "Revoke widget access": "Atsaukt vidžeta piekļuvi",
-    "Unpin Message": "Atstiprināt ziņu",
+    "Unpin Message": "Atkabināt ziņu",
     "Add rooms to this community": "Pievienot istabas šai kopienai",
     "Failed to set direct chat tag": "Neizdevās tiešajam čatam uzstādīt birku",
     "Warning": "Brīdinājums",
@@ -725,52 +725,52 @@
     "Failed to invite users to %(groupId)s": "Neizdevās uzaicināt lietotājus grupā %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Neizdevās pievienot sekojošas istabas grupai %(groupId)s:",
     "Restricted": "Ierobežots",
-    "Ignored user": "Ignorējams lietotājs",
+    "Ignored user": "Ignorēts lietotājs",
     "You are now ignoring %(userId)s": "Tagad Tu ignorē %(userId)s",
-    "Unignored user": "Neignorējams lietotājs",
+    "Unignored user": "Atignorēts lietotājs",
     "You are no longer ignoring %(userId)s": "Tu vairāk neignorē %(userId)s",
-    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu attēlojamo vārdu uz %(displayName)s.",
+    "%(oldDisplayName)s changed their display name to %(displayName)s.": "%(oldDisplayName)s nomainīja savu attēlojamo/redzamo vārdu uz %(displayName)s.",
     "%(senderName)s changed the pinned messages for the room.": "%(senderName)s šai istabai nomainīja piestiprinātās ziņas.",
     "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s vidžets, kuru mainīja %(senderName)s",
     "%(names)s and %(count)s others are typing|other": "%(names)s un %(count)s citi raksta",
     "%(names)s and %(count)s others are typing|one": "%(names)s un vēl kāds raksta",
     "Message Replies": "Atbildes uz ziņām",
-    "Message Pinning": "Ziņu piestiprināšana",
+    "Message Pinning": "Ziņu piekabināšana",
     "Presence Management": "Klātesamības vadība",
     "Tag Panel": "Birku panelis",
     "Disable Emoji suggestions while typing": "Atspējot Emoji ieteikumus teksta rakstīšanas laikā",
     "Hide avatar changes": "Slēpt avatara izmaiņas",
-    "Hide display name changes": "Slēpt attēlojamā vārda izmaiņas",
+    "Hide display name changes": "Slēpt attēlojamā/redzamā vārda izmaiņas",
     "Disable big emoji in chat": "Atspējot čatā lielos emocīšus (emoji)",
     "Mirror local video feed": "Spoguļot vietējā video barotni",
     "Enable inline URL previews by default": "URL priekšskats pēc noklusējuma",
-    "Enable URL previews for this room (only affects you)": "URL priekšskatījumi šai istabai (ietekmē tikai Tevi pašu)",
-    "Enable URL previews by default for participants in this room": "URL priekšskatījumi pēc noklusējuma visiem šīs istabas dalībniekiem",
+    "Enable URL previews for this room (only affects you)": "URL priekšskati šai istabai (ietekmē tikai Tevi pašu)",
+    "Enable URL previews by default for participants in this room": "URL priekšskati pēc noklusējuma visiem šīs istabas dalībniekiem",
     "Delete %(count)s devices|other": "Dzēst %(count)s ierīces",
     "Delete %(count)s devices|one": "Dzēst ierīci",
     "Select devices": "Izvēlēties ierīces",
     "%(senderName)s sent an image": "%(senderName)s nosūtīja bildi",
     "%(senderName)s sent a video": "%(senderName)s nosūtīja video",
     "%(senderName)s uploaded a file": "%(senderName)s augšupielādēja failu",
-    "Disinvite this user?": "Atcelt ielūgumu šim lietotājam?",
-    "Kick this user?": "Padzīt šo lietotāju?",
-    "Unban this user?": "Atbloķēt šo lietotāju (atcelt liegumu šim lietotājam)?",
-    "Ban this user?": "Bloķēt šo lietotāju (uzlikt liegumu šim lietotājam)?",
+    "Disinvite this user?": "Atsaukt ielūgumu šim lietotājam?",
+    "Kick this user?": "Izspert/padzīt (kick) šo lietotāju?",
+    "Unban this user?": "Atbanot/atbloķēt šo lietotāju (atcelt liegumu šim lietotājam)?",
+    "Ban this user?": "Nobanot/bloķēt šo lietotāju (uzlikt liegumu šim lietotājam)?",
     "You will not be able to undo this change as you are demoting yourself, if you are the last privileged user in the room it will be impossible to regain privileges.": "Jūs nevarēsiet atcelt šīs izmaiņas pēc sava statusa pazemināšanas. Gadījumā, ja esat pēdējais priviliģētais lietotājs istabā, būs neiespējami atgūt šīs privilēģijas.",
     "Unignore": "Atcelt ignorēšanu",
     "Ignore": "Ignorēt",
     "Jump to read receipt": "Pāriet uz izlasīšanas apstiprinājumu",
-    "Mention": "Atsauce (pieminējums)",
+    "Mention": "Pieminējums/atsauce",
     "Invite": "Uzaicināt",
-    "User Options": "Lietotāja uzstādījumi",
-    "Send an encrypted reply…": "Sūtīt šifrētu atbildi…",
-    "Send a reply (unencrypted)…": "Sūtīt nešifrētu atbildi…",
+    "User Options": "Lietotāja uzstādījumi/opcijas",
+    "Send an encrypted reply…": "sūtīt šifrētu atbildi…",
+    "Send a reply (unencrypted)…": "sūtīt NEšifrētu atbildi…",
     "Send an encrypted message…": "rakstīt ziņu (šifrētu)…",
     "Send a message (unencrypted)…": "rakstīt ziņu (NEšifrētu)…",
     "Jump to message": "Pāriet uz ziņu",
-    "No pinned messages.": "Nav piestiprinātu ziņu.",
+    "No pinned messages.": "Nav piekabinātu ziņu.",
     "Loading...": "Ielāde...",
-    "Pinned Messages": "Piestiprinātās ziņas",
+    "Pinned Messages": "Piekabinātās ziņas",
     "%(duration)ss": "%(duration)s sek",
     "%(duration)sm": "%(duration)smin",
     "%(duration)sh": "%(duration)sstundas",
@@ -782,17 +782,17 @@
     "Unknown": "Neskaidrs statuss",
     "Replying": "Atbildot uz",
     "No rooms to show": "Nav istabu, kuras parādīt",
-    "World readable": "Pieejams ikvienam no visurienes",
+    "World readable": "Pieejama ikvienam un no visurienes",
     "Remove avatar": "Dzēst avataru (profila attēlu)",
-    "Drop here to favourite": "Nomest šeit (atvilt uz šejieni), lai iekļautu izlasē (favorītos)",
-    "Drop here to tag direct chat": "Nomest šeit, lai pievienotu atzīmi \"Tiešais čats\"",
-    "Drop here to restore": "Nomest šeit, lai atgrieztu",
-    "Drop here to demote": "Nomest šeit, lai pazeminātu",
+    "Drop here to favourite": "Atvilkt uz šejieni (nomest šeit), lai iekļautu favorītos (izlasē)",
+    "Drop here to tag direct chat": "Atvilkt uz šejieni (nomest šeit), lai pievienotu atzīmi \"Tiešais čats\"",
+    "Drop here to restore": "Atvilkt uz šejieni (nomest šeit), lai atjaunotu/atgrieztu",
+    "Drop here to demote": "Atvilkt uz šejieni (nomest šeit), lai pazeminātu statusā",
     "Failed to remove tag %(tagName)s from room": "Neizdevās istabai noņemt birku %(tagName)s",
     "Failed to add tag %(tagName)s to room": "Neizdevās istabai pievienot birku %(tagName)s",
     "Community Invites": "Uzaicinājums uz kopienu",
     "You have been kicked from this room by %(userName)s.": "%(userName)s padzina Tevi no šīs istabas.",
-    "You have been banned from this room by %(userName)s.": "%(userName)s nobloķēja Tevi (liedza piekļuvi) šajā istabā.",
+    "You have been banned from this room by %(userName)s.": "%(userName)s nobanoja/nobloķēja Tevi (liedza piekļuvi) šajā istabā.",
     "You are trying to access a room.": "Tu centies gūt piekļuvi istabai.",
     "To change the room's avatar, you must be a": "Lai izmainītu istabas avatāru, Tev jābūt",
     "To change the room's name, you must be a": "Lai izmainītu istabas nosaukumu, Tev jābūt",
@@ -801,7 +801,7 @@
     "To change the permissions in the room, you must be a": "Lai istabā izmainītu atļaujas, Tev jābūt",
     "To change the topic, you must be a": "Lai izmainītu tematu, Tev jābūt",
     "To modify widgets in the room, you must be a": "Lai istabā izmainītu vidžetus, Tev jābūt",
-    "Banned by %(displayName)s": "Nobloķējis (liedzis piekļuvi) %(displayName)s",
+    "Banned by %(displayName)s": "Nobanojis/bloķējis (liedzis piekļuvi) %(displayName)s",
     "Members only (since the point in time of selecting this option)": "Tikai biedri (no šī parametra iestatīšanas brīža)",
     "Members only (since they were invited)": "Tikai biedri (no to uzaicināšanas brīža)",
     "Members only (since they joined)": "Tikai biedri (kopš pievienošanās)",
@@ -816,8 +816,8 @@
     "Invalid community ID": "Nederīgs kopienas Id",
     "'%(groupId)s' is not a valid community ID": "'%(groupId)s' nav derīgs kopienas Id",
     "Flair": "Gaidas (nojauta)",
-    "Showing flair for these communities:": "Parādīt Tavas gaidas šajās komūnās:",
-    "This room is not showing flair for any communities": "Šajā istabā neparādās gaidas, kas uzstādītas komūnās",
+    "Showing flair for these communities:": "Parādīt Tavas gaidas šajās kopienās:",
+    "This room is not showing flair for any communities": "Šajā istabā neparādās gaidas, kas uzstādītas kopienās",
     "New community ID (e.g. +foo:%(localDomain)s)": "Jaunās kopienas Id (piem. +foo:%(localDomain)s)",
     "URL previews are enabled by default for participants in this room.": "URL priekšskats šīs istabas dalībniekiem pēc noklusējuma ir iespējots.",
     "URL previews are disabled by default for participants in this room.": "ULR priešskats šīs istabas dalībniekiem pēc noklusējuma ir atspējots.",

From b8e5e603d38655d7c1e45a9e992b68e5030f57b6 Mon Sep 17 00:00:00 2001
From: Mirek Jurczyszyn <ovh@wir.pl>
Date: Tue, 27 Mar 2018 10:56:35 +0000
Subject: [PATCH 797/927] Translated using Weblate (Polish)

Currently translated at 69.9% (697 of 997 strings)

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

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index ae410232e3..9f672277f6 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -690,5 +690,13 @@
     "Which rooms would you like to add to this community?": "Które pokoje chcesz dodać do tej społeczności?",
     "Room name or alias": "Nazwa pokoju lub alias",
     "Add to community": "Dodaj do społeczności",
-    "Call": "Połącz"
+    "Call": "Połącz",
+    "Submit debug logs": "Wyślij dzienniki błędów",
+    "The version of Riot.im": "Wersja Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Czy jesteś zalogowany, czy nie (nie zapisujemy twojej nazwy użytkownika)",
+    "Your language of choice": "Twój wybrany język",
+    "Your homeserver's URL": "Adres URL twojego serwera domowego",
+    "Your identity server's URL": "Adres URL twojego serwera tożsamości",
+    "The information being sent to us to help make Riot.im better includes:": "Oto informacje przesyłane do nas, służące do poprawy Riot.im:",
+    "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Zapisujemy również każdą stronę, z której korzystasz w aplikacji (obecnie <CurrentPageHash>), twój User Agent (<CurrentUserAgent>) oraz rozdzielczość ekranu twojego urządzenia (<CurrentDeviceResolution>)."
 }

From c8312dd5ae0e94629bb6e69f420f3654ff42e94a Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Mar 2018 10:25:28 +0100
Subject: [PATCH 798/927] Use a less fragile API to track page change
 performance

---
 src/Analytics.js                        | 23 +++-------------
 src/components/structures/MatrixChat.js | 35 ++++++++++++++++++++++---
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index ab47d30c1d..bb9f900145 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -148,24 +148,7 @@ class Analytics {
         return true;
     }
 
-    startPageChangeTimer() {
-        performance.clearMarks('riot_page_change_start');
-        performance.mark('riot_page_change_start');
-    }
-
-    stopPageChangeTimer() {
-        performance.mark('riot_page_change_stop');
-        performance.measure(
-            'riot_page_change_delta',
-            'riot_page_change_start',
-            'riot_page_change_stop',
-        );
-
-        const measurement = performance.getEntriesByName('riot_page_change_delta').pop();
-        this.generationTimeMs = measurement.duration;
-    }
-
-    trackPageChange() {
+    trackPageChange(generationTimeMs) {
         if (this.disabled) return;
         if (this.firstPage) {
             // De-duplicate first page
@@ -174,8 +157,8 @@ class Analytics {
             return;
         }
         this._paq.push(['setCustomUrl', getRedactedUrl()]);
-        if (typeof this.generationTimeMs === 'number') {
-            this._paq.push(['setGenerationTimeMs', this.generationTimeMs]);
+        if (typeof generationTimeMs === 'number') {
+            this._paq.push(['setGenerationTimeMs', generationTimeMs]);
         }
         this._paq.push(['trackPageView']);
     }
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a898808141..2c38e3d26e 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -370,14 +370,14 @@ export default React.createClass({
 
     componentWillUpdate: function(props, state) {
         if (this.shouldTrackPageChange(this.state, state)) {
-            Analytics.startPageChangeTimer();
+            this.startPageChangeTimer();
         }
     },
 
     componentDidUpdate: function(prevProps, prevState) {
         if (this.shouldTrackPageChange(prevState, this.state)) {
-            Analytics.stopPageChangeTimer();
-            Analytics.trackPageChange();
+            const durationMs = this.stopPageChangeTimer();
+            Analytics.trackPageChange(durationMs);
         }
         if (this.focusComposer) {
             dis.dispatch({action: 'focus_composer'});
@@ -385,6 +385,35 @@ export default React.createClass({
         }
     },
 
+    startPageChangeTimer() {
+        // This shouldn't happen because componentWillUpdate and componentDidUpdate
+        // are used.
+        if (this._pageChanging) {
+            console.warn('MatrixChat.startPageChangeTimer: timer already started');
+            return;
+        }
+        this._pageChanging = true;
+        performance.mark('riot_MatrixChat_page_change_start');
+    },
+
+    stopPageChangeTimer() {
+        if (!this._pageChanging) {
+            console.warn('MatrixChat.stopPageChangeTimer: timer not started');
+            return;
+        }
+        this._pageChanging = false;
+        performance.mark('riot_MatrixChat_page_change_stop');
+        performance.measure(
+            'riot_MatrixChat_page_change_delta',
+            'riot_MatrixChat_page_change_start',
+            'riot_MatrixChat_page_change_stop',
+        );
+        performance.clearMarks('riot_MatrixChat_page_change_start');
+        performance.clearMarks('riot_MatrixChat_page_change_stop');
+        const measurement = performance.getEntriesByName('riot_MatrixChat_page_change_delta').pop();
+        return measurement.duration;
+    },
+
     shouldTrackPageChange(prevState, state) {
         return prevState.currentRoomId !== state.currentRoomId ||
             prevState.view !== state.view ||

From 187e8ab8a8d07b6efc63801fc356133c154c6fa8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Mar 2018 10:27:24 +0100
Subject: [PATCH 799/927] Remove unused variable

---
 src/Analytics.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index bb9f900145..bb49c19cf5 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -74,7 +74,6 @@ class Analytics {
         this._paq = null;
         this.disabled = true;
         this.firstPage = true;
-        this.generationTimeMs = null;
     }
 
     /**

From f29b58aba542350f2729bcd61932b6a5ebb41bc4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Mar 2018 10:31:03 +0100
Subject: [PATCH 800/927] Always expect generationTimeMs

---
 src/Analytics.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Analytics.js b/src/Analytics.js
index bb49c19cf5..2ef058b11b 100644
--- a/src/Analytics.js
+++ b/src/Analytics.js
@@ -148,6 +148,9 @@ class Analytics {
     }
 
     trackPageChange(generationTimeMs) {
+        if (typeof generationTimeMs !== 'number') {
+            throw new Error('Analytics.trackPageChange: expected generationTimeMs to be a number');
+        }
         if (this.disabled) return;
         if (this.firstPage) {
             // De-duplicate first page
@@ -156,9 +159,7 @@ class Analytics {
             return;
         }
         this._paq.push(['setCustomUrl', getRedactedUrl()]);
-        if (typeof generationTimeMs === 'number') {
-            this._paq.push(['setGenerationTimeMs', generationTimeMs]);
-        }
+        this._paq.push(['setGenerationTimeMs', generationTimeMs]);
         this._paq.push(['trackPageView']);
     }
 

From 00167fbc0622e2b2a08247622bd00229b6e67ed4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 28 Mar 2018 11:25:28 +0100
Subject: [PATCH 801/927] Init page change state in willMount

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

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 2c38e3d26e..92baecb787 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -291,6 +291,8 @@ export default React.createClass({
         this.handleResize();
         window.addEventListener('resize', this.handleResize);
 
+        this._pageChanging = false;
+
         // check we have the right tint applied for this theme.
         // N.B. we don't call the whole of setTheme() here as we may be
         // racing with the theme CSS download finishing from index.js

From 4ac9653ab93ceed990b0c914d78113823bc756c8 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 28 Mar 2018 12:22:06 +0100
Subject: [PATCH 802/927] Refactor widget postMessage API.

---
 src/FromWidgetPostMessageApi.js          | 201 ++++++++++++++++
 src/MatrixPostMessageApi.js              |  85 -------
 src/ToWidgetPostMessageApi.js            |  86 +++++++
 src/WidgetMessaging.js                   | 278 ++++-------------------
 src/WidgetMessagingEndpoint.js           |  37 +++
 src/components/views/elements/AppTile.js |  35 +--
 6 files changed, 386 insertions(+), 336 deletions(-)
 create mode 100644 src/FromWidgetPostMessageApi.js
 delete mode 100644 src/MatrixPostMessageApi.js
 create mode 100644 src/ToWidgetPostMessageApi.js
 create mode 100644 src/WidgetMessagingEndpoint.js

diff --git a/src/FromWidgetPostMessageApi.js b/src/FromWidgetPostMessageApi.js
new file mode 100644
index 0000000000..ad1f1acbbd
--- /dev/null
+++ b/src/FromWidgetPostMessageApi.js
@@ -0,0 +1,201 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the 'License');
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an 'AS IS' BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import URL from 'url';
+import dis from './dispatcher';
+import IntegrationManager from './IntegrationManager';
+import WidgetMessagingEndpoint from './WidgetMessagingEndpoint';
+
+const WIDGET_API_VERSION = '0.0.1'; // Current API version
+const SUPPORTED_WIDGET_API_VERSIONS = [
+    '0.0.1',
+];
+const INBOUND_API_NAME = 'fromWidget';
+
+// Listen for and handle incomming requests using the 'fromWidget' postMessage
+// API and initiate responses
+export default class FromWidgetPostMessageApi {
+    constructor() {
+        this.widgetMessagingEndpoints = [];
+
+        this.start = this.start.bind(this);
+        this.stop = this.stop.bind(this);
+        this.onPostMessage = this.onPostMessage.bind(this);
+    }
+
+    start() {
+        window.addEventListener('message', this.onPostMessage);
+    }
+
+    stop() {
+        window.removeEventListener('message', this.onPostMessage);
+    }
+
+    /**
+     * Register a widget endpoint for trusted postMessage communication
+     * @param {string} widgetId    Unique widget identifier
+     * @param {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
+     */
+    addEndpoint(widgetId, endpointUrl) {
+        const u = URL.parse(endpointUrl);
+        if (!u || !u.protocol || !u.host) {
+            console.warn('Add FromWidgetPostMessageApi endpoint - Invalid origin:', endpointUrl);
+            return;
+        }
+
+        const origin = u.protocol + '//' + u.host;
+        const endpoint = new WidgetMessagingEndpoint(widgetId, origin);
+        if (this.widgetMessagingEndpoints.some(function(ep) {
+            return (ep.widgetId === widgetId && ep.endpointUrl === endpointUrl);
+        })) {
+            // Message endpoint already registered
+            console.warn('Add FromWidgetPostMessageApi - Endpoint already registered');
+            return;
+        } else {
+            console.warn(`Adding fromWidget messaging endpoint for ${widgetId}`, endpoint);
+            this.widgetMessagingEndpoints.push(endpoint);
+        }
+    }
+
+    /**
+     * De-register a widget endpoint from trusted communication sources
+     * @param  {string} widgetId Unique widget identifier
+     * @param  {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
+     * @return {boolean} True if endpoint was successfully removed
+     */
+    removeEndpoint(widgetId, endpointUrl) {
+        const u = URL.parse(endpointUrl);
+        if (!u || !u.protocol || !u.host) {
+            console.warn('Remove widget messaging endpoint - Invalid origin');
+            return;
+        }
+
+        const origin = u.protocol + '//' + u.host;
+        if (this.widgetMessagingEndpoints && this.widgetMessagingEndpoints.length > 0) {
+            const length = this.widgetMessagingEndpoints.length;
+            this.widgetMessagingEndpoints = this.widgetMessagingEndpoints.
+                filter(function(endpoint) {
+                return (endpoint.widgetId != widgetId || endpoint.endpointUrl != origin);
+            });
+            return (length > this.widgetMessagingEndpoints.length);
+        }
+        return false;
+    }
+
+    /**
+     * Handle widget postMessage events
+     * Messages are only handled where a valid, registered messaging endpoints
+     * @param  {Event} event Event to handle
+     * @return {undefined}
+     */
+    onPostMessage(event) {
+        if (!event.origin) { // Handle chrome
+            event.origin = event.originalEvent.origin;
+        }
+
+        // Event origin is empty string if undefined
+        if (
+            event.origin.length === 0 ||
+            !this.trustedEndpoint(event.origin) ||
+            event.data.api !== INBOUND_API_NAME ||
+            !event.data.widgetId
+        ) {
+            return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
+        }
+
+        const action = event.data.action;
+        const widgetId = event.data.widgetId;
+        if (action === 'content_loaded') {
+            console.warn('Widget reported content loaded for', widgetId);
+            dis.dispatch({
+                action: 'widget_content_loaded',
+                widgetId: widgetId,
+            });
+            this.sendResponse(event, {success: true});
+        } else if (action === 'supported_api_versions') {
+            this.sendResponse(event, {
+                api: INBOUND_API_NAME,
+                supported_versions: SUPPORTED_WIDGET_API_VERSIONS,
+            });
+        } else if (action === 'api_version') {
+            this.sendResponse(event, {
+                api: INBOUND_API_NAME,
+                version: WIDGET_API_VERSION,
+            });
+        } else if (action === 'm.sticker') {
+            // console.warn('Got sticker message from widget', widgetId);
+            dis.dispatch({action: 'm.sticker', data: event.data.widgetData, widgetId: event.data.widgetId});
+        } else if (action === 'integration_manager_open') {
+            // Close the stickerpicker
+            dis.dispatch({action: 'stickerpicker_close'});
+            // Open the integration manager
+            const data = event.data.widgetData;
+            const integType = (data && data.integType) ? data.integType : null;
+            const integId = (data && data.integId) ? data.integId : null;
+            IntegrationManager.open(integType, integId);
+        } else {
+            console.warn('Widget postMessage event unhandled');
+            this.sendError(event, {message: 'The postMessage was unhandled'});
+        }
+    }
+
+    /**
+     * Check if message origin is registered as trusted
+     * @param  {string} origin PostMessage origin to check
+     * @return {boolean}       True if trusted
+     */
+    trustedEndpoint(origin) {
+        if (!origin) {
+            return false;
+        }
+
+        return this.widgetMessagingEndpoints.some((endpoint) => {
+            // TODO / FIXME -- Should this also check the widgetId?
+            return endpoint.endpointUrl === origin;
+        });
+    }
+
+    /**
+     * Send a postmessage response to a postMessage request
+     * @param  {Event} event  The original postMessage request event
+     * @param  {Object} res   Response data
+     */
+    sendResponse(event, res) {
+        const data = JSON.parse(JSON.stringify(event.data));
+        data.response = res;
+        event.source.postMessage(data, event.origin);
+    }
+
+    /**
+     * Send an error response to a postMessage request
+     * @param  {Event} event        The original postMessage request event
+     * @param  {string} msg         Error message
+     * @param  {Error} nestedError  Nested error event (optional)
+     */
+    sendError(event, msg, nestedError) {
+        console.error('Action:' + event.data.action + ' failed with message: ' + msg);
+        const data = JSON.parse(JSON.stringify(event.data));
+        data.response = {
+            error: {
+                message: msg,
+            },
+        };
+        if (nestedError) {
+            data.response.error._error = nestedError;
+        }
+        event.source.postMessage(data, event.origin);
+    }
+}
diff --git a/src/MatrixPostMessageApi.js b/src/MatrixPostMessageApi.js
deleted file mode 100644
index 303c7f596d..0000000000
--- a/src/MatrixPostMessageApi.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import Promise from "bluebird";
-
-// NOTE: PostMessageApi only handles message events with a data payload with a
-// response field
-export default class PostMessageApi {
-    constructor(targetWindow, timeoutMs) {
-        this._window = targetWindow || window.parent; // default to parent window
-        this._timeoutMs = timeoutMs || 5000; // default to 5s timer
-        this._counter = 0;
-        this._requestMap = {
-            // $ID: {resolve, reject}
-        };
-    }
-
-    start() {
-        addEventListener('message', this.getOnMessageCallback());
-    }
-
-    stop() {
-        removeEventListener('message', this.getOnMessageCallback());
-    }
-
-    // Somewhat convoluted so we can successfully capture the PostMessageApi 'this' instance.
-    getOnMessageCallback() {
-        if (this._onMsgCallback) {
-            return this._onMsgCallback;
-        }
-        const self = this;
-        this._onMsgCallback = function(ev) {
-            // THIS IS ALL UNSAFE EXECUTION.
-            // We do not verify who the sender of `ev` is!
-            const payload = ev.data;
-            // NOTE: Workaround for running in a mobile WebView where a
-            // postMessage immediately triggers this callback even though it is
-            // not the response.
-            if (payload.response === undefined) {
-                return;
-            }
-            const promise = self._requestMap[payload._id];
-            if (!promise) {
-                return;
-            }
-            delete self._requestMap[payload._id];
-            promise.resolve(payload);
-        };
-        return this._onMsgCallback;
-    }
-
-    exec(action, target) {
-        this._counter += 1;
-        target = target || "*";
-        action._id = Date.now() + "-" + Math.random().toString(36) + "-" + this._counter;
-
-        return new Promise((resolve, reject) => {
-            this._requestMap[action._id] = {resolve, reject};
-            this._window.postMessage(action, target);
-
-            if (this._timeoutMs > 0) {
-                setTimeout(() => {
-                    if (!this._requestMap[action._id]) {
-                        return;
-                    }
-                    console.error("postMessage request timed out. Sent object: " + JSON.stringify(action));
-                    this._requestMap[action._id].reject(new Error("Timed out"));
-                }, this._timeoutMs);
-            }
-        });
-    }
-}
diff --git a/src/ToWidgetPostMessageApi.js b/src/ToWidgetPostMessageApi.js
new file mode 100644
index 0000000000..ccaa0207c1
--- /dev/null
+++ b/src/ToWidgetPostMessageApi.js
@@ -0,0 +1,86 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import Promise from "bluebird";
+
+// const OUTBOUND_API_NAME = 'toWidget';
+
+// Initiate requests using the "toWidget" postMessage API and handle responses
+// NOTE: ToWidgetPostMessageApi only handles message events with a data payload with a
+// response field
+export default class ToWidgetPostMessageApi {
+    constructor(timeoutMs) {
+        this._timeoutMs = timeoutMs || 5000; // default to 5s timer
+        this._counter = 0;
+        this._requestMap = {
+            // $ID: {resolve, reject}
+        };
+        this.start = this.start.bind(this);
+        this.stop = this.stop.bind(this);
+        this.onPostMessage = this.onPostMessage.bind(this);
+    }
+
+    start() {
+        window.addEventListener('message', this.onPostMessage);
+    }
+
+    stop() {
+        window.removeEventListener('message', this.onPostMessage);
+    }
+
+    onPostMessage(ev) {
+        // THIS IS ALL UNSAFE EXECUTION.
+        // We do not verify who the sender of `ev` is!
+        const payload = ev.data;
+        // NOTE: Workaround for running in a mobile WebView where a
+        // postMessage immediately triggers this callback even though it is
+        // not the response.
+        if (payload.response === undefined) {
+            return;
+        }
+        const promise = this._requestMap[payload._id];
+        if (!promise) {
+            return;
+        }
+        delete this._requestMap[payload._id];
+        promise.resolve(payload);
+    }
+
+    // Initiate outbound requests (toWidget)
+    exec(action, targetWindow, targetOrigin) {
+        targetWindow = targetWindow || window.parent; // default to parent window
+        targetOrigin = targetOrigin || "*";
+        this._counter += 1;
+        action._id = Date.now() + "-" + Math.random().toString(36) + "-" + this._counter;
+
+        return new Promise((resolve, reject) => {
+            this._requestMap[action._id] = {resolve, reject};
+            targetWindow.postMessage(action, targetOrigin);
+
+            if (this._timeoutMs > 0) {
+                setTimeout(() => {
+                    if (!this._requestMap[action._id]) {
+                        return;
+                    }
+                    console.error("postMessage request timed out. Sent object: " + JSON.stringify(action),
+                        this._requestMap);
+                    this._requestMap[action._id].reject(new Error("Timed out"));
+                    delete this._requestMap[action._id];
+                }, this._timeoutMs);
+            }
+        });
+    }
+}
diff --git a/src/WidgetMessaging.js b/src/WidgetMessaging.js
index bae71bdc8f..effd96dacf 100644
--- a/src/WidgetMessaging.js
+++ b/src/WidgetMessaging.js
@@ -19,38 +19,33 @@ limitations under the License.
 * spec. details / documentation.
 */
 
-import URL from 'url';
-import dis from './dispatcher';
-import MatrixPostMessageApi from './MatrixPostMessageApi';
-import IntegrationManager from './IntegrationManager';
+import FromWidgetPostMessageApi from './FromWidgetPostMessageApi';
+import ToWidgetPostMessageApi from './ToWidgetPostMessageApi';
+
+if (!global.mxFromWidgetMessaging) {
+    global.mxFromWidgetMessaging = new FromWidgetPostMessageApi();
+    global.mxFromWidgetMessaging.start();
+}
+if (!global.mxToWidgetMessaging) {
+    global.mxToWidgetMessaging = new ToWidgetPostMessageApi();
+    global.mxToWidgetMessaging.start();
+}
 
-const WIDGET_API_VERSION = '0.0.1'; // Current API version
-const SUPPORTED_WIDGET_API_VERSIONS = [
-    '0.0.1',
-];
-const INBOUND_API_NAME = 'fromWidget';
 const OUTBOUND_API_NAME = 'toWidget';
 
-if (!global.mxWidgetMessagingListenerCount) {
-    global.mxWidgetMessagingListenerCount = 0;
-}
-if (!global.mxWidgetMessagingMessageEndpoints) {
-    global.mxWidgetMessagingMessageEndpoints = [];
-}
-
-export default class WidgetMessaging extends MatrixPostMessageApi {
-    constructor(widgetId, targetWindow) {
-        super(targetWindow);
+export default class WidgetMessaging {
+    constructor(widgetId, widgetUrl, target) {
         this.widgetId = widgetId;
-
-        this.startListening = this.startListening.bind(this);
-        this.stopListening = this.stopListening.bind(this);
-        this.onMessage = this.onMessage.bind(this);
+        this.widgetUrl = widgetUrl;
+        this.target = target;
+        this.fromWidget = global.mxFromWidgetMessaging;
+        this.toWidget = global.mxToWidgetMessaging;
+        this.start();
     }
 
-    exec(action) {
-        return super.exec(action).then((data) => {
-            // check for errors and reject if found
+    messageToWidget(action) {
+        return this.toWidget.exec(action, this.target).then((data) => {
+            // Check for errors and reject if found
             if (data.response === undefined) { // null is valid
                 throw new Error("Missing 'response' field");
             }
@@ -65,208 +60,23 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
                 // We can't aggressively sanitize [A-z0-9] since it might be a translation.
                 throw new Error(msg);
             }
-            // return the response field for the request
+            // Return the response field for the request
             return data.response;
         });
     }
 
-    /**
-     * Register widget message event listeners
-     */
-    startListening() {
-        if (global.mxWidgetMessagingListenerCount === 0) {
-            // Start postMessage API listener
-            this.start();
-            // Start widget specific listener
-            window.addEventListener("message", this.onMessage, false);
-        }
-        global.mxWidgetMessagingListenerCount += 1;
-    }
-
-    /**
-     * De-register widget message event listeners
-     */
-    stopListening() {
-        global.mxWidgetMessagingListenerCount -= 1;
-        if (global.mxWidgetMessagingListenerCount === 0) {
-            // Stop widget specific listener
-            window.removeEventListener("message", this.onMessage, false);
-            // Stop postMessage API listener
-            this.stop();
-        }
-        if (global.mxWidgetMessagingListenerCount < 0) {
-            // Make an error so we get a stack trace
-            const e = new Error(
-                "WidgetMessaging: mismatched startListening / stopListening detected." +
-                " Negative count",
-            );
-            console.error(e);
-        }
-    }
-
-    /**
-     * Register a widget endpoint for trusted postMessage communication
-     * @param {string} widgetId    Unique widget identifier
-     * @param {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
-     */
-    addEndpoint(widgetId, endpointUrl) {
-        const u = URL.parse(endpointUrl);
-        if (!u || !u.protocol || !u.host) {
-            console.warn("Invalid origin:", endpointUrl);
-            return;
-        }
-
-        const origin = u.protocol + '//' + u.host;
-        const endpoint = new WidgetMessageEndpoint(widgetId, origin);
-        if (global.mxWidgetMessagingMessageEndpoints) {
-            if (global.mxWidgetMessagingMessageEndpoints.some(function(ep) {
-                return (ep.widgetId === widgetId && ep.endpointUrl === endpointUrl);
-            })) {
-                // Message endpoint already registered
-                console.warn("Endpoint already registered");
-                return;
-            } else {
-                // console.warn(`Adding widget messaging endpoint for ${widgetId}`);
-                global.mxWidgetMessagingMessageEndpoints.push(endpoint);
-            }
-        }
-    }
-
-    /**
-     * De-register a widget endpoint from trusted communication sources
-     * @param  {string} widgetId Unique widget identifier
-     * @param  {string} endpointUrl Widget wurl origin (protocol + (optional port) + host)
-     * @return {boolean} True if endpoint was successfully removed
-     */
-    removeEndpoint(widgetId, endpointUrl) {
-        const u = URL.parse(endpointUrl);
-        if (!u || !u.protocol || !u.host) {
-            console.warn("Invalid origin");
-            return;
-        }
-
-        const origin = u.protocol + '//' + u.host;
-        if (global.mxWidgetMessagingMessageEndpoints && global.mxWidgetMessagingMessageEndpoints.length > 0) {
-            const length = global.mxWidgetMessagingMessageEndpoints.length;
-            global.mxWidgetMessagingMessageEndpoints = global.mxWidgetMessagingMessageEndpoints.
-                filter(function(endpoint) {
-                return (endpoint.widgetId != widgetId || endpoint.endpointUrl != origin);
-            });
-            return (length > global.mxWidgetMessagingMessageEndpoints.length);
-        }
-        return false;
-    }
-
-    /**
-     * Handle widget postMessage events
-     * @param  {Event} event Event to handle
-     * @return {undefined}
-     */
-    onMessage(event) {
-        if (!event.origin) { // Handle chrome
-            event.origin = event.originalEvent.origin;
-        }
-
-        // Event origin is empty string if undefined
-        if (
-            event.origin.length === 0 ||
-            !this.trustedEndpoint(event.origin) ||
-            event.data.api !== INBOUND_API_NAME ||
-            !event.data.widgetId
-        ) {
-            return; // don't log this - debugging APIs like to spam postMessage which floods the log otherwise
-        }
-
-        const action = event.data.action;
-        const widgetId = event.data.widgetId;
-        if (action === 'content_loaded') {
-            dis.dispatch({
-                action: 'widget_content_loaded',
-                widgetId: widgetId,
-            });
-            this.sendResponse(event, {success: true});
-        } else if (action === 'supported_api_versions') {
-            this.sendResponse(event, {
-                api: INBOUND_API_NAME,
-                supported_versions: SUPPORTED_WIDGET_API_VERSIONS,
-            });
-        } else if (action === 'api_version') {
-            this.sendResponse(event, {
-                api: INBOUND_API_NAME,
-                version: WIDGET_API_VERSION,
-            });
-        } else if (action === 'm.sticker') {
-            dis.dispatch({action: 'm.sticker', data: event.data.widgetData, widgetId: event.data.widgetId});
-        } else if (action === 'integration_manager_open') {
-            // Close the stickerpicker
-            dis.dispatch({action: 'stickerpicker_close'});
-            // Open the integration manager
-            const data = event.data.widgetData;
-            const integType = (data && data.integType) ? data.integType : null;
-            const integId = (data && data.integId) ? data.integId : null;
-            IntegrationManager.open(integType, integId);
-        } else {
-            console.warn("Widget postMessage event unhandled");
-            this.sendError(event, {message: "The postMessage was unhandled"});
-        }
-    }
-
-    /**
-     * Check if message origin is registered as trusted
-     * @param  {string} origin PostMessage origin to check
-     * @return {boolean}       True if trusted
-     */
-    trustedEndpoint(origin) {
-        if (!origin) {
-            return false;
-        }
-
-        return global.mxWidgetMessagingMessageEndpoints.some((endpoint) => {
-            return endpoint.endpointUrl === origin;
-        });
-    }
-
-    /**
-     * Send a postmessage response to a postMessage request
-     * @param  {Event} event  The original postMessage request event
-     * @param  {Object} res   Response data
-     */
-    sendResponse(event, res) {
-        const data = JSON.parse(JSON.stringify(event.data));
-        data.response = res;
-        event.source.postMessage(data, event.origin);
-    }
-
-    /**
-     * Send an error response to a postMessage request
-     * @param  {Event} event        The original postMessage request event
-     * @param  {string} msg         Error message
-     * @param  {Error} nestedError  Nested error event (optional)
-     */
-    sendError(event, msg, nestedError) {
-        console.error("Action:" + event.data.action + " failed with message: " + msg);
-        const data = JSON.parse(JSON.stringify(event.data));
-        data.response = {
-            error: {
-                message: msg,
-            },
-        };
-        if (nestedError) {
-            data.response.error._error = nestedError;
-        }
-        event.source.postMessage(data, event.origin);
-    }
-
     /**
      * Request a screenshot from a widget
      * @return {Promise} To be resolved with screenshot data when it has been generated
      */
     getScreenshot() {
-        return this.exec({
+        console.warn('Requesting screenshot for', this.widgetId);
+        return this.messageToWidget({
                 api: OUTBOUND_API_NAME,
                 action: "screenshot",
-            }).then((response) => response.screenshot)
-            .catch((error) => new Error("Failed to get screenshot: " + error.message));
+            })
+            .catch((error) => new Error("Failed to get screenshot: " + error.message))
+            .then((response) => response.screenshot);
     }
 
     /**
@@ -274,30 +84,22 @@ export default class WidgetMessaging extends MatrixPostMessageApi {
      * @return {Promise} To be resolved with an array of requested widget capabilities
      */
     getCapabilities() {
-        return this.exec({
+        console.warn('Requesting capabilities for', this.widgetId);
+        return this.messageToWidget({
                 api: OUTBOUND_API_NAME,
                 action: "capabilities",
-            }).then((response) => response.capabilities);
+            }).then((response) => {
+                console.warn('Got capabilities for', this.widgetId, response.capabilities);
+                return response.capabilities;
+            });
     }
-}
 
-/**
- * Represents mapping of widget instance to URLs for trusted postMessage communication.
- */
-class WidgetMessageEndpoint {
-    /**
-     * Mapping of widget instance to URL for trusted postMessage communication.
-     * @param  {string} widgetId    Unique widget identifier
-     * @param  {string} endpointUrl Widget wurl origin.
-     */
-    constructor(widgetId, endpointUrl) {
-        if (!widgetId) {
-            throw new Error("No widgetId specified in widgetMessageEndpoint constructor");
-        }
-        if (!endpointUrl) {
-            throw new Error("No endpoint specified in widgetMessageEndpoint constructor");
-        }
-        this.widgetId = widgetId;
-        this.endpointUrl = endpointUrl;
+
+    start() {
+        this.fromWidget.addEndpoint(this.widgetId, this.widgetUrl);
+    }
+
+    stop() {
+        this.fromWidget.removeEndpoint(this.widgetId, this.widgetUrl);
     }
 }
diff --git a/src/WidgetMessagingEndpoint.js b/src/WidgetMessagingEndpoint.js
new file mode 100644
index 0000000000..9114e12137
--- /dev/null
+++ b/src/WidgetMessagingEndpoint.js
@@ -0,0 +1,37 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+/**
+ * Represents mapping of widget instance to URLs for trusted postMessage communication.
+ */
+export default class WidgetMessageEndpoint {
+    /**
+     * Mapping of widget instance to URL for trusted postMessage communication.
+     * @param  {string} widgetId    Unique widget identifier
+     * @param  {string} endpointUrl Widget wurl origin.
+     */
+    constructor(widgetId, endpointUrl) {
+        if (!widgetId) {
+            throw new Error("No widgetId specified in widgetMessageEndpoint constructor");
+        }
+        if (!endpointUrl) {
+            throw new Error("No endpoint specified in widgetMessageEndpoint constructor");
+        }
+        this.widgetId = widgetId;
+        this.endpointUrl = endpointUrl;
+    }
+}
diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index e7f44a8840..a9613530ec 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -51,6 +51,7 @@ export default class AppTile extends React.Component {
         this._onSnapshotClick = this._onSnapshotClick.bind(this);
         this.onClickMenuBar = this.onClickMenuBar.bind(this);
         this._onMinimiseClick = this._onMinimiseClick.bind(this);
+        this._onInitialLoad = this._onInitialLoad.bind(this);
     }
 
     /**
@@ -172,8 +173,7 @@ export default class AppTile extends React.Component {
         // Widget postMessage listeners
         try {
             if (this.widgetMessaging) {
-                this.widgetMessaging.stopListening();
-                this.widgetMessaging.removeEndpoint(this.props.id, this.props.url);
+                this.widgetMessaging.stop();
             }
         } catch (e) {
             console.error('Failed to stop listening for widgetMessaging events', e.message);
@@ -290,14 +290,16 @@ export default class AppTile extends React.Component {
 
     _onSnapshotClick(e) {
         console.warn("Requesting widget snapshot");
-        this.widgetMessaging.getScreenshot().then((screenshot) => {
-            dis.dispatch({
-                action: 'picture_snapshot',
-                file: screenshot,
-            }, true);
-        }).catch((err) => {
-            console.error("Failed to get screenshot", err);
-        });
+        this.widgetMessaging.getScreenshot()
+            .catch((err) => {
+                console.error("Failed to get screenshot", err);
+            })
+            .then((screenshot) => {
+                dis.dispatch({
+                    action: 'picture_snapshot',
+                    file: screenshot,
+                }, true);
+            });
     }
 
     /* If user has permission to modify widgets, delete the widget,
@@ -343,9 +345,16 @@ export default class AppTile extends React.Component {
      * Called when widget iframe has finished loading
      */
     _onLoaded() {
-        this.widgetMessaging = new WidgetMessaging(this.props.id, this.refs.appFrame.contentWindow);
-        this.widgetMessaging.startListening();
-        this.widgetMessaging.addEndpoint(this.props.id, this.props.url);
+        if (!this.widgetMessaging) {
+            this._onInitialLoad();
+        }
+    }
+
+    /**
+     * Called on initial load of the widget iframe
+     */
+    _onInitialLoad() {
+        this.widgetMessaging = new WidgetMessaging(this.props.id, this.props.url, this.refs.appFrame.contentWindow);
         this.widgetMessaging.getCapabilities().then((requestedCapabilities) => {
             console.log(`Widget ${this.props.id} requested capabilities:`, requestedCapabilities);
             requestedCapabilities = requestedCapabilities || [];

From b4e70e30f33dce2c30e92458ba5793cbb70501af Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 28 Mar 2018 19:21:49 +0100
Subject: [PATCH 803/927] Expects object, not naked ID.

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

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index e9486138c7..4cdf57f5c7 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -60,7 +60,7 @@ export default class IntegrationManager {
     integType = 'type_' + integType;
     const src = (global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials()) ?
       global.mxIntegrationManager.client.getScalarInterfaceUrlForRoom(
-        RoomViewStore.getRoomId(),
+        {roomId: RoomViewStore.getRoomId()},
         integType,
         integId,
       ) :

From 385211528d5c739a753ef3326db3832045b880f9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 12:36:59 +0100
Subject: [PATCH 804/927] Implement "Join this community" button

for groups that have truthy summary.profile.is_joinable.
---
 src/components/structures/GroupView.js | 108 ++++++++++++++++++-------
 1 file changed, 80 insertions(+), 28 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 2b5b3d5353..c8773296e5 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -670,6 +670,20 @@ export default React.createClass({
         });
     },
 
+    _onJoinClick: function() {
+        this.setState({membershipBusy: true});
+        this._matrixClient.joinGroup(this.props.groupId).then(() => {
+            // don't reset membershipBusy here: wait for the membership change to come down the sync
+        }).catch((e) => {
+            this.setState({membershipBusy: false});
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createTrackedDialog('Error joining room', '', ErrorDialog, {
+                title: _t("Error"),
+                description: _t("Unable to join community"),
+            });
+        });
+    },
+
     _onLeaveClick: function() {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Leave Group', '', QuestionDialog, {
@@ -686,9 +700,9 @@ export default React.createClass({
                 }).catch((e) => {
                     this.setState({membershipBusy: false});
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Error leaving room', '', ErrorDialog, {
+                    Modal.createTrackedDialog('Error leaving community', '', ErrorDialog, {
                         title: _t("Error"),
-                        description: _t("Unable to leave room"),
+                        description: _t("Unable to leave community"),
                     });
                 });
             },
@@ -853,9 +867,8 @@ export default React.createClass({
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
         const group = this._matrixClient.getGroup(this.props.groupId);
-        if (!group) return null;
 
-        if (group.myMembership === 'invite') {
+        if (group && group.myMembership === 'invite') {
             if (this.state.membershipBusy || this.state.inviterProfileBusy) {
                 return <div className="mx_GroupView_membershipSection">
                     <Spinner />
@@ -896,33 +909,72 @@ export default React.createClass({
                     </div>
                 </div>
             </div>;
-        } else if (group.myMembership === 'join' && this.state.editing) {
-            const leaveButtonTooltip = this.state.isUserPrivileged ?
+        }
+
+        let membershipContainerExtraClasses;
+        let membershipButtonExtraClasses;
+        let membershipButtonTooltip;
+        let membershipButtonText;
+        let membershipButtonOnClick;
+
+        // User is not in the group
+        if ((!group || group.myMembership === 'leave') &&
+            this.state.summary &&
+            this.state.summary.profile &&
+            Boolean(this.state.summary.profile.is_joinable)
+        ) {
+            membershipButtonText = _t("Join this community");
+            membershipButtonOnClick = this._onJoinClick;
+
+            membershipButtonExtraClasses = 'mx_GroupView_joinButton';
+            membershipContainerExtraClasses = 'mx_GroupView_membershipSection_leave';
+        } else if (
+            group &&
+            group.myMembership === 'join' &&
+            this.state.editing
+        ) {
+            membershipButtonText = _t("Leave this community");
+            membershipButtonOnClick = this._onLeaveClick;
+            membershipButtonTooltip = this.state.isUserPrivileged ?
                 _t("You are an administrator of this community") :
                 _t("You are a member of this community");
-            const leaveButtonClasses = classnames({
-                "mx_RoomHeader_textButton": true,
-                "mx_GroupView_textButton": true,
-                "mx_GroupView_leaveButton": true,
-                "mx_RoomHeader_textButton_danger": this.state.isUserPrivileged,
-            });
-            return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_joined">
-                <div className="mx_GroupView_membershipSubSection">
-                    { /* Empty div for flex alignment */ }
-                    <div />
-                    <div className="mx_GroupView_membership_buttonContainer">
-                        <AccessibleButton
-                            className={leaveButtonClasses}
-                            onClick={this._onLeaveClick}
-                            title={leaveButtonTooltip}
-                        >
-                            { _t("Leave") }
-                        </AccessibleButton>
-                    </div>
-                </div>
-            </div>;
+
+            membershipButtonExtraClasses = {
+                'mx_GroupView_leaveButton': true,
+                'mx_RoomHeader_textButton_danger': this.state.isUserPrivileged,
+            };
+            membershipContainerExtraClasses = 'mx_GroupView_membershipSection_joined';
+        } else {
+            return null;
         }
-        return null;
+
+        const membershipButtonClasses = classnames([
+            'mx_RoomHeader_textButton',
+            'mx_GroupView_textButton',
+        ],
+            membershipButtonExtraClasses,
+        );
+
+        const membershipContainerClasses = classnames(
+            'mx_GroupView_membershipSection',
+            membershipContainerExtraClasses,
+        );
+
+        return <div className={membershipContainerClasses}>
+            <div className="mx_GroupView_membershipSubSection">
+                { /* Empty div for flex alignment */ }
+                <div />
+                <div className="mx_GroupView_membership_buttonContainer">
+                    <AccessibleButton
+                        className={membershipButtonClasses}
+                        onClick={membershipButtonOnClick}
+                        title={membershipButtonTooltip}
+                    >
+                        { membershipButtonText }
+                    </AccessibleButton>
+                </div>
+            </div>
+        </div>;
     },
 
     _getLongDescriptionNode: function() {

From 2dea5cd2336d4bcf07c46e56f37923f7b63c6217 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 12:39:21 +0100
Subject: [PATCH 805/927] run gen-i18n

---
 src/i18n/strings/en_EN.json | 66 +++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2d3ef836e0..db57eedc72 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -38,10 +38,6 @@
     "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload",
     "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",
     "Upload Failed": "Upload Failed",
-    "Failure to create room": "Failure to create room",
-    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
-    "Send anyway": "Send anyway",
-    "Send": "Send",
     "Sun": "Sun",
     "Mon": "Mon",
     "Tue": "Tue",
@@ -81,7 +77,6 @@
     "Failed to invite users to community": "Failed to invite users to community",
     "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s",
     "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:",
-    "Unnamed Room": "Unnamed Room",
     "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",
     "Unable to enable Notifications": "Unable to enable Notifications",
@@ -179,6 +174,11 @@
     "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing",
     "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing",
     "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing",
+    "Failure to create room": "Failure to create room",
+    "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.",
+    "Send anyway": "Send anyway",
+    "Send": "Send",
+    "Unnamed Room": "Unnamed Room",
     "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions",
     "Not a valid Riot keyfile": "Not a valid Riot keyfile",
     "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?",
@@ -186,7 +186,6 @@
     "Message Replies": "Message Replies",
     "Message Pinning": "Message Pinning",
     "Presence Management": "Presence Management",
-    "Tag Panel": "Tag Panel",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Hide removed messages": "Hide removed messages",
@@ -253,29 +252,6 @@
     "Failed to set display name": "Failed to set display name",
     "Disable Notifications": "Disable Notifications",
     "Enable Notifications": "Enable Notifications",
-    "Invalid alias format": "Invalid alias format",
-    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
-    "Invalid address format": "Invalid address format",
-    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
-    "not specified": "not specified",
-    "not set": "not set",
-    "Remote addresses for this room:": "Remote addresses for this room:",
-    "Addresses": "Addresses",
-    "The main address for this room is": "The main address for this room is",
-    "Local addresses for this room:": "Local addresses for this room:",
-    "This room has no local addresses": "This room has no local addresses",
-    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
-    "Invalid community ID": "Invalid community ID",
-    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
-    "Flair": "Flair",
-    "Showing flair for these communities:": "Showing flair for these communities:",
-    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
-    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
-    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
-    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
-    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
-    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
-    "URL Previews": "URL Previews",
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
@@ -371,11 +347,11 @@
     "numbullet": "numbullet",
     "Markdown is disabled": "Markdown is disabled",
     "Markdown is enabled": "Markdown is enabled",
+    "Unpin Message": "Unpin Message",
+    "Jump to message": "Jump to message",
     "No pinned messages.": "No pinned messages.",
     "Loading...": "Loading...",
     "Pinned Messages": "Pinned Messages",
-    "Unpin Message": "Unpin Message",
-    "Jump to message": "Jump to message",
     "%(duration)ss": "%(duration)ss",
     "%(duration)sm": "%(duration)sm",
     "%(duration)sh": "%(duration)sh",
@@ -498,6 +474,29 @@
     "Scroll to unread messages": "Scroll to unread messages",
     "Jump to first unread message.": "Jump to first unread message.",
     "Close": "Close",
+    "Invalid alias format": "Invalid alias format",
+    "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
+    "Invalid address format": "Invalid address format",
+    "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address",
+    "not specified": "not specified",
+    "not set": "not set",
+    "Remote addresses for this room:": "Remote addresses for this room:",
+    "Addresses": "Addresses",
+    "The main address for this room is": "The main address for this room is",
+    "Local addresses for this room:": "Local addresses for this room:",
+    "This room has no local addresses": "This room has no local addresses",
+    "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)",
+    "Invalid community ID": "Invalid community ID",
+    "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID",
+    "Flair": "Flair",
+    "Showing flair for these communities:": "Showing flair for these communities:",
+    "This room is not showing flair for any communities": "This room is not showing flair for any communities",
+    "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)",
+    "You have <a>enabled</a> URL previews by default.": "You have <a>enabled</a> URL previews by default.",
+    "You have <a>disabled</a> URL previews by default.": "You have <a>disabled</a> URL previews by default.",
+    "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.",
+    "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.",
+    "URL Previews": "URL Previews",
     "Error decrypting audio": "Error decrypting audio",
     "Error decrypting attachment": "Error decrypting attachment",
     "Decrypt %(text)s": "Decrypt %(text)s",
@@ -763,10 +762,11 @@
     "Failed to update community": "Failed to update community",
     "Unable to accept invite": "Unable to accept invite",
     "Unable to reject invite": "Unable to reject invite",
+    "Unable to join community": "Unable to join community",
     "Leave Community": "Leave Community",
     "Leave %(groupName)s?": "Leave %(groupName)s?",
     "Leave": "Leave",
-    "Unable to leave room": "Unable to leave room",
+    "Unable to leave community": "Unable to leave community",
     "Community Settings": "Community Settings",
     "Changes made to your community might not be seen by other users for up to 30 minutes.": "Changes made to your community might not be seen by other users for up to 30 minutes.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
@@ -774,8 +774,10 @@
     "Featured Rooms:": "Featured Rooms:",
     "Featured Users:": "Featured Users:",
     "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
+    "Join this community": "Join this community",
     "You are an administrator of this community": "You are an administrator of this community",
     "You are a member of this community": "You are a member of this community",
+    "Leave this community": "Leave this community",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!",
     "Long Description (HTML)": "Long Description (HTML)",
     "Description": "Description",

From c4322892de70e9c819a0912a0aefc62089e24357 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 14:33:54 +0100
Subject: [PATCH 806/927] Reword group setting delay

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 2b5b3d5353..8addb190d8 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -708,8 +708,14 @@ export default React.createClass({
         const header = this.state.editing ? <h2> { _t('Community Settings') } </h2> : <div />;
         const changeDelayWarning = this.state.editing && this.state.isUserPrivileged ?
             <div className="mx_GroupView_changeDelayWarning">
-                { _t( 'Changes made to your community might not be seen by other users ' +
-                      'for up to 30 minutes.',
+                { _t(
+                    'Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> ' +
+                    'might not be seen by other users for up to 30 minutes.',
+                    {},
+                    {
+                        'bold1': (sub) => <b> { sub } </b>,
+                        'bold2': (sub) => <b> { sub } </b>,
+                    },
                 ) }
             </div> : <div />;
         return <div className={groupSettingsSectionClasses}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2d3ef836e0..48480ed2a9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -768,7 +768,7 @@
     "Leave": "Leave",
     "Unable to leave room": "Unable to leave room",
     "Community Settings": "Community Settings",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Changes made to your community might not be seen by other users for up to 30 minutes.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
     "Add rooms to this community": "Add rooms to this community",
     "Featured Rooms:": "Featured Rooms:",

From fdf38bb87127b885f624354482f8a192fa3c252a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Thu, 29 Mar 2018 15:19:54 +0000
Subject: [PATCH 807/927] Translated using Weblate (French)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f365d8e273..ad96616f66 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -998,5 +998,10 @@
     "Debug Logs Submission": "Envoi des journaux de débogage",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Si vous avez signalé un bug via GitHub, les journaux de débogage peuvent nous aider à identifier le problème. Les journaux de débogage contiennent des données d'utilisation de l'application dont votre nom d'utilisateur, les identifiants ou alias des salons ou groupes que vous avez visité et les noms d'utilisateur des autres participants. Ils ne contiennent pas les messages.",
     "Submit debug logs": "Envoyer les journaux de débogage",
-    "Opens the Developer Tools dialog": "Ouvre la fenêtre des Outils de développeur"
+    "Opens the Developer Tools dialog": "Ouvre la fenêtre des Outils de développeur",
+    "Unable to join community": "Impossible de rejoindre la communauté",
+    "Unable to leave community": "Impossible de quitter la communauté",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Les changements effectués au <bold1>nom</bold1> et à l'<bold2>avatar</bold2> de votre communauté peuvent prendre jusqu'à 30 minutes avant d'être vus par d'autres utilisateurs.",
+    "Join this community": "Rejoindre cette communauté",
+    "Leave this community": "Quitter cette communauté"
 }

From 5fc9b8a6b8c436014352c5fc5f99df4a5ed7e056 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 16:23:20 +0100
Subject: [PATCH 808/927] Indentation.

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

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 47ad87a8d7..33009d502b 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -276,9 +276,9 @@ class ContentMessages {
     }
 
     sendStickerContentToRoom(url, roomId, info, text, matrixClient) {
-      return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
-        console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
-      });
+        return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
+            console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
+        });
     }
 
     sendContentToRoom(file, roomId, matrixClient) {

From a1581ad2dc4cbb196867a1fd2c66f60e04d2bef6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 16:24:03 +0100
Subject: [PATCH 809/927] Don't swallow error.

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

diff --git a/src/ContentMessages.js b/src/ContentMessages.js
index 33009d502b..7fe625f8b9 100644
--- a/src/ContentMessages.js
+++ b/src/ContentMessages.js
@@ -278,6 +278,7 @@ class ContentMessages {
     sendStickerContentToRoom(url, roomId, info, text, matrixClient) {
         return MatrixClientPeg.get().sendStickerMessage(roomId, url, info, text).catch((e) => {
             console.warn(`Failed to send content with URL ${url} to room ${roomId}`, e);
+            throw e;
         });
     }
 

From 23a52bdb4cbc54b0988e241651006682b0ac7109 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 16:46:22 +0100
Subject: [PATCH 810/927] Indentation.

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index a6b4c272b4..f531b94788 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -937,12 +937,12 @@ module.exports = React.createClass({
         }
 
         ContentMessages.sendStickerContentToRoom(url, this.state.room.roomId, info, text, MatrixClientPeg.get())
-          .done(undefined, (error) => {
-              if (error.name === "UnknownDeviceError") {
-                  // Let the staus bar handle this
-                  return;
-              }
-          });
+            .done(undefined, (error) => {
+                if (error.name === "UnknownDeviceError") {
+                    // Let the staus bar handle this
+                    return;
+                }
+            });
     },
 
     onSearch: function(term, scope) {

From 35fcb2c9abddd1cf1e14875f548b647c557039c1 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 16:56:02 +0100
Subject: [PATCH 811/927] Catch rather than 'done' error handler.

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

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index f531b94788..6fc16b9760 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -916,7 +916,7 @@ module.exports = React.createClass({
 
         ContentMessages.sendContentToRoom(
             file, this.state.room.roomId, MatrixClientPeg.get(),
-        ).done(undefined, (error) => {
+        ).catch((error) => {
             if (error.name === "UnknownDeviceError") {
                 // Let the staus bar handle this
                 return;
@@ -925,7 +925,8 @@ module.exports = React.createClass({
             console.error("Failed to upload file " + file + " " + error);
             Modal.createTrackedDialog('Failed to upload file', '', ErrorDialog, {
                 title: _t('Failed to upload file'),
-                description: ((error && error.message) ? error.message : _t("Server may be unavailable, overloaded, or the file too big")),
+                description: ((error && error.message)
+                    ? error.message : _t("Server may be unavailable, overloaded, or the file too big")),
             });
         });
     },

From aefccb134c294efcf2ee77d308c27ab62ec15706 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 16:56:25 +0100
Subject: [PATCH 812/927] Ensure deleting is set to false.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index a9613530ec..98b68bd890 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -330,6 +330,7 @@ export default class AppTile extends React.Component {
                             this.props.id,
                         ).catch((e) => {
                             console.error('Failed to delete widget', e);
+                        }).finally(() => {
                             this.setState({deleting: false});
                         });
                     },

From f42cdf6a4c55bc07e893844604ec0820d3a2f533 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 16:57:07 +0100
Subject: [PATCH 813/927] Add radio button for setting group is_joinable

which dictates whether the group can be joined without invitation.
---
 src/components/structures/GroupView.js | 54 ++++++++++++++++++++++++--
 src/i18n/strings/en_EN.json            |  2 +
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 2b5b3d5353..d1f5de0b95 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -545,6 +545,9 @@ export default React.createClass({
         this.setState({
             editing: true,
             profileForm: Object.assign({}, this.state.summary.profile),
+            joinableForm: {
+                isJoinable: this.state.summary.profile.is_joinable,
+            },
         });
         dis.dispatch({
             action: 'panel_disable',
@@ -607,11 +610,15 @@ export default React.createClass({
         }).done();
     },
 
+    _onJoinableChange: function(ev) {
+        this.setState({
+            joinableForm: { isJoinable: ev.target.value === "true" },
+        });
+    },
+
     _onSaveClick: function() {
         this.setState({saving: true});
-        const savePromise = this.state.isUserPrivileged ?
-            this._matrixClient.setGroupProfile(this.props.groupId, this.state.profileForm) :
-            Promise.resolve();
+        const savePromise = this.state.isUserPrivileged ? this._saveGroup() : Promise.resolve();
         savePromise.then((result) => {
             this.setState({
                 saving: false,
@@ -642,6 +649,11 @@ export default React.createClass({
         }).done();
     },
 
+    _saveGroup: async function() {
+        await this._matrixClient.setGroupProfile(this.props.groupId, this.state.profileForm);
+        await this._matrixClient.setGroupJoinable(this.props.groupId, this.state.joinableForm.isJoinable);
+    },
+
     _onAcceptInviteClick: function() {
         this.setState({membershipBusy: true});
         this._groupStore.acceptGroupInvite().then(() => {
@@ -715,6 +727,7 @@ export default React.createClass({
         return <div className={groupSettingsSectionClasses}>
             { header }
             { changeDelayWarning }
+            { this._getJoinableNode() }
             { this._getLongDescriptionNode() }
             { this._getRoomsNode() }
         </div>;
@@ -925,6 +938,41 @@ export default React.createClass({
         return null;
     },
 
+    _getJoinableNode: function() {
+        return this.state.editing ? <div>
+            <h3>
+                { _t('Who can join this community?') }
+                { this.state.groupJoinableLoading ?
+                    <InlineSpinner /> : <div />
+                }
+            </h3>
+            <div>
+                <label>
+                    <input type="radio"
+                        value="false"
+                        checked={!this.state.joinableForm.isJoinable}
+                        onClick={this._onJoinableChange}
+                    />
+                    <div className="mx_GroupView_label_text">
+                        { _t('Only people who have been invited') }
+                    </div>
+                </label>
+            </div>
+            <div>
+                <label>
+                    <input type="radio"
+                        value="true"
+                        checked={this.state.joinableForm.isJoinable}
+                        onClick={this._onJoinableChange}
+                    />
+                    <div className="mx_GroupView_label_text">
+                        { _t('Everyone') }
+                    </div>
+                </label>
+            </div>
+        </div> : null;
+    },
+
     _getLongDescriptionNode: function() {
         const summary = this.state.summary;
         let description = null;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 2d3ef836e0..6be80bbf4f 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -776,6 +776,8 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
     "You are an administrator of this community": "You are an administrator of this community",
     "You are a member of this community": "You are a member of this community",
+    "Who can join this community?": "Who can join this community?",
+    "Everyone": "Everyone",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!",
     "Long Description (HTML)": "Long Description (HTML)",
     "Description": "Description",

From cafbd2904ecb033db63c4d45b934c8c3eff397f3 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 16:57:21 +0100
Subject: [PATCH 814/927] Remove unused ref.

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

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 83d8309cf9..ef2c2106cc 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -106,7 +106,7 @@ export default class MStickerBody extends MImageBody {
         placeholderSize = placeholderSize + 'px';
 
         return (
-            <span className='mx_MStickerBody' ref='body'
+            <span className='mx_MStickerBody'
                 style={{
                     height: placeholderFixupHeight,
                 }}>

From f38329826729d440f95292e42c258abc52b4dec0 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:08:07 +0100
Subject: [PATCH 815/927] Remove duplicate event handler.

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

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index ef2c2106cc..5b44789445 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -50,6 +50,9 @@ export default class MStickerBody extends MImageBody {
             });
         }, 500);
         this.setState({hidePlaceholderTimer});
+        if (this.props.onWidgetLoad) {
+            this.props.onWidgetLoad();
+        }
     }
 
     _afterComponentDidMount() {
@@ -129,7 +132,6 @@ export default class MStickerBody extends MImageBody {
                         src={contentUrl}
                         ref='image'
                         alt={content.body}
-                        onLoad={this.props.onWidgetLoad}
                         onLoad={this._onImageLoad}
                         onMouseEnter={this._onMouseEnter}
                         onMouseLeave={this._onMouseLeave}

From 9c10d243e85d367aff06f6b4d3f0dd53d118f28b Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:09:03 +0100
Subject: [PATCH 816/927] Add comment.

---
 src/components/views/messages/MStickerBody.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 5b44789445..8ae5bdd2c4 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -142,6 +142,7 @@ export default class MStickerBody extends MImageBody {
         );
     }
 
+    // Empty to prevent default behaviour of MImageBody
     onClick() {
     }
 }

From 2bc8d6d3a41f31e9c485621331379a48b14283f6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 17:25:06 +0100
Subject: [PATCH 817/927] Use less confusing values on radio buttons

---
 src/components/structures/GroupView.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index d1f5de0b95..0be9ffb77a 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -399,6 +399,9 @@ FeaturedRoom.contextTypes = GroupContext;
 RoleUserList.contextTypes = GroupContext;
 FeaturedUser.contextTypes = GroupContext;
 
+const GROUP_JOINABLE = "GROUP_JOINABLE";
+const GROUP_NOT_JOINABLE = "GROUP_NOT_JOINABLE";
+
 export default React.createClass({
     displayName: 'GroupView',
 
@@ -612,7 +615,7 @@ export default React.createClass({
 
     _onJoinableChange: function(ev) {
         this.setState({
-            joinableForm: { isJoinable: ev.target.value === "true" },
+            joinableForm: { isJoinable: ev.target.value === GROUP_JOINABLE },
         });
     },
 
@@ -949,7 +952,7 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value="false"
+                        value={GROUP_NOT_JOINABLE}
                         checked={!this.state.joinableForm.isJoinable}
                         onClick={this._onJoinableChange}
                     />
@@ -961,7 +964,7 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value="true"
+                        value={GROUP_JOINABLE}
                         checked={this.state.joinableForm.isJoinable}
                         onClick={this._onJoinableChange}
                     />

From 38c8bc7d9aca9b2241d79b88b01cd5e86cc27a83 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:25:07 +0100
Subject: [PATCH 818/927] Consistent function naming.

---
 src/components/views/rooms/Stickerpicker.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 1171ad1ee0..e531212baf 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -31,12 +31,12 @@ const widgetType = 'm.stickerpicker';
 export default class Stickerpicker extends React.Component {
     constructor(props) {
         super(props);
-        this.onShowStickersClick = this.onShowStickersClick.bind(this);
-        this.onHideStickersClick = this.onHideStickersClick.bind(this);
-        this.onFinished = this.onFinished.bind(this);
+        this._onShowStickersClick = this._onShowStickersClick.bind(this);
+        this._onHideStickersClick = this._onHideStickersClick.bind(this);
         this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
         this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
         this._onWidgetAction = this._onWidgetAction.bind(this);
+        this.onFinished = this.onFinished.bind(this);
 
         this.defaultStickersContent = (
             <div className='mx_Stickers_contentPlaceholder'>
@@ -157,7 +157,7 @@ export default class Stickerpicker extends React.Component {
                             showTitle={false}
                             showMinimise={true}
                             showDelete={false}
-                            onMinimiseClick={this.onHideStickersClick}
+                            onMinimiseClick={this._onHideStickersClick}
                             handleMinimisePointerEvents={true}
                             whitelistCapabilities={['m.sticker']}
                         />
@@ -182,7 +182,7 @@ export default class Stickerpicker extends React.Component {
      * If no stickerpacks have been added, show a link to the integration manager add sticker packs page.
      * @param  {Event} e Event that triggered the function
      */
-    onShowStickersClick(e) {
+    _onShowStickersClick(e) {
         this._getStickerPickerWidget();
         const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
         const buttonRect = e.target.getBoundingClientRect();
@@ -211,7 +211,7 @@ export default class Stickerpicker extends React.Component {
      * Trigger hiding of the sticker picker overlay
      * @param  {Event} ev Event that triggered the function call
      */
-    onHideStickersClick(ev) {
+    _onHideStickersClick(ev) {
         setTimeout(() => this.stickersMenu.close());
     }
 
@@ -252,7 +252,7 @@ export default class Stickerpicker extends React.Component {
                     id='stickersButton'
                     key="controls_hide_stickers"
                     className="mx_MessageComposer_stickers mx_Stickers_hideStickers"
-                    onClick={this.onHideStickersClick}
+                    onClick={this._onHideStickersClick}
                     ref='target'
                     title={_t("Hide Stickers")}>
                     <TintableSvg src="img/icons-hide-stickers.svg" width="35" height="35" />
@@ -264,7 +264,7 @@ export default class Stickerpicker extends React.Component {
                     id='stickersButton'
                     key="constrols_show_stickers"
                     className="mx_MessageComposer_stickers"
-                    onClick={this.onShowStickersClick}
+                    onClick={this._onShowStickersClick}
                     title={_t("Show Stickers")}>
                     <TintableSvg src="img/icons-show-stickers.svg" width="35" height="35" />
                 </div>;

From e21cc14e5b6e8ee1c9e228ca65a484167023fe90 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:26:19 +0100
Subject: [PATCH 819/927] Comment.

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index e531212baf..2759bd51b8 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -68,6 +68,7 @@ export default class Stickerpicker extends React.Component {
         }
         Widgets.removeStickerpickerWidgets();
         this._getStickerPickerWidget();
+        // Wrap this in a timeout in order to avoid the DOM node from being pulled from under its feet
         setTimeout(() => this.stickersMenu.close());
     }
 

From 67f755efcbdd1136646ab25c75d3e89d0f96dc8d Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:26:54 +0100
Subject: [PATCH 820/927] Comment.

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 2759bd51b8..12917e209d 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -108,7 +108,8 @@ export default class Stickerpicker extends React.Component {
             this._getStickerPickerWidget();
             return;
         } else if (payload.action === "stickerpicker_close") {
-          setTimeout(() => this.stickersMenu.close());
+            // Wrap this in a timeout in order to avoid the DOM node from being pulled from under its feet
+            setTimeout(() => this.stickersMenu.close());
         }
     }
 

From 50a2756203963482dac70ae7ad9c822449e4199b Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Thu, 29 Mar 2018 16:28:22 +0000
Subject: [PATCH 821/927] Translated using Weblate (German)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index fe489472f0..e67c9fcaaa 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -996,6 +996,12 @@
     "Debug Logs Submission": "Einsenden des Fehlerprotokolls",
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Wenn du einen Fehler via GitHub gemeldet hast, können Fehlerberichte uns helfen um das Problem zu finden. Sie enthalten Anwendungsdaten wie deinen Nutzernamen, Raum- und Gruppen-ID's und Aliase die du besucht hast und Nutzernamen anderer Nutzer. Sie enthalten keine Nachrichten.",
     "Submit debug logs": "Fehlerberichte einreichen",
-    "Code": "",
-    "Opens the Developer Tools dialog": "Öffnet den Entwicklerwerkzeugkasten"
+    "Code": "Code",
+    "Opens the Developer Tools dialog": "Öffnet den Entwicklerwerkzeugkasten",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Von %(displayName)s (%(userName)s) um %(dateTime)s gesehen",
+    "Unable to join community": "Community konnte nicht betreten werden",
+    "Unable to leave community": "Community konnte nicht verlassen werden",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Änderungen am <bold1>Namen</bold1> und <bold2>Bild</bold2> deiner Community werden evtl. erst nach 30 Minuten von anderen Nutzern gesehen werden.",
+    "Join this community": "Community beitreten",
+    "Leave this community": "Community verlassen"
 }

From c8f9586c9bbb939b4c272503e9adbc71c7041ec6 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:35:21 +0100
Subject: [PATCH 822/927] Check for valid reference.

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 12917e209d..fe99a18d92 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -90,7 +90,9 @@ export default class Stickerpicker extends React.Component {
     }
 
     componentWillUnmount() {
-        dis.unregister(this.dispatcherRef);
+        if (this.dispatcherRef) {
+            dis.unregister(this.dispatcherRef);
+        }
     }
 
     _imError(errorMsg, e) {

From 6181ca642f5454380600a332519959c9ca4337b7 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:47:53 +0100
Subject: [PATCH 823/927] "Stickerpack" translation.

---
 src/components/views/rooms/Stickerpicker.js | 2 +-
 src/i18n/strings/en_EN.json                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index fe99a18d92..e589b391d6 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -125,7 +125,7 @@ export default class Stickerpicker extends React.Component {
         // Load stickerpack content
         if (stickerpickerWidget && stickerpickerWidget.content && stickerpickerWidget.content.url) {
             // Set default name
-            stickerpickerWidget.content.name = stickerpickerWidget.name || "Stickerpack";
+            stickerpickerWidget.content.name = stickerpickerWidget.name || _t("Stickerpack");
             this.widgetId = stickerpickerWidget.id;
 
             stickersContent = (
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a1539cc665..50008c3202 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -256,6 +256,7 @@
     "Cannot add any more widgets": "Cannot add any more widgets",
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
+    "Stickerpack": "Stickerpack",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Click": "Click",
     "here": "here",

From b1e7dcf21645d3dc9ce365426cb0f3e621d297c4 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:52:34 +0100
Subject: [PATCH 824/927] Cleanup / simplify code.

---
 src/utils/widgets.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index c2eae88b17..edbe78fd58 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -49,8 +49,7 @@ function getUserWidgets() {
  * @return {[object]} Array containing current / active user widgets
  */
 function getUserWidgetsArray() {
-  const userWidgetContent = getUserWidgets();
-  return Object.keys(userWidgetContent).map((key) => userWidgetContent[key]);
+  return Object.values(getUserWidgets());
 }
 
 /**

From 3d9bdb90ca5ae013458c344239a4519766e031a4 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 17:56:12 +0100
Subject: [PATCH 825/927] Consistent async / await / promises.

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

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index 4cdf57f5c7..60b0fb534d 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -25,13 +25,13 @@ if (!global.mxIntegrationManager) {
 }
 
 export default class IntegrationManager {
-  static async _init() {
+  static _init() {
     if (!global.mxIntegrationManager.client || !global.mxIntegrationManager.connected) {
       if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
         ScalarMessaging.startListening();
         global.mxIntegrationManager.client = new ScalarAuthClient();
 
-        await global.mxIntegrationManager.client.connect().then(() => {
+        return global.mxIntegrationManager.client.connect().then(() => {
           global.mxIntegrationManager.connected = true;
         }).catch((e) => {
           console.error("Failed to connect to integrations server", e);

From 5ba18b5ee2088352be6705221bf398692fd8ac84 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 18:13:23 +0100
Subject: [PATCH 826/927] Avoid redefining function parameter

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

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index 60b0fb534d..6d488d91df 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -45,11 +45,11 @@ export default class IntegrationManager {
 
   /**
    * Launch the integrations manager on the stickers integration page
-   * @param  {string} integType integration / widget type
+   * @param  {string} integName integration / widget type
    * @param  {string} integId   integration / widget ID
    * @param  {function} onClose Callback to invoke on integration manager close
    */
-  static async open(integType, integId, onClose) {
+  static async open(integName, integId, onClose) {
     await IntegrationManager._init();
     const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
     if (global.mxIntegrationManager.error ||
@@ -57,7 +57,7 @@ export default class IntegrationManager {
       console.error("Scalar error", global.mxIntegrationManager);
       return;
     }
-    integType = 'type_' + integType;
+    const integType = 'type_' + integName;
     const src = (global.mxIntegrationManager.client && global.mxIntegrationManager.client.hasCredentials()) ?
       global.mxIntegrationManager.client.getScalarInterfaceUrlForRoom(
         {roomId: RoomViewStore.getRoomId()},

From d6b3083c2f16f55b1400be2d154e35b645c3c730 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 29 Mar 2018 18:18:53 +0100
Subject: [PATCH 827/927] Don't notify for bad encrypted messages

Continue to wait for decryption if the decryption process failed.
Because we weren't doing this, the first message in a megolm session
was generally failing to decrypt the first time because the keys often
arrive after the message.

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

This is is small & safe enough that we may want to consider
putting it in 0.14 if we're cutting another RC.
---
 src/Notifier.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Notifier.js b/src/Notifier.js
index e69bdf4461..b823c4df05 100644
--- a/src/Notifier.js
+++ b/src/Notifier.js
@@ -256,6 +256,10 @@ const Notifier = {
     },
 
     onEventDecrypted: function(ev) {
+        // 'decrypted' means the decryption process has finished: it may have failed,
+        // in which case it might decrypt soon if the keys arrive
+        if (ev.isDecryptionFailure()) return;
+
         const idx = this.pendingEncryptedEventIds.indexOf(ev.getId());
         if (idx === -1) return;
 

From 20cbc016987e144ae1b46fe9468503569fde6f64 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 18:32:49 +0100
Subject: [PATCH 828/927] Add callback handler for integration manager close.

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

diff --git a/src/IntegrationManager.js b/src/IntegrationManager.js
index 6d488d91df..eb45a1f425 100644
--- a/src/IntegrationManager.js
+++ b/src/IntegrationManager.js
@@ -47,9 +47,9 @@ export default class IntegrationManager {
    * Launch the integrations manager on the stickers integration page
    * @param  {string} integName integration / widget type
    * @param  {string} integId   integration / widget ID
-   * @param  {function} onClose Callback to invoke on integration manager close
+   * @param  {function} onFinished Callback to invoke on integration manager close
    */
-  static async open(integName, integId, onClose) {
+  static async open(integName, integId, onFinished) {
     await IntegrationManager._init();
     const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
     if (global.mxIntegrationManager.error ||
@@ -67,10 +67,7 @@ export default class IntegrationManager {
       null;
     Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
       src: src,
+      onFinished: onFinished,
     }, "mx_IntegrationsManager");
-
-    if (onClose) {
-      onClose();
-    }
   }
 }

From 248d1d6c5856096011dc5026f883a997bb2794e0 Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 29 Mar 2018 18:01:23 +0000
Subject: [PATCH 829/927] Translated using Weblate (Russian)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index f06bb8c00c..5f15336d91 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -998,5 +998,10 @@
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Если вы отправили ошибку через GitHub, журналы отладки могут помочь нам выявить проблему. Журналы отладки содержат данные об использовании приложения, включая ваше имя пользователя, идентификаторы или псевдонимы комнат или групп, которые вы посетили, а также имена других пользователей. Они не содержат сообщений.",
     "Submit debug logs": "Отправка журналов отладки",
     "Opens the Developer Tools dialog": "Открывает Инструменты разработчика",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Просмотрено %(displayName)s (%(userName)s) в %(dateTime)s"
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Просмотрено %(displayName)s (%(userName)s) в %(dateTime)s",
+    "Unable to join community": "Не удалось присоединиться к сообществу",
+    "Unable to leave community": "Не удалось покинуть сообщество",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Изменения <bold1>имени</bold1> и <bold2>аватара</bold2>, внесенные в ваше сообщество, могут не отображаться другим пользователям в течение 30 минут.",
+    "Join this community": "Присоединиться к сообществу",
+    "Leave this community": "Покинуть это сообщество"
 }

From 9a3f3562e12c05178048ce89feb91000a008dfee Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 20:07:26 +0100
Subject: [PATCH 830/927] Wait for setAccountData to complete.

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

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index 351c178da4..dad1bdf6f6 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -355,12 +355,13 @@ function setWidget(event, roomId) {
             };
         }
 
-        client.setAccountData('m.widgets', userWidgets);
-        sendResponse(event, {
-            success: true,
-        });
+        client.setAccountData('m.widgets', userWidgets).then(() => {
+            sendResponse(event, {
+                success: true,
+            });
 
-        dis.dispatch({ action: "user_widget_updated" });
+            dis.dispatch({ action: "user_widget_updated" });
+        });
     } else { // Room widget
         if (!roomId) {
             sendError(event, _t('Missing roomId.'), null);

From 93804e80b864719bed8a4bc88e502a2effeb3330 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 20:37:24 +0100
Subject: [PATCH 831/927] Return promise

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

diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index edbe78fd58..62f841c9c2 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -76,7 +76,7 @@ function removeStickerpickerWidgets() {
             delete userWidgets[key];
         }
     });
-    client.setAccountData('m.widgets', userWidgets);
+    return client.setAccountData('m.widgets', userWidgets);
 }
 
 

From 2e6d6c83cdcf26dc55425fde2258b7ffdfd15b73 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 21:16:12 +0100
Subject: [PATCH 832/927] Add back in body 'ref'

---
 src/components/views/messages/MStickerBody.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/messages/MStickerBody.js b/src/components/views/messages/MStickerBody.js
index 8ae5bdd2c4..08ddb6de20 100644
--- a/src/components/views/messages/MStickerBody.js
+++ b/src/components/views/messages/MStickerBody.js
@@ -108,8 +108,9 @@ export default class MStickerBody extends MImageBody {
 
         placeholderSize = placeholderSize + 'px';
 
+        // Body 'ref' required by MImageBody
         return (
-            <span className='mx_MStickerBody'
+            <span className='mx_MStickerBody' ref='body'
                 style={{
                     height: placeholderFixupHeight,
                 }}>

From 003cf6138865f76ac5600c6f5a311319a69f1879 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 21:16:35 +0100
Subject: [PATCH 833/927] Handle remove sticker picker errors.

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index e589b391d6..32bf284c19 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -66,10 +66,14 @@ export default class Stickerpicker extends React.Component {
         } else {
             console.warn('No widget ID specified, not disabling assets');
         }
-        Widgets.removeStickerpickerWidgets();
-        this._getStickerPickerWidget();
+
         // Wrap this in a timeout in order to avoid the DOM node from being pulled from under its feet
         setTimeout(() => this.stickersMenu.close());
+        Widgets.removeStickerpickerWidgets().then(() => {
+            this._getStickerPickerWidget();
+        }).catch((e) => {
+            console.error('Failed to remove sticker picker widget', e);
+        });
     }
 
     componentDidMount() {

From ff0834ad9d1f50b951e363bcfd9615d62edf421d Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 21:31:09 +0100
Subject: [PATCH 834/927] Add comment.

---
 src/components/structures/MessagePanel.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 248c874fa8..773c9710dd 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -450,7 +450,12 @@ module.exports = React.createClass({
         if (prevEvent !== null
                 && prevEvent.sender && mxEv.sender
                 && mxEv.sender.userId === prevEvent.sender.userId
-                 && Boolean(mxEv.getContent().body) == Boolean(prevEvent.getContent().body)) {
+                // The preferred way of checking for 'continuation messages' is by
+                // checking whether subsiquent messages from the same user have a
+                // message body. This is because all messages intended to be displayed
+                // should have a 'body' whereas some (non-m.room) messages (such as
+                // m.sticker) may not have a message 'type'.
+                && Boolean(mxEv.getContent().body) == Boolean(prevEvent.getContent().body)) {
             continuation = true;
         }
 

From 9cc3d3c9bbaa4b8b8d7d54a11b2742fde09f440a Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 21:48:03 +0100
Subject: [PATCH 835/927] Move default sticker content into generator function.

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 32bf284c19..63ebfe3496 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -1,6 +1,5 @@
 /*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -38,21 +37,24 @@ export default class Stickerpicker extends React.Component {
         this._onWidgetAction = this._onWidgetAction.bind(this);
         this.onFinished = this.onFinished.bind(this);
 
-        this.defaultStickersContent = (
+        this.popoverWidth = 300;
+        this.popoverHeight = 300;
+
+        this.state = {
+            stickersContent: this.defaultStickersContent(),
+            showStickers: false,
+            imError: null,
+        };
+    }
+
+    defaultStickersContent() {
+        return (
             <div className='mx_Stickers_contentPlaceholder'>
                 <p>{ _t("You don't currently have any stickerpacks enabled") }</p>
                 <p>{ _t("Click") } <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("here") }</span> { _t("to add some!") }</p>
                 <img src='img/stickerpack-placeholder.png' alt={_t('Add a stickerpack')} />
             </div>
         );
-        this.popoverWidth = 300;
-        this.popoverHeight = 300;
-
-        this.state = {
-            stickersContent: this.defaultStickersContent,
-            showStickers: false,
-            imError: null,
-        };
     }
 
     _removeStickerpickerWidgets() {
@@ -175,7 +177,7 @@ export default class Stickerpicker extends React.Component {
         } else {
             // Default content to show if stickerpicker widget not added
             console.warn("No available sticker picker widgets");
-            stickersContent = this.defaultStickersContent;
+            stickersContent = this.defaultStickersContent();
             this.widgetId = null;
             this.forceUpdate();
         }

From 557a45e89007ed97ccec6c11ade572fcbda82641 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Thu, 29 Mar 2018 22:22:57 +0100
Subject: [PATCH 836/927] Remove inline styling.

---
 src/components/views/rooms/Stickerpicker.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 63ebfe3496..1a74da9a8b 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -135,12 +135,7 @@ export default class Stickerpicker extends React.Component {
             this.widgetId = stickerpickerWidget.id;
 
             stickersContent = (
-                <div
-                    style={{
-                        overflow: 'hidden',
-                        height: '300px',
-                    }}
-                >
+                <div className='mx_Stickers_content_container'>
                     <div
                         id='stickersContent'
                         className='mx_Stickers_content'

From 0be26361c6bdec6cb81462746a6a1cb682f13b8c Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Fri, 30 Mar 2018 01:55:31 +0000
Subject: [PATCH 837/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9fded62d18..c0d4ce20c8 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -998,5 +998,10 @@
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "如果您透過 GitHub 來回報錯誤，除錯訊息可以用來追蹤問題。除錯訊息包含應用程式的使用資料，包括您的使用者名稱、您所造訪的房間/群組的 ID 或別名、其他使用者的使用者名稱等，其中不包含訊息本身。",
     "Submit debug logs": "傳送除錯訊息",
     "Opens the Developer Tools dialog": "開啟開發者工具對話視窗",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "被 %(displayName)s (%(userName)s) 於 %(dateTime)s 看過"
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "被 %(displayName)s (%(userName)s) 於 %(dateTime)s 看過",
+    "Unable to join community": "無法加入社群",
+    "Unable to leave community": "無法離開社群",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "對您的社群的<bold1>名稱</bold1>與<bold2>大頭貼</bold2>的變更可能在最多30分鐘內不會被其他使用者看到。",
+    "Join this community": "加入此社群",
+    "Leave this community": "離開此社群"
 }

From 01956603e5b9e465c7b70d56a422d71cd03fd105 Mon Sep 17 00:00:00 2001
From: Xose M <xosem@disroot.org>
Date: Fri, 30 Mar 2018 13:28:08 +0000
Subject: [PATCH 838/927] Translated using Weblate (Galician)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index fa290a33f1..bc86593fc4 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -992,5 +992,16 @@
     "Changes made to your community might not be seen by other users for up to 30 minutes.": "Os cambios feitos a súa comunidade poderían tardar uns 30 minutos en ser visibles para os membros.",
     "Did you know: you can use communities to filter your Riot.im experience!": "Sabía que pode utilizar as comunidades para mellorar a súa experiencia con Riot.im!",
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Para establecer un filtro, arrastre un avatar da comunidade sobre o panel de filtros na parte esquerda da pantalla. Pode pulsar nun avatar no panel de filtrado en calquer moemento para ver só salas e xente asociada a esa comunidade.",
-    "Deops user with given id": "Degradar usuaria co id dado"
+    "Deops user with given id": "Degradar usuaria co id dado",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Visto por %(displayName)s(%(userName)s en %(dateTime)s",
+    "Code": "Código",
+    "Unable to join community": "Non se puido unir a comunidade",
+    "Unable to leave community": "Non se puido deixar a comunidade",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Os cambios realizados a súa comunidade <bold1>name</bold1> e <bold2>avatar</bold2) poderían non ser vistos por outras usuarias ate dentro de 30 minutos.",
+    "Join this community": "Únase a esta comunidade",
+    "Leave this community": "Deixar esta comunidade",
+    "Debug Logs Submission": "Envío de rexistro de depuración",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Si enviou un reporte de fallo a través de GitHub, os informes poden axudarnos a examinar o problema. Os informes de fallo conteñen datos do uso do aplicativo incluíndo o seu nome de usuaria, os IDs ou alcumes das salas e grupos que visitou e os nomes de usuaria de outras personas. Non conteñen mensaxes.",
+    "Submit debug logs": "Enviar informes de depuración",
+    "Opens the Developer Tools dialog": "Abre o cadro de Ferramentas de Desenvolvedoras"
 }

From f417e60ba7730fdfcf6a73d530d8fe93f719eb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Sat, 31 Mar 2018 12:56:50 +0000
Subject: [PATCH 839/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index ab7812321b..faf4cc0aa1 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -981,5 +981,26 @@
     "Failed to add tag %(tagName)s to room": "Miestnosti sa nepodarilo pridať značku %(tagName)s",
     "<a>In reply to</a> <pill>": "<a>Odpoveď na</a> <pill>",
     "Community IDs cannot not be empty.": "ID komunity nemôže ostať prázdne.",
-    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText>, <sendAnywayText>napriek tomu odoslať</sendAnywayText> alebo <cancelText>zrušiť</cancelText>."
+    "<showDevicesText>Show devices</showDevicesText>, <sendAnywayText>send anyway</sendAnywayText> or <cancelText>cancel</cancelText>.": "<showDevicesText>Zobraziť zariadenia</showDevicesText>, <sendAnywayText>napriek tomu odoslať</sendAnywayText> alebo <cancelText>zrušiť</cancelText>.",
+    "Disable Community Filter Panel": "Zakázať panel Filter komunity",
+    "Your key share request has been sent - please check your other devices for key share requests.": "Žiadosť o zdieľanie kľúčov bola odoslaná - Overte si zobrazenie žiadosti o zdieľanie kľúčov na vašich ostatných zariadeniach.",
+    "Key share requests are sent to your other devices automatically. If you rejected or dismissed the key share request on your other devices, click here to request the keys for this session again.": "Žiadosť o zdieľanie kľúčov je automaticky odoslaná na vaše ďalšie zariadenia. Ak ste žiadosť odmietli alebo zrušili dialógové okno so žiadosťou na ostatných zariadeniach, kliknutím sem môžete opätovne vyžiadať kľúče pre túto reláciu.",
+    "If your other devices do not have the key for this message you will not be able to decrypt them.": "Ak kľúče pre tieto správy nemáte uložené na ostatných vašich zariadeniach, nebudete ich môcť dešifrovať.",
+    "Key request sent.": "Žiadosť o kľúče odoslaná.",
+    "<requestLink>Re-request encryption keys</requestLink> from your other devices.": "<requestLink>Znovu vyžiadať šifrovacie kľúče</requestLink> z vašich ostatných zariadení.",
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) videl %(dateTime)s",
+    "%(user)s is a %(userRole)s": "%(user)s je %(userRole)s",
+    "Code": "Kód",
+    "Unable to join community": "Nie je možné vstúpiť do komunity",
+    "Unable to leave community": "Nie je možné opustiť komunitu",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Zmeny vykonané vo vašej komunite <bold1>name</bold1> and <bold2>avatar</bold2> nemusia byť nasledujúcich 30 minút viditeľné všetkými používateľmi.",
+    "Join this community": "Vstúpiť do tejto komunity",
+    "Leave this community": "Opustiť túto komunitu",
+    "Did you know: you can use communities to filter your Riot.im experience!": "Vedeli ste: Že prácu s Riot.im si môžete spríjemníť použitím komunít!",
+    "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Ak si chcete nastaviť filter, pretiahnite avatara komunity na panel filtrovania úplne na ľavej strane obrazovky. Potom môžete kedykoľvek kliknúť na avatara komunity na tomto panely a Riot.im vám bude zobrazovať len miestnosti a ľudí z komunity, na ktorej avatar ste klikli.",
+    "Clear filter": "Zrušiť filter",
+    "Debug Logs Submission": "Odoslanie ladiacich záznamov",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ak ste nám poslali hlásenie o chybe cez Github, ladiace záznamy nám môžu pomôcť lepšie identifikovať chybu. Ladiace záznamy obsahujú údaje o používaní aplikácii vrátane vašeho používateľského mena, názvy a aliasy miestností a komunít, do ktorých ste vstúpili, mená používateľov, s ktorými ste komunikovali. Tieto záznamy neobsahujú samotný obsah vašich správ.",
+    "Submit debug logs": "Odoslať ladiace záznamy",
+    "Opens the Developer Tools dialog": "Otvorí dialóg nástroje pre vývojárov"
 }

From 778ebe63ffb9b21e680697323d319e03c39b8095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Sat, 31 Mar 2018 17:42:10 +0200
Subject: [PATCH 840/927] TopUnreadMessagesBar: turn clickables into accessible
 buttons and fix over verbosity for the accessible name.

---
 .../views/rooms/TopUnreadMessagesBar.js          | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/views/rooms/TopUnreadMessagesBar.js b/src/components/views/rooms/TopUnreadMessagesBar.js
index 85a5d3863e..b2648e55a9 100644
--- a/src/components/views/rooms/TopUnreadMessagesBar.js
+++ b/src/components/views/rooms/TopUnreadMessagesBar.js
@@ -20,6 +20,7 @@ limitations under the License.
 const React = require('react');
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
+import AccessibleButton from '../elements/AccessibleButton';
 const sdk = require('../../../index');
 
 module.exports = React.createClass({
@@ -33,14 +34,19 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_TopUnreadMessagesBar">
-                <div className="mx_TopUnreadMessagesBar_scrollUp"
+                <AccessibleButton className="mx_TopUnreadMessagesBar_scrollUp"
                         onClick={this.props.onScrollUpClick}>
                     <img src="img/scrollto.svg" width="24" height="24"
-                        alt={_t('Scroll to unread messages')}
-                        title={_t('Scroll to unread messages')} />
+                        // No point on setting up non empty alt on this image
+                        // as it only complements the text which follows it.
+                        alt=""
+                        title={_t('Scroll to unread messages')}
+                        // In order not to use this title attribute for accessible name
+                        // calculation of the parent button set the role presentation
+                        role="presentation" />
                     { _t("Jump to first unread message.") }
-                </div>
-                <img className="mx_TopUnreadMessagesBar_close mx_filterFlipColor"
+                </AccessibleButton>
+                <AccessibleButton element='img' className="mx_TopUnreadMessagesBar_close mx_filterFlipColor"
                     src="img/cancel.svg" width="18" height="18"
                     alt={_t("Close")} title={_t("Close")}
                     onClick={this.props.onCloseClick} />

From 65308a4c83ce79c77175402feda896c21de2e838 Mon Sep 17 00:00:00 2001
From: Gergely Bakos <bgergo88@gmail.com>
Date: Sun, 1 Apr 2018 09:39:09 +0000
Subject: [PATCH 841/927] Translated using Weblate (Hungarian)

Currently translated at 99.8% (998 of 999 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d8e13c9ae3..47736bcb21 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -998,5 +998,9 @@
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ha a GitHubon keresztül küldted be a hibát, a hibakeresési napló segíthet nekünk a javításban. A napló felhasználási adatokat tartalmaz mint a felhasználói neved, az általad meglátogatott szobák vagy csoportok azonosítóját vagy alternatív nevét és mások felhasználói nevét. De nem tartalmazzák az üzeneteket.",
     "Submit debug logs": "Hibakeresési napló küldése",
     "Opens the Developer Tools dialog": "Megnyitja a fejlesztői eszközök ablakát",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) az alábbi időpontban látta: %(dateTime)s"
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s) az alábbi időpontban látta: %(dateTime)s",
+    "Unable to join community": "Nem sikerült csatlakozni a közösséghez",
+    "Unable to leave community": "Nem sikerült elhagyni a közösséget",
+    "Join this community": "Csatlakozás ehhez a közösséghez",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "A közösséget <bold1>name</bold1> and <bold2>avatar</bold2> érintő változások legfeljebb 30 percig nem lesznek láthatóak más felhasználók számára."
 }

From e1d6c17dafa6b0bcb05be1a4a902ee2e316c81fa Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Sun, 1 Apr 2018 09:39:38 +0000
Subject: [PATCH 842/927] Translated using Weblate (Hungarian)

Currently translated at 99.8% (998 of 999 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 47736bcb21..abdbacf984 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1002,5 +1002,5 @@
     "Unable to join community": "Nem sikerült csatlakozni a közösséghez",
     "Unable to leave community": "Nem sikerült elhagyni a közösséget",
     "Join this community": "Csatlakozás ehhez a közösséghez",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "A közösséget <bold1>name</bold1> and <bold2>avatar</bold2> érintő változások legfeljebb 30 percig nem lesznek láthatóak más felhasználók számára."
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "A közösséget <bold1>name</bold1> és <bold2>avatar</bold2> érintő változások legfeljebb 30 percig nem lesznek láthatók más felhasználók számára."
 }

From 2493ede6a69ec6b7443b395796d729f9a39625cc Mon Sep 17 00:00:00 2001
From: Gergely Bakos <bgergo88@gmail.com>
Date: Sun, 1 Apr 2018 09:39:53 +0000
Subject: [PATCH 843/927] Translated using Weblate (Hungarian)

Currently translated at 99.8% (999 of 999 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index abdbacf984..6a9ec07071 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1002,5 +1002,6 @@
     "Unable to join community": "Nem sikerült csatlakozni a közösséghez",
     "Unable to leave community": "Nem sikerült elhagyni a közösséget",
     "Join this community": "Csatlakozás ehhez a közösséghez",
-    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "A közösséget <bold1>name</bold1> és <bold2>avatar</bold2> érintő változások legfeljebb 30 percig nem lesznek láthatók más felhasználók számára."
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "A közösséget <bold1>name</bold1> és <bold2>avatar</bold2> érintő változások legfeljebb 30 percig nem lesznek láthatók más felhasználók számára.",
+    "Leave this community": "Közösség elhagyása"
 }

From 11915b0cdf51ef8c15cbf573c7cd3e364aea1afc Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 2 Apr 2018 10:02:41 +0100
Subject: [PATCH 844/927] Fix user widget event type. Add comments for clarity.

---
 src/ScalarMessaging.js | 6 +++++-
 src/WidgetUtils.js     | 2 +-
 src/utils/widgets.js   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ScalarMessaging.js b/src/ScalarMessaging.js
index dad1bdf6f6..123d02159e 100644
--- a/src/ScalarMessaging.js
+++ b/src/ScalarMessaging.js
@@ -350,7 +350,7 @@ function setWidget(event, roomId) {
                 content: content,
                 sender: client.getUserId(),
                 stateKey: widgetId,
-                type: 'im.vector.modular.widgets',
+                type: 'm.widget',
                 id: widgetId,
             };
         }
@@ -370,6 +370,8 @@ function setWidget(event, roomId) {
         if (widgetUrl === null) { // widget is being deleted
             content = {};
         }
+        // TODO - Room widgets need to be moved to 'm.widget' state events
+        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
         client.sendStateEvent(roomId, "im.vector.modular.widgets", content, widgetId).done(() => {
             sendResponse(event, {
                 success: true,
@@ -394,6 +396,8 @@ function getWidgets(event, roomId) {
             sendError(event, _t('This room is not recognised.'));
             return;
         }
+        // TODO - Room widgets need to be moved to 'm.widget' state events
+        // https://docs.google.com/document/d/1uPF7XWY_dXTKVKV7jZQ2KmsI19wn9-kFRgQ1tFQP7wQ/edit?usp=sharing
         const stateEvents = room.currentState.getStateEvents("im.vector.modular.widgets");
         // Only return widgets which have required fields
         if (room) {
diff --git a/src/WidgetUtils.js b/src/WidgetUtils.js
index 34c998978d..5f45a8c58c 100644
--- a/src/WidgetUtils.js
+++ b/src/WidgetUtils.js
@@ -17,8 +17,8 @@ limitations under the License.
 import MatrixClientPeg from './MatrixClientPeg';
 
 export default class WidgetUtils {
-
     /* Returns true if user is able to send state events to modify widgets in this room
+     * (Does not apply to non-room-based / user widgets)
      * @param roomId -- The ID of the room to check
      * @return Boolean -- true if the user can modify widgets in this room
      * @throws Error -- specifies the error reason
diff --git a/src/utils/widgets.js b/src/utils/widgets.js
index 62f841c9c2..0d7f5dbf3f 100644
--- a/src/utils/widgets.js
+++ b/src/utils/widgets.js
@@ -64,6 +64,7 @@ function getStickerpickerWidgets() {
 
 /**
  * Remove all stickerpicker widgets (stickerpickers are user widgets by nature)
+ * @return {Promise} Resolves on account data updated
  */
 function removeStickerpickerWidgets() {
     const client = MatrixClientPeg.get();

From d83b6f1cf8891b85b1166badf68920308657b337 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 2 Apr 2018 10:18:35 +0100
Subject: [PATCH 845/927] Use AccessibleButton.

---
 src/components/views/rooms/Stickerpicker.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 1a74da9a8b..17fd839944 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -24,6 +24,7 @@ import sdk from '../../../index';
 import SdkConfig from '../../../SdkConfig';
 import ScalarAuthClient from '../../../ScalarAuthClient';
 import dis from '../../../dispatcher';
+import AccessibleButton from '../elements/AccessibleButton';
 
 const widgetType = 'm.stickerpicker';
 
@@ -49,11 +50,12 @@ export default class Stickerpicker extends React.Component {
 
     defaultStickersContent() {
         return (
-            <div className='mx_Stickers_contentPlaceholder'>
+            <AccessibleButton onClick={this._launchManageIntegrations}
+                className='mx_Stickers_contentPlaceholder'>
                 <p>{ _t("You don't currently have any stickerpacks enabled") }</p>
-                <p>{ _t("Click") } <span className='mx_Stickers_addLink' onClick={this._launchManageIntegrations} > { _t("here") }</span> { _t("to add some!") }</p>
+                <p className='mx_Stickers_addLink'>Add some now</p>
                 <img src='img/stickerpack-placeholder.png' alt={_t('Add a stickerpack')} />
-            </div>
+            </AccessibleButton>
         );
     }
 

From 49bea1a35b61b18ed127c457e8cb71213259eb34 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 2 Apr 2018 10:56:45 +0100
Subject: [PATCH 846/927] Move stickerpicker content out of state in to
 generator function.

---
 src/components/views/rooms/Stickerpicker.js | 64 ++++++++++++---------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 17fd839944..1a204b45d5 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -36,29 +36,17 @@ export default class Stickerpicker extends React.Component {
         this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
         this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
         this._onWidgetAction = this._onWidgetAction.bind(this);
-        this.onFinished = this.onFinished.bind(this);
+        this._onFinished = this._onFinished.bind(this);
 
         this.popoverWidth = 300;
         this.popoverHeight = 300;
 
         this.state = {
-            stickersContent: this.defaultStickersContent(),
             showStickers: false,
             imError: null,
         };
     }
 
-    defaultStickersContent() {
-        return (
-            <AccessibleButton onClick={this._launchManageIntegrations}
-                className='mx_Stickers_contentPlaceholder'>
-                <p>{ _t("You don't currently have any stickerpacks enabled") }</p>
-                <p className='mx_Stickers_addLink'>Add some now</p>
-                <img src='img/stickerpack-placeholder.png' alt={_t('Add a stickerpack')} />
-            </AccessibleButton>
-        );
-    }
-
     _removeStickerpickerWidgets() {
         console.warn('Removing Stickerpicker widgets');
         if (this.widgetId) {
@@ -74,7 +62,7 @@ export default class Stickerpicker extends React.Component {
         // Wrap this in a timeout in order to avoid the DOM node from being pulled from under its feet
         setTimeout(() => this.stickersMenu.close());
         Widgets.removeStickerpickerWidgets().then(() => {
-            this._getStickerPickerWidget();
+            this._getStickerpickerContent();
         }).catch((e) => {
             console.error('Failed to remove sticker picker widget', e);
         });
@@ -92,9 +80,9 @@ export default class Stickerpicker extends React.Component {
         }
 
         if (!this.state.imError) {
-            this._getStickerPickerWidget();
             this.dispatcherRef = dis.register(this._onWidgetAction);
         }
+        this._getStickerpickerContent();
     }
 
     componentWillUnmount() {
@@ -105,28 +93,52 @@ export default class Stickerpicker extends React.Component {
 
     _imError(errorMsg, e) {
         console.error(errorMsg, e);
-        const imErrorContent = <div style={{"text-align": "center"}} className="error"><p> { errorMsg } </p></div>;
         this.setState({
             showStickers: false,
             imError: errorMsg,
-            stickersContent: imErrorContent,
         });
     }
 
     _onWidgetAction(payload) {
         if (payload.action === "user_widget_updated") {
-            this._getStickerPickerWidget();
+            this._getStickerpickerContent();
             return;
         } else if (payload.action === "stickerpicker_close") {
-            // Wrap this in a timeout in order to avoid the DOM node from being pulled from under its feet
+            // Wrap this in a timeout in order to avoid the DOM node from being
+            // pulled from under its feet
             setTimeout(() => this.stickersMenu.close());
         }
     }
 
-    _getStickerPickerWidget() {
+    _defaultStickerpickerContent() {
+        return (
+            <AccessibleButton onClick={this._launchManageIntegrations}
+                className='mx_Stickers_contentPlaceholder'>
+                <p>{ _t("You don't currently have any stickerpacks enabled") }</p>
+                <p className='mx_Stickers_addLink'>Add some now</p>
+                <img src='img/stickerpack-placeholder.png' alt={_t('Add a stickerpack')} />
+            </AccessibleButton>
+        );
+    }
+
+    _errorStickerpickerContent() {
+        return (
+            <div style={{"text-align": "center"}} className="error">
+                <p> { this.state.imError } </p>
+            </div>
+        );
+    }
+
+    _getStickerpickerContent() {
+        // Handle Integration Manager errors
+        if (this.state._imError) {
+            return this._errorStickerpickerContent();
+        }
+
         // Stickers
         // TODO - Add support for Stickerpickers from multiple app stores.
-        // Render content from multiple stickerpack sources, each within their own iframe, within the stickerpicker UI element.
+        // Render content from multiple stickerpack sources, each within their
+        // own iframe, within the stickerpicker UI element.
         const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
         let stickersContent;
 
@@ -180,8 +192,8 @@ export default class Stickerpicker extends React.Component {
         }
         this.setState({
             showStickers: false,
-            stickersContent: stickersContent,
         });
+        return stickersContent;
     }
 
     /**
@@ -190,7 +202,7 @@ export default class Stickerpicker extends React.Component {
      * @param  {Event} e Event that triggered the function
      */
     _onShowStickersClick(e) {
-        this._getStickerPickerWidget();
+        this._getStickerpickerContent();
         const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
         const buttonRect = e.target.getBoundingClientRect();
 
@@ -205,8 +217,8 @@ export default class Stickerpicker extends React.Component {
             top: y,
             menuWidth: this.popoverWidth,
             menuHeight: this.popoverHeight,
-            element: this.state.stickersContent,
-            onFinished: this.onFinished,
+            element: this._getStickerpickerContent(),
+            onFinished: this._onFinished,
             menuPaddingTop: 0,
         });
 
@@ -225,7 +237,7 @@ export default class Stickerpicker extends React.Component {
     /**
      * The stickers picker was hidden
      */
-    onFinished() {
+    _onFinished() {
         this.setState({showStickers: false});
     }
 

From 8241afe87dbf55975163cae548c0ef7506251492 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 2 Apr 2018 20:25:24 +0100
Subject: [PATCH 847/927] Fix content references

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index 1a204b45d5..e45f0e8f1b 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -62,7 +62,7 @@ export default class Stickerpicker extends React.Component {
         // Wrap this in a timeout in order to avoid the DOM node from being pulled from under its feet
         setTimeout(() => this.stickersMenu.close());
         Widgets.removeStickerpickerWidgets().then(() => {
-            this._getStickerpickerContent();
+            this.forceUpdate();
         }).catch((e) => {
             console.error('Failed to remove sticker picker widget', e);
         });
@@ -82,7 +82,6 @@ export default class Stickerpicker extends React.Component {
         if (!this.state.imError) {
             this.dispatcherRef = dis.register(this._onWidgetAction);
         }
-        this._getStickerpickerContent();
     }
 
     componentWillUnmount() {
@@ -101,8 +100,7 @@ export default class Stickerpicker extends React.Component {
 
     _onWidgetAction(payload) {
         if (payload.action === "user_widget_updated") {
-            this._getStickerpickerContent();
-            return;
+            this.forceUpdate();
         } else if (payload.action === "stickerpicker_close") {
             // Wrap this in a timeout in order to avoid the DOM node from being
             // pulled from under its feet
@@ -186,7 +184,7 @@ export default class Stickerpicker extends React.Component {
         } else {
             // Default content to show if stickerpicker widget not added
             console.warn("No available sticker picker widgets");
-            stickersContent = this.defaultStickersContent();
+            stickersContent = this._defaultStickerpickerContent();
             this.widgetId = null;
             this.forceUpdate();
         }
@@ -202,7 +200,6 @@ export default class Stickerpicker extends React.Component {
      * @param  {Event} e Event that triggered the function
      */
     _onShowStickersClick(e) {
-        this._getStickerpickerContent();
         const GenericElementContextMenu = sdk.getComponent('context_menus.GenericElementContextMenu');
         const buttonRect = e.target.getBoundingClientRect();
 

From b109c9304c7ecdb1fa68c46a8aa4fc786bcb8ba8 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Mon, 2 Apr 2018 22:24:46 +0100
Subject: [PATCH 848/927] Put stickers behind labs flag.

---
 src/components/views/rooms/MessageComposer.js | 7 ++++++-
 src/i18n/strings/en_EN.json                   | 1 +
 src/settings/Settings.js                      | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 0f98e6b526..ff46f7423e 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -329,6 +329,11 @@ export default class MessageComposer extends React.Component {
                 }
             }
 
+            let stickerpickerButton;
+            if (SettingsStore.isFeatureEnabled('feature_sticker_messages')) {
+                stickerpickerButton = <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />;
+            }
+
             controls.push(
                 <MessageComposerInput
                     ref={(c) => this.messageComposerInput = c}
@@ -340,7 +345,7 @@ export default class MessageComposer extends React.Component {
                     onContentChanged={this.onInputContentChanged}
                     onInputStateChanged={this.onInputStateChanged} />,
                 formattingButton,
-                <Stickerpicker key='stickerpicker_controls_button' room={this.props.room} />,
+                stickerpickerButton,
                 uploadButton,
                 hangupButton,
                 callButton,
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 50008c3202..8aac4e60d0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -257,6 +257,7 @@
     "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.",
     "Add a widget": "Add a widget",
     "Stickerpack": "Stickerpack",
+    "Sticker Messages": "Sticker Messages",
     "You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
     "Click": "Click",
     "here": "here",
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index cd37c00fa8..7acaa8009f 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -100,6 +100,12 @@ export const SETTINGS = {
         supportedLevels: LEVELS_FEATURE,
         default: false,
     },
+    "feature_sticker_messages": {
+        isFeature: true,
+        displayName: _td("Sticker Messages"),
+        supportedLevels: LEVELS_FEATURE,
+        default: false,
+    },
     "MessageComposerInput.dontSuggestEmoji": {
         supportedLevels: LEVELS_ACCOUNT_SETTINGS,
         displayName: _td('Disable Emoji suggestions while typing'),

From 0f5e5de95fa3133f5c714cc6ac90ed1c6ddc2ef9 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 2 Apr 2018 21:52:16 +0000
Subject: [PATCH 849/927] Translated using Weblate (Basque)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index d8f81f653d..276baab771 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -998,5 +998,10 @@
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Akats bat bidali baduzu GitHub bidez, arazte-egunkariek arazoa aurkitzen lagundu gaitzakete. Arazte-egunkariek aplikazioak darabilen datuak dauzkate, zure erabiltzaile izena barne, bisitatu dituzun gelen ID-ak edo ezizenak eta beste erabiltzaileen izenak. Ez dute mezurik.",
     "Submit debug logs": "Bidali arazte-txostenak",
     "Opens the Developer Tools dialog": "Garatzailearen tresnen elkarrizketa-koadroa irekitzen du",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s)(e)k ikusita %(dateTime)s(e)tan"
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "%(displayName)s (%(userName)s)(e)k ikusita %(dateTime)s(e)tan",
+    "Unable to join community": "Ezinekoa komunitatera elkartzea",
+    "Unable to leave community": "Ezinezkoa komunitatetik ateratzea",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Zure komunitatearen <bold1>izen</bold1> eta <bold2>abatar</bold2>ari egindako aldaketak 30 minutu behar ditzakete beste erabiltzaileek ikusi arte.",
+    "Join this community": "Elkartu komunitate honetara",
+    "Leave this community": "Atera komunitate honetatik"
 }

From 8ca1243ecb9219fd99a55e895310529689831324 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 3 Apr 2018 17:35:34 +0100
Subject: [PATCH 850/927] Add null-guard to prevent RoomAvatar NPE when room is
 null

which may have been occuring when peeking into a room that the
client hasn't got a Room object for.

Fixes https://github.com/vector-im/riot-web/issues/6432
---
 src/components/views/avatars/RoomAvatar.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index e547cf0fa7..ef69bcb60a 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -66,7 +66,8 @@ module.exports = React.createClass({
     },
 
     onRoomStateEvents: function(ev) {
-        if (ev.getRoomId() !== this.props.room.roomId ||
+        if (!this.props.room ||
+            ev.getRoomId() !== this.props.room.roomId ||
             ev.getType() !== 'm.room.avatar'
         ) return;
 

From b6435601c59c44d400534c5a7549f391a068d450 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 3 Apr 2018 16:49:29 +0000
Subject: [PATCH 851/927] Translated using Weblate (Bulgarian)

Currently translated at 99.6% (996 of 999 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 40b0eda0a4..f33fcadeb1 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1001,5 +1001,7 @@
     "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ако сте изпратили грешка чрез GitHub, логовете за дебъгване могат да ни помогнат да проследим проблема. Логовете за дебъгване съдържат данни за използване на приложението, включващи потребителското Ви име, идентификаторите или псевдонимите на стаите или групите, които сте посетили, и потребителските имена на други потребители. Те не съдържат съобщения.",
     "Submit debug logs": "Изпрати логове за дебъгване",
     "Opens the Developer Tools dialog": "Отваря прозорец с инструменти на разработчика",
-    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Видяно от %(displayName)s (%(userName)s) в %(dateTime)s"
+    "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Видяно от %(displayName)s (%(userName)s) в %(dateTime)s",
+    "Unable to join community": "Неуспешно влизане в общността",
+    "Unable to leave community": "Неуспешно напускане на общността"
 }

From 597ccbafadb98956c38fb9152f6761a26f4f7d75 Mon Sep 17 00:00:00 2001
From: WSKaCrs <wska@mainstars.net>
Date: Tue, 3 Apr 2018 13:40:09 +0000
Subject: [PATCH 852/927] Translated using Weblate (Chinese (Simplified))

Currently translated at 80.1% (801 of 999 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 86aebb7aa5..c7e67319ef 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -802,5 +802,6 @@
     "Your Communities": "你的社区",
     "Failed to set direct chat tag": "无法设定私聊标签",
     "Failed to remove tag %(tagName)s from room": "移除聊天室标签 %(tagName)s 失败",
-    "Failed to add tag %(tagName)s to room": "无法为聊天室新增标签 %(tagName)s"
+    "Failed to add tag %(tagName)s to room": "无法为聊天室新增标签 %(tagName)s",
+    "Submit debug logs": "提交调试日志"
 }

From baba8dec435681ba936fcc35ad848729e31e3152 Mon Sep 17 00:00:00 2001
From: Moo <hazap@hotmail.com>
Date: Tue, 3 Apr 2018 09:31:23 +0000
Subject: [PATCH 853/927] Translated using Weblate (Lithuanian)

Currently translated at 1.4% (14 of 999 strings)

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

diff --git a/src/i18n/strings/lt.json b/src/i18n/strings/lt.json
index 23ea52cb96..38cc908111 100644
--- a/src/i18n/strings/lt.json
+++ b/src/i18n/strings/lt.json
@@ -1,12 +1,12 @@
 {
     "This email address is already in use": "Šis el. pašto adresas jau naudojamas",
     "This phone number is already in use": "Šis telefono numeris jau naudojamas",
-    "Failed to verify email address: make sure you clicked the link in the email": "Nepavyko patvirtinti el. pašto adreso: patikrinkite ar paspaudėte nuorodą atsiųstame el. laiške",
-    "The platform you're on": "Jūsų platforma",
+    "Failed to verify email address: make sure you clicked the link in the email": "Nepavyko patvirtinti el. pašto adreso: įsitikinkite, kad gautame el. laiške spustelėjote nuorodą",
+    "The platform you're on": "Jūsų naudojama platforma",
     "The version of Riot.im": "Riot.im versija",
-    "Whether or not you're logged in (we don't record your user name)": "Nesvarbu jūs prisijungę ar ne (mes nesaugome jūsų slapyvardžio)",
+    "Whether or not you're logged in (we don't record your user name)": "Nesvarbu ar esate prisijungę ar ne (mes neįrašome jūsų naudotojo vardo)",
     "Your language of choice": "Jūsų pasirinkta kalba",
-    "Which officially provided instance you are using, if any": "Kurį oficialiai pateiktą pavyzdį jūs naudojate, jei naudojate",
+    "Which officially provided instance you are using, if any": "Kurį oficialiai pateiktą egzempliorių naudojate",
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Nesvarbu jūs naudojate ar ne raiškiojo teksto režimą Raiškiojo tekto redaktoriuje",
     "Your homeserver's URL": "Jūsų serverio URL adresas",
     "Your identity server's URL": "Jūsų identifikavimo serverio URL adresas",

From cc15e582fb21f87b0851a89d00034027da050896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20V=C3=A1gner?= <pvdeejay@gmail.com>
Date: Sat, 31 Mar 2018 13:07:24 +0000
Subject: [PATCH 854/927] Translated using Weblate (Slovak)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/sk.json b/src/i18n/strings/sk.json
index faf4cc0aa1..72ba11b6d4 100644
--- a/src/i18n/strings/sk.json
+++ b/src/i18n/strings/sk.json
@@ -289,7 +289,7 @@
     "No pinned messages.": "Žiadne pripnuté správy.",
     "Loading...": "Načítanie...",
     "Pinned Messages": "Pripnuté správy",
-    "Online": "Prítomný",
+    "Online": "Pripojený",
     "Idle": "Nečinný",
     "Offline": "Nedostupný",
     "Unknown": "Neznámy",
@@ -1000,7 +1000,7 @@
     "To set up a filter, drag a community avatar over to the filter panel on the far left hand side of the screen. You can click on an avatar in the filter panel at any time to see only the rooms and people associated with that community.": "Ak si chcete nastaviť filter, pretiahnite avatara komunity na panel filtrovania úplne na ľavej strane obrazovky. Potom môžete kedykoľvek kliknúť na avatara komunity na tomto panely a Riot.im vám bude zobrazovať len miestnosti a ľudí z komunity, na ktorej avatar ste klikli.",
     "Clear filter": "Zrušiť filter",
     "Debug Logs Submission": "Odoslanie ladiacich záznamov",
-    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ak ste nám poslali hlásenie o chybe cez Github, ladiace záznamy nám môžu pomôcť lepšie identifikovať chybu. Ladiace záznamy obsahujú údaje o používaní aplikácii vrátane vašeho používateľského mena, názvy a aliasy miestností a komunít, do ktorých ste vstúpili, mená používateľov, s ktorými ste komunikovali. Tieto záznamy neobsahujú samotný obsah vašich správ.",
+    "If you've submitted a bug via GitHub, debug logs can help us track down the problem. Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contian messages.": "Ak ste nám poslali hlásenie o chybe cez Github, ladiace záznamy nám môžu pomôcť lepšie identifikovať chybu. Ladiace záznamy obsahujú údaje o používaní aplikácii, vrátane vašeho používateľského mena, názvy a aliasy miestností a komunít, ku ktorým ste sa pripojili a mená ostatných používateľov. Tieto záznamy neobsahujú samotný obsah vašich správ.",
     "Submit debug logs": "Odoslať ladiace záznamy",
     "Opens the Developer Tools dialog": "Otvorí dialóg nástroje pre vývojárov"
 }

From 3376366b55db17d0a1de40869d0da10ba1caa88e Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 3 Apr 2018 17:09:56 +0000
Subject: [PATCH 855/927] Translated using Weblate (Bulgarian)

Currently translated at 100.0% (999 of 999 strings)

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

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index f33fcadeb1..8111329bef 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1003,5 +1003,8 @@
     "Opens the Developer Tools dialog": "Отваря прозорец с инструменти на разработчика",
     "Seen by %(displayName)s (%(userName)s) at %(dateTime)s": "Видяно от %(displayName)s (%(userName)s) в %(dateTime)s",
     "Unable to join community": "Неуспешно влизане в общността",
-    "Unable to leave community": "Неуспешно напускане на общността"
+    "Unable to leave community": "Неуспешно напускане на общността",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Промени направени по <bold1>името</bold1> и <bold2>аватара</bold2> на вашата общност може да не се отразят при другите потребители за до 30 минути.",
+    "Join this community": "Присъединете се в тази общност",
+    "Leave this community": "Напуснете тази общност"
 }

From eb9f2261ce632daa07c1b409a81beed11662b86d Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Wed, 4 Apr 2018 07:01:23 +0000
Subject: [PATCH 856/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1009 of 1009 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c0d4ce20c8..9872ecc3dc 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1003,5 +1003,15 @@
     "Unable to leave community": "無法離開社群",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "對您的社群的<bold1>名稱</bold1>與<bold2>大頭貼</bold2>的變更可能在最多30分鐘內不會被其他使用者看到。",
     "Join this community": "加入此社群",
-    "Leave this community": "離開此社群"
+    "Leave this community": "離開此社群",
+    "Stickerpack": "貼圖包",
+    "Sticker Messages": "貼圖訊息",
+    "You don't currently have any stickerpacks enabled": "您目前未啟用任何貼圖包",
+    "Click": "點按",
+    "here": "這裡",
+    "to add some!": "來新增一些！",
+    "Add a stickerpack": "新增貼圖包",
+    "Hide Stickers": "隱藏貼圖",
+    "Show Stickers": "顯示貼圖",
+    "Manage sticker packs": "管理貼圖包"
 }

From 702380c5910194198f0f2b0e535dfa7f12e5faf3 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 4 Apr 2018 13:37:52 +0100
Subject: [PATCH 857/927] Add props to style (remaining) menu padding
 attributes.

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

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index 59a68181c3..da69c38d73 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -138,6 +138,15 @@ module.exports = {
         if (!isNaN(Number(props.menuPaddingTop))) {
             menuStyle["paddingTop"] = props.menuPaddingTop;
         }
+        if (!isNaN(Number(props.menuPaddingLeft))) {
+            menuStyle["paddingLeft"] = props.menuPaddingLeft;
+        }
+        if (!isNaN(Number(props.menuPaddingBottom))) {
+            menuStyle["paddingBottom"] = props.menuPaddingBottom;
+        }
+        if (!isNaN(Number(props.menuPaddingRight))) {
+            menuStyle["paddingRight"] = props.menuPaddingRight;
+        }
 
         // FIXME: If a menu uses getDefaultProps it clobbers the onFinished
         // property set here so you can't close the menu from a button click!

From 369cbdaaf62ced1e3e8ab034f90046ab0fe27977 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 4 Apr 2018 13:38:07 +0100
Subject: [PATCH 858/927] Add missing PropType declarations.

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

diff --git a/src/components/structures/ContextualMenu.js b/src/components/structures/ContextualMenu.js
index da69c38d73..0e2df890f3 100644
--- a/src/components/structures/ContextualMenu.js
+++ b/src/components/structures/ContextualMenu.js
@@ -30,11 +30,21 @@ module.exports = {
     ContextualMenuContainerId: "mx_ContextualMenu_Container",
 
     propTypes: {
+        top: PropTypes.number,
+        bottom: PropTypes.number,
+        left: PropTypes.number,
+        right: PropTypes.number,
         menuWidth: PropTypes.number,
         menuHeight: PropTypes.number,
         chevronOffset: PropTypes.number,
         menuColour: PropTypes.string,
         chevronFace: PropTypes.string, // top, bottom, left, right
+        // Function to be called on menu close
+        onFinished: PropTypes.func,
+        menuPaddingTop: PropTypes.number,
+        menuPaddingRight: PropTypes.number,
+        menuPaddingBottom: PropTypes.number,
+        menuPaddingLeft: PropTypes.number,
     },
 
     getOrCreateContainer: function() {

From da6c2c51fb8a744df78945dd151c2ac0e8f30e59 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 4 Apr 2018 13:38:48 +0100
Subject: [PATCH 859/927] Remove left and right menu padding

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

diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index e45f0e8f1b..929e0b0d83 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -217,6 +217,8 @@ export default class Stickerpicker extends React.Component {
             element: this._getStickerpickerContent(),
             onFinished: this._onFinished,
             menuPaddingTop: 0,
+            menuPaddingLeft: 0,
+            menuPaddingRight: 0,
         });
 
 

From 410c2ed9d95e104decd1514a6aa7ee10802874b9 Mon Sep 17 00:00:00 2001
From: Oriol Gual <oriol@codegram.com>
Date: Wed, 4 Apr 2018 10:17:27 +0000
Subject: [PATCH 860/927] Translated using Weblate (Catalan)

Currently translated at 87.2% (880 of 1009 strings)

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

diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
index 465b0de506..8f9da794b6 100644
--- a/src/i18n/strings/ca.json
+++ b/src/i18n/strings/ca.json
@@ -875,5 +875,12 @@
     "Report it": "Informa",
     "Found a bug?": "Has trobat un error?",
     "Display name": "Nom visible",
-    "Identity Server is": "El servidor d'identitat es"
+    "Identity Server is": "El servidor d'identitat es",
+    "Submit debug logs": "Enviar logs de depuració",
+    "The platform you're on": "La plataforma a la que estàs",
+    "Whether or not you're logged in (we don't record your user name)": "Si estàs identificat o no (no desem el teu nom d'usuari)",
+    "Your language of choice": "El teu idioma preferit",
+    "Which officially provided instance you are using, if any": "Quina instància oficial estàs utilitzant, si escau",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Si estàs utilitzant el mode Richtext del Rich Text Editor o no",
+    "The information being sent to us to help make Riot.im better includes:": "La informació enviada a Riot.im per ajudar-nos a millorar inclou:"
 }

From 5c422d7e35954c338344e87946462256be8797df Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Wed, 4 Apr 2018 09:59:04 +0000
Subject: [PATCH 861/927] Translated using Weblate (Italian)

Currently translated at 99.5% (1004 of 1009 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 5bcd2114f1..6450febfb3 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -99,7 +99,7 @@
     "Whether or not you're using the Richtext mode of the Rich Text Editor": "Se stai usando o meno la modalità Richtext dell'editor Rich Text",
     "Your homeserver's URL": "L'URL del tuo homeserver",
     "Your identity server's URL": "L'URL del tuo server di identità",
-    "Analytics": "Analitiche",
+    "Analytics": "Statistiche",
     "The information being sent to us to help make Riot.im better includes:": "Le informazioni inviate per aiutarci a migliorare Riot.im includono:",
     "We also record each page you use in the app (currently <CurrentPageHash>), your User Agent (<CurrentUserAgent>) and your device resolution (<CurrentDeviceResolution>).": "Registriamo anche ogni pagina che usi nell'app (attualmente <CurrentPageHash>), il tuo User Agent (<CurrentUserAgent>) e la risoluzione del dispositivo (<CurrentDeviceResolution>).",
     "Where this page includes identifiable information, such as a room, user or group ID, that data is removed before being sent to the server.": "Se questa pagina include informazioni identificabili, come una stanza, utente o ID di gruppo, questi dati sono rimossi prima che vengano inviati al server.",
@@ -249,7 +249,7 @@
     "Automatically replace plain text Emoji": "Sostituisci automaticamente le emoji testuali",
     "Disable Community Filter Panel": "Disattiva il pannello filtro comunità",
     "Disable Peer-to-Peer for 1:1 calls": "Disattiva il peer-to-peer per chiamate 1:1",
-    "Opt out of analytics": "Rifiuta le analitiche",
+    "Opt out of analytics": "Rifiuta le statistiche",
     "Never send encrypted messages to unverified devices from this device": "Non inviare mai da questo dispositivo messaggi cifrati a dispositivi non verificati",
     "Never send encrypted messages to unverified devices in this room from this device": "Non inviare mai da questo dispositivo messaggi cifrati a dispositivi non verificati in questa stanza",
     "Enable inline URL previews by default": "Attiva le anteprime URL in modo predefinito",
@@ -990,5 +990,20 @@
     "Import": "Importa",
     "Failed to set direct chat tag": "Impostazione etichetta chat diretta fallita",
     "Failed to remove tag %(tagName)s from room": "Rimozione etichetta %(tagName)s dalla stanza fallita",
-    "Failed to add tag %(tagName)s to room": "Aggiunta etichetta %(tagName)s alla stanza fallita"
+    "Failed to add tag %(tagName)s to room": "Aggiunta etichetta %(tagName)s alla stanza fallita",
+    "Stickerpack": "Pacchetto adesivi",
+    "Click": "Clicca",
+    "here": "qui",
+    "to add some!": "per aggiungerne alcuni!",
+    "Hide Stickers": "Nascondi gli adesivi",
+    "Show Stickers": "Mostra gli adesivi",
+    "Manage sticker packs": "Gestisci pacchetti di adesivi",
+    "Unable to join community": "Impossibile unirsi alla comunità",
+    "Unable to leave community": "Impossibile uscire dalla comunità",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Le modifiche al <bold1>nome</bold1> e all'<bold2>avatar</bold2> effettuate alla tua comunità potrebbero non essere visibili agli altri utenti per i prossimi 30 minuti.",
+    "Join this community": "Unisciti a questa comunità",
+    "Leave this community": "Esci da questa comunità",
+    "Sticker Messages": "Messaggi adesivi",
+    "You don't currently have any stickerpacks enabled": "Non hai ancora alcun pacchetto di adesivi attivato",
+    "Add a stickerpack": "Aggiungi un pacchetto di adesivi"
 }

From 2e05435a5c76ea113855b92bd7f66b6f2c51e80e Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Wed, 4 Apr 2018 00:18:16 +0000
Subject: [PATCH 862/927] Translated using Weblate (Russian)

Currently translated at 99.3% (1002 of 1009 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 5f15336d91..bd6bc3c2a7 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1003,5 +1003,8 @@
     "Unable to leave community": "Не удалось покинуть сообщество",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Изменения <bold1>имени</bold1> и <bold2>аватара</bold2>, внесенные в ваше сообщество, могут не отображаться другим пользователям в течение 30 минут.",
     "Join this community": "Присоединиться к сообществу",
-    "Leave this community": "Покинуть это сообщество"
+    "Leave this community": "Покинуть это сообщество",
+    "here": "здесь",
+    "to add some!": "для добавления!",
+    "Click": "Нажмите"
 }

From a41384a994d310fc52f7b2759baddd45a6e539e1 Mon Sep 17 00:00:00 2001
From: Richard Lewis <richard@smetco.co.uk>
Date: Wed, 4 Apr 2018 23:45:47 +0100
Subject: [PATCH 863/927] Fix function binding.

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

diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js
index 98b68bd890..41be5738af 100644
--- a/src/components/views/elements/AppTile.js
+++ b/src/components/views/elements/AppTile.js
@@ -52,6 +52,8 @@ export default class AppTile extends React.Component {
         this.onClickMenuBar = this.onClickMenuBar.bind(this);
         this._onMinimiseClick = this._onMinimiseClick.bind(this);
         this._onInitialLoad = this._onInitialLoad.bind(this);
+        this._grantWidgetPermission = this._grantWidgetPermission.bind(this);
+        this._revokeWidgetPermission = this._revokeWidgetPermission.bind(this);
     }
 
     /**

From ea82393b3eaecfdbfa9bee997c1c4a576df9b104 Mon Sep 17 00:00:00 2001
From: John Huang <ymhuang@fmbase.tw>
Date: Thu, 5 Apr 2018 08:22:50 +0000
Subject: [PATCH 864/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1009 of 1009 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 9872ecc3dc..e4c692d82b 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -64,12 +64,12 @@
     "Encrypted messages will not be visible on clients that do not yet implement encryption": "不支援加密的客戶端將看不到加密的訊息",
     "Encrypted room": "加密聊天室",
     "%(senderName)s ended the call.": "%(senderName)s 結束了通話。.",
-    "End-to-end encryption information": "端到端加密信息",
+    "End-to-end encryption information": "端到端加密資訊",
     "End-to-end encryption is in beta and may not be reliable": "端到端加密現為測試版，不一定可靠",
     "Enter Code": "輸入代碼",
     "Error": "錯誤",
     "Error decrypting attachment": "解密附件時出錯",
-    "Event information": "事件信息",
+    "Event information": "事件資訊",
     "Existing Call": "現有通話",
     "Export E2E room keys": "導出聊天室的端到端加密密鑰",
     "Failed to ban user": "封禁用戶失敗",
@@ -108,7 +108,7 @@
     "Hangup": "掛斷",
     "Hide read receipts": "隱藏已讀回執",
     "Hide Text Formatting Toolbar": "隱藏格式工具欄",
-    "Historical": "曆史",
+    "Historical": "歷史",
     "Homeserver is": "主服務器是",
     "Identity Server is": "身份認證服務器是",
     "I have verified my email address": "我已經驗證了我的電子郵件地址",
@@ -142,7 +142,7 @@
     "Search": "搜尋",
     "Search failed": "搜索失敗",
     "Searches DuckDuckGo for results": "搜索 DuckDuckGo",
-    "Sender device information": "發送者的裝置信息",
+    "Sender device information": "發送者的裝置資訊",
     "Send Invites": "發送邀請",
     "Send Reset Email": "發送密碼重設郵件",
     "%(senderDisplayName)s sent an image.": "%(senderDisplayName)s 發了一張圖片。.",
@@ -273,7 +273,7 @@
     "Click to unmute audio": "點選以解除靜音",
     "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 encrypted rooms": "不支援在加密聊天室的會議通話",
     "Conference calls are not supported in this client": "這個客戶端不支援會議通話",
     "Could not connect to the integration server": "無法連線到整合的伺服器",
     "%(count)s new messages|one": "%(count)s 個訊息",

From d05da36c5254ae2438f13d6b01ec28bc681ee184 Mon Sep 17 00:00:00 2001
From: random <dictionary@tutamail.com>
Date: Thu, 5 Apr 2018 13:04:20 +0000
Subject: [PATCH 865/927] Translated using Weblate (Italian)

Currently translated at 99.5% (1004 of 1009 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 6450febfb3..84b6a357e2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -421,7 +421,7 @@
     "Favourites": "Preferiti",
     "People": "Persone",
     "Low priority": "Bassa priorità",
-    "Historical": "Storico",
+    "Historical": "Cronologia",
     "Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Impossibile verificare che l'indirizzo al quale questo invito è stato inviato corrisponda a uno associato al tuo account.",
     "Power level must be positive integer.": "Il livello di poteri deve essere un intero positivo.",
     "%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s ha modificato il livello di poteri di %(powerLevelDiffText)s.",

From 9da5e6692bd3157943af43737c1fa5c3c8af8cdc Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 5 Apr 2018 15:27:38 +0000
Subject: [PATCH 866/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1009 of 1009 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 6a9ec07071..7a8896e896 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1003,5 +1003,15 @@
     "Unable to leave community": "Nem sikerült elhagyni a közösséget",
     "Join this community": "Csatlakozás ehhez a közösséghez",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "A közösséget <bold1>name</bold1> és <bold2>avatar</bold2> érintő változások legfeljebb 30 percig nem lesznek láthatók más felhasználók számára.",
-    "Leave this community": "Közösség elhagyása"
+    "Leave this community": "Közösség elhagyása",
+    "Stickerpack": "Matrica csomag",
+    "Sticker Messages": "Matrica üzenetek",
+    "You don't currently have any stickerpacks enabled": "Nincs engedélyezett matrica csomagod",
+    "Click": "Kattints",
+    "here": "ide",
+    "to add some!": "hogy adj hozzá párat!",
+    "Add a stickerpack": "Matrica csomag hozzáadása",
+    "Hide Stickers": "Matricák elrejtése",
+    "Show Stickers": "Matricák megjelenítése",
+    "Manage sticker packs": "Matrica csomagok kezelése"
 }

From 03747b82872ce2f14ef7925182ed6d739ceb7dd1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Apr 2018 16:56:35 +0100
Subject: [PATCH 867/927] Update to use new join_policy API

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 5931217363..8f2087cadf 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd.
-Copyright 2017 New Vector Ltd.
+Copyright 2017, 2018 New Vector Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -399,8 +399,8 @@ FeaturedRoom.contextTypes = GroupContext;
 RoleUserList.contextTypes = GroupContext;
 FeaturedUser.contextTypes = GroupContext;
 
-const GROUP_JOINABLE = "GROUP_JOINABLE";
-const GROUP_NOT_JOINABLE = "GROUP_NOT_JOINABLE";
+const GROUP_JOINPOLICY_OPEN = "open";
+const GROUP_JOINPOLICY_INVITE = "invite";
 
 export default React.createClass({
     displayName: 'GroupView',
@@ -549,7 +549,7 @@ export default React.createClass({
             editing: true,
             profileForm: Object.assign({}, this.state.summary.profile),
             joinableForm: {
-                isJoinable: this.state.summary.profile.is_joinable,
+                policyType: this.state.summary.profile.join_policy,
             },
         });
         dis.dispatch({
@@ -615,7 +615,7 @@ export default React.createClass({
 
     _onJoinableChange: function(ev) {
         this.setState({
-            joinableForm: { isJoinable: ev.target.value === GROUP_JOINABLE },
+            joinableForm: { policyType: ev.target.value },
         });
     },
 
@@ -654,7 +654,9 @@ export default React.createClass({
 
     _saveGroup: async function() {
         await this._matrixClient.setGroupProfile(this.props.groupId, this.state.profileForm);
-        await this._matrixClient.setGroupJoinable(this.props.groupId, this.state.joinableForm.isJoinable);
+        await this._matrixClient.setGroupJoinPolicy(this.props.groupId, {
+            type: this.state.joinableForm.policyType,
+        });
     },
 
     _onAcceptInviteClick: function() {
@@ -1010,8 +1012,8 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value={GROUP_NOT_JOINABLE}
-                        checked={!this.state.joinableForm.isJoinable}
+                        value={GROUP_JOINPOLICY_INVITE}
+                        checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_INVITE}
                         onClick={this._onJoinableChange}
                     />
                     <div className="mx_GroupView_label_text">
@@ -1022,8 +1024,8 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value={GROUP_JOINABLE}
-                        checked={this.state.joinableForm.isJoinable}
+                        value={GROUP_JOINPOLICY_OPEN}
+                        checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_OPEN}
                         onClick={this._onJoinableChange}
                     />
                     <div className="mx_GroupView_label_text">

From 027c7aab0e5c08900f5527ed62bf6a6e85587703 Mon Sep 17 00:00:00 2001
From: John Huang <ymhuang@fmbase.tw>
Date: Thu, 5 Apr 2018 13:33:52 +0000
Subject: [PATCH 868/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1009 of 1009 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index e4c692d82b..d9541bc33f 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -129,7 +129,7 @@
     "New password": "新密碼",
     "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.": "重設密碼目前會把所有裝置上的端到端加密金鑰重設，讓已加密的聊天歷史不可讀，除非您先匯出您的聊天室金鑰並在稍後重新匯入。這會在未來改進。",
-    "Return to login screen": "返回登錄頁面",
+    "Return to login screen": "返回到登入畫面",
     "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-網頁版：",

From e73018b33306c4bf08f2f87dd15a5da0e99a7905 Mon Sep 17 00:00:00 2001
From: Dudi Maroshi <yesh_etza@yahoo.com>
Date: Thu, 5 Apr 2018 15:55:10 +0000
Subject: [PATCH 869/927] Translated using Weblate (Hebrew)

Currently translated at 8.6% (87 of 1009 strings)

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

diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index bd96159ae1..e3de41600a 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -54,5 +54,36 @@
     "Which rooms would you like to add to this community?": "אילו חדרים תרצה להוסיף לקהילה?",
     "Show these rooms to non-members on the community page and room list?": "הצג חדרים אלה לחסרי-חשבון על דף הקהילה ורשימת החדרים?",
     "Add rooms to the community": "הוסף חדרים לקהילה",
-    "Room name or alias": "שם חדר או כינוי"
+    "Room name or alias": "שם חדר או כינוי",
+    "Warning": "התראה",
+    "Submit debug logs": "הזן יומני ניפוי שגיאה (דבאג)",
+    "Edit": "ערוך",
+    "Unpin Message": "שחרר צימוד הודעה",
+    "Online": "מקוון",
+    "Register": "רשום",
+    "Rooms": "חדרי שיחוח",
+    "Add rooms to this community": "הוסף חדר שיחוח לקהילה זו",
+    "OK": "בסדר",
+    "Operation failed": "פעולה נכשלה",
+    "Search": "חפש",
+    "Custom Server Options": "הגדרות שרת מותאמות אישית",
+    "Dismiss": "שחרר",
+    "powered by Matrix": "מופעל ע\"י Matrix",
+    "Error": "שגיאה",
+    "Remove": "הסר",
+    "Close": "סגור",
+    "Cancel": "ביטול",
+    "Send": "שלח",
+    "Continue": "המשך",
+    "Failed to change password. Is your password correct?": "נכשל בשינוי סיסמא, האם הסיסמא נכונה?",
+    "unknown error code": "קוד שגיאה לא מוכר",
+    "Failed to forget room %(errCode)s": "נכשל בעת בקשה לשכוח חדר %(errCode)s",
+    "Mute": "השתק",
+    "Leave": "לעזוב",
+    "Favourite": "מועדף",
+    "Notifications": "התראות",
+    "Unnamed room": "חדר ללא שם",
+    "World readable": "העולם קריא",
+    "Guests can join": "אורחים יכולים להצטרף",
+    "No rooms to show": "אין חדרים להצגה"
 }

From e20f223e7884f777514021f088192b21640dd68f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 5 Apr 2018 17:39:25 +0100
Subject: [PATCH 870/927] Fix warning "Unknown prop `wrappedRef` on <div>
 tag..."

GeminiScrollbar should not receive wrappedRef as a property,
so remove it using object destructuring.
---
 src/components/views/elements/GeminiScrollbarWrapper.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/GeminiScrollbarWrapper.js b/src/components/views/elements/GeminiScrollbarWrapper.js
index af801c0113..13eb14ecc3 100644
--- a/src/components/views/elements/GeminiScrollbarWrapper.js
+++ b/src/components/views/elements/GeminiScrollbarWrapper.js
@@ -18,6 +18,8 @@ import React from 'react';
 import GeminiScrollbar from 'react-gemini-scrollbar';
 
 function GeminiScrollbarWrapper(props) {
+    const {wrappedRef, ...wrappedProps} = props;
+
     // Enable forceGemini so that gemini is always enabled. This is
     // to avoid future issues where a feature is implemented without
     // doing QA on every OS/browser combination.
@@ -25,7 +27,7 @@ function GeminiScrollbarWrapper(props) {
     // By default GeminiScrollbar allows native scrollbars to be used
     // on macOS. Use forceGemini to enable Gemini's non-native
     // scrollbars on all OSs.
-    return <GeminiScrollbar ref={props.wrappedRef} forceGemini={true} {...props}>
+    return <GeminiScrollbar ref={wrappedRef} forceGemini={true} {...wrappedProps}>
         { props.children }
     </GeminiScrollbar>;
 }

From 3cb0bd404cb1cc1d444a522e325b04bdae8f9704 Mon Sep 17 00:00:00 2001
From: John Huang <ymhuang@fmbase.tw>
Date: Fri, 6 Apr 2018 02:14:58 +0000
Subject: [PATCH 871/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1011 of 1011 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d9541bc33f..c556183683 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1013,5 +1013,7 @@
     "Add a stickerpack": "新增貼圖包",
     "Hide Stickers": "隱藏貼圖",
     "Show Stickers": "顯示貼圖",
-    "Manage sticker packs": "管理貼圖包"
+    "Manage sticker packs": "管理貼圖包",
+    "Who can join this community?": "誰可以加入此社群？",
+    "Everyone": "每個人"
 }

From ad9249b666fa44de641cf3b518fb62e052f508f8 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 6 Apr 2018 05:20:02 +0000
Subject: [PATCH 872/927] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1011 of 1011 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7a8896e896..b7f20d52f7 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -1013,5 +1013,7 @@
     "Add a stickerpack": "Matrica csomag hozzáadása",
     "Hide Stickers": "Matricák elrejtése",
     "Show Stickers": "Matricák megjelenítése",
-    "Manage sticker packs": "Matrica csomagok kezelése"
+    "Manage sticker packs": "Matrica csomagok kezelése",
+    "Who can join this community?": "Ki tud csatlakozni ehhez a közösséghez?",
+    "Everyone": "Mindenki"
 }

From adb78c2931c4c8a3579a0f7b92362c6bc5a9d106 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 10:27:03 +0100
Subject: [PATCH 873/927] Fix broken ForgotPassword component

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

diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index 53688ee6c3..ca50b9db6e 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import Modal from "../../../Modal";
 import MatrixClientPeg from "../../../MatrixClientPeg";
+import SdkConfig from "../../../SdkConfig";
 
 import PasswordReset from "../../../PasswordReset";
 
@@ -185,7 +186,7 @@ module.exports = React.createClass({
             );
         } else {
             let serverConfigSection;
-            if (!config.disable_custom_urls) {
+            if (!SdkConfig.get().disable_custom_urls) {
                 serverConfigSection = (
                     <ServerConfig ref="serverConfig"
                         withToggleButton={true}

From 0306c365cc467f6355a30b1bee7a92e3fd484720 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 11:03:17 +0100
Subject: [PATCH 874/927] Fix to prevent guests from seeing features

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

diff --git a/src/settings/handlers/DeviceSettingsHandler.js b/src/settings/handlers/DeviceSettingsHandler.js
index 13117f7498..b2a225e190 100644
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.js
@@ -102,7 +102,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
     _readFeature(featureName) {
         if (MatrixClientPeg.get() && MatrixClientPeg.get().isGuest()) {
             // Guests should not have any labs features enabled.
-            return {enabled: false};
+            return false;
         }
 
         const value = localStorage.getItem("mx_labs_feature_" + featureName);

From b03e5d32f3ee6ac29064806e7cc2775a676fb114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20C?= <zecakeh@posteo.net>
Date: Fri, 6 Apr 2018 10:04:30 +0000
Subject: [PATCH 875/927] Translated using Weblate (French)

Currently translated at 100.0% (1011 of 1011 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index ad96616f66..25cfc6cc82 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1003,5 +1003,17 @@
     "Unable to leave community": "Impossible de quitter la communauté",
     "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Les changements effectués au <bold1>nom</bold1> et à l'<bold2>avatar</bold2> de votre communauté peuvent prendre jusqu'à 30 minutes avant d'être vus par d'autres utilisateurs.",
     "Join this community": "Rejoindre cette communauté",
-    "Leave this community": "Quitter cette communauté"
+    "Leave this community": "Quitter cette communauté",
+    "Stickerpack": "Pack de stickers",
+    "Sticker Messages": "Messages sticker",
+    "You don't currently have any stickerpacks enabled": "Vous n'avez activé aucun pack de stickers pour l'instant",
+    "Click": "Cliquer",
+    "here": "ici",
+    "to add some!": "pour en ajouter !",
+    "Add a stickerpack": "Ajouter un pack de stickers",
+    "Hide Stickers": "Masquer les stickers",
+    "Show Stickers": "Afficher les stickers",
+    "Manage sticker packs": "Gérer les packs de stickers",
+    "Who can join this community?": "Qui peut rejoindre cette communauté ?",
+    "Everyone": "Tout le monde"
 }

From a1b13d22d1d666ceddc8c104b322df7af6784207 Mon Sep 17 00:00:00 2001
From: John Huang <ymhuang@fmbase.tw>
Date: Fri, 6 Apr 2018 02:15:18 +0000
Subject: [PATCH 876/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1011 of 1011 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index c556183683..31c2ac9086 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1,5 +1,5 @@
 {
-    "A new password must be entered.": "一個新的密碼必須被輸入。.",
+    "A new password must be entered.": "一個新的密碼必須被輸入。",
     "An error has occurred.": "一個錯誤出現了。",
     "Anyone who knows the room's link, apart from guests": "任何知道房間連結的人，但訪客除外",
     "Anyone who knows the room's link, including guests": "任何知道房間連結的人，包括訪客",

From e2cc4691f100fcfe44a248007295ec9d02c5c77b Mon Sep 17 00:00:00 2001
From: Andrey <andrey@mailbox.org>
Date: Thu, 5 Apr 2018 23:02:02 +0000
Subject: [PATCH 877/927] Translated using Weblate (Russian)

Currently translated at 99.3% (1004 of 1011 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index bd6bc3c2a7..d732be55da 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1006,5 +1006,7 @@
     "Leave this community": "Покинуть это сообщество",
     "here": "здесь",
     "to add some!": "для добавления!",
-    "Click": "Нажмите"
+    "Click": "Нажмите",
+    "Who can join this community?": "Кто может присоединиться к этому сообществу?",
+    "Everyone": "Все"
 }

From 1e586428acbdf316e22e2196dcac4e0f1f54a1bf Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 14:58:10 +0100
Subject: [PATCH 878/927] Update to match is_openly_joinable API

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 8f2087cadf..8884396c01 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -549,7 +549,10 @@ export default React.createClass({
             editing: true,
             profileForm: Object.assign({}, this.state.summary.profile),
             joinableForm: {
-                policyType: this.state.summary.profile.join_policy,
+                policyType:
+                    this.state.summary.profile.is_openly_joinable ?
+                        GROUP_JOINPOLICY_OPEN :
+                        GROUP_JOINPOLICY_INVITE,
             },
         });
         dis.dispatch({

From 008572afe12793663a05112cedadb1aad3d698f8 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 16:42:59 +0100
Subject: [PATCH 879/927] Revert "Handle non-m.room.message event types."

This reverts commit f8d7ab10fab9c742f2351477e698d5f6b0e6a5d1.
---
 src/components/structures/MessagePanel.js | 7 +------
 src/components/views/rooms/EventTile.js   | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 773c9710dd..6a8c2e9c2e 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -450,12 +450,7 @@ module.exports = React.createClass({
         if (prevEvent !== null
                 && prevEvent.sender && mxEv.sender
                 && mxEv.sender.userId === prevEvent.sender.userId
-                // The preferred way of checking for 'continuation messages' is by
-                // checking whether subsiquent messages from the same user have a
-                // message body. This is because all messages intended to be displayed
-                // should have a 'body' whereas some (non-m.room) messages (such as
-                // m.sticker) may not have a message 'type'.
-                && Boolean(mxEv.getContent().body) == Boolean(prevEvent.getContent().body)) {
+                && mxEv.getType() == prevEvent.getType()) {
             continuation = true;
         }
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 5e453e66d0..367e31e3b4 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -471,8 +471,7 @@ module.exports = withMatrixClient(React.createClass({
         const eventType = this.props.mxEvent.getType();
 
         // Info messages are basically information about commands processed on a room
-        // For now assume that anything that doesn't have a content body is an isInfoMessage
-        const isInfoMessage = !content.body; // Boolean comparison of non-boolean content body
+        const isInfoMessage = (eventType !== 'm.room.message' && eventType !== 'm.room.sticker');
 
         const EventTileType = sdk.getComponent(getHandlerTile(this.props.mxEvent));
         // This shouldn't happen: the caller should check we support this type

From 01dd494f508ae8c9e69d7007cfc3259a961b48a4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 17:47:44 +0100
Subject: [PATCH 880/927] Make stickers/messages continuations of each other

---
 src/components/structures/MessagePanel.js | 10 +++++++++-
 src/components/views/rooms/EventTile.js   |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index 6a8c2e9c2e..50bdb37734 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -447,10 +447,18 @@ module.exports = React.createClass({
         // is this a continuation of the previous message?
         let continuation = false;
 
+        // Some events should appear as continuations from previous events of
+        // different types.
+        const continuedTypes = ['m.sticker', 'm.room.message'];
+        const eventTypeContinues =
+            prevEvent !== null &&
+            continuedTypes.includes(mxEv.getType()) &&
+            continuedTypes.includes(prevEvent.getType());
+
         if (prevEvent !== null
                 && prevEvent.sender && mxEv.sender
                 && mxEv.sender.userId === prevEvent.sender.userId
-                && mxEv.getType() == prevEvent.getType()) {
+                && (mxEv.getType() == prevEvent.getType() || eventTypeContinues)) {
             continuation = true;
         }
 
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 367e31e3b4..ed7851bf2d 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -471,7 +471,7 @@ module.exports = withMatrixClient(React.createClass({
         const eventType = this.props.mxEvent.getType();
 
         // Info messages are basically information about commands processed on a room
-        const isInfoMessage = (eventType !== 'm.room.message' && eventType !== 'm.room.sticker');
+        const isInfoMessage = (eventType !== 'm.room.message' && eventType !== 'm.sticker');
 
         const EventTileType = sdk.getComponent(getHandlerTile(this.props.mxEvent));
         // This shouldn't happen: the caller should check we support this type

From ce80b82ab3948ee3933d51386113c553812d76ea Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 13:53:02 +0100
Subject: [PATCH 881/927] Bump source-map-loader version to avoid bug /w inline
 base64 maps

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

diff --git a/package.json b/package.json
index b32e5f0501..cf9f4e60fc 100644
--- a/package.json
+++ b/package.json
@@ -129,7 +129,7 @@
     "require-json": "0.0.1",
     "rimraf": "^2.4.3",
     "sinon": "^1.17.3",
-    "source-map-loader": "^0.1.5",
+    "source-map-loader": "^0.2.3",
     "walk": "^2.3.9",
     "webpack": "^1.12.14"
   }

From 92703d008ff25d883cffe6d19d084d0b1c31a426 Mon Sep 17 00:00:00 2001
From: John Huang <ymhuang@fmbase.tw>
Date: Sat, 7 Apr 2018 14:45:47 +0000
Subject: [PATCH 882/927] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (1011 of 1011 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 31c2ac9086..0be62a27e5 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -8,9 +8,9 @@
     "Are you sure you want to upload the following files?": "您確認要上傳以下文件嗎？",
     "Attachment": "附件",
     "Autoplay GIFs and videos": "自動播放 GIF 和影片",
-    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封禁了 %(targetName)s.",
-    "Ban": "封禁",
-    "Banned users": "被封禁的用戶",
+    "%(senderName)s banned %(targetName)s.": "%(senderName)s 封鎖了 %(targetName)s.",
+    "Ban": "封鎖",
+    "Banned users": "被封鎖的用戶",
     "Blacklisted": "已列入黑名單",
     "Bug Report": "臭蟲回報",
     "Call Timeout": "通話超時",
@@ -72,7 +72,7 @@
     "Event information": "事件資訊",
     "Existing Call": "現有通話",
     "Export E2E room keys": "導出聊天室的端到端加密密鑰",
-    "Failed to ban user": "封禁用戶失敗",
+    "Failed to ban user": "封鎖用戶失敗",
     "Failed to change password. Is your password correct?": "變更密碼失敗。您的密碼正確嗎？",
     "Failed to forget room %(errCode)s": "無法忘記聊天室 %(errCode)s",
     "Failed to join room": "無法加入聊天室",
@@ -90,7 +90,7 @@
     "Failed to set display name": "設置暱稱失敗",
     "Failed to set up conference call": "無法啟動群組通話",
     "Failed to toggle moderator status": "無法切換管理員權限",
-    "Failed to unban": "解除封禁失敗",
+    "Failed to unban": "解除封鎖失敗",
     "Failed to upload file": "上傳文件失敗",
     "Failed to verify email address: make sure you clicked the link in the email": "電子郵件地址驗證失敗： 請確保你已點擊郵件中的連結",
     "Failure to create room": "創建聊天室失敗",
@@ -654,7 +654,7 @@
     "Edit": "編輯",
     "Enable automatic language detection for syntax highlighting": "啟用語法突顯的自動語言偵測",
     "Hide Apps": "隱藏應用程式",
-    "Hide join/leave messages (invites/kicks/bans unaffected)": "隱藏加入／離開訊息（邀請／踢出／封禁不受影響）",
+    "Hide join/leave messages (invites/kicks/bans unaffected)": "隱藏加入／離開訊息（邀請／踢出／封鎖不受影響）",
     "Integrations Error": "整合錯誤",
     "Publish this room to the public in %(domain)s's room directory?": "將這個聊天室公開到 %(domain)s 的聊天室目錄中？",
     "AM": "上午",
@@ -666,7 +666,7 @@
     "The maximum permitted number of widgets have already been added to this room.": "這個聊天室已經有可加入的最大量的小工具了。",
     "To get started, please pick a username!": "要開始，請先取一個使用者名稱！",
     "Unable to create widget.": "無法建立小工具。",
-    "Unbans user with given id": "取消封禁指定 ID 的使用者",
+    "Unbans user with given id": "取消封鎖指定 ID 的使用者",
     "You are not in this room.": "您不在這個聊天室內。",
     "You do not have permission to do that in this room.": "您沒有在這個聊天室做這件事的權限。",
     "Verifies a user, device, and pubkey tuple": "驗證使用者、裝置與公開金鑰變數組",

From 91efcd5453bef840a6055d26b9ddf7d341f9ef28 Mon Sep 17 00:00:00 2001
From: Daniel D <daniel.dona.alvarez@alumnos.upm.es>
Date: Sat, 7 Apr 2018 21:23:53 +0000
Subject: [PATCH 883/927] Translated using Weblate (Spanish)

Currently translated at 57.9% (586 of 1011 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 274ad0d59f..0241d6a0cc 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -571,5 +571,21 @@
     "Dec": "Dic",
     "Warning": "Advertencia",
     "Unpin Message": "Desmarcar Mensaje",
-    "Online": "Conectado"
+    "Online": "Conectado",
+    "Submit debug logs": "Enviar registros de depuración",
+    "The platform you're on": "La plataforma en la que te encuentras",
+    "The version of Riot.im": "La versión de Riot.im",
+    "Whether or not you're logged in (we don't record your user name)": "Estés identificado o no (no almacenamos tu nombre de usuario)",
+    "Your language of choice": "El idioma que has elegido",
+    "Your homeserver's URL": "La URL de tu homeserver",
+    "Your identity server's URL": "La URL de tu servidor de identidad",
+    "The information being sent to us to help make Riot.im better includes:": "La información remitida a nosotros para ayudar a mejorar Riot.im incluye:",
+    "Drop here to demote": "Suelta aquí para degradar",
+    "Whether or not you're using the Richtext mode of the Rich Text Editor": "Estés o no usando el modo Richtext del Editor de Texto Enriquecido",
+    "Who would you like to add to this community?": "¿A quién deseas añadir a esta comunidad?",
+    "Warning: any person you add to a community will be publicly visible to anyone who knows the community ID": "Aviso: cualquier persona que añadas a una comunidad será públicamente visible a cualquiera que conozca el ID de la comunidad",
+    "Invite new community members": "Invita nuevos miembros de la comunidad",
+    "Name or matrix ID": "Nombre o ID de matrix",
+    "Invite to Community": "Invitar a la comunidad",
+    "Which rooms would you like to add to this community?": "¿Qué salas deseas añadir a esta comunidad?"
 }

From 18ec690e2edb4e87780c7fd282d7fdc19a618ba9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 16:57:07 +0100
Subject: [PATCH 884/927] Add radio button for setting group is_joinable

which dictates whether the group can be joined without invitation.
---
 src/components/structures/GroupView.js | 54 ++++++++++++++++++++++++--
 src/i18n/strings/en_EN.json            |  2 +
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 30e897e5dc..a491bc65e0 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -546,6 +546,9 @@ export default React.createClass({
         this.setState({
             editing: true,
             profileForm: Object.assign({}, this.state.summary.profile),
+            joinableForm: {
+                isJoinable: this.state.summary.profile.is_joinable,
+            },
         });
         dis.dispatch({
             action: 'panel_disable',
@@ -608,11 +611,15 @@ export default React.createClass({
         }).done();
     },
 
+    _onJoinableChange: function(ev) {
+        this.setState({
+            joinableForm: { isJoinable: ev.target.value === "true" },
+        });
+    },
+
     _onSaveClick: function() {
         this.setState({saving: true});
-        const savePromise = this.state.isUserPrivileged ?
-            this._matrixClient.setGroupProfile(this.props.groupId, this.state.profileForm) :
-            Promise.resolve();
+        const savePromise = this.state.isUserPrivileged ? this._saveGroup() : Promise.resolve();
         savePromise.then((result) => {
             this.setState({
                 saving: false,
@@ -643,6 +650,11 @@ export default React.createClass({
         }).done();
     },
 
+    _saveGroup: async function() {
+        await this._matrixClient.setGroupProfile(this.props.groupId, this.state.profileForm);
+        await this._matrixClient.setGroupJoinable(this.props.groupId, this.state.joinableForm.isJoinable);
+    },
+
     _onAcceptInviteClick: function() {
         this.setState({membershipBusy: true});
         this._groupStore.acceptGroupInvite().then(() => {
@@ -716,6 +728,7 @@ export default React.createClass({
         return <div className={groupSettingsSectionClasses}>
             { header }
             { changeDelayWarning }
+            { this._getJoinableNode() }
             { this._getLongDescriptionNode() }
             { this._getRoomsNode() }
         </div>;
@@ -926,6 +939,41 @@ export default React.createClass({
         return null;
     },
 
+    _getJoinableNode: function() {
+        return this.state.editing ? <div>
+            <h3>
+                { _t('Who can join this community?') }
+                { this.state.groupJoinableLoading ?
+                    <InlineSpinner /> : <div />
+                }
+            </h3>
+            <div>
+                <label>
+                    <input type="radio"
+                        value="false"
+                        checked={!this.state.joinableForm.isJoinable}
+                        onClick={this._onJoinableChange}
+                    />
+                    <div className="mx_GroupView_label_text">
+                        { _t('Only people who have been invited') }
+                    </div>
+                </label>
+            </div>
+            <div>
+                <label>
+                    <input type="radio"
+                        value="true"
+                        checked={this.state.joinableForm.isJoinable}
+                        onClick={this._onJoinableChange}
+                    />
+                    <div className="mx_GroupView_label_text">
+                        { _t('Everyone') }
+                    </div>
+                </label>
+            </div>
+        </div> : null;
+    },
+
     _getLongDescriptionNode: function() {
         const summary = this.state.summary;
         let description = null;
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 49b9b641b0..3d522603ea 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -774,6 +774,8 @@
     "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
     "You are an administrator of this community": "You are an administrator of this community",
     "You are a member of this community": "You are a member of this community",
+    "Who can join this community?": "Who can join this community?",
+    "Everyone": "Everyone",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!",
     "Long Description (HTML)": "Long Description (HTML)",
     "Description": "Description",

From 2a6d7e6e8ed15bc00b56f07188b1ee6bf8da0b16 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 17:25:06 +0100
Subject: [PATCH 885/927] Use less confusing values on radio buttons

---
 src/components/structures/GroupView.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index a491bc65e0..9fbba0987a 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -400,6 +400,9 @@ FeaturedRoom.contextTypes = GroupContext;
 RoleUserList.contextTypes = GroupContext;
 FeaturedUser.contextTypes = GroupContext;
 
+const GROUP_JOINABLE = "GROUP_JOINABLE";
+const GROUP_NOT_JOINABLE = "GROUP_NOT_JOINABLE";
+
 export default React.createClass({
     displayName: 'GroupView',
 
@@ -613,7 +616,7 @@ export default React.createClass({
 
     _onJoinableChange: function(ev) {
         this.setState({
-            joinableForm: { isJoinable: ev.target.value === "true" },
+            joinableForm: { isJoinable: ev.target.value === GROUP_JOINABLE },
         });
     },
 
@@ -950,7 +953,7 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value="false"
+                        value={GROUP_NOT_JOINABLE}
                         checked={!this.state.joinableForm.isJoinable}
                         onClick={this._onJoinableChange}
                     />
@@ -962,7 +965,7 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value="true"
+                        value={GROUP_JOINABLE}
                         checked={this.state.joinableForm.isJoinable}
                         onClick={this._onJoinableChange}
                     />

From 6cb9d28e75e00142f15fac42316a8a4310864c96 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 5 Apr 2018 16:56:35 +0100
Subject: [PATCH 886/927] Update to use new join_policy API

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9fbba0987a..ac6e89d407 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2017 Vector Creations Ltd.
-Copyright 2017 New Vector Ltd.
+Copyright 2017, 2018 New Vector Ltd.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -400,8 +400,8 @@ FeaturedRoom.contextTypes = GroupContext;
 RoleUserList.contextTypes = GroupContext;
 FeaturedUser.contextTypes = GroupContext;
 
-const GROUP_JOINABLE = "GROUP_JOINABLE";
-const GROUP_NOT_JOINABLE = "GROUP_NOT_JOINABLE";
+const GROUP_JOINPOLICY_OPEN = "open";
+const GROUP_JOINPOLICY_INVITE = "invite";
 
 export default React.createClass({
     displayName: 'GroupView',
@@ -550,7 +550,7 @@ export default React.createClass({
             editing: true,
             profileForm: Object.assign({}, this.state.summary.profile),
             joinableForm: {
-                isJoinable: this.state.summary.profile.is_joinable,
+                policyType: this.state.summary.profile.join_policy,
             },
         });
         dis.dispatch({
@@ -616,7 +616,7 @@ export default React.createClass({
 
     _onJoinableChange: function(ev) {
         this.setState({
-            joinableForm: { isJoinable: ev.target.value === GROUP_JOINABLE },
+            joinableForm: { policyType: ev.target.value },
         });
     },
 
@@ -655,7 +655,9 @@ export default React.createClass({
 
     _saveGroup: async function() {
         await this._matrixClient.setGroupProfile(this.props.groupId, this.state.profileForm);
-        await this._matrixClient.setGroupJoinable(this.props.groupId, this.state.joinableForm.isJoinable);
+        await this._matrixClient.setGroupJoinPolicy(this.props.groupId, {
+            type: this.state.joinableForm.policyType,
+        });
     },
 
     _onAcceptInviteClick: function() {
@@ -953,8 +955,8 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value={GROUP_NOT_JOINABLE}
-                        checked={!this.state.joinableForm.isJoinable}
+                        value={GROUP_JOINPOLICY_INVITE}
+                        checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_INVITE}
                         onClick={this._onJoinableChange}
                     />
                     <div className="mx_GroupView_label_text">
@@ -965,8 +967,8 @@ export default React.createClass({
             <div>
                 <label>
                     <input type="radio"
-                        value={GROUP_JOINABLE}
-                        checked={this.state.joinableForm.isJoinable}
+                        value={GROUP_JOINPOLICY_OPEN}
+                        checked={this.state.joinableForm.policyType === GROUP_JOINPOLICY_OPEN}
                         onClick={this._onJoinableChange}
                     />
                     <div className="mx_GroupView_label_text">

From ef427eaf6793c20c9304398a9441f8d947ee0140 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 3 Apr 2018 17:35:34 +0100
Subject: [PATCH 887/927] Add null-guard to prevent RoomAvatar NPE when room is
 null

which may have been occuring when peeking into a room that the
client hasn't got a Room object for.

Fixes https://github.com/vector-im/riot-web/issues/6432
---
 src/components/views/avatars/RoomAvatar.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/views/avatars/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js
index e547cf0fa7..ef69bcb60a 100644
--- a/src/components/views/avatars/RoomAvatar.js
+++ b/src/components/views/avatars/RoomAvatar.js
@@ -66,7 +66,8 @@ module.exports = React.createClass({
     },
 
     onRoomStateEvents: function(ev) {
-        if (ev.getRoomId() !== this.props.room.roomId ||
+        if (!this.props.room ||
+            ev.getRoomId() !== this.props.room.roomId ||
             ev.getType() !== 'm.room.avatar'
         ) return;
 

From 0da187c101786d72d75869c92e7ee8c4be4fb16c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 10:27:03 +0100
Subject: [PATCH 888/927] Fix broken ForgotPassword component

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

diff --git a/src/components/structures/login/ForgotPassword.js b/src/components/structures/login/ForgotPassword.js
index 53688ee6c3..ca50b9db6e 100644
--- a/src/components/structures/login/ForgotPassword.js
+++ b/src/components/structures/login/ForgotPassword.js
@@ -23,6 +23,7 @@ import { _t } from '../../../languageHandler';
 import sdk from '../../../index';
 import Modal from "../../../Modal";
 import MatrixClientPeg from "../../../MatrixClientPeg";
+import SdkConfig from "../../../SdkConfig";
 
 import PasswordReset from "../../../PasswordReset";
 
@@ -185,7 +186,7 @@ module.exports = React.createClass({
             );
         } else {
             let serverConfigSection;
-            if (!config.disable_custom_urls) {
+            if (!SdkConfig.get().disable_custom_urls) {
                 serverConfigSection = (
                     <ServerConfig ref="serverConfig"
                         withToggleButton={true}

From 929718b032b63e2279353871a077a0dbfc97d59c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 11:03:17 +0100
Subject: [PATCH 889/927] Fix to prevent guests from seeing features

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

diff --git a/src/settings/handlers/DeviceSettingsHandler.js b/src/settings/handlers/DeviceSettingsHandler.js
index 13117f7498..b2a225e190 100644
--- a/src/settings/handlers/DeviceSettingsHandler.js
+++ b/src/settings/handlers/DeviceSettingsHandler.js
@@ -102,7 +102,7 @@ export default class DeviceSettingsHandler extends SettingsHandler {
     _readFeature(featureName) {
         if (MatrixClientPeg.get() && MatrixClientPeg.get().isGuest()) {
             // Guests should not have any labs features enabled.
-            return {enabled: false};
+            return false;
         }
 
         const value = localStorage.getItem("mx_labs_feature_" + featureName);

From 76144b964aa1d8b7f8e64fe4c138620eae80dec3 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 6 Apr 2018 14:58:10 +0100
Subject: [PATCH 890/927] Update to match is_openly_joinable API

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index ac6e89d407..8a5d3d2025 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -550,7 +550,10 @@ export default React.createClass({
             editing: true,
             profileForm: Object.assign({}, this.state.summary.profile),
             joinableForm: {
-                policyType: this.state.summary.profile.join_policy,
+                policyType:
+                    this.state.summary.profile.is_openly_joinable ?
+                        GROUP_JOINPOLICY_OPEN :
+                        GROUP_JOINPOLICY_INVITE,
             },
         });
         dis.dispatch({

From 84635b715c2b8a1f3d915c6e1ae2891b1777ea23 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 15:31:52 +0100
Subject: [PATCH 891/927] Bump matrix-js-sdk to rc.2

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

diff --git a/package.json b/package.json
index 6b74c7eed6..8b4020babc 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.10.0-rc.1",
+    "matrix-js-sdk": "0.10.0-rc.2",
     "optimist": "^0.6.1",
     "prop-types": "^15.5.8",
     "querystring": "^0.2.0",

From 39cda801432f6e11623ca737effbde0c1ca56704 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 15:41:01 +0100
Subject: [PATCH 892/927] Prepare changelog for v0.12.0-rc.5

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36709caf62..1beb4f5876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [0.12.0-rc.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.5) (2018-04-09)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.4...v0.12.0-rc.5)
+
+ * Added radio button to set group join policy
+ * Fix to prevent guests from accessing lab features
+ * Fix broken forgot password page
+ * Fix crash when joining a room after peeking
+
 Changes in [0.12.0-rc.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.4) (2018-03-22)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.3...v0.12.0-rc.4)

From 9bab958a975f50a578b4bda9f460992e3e7ac451 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 15:41:02 +0100
Subject: [PATCH 893/927] v0.12.0-rc.5

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

diff --git a/package.json b/package.json
index 8b4020babc..5fff12160a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.0-rc.4",
+  "version": "0.12.0-rc.5",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 2da45277cd8548902495467bcfc40df1194e83cf Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 16:57:27 +0100
Subject: [PATCH 894/927] Update group join button to match new API

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 8884396c01..2cb791b689 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -948,7 +948,7 @@ export default React.createClass({
         if ((!group || group.myMembership === 'leave') &&
             this.state.summary &&
             this.state.summary.profile &&
-            Boolean(this.state.summary.profile.is_joinable)
+            Boolean(this.state.summary.profile.is_openly_joinable)
         ) {
             membershipButtonText = _t("Join this community");
             membershipButtonOnClick = this._onJoinClick;

From 18fcb1d6a628b78c3f18cabed5cfb2a2c4972164 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 12:36:59 +0100
Subject: [PATCH 895/927] Implement "Join this community" button

for groups that have truthy summary.profile.is_joinable.
---
 src/components/structures/GroupView.js | 108 ++++++++++++++++++-------
 1 file changed, 80 insertions(+), 28 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 8a5d3d2025..14c6b4a0be 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -691,6 +691,20 @@ export default React.createClass({
         });
     },
 
+    _onJoinClick: function() {
+        this.setState({membershipBusy: true});
+        this._matrixClient.joinGroup(this.props.groupId).then(() => {
+            // don't reset membershipBusy here: wait for the membership change to come down the sync
+        }).catch((e) => {
+            this.setState({membershipBusy: false});
+            const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createTrackedDialog('Error joining room', '', ErrorDialog, {
+                title: _t("Error"),
+                description: _t("Unable to join community"),
+            });
+        });
+    },
+
     _onLeaveClick: function() {
         const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
         Modal.createTrackedDialog('Leave Group', '', QuestionDialog, {
@@ -707,9 +721,9 @@ export default React.createClass({
                 }).catch((e) => {
                     this.setState({membershipBusy: false});
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createTrackedDialog('Error leaving room', '', ErrorDialog, {
+                    Modal.createTrackedDialog('Error leaving community', '', ErrorDialog, {
                         title: _t("Error"),
-                        description: _t("Unable to leave room"),
+                        description: _t("Unable to leave community"),
                     });
                 });
             },
@@ -875,9 +889,8 @@ export default React.createClass({
         const BaseAvatar = sdk.getComponent("avatars.BaseAvatar");
 
         const group = this._matrixClient.getGroup(this.props.groupId);
-        if (!group) return null;
 
-        if (group.myMembership === 'invite') {
+        if (group && group.myMembership === 'invite') {
             if (this.state.membershipBusy || this.state.inviterProfileBusy) {
                 return <div className="mx_GroupView_membershipSection">
                     <Spinner />
@@ -918,33 +931,72 @@ export default React.createClass({
                     </div>
                 </div>
             </div>;
-        } else if (group.myMembership === 'join' && this.state.editing) {
-            const leaveButtonTooltip = this.state.isUserPrivileged ?
+        }
+
+        let membershipContainerExtraClasses;
+        let membershipButtonExtraClasses;
+        let membershipButtonTooltip;
+        let membershipButtonText;
+        let membershipButtonOnClick;
+
+        // User is not in the group
+        if ((!group || group.myMembership === 'leave') &&
+            this.state.summary &&
+            this.state.summary.profile &&
+            Boolean(this.state.summary.profile.is_joinable)
+        ) {
+            membershipButtonText = _t("Join this community");
+            membershipButtonOnClick = this._onJoinClick;
+
+            membershipButtonExtraClasses = 'mx_GroupView_joinButton';
+            membershipContainerExtraClasses = 'mx_GroupView_membershipSection_leave';
+        } else if (
+            group &&
+            group.myMembership === 'join' &&
+            this.state.editing
+        ) {
+            membershipButtonText = _t("Leave this community");
+            membershipButtonOnClick = this._onLeaveClick;
+            membershipButtonTooltip = this.state.isUserPrivileged ?
                 _t("You are an administrator of this community") :
                 _t("You are a member of this community");
-            const leaveButtonClasses = classnames({
-                "mx_RoomHeader_textButton": true,
-                "mx_GroupView_textButton": true,
-                "mx_GroupView_leaveButton": true,
-                "mx_RoomHeader_textButton_danger": this.state.isUserPrivileged,
-            });
-            return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_joined">
-                <div className="mx_GroupView_membershipSubSection">
-                    { /* Empty div for flex alignment */ }
-                    <div />
-                    <div className="mx_GroupView_membership_buttonContainer">
-                        <AccessibleButton
-                            className={leaveButtonClasses}
-                            onClick={this._onLeaveClick}
-                            title={leaveButtonTooltip}
-                        >
-                            { _t("Leave") }
-                        </AccessibleButton>
-                    </div>
-                </div>
-            </div>;
+
+            membershipButtonExtraClasses = {
+                'mx_GroupView_leaveButton': true,
+                'mx_RoomHeader_textButton_danger': this.state.isUserPrivileged,
+            };
+            membershipContainerExtraClasses = 'mx_GroupView_membershipSection_joined';
+        } else {
+            return null;
         }
-        return null;
+
+        const membershipButtonClasses = classnames([
+            'mx_RoomHeader_textButton',
+            'mx_GroupView_textButton',
+        ],
+            membershipButtonExtraClasses,
+        );
+
+        const membershipContainerClasses = classnames(
+            'mx_GroupView_membershipSection',
+            membershipContainerExtraClasses,
+        );
+
+        return <div className={membershipContainerClasses}>
+            <div className="mx_GroupView_membershipSubSection">
+                { /* Empty div for flex alignment */ }
+                <div />
+                <div className="mx_GroupView_membership_buttonContainer">
+                    <AccessibleButton
+                        className={membershipButtonClasses}
+                        onClick={membershipButtonOnClick}
+                        title={membershipButtonTooltip}
+                    >
+                        { membershipButtonText }
+                    </AccessibleButton>
+                </div>
+            </div>
+        </div>;
     },
 
     _getJoinableNode: function() {

From 560da03a9f36ac815cbce43a8c99c8a1f1891f5b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 12:39:21 +0100
Subject: [PATCH 896/927] run gen-i18n

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 3d522603ea..7d213d73a8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -186,7 +186,6 @@
     "Message Replies": "Message Replies",
     "Message Pinning": "Message Pinning",
     "Presence Management": "Presence Management",
-    "Tag Panel": "Tag Panel",
     "Disable Emoji suggestions while typing": "Disable Emoji suggestions while typing",
     "Use compact timeline layout": "Use compact timeline layout",
     "Hide removed messages": "Hide removed messages",
@@ -761,10 +760,11 @@
     "Failed to update community": "Failed to update community",
     "Unable to accept invite": "Unable to accept invite",
     "Unable to reject invite": "Unable to reject invite",
+    "Unable to join community": "Unable to join community",
     "Leave Community": "Leave Community",
     "Leave %(groupName)s?": "Leave %(groupName)s?",
     "Leave": "Leave",
-    "Unable to leave room": "Unable to leave room",
+    "Unable to leave community": "Unable to leave community",
     "Community Settings": "Community Settings",
     "Changes made to your community might not be seen by other users for up to 30 minutes.": "Changes made to your community might not be seen by other users for up to 30 minutes.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
@@ -772,10 +772,12 @@
     "Featured Rooms:": "Featured Rooms:",
     "Featured Users:": "Featured Users:",
     "%(inviter)s has invited you to join this community": "%(inviter)s has invited you to join this community",
+    "Join this community": "Join this community",
     "You are an administrator of this community": "You are an administrator of this community",
     "You are a member of this community": "You are a member of this community",
     "Who can join this community?": "Who can join this community?",
     "Everyone": "Everyone",
+    "Leave this community": "Leave this community",
     "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!": "Your community hasn't got a Long Description, a HTML page to show to community members.<br />Click here to open settings and give it one!",
     "Long Description (HTML)": "Long Description (HTML)",
     "Description": "Description",

From ef104b762e0772a9604e3e5a74c62d671d219ba4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 16:57:27 +0100
Subject: [PATCH 897/927] Update group join button to match new API

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 14c6b4a0be..9352760914 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -943,7 +943,7 @@ export default React.createClass({
         if ((!group || group.myMembership === 'leave') &&
             this.state.summary &&
             this.state.summary.profile &&
-            Boolean(this.state.summary.profile.is_joinable)
+            Boolean(this.state.summary.profile.is_openly_joinable)
         ) {
             membershipButtonText = _t("Join this community");
             membershipButtonOnClick = this._onJoinClick;

From 0f9fd3296248299518a27b2cfad3eca6f33df80b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 17:10:02 +0100
Subject: [PATCH 898/927] Prepare changelog for v0.12.0-rc.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1beb4f5876..cfd32e5200 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.12.0-rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6) (2018-04-09)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.5...v0.12.0-rc.6)
+
+ * Fix group join button not appearing
+
 Changes in [0.12.0-rc.5](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.5) (2018-04-09)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.4...v0.12.0-rc.5)

From d02dced2463bf2f26b15e9485e851865b386ce6c Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Mon, 9 Apr 2018 17:10:03 +0100
Subject: [PATCH 899/927] v0.12.0-rc.6

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

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

From 2d8880ec5ffa731e540842b58c33c3501f7ab5b5 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Apr 2018 22:59:46 +0100
Subject: [PATCH 900/927] patch NPE on Pill when lazyloading members

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

diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index 067c377eaa..7e5ad379de 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -207,6 +207,7 @@ const Pill = React.createClass({
                     const member = this.state.member;
                     if (member) {
                         userId = member.userId;
+                        member.rawDisplayName = member.rawDisplayName || '';
                         linkText = member.rawDisplayName.replace(' (IRC)', ''); // FIXME when groups are done
                         if (this.props.shouldShowPillAvatar) {
                             avatar = <MemberAvatar member={member} width={16} height={16} />;

From 0ff2837d7f8d3696448e98322121165c63d07600 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Apr 2018 23:02:59 +0100
Subject: [PATCH 901/927] rename createGroupButton to not be a total
 misnomer...

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 790c497a67..0b6dc9fc75 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -148,7 +148,7 @@ const TagPanel = React.createClass({
                 </Droppable>
             </GeminiScrollbarWrapper>
             <div className="mx_TagPanel_divider" />
-            <div className="mx_TagPanel_createGroupButton">
+            <div className="mx_TagPanel_groupsButton">
                 <GroupsButton tooltip={true} />
             </div>
         </div>;

From 42141f7da7c00367f1adbb47ef2be5474f974b11 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 10:03:54 +0100
Subject: [PATCH 902/927] Fetch group data when leaving or joining to update
 the view

---
 src/components/structures/GroupView.js |  7 ++++---
 src/stores/GroupStore.js               | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 2cb791b689..65f6a5b0b1 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -678,7 +678,7 @@ export default React.createClass({
 
     _onRejectInviteClick: function() {
         this.setState({membershipBusy: true});
-        this._matrixClient.leaveGroup(this.props.groupId).then(() => {
+        this._groupStore.leaveGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
             this.setState({membershipBusy: false});
@@ -692,7 +692,8 @@ export default React.createClass({
 
     _onJoinClick: function() {
         this.setState({membershipBusy: true});
-        this._matrixClient.joinGroup(this.props.groupId).then(() => {
+
+        this._groupStore.joinGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
             this.setState({membershipBusy: false});
@@ -715,7 +716,7 @@ export default React.createClass({
                 if (!confirmed) return;
 
                 this.setState({membershipBusy: true});
-                this._matrixClient.leaveGroup(this.props.groupId).then(() => {
+                this._groupStore.leaveGroup().then(() => {
                     // don't reset membershipBusy here: wait for the membership change to come down the sync
                 }).catch((e) => {
                     this.setState({membershipBusy: false});
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 2ea69b61aa..d4f0b09ff9 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -252,6 +252,8 @@ export default class GroupStore extends EventEmitter {
 
     acceptGroupInvite() {
         return MatrixClientPeg.get().acceptGroupInvite(this.groupId)
+            // The user should now be able to access (personal) group settings
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary))
             // The user might be able to see more rooms now
             .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms))
             // The user should now appear as a member
@@ -260,6 +262,28 @@ export default class GroupStore extends EventEmitter {
             .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupInvitedMembers));
     }
 
+    joinGroup() {
+        return MatrixClientPeg.get().joinGroup(this.groupId)
+            // The user should now be able to access (personal) group settings
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary))
+            // The user might be able to see more rooms now
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms))
+            // The user should now appear as a member
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupMembers))
+            // The user should now not appear as an invited member
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupInvitedMembers));
+    }
+
+    leaveGroup() {
+        return MatrixClientPeg.get().leaveGroup(this.groupId)
+            // The user should now not be able to access group settings
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary))
+            // The user might only be able to see a subset of rooms now
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms))
+            // The user should now not appear as a member
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupMembers));
+    }
+
     addRoomToGroupSummary(roomId, categoryId) {
         return MatrixClientPeg.get()
             .addRoomToGroupSummary(this.groupId, roomId, categoryId)

From 0681df71b07851150ced0d7b6282ffc324fdce6d Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 11:49:35 +0100
Subject: [PATCH 903/927] Hide settings after leaving a group

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 65f6a5b0b1..0ec216dea2 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -466,6 +466,10 @@ export default React.createClass({
     _onGroupMyMembership: function(group) {
         if (group.groupId !== this.props.groupId) return;
 
+        if (group.myMembership === 'leave') {
+            // Leave settings - the user might have clicked the "Leave" button
+            this._onCancelClick();
+        }
         this.setState({membershipBusy: false});
     },
 

From 24d4df87d197bbe628956fc6ca24f53c5f42a902 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 11:49:59 +0100
Subject: [PATCH 904/927] Show membership spinner next to Leave/Join button
 when leaving/joining

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 0ec216dea2..e2b93992e3 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -994,8 +994,8 @@ export default React.createClass({
 
         return <div className={membershipContainerClasses}>
             <div className="mx_GroupView_membershipSubSection">
-                { /* Empty div for flex alignment */ }
-                <div />
+                { /* The <div /> is for flex alignment */ }
+                { this.state.membershipBusy ? <Spinner /> : <div /> }
                 <div className="mx_GroupView_membership_buttonContainer">
                     <AccessibleButton
                         className={membershipButtonClasses}

From de1073aacb0184fb16a6e13223983715af1fae92 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 13:28:42 +0100
Subject: [PATCH 905/927] Factor out `_closeSettings` for cleanliness

---
 src/components/structures/GroupView.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index e2b93992e3..e725483d29 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -468,7 +468,7 @@ export default React.createClass({
 
         if (group.myMembership === 'leave') {
             // Leave settings - the user might have clicked the "Leave" button
-            this._onCancelClick();
+            this._closeSettings();
         }
         this.setState({membershipBusy: false});
     },
@@ -566,6 +566,10 @@ export default React.createClass({
     },
 
     _onCancelClick: function() {
+        this._closeSettings();
+    },
+
+    _closeSettings() {
         this.setState({
             editing: false,
             profileForm: null,

From 6f10b5a410e083c1560f704436c7a8ca8317ba20 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 10:03:54 +0100
Subject: [PATCH 906/927] Fetch group data when leaving or joining to update
 the view

---
 src/components/structures/GroupView.js |  7 ++++---
 src/stores/GroupStore.js               | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9352760914..4b8ac70336 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -679,7 +679,7 @@ export default React.createClass({
 
     _onRejectInviteClick: function() {
         this.setState({membershipBusy: true});
-        this._matrixClient.leaveGroup(this.props.groupId).then(() => {
+        this._groupStore.leaveGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
             this.setState({membershipBusy: false});
@@ -693,7 +693,8 @@ export default React.createClass({
 
     _onJoinClick: function() {
         this.setState({membershipBusy: true});
-        this._matrixClient.joinGroup(this.props.groupId).then(() => {
+
+        this._groupStore.joinGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
             this.setState({membershipBusy: false});
@@ -716,7 +717,7 @@ export default React.createClass({
                 if (!confirmed) return;
 
                 this.setState({membershipBusy: true});
-                this._matrixClient.leaveGroup(this.props.groupId).then(() => {
+                this._groupStore.leaveGroup().then(() => {
                     // don't reset membershipBusy here: wait for the membership change to come down the sync
                 }).catch((e) => {
                     this.setState({membershipBusy: false});
diff --git a/src/stores/GroupStore.js b/src/stores/GroupStore.js
index 2ea69b61aa..d4f0b09ff9 100644
--- a/src/stores/GroupStore.js
+++ b/src/stores/GroupStore.js
@@ -252,6 +252,8 @@ export default class GroupStore extends EventEmitter {
 
     acceptGroupInvite() {
         return MatrixClientPeg.get().acceptGroupInvite(this.groupId)
+            // The user should now be able to access (personal) group settings
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary))
             // The user might be able to see more rooms now
             .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms))
             // The user should now appear as a member
@@ -260,6 +262,28 @@ export default class GroupStore extends EventEmitter {
             .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupInvitedMembers));
     }
 
+    joinGroup() {
+        return MatrixClientPeg.get().joinGroup(this.groupId)
+            // The user should now be able to access (personal) group settings
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary))
+            // The user might be able to see more rooms now
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms))
+            // The user should now appear as a member
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupMembers))
+            // The user should now not appear as an invited member
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupInvitedMembers));
+    }
+
+    leaveGroup() {
+        return MatrixClientPeg.get().leaveGroup(this.groupId)
+            // The user should now not be able to access group settings
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.Summary))
+            // The user might only be able to see a subset of rooms now
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupRooms))
+            // The user should now not appear as a member
+            .then(this._fetchResource.bind(this, GroupStore.STATE_KEY.GroupMembers));
+    }
+
     addRoomToGroupSummary(roomId, categoryId) {
         return MatrixClientPeg.get()
             .addRoomToGroupSummary(this.groupId, roomId, categoryId)

From 1da56d9e980dadaa85dc6f3a4717ad5d5682fefc Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 11:49:35 +0100
Subject: [PATCH 907/927] Hide settings after leaving a group

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 4b8ac70336..91fa378f33 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -467,6 +467,10 @@ export default React.createClass({
     _onGroupMyMembership: function(group) {
         if (group.groupId !== this.props.groupId) return;
 
+        if (group.myMembership === 'leave') {
+            // Leave settings - the user might have clicked the "Leave" button
+            this._onCancelClick();
+        }
         this.setState({membershipBusy: false});
     },
 

From 9e6841df09fade330111e040503e07d9fce540af Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 11:49:59 +0100
Subject: [PATCH 908/927] Show membership spinner next to Leave/Join button
 when leaving/joining

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 91fa378f33..47c6ab57ca 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -989,8 +989,8 @@ export default React.createClass({
 
         return <div className={membershipContainerClasses}>
             <div className="mx_GroupView_membershipSubSection">
-                { /* Empty div for flex alignment */ }
-                <div />
+                { /* The <div /> is for flex alignment */ }
+                { this.state.membershipBusy ? <Spinner /> : <div /> }
                 <div className="mx_GroupView_membership_buttonContainer">
                     <AccessibleButton
                         className={membershipButtonClasses}

From e616dbac3390ff7f8e0bf4d3d6a8c26edd7a139b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 13:28:42 +0100
Subject: [PATCH 909/927] Factor out `_closeSettings` for cleanliness

---
 src/components/structures/GroupView.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 47c6ab57ca..5ef627034c 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -469,7 +469,7 @@ export default React.createClass({
 
         if (group.myMembership === 'leave') {
             // Leave settings - the user might have clicked the "Leave" button
-            this._onCancelClick();
+            this._closeSettings();
         }
         this.setState({membershipBusy: false});
     },
@@ -567,6 +567,10 @@ export default React.createClass({
     },
 
     _onCancelClick: function() {
+        this._closeSettings();
+    },
+
+    _closeSettings() {
         this.setState({
             editing: false,
             profileForm: null,

From f72103894268432386562dc08a1d1221adeacc3b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 29 Mar 2018 14:33:54 +0100
Subject: [PATCH 910/927] Reword group setting delay

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 5ef627034c..353c0a8694 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -752,8 +752,14 @@ export default React.createClass({
         const header = this.state.editing ? <h2> { _t('Community Settings') } </h2> : <div />;
         const changeDelayWarning = this.state.editing && this.state.isUserPrivileged ?
             <div className="mx_GroupView_changeDelayWarning">
-                { _t( 'Changes made to your community might not be seen by other users ' +
-                      'for up to 30 minutes.',
+                { _t(
+                    'Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> ' +
+                    'might not be seen by other users for up to 30 minutes.',
+                    {},
+                    {
+                        'bold1': (sub) => <b> { sub } </b>,
+                        'bold2': (sub) => <b> { sub } </b>,
+                    },
                 ) }
             </div> : <div />;
         return <div className={groupSettingsSectionClasses}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7d213d73a8..84a65fa3cf 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -766,7 +766,7 @@
     "Leave": "Leave",
     "Unable to leave community": "Unable to leave community",
     "Community Settings": "Community Settings",
-    "Changes made to your community might not be seen by other users for up to 30 minutes.": "Changes made to your community might not be seen by other users for up to 30 minutes.",
+    "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.": "Changes made to your community <bold1>name</bold1> and <bold2>avatar</bold2> might not be seen by other users for up to 30 minutes.",
     "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.": "These rooms are displayed to community members on the community page. Community members can join the rooms by clicking on them.",
     "Add rooms to this community": "Add rooms to this community",
     "Featured Rooms:": "Featured Rooms:",

From b4ea03f823305e2f0946c498c5d93029aafdcb57 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 14:27:38 +0100
Subject: [PATCH 911/927] Prepare changelog for v0.12.0-rc.7

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfd32e5200..a9364b5820 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [0.12.0-rc.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.7) (2018-04-10)
+===============================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.6...v0.12.0-rc.7)
+
+ * Reword group setting delay
+  [\#1816](https://github.com/matrix-org/matrix-react-sdk/pull/1816)
+ * Improve group joining/leaving feedback
+  [\#1831](https://github.com/matrix-org/matrix-react-sdk/pull/1831)
+ 
 Changes in [0.12.0-rc.6](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.6) (2018-04-09)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.5...v0.12.0-rc.6)

From f2e60b1526e44b577c55cbdc838b7af5a4f0df66 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 14:27:38 +0100
Subject: [PATCH 912/927] v0.12.0-rc.7

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

diff --git a/package.json b/package.json
index af5710b1f0..44dc934556 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.0-rc.6",
+  "version": "0.12.0-rc.7",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 31e99792859152fd1a5fc7ca573da0f2805da44e Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 15:31:04 +0100
Subject: [PATCH 913/927] Add 500ms delay to show `membershipBusy` for longer

to avoid a UI that flashes quickly
---
 src/components/structures/GroupView.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index e725483d29..0a85c5e7ab 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -670,8 +670,12 @@ export default React.createClass({
         });
     },
 
-    _onAcceptInviteClick: function() {
+    _onAcceptInviteClick: async function() {
         this.setState({membershipBusy: true});
+
+        // Wait 500ms to prevent flashing
+        await Promise.delay(500);
+
         this._groupStore.acceptGroupInvite().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
@@ -684,8 +688,12 @@ export default React.createClass({
         });
     },
 
-    _onRejectInviteClick: function() {
+    _onRejectInviteClick: async function() {
         this.setState({membershipBusy: true});
+
+        // Wait 500ms to prevent flashing
+        await Promise.delay(500);
+
         this._groupStore.leaveGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
@@ -698,9 +706,12 @@ export default React.createClass({
         });
     },
 
-    _onJoinClick: function() {
+    _onJoinClick: async function() {
         this.setState({membershipBusy: true});
 
+        // Wait 500ms to prevent flashing
+        await Promise.delay(500);
+
         this._groupStore.joinGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
@@ -720,10 +731,14 @@ export default React.createClass({
             description: _t("Leave %(groupName)s?", {groupName: this.props.groupId}),
             button: _t("Leave"),
             danger: true,
-            onFinished: (confirmed) => {
+            onFinished: async (confirmed) => {
                 if (!confirmed) return;
 
                 this.setState({membershipBusy: true});
+
+                // Wait 500ms to prevent flashing
+                await Promise.delay(500);
+
                 this._groupStore.leaveGroup().then(() => {
                     // don't reset membershipBusy here: wait for the membership change to come down the sync
                 }).catch((e) => {

From fca7325b2005f8216238b2c9788256c30457a092 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 15:56:57 +0100
Subject: [PATCH 914/927] Change comments

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 0a85c5e7ab..62fdb1070a 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -673,7 +673,8 @@ export default React.createClass({
     _onAcceptInviteClick: async function() {
         this.setState({membershipBusy: true});
 
-        // Wait 500ms to prevent flashing
+        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+        // spinner disappearing after we have fetched new group data.
         await Promise.delay(500);
 
         this._groupStore.acceptGroupInvite().then(() => {
@@ -691,7 +692,8 @@ export default React.createClass({
     _onRejectInviteClick: async function() {
         this.setState({membershipBusy: true});
 
-        // Wait 500ms to prevent flashing
+        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+        // spinner disappearing after we have fetched new group data.
         await Promise.delay(500);
 
         this._groupStore.leaveGroup().then(() => {
@@ -709,7 +711,8 @@ export default React.createClass({
     _onJoinClick: async function() {
         this.setState({membershipBusy: true});
 
-        // Wait 500ms to prevent flashing
+        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+        // spinner disappearing after we have fetched new group data.
         await Promise.delay(500);
 
         this._groupStore.joinGroup().then(() => {
@@ -736,7 +739,8 @@ export default React.createClass({
 
                 this.setState({membershipBusy: true});
 
-                // Wait 500ms to prevent flashing
+                // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+                // spinner disappearing after we have fetched new group data.
                 await Promise.delay(500);
 
                 this._groupStore.leaveGroup().then(() => {

From b0818df329d9ea86af2048a75c81955b2324bf06 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 15:31:04 +0100
Subject: [PATCH 915/927] Add 500ms delay to show `membershipBusy` for longer

to avoid a UI that flashes quickly
---
 src/components/structures/GroupView.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 353c0a8694..1c1009d6fa 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -671,8 +671,12 @@ export default React.createClass({
         });
     },
 
-    _onAcceptInviteClick: function() {
+    _onAcceptInviteClick: async function() {
         this.setState({membershipBusy: true});
+
+        // Wait 500ms to prevent flashing
+        await Promise.delay(500);
+
         this._groupStore.acceptGroupInvite().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
@@ -685,8 +689,12 @@ export default React.createClass({
         });
     },
 
-    _onRejectInviteClick: function() {
+    _onRejectInviteClick: async function() {
         this.setState({membershipBusy: true});
+
+        // Wait 500ms to prevent flashing
+        await Promise.delay(500);
+
         this._groupStore.leaveGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
@@ -699,9 +707,12 @@ export default React.createClass({
         });
     },
 
-    _onJoinClick: function() {
+    _onJoinClick: async function() {
         this.setState({membershipBusy: true});
 
+        // Wait 500ms to prevent flashing
+        await Promise.delay(500);
+
         this._groupStore.joinGroup().then(() => {
             // don't reset membershipBusy here: wait for the membership change to come down the sync
         }).catch((e) => {
@@ -721,10 +732,14 @@ export default React.createClass({
             description: _t("Leave %(groupName)s?", {groupName: this.props.groupId}),
             button: _t("Leave"),
             danger: true,
-            onFinished: (confirmed) => {
+            onFinished: async (confirmed) => {
                 if (!confirmed) return;
 
                 this.setState({membershipBusy: true});
+
+                // Wait 500ms to prevent flashing
+                await Promise.delay(500);
+
                 this._groupStore.leaveGroup().then(() => {
                     // don't reset membershipBusy here: wait for the membership change to come down the sync
                 }).catch((e) => {

From 98c76a891c9beadf8135815b5abdf417078a2ebe Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 15:56:57 +0100
Subject: [PATCH 916/927] Change comments

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

diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 1c1009d6fa..2884484419 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -674,7 +674,8 @@ export default React.createClass({
     _onAcceptInviteClick: async function() {
         this.setState({membershipBusy: true});
 
-        // Wait 500ms to prevent flashing
+        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+        // spinner disappearing after we have fetched new group data.
         await Promise.delay(500);
 
         this._groupStore.acceptGroupInvite().then(() => {
@@ -692,7 +693,8 @@ export default React.createClass({
     _onRejectInviteClick: async function() {
         this.setState({membershipBusy: true});
 
-        // Wait 500ms to prevent flashing
+        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+        // spinner disappearing after we have fetched new group data.
         await Promise.delay(500);
 
         this._groupStore.leaveGroup().then(() => {
@@ -710,7 +712,8 @@ export default React.createClass({
     _onJoinClick: async function() {
         this.setState({membershipBusy: true});
 
-        // Wait 500ms to prevent flashing
+        // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+        // spinner disappearing after we have fetched new group data.
         await Promise.delay(500);
 
         this._groupStore.joinGroup().then(() => {
@@ -737,7 +740,8 @@ export default React.createClass({
 
                 this.setState({membershipBusy: true});
 
-                // Wait 500ms to prevent flashing
+                // Wait 500ms to prevent flashing. Do this before sending a request otherwise we risk the
+                // spinner disappearing after we have fetched new group data.
                 await Promise.delay(500);
 
                 this._groupStore.leaveGroup().then(() => {

From edb754b76b00e6bcd0b662c56dce5c38ee6093d6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 18:08:19 +0100
Subject: [PATCH 917/927] Use GeminiScrollbarWrapper in Flair settings of
 UserSettings

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

diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 755d6aae8f..0405d411d2 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import sdk from '../../../index';
 import { MatrixClient } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
@@ -55,14 +54,15 @@ export default React.createClass({
             text = _t('Loading...');
         } else if (groups.length > 0) {
             const GroupPublicityToggle = sdk.getComponent('groups.GroupPublicityToggle');
+            const GeminiScrollbarWrapper = sdk.getComponent('elements.GeminiScrollbarWrapper');
             const groupPublicityToggles = groups.map((groupId, index) => {
                 return <GroupPublicityToggle key={index} groupId={groupId} />;
             });
             text = _t('Display your community flair in rooms configured to show it.');
             scrollbox = <div className="mx_GroupUserSettings_groupPublicity_scrollbox">
-                <GeminiScrollbar>
+                <GeminiScrollbarWrapper>
                     { groupPublicityToggles }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>;
         } else {
             text = _t("You're not currently a member of any communities.");

From 3b5fb3ae3015b1bae0bf483f4360222392ad419b Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Tue, 10 Apr 2018 18:08:19 +0100
Subject: [PATCH 918/927] Use GeminiScrollbarWrapper in Flair settings of
 UserSettings

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

diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 755d6aae8f..0405d411d2 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import GeminiScrollbar from 'react-gemini-scrollbar';
 import sdk from '../../../index';
 import { MatrixClient } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
@@ -55,14 +54,15 @@ export default React.createClass({
             text = _t('Loading...');
         } else if (groups.length > 0) {
             const GroupPublicityToggle = sdk.getComponent('groups.GroupPublicityToggle');
+            const GeminiScrollbarWrapper = sdk.getComponent('elements.GeminiScrollbarWrapper');
             const groupPublicityToggles = groups.map((groupId, index) => {
                 return <GroupPublicityToggle key={index} groupId={groupId} />;
             });
             text = _t('Display your community flair in rooms configured to show it.');
             scrollbox = <div className="mx_GroupUserSettings_groupPublicity_scrollbox">
-                <GeminiScrollbar>
+                <GeminiScrollbarWrapper>
                     { groupPublicityToggles }
-                </GeminiScrollbar>
+                </GeminiScrollbarWrapper>
             </div>;
         } else {
             text = _t("You're not currently a member of any communities.");

From 8b2446f80397532d14ffb1e3aa9a2abe8956f1f1 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 9 Apr 2018 23:02:59 +0100
Subject: [PATCH 919/927] rename createGroupButton to not be a total
 misnomer...

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

diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js
index 7a187e4298..03d4b8f027 100644
--- a/src/components/structures/TagPanel.js
+++ b/src/components/structures/TagPanel.js
@@ -147,7 +147,7 @@ const TagPanel = React.createClass({
                 </Droppable>
             </GeminiScrollbar>
             <div className="mx_TagPanel_divider" />
-            <div className="mx_TagPanel_createGroupButton">
+            <div className="mx_TagPanel_groupsButton">
                 <GroupsButton tooltip={true} />
             </div>
         </div>;

From a142f4405a1340c42d2ee98231893485d0695925 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 11 Apr 2018 10:41:11 +0100
Subject: [PATCH 920/927] Revert "Use GeminiScrollbarWrapper in Flair settings
 of UserSettings"

This reverts commit 3b5fb3ae3015b1bae0bf483f4360222392ad419b.
---
 src/components/views/groups/GroupUserSettings.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/views/groups/GroupUserSettings.js b/src/components/views/groups/GroupUserSettings.js
index 0405d411d2..755d6aae8f 100644
--- a/src/components/views/groups/GroupUserSettings.js
+++ b/src/components/views/groups/GroupUserSettings.js
@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import GeminiScrollbar from 'react-gemini-scrollbar';
 import sdk from '../../../index';
 import { MatrixClient } from 'matrix-js-sdk';
 import { _t } from '../../../languageHandler';
@@ -54,15 +55,14 @@ export default React.createClass({
             text = _t('Loading...');
         } else if (groups.length > 0) {
             const GroupPublicityToggle = sdk.getComponent('groups.GroupPublicityToggle');
-            const GeminiScrollbarWrapper = sdk.getComponent('elements.GeminiScrollbarWrapper');
             const groupPublicityToggles = groups.map((groupId, index) => {
                 return <GroupPublicityToggle key={index} groupId={groupId} />;
             });
             text = _t('Display your community flair in rooms configured to show it.');
             scrollbox = <div className="mx_GroupUserSettings_groupPublicity_scrollbox">
-                <GeminiScrollbarWrapper>
+                <GeminiScrollbar>
                     { groupPublicityToggles }
-                </GeminiScrollbarWrapper>
+                </GeminiScrollbar>
             </div>;
         } else {
             text = _t("You're not currently a member of any communities.");

From f4d3e6fabfebd8acb935ac05f1bdcdb7fb8abcb4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 11 Apr 2018 11:31:30 +0100
Subject: [PATCH 921/927] Prepare changelog for v0.12.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9364b5820..3f08fddee5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+Changes in [0.12.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0) (2018-04-11)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.7...v0.12.0)
+
+ * Further improve group joining/leaving feedback
+  [\#1832](https://github.com/matrix-org/matrix-react-sdk/pull/1832)
+ * Cosmetic changes to Communities button
+
 Changes in [0.12.0-rc.7](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0-rc.7) (2018-04-10)
 ===============================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.6...v0.12.0-rc.7)

From 87d0c4b45a5a25f3db8ea4cd898ed8e2400926aa Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 11 Apr 2018 11:31:31 +0100
Subject: [PATCH 922/927] v0.12.0

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

diff --git a/package.json b/package.json
index 44dc934556..8483adb56d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.0-rc.7",
+  "version": "0.12.0",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 478c2bab335494a3add4a0ff193becfedcff11f9 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 11 Apr 2018 11:51:16 +0100
Subject: [PATCH 923/927] Bump js-sdk version to 0.10.0

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

diff --git a/package.json b/package.json
index 8483adb56d..cd5835dd7b 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "isomorphic-fetch": "^2.2.1",
     "linkifyjs": "^2.1.3",
     "lodash": "^4.13.1",
-    "matrix-js-sdk": "0.10.0-rc.2",
+    "matrix-js-sdk": "0.10.0",
     "optimist": "^0.6.1",
     "prop-types": "^15.5.8",
     "querystring": "^0.2.0",

From d392eef6a81d54c188bf0fe621e5589d821be39f Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 11 Apr 2018 11:54:53 +0100
Subject: [PATCH 924/927] Prepare changelog for v0.12.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f08fddee5..a74351aa69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+Changes in [0.12.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.1) (2018-04-11)
+=====================================================================================================
+[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0...v0.12.1)
+
+
 Changes in [0.12.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.0) (2018-04-11)
 =====================================================================================================
 [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.0-rc.7...v0.12.0)

From 1adb82b985ff805a01f53135ed0fe2e586924457 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 11 Apr 2018 11:54:54 +0100
Subject: [PATCH 925/927] v0.12.1

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

diff --git a/package.json b/package.json
index cd5835dd7b..95c899fedc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "matrix-react-sdk",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "SDK for matrix.org using React",
   "author": "matrix.org",
   "repository": {

From 91024007aaa576d2e029c195641a8b45a269037f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Apr 2018 18:20:40 +0100
Subject: [PATCH 926/927] Null check stylesheet href

As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
---
 src/Tinter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Tinter.js b/src/Tinter.js
index 7667e6d912..75a65412a4 100644
--- a/src/Tinter.js
+++ b/src/Tinter.js
@@ -326,7 +326,9 @@ class Tinter {
             // Vector Green as any other colour.
             // --matthew
 
-            if (ss.href && !ss.href.match(new RegExp('/theme-' + this.theme + '.css$'))) continue;
+            // stylesheets we don't have permission to access (eg. ones from extensions) have a null
+            // href and will throw exceptions if we try to access their rules.
+            if (!ss.href || !ss.href.match(new RegExp('/theme-' + this.theme + '.css$'))) continue;
             if (ss.disabled) continue;
             if (!ss.cssRules) continue;
 

From dbed29a7cc1676590c517ac06deee6f152a0933e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 11 Apr 2018 18:31:54 +0100
Subject: [PATCH 927/927] Put Tinter loop body in a try/catch

So whatever other random ways this process fails in don't cause it
to take out the whole app.
---
 src/Tinter.js | 96 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 44 deletions(-)

diff --git a/src/Tinter.js b/src/Tinter.js
index 75a65412a4..d24a4c3e74 100644
--- a/src/Tinter.js
+++ b/src/Tinter.js
@@ -298,58 +298,66 @@ class Tinter {
 
         for (let i = 0; i < document.styleSheets.length; i++) {
             const ss = document.styleSheets[i];
-            if (!ss) continue; // well done safari >:(
-            // Chromium apparently sometimes returns null here; unsure why.
-            // see $14534907369972FRXBx:matrix.org in HQ
-            // ...ah, it's because there's a third party extension like
-            // privacybadger inserting its own stylesheet in there with a
-            // resource:// URI or something which results in a XSS error.
-            // See also #vector:matrix.org/$145357669685386ebCfr:matrix.org
-            // ...except some browsers apparently return stylesheets without
-            // hrefs, which we have no choice but ignore right now
+            try {
+                if (!ss) continue; // well done safari >:(
+                // Chromium apparently sometimes returns null here; unsure why.
+                // see $14534907369972FRXBx:matrix.org in HQ
+                // ...ah, it's because there's a third party extension like
+                // privacybadger inserting its own stylesheet in there with a
+                // resource:// URI or something which results in a XSS error.
+                // See also #vector:matrix.org/$145357669685386ebCfr:matrix.org
+                // ...except some browsers apparently return stylesheets without
+                // hrefs, which we have no choice but ignore right now
 
-            // XXX seriously? we are hardcoding the name of vector's CSS file in
-            // here?
-            //
-            // Why do we need to limit it to vector's CSS file anyway - if there
-            // are other CSS files affecting the doc don't we want to apply the
-            // same transformations to them?
-            //
-            // Iterating through the CSS looking for matches to hack on feels
-            // pretty horrible anyway. And what if the application skin doesn't use
-            // Vector Green as its primary color?
-            // --richvdh
+                // XXX seriously? we are hardcoding the name of vector's CSS file in
+                // here?
+                //
+                // Why do we need to limit it to vector's CSS file anyway - if there
+                // are other CSS files affecting the doc don't we want to apply the
+                // same transformations to them?
+                //
+                // Iterating through the CSS looking for matches to hack on feels
+                // pretty horrible anyway. And what if the application skin doesn't use
+                // Vector Green as its primary color?
+                // --richvdh
 
-            // Yes, tinting assumes that you are using the Riot skin for now.
-            // The right solution will be to move the CSS over to react-sdk.
-            // And yes, the default assets for the base skin might as well use
-            // Vector Green as any other colour.
-            // --matthew
+                // Yes, tinting assumes that you are using the Riot skin for now.
+                // The right solution will be to move the CSS over to react-sdk.
+                // And yes, the default assets for the base skin might as well use
+                // Vector Green as any other colour.
+                // --matthew
 
-            // stylesheets we don't have permission to access (eg. ones from extensions) have a null
-            // href and will throw exceptions if we try to access their rules.
-            if (!ss.href || !ss.href.match(new RegExp('/theme-' + this.theme + '.css$'))) continue;
-            if (ss.disabled) continue;
-            if (!ss.cssRules) continue;
+                // stylesheets we don't have permission to access (eg. ones from extensions) have a null
+                // href and will throw exceptions if we try to access their rules.
+                if (!ss.href || !ss.href.match(new RegExp('/theme-' + this.theme + '.css$'))) continue;
+                if (ss.disabled) continue;
+                if (!ss.cssRules) continue;
 
-            if (DEBUG) console.debug("calcCssFixups checking " + ss.cssRules.length + " rules for " + ss.href);
+                if (DEBUG) console.debug("calcCssFixups checking " + ss.cssRules.length + " rules for " + ss.href);
 
-            for (let j = 0; j < ss.cssRules.length; j++) {
-                const rule = ss.cssRules[j];
-                if (!rule.style) continue;
-                if (rule.selectorText && rule.selectorText.match(/#mx_theme/)) continue;
-                for (let k = 0; k < this.cssAttrs.length; k++) {
-                    const attr = this.cssAttrs[k];
-                    for (let l = 0; l < this.keyRgb.length; l++) {
-                        if (rule.style[attr] === this.keyRgb[l]) {
-                            this.cssFixups[this.theme].push({
-                                style: rule.style,
-                                attr: attr,
-                                index: l,
-                            });
+                for (let j = 0; j < ss.cssRules.length; j++) {
+                    const rule = ss.cssRules[j];
+                    if (!rule.style) continue;
+                    if (rule.selectorText && rule.selectorText.match(/#mx_theme/)) continue;
+                    for (let k = 0; k < this.cssAttrs.length; k++) {
+                        const attr = this.cssAttrs[k];
+                        for (let l = 0; l < this.keyRgb.length; l++) {
+                            if (rule.style[attr] === this.keyRgb[l]) {
+                                this.cssFixups[this.theme].push({
+                                    style: rule.style,
+                                    attr: attr,
+                                    index: l,
+                                });
+                            }
                         }
                     }
                 }
+            } catch (e) {
+                // Catch any random exceptions that happen here: all sorts of things can go
+                // wrong with this (nulls, SecurityErrors) and mostly it's for other
+                // stylesheets that we don't want to proces anyway. We should not propagate an
+                // exception out since this will cause the app to fail to start.
+                console.log("Failed to calculate CSS fixups for a stylesheet: " + ss.href, e);
             }
         }
         if (DEBUG) {