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 001/134] 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 002/134] 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 003/134] 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 004/134] 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 005/134] 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 006/134] 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 007/134] 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 008/134] 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 009/134] 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 010/134] 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 011/134] 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 012/134] 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 013/134] 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 014/134] 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 015/134] 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 016/134] 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 017/134] 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 018/134] 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 019/134] 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 020/134] 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 021/134] 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 022/134] 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 023/134] 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 024/134] 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 025/134] 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 026/134] 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 027/134] 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 028/134] 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 029/134] 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 030/134] 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 031/134] 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 032/134] 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 033/134] 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 034/134] 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 035/134] 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 036/134] 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 037/134] 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 038/134] 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 039/134] 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 040/134] 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 041/134] 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 042/134] 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 043/134] 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 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 044/134] 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 045/134] 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 046/134] 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 047/134] 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 048/134] 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 049/134] 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 050/134] 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 051/134] 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 052/134] 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 053/134] 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 054/134] 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 055/134] 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 056/134] 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 057/134] 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 058/134] 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 059/134] 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 060/134] 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 061/134] 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 062/134] 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 063/134] 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 064/134] 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 065/134] 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 066/134] 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 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 067/134] 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 4be057ee2caa3f28d858f1ad24af7dcbddc695fc Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 30 Nov 2017 07:51:15 +0000
Subject: [PATCH 068/134] 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 069/134] 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 c0d9f819283678867777d09c5c35dd93b50c3700 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 3 Dec 2017 14:15:06 +0000
Subject: [PATCH 070/134] 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 071/134] 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 072/134] 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 35c7f6e13d02e5bb5ee89e0495da894b7792ace0 Mon Sep 17 00:00:00 2001
From: jfkimmes <jfkimmes@mailbox.org>
Date: Mon, 4 Dec 2017 14:58:30 +0000
Subject: [PATCH 073/134] 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 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 074/134] 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 075/134] 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 076/134] 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 077/134] 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 078/134] 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 079/134] 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 080/134] 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 47c444f91db9c1943a963bbc5de7607bb4a732b9 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Thu, 7 Dec 2017 15:44:56 +0000
Subject: [PATCH 081/134] 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 082/134] 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 083/134] 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 509fbd4331ca4d41d3bb863d67f743efda057b2f Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 8 Dec 2017 18:07:44 +0000
Subject: [PATCH 084/134] 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 085/134] 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 a3f74d14a0eff2c12bc927a70ae3ca1cc0a31325 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 9 Dec 2017 18:03:45 +0000
Subject: [PATCH 086/134] 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 087/134] 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 088/134] 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 089/134] 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 68f4dcbc23562e96c7744247b77d72f260edea38 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Tue, 12 Dec 2017 10:29:18 +0000
Subject: [PATCH 090/134] 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 091/134] 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 66fb73af5dd4b4baecb016d2936f653904f138af Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Fri, 15 Dec 2017 13:33:11 +0000
Subject: [PATCH 092/134] 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 093/134] 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 094/134] 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 5d0a82c83b5c17b13a9862062f2134a842b8fce1 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Sat, 16 Dec 2017 14:45:13 +0000
Subject: [PATCH 095/134] 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 096/134] 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 097/134] 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 098/134] 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 21bca7e2d3c467e081a186e556f80ab59090fb2d Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Mon, 18 Dec 2017 21:34:17 +0000
Subject: [PATCH 099/134] 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 100/134] 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 9702e60f4600d987d0c7bfdbd6856affe3bfc2df Mon Sep 17 00:00:00 2001
From: SimonLefort <moi@simonlefort.be>
Date: Wed, 20 Dec 2017 10:55:39 +0000
Subject: [PATCH 101/134] 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 102/134] 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 103/134] 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 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 104/134] 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 105/134] 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 106/134] 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 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 107/134] 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 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 108/134] 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 109/134] 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 110/134] 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 fb76d5fa522454af718504bfaf34e60b1175e1d8 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Mon, 1 Jan 2018 10:35:57 +0000
Subject: [PATCH 111/134] 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 112/134] 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 113/134] 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 114/134] 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 115/134] 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 116/134] 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 117/134] 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 118/134] 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 119/134] 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 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 120/134] 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 08e6d123a2b218f37c90dc7caed498e77f392c89 Mon Sep 17 00:00:00 2001
From: Osoitz <oelkoro@gmail.com>
Date: Wed, 3 Jan 2018 11:53:58 +0000
Subject: [PATCH 121/134] 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 122/134] 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 123/134] 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 124/134] 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 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 125/134] 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 126/134] 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 127/134] 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 a7aa0a3b276cd8c40c29924802d0b7990792cbdf Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Thu, 4 Jan 2018 21:28:06 +0000
Subject: [PATCH 128/134] 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 8731bfd0089e76b759b9b786fdd8c5410ed52517 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Thu, 4 Jan 2018 21:36:34 +0000
Subject: [PATCH 129/134] 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 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 130/134] 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 131/134] 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 132/134] 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 133/134] 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 134/134] 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({