From b032accdfa38c3819e2f24d3ae581a21bac4e5f7 Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver@hunt.bz>
Date: Fri, 9 Jun 2017 17:03:29 +0100
Subject: [PATCH 001/172] Add border on hover for code blocks

Signed-off-by: Oliver Hunt <oliver@hunt.bz>
---
 .../vector/css/matrix-react-sdk/views/rooms/_EventTile.scss  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index a980d1f9ce..38da84b1c4 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -345,6 +345,11 @@ limitations under the License.
 }
 .mx_EventTile_body pre {
     position: relative;
+    border: 1px solid #f8f8f8;
+}
+.mx_EventTile:hover .mx_EventTile_body pre
+{
+    border: 1px solid $primary-hairline-color;
 }
 .mx_EventTile_body pre:hover .mx_EventTile_copyButton
 {

From 87cc154bcce1d48016c63ca9411c329dee99a2c1 Mon Sep 17 00:00:00 2001
From: GrigRUSS <grigruss@ya.ru>
Date: Fri, 9 Jun 2017 17:24:25 +0000
Subject: [PATCH 002/172] Translated using Weblate (Russian)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 573a09cc05..ab37461b10 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -190,5 +190,18 @@
     "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто matrix-appservice-irc  эксплуатирует и использует",
     "You have successfully set a password!": "Вы успешно установили пароль!",
     "Continue": "Продолжить",
-    "Please set a password!": "Задайте пароль!"
+    "Please set a password!": "Задайте пароль!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix существует множество комнат, связанных с существующими сетями (Slack, IRC, Gitter и т.д.) Или независимыми. Ищите в каталоге!",
+    "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
+    "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
+    "Support for those using the Matrix spec": "Поддержка тех, кто использует спецификацию Matrix",
+    "Design and implementation of E2E in Matrix": "Разработка и внедрение E2E в Matrix",
+    "Implementing VR services with Matrix": "Внедрение служб VR с помощью Matrix",
+    "Discussion of the Identity Service API": "Обсуждение службы идентификации API",
+    "Support for those using, running and writing other bridges": "Поддержка тех, кто использует, работает и пишет другие мосты (bridges)",
+    "Contributing code to Matrix and Riot": "Взаимодействующий код для Matrix и Riot",
+    "Dev chat for the Riot/Web dev team": "Dev chat для группы разработчиков Riot/Web",
+    "Dev chat for the Dendrite dev team": "Dev chat для группы разработчиков Dendrite",
+    "Co-ordination for Riot/Web translators": "Координирование для переводчиков Riot / Web",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит Вам вернуться в свою учетную запись после выхода, и войти в систему на других устройствах."
 }

From daf92c59b107474764873aa772e4b1c48825a5aa Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 20:29:36 +0100
Subject: [PATCH 003/172] released js-sdk & react-sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ffed4f17a1..e6dba93528 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.10",
-    "matrix-react-sdk": "0.9.2",
+    "matrix-js-sdk": "0.7.11-rc.1",
+    "matrix-react-sdk": "0.9.3-rc.1",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From b98497f386f04be21e3324905953592e31484a67 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 20:30:24 +0100
Subject: [PATCH 004/172] v0.11.0-rc.1

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

diff --git a/electron_app/package.json b/electron_app/package.json
index a21fd522c5..b277e80668 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.10.2",
+  "version": "0.11.0-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 556aa2e38e9a82d8e80c6abaa27685fad4e3a4f8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 20:31:33 +0100
Subject: [PATCH 005/172] Prepare changelog for v0.11.0-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae8209ad12..378849000a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,100 @@
+Changes in [0.11.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.0-rc.1) (2017-06-09)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.2...v0.11.0-rc.1)
+
+ * Update from Weblate.
+   [\#4258](https://github.com/vector-im/riot-web/pull/4258)
+ * Update from Weblate.
+   [\#4254](https://github.com/vector-im/riot-web/pull/4254)
+ * Update from Weblate.
+   [\#4253](https://github.com/vector-im/riot-web/pull/4253)
+ * Expect to see HTTP /join/#some:alias when we the view knows it
+   [\#4252](https://github.com/vector-im/riot-web/pull/4252)
+ * Update from Weblate.
+   [\#4250](https://github.com/vector-im/riot-web/pull/4250)
+ * add explicit import to utf8 polyfill and rip out unused imports
+   [\#4169](https://github.com/vector-im/riot-web/pull/4169)
+ * Added styling for copy to clipboard button
+   [\#4204](https://github.com/vector-im/riot-web/pull/4204)
+ * Update from Weblate.
+   [\#4231](https://github.com/vector-im/riot-web/pull/4231)
+ * Update from Weblate.
+   [\#4218](https://github.com/vector-im/riot-web/pull/4218)
+ * Update CSS for ChatInviteDialog
+   [\#4226](https://github.com/vector-im/riot-web/pull/4226)
+ * change electron -> electron_app which was previously missed
+   [\#4212](https://github.com/vector-im/riot-web/pull/4212)
+ * New guest access
+   [\#4039](https://github.com/vector-im/riot-web/pull/4039)
+ * Align message timestamp centrally about the avatar mid-point
+   [\#4219](https://github.com/vector-im/riot-web/pull/4219)
+ * Remove '/' from homepage URL
+   [\#4221](https://github.com/vector-im/riot-web/pull/4221)
+ * Chop off 'origin/'
+   [\#4220](https://github.com/vector-im/riot-web/pull/4220)
+ * Update from Weblate.
+   [\#4214](https://github.com/vector-im/riot-web/pull/4214)
+ * adjust alignment of message menu button in compact layout
+   [\#4211](https://github.com/vector-im/riot-web/pull/4211)
+ * Update from Weblate.
+   [\#4207](https://github.com/vector-im/riot-web/pull/4207)
+ * Fix Tests in ILAG
+   [\#4209](https://github.com/vector-im/riot-web/pull/4209)
+ * Update from Weblate.
+   [\#4197](https://github.com/vector-im/riot-web/pull/4197)
+ * Fix tests for new-guest-access
+   [\#4201](https://github.com/vector-im/riot-web/pull/4201)
+ * i18n for SetPasswordDialog
+   [\#4198](https://github.com/vector-im/riot-web/pull/4198)
+ * Update from Weblate.
+   [\#4193](https://github.com/vector-im/riot-web/pull/4193)
+ * to make the windows volume mixer not explode as it can't resize icons.
+   [\#4183](https://github.com/vector-im/riot-web/pull/4183)
+ * provide react devtools in electron dev runs
+   [\#4186](https://github.com/vector-im/riot-web/pull/4186)
+ * Fix DeprecationWarning
+   [\#4184](https://github.com/vector-im/riot-web/pull/4184)
+ * room link should be a matrix.to one
+   [\#4178](https://github.com/vector-im/riot-web/pull/4178)
+ * Update home.html
+   [\#4163](https://github.com/vector-im/riot-web/pull/4163)
+ * Add missing translation for room directory
+   [\#4160](https://github.com/vector-im/riot-web/pull/4160)
+ * i18n welcome
+   [\#4129](https://github.com/vector-im/riot-web/pull/4129)
+ * Tom welcome page
+   [\#4038](https://github.com/vector-im/riot-web/pull/4038)
+ * Fix some tests that expect Directory (they should expect HomePage)
+   [\#4076](https://github.com/vector-im/riot-web/pull/4076)
+ * Add "Login" button to RHS when user is a guest
+   [\#4037](https://github.com/vector-im/riot-web/pull/4037)
+ * Rejig the PaswordNagBar
+   [\#4026](https://github.com/vector-im/riot-web/pull/4026)
+ * Allow team server config to be missing
+   [\#4024](https://github.com/vector-im/riot-web/pull/4024)
+ * Remove GuestWarningBar
+   [\#4020](https://github.com/vector-im/riot-web/pull/4020)
+ * Make left panel better for new users (mk III)
+   [\#4023](https://github.com/vector-im/riot-web/pull/4023)
+ * Implement default welcome page and allow custom URL /w config
+   [\#4015](https://github.com/vector-im/riot-web/pull/4015)
+ * Add warm-fuzzy for successful password entry
+   [\#3989](https://github.com/vector-im/riot-web/pull/3989)
+ * autoFocus new password input in SetPasswordDialog
+   [\#3982](https://github.com/vector-im/riot-web/pull/3982)
+ * Implement dialog to set password
+   [\#3921](https://github.com/vector-im/riot-web/pull/3921)
+ * Replace NeedToRegister with SetMxId dialog
+   [\#3924](https://github.com/vector-im/riot-web/pull/3924)
+ * Add welcomeUserId to sample config
+   [\#3906](https://github.com/vector-im/riot-web/pull/3906)
+ * CSS for mxIdDialog redesign
+   [\#3885](https://github.com/vector-im/riot-web/pull/3885)
+ * Implement PasswordNagBar
+   [\#3817](https://github.com/vector-im/riot-web/pull/3817)
+ * CSS for new SetMxIdDialog
+   [\#3762](https://github.com/vector-im/riot-web/pull/3762)
+
 Changes in [0.10.2](https://github.com/vector-im/riot-web/releases/tag/v0.10.2) (2017-06-06)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.1...v0.10.2)

From 7237224fc96a9ddbfb36e2b1880c5f3356ed9668 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 20:31:34 +0100
Subject: [PATCH 006/172] v0.11.0-rc.1

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

diff --git a/package.json b/package.json
index e6dba93528..028cd76bef 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.10.2",
+  "version": "0.11.0-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From fecbbcda9e3671e4162652b149f2c0c94a6e8d6b Mon Sep 17 00:00:00 2001
From: maxigaz <maxigaz@protonmail.com>
Date: Fri, 9 Jun 2017 20:41:27 +0000
Subject: [PATCH 007/172] Translated using Weblate (Hungarian)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d5d33930ab..f04b56313d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -160,5 +160,41 @@
     "OK": "Rendben",
     "You need to be using HTTPS to place a screen-sharing call.": "HTTPS-t kell használnod hogy képernyőmegosztásos hívást kezdeményezz.",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "A problémák diagnosztizálása érdekében erről a kliensről a hibajelentésben naplók lesznek elküldve. Ha csak az alábbi szöveget szeretnéd elküldeni akkor ezt ne jelöld meg:",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Írd le a hibát. Mit csináltál? Mi az amit szerettél volna ha történik? Ezzel szemben mi az ami történt?"
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Írd le a hibát. Mit csináltál? Mi az amit szerettél volna ha történik? Ezzel szemben mi az ami történt?",
+    "Login": "Bejelentkezés",
+    "Welcome to Riot.im": "Üdvözlünk a Riot.im-en",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizált, titkosított csevegés és kollaboráció [matrix] alapokon",
+    "Search the room directory": "Keresés a szobák jegyzékében",
+    "Chat with Riot Bot": "Csevegés a Riot Robottal",
+    "Get started with some tips from Riot Bot!": "Kezdd el a Riot használatát a Riot Robot tippjei segítségével!",
+    "General discussion about Matrix and Riot": "Általános beszélgetések a Matrixról és a Riotról",
+    "Discussion of all things Matrix!": "Beszélgetések mindenről, ami a Matrixhoz kapcsolódik!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web és asztali csevegés",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS és matrix-ios-sdk csevegés",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android és matrix-android-sdk csevegés",
+    "Matrix technical discussions": "Technikai jellegű beszélgetések a Matrixról",
+    "Community-run support for Synapse": "Közösségi támogatás a Synapse-hez",
+    "Admin support for Dendrite": "Adminisztrációs támogatás a Dendrite-hoz",
+    "Announcements about Synapse releases": "Bejelentések a Synapse kiadásairól",
+    "Running Matrix services": "Matrixszolgáltatások működtetése",
+    "Support for those using and running matrix-appservice-irc": "Támogatás a matrix-appservice-irc használatáról és működtetéséről",
+    "Building services on Matrix": "Szolgáltatások fejlesztése a Matrixra",
+    "Support for those using the Matrix spec": "Támogatás a Matrix specifikáció használatáról",
+    "Design and implementation of E2E in Matrix": "A végponttól végpontig történő titkosítás (E2E) tervezése és implementációja a Matrixban",
+    "Implementing VR services with Matrix": "A Matrixszal együttműködő virtuális valóság (VR) szolgáltatások implementációja",
+    "Implementing VoIP services with Matrix": "A Matrixszal együttműködő VoIP szolgáltatások implementációja",
+    "Discussion of the Identity Service API": "Beszélgetések az Identity Service API-ról",
+    "Support for those using, running and writing other bridges": "Támogatás egyéb hídak használáról, működtetéséről és fejlesztéséről",
+    "Contributing code to Matrix and Riot": "Hozzájárulás a Matrix és Riot programkódjának fejlesztéséhez",
+    "Dev chat for the Riot/Web dev team": "Csevegés a Riot/Web fejlesztői csapatával fejlesztőknek",
+    "Dev chat for the Dendrite dev team": "Csevegés a Dendrite fejlesztői csapatával fejlesztőknek",
+    "Co-ordination for Riot/Web translators": "Egyeztetés a Riot/Web fordítóival",
+    "Failed to change password. Is your password correct?": "Nem sikerült megváltoztatni a jelszót. Helyesen írtad be a jelszavadat?",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Már sok létező szoba van a Matrixon, melyek más hálózatokkal vannak összekapcsolva (Slack, IRC, Gitter stb.) vagy függetlenek. Látogasd meg a szobajegyzéket!",
+    "You have successfully set a password!": "Sikeresen állítottál be jelszót!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Most már visszatérhetsz a fiókodhoz kijelentkezés után, és más eszközökkel is be tudsz jelentkezni.",
+    "Continue": "Folytatás",
+    "Please set a password!": "Kérlek, állíts be egy jelszót!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
+    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))"
 }

From d108f34390d3e29f4fedc3bdff0ddd73f34c87bf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 21:43:11 +0100
Subject: [PATCH 008/172] Change flux version to 2.1.1

It was previously pinned to 2.0.3 in https://github.com/vector-im/riot-web/commit/5bab440a1
but only here and not in react-sdk, meaning that react-sdk was
still using the latest, at least in develop builds, however
react-sdk now uses utils which requires 2.1, so pin to 2.1.1
everywhere for sanity.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 028cd76bef..fffd8343e9 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "extract-text-webpack-plugin": "^0.9.1",
     "favico.js": "^0.3.10",
     "filesize": "3.5.6",
-    "flux": "~2.0.3",
+    "flux": "2.1.1",
     "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",

From f086629fed1830f090a84488620c89865289f1df Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 22:17:30 +0100
Subject: [PATCH 009/172] react-sdk rc.2

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

diff --git a/package.json b/package.json
index fffd8343e9..48488c360e 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
     "matrix-js-sdk": "0.7.11-rc.1",
-    "matrix-react-sdk": "0.9.3-rc.1",
+    "matrix-react-sdk": "0.9.3-rc.2",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From f335656c7d1ca3e7b7f7e97493c7d80282701add Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 22:18:01 +0100
Subject: [PATCH 010/172] v0.11.0-rc.2

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

diff --git a/electron_app/package.json b/electron_app/package.json
index b277e80668..fc92b5c496 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.0-rc.1",
+  "version": "0.11.0-rc.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 1d3fc7be9bfe0ced1e723586c8b9d89fa034c0ca Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 22:20:38 +0100
Subject: [PATCH 011/172] Prepare changelog for v0.11.0-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 378849000a..e75c6e23a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Changes in [0.11.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.0-rc.2) (2017-06-09)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0-rc.1...v0.11.0-rc.2)
+
+ * Update to matrix-react-sdk rc.2 which fixes the flux
+   dependency version and an issue with the conference
+   call bar translation.
+
+
 Changes in [0.11.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.0-rc.1) (2017-06-09)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.10.2...v0.11.0-rc.1)

From 89e14c1b495a586a406fb2592ffa9aa898e70fd0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 9 Jun 2017 22:20:38 +0100
Subject: [PATCH 012/172] v0.11.0-rc.2

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

diff --git a/package.json b/package.json
index 48488c360e..6f816f6704 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.0-rc.1",
+  "version": "0.11.0-rc.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From dd7489002f85839a90b91e0d0949fb73997dad6a Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Fri, 9 Jun 2017 16:57:45 +0000
Subject: [PATCH 013/172] Translated using Weblate (English (United States))

Currently translated at 85.3% (169 of 198 strings)

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

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 04409be07a..8500886541 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -163,5 +163,9 @@
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
     "Login": "Login",
     "Continue": "Continue",
-    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?"
+    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
+    " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+    "Welcome to Riot.im": "Welcome to Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
+    "Chat with Riot Bot": "Chat with Riot Bot"
 }

From a7641ca04d25d0473aba08cdcea2bbc68fbb1988 Mon Sep 17 00:00:00 2001
From: maxigaz <maxigaz@protonmail.com>
Date: Fri, 9 Jun 2017 20:44:00 +0000
Subject: [PATCH 014/172] Translated using Weblate (Hungarian)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index f04b56313d..9f8b2bef8f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -9,7 +9,7 @@
     "Cancel Sending": "Küldés megszakítása",
     "Can't update user notification settings": "Nem sikerül frissíteni az értesítési beállításokat",
     "Close": "Bezár",
-    "Create new room": "Új szoba készítés",
+    "Create new room": "Új szoba létrehozása",
     "Couldn't find a matching Matrix room": "Nem található a keresett Matrix szoba",
     "Custom Server Options": "Egyedi szerver beállítások",
     "delete the alias.": "becenév törlése.",

From c51270aca42d64858b64a1b9b0aa312c7788b58a Mon Sep 17 00:00:00 2001
From: GrigRUSS <grigruss@ya.ru>
Date: Fri, 9 Jun 2017 19:12:10 +0000
Subject: [PATCH 015/172] Translated using Weblate (Russian)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 ab37461b10..b9dcf10d56 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -9,7 +9,7 @@
     "Custom Server Options": "Расширенные настройки сервера",
     "delete the alias.": "удалить привязку.",
     "Delete the room alias": "Удалить привязку комнаты",
-    "Direct Chat": "Персональное сообщение",
+    "Direct Chat": "Приватный чат",
     "Directory": "Каталог",
     "Dismiss": "Отказ",
     "Drop here to": "Перетащите сюда",
@@ -194,7 +194,7 @@
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix существует множество комнат, связанных с существующими сетями (Slack, IRC, Gitter и т.д.) Или независимыми. Ищите в каталоге!",
     "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
     "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
-    "Support for those using the Matrix spec": "Поддержка тех, кто использует спецификацию Matrix",
+    "Support for those using the Matrix spec": "Поддержка для тех, кто использует спецификацию Matrix",
     "Design and implementation of E2E in Matrix": "Разработка и внедрение E2E в Matrix",
     "Implementing VR services with Matrix": "Внедрение служб VR с помощью Matrix",
     "Discussion of the Identity Service API": "Обсуждение службы идентификации API",

From 3a86e659afdfdb15a2d05cc6112b6ebd3c33ae8a Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver@hunt.bz>
Date: Sat, 10 Jun 2017 01:26:20 +0100
Subject: [PATCH 016/172] Made border transparent when not hovered

Signed-off-by: Oliver Hunt <oliver@hunt.bz>
---
 .../vector/css/matrix-react-sdk/views/rooms/_EventTile.scss     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index 38da84b1c4..7d8e4ba2b7 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -345,7 +345,7 @@ limitations under the License.
 }
 .mx_EventTile_body pre {
     position: relative;
-    border: 1px solid #f8f8f8;
+    border: 1px solid transparent;
 }
 .mx_EventTile:hover .mx_EventTile_body pre
 {

From 379a5582ea17fb40239c189da4279f4927247c60 Mon Sep 17 00:00:00 2001
From: BrianMwit <brian.mwit@gmail.com>
Date: Sat, 10 Jun 2017 00:27:46 +0000
Subject: [PATCH 017/172] Translated using Weblate (Thai)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index c993079cd9..bfe98e2d02 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -187,7 +187,7 @@
     "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite",
     "Co-ordination for Riot/Web translators": "แชทสำหรับประสานงานการแปล Riot บนเว็บ",
     "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเคีือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเครือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!",
     "You have successfully set a password!": "การตั้งรหัสผ่านเสร็จสมบูรณ์!",
     "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาสู่ระบบบนอุปกรณ์อื่น ๆ",
     "Continue": "ดำเนินการต่อ",
@@ -195,5 +195,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ",
     "Design and implementation of E2E in Matrix": "การออกแบบและใช้งาน E2E ใน Matrix",
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก [matrix]"
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก [matrix]",
+    "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
+    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))"
 }

From 5eb0c95b5d22b036f078a81b150b9698769a5893 Mon Sep 17 00:00:00 2001
From: Radium <ztl8702@126.com>
Date: Sat, 10 Jun 2017 07:34:30 +0000
Subject: [PATCH 018/172] Added translation using Weblate (Chinese
 (Simplified))

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/zh_Hans.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 92ebb6576f1449550014a2bfed067e77e430ca97 Mon Sep 17 00:00:00 2001
From: abugandar <abugandar+1@yandex.com>
Date: Sat, 10 Jun 2017 20:51:00 +0000
Subject: [PATCH 019/172] Added translation using Weblate (Arabic)

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

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/ar.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 6f10213efdbe55c238d7f20b3011636380c97c86 Mon Sep 17 00:00:00 2001
From: abugandar <abugandar+1@yandex.com>
Date: Sat, 10 Jun 2017 20:52:05 +0000
Subject: [PATCH 020/172] Translated using Weblate (Arabic)

Currently translated at 0.5% (1 of 198 strings)

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

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 9e26dfeeb6..5dd1a2cd42 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+    "All messages": "كل الرسائل"
+}

From 585c36b0a3fcf94150804d9b9ab15a33942990ba Mon Sep 17 00:00:00 2001
From: Radium <ztl8702@126.com>
Date: Sat, 10 Jun 2017 07:54:20 +0000
Subject: [PATCH 021/172] Translated using Weblate (Chinese (Simplified))

Currently translated at 0.5% (1 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 9e26dfeeb6..a9c61ad9b5 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1 +1,3 @@
-{}
\ No newline at end of file
+{
+    "Close": "关闭"
+}

From 08d0ef82dc85f83bf4e3ca6d0f1f45c5d7c26b94 Mon Sep 17 00:00:00 2001
From: Radium <ztl8702@126.com>
Date: Sat, 10 Jun 2017 07:09:04 +0000
Subject: [PATCH 022/172] Translated using Weblate (Chinese (Traditional))

Currently translated at 81.8% (162 of 198 strings)

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

diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d6f0930a77..5b22640d87 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -98,7 +98,7 @@
     "OK": "OK",
     "You need to be using HTTPS to place a screen-sharing call.": "你需要使用　HTTPS 來置放畫面分享的通話。",
     "Welcome page": "歡迎頁",
-    "A new version of Riot is available.": " Riot 發佈了新版本",
+    "A new version of Riot is available.": "Riot 發佈了新版本",
     "Add an email address above to configure email notifications": "在上面新增電子郵件以設定電郵通知",
     "All notifications are currently disabled for all targets.": "目前所有的通知功能已取消",
     "An error occurred whilst saving your email notification preferences.": "在儲存你的電郵通知偏好時發生錯誤",

From 296a5a903b2c210de6ac49fd1e992f4e7196cbc2 Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Sat, 10 Jun 2017 21:48:37 +0000
Subject: [PATCH 023/172] Translated using Weblate (German)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 a289d08edc..dfd84ecbd8 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -145,7 +145,7 @@
     "Collecting logs": "Protokolle werden abgerufen",
     "Describe your problem here.": "Beschreibe dein Problem hier.",
     "Failed to send report: ": "Senden des Reports fehlgeschlagen: ",
-    "Forward Message": "Leite Nachricht weiter",
+    "Forward Message": "Nachricht weiterleiten",
     "Hide panel": "Verberge Feld",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Um Probleme zu diagnostizieren werden mit diesem Fehlerbericht Protokolle von diesem Client gesendet. Wenn du nur obigen text senden willst, deselektiere folgendes:",
     "Loading bug report module": "Lade Fehlerbericht-Modul",

From ff33521ed925bbc898c21125103d9f5b4f11fd32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=B4=A8=E0=B4=BF=E0=B4=A6=E0=B4=B0=E0=B5=8D=E2=80=8D?=
 =?UTF-8?q?=E0=B4=B6=E0=B5=8D?= <nidarshraj@disroot.org>
Date: Sat, 10 Jun 2017 19:15:48 +0000
Subject: [PATCH 024/172] Translated using Weblate (Malayalam)

Currently translated at 2.0% (4 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
---
 src/i18n/strings/ml.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index e67ece484c..1059888544 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -1,5 +1,6 @@
 {
     "Add an email address above to configure email notifications": "ഇ മെയില്‍ അറിയിപ്പുകൾ ലഭിക്കാന്‍ മുകളില്‍ ഇ-മെയില്‍ വിലാസം നല്‍കൂ",
     "All messages": "എല്ലാ സന്ദേശങ്ങളും",
-    "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)"
-}
\ No newline at end of file
+    "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)ല്‍  %(browserName) വഴി %(appName)"
+}

From dcfe49e48e632b9f1d9d2b73cd6dca68a967389d Mon Sep 17 00:00:00 2001
From: Pitchaya Boonsarngsuk <brian.mwit@gmail.com>
Date: Sat, 10 Jun 2017 00:48:36 +0000
Subject: [PATCH 025/172] Translated using Weblate (Thai)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index bfe98e2d02..c770dc3e43 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -195,7 +195,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ",
     "Design and implementation of E2E in Matrix": "การออกแบบและใช้งาน E2E ใน Matrix",
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "ระบบแชทและประสานงาน ไร้ศูนย์กลางและเข้ารหัสได้ โดยใช้เทคโนโลยีจาก [matrix]",
     "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
     " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))"
 }

From e5b6d0a43c9962f30b6b580769610a0391573743 Mon Sep 17 00:00:00 2001
From: Tom Tryfonidis <tomtryf@gnome.org>
Date: Sun, 11 Jun 2017 16:33:13 +0000
Subject: [PATCH 026/172] Translated using Weblate (Greek)

Currently translated at 97.9% (194 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
---
 src/i18n/strings/el.json | 133 +++++++++++++++++++++++++--------------
 1 file changed, 85 insertions(+), 48 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 2cb2973c0f..22d0775ec8 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -7,34 +7,34 @@
     "An error occurred whilst saving your email notification preferences.": "Ένα σφάλμα προέκυψε κατά την αποθήκευση των ρυθμίσεων σας.",
     "Call invitation": "Πρόσκληση σε κλήση",
     "Cancel": "Ακύρωση",
-    "Cancel Sending": "Ακύρωση Αποστολής",
+    "Cancel Sending": "Ακύρωση αποστολής",
     "Can't update user notification settings": "Δεν είναι δυνατή η ενημέρωση των ρυθμίσεων ειδοποίησης χρήστη",
     "Changelog": "Αλλαγές",
     "Close": "Κλείσιμο",
     "Collapse panel": "Ελαχιστοποίηση καρτέλας",
-    "Create new room": "Δημιούργησε ένα νέο δωμάτιο",
+    "Create new room": "Δημιουργία νέου δωματίου",
     "Custom Server Options": "Προσαρμοσμένες ρυθμίσεις διακομιστή",
-    "Describe your problem here.": "Περιέγραψε το πρόβλημα σου εδώ.",
-    "Direct Chat": "Απευθείας Συνομιλία",
+    "Describe your problem here.": "Περιγράψτε το πρόβλημα σας εδώ.",
+    "Direct Chat": "Απευθείας συνομιλία",
     "Directory": "Ευρετήριο",
-    "Download this file": "Κατέβασε το αρχείο",
-    "Enable audible notifications in web client": "Ενεργοποίηση των ηχητικών ειδοποιήσεων",
-    "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω email",
+    "Download this file": "Λήψη αρχείου",
+    "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
+    "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας",
     "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων γι' αυτό το λογαριασμό",
     "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:",
     "Error": "Σφάλμα",
     "#example": "#παράδειγμα",
     "Expand panel": "Μεγιστοποίηση καρτέλας",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> και <a href=\"http://opera.com\">Opera</a> λειτουργούν επίσης.",
-    "Add an email address above to configure email notifications": "Πρόσθεσε μια διεύθυνση email στο παραπάνω πεδίο, για να έχεις τη δυνατότητα να λαμβάνεις ειδοποιήσεις",
+    "Add an email address above to configure email notifications": "Προσθέστε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στο παραπάνω πεδίο, για να έχετε τη δυνατότητα να λαμβάνετε ειδοποιήσεις",
     "Collecting app version information": "Συγκέντρωση πληροφοριών σχετικά με την έκδοση της εφαρμογής",
-    "customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας ένα διαφορετικό URL για το διακομιστή.<br/> Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.<br/><br/>Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν, μέσω email.",
+    "customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας μια διαφορετική διεύθυνση για το διακομιστή.<br/> Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.<br/><br/>Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν μέσω μηνυμάτων ηλεκτρονικής αλληλογραφίας.",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s μέσω %(browserName)s σε %(osName)s",
     "All messages (loud)": "Όλα τα μηνύματα (δυνατά)",
-    "delete the alias.": "διέγραψε το ψευδώνυμο.",
+    "delete the alias.": "διαγραφή ψευδώνυμου.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Διαγραφή του ψευδώνυμου %(alias)s και αφαίρεση του %(name)s από το ευρετήριο;",
-    "Dismiss": "Αγνόησε",
-    "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η εισαγωγή του tag %(tagName)s στο δωμάτιο",
+    "Dismiss": "Απόρριψη",
+    "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η προσθήκη της ετικέτας %(tagName)s στο δωμάτιο",
     "Failed to change settings": "Δεν ήταν δυνατή η αλλαγή των ρυθμίσεων",
     "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
     "Favourite": "Αγαπημένο",
@@ -43,13 +43,13 @@
     "Forward Message": "Προώθηση",
     " from room": " από το δωμάτιο",
     "Guests can join": "Επισκέπτες μπορούν να συνδεθούν",
-    "Guest users can't invite users. Please register to invite.": "Οι επισκέπτες δεν έχουν τη δυνατότητα να προσκαλέσουν άλλους χρήστες. Παρακαλώ εγγραφείτε πρώτα.",
-    "Hide panel": "Κρύψε τη καρτέλα",
+    "Guest users can't invite users. Please register to invite.": "Οι επισκέπτες δεν έχουν τη δυνατότητα να προσκαλέσουν άλλους χρήστες. Παρακαλούμε εγγραφείτε πρώτα.",
+    "Hide panel": "Απόκρυψη καρτέλας",
     "I understand the risks and wish to continue": "Κατανοώ του κινδύνους και επιθυμώ να συνεχίσω",
-    "Invite to this room": "Προσκάλεσε",
+    "Invite to this room": "Πρόσκληση σε αυτό το δωμάτιο",
     "Keywords": "Λέξεις κλειδιά",
-    "Leave": "Αποχώρησε",
-    "Low Priority": "Χαμηλής Προτεραιότητας",
+    "Leave": "Αποχώρηση",
+    "Low Priority": "Χαμηλή προτεραιότητα",
     "Members": "Μέλη",
     "Messages containing <span>keywords</span>": "Μηνύματα που περιέχουν <span>λέξεις κλειδιά</span>",
     "Messages containing my user name": "Μηνύματα που περιέχουν το ψευδώνυμο μου",
@@ -62,49 +62,49 @@
     "Noisy": "Δυνατά",
     "Notifications": "Ειδοποιήσεις",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Οι ειδοποιήσεις για τις επόμενες λέξεις κλειδία ακολουθούν κανόνες που δεν είναι δυνατόν να εμφανιστούν εδώ:",
-    "Notify for all other messages/rooms": "Στείλε ειδοποιήσεις για όλα τα υπόλοιπα μηνύματα/δωμάτια",
-    "Notify me for anything else": "Ειδοποίησέ με για οτιδήποτε άλλο",
+    "Notify for all other messages/rooms": "Ειδοποίηση για όλα τα υπόλοιπα μηνύματα/δωμάτια",
+    "Notify me for anything else": "Ειδοποίηση  για οτιδήποτε άλλο",
     "Operation failed": "Η λειτουργία απέτυχε",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Παρακαλώ περιγράψτε το σφάλμα. Τι κάνατε; Τι περιμένατε να συμβεί; Τι έγινε τελικά;",
-    "Please Register": "Παρακαλώ εγγραφείτε",
-    "Redact": "Ανακάλεσε",
-    "Reject": "Απέρριψε",
-    "Remove": "Αφαίρεσε",
-    "Remove from Directory": "Αφαίρεση από το Ευρετήριο",
-    "Resend": "Ξαναστείλε",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Παρακαλούμε περιγράψτε το σφάλμα. Τι κάνατε; Τι περιμένατε να συμβεί; Τι έγινε τελικά;",
+    "Please Register": "Παρακαλούμε εγγραφείτε",
+    "Redact": "Ανάκληση",
+    "Reject": "Απόρριψη",
+    "Remove": "Αφαίρεση",
+    "Remove from Directory": "Αφαίρεση από το ευρετήριο",
+    "Resend": "Αποστολή ξανά",
     "Riot Desktop on %(platformName)s": "Riot Desktop σε %(platformName)s",
     "Room directory": "Ευρετήριο",
     "Room not found": "Το δωμάτιο δεν βρέθηκε",
     "Search": "Αναζήτηση",
     "Search…": "Αναζήτηση…",
-    "Send": "Στείλε",
+    "Send": "Αποστολή",
     "Settings": "Ρυθμίσεις",
-    "Start chat": "Άρχισε μια συνομιλία",
+    "Start chat": "Έναρξη συνομιλίας",
     "This Room": "Στο δωμάτιο",
     "Unavailable": "Μη διαθέσιμο",
     "Unknown device": "Άγνωστη συσκευή",
     "Update": "Ενημέρωση",
     "Enable desktop notifications": "Ενεργοποίηση ειδοποιήσεων στην επιφάνεια εργασίας",
     "Error saving email notification preferences": "Σφάλμα κατά την αποθήκευση των προτιμήσεων",
-    "Failed to send report: ": "Η αποστολή της αναφοράς απέτυχε: ",
+    "Failed to send report: ": "Απέτυχε η αποστολή της αναφοράς: ",
     "Loading bug report module": "Φόρτωση μονάδας αναφοράς σφαλμάτων",
-    "Mentions only": "Αναφορές μόνο",
+    "Mentions only": "Μόνο αναφορές",
     "Messages containing my display name": "Μηνύματα που περιέχουν το όνομα μου",
     "Off": "Ανενεργό",
     "On": "Ενεργό",
     "Permalink": "Μόνιμος σύνδεσμος",
-    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Παρακαλώ εγκαταστήστε έναν από τους φυλλομετρητές <a href=\"https://www.google.com/chrome\">Chrome</a> ή <a href=\"https://getfirefox.com\">Firefox</a> για την καλύτερη δυνατή εμπειρία.",
-    "Report a bug": "Ανεφέρε κάποιο πρόβλημα",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Παρακαλούμε εγκαταστήστε έναν από τους φυλλομετρητές <a href=\"https://www.google.com/chrome\">Chrome</a> ή <a href=\"https://getfirefox.com\">Firefox</a> για την καλύτερη δυνατή εμπειρία.",
+    "Report a bug": "Αναφορά σφάλματος",
     "Riot does not know how to join a room on this network": "To Riot δεν γνωρίζει πως να συνδεθεί σε δωμάτια που ανήκουν σ' αυτό το δίκτυο",
-    "Search for a room": "Αναζήτησε κάποιο δωμάτιο",
+    "Search for a room": "Αναζήτηση δωματίου",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Λυπούμαστε, αλλά ο φυλλομετρητής σας <b>δεν</b> υποστηρίζεται από το Riot.",
     "There are advanced notifications which are not shown here": "Υπάρχουν προχωρημένες ειδοποιήσεις οι οποίες δεν εμφανίζονται εδώ",
     "This room is inaccessible to guests. You may be able to join if you register.": "Το δωμάτιο δεν είναι προσβάσιμο σε επισκέπτες. Πιθανόν να μπορέσετε να συνδεθείτε εάν εγγραφείτε.",
     "Unable to join network": "Δεν είναι δυνατή η σύνδεση στο δίκτυο",
     "unknown error code": "άγνωστος κωδικός σφάλματος",
-    "Unnamed room": "Δωμάτιο χωρίς όνομα",
-    "Uploaded on %(date)s by %(user)s": "Ανέβηκε την %(date)s από %(user)s",
-    "Uploading report": "Ανέβασμα αναφοράς",
+    "Unnamed room": "Ανώνυμο δωμάτιο",
+    "Uploaded on %(date)s by %(user)s": "Απεστάλη στις %(date)s από %(user)s",
+    "Uploading report": "Αποστολή αναφοράς",
     "What's New": "Τι νέο υπάρχει",
     "What's new?": "Τι νέο υπάρχει;",
     "When I'm invited to a room": "Όταν με προσκαλούν σ' ένα δωμάτιο",
@@ -121,39 +121,76 @@
     "Saturday": "Σάββατο",
     "Today": "Σήμερα",
     "Yesterday": "Χθές",
-    "OK": "ΟΚ",
+    "OK": "Εντάξει",
     "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.",
     "Welcome page": "Αρχική σελίδα",
-    "Forget": "Διαγραφή",
+    "Forget": "Παράλειψη",
     "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από φυλλομετρητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
     "Unhide Preview": "Προεπισκόπηση",
     "Waiting for response from server": "Αναμονή απάντησης από τον διακομιστή",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Χρησιμοποιείς το Riot ως επισκέπτης. Κάνε <a>εγγραφή</a> ή <a>συνδέσου</a> για να αποκτήσεις πρόσβαση σε περισσότερα δωμάτια και επιλογές!",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Χρησιμοποιείτε το Riot ως επισκέπτης. <a>Εγγραφείτε</a> ή <a>συνδεθείτε</a> για να αποκτήσετε πρόσβαση σε περισσότερα δωμάτια και χαρακτηριστικά!",
     "Collecting logs": "Συγκέντρωση πληροφοριών",
     "Enable them now": "Ενεργοποίηση",
     "Failed to forget room %(errCode)s": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)",
     "Failed to update keywords": "Οι λέξεις κλειδιά δεν ενημερώθηκαν",
     "Failed to get protocol list from Home Server": "Δεν ήταν δυνατή η εύρεση των διαθέσιμων πρωτοκόλλων από το διακομιστή",
-    "Failed to remove tag %(tagName)s from room": "Δεν ήταν δυνατή η διαγραφή του tag %(tagName)s από το δωμάτιο",
+    "Failed to remove tag %(tagName)s from room": "Δεν ήταν δυνατή η διαγραφή της ετικέτας %(tagName)s από το δωμάτιο",
     "Notification targets": "Στόχοι ειδοποιήσεων",
-    "Please describe the bug and/or send logs.": "Παρακαλώ περιγράψτε το πρόβλημα και/ή στείλτε πληροφορίες σχετικά με την εφαρμογή.",
+    "Please describe the bug and/or send logs.": "Παρακαλούμε περιγράψτε το σφάλμα και/ή στείλτε πληροφορίες σχετικά με την εφαρμογή.",
     "Remove %(name)s from the directory?": "Αφαίρεση του %(name)s από το ευρετήριο;",
     "remove %(name)s from the directory.": "αφαίρεση του %(name)s από το ευρετήριο.",
-    "Send logs": "Στείλε πληροφορίες",
+    "Send logs": "Αποστολή πληροφοριών",
     "Source URL": "Πηγαίο URL",
     "The server may be unavailable or overloaded": "Ο διακομιστής είναι μη διαθέσιμος ή υπερφορτωμένος",
     " to room": " στο δωμάτιο",
     "Unable to fetch notification target list": "Δεν ήταν δυνατή η εύρεση στόχων για τις ειδοποιήσεις",
     "Unable to look up room ID from server": "Δεν είναι δυνατή η εύρεση του ID για το δωμάτιο",
-    "View Decrypted Source": "Δες τον αποκρυπτογραφημένο κώδικα",
-    "View Source": "Δες τον κώδικα",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως έχεις κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείς να τις αλλάξεις μέσω του Riot αλλά ισχύουν κανονικά",
+    "View Decrypted Source": "Προβολή του αποκρυπτογραφημένου κώδικα",
+    "View Source": "Προβολή κώδικα",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά",
     "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο",
-    "Drop here %(toAction)s": "Σύρε εδώ %(toAction)s",
+    "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s",
     "Failed to": "Αποτυχία να",
     "Failed to get public room list": "Δεν ήταν δυνατή η λήψη της λίστας με τα δημόσια δωμάτια",
     "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1",
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
-    "Quote": "Αναφορά",
-    "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε"
+    "Quote": "Παράθεση",
+    "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
+    " (HTTP status %(httpStatus))": "(Κατάσταση HTTP %(httpStatus))",
+    "Login": "Σύνδεση",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το Riot χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
+    "The Home Server may be too old to support third party networks": "Ο διακομιστής μπορεί να είναι αρκετά παλιός για να υποστηρίζει δίκτυα τρίτων",
+    "Welcome to Riot.im": "Καλώς ήλθατε στο Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία &amp; συνεργασία με τη βοήθεια του [matrix]",
+    "Search the room directory": "Αναζήτηση του ευρετηρίου δωματίων",
+    "Chat with Riot Bot": "Συνομιλία με το Riot Bot",
+    "Get started with some tips from Riot Bot!": "Ξεκινήστε με μερικές συμβουλές από το Riot Bot!",
+    "General discussion about Matrix and Riot": "Γενική συζήτηση σχετικά με Matrix και Riot",
+    "Discussion of all things Matrix!": "Συζήτηση για όλα τα πράγματα του Matrix!",
+    "Riot/Web &amp; Desktop chat": "Συνομιλία για Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Συνομιλία για Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Συνομιλία για Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Τεχνικές συζητήσεις σχετικά με το Matrix",
+    "Running Matrix services": "Εκτέλεση υπηρεσιών Matrix",
+    "Community-run support for Synapse": "Κοινοτική υποστήριξη για το Synapse",
+    "Admin support for Dendrite": "Υποστήριξη διαχειριστή για το Dendrite",
+    "Announcements about Synapse releases": "Ανακοινώσεις σχετικά με τις εκδόσεις του Synapse",
+    "Support for those using and running matrix-appservice-irc": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το matrix-appservice-irc",
+    "Building services on Matrix": "Ανάπτυξη υπηρεσιών στο Matrix",
+    "Support for those using the Matrix spec": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το Matrix spec",
+    "Design and implementation of E2E in Matrix": "Σχεδιασμός και υλοποίηση του E2E στο Matrix",
+    "Implementing VR services with Matrix": "Υλοποίηση υπηρεσίων VR με το Matrix",
+    "Implementing VoIP services with Matrix": "Υλοποίηση υπηρεσίων VoIP με το Matrix",
+    "Discussion of the Identity Service API": "Συζήτηση σχετικά με το Identity Service API",
+    "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και Riot",
+    "Dev chat for the Riot/Web dev team": "Συνομιλία για την ομάδα ανάπτυξης του Riot/Web",
+    "Dev chat for the Dendrite dev team": "Συνομιλία για την ομάδα ανάπτυξης του Dendrite",
+    "Co-ordination for Riot/Web translators": "Συντονισμός για μεταφραστές του Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Αρκετά δωμάτια υπάρχουν ήδη στο Matrix, συνδεδεμένα σε υπάρχοντα δίκτυα (Slack, IRC, Gitter κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!",
+    "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;",
+    "You have successfully set a password!": "Ο κωδικός πρόσβασης ορίστηκε επιτυχώς!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Μπορείτε να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές.",
+    "Continue": "Συνέχεια",
+    "Please set a password!": "Παρακαλούμε ορίστε έναν κωδικό πρόσβασης!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Αυτό θα σας επιτρέψει να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές"
 }

From bd583f86b0ccdc9c3fa4c954aac8228bf2723d78 Mon Sep 17 00:00:00 2001
From: Tom Tryfonidis <tomtryf@gnome.org>
Date: Sun, 11 Jun 2017 16:43:08 +0000
Subject: [PATCH 027/172] Translated using Weblate (Greek)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
---
 src/i18n/strings/el.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 22d0775ec8..542d3f22af 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -125,7 +125,7 @@
     "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.",
     "Welcome page": "Αρχική σελίδα",
     "Forget": "Παράλειψη",
-    "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από φυλλομετρητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
+    "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από περιηγητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
     "Unhide Preview": "Προεπισκόπηση",
     "Waiting for response from server": "Αναμονή απάντησης από τον διακομιστή",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Χρησιμοποιείτε το Riot ως επισκέπτης. <a>Εγγραφείτε</a> ή <a>συνδεθείτε</a> για να αποκτήσετε πρόσβαση σε περισσότερα δωμάτια και χαρακτηριστικά!",
@@ -192,5 +192,9 @@
     "You can now return to your account after signing out, and sign in on other devices.": "Μπορείτε να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές.",
     "Continue": "Συνέχεια",
     "Please set a password!": "Παρακαλούμε ορίστε έναν κωδικό πρόσβασης!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Αυτό θα σας επιτρέψει να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές"
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Αυτό θα σας επιτρέψει να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές.",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
+    "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
+    "Support for those using, running and writing other bridges": "Υποστήριξη ηια τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
 }

From eabfce8aa9c721bf7af043b11f61cf15e6de626f Mon Sep 17 00:00:00 2001
From: abugandar <abugandar+1@yandex.com>
Date: Sun, 11 Jun 2017 10:36:28 +0000
Subject: [PATCH 028/172] Translated using Weblate (Arabic)

Currently translated at 2.0% (4 of 198 strings)

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

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 5dd1a2cd42..075c0b5957 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -1,3 +1,6 @@
 {
-    "All messages": "كل الرسائل"
+    "All messages": "كل الرسائل",
+    "Continue": "استمر",
+    "Please set a password!": "يرجى تعيين كلمة مرور!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "سيسمح لك هذا بالعودة إلى حسابك بعد الخروج، وتسجيل الدخول على الأجهزة الأخرى."
 }

From 6d72e0633bf8d8687e0026b415c2f1424bd5fa13 Mon Sep 17 00:00:00 2001
From: Radium <ztl8702@126.com>
Date: Sun, 11 Jun 2017 03:26:19 +0000
Subject: [PATCH 029/172] Translated using Weblate (Chinese (Simplified))

Currently translated at 2.5% (5 of 198 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index a9c61ad9b5..f76aa160dd 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -1,3 +1,7 @@
 {
-    "Close": "关闭"
+    "Close": "关闭",
+    "Mute": "静音",
+    "Notifications": "通知",
+    "OK": "确定",
+    "Operation failed": "操作失败"
 }

From 6d5e980c6c2c096b801c83d426996a68a170e8c5 Mon Sep 17 00:00:00 2001
From: Tom Tryfonidis <tomtryf@gnome.org>
Date: Sun, 11 Jun 2017 16:45:59 +0000
Subject: [PATCH 030/172] Translated using Weblate (Greek)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 542d3f22af..cbb2a819cf 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -93,11 +93,11 @@
     "Off": "Ανενεργό",
     "On": "Ενεργό",
     "Permalink": "Μόνιμος σύνδεσμος",
-    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Παρακαλούμε εγκαταστήστε έναν από τους φυλλομετρητές <a href=\"https://www.google.com/chrome\">Chrome</a> ή <a href=\"https://getfirefox.com\">Firefox</a> για την καλύτερη δυνατή εμπειρία.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Παρακαλούμε εγκαταστήστε έναν από τους περιηγητές <a href=\"https://www.google.com/chrome\">Chrome</a> ή <a href=\"https://getfirefox.com\">Firefox</a> για την καλύτερη δυνατή εμπειρία.",
     "Report a bug": "Αναφορά σφάλματος",
     "Riot does not know how to join a room on this network": "To Riot δεν γνωρίζει πως να συνδεθεί σε δωμάτια που ανήκουν σ' αυτό το δίκτυο",
     "Search for a room": "Αναζήτηση δωματίου",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Λυπούμαστε, αλλά ο φυλλομετρητής σας <b>δεν</b> υποστηρίζεται από το Riot.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Λυπούμαστε, αλλά ο περιηγητές σας <b>δεν</b> υποστηρίζεται από το Riot.",
     "There are advanced notifications which are not shown here": "Υπάρχουν προχωρημένες ειδοποιήσεις οι οποίες δεν εμφανίζονται εδώ",
     "This room is inaccessible to guests. You may be able to join if you register.": "Το δωμάτιο δεν είναι προσβάσιμο σε επισκέπτες. Πιθανόν να μπορέσετε να συνδεθείτε εάν εγγραφείτε.",
     "Unable to join network": "Δεν είναι δυνατή η σύνδεση στο δίκτυο",

From 2bfaf2f802acf0cdfeb6bb248a9aaa5c690e3aa3 Mon Sep 17 00:00:00 2001
From: Tom Tryfonidis <tomtryf@gnome.org>
Date: Mon, 12 Jun 2017 09:20:18 +0000
Subject: [PATCH 031/172] Translated using Weblate (Greek)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index cbb2a819cf..c060f3bdb3 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -20,7 +20,7 @@
     "Download this file": "Λήψη αρχείου",
     "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
     "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας",
-    "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων γι' αυτό το λογαριασμό",
+    "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό",
     "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:",
     "Error": "Σφάλμα",
     "#example": "#παράδειγμα",
@@ -31,7 +31,7 @@
     "customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας μια διαφορετική διεύθυνση για το διακομιστή.<br/> Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.<br/><br/>Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν μέσω μηνυμάτων ηλεκτρονικής αλληλογραφίας.",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s μέσω %(browserName)s σε %(osName)s",
     "All messages (loud)": "Όλα τα μηνύματα (δυνατά)",
-    "delete the alias.": "διαγραφή ψευδώνυμου.",
+    "delete the alias.": "διέγραψε το ψευδώνυμο.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Διαγραφή του ψευδώνυμου %(alias)s και αφαίρεση του %(name)s από το ευρετήριο;",
     "Dismiss": "Απόρριψη",
     "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η προσθήκη της ετικέτας %(tagName)s στο δωμάτιο",
@@ -39,7 +39,7 @@
     "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
     "Favourite": "Αγαπημένο",
     "Files": "Αρχεία",
-    "Filter room names": "Φίλτραρε τα δωμάτια",
+    "Filter room names": "Φιλτράρισμα δωματίων",
     "Forward Message": "Προώθηση",
     " from room": " από το δωμάτιο",
     "Guests can join": "Επισκέπτες μπορούν να συνδεθούν",
@@ -150,7 +150,7 @@
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά",
     "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο",
     "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s",
-    "Failed to": "Αποτυχία να",
+    "Failed to": "Απέτυχε να",
     "Failed to get public room list": "Δεν ήταν δυνατή η λήψη της λίστας με τα δημόσια δωμάτια",
     "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1",
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
@@ -196,5 +196,5 @@
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
     "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
-    "Support for those using, running and writing other bridges": "Υποστήριξη ηια τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
+    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
 }

From 8c541a270257c53cbdea948165403d7f06db86d6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 15:53:46 +0100
Subject: [PATCH 032/172] released js sdk & react sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6f816f6704..daff15ce35 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.11-rc.1",
-    "matrix-react-sdk": "0.9.3-rc.2",
+    "matrix-js-sdk": "0.7.11",
+    "matrix-react-sdk": "0.9.3",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From 02c4516fa7e06a7ebb7dcf347586114d375aaf27 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 9 Jun 2017 22:22:18 +0100
Subject: [PATCH 033/172] fix broken var

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 3ecffb3e72..70860d27e7 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -102,7 +102,7 @@
     "View Source": "Bekijk bron",
     "When I'm invited to a room": "Wanneer ik uitgenodigt wordt naar een kamer",
     "World readable": "Door iedereen leesbaar",
-    "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%code)s)",
+    "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. %(code)s)",
     "You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)",
     "You are not receiving desktop notifications": "Je ontvangt momenteel geen desktop notificaties",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Je hebt ze mogelijk ingesteld in een andere client dan Riot. Je kunt ze niet aanpassen in Riot maar ze zijn wel actief",

From 2ed6c01a65625945f9cd9ae4d8c9682ce62de93c Mon Sep 17 00:00:00 2001
From: krombel <krombel@krombel.de>
Date: Sat, 10 Jun 2017 03:11:55 +0200
Subject: [PATCH 034/172] Use Thai string for Thai in Language-Chooser

---
 scripts/copy-res.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index c33a931bd1..b02946ae92 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -21,7 +21,7 @@ const INCLUDE_LANGS = [
     {'value': 'ru', 'label': 'Русский'},
     {'value': 'sv', 'label': 'Svenska'},
     {'value': 'es', 'label': 'Español'},
-    {'value': 'th', 'label': 'Thai'},
+    {'value': 'th', 'label': 'ไทย'},
     {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
     {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
 ];

From 23f4ddb4fd437a1d648fcc83b8cd80ce97b60962 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Sat, 10 Jun 2017 12:27:26 +0200
Subject: [PATCH 035/172] Update import and directory path

...in the Translations dev guide
---
 docs/translating-dev.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/translating-dev.md b/docs/translating-dev.md
index 80d4b64a3a..55ba34be10 100644
--- a/docs/translating-dev.md
+++ b/docs/translating-dev.md
@@ -8,9 +8,9 @@
 
 ## Adding new strings
 
-1. Check if the import ``import _t from 'counterpart-riot'`` is present. If not add it to the other import statements.
+1. Check if the import ``import { _t } from 'matrix-react-sdk/lib/languageHandler';`` is present. If not add it to the other import statements.
 2. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method)
-3. Add the String to the ``en_EN.json`` file in ``src/i18n`` or if you are working in matrix-react-sdk you can find the json file in ``src/i18n/strings``
+3. Add the String to the ``en_EN.json`` file in ``src/i18n/strings`` (respect which repository you are on).
 
 ## Adding variables inside a string.
 

From 76e058cfa150cb40040081ce5a1f93e09971e503 Mon Sep 17 00:00:00 2001
From: Marcel <MTRNord@users.noreply.github.com>
Date: Sat, 10 Jun 2017 17:26:29 +0200
Subject: [PATCH 036/172] Add missing VOIP Dropdown width

---
 .../vector/css/matrix-react-sdk/structures/_UserSettings.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
index 3075135af2..9809a81ab1 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@@ -135,6 +135,10 @@ limitations under the License.
     width: 200px;
 }
 
+.mx_UserSettings_webRtcDevices_dropdown{
+    width: 200px;
+}
+
 .mx_UserSettings_profileTable
 {
     display: table;

From 319a3312b13e1a5bced1c9fd809fa89538eae5ca Mon Sep 17 00:00:00 2001
From: Riot Translate Bot <admin@riot.im>
Date: Sun, 11 Jun 2017 20:42:24 +0100
Subject: [PATCH 037/172] Update from Weblate. (#4272)

* Translated using Weblate (Russian)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/

* Translated using Weblate (English (United States))

Currently translated at 85.3% (169 of 198 strings)

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

* Translated using Weblate (Russian)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/

* Translated using Weblate (Thai)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/th/

* Added translation using Weblate (Chinese (Simplified))

* Added translation using Weblate (Arabic)

* Translated using Weblate (Thai)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/th/

* Translated using Weblate (Chinese (Traditional))

Currently translated at 81.8% (162 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 0.5% (1 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/

* Translated using Weblate (Malayalam)

Currently translated at 2.0% (4 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/

* Translated using Weblate (Arabic)

Currently translated at 0.5% (1 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/

* Translated using Weblate (German)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/

* Translated using Weblate (Greek)

Currently translated at 97.9% (194 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 2.5% (5 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/

* Translated using Weblate (Arabic)

Currently translated at 2.0% (4 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ar/

* Translated using Weblate (Greek)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
---
 src/i18n/strings/ar.json      |   6 ++
 src/i18n/strings/de_DE.json   |   2 +-
 src/i18n/strings/el.json      | 141 ++++++++++++++++++++++------------
 src/i18n/strings/en_US.json   |   6 +-
 src/i18n/strings/hu.json      |  40 +++++++++-
 src/i18n/strings/ml.json      |   5 +-
 src/i18n/strings/ru.json      |  17 +++-
 src/i18n/strings/th.json      |   6 +-
 src/i18n/strings/zh_Hans.json |   7 ++
 src/i18n/strings/zh_Hant.json |   2 +-
 10 files changed, 171 insertions(+), 61 deletions(-)
 create mode 100644 src/i18n/strings/ar.json
 create mode 100644 src/i18n/strings/zh_Hans.json

diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
new file mode 100644
index 0000000000..075c0b5957
--- /dev/null
+++ b/src/i18n/strings/ar.json
@@ -0,0 +1,6 @@
+{
+    "All messages": "كل الرسائل",
+    "Continue": "استمر",
+    "Please set a password!": "يرجى تعيين كلمة مرور!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "سيسمح لك هذا بالعودة إلى حسابك بعد الخروج، وتسجيل الدخول على الأجهزة الأخرى."
+}
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index a289d08edc..dfd84ecbd8 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -145,7 +145,7 @@
     "Collecting logs": "Protokolle werden abgerufen",
     "Describe your problem here.": "Beschreibe dein Problem hier.",
     "Failed to send report: ": "Senden des Reports fehlgeschlagen: ",
-    "Forward Message": "Leite Nachricht weiter",
+    "Forward Message": "Nachricht weiterleiten",
     "Hide panel": "Verberge Feld",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Um Probleme zu diagnostizieren werden mit diesem Fehlerbericht Protokolle von diesem Client gesendet. Wenn du nur obigen text senden willst, deselektiere folgendes:",
     "Loading bug report module": "Lade Fehlerbericht-Modul",
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 2cb2973c0f..cbb2a819cf 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -7,34 +7,34 @@
     "An error occurred whilst saving your email notification preferences.": "Ένα σφάλμα προέκυψε κατά την αποθήκευση των ρυθμίσεων σας.",
     "Call invitation": "Πρόσκληση σε κλήση",
     "Cancel": "Ακύρωση",
-    "Cancel Sending": "Ακύρωση Αποστολής",
+    "Cancel Sending": "Ακύρωση αποστολής",
     "Can't update user notification settings": "Δεν είναι δυνατή η ενημέρωση των ρυθμίσεων ειδοποίησης χρήστη",
     "Changelog": "Αλλαγές",
     "Close": "Κλείσιμο",
     "Collapse panel": "Ελαχιστοποίηση καρτέλας",
-    "Create new room": "Δημιούργησε ένα νέο δωμάτιο",
+    "Create new room": "Δημιουργία νέου δωματίου",
     "Custom Server Options": "Προσαρμοσμένες ρυθμίσεις διακομιστή",
-    "Describe your problem here.": "Περιέγραψε το πρόβλημα σου εδώ.",
-    "Direct Chat": "Απευθείας Συνομιλία",
+    "Describe your problem here.": "Περιγράψτε το πρόβλημα σας εδώ.",
+    "Direct Chat": "Απευθείας συνομιλία",
     "Directory": "Ευρετήριο",
-    "Download this file": "Κατέβασε το αρχείο",
-    "Enable audible notifications in web client": "Ενεργοποίηση των ηχητικών ειδοποιήσεων",
-    "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω email",
+    "Download this file": "Λήψη αρχείου",
+    "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
+    "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας",
     "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων γι' αυτό το λογαριασμό",
     "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:",
     "Error": "Σφάλμα",
     "#example": "#παράδειγμα",
     "Expand panel": "Μεγιστοποίηση καρτέλας",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> και <a href=\"http://opera.com\">Opera</a> λειτουργούν επίσης.",
-    "Add an email address above to configure email notifications": "Πρόσθεσε μια διεύθυνση email στο παραπάνω πεδίο, για να έχεις τη δυνατότητα να λαμβάνεις ειδοποιήσεις",
+    "Add an email address above to configure email notifications": "Προσθέστε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στο παραπάνω πεδίο, για να έχετε τη δυνατότητα να λαμβάνετε ειδοποιήσεις",
     "Collecting app version information": "Συγκέντρωση πληροφοριών σχετικά με την έκδοση της εφαρμογής",
-    "customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας ένα διαφορετικό URL για το διακομιστή.<br/> Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.<br/><br/>Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν, μέσω email.",
+    "customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας μια διαφορετική διεύθυνση για το διακομιστή.<br/> Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.<br/><br/>Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν μέσω μηνυμάτων ηλεκτρονικής αλληλογραφίας.",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s μέσω %(browserName)s σε %(osName)s",
     "All messages (loud)": "Όλα τα μηνύματα (δυνατά)",
-    "delete the alias.": "διέγραψε το ψευδώνυμο.",
+    "delete the alias.": "διαγραφή ψευδώνυμου.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Διαγραφή του ψευδώνυμου %(alias)s και αφαίρεση του %(name)s από το ευρετήριο;",
-    "Dismiss": "Αγνόησε",
-    "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η εισαγωγή του tag %(tagName)s στο δωμάτιο",
+    "Dismiss": "Απόρριψη",
+    "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η προσθήκη της ετικέτας %(tagName)s στο δωμάτιο",
     "Failed to change settings": "Δεν ήταν δυνατή η αλλαγή των ρυθμίσεων",
     "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
     "Favourite": "Αγαπημένο",
@@ -43,13 +43,13 @@
     "Forward Message": "Προώθηση",
     " from room": " από το δωμάτιο",
     "Guests can join": "Επισκέπτες μπορούν να συνδεθούν",
-    "Guest users can't invite users. Please register to invite.": "Οι επισκέπτες δεν έχουν τη δυνατότητα να προσκαλέσουν άλλους χρήστες. Παρακαλώ εγγραφείτε πρώτα.",
-    "Hide panel": "Κρύψε τη καρτέλα",
+    "Guest users can't invite users. Please register to invite.": "Οι επισκέπτες δεν έχουν τη δυνατότητα να προσκαλέσουν άλλους χρήστες. Παρακαλούμε εγγραφείτε πρώτα.",
+    "Hide panel": "Απόκρυψη καρτέλας",
     "I understand the risks and wish to continue": "Κατανοώ του κινδύνους και επιθυμώ να συνεχίσω",
-    "Invite to this room": "Προσκάλεσε",
+    "Invite to this room": "Πρόσκληση σε αυτό το δωμάτιο",
     "Keywords": "Λέξεις κλειδιά",
-    "Leave": "Αποχώρησε",
-    "Low Priority": "Χαμηλής Προτεραιότητας",
+    "Leave": "Αποχώρηση",
+    "Low Priority": "Χαμηλή προτεραιότητα",
     "Members": "Μέλη",
     "Messages containing <span>keywords</span>": "Μηνύματα που περιέχουν <span>λέξεις κλειδιά</span>",
     "Messages containing my user name": "Μηνύματα που περιέχουν το ψευδώνυμο μου",
@@ -62,49 +62,49 @@
     "Noisy": "Δυνατά",
     "Notifications": "Ειδοποιήσεις",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Οι ειδοποιήσεις για τις επόμενες λέξεις κλειδία ακολουθούν κανόνες που δεν είναι δυνατόν να εμφανιστούν εδώ:",
-    "Notify for all other messages/rooms": "Στείλε ειδοποιήσεις για όλα τα υπόλοιπα μηνύματα/δωμάτια",
-    "Notify me for anything else": "Ειδοποίησέ με για οτιδήποτε άλλο",
+    "Notify for all other messages/rooms": "Ειδοποίηση για όλα τα υπόλοιπα μηνύματα/δωμάτια",
+    "Notify me for anything else": "Ειδοποίηση  για οτιδήποτε άλλο",
     "Operation failed": "Η λειτουργία απέτυχε",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Παρακαλώ περιγράψτε το σφάλμα. Τι κάνατε; Τι περιμένατε να συμβεί; Τι έγινε τελικά;",
-    "Please Register": "Παρακαλώ εγγραφείτε",
-    "Redact": "Ανακάλεσε",
-    "Reject": "Απέρριψε",
-    "Remove": "Αφαίρεσε",
-    "Remove from Directory": "Αφαίρεση από το Ευρετήριο",
-    "Resend": "Ξαναστείλε",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Παρακαλούμε περιγράψτε το σφάλμα. Τι κάνατε; Τι περιμένατε να συμβεί; Τι έγινε τελικά;",
+    "Please Register": "Παρακαλούμε εγγραφείτε",
+    "Redact": "Ανάκληση",
+    "Reject": "Απόρριψη",
+    "Remove": "Αφαίρεση",
+    "Remove from Directory": "Αφαίρεση από το ευρετήριο",
+    "Resend": "Αποστολή ξανά",
     "Riot Desktop on %(platformName)s": "Riot Desktop σε %(platformName)s",
     "Room directory": "Ευρετήριο",
     "Room not found": "Το δωμάτιο δεν βρέθηκε",
     "Search": "Αναζήτηση",
     "Search…": "Αναζήτηση…",
-    "Send": "Στείλε",
+    "Send": "Αποστολή",
     "Settings": "Ρυθμίσεις",
-    "Start chat": "Άρχισε μια συνομιλία",
+    "Start chat": "Έναρξη συνομιλίας",
     "This Room": "Στο δωμάτιο",
     "Unavailable": "Μη διαθέσιμο",
     "Unknown device": "Άγνωστη συσκευή",
     "Update": "Ενημέρωση",
     "Enable desktop notifications": "Ενεργοποίηση ειδοποιήσεων στην επιφάνεια εργασίας",
     "Error saving email notification preferences": "Σφάλμα κατά την αποθήκευση των προτιμήσεων",
-    "Failed to send report: ": "Η αποστολή της αναφοράς απέτυχε: ",
+    "Failed to send report: ": "Απέτυχε η αποστολή της αναφοράς: ",
     "Loading bug report module": "Φόρτωση μονάδας αναφοράς σφαλμάτων",
-    "Mentions only": "Αναφορές μόνο",
+    "Mentions only": "Μόνο αναφορές",
     "Messages containing my display name": "Μηνύματα που περιέχουν το όνομα μου",
     "Off": "Ανενεργό",
     "On": "Ενεργό",
     "Permalink": "Μόνιμος σύνδεσμος",
-    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Παρακαλώ εγκαταστήστε έναν από τους φυλλομετρητές <a href=\"https://www.google.com/chrome\">Chrome</a> ή <a href=\"https://getfirefox.com\">Firefox</a> για την καλύτερη δυνατή εμπειρία.",
-    "Report a bug": "Ανεφέρε κάποιο πρόβλημα",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Παρακαλούμε εγκαταστήστε έναν από τους περιηγητές <a href=\"https://www.google.com/chrome\">Chrome</a> ή <a href=\"https://getfirefox.com\">Firefox</a> για την καλύτερη δυνατή εμπειρία.",
+    "Report a bug": "Αναφορά σφάλματος",
     "Riot does not know how to join a room on this network": "To Riot δεν γνωρίζει πως να συνδεθεί σε δωμάτια που ανήκουν σ' αυτό το δίκτυο",
-    "Search for a room": "Αναζήτησε κάποιο δωμάτιο",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Λυπούμαστε, αλλά ο φυλλομετρητής σας <b>δεν</b> υποστηρίζεται από το Riot.",
+    "Search for a room": "Αναζήτηση δωματίου",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Λυπούμαστε, αλλά ο περιηγητές σας <b>δεν</b> υποστηρίζεται από το Riot.",
     "There are advanced notifications which are not shown here": "Υπάρχουν προχωρημένες ειδοποιήσεις οι οποίες δεν εμφανίζονται εδώ",
     "This room is inaccessible to guests. You may be able to join if you register.": "Το δωμάτιο δεν είναι προσβάσιμο σε επισκέπτες. Πιθανόν να μπορέσετε να συνδεθείτε εάν εγγραφείτε.",
     "Unable to join network": "Δεν είναι δυνατή η σύνδεση στο δίκτυο",
     "unknown error code": "άγνωστος κωδικός σφάλματος",
-    "Unnamed room": "Δωμάτιο χωρίς όνομα",
-    "Uploaded on %(date)s by %(user)s": "Ανέβηκε την %(date)s από %(user)s",
-    "Uploading report": "Ανέβασμα αναφοράς",
+    "Unnamed room": "Ανώνυμο δωμάτιο",
+    "Uploaded on %(date)s by %(user)s": "Απεστάλη στις %(date)s από %(user)s",
+    "Uploading report": "Αποστολή αναφοράς",
     "What's New": "Τι νέο υπάρχει",
     "What's new?": "Τι νέο υπάρχει;",
     "When I'm invited to a room": "Όταν με προσκαλούν σ' ένα δωμάτιο",
@@ -121,39 +121,80 @@
     "Saturday": "Σάββατο",
     "Today": "Σήμερα",
     "Yesterday": "Χθές",
-    "OK": "ΟΚ",
+    "OK": "Εντάξει",
     "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.",
     "Welcome page": "Αρχική σελίδα",
-    "Forget": "Διαγραφή",
-    "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από φυλλομετρητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
+    "Forget": "Παράλειψη",
+    "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από περιηγητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
     "Unhide Preview": "Προεπισκόπηση",
     "Waiting for response from server": "Αναμονή απάντησης από τον διακομιστή",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Χρησιμοποιείς το Riot ως επισκέπτης. Κάνε <a>εγγραφή</a> ή <a>συνδέσου</a> για να αποκτήσεις πρόσβαση σε περισσότερα δωμάτια και επιλογές!",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Χρησιμοποιείτε το Riot ως επισκέπτης. <a>Εγγραφείτε</a> ή <a>συνδεθείτε</a> για να αποκτήσετε πρόσβαση σε περισσότερα δωμάτια και χαρακτηριστικά!",
     "Collecting logs": "Συγκέντρωση πληροφοριών",
     "Enable them now": "Ενεργοποίηση",
     "Failed to forget room %(errCode)s": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)",
     "Failed to update keywords": "Οι λέξεις κλειδιά δεν ενημερώθηκαν",
     "Failed to get protocol list from Home Server": "Δεν ήταν δυνατή η εύρεση των διαθέσιμων πρωτοκόλλων από το διακομιστή",
-    "Failed to remove tag %(tagName)s from room": "Δεν ήταν δυνατή η διαγραφή του tag %(tagName)s από το δωμάτιο",
+    "Failed to remove tag %(tagName)s from room": "Δεν ήταν δυνατή η διαγραφή της ετικέτας %(tagName)s από το δωμάτιο",
     "Notification targets": "Στόχοι ειδοποιήσεων",
-    "Please describe the bug and/or send logs.": "Παρακαλώ περιγράψτε το πρόβλημα και/ή στείλτε πληροφορίες σχετικά με την εφαρμογή.",
+    "Please describe the bug and/or send logs.": "Παρακαλούμε περιγράψτε το σφάλμα και/ή στείλτε πληροφορίες σχετικά με την εφαρμογή.",
     "Remove %(name)s from the directory?": "Αφαίρεση του %(name)s από το ευρετήριο;",
     "remove %(name)s from the directory.": "αφαίρεση του %(name)s από το ευρετήριο.",
-    "Send logs": "Στείλε πληροφορίες",
+    "Send logs": "Αποστολή πληροφοριών",
     "Source URL": "Πηγαίο URL",
     "The server may be unavailable or overloaded": "Ο διακομιστής είναι μη διαθέσιμος ή υπερφορτωμένος",
     " to room": " στο δωμάτιο",
     "Unable to fetch notification target list": "Δεν ήταν δυνατή η εύρεση στόχων για τις ειδοποιήσεις",
     "Unable to look up room ID from server": "Δεν είναι δυνατή η εύρεση του ID για το δωμάτιο",
-    "View Decrypted Source": "Δες τον αποκρυπτογραφημένο κώδικα",
-    "View Source": "Δες τον κώδικα",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως έχεις κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείς να τις αλλάξεις μέσω του Riot αλλά ισχύουν κανονικά",
+    "View Decrypted Source": "Προβολή του αποκρυπτογραφημένου κώδικα",
+    "View Source": "Προβολή κώδικα",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά",
     "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο",
-    "Drop here %(toAction)s": "Σύρε εδώ %(toAction)s",
+    "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s",
     "Failed to": "Αποτυχία να",
     "Failed to get public room list": "Δεν ήταν δυνατή η λήψη της λίστας με τα δημόσια δωμάτια",
     "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1",
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
-    "Quote": "Αναφορά",
-    "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε"
+    "Quote": "Παράθεση",
+    "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
+    " (HTTP status %(httpStatus))": "(Κατάσταση HTTP %(httpStatus))",
+    "Login": "Σύνδεση",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το Riot χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
+    "The Home Server may be too old to support third party networks": "Ο διακομιστής μπορεί να είναι αρκετά παλιός για να υποστηρίζει δίκτυα τρίτων",
+    "Welcome to Riot.im": "Καλώς ήλθατε στο Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Αποκεντρωμένη, κρυπτογραφημένη συνομιλία &amp; συνεργασία με τη βοήθεια του [matrix]",
+    "Search the room directory": "Αναζήτηση του ευρετηρίου δωματίων",
+    "Chat with Riot Bot": "Συνομιλία με το Riot Bot",
+    "Get started with some tips from Riot Bot!": "Ξεκινήστε με μερικές συμβουλές από το Riot Bot!",
+    "General discussion about Matrix and Riot": "Γενική συζήτηση σχετικά με Matrix και Riot",
+    "Discussion of all things Matrix!": "Συζήτηση για όλα τα πράγματα του Matrix!",
+    "Riot/Web &amp; Desktop chat": "Συνομιλία για Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Συνομιλία για Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Συνομιλία για Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Τεχνικές συζητήσεις σχετικά με το Matrix",
+    "Running Matrix services": "Εκτέλεση υπηρεσιών Matrix",
+    "Community-run support for Synapse": "Κοινοτική υποστήριξη για το Synapse",
+    "Admin support for Dendrite": "Υποστήριξη διαχειριστή για το Dendrite",
+    "Announcements about Synapse releases": "Ανακοινώσεις σχετικά με τις εκδόσεις του Synapse",
+    "Support for those using and running matrix-appservice-irc": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το matrix-appservice-irc",
+    "Building services on Matrix": "Ανάπτυξη υπηρεσιών στο Matrix",
+    "Support for those using the Matrix spec": "Υποστήριξη για τους χρήστες που χρησιμοποιούν το Matrix spec",
+    "Design and implementation of E2E in Matrix": "Σχεδιασμός και υλοποίηση του E2E στο Matrix",
+    "Implementing VR services with Matrix": "Υλοποίηση υπηρεσίων VR με το Matrix",
+    "Implementing VoIP services with Matrix": "Υλοποίηση υπηρεσίων VoIP με το Matrix",
+    "Discussion of the Identity Service API": "Συζήτηση σχετικά με το Identity Service API",
+    "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και Riot",
+    "Dev chat for the Riot/Web dev team": "Συνομιλία για την ομάδα ανάπτυξης του Riot/Web",
+    "Dev chat for the Dendrite dev team": "Συνομιλία για την ομάδα ανάπτυξης του Dendrite",
+    "Co-ordination for Riot/Web translators": "Συντονισμός για μεταφραστές του Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Αρκετά δωμάτια υπάρχουν ήδη στο Matrix, συνδεδεμένα σε υπάρχοντα δίκτυα (Slack, IRC, Gitter κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!",
+    "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;",
+    "You have successfully set a password!": "Ο κωδικός πρόσβασης ορίστηκε επιτυχώς!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Μπορείτε να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές.",
+    "Continue": "Συνέχεια",
+    "Please set a password!": "Παρακαλούμε ορίστε έναν κωδικό πρόσβασης!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Αυτό θα σας επιτρέψει να επιστρέψετε στον λογαριασμό σας αφού αποσυνδεθείτε και συνδεθείτε από άλλες συσκευές.",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
+    "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
+    "Support for those using, running and writing other bridges": "Υποστήριξη ηια τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 04409be07a..8500886541 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -163,5 +163,9 @@
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
     "Login": "Login",
     "Continue": "Continue",
-    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?"
+    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
+    " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+    "Welcome to Riot.im": "Welcome to Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
+    "Chat with Riot Bot": "Chat with Riot Bot"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index d5d33930ab..9f8b2bef8f 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -9,7 +9,7 @@
     "Cancel Sending": "Küldés megszakítása",
     "Can't update user notification settings": "Nem sikerül frissíteni az értesítési beállításokat",
     "Close": "Bezár",
-    "Create new room": "Új szoba készítés",
+    "Create new room": "Új szoba létrehozása",
     "Couldn't find a matching Matrix room": "Nem található a keresett Matrix szoba",
     "Custom Server Options": "Egyedi szerver beállítások",
     "delete the alias.": "becenév törlése.",
@@ -160,5 +160,41 @@
     "OK": "Rendben",
     "You need to be using HTTPS to place a screen-sharing call.": "HTTPS-t kell használnod hogy képernyőmegosztásos hívást kezdeményezz.",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "A problémák diagnosztizálása érdekében erről a kliensről a hibajelentésben naplók lesznek elküldve. Ha csak az alábbi szöveget szeretnéd elküldeni akkor ezt ne jelöld meg:",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Írd le a hibát. Mit csináltál? Mi az amit szerettél volna ha történik? Ezzel szemben mi az ami történt?"
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Írd le a hibát. Mit csináltál? Mi az amit szerettél volna ha történik? Ezzel szemben mi az ami történt?",
+    "Login": "Bejelentkezés",
+    "Welcome to Riot.im": "Üdvözlünk a Riot.im-en",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizált, titkosított csevegés és kollaboráció [matrix] alapokon",
+    "Search the room directory": "Keresés a szobák jegyzékében",
+    "Chat with Riot Bot": "Csevegés a Riot Robottal",
+    "Get started with some tips from Riot Bot!": "Kezdd el a Riot használatát a Riot Robot tippjei segítségével!",
+    "General discussion about Matrix and Riot": "Általános beszélgetések a Matrixról és a Riotról",
+    "Discussion of all things Matrix!": "Beszélgetések mindenről, ami a Matrixhoz kapcsolódik!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web és asztali csevegés",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS és matrix-ios-sdk csevegés",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android és matrix-android-sdk csevegés",
+    "Matrix technical discussions": "Technikai jellegű beszélgetések a Matrixról",
+    "Community-run support for Synapse": "Közösségi támogatás a Synapse-hez",
+    "Admin support for Dendrite": "Adminisztrációs támogatás a Dendrite-hoz",
+    "Announcements about Synapse releases": "Bejelentések a Synapse kiadásairól",
+    "Running Matrix services": "Matrixszolgáltatások működtetése",
+    "Support for those using and running matrix-appservice-irc": "Támogatás a matrix-appservice-irc használatáról és működtetéséről",
+    "Building services on Matrix": "Szolgáltatások fejlesztése a Matrixra",
+    "Support for those using the Matrix spec": "Támogatás a Matrix specifikáció használatáról",
+    "Design and implementation of E2E in Matrix": "A végponttól végpontig történő titkosítás (E2E) tervezése és implementációja a Matrixban",
+    "Implementing VR services with Matrix": "A Matrixszal együttműködő virtuális valóság (VR) szolgáltatások implementációja",
+    "Implementing VoIP services with Matrix": "A Matrixszal együttműködő VoIP szolgáltatások implementációja",
+    "Discussion of the Identity Service API": "Beszélgetések az Identity Service API-ról",
+    "Support for those using, running and writing other bridges": "Támogatás egyéb hídak használáról, működtetéséről és fejlesztéséről",
+    "Contributing code to Matrix and Riot": "Hozzájárulás a Matrix és Riot programkódjának fejlesztéséhez",
+    "Dev chat for the Riot/Web dev team": "Csevegés a Riot/Web fejlesztői csapatával fejlesztőknek",
+    "Dev chat for the Dendrite dev team": "Csevegés a Dendrite fejlesztői csapatával fejlesztőknek",
+    "Co-ordination for Riot/Web translators": "Egyeztetés a Riot/Web fordítóival",
+    "Failed to change password. Is your password correct?": "Nem sikerült megváltoztatni a jelszót. Helyesen írtad be a jelszavadat?",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Már sok létező szoba van a Matrixon, melyek más hálózatokkal vannak összekapcsolva (Slack, IRC, Gitter stb.) vagy függetlenek. Látogasd meg a szobajegyzéket!",
+    "You have successfully set a password!": "Sikeresen állítottál be jelszót!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Most már visszatérhetsz a fiókodhoz kijelentkezés után, és más eszközökkel is be tudsz jelentkezni.",
+    "Continue": "Folytatás",
+    "Please set a password!": "Kérlek, állíts be egy jelszót!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
+    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))"
 }
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index e67ece484c..1059888544 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -1,5 +1,6 @@
 {
     "Add an email address above to configure email notifications": "ഇ മെയില്‍ അറിയിപ്പുകൾ ലഭിക്കാന്‍ മുകളില്‍ ഇ-മെയില്‍ വിലാസം നല്‍കൂ",
     "All messages": "എല്ലാ സന്ദേശങ്ങളും",
-    "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)"
-}
\ No newline at end of file
+    "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)ല്‍  %(browserName) വഴി %(appName)"
+}
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 573a09cc05..b9dcf10d56 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -9,7 +9,7 @@
     "Custom Server Options": "Расширенные настройки сервера",
     "delete the alias.": "удалить привязку.",
     "Delete the room alias": "Удалить привязку комнаты",
-    "Direct Chat": "Персональное сообщение",
+    "Direct Chat": "Приватный чат",
     "Directory": "Каталог",
     "Dismiss": "Отказ",
     "Drop here to": "Перетащите сюда",
@@ -190,5 +190,18 @@
     "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто matrix-appservice-irc  эксплуатирует и использует",
     "You have successfully set a password!": "Вы успешно установили пароль!",
     "Continue": "Продолжить",
-    "Please set a password!": "Задайте пароль!"
+    "Please set a password!": "Задайте пароль!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix существует множество комнат, связанных с существующими сетями (Slack, IRC, Gitter и т.д.) Или независимыми. Ищите в каталоге!",
+    "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
+    "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
+    "Support for those using the Matrix spec": "Поддержка для тех, кто использует спецификацию Matrix",
+    "Design and implementation of E2E in Matrix": "Разработка и внедрение E2E в Matrix",
+    "Implementing VR services with Matrix": "Внедрение служб VR с помощью Matrix",
+    "Discussion of the Identity Service API": "Обсуждение службы идентификации API",
+    "Support for those using, running and writing other bridges": "Поддержка тех, кто использует, работает и пишет другие мосты (bridges)",
+    "Contributing code to Matrix and Riot": "Взаимодействующий код для Matrix и Riot",
+    "Dev chat for the Riot/Web dev team": "Dev chat для группы разработчиков Riot/Web",
+    "Dev chat for the Dendrite dev team": "Dev chat для группы разработчиков Dendrite",
+    "Co-ordination for Riot/Web translators": "Координирование для переводчиков Riot / Web",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит Вам вернуться в свою учетную запись после выхода, и войти в систему на других устройствах."
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index c993079cd9..c770dc3e43 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -187,7 +187,7 @@
     "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite",
     "Co-ordination for Riot/Web translators": "แชทสำหรับประสานงานการแปล Riot บนเว็บ",
     "Failed to change password. Is your password correct?": "การเปลี่ยนรหัสผ่านล้มเหลว รหัสผ่านของคุณถูกต้องหรือไม่?",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเคีือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "มีห้องอยู่มากมายใน Matrix ทั้งห้องที่เชื่อมไปยังเครือข่ายอื่น (Slack, IRC, Gitter ฯลฯ) และห้องที่อยู่ด้วยตัวเอง ลองดูไดเรกทอรีสิ!",
     "You have successfully set a password!": "การตั้งรหัสผ่านเสร็จสมบูรณ์!",
     "You can now return to your account after signing out, and sign in on other devices.": "คุณสามารถกลับไปยังบัญชีของคุณหลังจากออกจากระบบ แล้วกลับเขาสู่ระบบบนอุปกรณ์อื่น ๆ",
     "Continue": "ดำเนินการต่อ",
@@ -195,5 +195,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "เพื่อคุณจะได้กลับมายังบัญชีเดิมของคุณได้ หลังจากออกจากระบบ แล้วกลับเข้าสู่ระบบในอุปกรณ์อื่น ๆ",
     "Design and implementation of E2E in Matrix": "การออกแบบและใช้งาน E2E ใน Matrix",
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก [matrix]"
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "ระบบแชทและประสานงาน ไร้ศูนย์กลางและเข้ารหัสได้ โดยใช้เทคโนโลยีจาก [matrix]",
+    "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
+    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
new file mode 100644
index 0000000000..f76aa160dd
--- /dev/null
+++ b/src/i18n/strings/zh_Hans.json
@@ -0,0 +1,7 @@
+{
+    "Close": "关闭",
+    "Mute": "静音",
+    "Notifications": "通知",
+    "OK": "确定",
+    "Operation failed": "操作失败"
+}
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index d6f0930a77..5b22640d87 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -98,7 +98,7 @@
     "OK": "OK",
     "You need to be using HTTPS to place a screen-sharing call.": "你需要使用　HTTPS 來置放畫面分享的通話。",
     "Welcome page": "歡迎頁",
-    "A new version of Riot is available.": " Riot 發佈了新版本",
+    "A new version of Riot is available.": "Riot 發佈了新版本",
     "Add an email address above to configure email notifications": "在上面新增電子郵件以設定電郵通知",
     "All notifications are currently disabled for all targets.": "目前所有的通知功能已取消",
     "An error occurred whilst saving your email notification preferences.": "在儲存你的電郵通知偏好時發生錯誤",

From b8e0cbaf5a8de2534185264d39fd0b8c3b07f20d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 16:02:51 +0100
Subject: [PATCH 038/172] v0.11.0

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

diff --git a/electron_app/package.json b/electron_app/package.json
index fc92b5c496..0e08efd5c7 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.0-rc.2",
+  "version": "0.11.0",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 030f2eaeb5bafde44ccdeab485fa426df63d2aff Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 16:04:23 +0100
Subject: [PATCH 039/172] Prepare changelog for v0.11.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e75c6e23a8..28b978c544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.11.0](https://github.com/vector-im/riot-web/releases/tag/v0.11.0) (2017-06-12)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0-rc.2...v0.11.0)
+
+ * More translations & minor fixes
+
 Changes in [0.11.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.0-rc.2) (2017-06-09)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0-rc.1...v0.11.0-rc.2)

From bddb6b7f8fc3eb986276931dc4179ac4bd5cfcd3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 16:04:24 +0100
Subject: [PATCH 040/172] v0.11.0

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

diff --git a/package.json b/package.json
index daff15ce35..51c366b1e6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.0-rc.2",
+  "version": "0.11.0",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From 051db65188d5eb4ce9b2bc1a6618d64db16a8447 Mon Sep 17 00:00:00 2001
From: Jean <jeangb@hotmail.fr>
Date: Mon, 12 Jun 2017 15:02:46 +0000
Subject: [PATCH 041/172] Translated using Weblate (French)

Currently translated at 84.8% (168 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
---
 src/i18n/strings/fr.json | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 47fb52532c..cc5d2d24fc 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -10,7 +10,7 @@
     "Create new room": "Créer un nouveau salon",
     "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix",
     "Custom Server Options": "Options de serveur personnalisées",
-    "delete the alias.": "Supprimer l'alias.",
+    "delete the alias.": "supprimer l'alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
     "Direct Chat": "Conversation Directe",
     "Directory": "Répertoire",
@@ -118,7 +118,7 @@
     "Guests can join": "Ouvert aux visiteurs",
     " to room": " au salon",
     "Advanced notification settings": "Paramètres de notification avancés",
-    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.<br/>Cela permet d'utiliser Riot avec un compte existant sur un homeserverdifférent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
+    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.<br/>Cela permet d'utiliser Riot avec un compte existant sur un homeserver différent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots-clés suivant répondent à des critères qui ne peuvent pas être affichés ici :",
     "Collapse panel": "Cacher le panneau",
     "Expand panel": "Dévoiler le panneau",
@@ -161,5 +161,11 @@
     "Waiting for response from server": "En attente d’une réponse du serveur",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. <a>Enregistrez vous</a> ou <a>identifiez vous</a> pour accéder à plus de salons et de fonctionnalités !",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
-    "OK": "OK"
+    "OK": "OK",
+    "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
+    "You have successfully set a password!": "Vous avez paramétré un mot de passe avec succès !",
+    "Continue": "Continuer",
+    "Please set a password!": "Veuillez paramétrer un mot de passe !",
+    "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils."
 }

From a3240b934f1a115d8dfae9e6244f450a4055dc95 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 16:49:09 +0100
Subject: [PATCH 042/172] Missing bracket in translation

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 70860d27e7..1b497ff3ad 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -102,7 +102,7 @@
     "View Source": "Bekijk bron",
     "When I'm invited to a room": "Wanneer ik uitgenodigt wordt naar een kamer",
     "World readable": "Door iedereen leesbaar",
-    "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. %(code)s)",
+    "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)",
     "You are not receiving desktop notifications": "Je ontvangt momenteel geen desktop notificaties",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Je hebt ze mogelijk ingesteld in een andere client dan Riot. Je kunt ze niet aanpassen in Riot maar ze zijn wel actief",

From bbb9dd9228a3b707fccd23f08bcc3cc460447d88 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 17:33:02 +0100
Subject: [PATCH 043/172] Fix broken riot.im link on homepage

For want of a quote the something something

Also add noopeners
---
 src/components/structures/HomePage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index e1e700f21e..2311cc1f30 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -46,8 +46,8 @@ module.exports = React.createClass({
     translate: function(s) {
         s = sanitizeHtml(_t(s));
         // ugly fix for https://github.com/vector-im/riot-web/issues/4243
-        s = s.replace(/Riot\.im/, '<a href="https://riot.im target="_blank">Riot.im</a>');
-        s = s.replace(/\[matrix\]/, '<a href="https://matrix.org" target="_blank"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a>');
+        s = s.replace(/Riot\.im/, '<a href="https://riot.im" target="_blank" rel="noopener">Riot.im</a>');
+        s = s.replace(/\[matrix\]/, '<a href="https://matrix.org" target="_blank" rel="noopener"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a>');
         return s;
     },
 

From ac25cf56fbaedbb0f7b7d7b838fe8874d4efccc5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 17:33:02 +0100
Subject: [PATCH 044/172] Fix broken riot.im link on homepage

For want of a quote the something something

Also add noopeners
---
 src/components/structures/HomePage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index e1e700f21e..2311cc1f30 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -46,8 +46,8 @@ module.exports = React.createClass({
     translate: function(s) {
         s = sanitizeHtml(_t(s));
         // ugly fix for https://github.com/vector-im/riot-web/issues/4243
-        s = s.replace(/Riot\.im/, '<a href="https://riot.im target="_blank">Riot.im</a>');
-        s = s.replace(/\[matrix\]/, '<a href="https://matrix.org" target="_blank"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a>');
+        s = s.replace(/Riot\.im/, '<a href="https://riot.im" target="_blank" rel="noopener">Riot.im</a>');
+        s = s.replace(/\[matrix\]/, '<a href="https://matrix.org" target="_blank" rel="noopener"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a>');
         return s;
     },
 

From c43b30f2fd2d4d2ed2a373d4cafda89d84c5bb5d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 16:49:09 +0100
Subject: [PATCH 045/172] Missing bracket in translation

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 70860d27e7..1b497ff3ad 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -102,7 +102,7 @@
     "View Source": "Bekijk bron",
     "When I'm invited to a room": "Wanneer ik uitgenodigt wordt naar een kamer",
     "World readable": "Door iedereen leesbaar",
-    "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. %(code)s)",
+    "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)",
     "You are not receiving desktop notifications": "Je ontvangt momenteel geen desktop notificaties",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Je hebt ze mogelijk ingesteld in een andere client dan Riot. Je kunt ze niet aanpassen in Riot maar ze zijn wel actief",

From 91295c68adee3e728f58cdcd4a65f9c862e587d5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 17:54:58 +0100
Subject: [PATCH 046/172] Don't show the tooltips when filtering rooms

Fixes https://github.com/vector-im/riot-web/issues/4281
---
 src/components/structures/RoomSubList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 2740c6a400..092ed9cca0 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -530,7 +530,7 @@ var RoomSubList = React.createClass({
         var label = this.props.collapsed ? null : this.props.label;
 
         let content;
-        if (this.state.sortedList.length == 0) {
+        if (this.state.sortedList.length == 0 && !this.props.searchFilter) {
             content = this.props.emptyContent;
         } else {
             content = this.makeRoomTiles();

From 0b83baeaf499d4ed426f875bde2e5858df6e6a88 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 12 Jun 2017 17:54:58 +0100
Subject: [PATCH 047/172] Don't show the tooltips when filtering rooms

Fixes https://github.com/vector-im/riot-web/issues/4281
---
 src/components/structures/RoomSubList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 2740c6a400..092ed9cca0 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -530,7 +530,7 @@ var RoomSubList = React.createClass({
         var label = this.props.collapsed ? null : this.props.label;
 
         let content;
-        if (this.state.sortedList.length == 0) {
+        if (this.state.sortedList.length == 0 && !this.props.searchFilter) {
             content = this.props.emptyContent;
         } else {
             content = this.makeRoomTiles();

From 8967403bcafcb01354e7a2638de4bda8c4fc8303 Mon Sep 17 00:00:00 2001
From: Justin <jvs@fsfe.org>
Date: Mon, 12 Jun 2017 21:47:38 +0000
Subject: [PATCH 048/172] Translated using Weblate (Dutch)

Currently translated at 95.4% (189 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
---
 src/i18n/strings/nl.json | 158 +++++++++++++++++++++++++++------------
 1 file changed, 112 insertions(+), 46 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 1b497ff3ad..ac8cf1fb60 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1,42 +1,42 @@
 {
-    "Add an email address above to configure email notifications": "Voeg een email adres toe om email notificaties te ontvangen",
-    "Advanced notification settings": "Geavanceerde notificatie instellingen",
+    "Add an email address above to configure email notifications": "Voeg een e-mailadres toe om e-mailmeldingen te ontvangen",
+    "Advanced notification settings": "Geavanceerde meldingsinstellingen",
     "All messages": "Alle berichten",
     "All messages (loud)": "Alle berichten (luid)",
-    "All notifications are currently disabled for all targets.": "Alle notificaties zijn op het moment uitgeschakeld voor alle doelen.",
-    "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van jouw email notificatie voorkeuren.",
-    "Call invitation": "Audio gesprek uitnodiging",
-    "Cancel Sending": "Annuleren verzending",
-    "Can't update user notification settings": "Het is niet gelukt om de gebruiker notificatie instellingen bij te werken",
+    "All notifications are currently disabled for all targets.": "Alle meldingen zijn momenteel uitgeschakeld voor alle doelen.",
+    "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van uw e-mailmeldingsvoorkeuren.",
+    "Call invitation": "Oproep-uitnodiging",
+    "Cancel Sending": "Versturen annuleren",
+    "Can't update user notification settings": "Het is niet gelukt om de meldingsinstellingen van de gebruiker bij te werken",
     "Close": "Sluiten",
-    "Create new room": "Maak een nieuwe kamer",
+    "Create new room": "Een nieuwe kamer maken",
     "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix kamer te vinden",
-    "Custom Server Options": "Aangepaste server instellingen",
-    "customServer_text": "Je kunt de aangepaste server instellingen gebruiken om in te loggen bij andere Matrix servers door een andere home server URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix account op een andere home server.<br/><br/>Je kunt ook een aangepaste identiteit server instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een email adres of zelf uitgenodigt te worden met een email adres.",
+    "Custom Server Options": "Aangepaste serverinstellingen",
+    "customServer_text": "U kunt de aangepaste serverinstellingen gebruiken om in te loggen bij andere Matrix-servers door een andere homeserver-URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix-account op een andere homeserver.<br/><br/>U kunt ook een aangepaste identiteitsserver instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een e-mailadres of zelf uitgenodigd te worden met een e-mailadres.",
     "delete the alias.": "verwijder de alias.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Verwijder de alias %(alias)s en verwijder %(name)s uit de map?",
-    "Direct Chat": "Privé gesprek",
-    "Directory": "Kamer lijst",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de kamerlijst verwijderen?",
+    "Direct Chat": "Direct chatten",
+    "Directory": "Kamerlijst",
     "Dismiss": "Afwijzen",
     "Download this file": "Download dit bestand",
-    "Enable audible notifications in web client": "Zet notificaties aan in de web client",
-    "Enable desktop notifications": "Zet desktop notificaties aan",
-    "Enable email notifications": "Zet email notificaties aan",
-    "Enable notifications for this account": "Zet notificaties aan voor dit account",
-    "Enable them now": "Zet ze nu aan",
+    "Enable audible notifications in web client": "Meldingen in de webclient aanzetten",
+    "Enable desktop notifications": "Desktopmeldingen aanzetten",
+    "Enable email notifications": "E-mailmeldingen aanzetten",
+    "Enable notifications for this account": "Meldingen voor dit account aanzetten",
+    "Enable them now": "Deze nu aanzetten",
     "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gesplitst door een komma:",
     "Error": "Fout",
-    "Error saving email notification preferences": "Fout bij het opslaan van de email notificatie voorkeuren",
+    "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
     "#example": "#voorbeeld",
     "Failed to": "Mislukt om",
     "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen",
-    "Failed to change settings": "Het is mislukt om de instellingen te wijzigen",
-    "Failed to forget room %(errCode)s": "Het is mislukt om de kamer te vergeten %(errCode)s",
-    "Failed to update keywords": "Het is mislukt om de trefwoorden bij te werken",
-    "Failed to get protocol list from Home Server": "Het is mislukt om de protocol lijst op te halen van de home server",
-    "Failed to get public room list": "Het is mislukt om de lijst van publieke kamers op te halen",
-    "Failed to join the room": "Het is mislukt om de kamer toe te treden",
-    "Failed to remove tag %(tagName)s from room": "Het is mislukt om de label %(tagName)s van de kamer te verwijderen",
+    "Failed to change settings": "Instellingen wijzigen mislukt",
+    "Failed to forget room %(errCode)s": "Kamer vergeten mislukt %(errCode)s",
+    "Failed to update keywords": "Sleutelwoorden bijwerken mislukt",
+    "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
+    "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt",
+    "Failed to join the room": "Kamer binnengaan mislukt",
+    "Failed to remove tag %(tagName)s from room": "Label %(tagName)s van de kamer verwijderen mislukt",
     "Failed to set direct chat tag": "Het is mislukt om de privé chat label weg te halen",
     "Favourite": "Favoriet",
     "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
@@ -54,38 +54,38 @@
     "Mentions only": "Alleen vermeldingen",
     "Messages containing my display name": "Berichten die mijn weergavenaam bevatten",
     "Messages containing my user name": "Berichten die mijn gebruikersnaam bevatten",
-    "Messages in group chats": "Berichten in groep gesprekken",
-    "Messages in one-to-one chats": "Berichten in één-op-één gesprekken",
+    "Messages in group chats": "Berichten in groepsgesprekken",
+    "Messages in one-to-one chats": "Berichten in één-op-één-gesprekken",
     "Messages sent by bot": "Berichten verzonden bij een bot",
     "more": "meer",
     "Mute": "Dempen",
     "No rooms to show": "Geen kamers om te laten zien",
     "Noisy": "Luidruchtig",
     "Notification targets": "Notificatie doelen",
-    "Notifications": "Notificaties",
+    "Notifications": "Meldingen",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificaties op de volgende trefwoorden volgen regels die hier niet kunnen worden laten zien:",
     "Notify for all other messages/rooms": "Informeer mij voor alle andere berichten/kamers",
     "Notify me for anything else": "Informeer mij voor al het andere",
     "Off": "Uit",
     "On": "Aan",
     "Operation failed": "Actie mislukt",
-    "Permalink": "Permalink",
-    "Please Register": "Registreer alsjeblieft",
-    "powered by Matrix": "aangedreven door Matrix",
-    "Quote": "Quote",
+    "Permalink": "Permanente link",
+    "Please Register": "Registreer alstublieft",
+    "powered by Matrix": "mogelijk gemaakt door Matrix",
+    "Quote": "Citaat",
     "Reject": "Afwijzen",
-    "Remove %(name)s from the directory?": "Verwijder %(name)s uit de kamer lijst?",
-    "Remove": "Verwijder",
-    "remove %(name)s from the directory.": "verwijder %(name)s uit de kamer lijst.",
-    "Remove from Directory": "Verwijder uit de kamer lijst",
+    "Remove %(name)s from the directory?": "%(name)s uit de kamerlijst verwijderen?",
+    "Remove": "Verwijderen",
+    "remove %(name)s from the directory.": "verwijder %(name)s uit de kamerlijst.",
+    "Remove from Directory": "Uit de kamerlijst verwijderen",
     "Resend": "Opnieuw verzenden",
     "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet toetreden tot een kamer op dit netwerk",
-    "Room directory": "Kamer lijst",
+    "Room directory": "Kamerlijst",
     "Room not found": "De kamer is niet gevonden",
-    "Search for a room": "Zoek naar een kamer",
+    "Search for a room": "Een kamer zoeken",
     "Settings": "Instellingen",
     "Source URL": "Bron URL",
-    "Start chat": "Start gesprek",
+    "Start chat": "Gesprek starten",
     "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen",
     "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet worden laten zien",
     "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbeladen",
@@ -95,7 +95,7 @@
     "Unable to join network": "Het is mislukt om toe te treden tot dit netwerk",
     "Unable to look up room ID from server": "Het is mislukt om de kamer ID op te halen van de server",
     "Unhide Preview": "Zichtbaar maken preview",
-    "unknown error code": "niet bekende foutcode",
+    "unknown error code": "onbekende foutcode",
     "Unnamed room": "Kamer zonder naam",
     "Uploaded on %(date)s by %(user)s": "Geüpload op %(date)s door %(user)s",
     "View Decrypted Source": "Bekijk gedecodeerde bron",
@@ -115,11 +115,77 @@
     "Saturday": "Zaterdag",
     "Today": "Vandaag",
     "Yesterday": "Gisteren",
-    "Welcome page": "Welkom pagina",
-    "Drop here %(toAction)s": "%(toAction)s hier naar toe verplaatsen",
+    "Welcome page": "Welkomstpagina",
+    "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen",
     "Failed to set Direct Message status of room": "Het is mislukt om de directe berichten status van de kamer in te stellen",
     "Redact": "Redigeren",
-    "A new version of Riot is available.": "Nieuwe Riot versie is beschikbaar.",
-    "All Rooms": "Alle Kamers",
-    "Cancel": "Annuleer"
+    "A new version of Riot is available.": "Nieuwe Riot-versie is beschikbaar.",
+    "All Rooms": "Alle kamers",
+    "Cancel": "Annuleren",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> en <a href=\"http://opera.com\">Opera</a> werken ook.",
+    "Changelog": "Logboek van wijzigingen",
+    "Collapse panel": "Paneel inklappen",
+    "Collecting app version information": "App-versieinformatie verzamelen",
+    "Collecting logs": "Logboeken verzamelen",
+    "Describe your problem here.": "Beschrijf uw probleem hier.",
+    "Expand panel": "Paneel uitklappen",
+    "Failed to send report: ": "Rapport verzenden mislukt: ",
+    "Forward Message": "Bericht doorsturen",
+    "Hide panel": "Paneel verbergen",
+    " (HTTP status %(httpStatus))": "(HTTP-status %(httpStatus))",
+    "I understand the risks and wish to continue": "Ik begrijp de risico's en wil graag verder gaan",
+    "Login": "Aanmelden",
+    "Loading bug report module": "Bugrapporteermodule laden",
+    "Messages containing <span>keywords</span>": "Berichten die <span>sleutelwoorden</span> bevatten",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Installeer <a href=\"https://www.google.com/chrome\">Chrome</a> of <a href=\"https://getfirefox.com\">Firefox</a> voor de beste ervaring.",
+    "Report a bug": "Een bug rapporteren",
+    "Riot Desktop on %(platformName)s": "Riot Desktop op %(platformName)s",
+    "Riot is not supported on mobile web. Install the app?": "Riot wordt niet ondersteund op het mobiele web. De app installeren?",
+    "Search": "Zoeken",
+    "Search…": "Zoeken…",
+    "Send": "Versturen",
+    "Send logs": "Logboeken versturen",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, uw browser werkt <b>niet</b> met Riot.",
+    "This Room": "Deze ruimte",
+    "Unavailable": "Niet beschikbaar",
+    "Unknown device": "Onbekend apparaat",
+    "Update": "Bijwerken",
+    "Uploading report": "Rapport uploaden",
+    "What's New": "Wat is er nieuw",
+    "What's new?": "Wat is er nieuw?",
+    "Waiting for response from server": "Wachten op antwoord van de server",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "U gebruikt Riot als gast. <a>Registreren</a> of <a>aanmelden</a> om voor meer ruimtes en functies!",
+    "OK": "OK",
+    "You need to be using HTTPS to place a screen-sharing call.": "U moet HTTPS gebruiken om een oproep met schermdelen te kunnen starten.",
+    "Welcome to Riot.im": "Welkom bij Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentaliseerd en versleuteld chatten &amp; samenwerking mogelijk gemaakt door [matrix]",
+    "Search the room directory": "De kamerlijst doorzoeken",
+    "Chat with Riot Bot": "Met Riot Bot chatten",
+    "Get started with some tips from Riot Bot!": "Begin met enkele tips van Riot-bot!",
+    "General discussion about Matrix and Riot": "Algemene discussie over Matrix en Riot",
+    "Discussion of all things Matrix!": "Discussie over alle Matrix-dingen!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-chat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-chat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-chat",
+    "Matrix technical discussions": "Technische discussies over Matrix",
+    "Running Matrix services": "Matrixdiensten beheren",
+    "Community-run support for Synapse": "Synapse-ondersteuning vanuit de gemeenschap",
+    "Admin support for Dendrite": "Beheerondersteuning voor Dendrite",
+    "Announcements about Synapse releases": "Aankondigingen over Synapse-uitgaven",
+    "Support for those using and running matrix-appservice-irc": "Ondersteuning voor hen die matrix-appservice-irc gebruiken en beheren",
+    "Building services on Matrix": "Diensten op Matrix bouwen",
+    "Support for those using the Matrix spec": "Ondersteuning voor hen die de Matrix-specificatie gebruiken",
+    "Contributing code to Matrix and Riot": "Code bijdragen aan Matrix en Riot",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Veel ruimtes bestaan al in Matrix, gelinkt aan bestaande netwerken (Slack, IRC, Gitter enz.) of onafhankelijk. Bekijk de kamerlijst!",
+    "Failed to change password. Is your password correct?": "Wachtwoord wijzigen mislukt. Is uw wachtwoord juist?",
+    "You have successfully set a password!": "U heeft met succes een wachtwoord ingesteld!",
+    "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u bent afgemeld, en aanmelden op andere apparaten.",
+    "Continue": "Doorgaan",
+    "Please set a password!": "Stel een wachtwoord in!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en aanmelden op andere apparaten.",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s op %(osName)s",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Beschrijf de bug. Wat deed u? Wat verwachtte u? Wat gebeurde er in werkelijkheid?",
+    "Please describe the bug and/or send logs.": "Beschrijf de bug en/of verstuur logboeken.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebrukt veel geavanceerde browserfuncties, waarvan enkele niet of experimenteel in uw webbrowser beschikbaar zijn.",
+    "Co-ordination for Riot/Web translators": "Coördinatie voor Riot/Web-vertalers"
 }

From 278bd61ad9711f89688ac7e794115dd4999d4e23 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Mon, 12 Jun 2017 22:22:45 +0000
Subject: [PATCH 049/172] Translated using Weblate (English (United States))

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 8500886541..63fadbe006 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -167,5 +167,34 @@
     " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
     "Welcome to Riot.im": "Welcome to Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
-    "Chat with Riot Bot": "Chat with Riot Bot"
+    "Chat with Riot Bot": "Chat with Riot Bot",
+    "Search the room directory": "Search the room directory",
+    "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
+    "General discussion about Matrix and Riot": "General discussion about Matrix and Riot",
+    "Discussion of all things Matrix!": "Discussion of all things Matrix!",
+    "Matrix technical discussions": "Matrix technical discussions",
+    "Running Matrix services": "Running Matrix services",
+    "Community-run support for Synapse": "Community-run support for Synapse",
+    "Admin support for Dendrite": "Admin support for Dendrite",
+    "Announcements about Synapse releases": "Announcements about Synapse releases",
+    "Support for those using and running matrix-appservice-irc": "Support for those using and running matrix-appservice-irc",
+    "Building services on Matrix": "Building services on Matrix",
+    "Support for those using the Matrix spec": "Support for those using the Matrix spec",
+    "Design and implementation of E2E in Matrix": "Design and implementation of E2E in Matrix",
+    "Implementing VR services with Matrix": "Implementing VR services with Matrix",
+    "Implementing VoIP services with Matrix": "Implementing VoIP services with Matrix",
+    "Discussion of the Identity Service API": "Discussion of the Identity Service API",
+    "Support for those using, running and writing other bridges": "Support for those using, running and writing other bridges",
+    "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
+    "Dev chat for the Riot/Web dev team": "Dev chat for the Riot/Web dev team",
+    "Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team",
+    "Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
+    "You have successfully set a password!": "You have successfully set a password!",
+    "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
+    "Please set a password!": "Please set a password!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat"
 }

From 5e530a20658cabafe3a70aeb2a90b04c473b00d0 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 13 Jun 2017 10:06:10 +0100
Subject: [PATCH 050/172] New icons for riot-ios & riot-translations

---
 res/home/rooms/riot-ios.png          | Bin 3828 -> 5324 bytes
 res/home/rooms/riot-translations.png | Bin 146 -> 8409 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/home/rooms/riot-ios.png b/res/home/rooms/riot-ios.png
index 83306f7cb8bae371ca455a6ff601a89fe624cf8e..6a0c598fe579a63739302ec951760936f69da3f4 100644
GIT binary patch
literal 5324
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

literal 3828
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

diff --git a/res/home/rooms/riot-translations.png b/res/home/rooms/riot-translations.png
index ee0f85589570374f5e1dec95ff7867a6c731f7bf..2ae95836e70a2e56e5f666be9bbee8b3053a62f2 100644
GIT binary patch
literal 8409
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

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1SFZ~=vx6P$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GCY~;iAr-gYoMq%?FyLTNsC6=qKC0CJ@Yw=}$jcia9u?Xc
lp(ECPGzm(5Jo<y%fPqzq$u+6qegsfIgQu&X%Q~loCIIV<EVBRr


From 03dec86211189fb69cbac1866e149cc77a698430 Mon Sep 17 00:00:00 2001
From: Justin <jvs@fsfe.org>
Date: Mon, 12 Jun 2017 21:48:12 +0000
Subject: [PATCH 051/172] Translated using Weblate (Dutch)

Currently translated at 95.4% (189 of 198 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index ac8cf1fb60..d9e459d551 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -15,7 +15,7 @@
     "customServer_text": "U kunt de aangepaste serverinstellingen gebruiken om in te loggen bij andere Matrix-servers door een andere homeserver-URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix-account op een andere homeserver.<br/><br/>U kunt ook een aangepaste identiteitsserver instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een e-mailadres of zelf uitgenodigd te worden met een e-mailadres.",
     "delete the alias.": "verwijder de alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de kamerlijst verwijderen?",
-    "Direct Chat": "Direct chatten",
+    "Direct Chat": "Privégesprek",
     "Directory": "Kamerlijst",
     "Dismiss": "Afwijzen",
     "Download this file": "Download dit bestand",

From 5812dd8f3f1110ad42dc3c00496d454cd609895e Mon Sep 17 00:00:00 2001
From: Jean <jeangb@hotmail.fr>
Date: Tue, 13 Jun 2017 09:05:39 +0000
Subject: [PATCH 052/172] Translated using Weblate (French)

Currently translated at 92.9% (184 of 198 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index cc5d2d24fc..c57a6d17d3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -167,5 +167,22 @@
     "Continue": "Continuer",
     "Please set a password!": "Veuillez paramétrer un mot de passe !",
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils."
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
+    "Welcome to Riot.im": "Bienvenue sur Riot.im",
+    " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))",
+    "Login": "S'identifier",
+    "Chat with Riot Bot": "Discussion avec le Robot Riot",
+    "Search the room directory": "Rechercher dans le répertoire de salon",
+    "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces du Robot Riot !",
+    "Riot/Android &amp; matrix-android-sdk chat": "Discussions Riot/Android &amp; matrix-android-sd",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Discussions Riot/iOS &amp; matrix-ios-sdk",
+    "General discussion about Matrix and Riot": "Discussion générale sur Matrix et Riot",
+    "Riot/Web &amp; Desktop chat": "Discussions Riot/Web &amp; Desktop",
+    "Running Matrix services": "Exécution de services Matrix",
+    "Admin support for Dendrite": "Support admin pour Dendrite",
+    "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapses",
+    "Matrix technical discussions": "Discussions techniques sur Matrix",
+    "Community-run support for Synapse": "Support communautaire sur Synape",
+    "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc",
+    "Building services on Matrix": ""
 }

From e2f2d3469879cfbe9b7b2895cb6c30f783cb7eb7 Mon Sep 17 00:00:00 2001
From: Tom Tryfonidis <tomtryf@gnome.org>
Date: Tue, 13 Jun 2017 10:45:15 +0000
Subject: [PATCH 053/172] Translated using Weblate (Greek)

Currently translated at 100.0% (198 of 198 strings)

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

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index c060f3bdb3..821f2aa778 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -21,7 +21,7 @@
     "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
     "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας",
     "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό",
-    "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:",
+    "Enter keywords separated by a comma:": "Προσθέστε λέξεις κλειδιά χωρισμένες με κόμμα:",
     "Error": "Σφάλμα",
     "#example": "#παράδειγμα",
     "Expand panel": "Μεγιστοποίηση καρτέλας",
@@ -86,7 +86,7 @@
     "Update": "Ενημέρωση",
     "Enable desktop notifications": "Ενεργοποίηση ειδοποιήσεων στην επιφάνεια εργασίας",
     "Error saving email notification preferences": "Σφάλμα κατά την αποθήκευση των προτιμήσεων",
-    "Failed to send report: ": "Απέτυχε η αποστολή της αναφοράς: ",
+    "Failed to send report: ": "Δεν ήταν δυνατή η αποστολή της αναφοράς: ",
     "Loading bug report module": "Φόρτωση μονάδας αναφοράς σφαλμάτων",
     "Mentions only": "Μόνο αναφορές",
     "Messages containing my display name": "Μηνύματα που περιέχουν το όνομα μου",
@@ -167,11 +167,11 @@
     "Get started with some tips from Riot Bot!": "Ξεκινήστε με μερικές συμβουλές από το Riot Bot!",
     "General discussion about Matrix and Riot": "Γενική συζήτηση σχετικά με Matrix και Riot",
     "Discussion of all things Matrix!": "Συζήτηση για όλα τα πράγματα του Matrix!",
-    "Riot/Web &amp; Desktop chat": "Συνομιλία για Riot/Web &amp; Desktop",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Συνομιλία για Riot/iOS &amp; matrix-ios-sdk",
-    "Riot/Android &amp; matrix-android-sdk chat": "Συνομιλία για Riot/Android &amp; matrix-android-sdk",
+    "Riot/Web &amp; Desktop chat": "Συζήτηση για το Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Συζήτηση για το Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Συζήτηση για το Riot/Android &amp; matrix-android-sdk",
     "Matrix technical discussions": "Τεχνικές συζητήσεις σχετικά με το Matrix",
-    "Running Matrix services": "Εκτέλεση υπηρεσιών Matrix",
+    "Running Matrix services": "Χρησιμοποιώντας τις υπηρεσίες του Matrix",
     "Community-run support for Synapse": "Κοινοτική υποστήριξη για το Synapse",
     "Admin support for Dendrite": "Υποστήριξη διαχειριστή για το Dendrite",
     "Announcements about Synapse releases": "Ανακοινώσεις σχετικά με τις εκδόσεις του Synapse",
@@ -183,8 +183,8 @@
     "Implementing VoIP services with Matrix": "Υλοποίηση υπηρεσίων VoIP με το Matrix",
     "Discussion of the Identity Service API": "Συζήτηση σχετικά με το Identity Service API",
     "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και Riot",
-    "Dev chat for the Riot/Web dev team": "Συνομιλία για την ομάδα ανάπτυξης του Riot/Web",
-    "Dev chat for the Dendrite dev team": "Συνομιλία για την ομάδα ανάπτυξης του Dendrite",
+    "Dev chat for the Riot/Web dev team": "Συζήτηση με την ομάδα ανάπτυξης του Riot/Web",
+    "Dev chat for the Dendrite dev team": "Συζήτηση με την ομάδα ανάπτυξης του Dendrite",
     "Co-ordination for Riot/Web translators": "Συντονισμός για μεταφραστές του Riot/Web",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Αρκετά δωμάτια υπάρχουν ήδη στο Matrix, συνδεδεμένα σε υπάρχοντα δίκτυα (Slack, IRC, Gitter κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!",
     "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;",

From aa07266f12e53519291df9a6d221f8dd8d40052a Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 13 Jun 2017 12:52:35 +0100
Subject: [PATCH 054/172] Test that we handle stored mx_last_room_id correctly

 * Do we show the last room correctly on resume?
 * Do we show the home page if we have no last room?
 * If we follow a login link, and re-log-in, do we correctly vape the
   mx_last_room_id (#4283)
---
 test/app-tests/loading.js | 124 +++++++++++++++++++++++++++++---------
 1 file changed, 95 insertions(+), 29 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index b6e4324f27..3f98b4f11b 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -222,33 +222,7 @@ describe('loading:', function () {
                 // Wait for another trip around the event loop for the UI to update
                 return q.delay(1);
             }).then(() => {
-                // we expect a single <Login> component
-                let login = ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.login.Login'));
-                httpBackend.when('POST', '/login').check(function(req) {
-                    console.log(req);
-                    expect(req.data.type).toEqual('m.login.password');
-                    expect(req.data.identifier.type).toEqual('m.id.user');
-                    expect(req.data.identifier.user).toEqual('user');
-                    expect(req.data.password).toEqual('pass');
-                }).respond(200, {
-                    user_id: '@user:id',
-                    device_id: 'DEVICE_ID',
-                    access_token: 'access_token',
-                });
-                login.onPasswordLogin("user", undefined, undefined, "pass")
-                return httpBackend.flush();
-            }).then(() => {
-                // Wait for another trip around the event loop for the UI to update
-                return q.delay(1);
-            }).then(() => {
-                // we expect a spinner
-                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('elements.Spinner'));
-
-                httpBackend.when('GET', '/pushrules').respond(200, {});
-                httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
-                return expectAndAwaitSync();
+                return completeLogin(matrixChat);
             }).then(() => {
                 // once the sync completes, we should have a room view
                 return awaitRoomView(matrixChat);
@@ -271,9 +245,30 @@ describe('loading:', function () {
             localStorage.setItem("mx_is_url", "http://localhost" );
             localStorage.setItem("mx_access_token", "access_token");
             localStorage.setItem("mx_user_id", "@me:localhost");
+            localStorage.setItem("mx_last_room_id", "!last_room:id");
+        });
+
+        it('shows the last known room by default', function() {
+            httpBackend.when('GET', '/pushrules').respond(200, {});
+            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
+
+            loadApp();
+
+            return awaitSyncingSpinner(matrixChat).then(() => {
+                // we got a sync spinner - let the sync complete
+                return expectAndAwaitSync();
+            }).then(() => {
+                // once the sync completes, we should have a room view
+                return awaitRoomView(matrixChat);
+            }).then(() => {
+                httpBackend.verifyNoOutstandingExpectation();
+                expect(windowLocation.hash).toEqual("#/room/!last_room:id");
+            });
         });
 
         it('shows a home page by default if we have no joined rooms', function(done) {
+            localStorage.removeItem("mx_last_room_id");
+
             httpBackend.when('GET', '/pushrules').respond(200, {});
             httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
 
@@ -309,7 +304,37 @@ describe('loading:', function () {
                 httpBackend.verifyNoOutstandingExpectation();
                 expect(windowLocation.hash).toEqual("#/room/!room:id");
             }).done(done, done);
+        });
 
+        describe('/#/login link:', function() {
+            beforeEach(function() {
+                httpBackend.when('GET', '/pushrules').respond(200, {});
+                httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
+
+                loadApp({
+                    uriFragment: "#/login",
+                });
+
+                return expectAndAwaitSync().then(() => {
+                    return q.delay(1);
+                });
+            });
+
+            it('shows a login view', function() {
+                // we expect a single <Login> component
+                const login = ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.login.Login')
+                );
+            });
+
+            it('shows the homepage after login', function() {
+                return completeLogin(matrixChat).then(() => {
+                    // we should see a home page if we previously had no room
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, sdk.getComponent('structures.HomePage'));
+                    expect(windowLocation.hash).toEqual("#/home");
+                });
+            });
         });
     });
 
@@ -450,6 +475,45 @@ describe('loading:', function () {
             }).done(done, done);
         });
     });
+
+
+    // check that we have a Login component, send a 'user:pass' login,
+    // and await the HTTP requests.
+    function completeLogin(matrixChat) {
+        // we expect a single <Login> component
+        const login = ReactTestUtils.findRenderedComponentWithType(
+            matrixChat, sdk.getComponent('structures.login.Login'));
+
+        httpBackend.when('POST', '/login').check(function(req) {
+            console.log(req);
+            expect(req.data.type).toEqual('m.login.password');
+            expect(req.data.identifier.type).toEqual('m.id.user');
+            expect(req.data.identifier.user).toEqual('user');
+            expect(req.data.password).toEqual('pass');
+        }).respond(200, {
+            user_id: '@user:id',
+            device_id: 'DEVICE_ID',
+            access_token: 'access_token',
+        });
+        login.onPasswordLogin("user", undefined, undefined, "pass");
+
+        return httpBackend.flush().then(() => {
+            // Wait for another trip around the event loop for the UI to update
+            return q.delay(1);
+        }).then(() => {
+            // we expect a spinner
+            ReactTestUtils.findRenderedComponentWithType(
+                matrixChat, sdk.getComponent('elements.Spinner'));
+
+            httpBackend.when('GET', '/pushrules').respond(200, {});
+            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
+            return expectAndAwaitSync().catch((e) => {
+                throw new Error("Never got /sync after login: did the client start?");
+            });
+        }).then(() => {
+            httpBackend.verifyNoOutstandingExpectation();
+        });
+    }
 });
 
 // assert that we are on the loading page
@@ -465,7 +529,7 @@ function assertAtLoadingSpinner(matrixChat) {
 // the page includes a logout link.
 function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
     if (retryLimit === undefined) {
-        retryLimit = 5;
+        retryLimit = 10;
     }
     if (retryCount === undefined) {
         retryCount = 0;
@@ -477,7 +541,9 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
             throw new Error("MatrixChat still not loaded after " +
                             retryCount + " tries");
         }
-        return q.delay(0).then(() => {
+        // loading can take quite a long time, because we delete the
+        // indexedDB store.
+        return q.delay(5).then(() => {
             return awaitSyncingSpinner(matrixChat, retryLimit, retryCount + 1);
         });
     }

From dfd9f7c27b86f43697c95a417c84c7ec3b02e307 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 13 Jun 2017 10:06:10 +0100
Subject: [PATCH 055/172] New icons for riot-ios & riot-translations

---
 res/home/rooms/riot-ios.png          | Bin 3828 -> 5324 bytes
 res/home/rooms/riot-translations.png | Bin 146 -> 8409 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/home/rooms/riot-ios.png b/res/home/rooms/riot-ios.png
index 83306f7cb8bae371ca455a6ff601a89fe624cf8e..6a0c598fe579a63739302ec951760936f69da3f4 100644
GIT binary patch
literal 5324
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

literal 3828
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

diff --git a/res/home/rooms/riot-translations.png b/res/home/rooms/riot-translations.png
index ee0f85589570374f5e1dec95ff7867a6c731f7bf..2ae95836e70a2e56e5f666be9bbee8b3053a62f2 100644
GIT binary patch
literal 8409
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

literal 146
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1SFZ~=vx6P$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1GCY~;iAr-gYoMq%?FyLTNsC6=qKC0CJ@Yw=}$jcia9u?Xc
lp(ECPGzm(5Jo<y%fPqzq$u+6qegsfIgQu&X%Q~loCIIV<EVBRr


From 27b8568fc0499d03f4a347614bacf928181baf30 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Tue, 13 Jun 2017 10:52:06 +0100
Subject: [PATCH 056/172] Merge pull request #4290 from
 RiotTranslateBot/weblate-riot-web-riot-web

Update from Weblate.
---
 src/i18n/strings/el.json    |  10 +--
 src/i18n/strings/en_US.json |  31 ++++++-
 src/i18n/strings/fr.json    |  29 ++++++-
 src/i18n/strings/nl.json    | 158 +++++++++++++++++++++++++-----------
 4 files changed, 173 insertions(+), 55 deletions(-)

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index cbb2a819cf..c060f3bdb3 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -20,7 +20,7 @@
     "Download this file": "Λήψη αρχείου",
     "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
     "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας",
-    "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων γι' αυτό το λογαριασμό",
+    "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό",
     "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:",
     "Error": "Σφάλμα",
     "#example": "#παράδειγμα",
@@ -31,7 +31,7 @@
     "customServer_text": "Μπορείτε να χρησιμοποιήσετε τις προσαρμοσμένες ρυθμίσεις για να εισέλθετε σε άλλους διακομιστές Matrix επιλέγοντας μια διαφορετική διεύθυνση για το διακομιστή.<br/> Αυτό σας επιτρέπει να χρησιμοποιήσετε την εφαρμογή Riot με έναν υπάρχοντα λογαριασμό σε διαφορετικό διακομιστή.<br/><br/>Επίσης μπορείτε να επιλέξετε ένα διαφορετικό διακομιστή ταυτότητας αλλά δεν θα έχετε τη δυνατότητα να προσκαλέσετε άλλους χρήστες ή να σας προσκαλέσουν μέσω μηνυμάτων ηλεκτρονικής αλληλογραφίας.",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s μέσω %(browserName)s σε %(osName)s",
     "All messages (loud)": "Όλα τα μηνύματα (δυνατά)",
-    "delete the alias.": "διαγραφή ψευδώνυμου.",
+    "delete the alias.": "διέγραψε το ψευδώνυμο.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Διαγραφή του ψευδώνυμου %(alias)s και αφαίρεση του %(name)s από το ευρετήριο;",
     "Dismiss": "Απόρριψη",
     "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η προσθήκη της ετικέτας %(tagName)s στο δωμάτιο",
@@ -39,7 +39,7 @@
     "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
     "Favourite": "Αγαπημένο",
     "Files": "Αρχεία",
-    "Filter room names": "Φίλτραρε τα δωμάτια",
+    "Filter room names": "Φιλτράρισμα δωματίων",
     "Forward Message": "Προώθηση",
     " from room": " από το δωμάτιο",
     "Guests can join": "Επισκέπτες μπορούν να συνδεθούν",
@@ -150,7 +150,7 @@
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά",
     "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο",
     "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s",
-    "Failed to": "Αποτυχία να",
+    "Failed to": "Απέτυχε να",
     "Failed to get public room list": "Δεν ήταν δυνατή η λήψη της λίστας με τα δημόσια δωμάτια",
     "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1",
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
@@ -196,5 +196,5 @@
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
     "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
-    "Support for those using, running and writing other bridges": "Υποστήριξη ηια τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
+    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 8500886541..63fadbe006 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -167,5 +167,34 @@
     " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
     "Welcome to Riot.im": "Welcome to Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
-    "Chat with Riot Bot": "Chat with Riot Bot"
+    "Chat with Riot Bot": "Chat with Riot Bot",
+    "Search the room directory": "Search the room directory",
+    "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
+    "General discussion about Matrix and Riot": "General discussion about Matrix and Riot",
+    "Discussion of all things Matrix!": "Discussion of all things Matrix!",
+    "Matrix technical discussions": "Matrix technical discussions",
+    "Running Matrix services": "Running Matrix services",
+    "Community-run support for Synapse": "Community-run support for Synapse",
+    "Admin support for Dendrite": "Admin support for Dendrite",
+    "Announcements about Synapse releases": "Announcements about Synapse releases",
+    "Support for those using and running matrix-appservice-irc": "Support for those using and running matrix-appservice-irc",
+    "Building services on Matrix": "Building services on Matrix",
+    "Support for those using the Matrix spec": "Support for those using the Matrix spec",
+    "Design and implementation of E2E in Matrix": "Design and implementation of E2E in Matrix",
+    "Implementing VR services with Matrix": "Implementing VR services with Matrix",
+    "Implementing VoIP services with Matrix": "Implementing VoIP services with Matrix",
+    "Discussion of the Identity Service API": "Discussion of the Identity Service API",
+    "Support for those using, running and writing other bridges": "Support for those using, running and writing other bridges",
+    "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
+    "Dev chat for the Riot/Web dev team": "Dev chat for the Riot/Web dev team",
+    "Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team",
+    "Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
+    "You have successfully set a password!": "You have successfully set a password!",
+    "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
+    "Please set a password!": "Please set a password!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 47fb52532c..c57a6d17d3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -10,7 +10,7 @@
     "Create new room": "Créer un nouveau salon",
     "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix",
     "Custom Server Options": "Options de serveur personnalisées",
-    "delete the alias.": "Supprimer l'alias.",
+    "delete the alias.": "supprimer l'alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
     "Direct Chat": "Conversation Directe",
     "Directory": "Répertoire",
@@ -118,7 +118,7 @@
     "Guests can join": "Ouvert aux visiteurs",
     " to room": " au salon",
     "Advanced notification settings": "Paramètres de notification avancés",
-    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.<br/>Cela permet d'utiliser Riot avec un compte existant sur un homeserverdifférent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
+    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.<br/>Cela permet d'utiliser Riot avec un compte existant sur un homeserver différent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots-clés suivant répondent à des critères qui ne peuvent pas être affichés ici :",
     "Collapse panel": "Cacher le panneau",
     "Expand panel": "Dévoiler le panneau",
@@ -161,5 +161,28 @@
     "Waiting for response from server": "En attente d’une réponse du serveur",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. <a>Enregistrez vous</a> ou <a>identifiez vous</a> pour accéder à plus de salons et de fonctionnalités !",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
-    "OK": "OK"
+    "OK": "OK",
+    "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
+    "You have successfully set a password!": "Vous avez paramétré un mot de passe avec succès !",
+    "Continue": "Continuer",
+    "Please set a password!": "Veuillez paramétrer un mot de passe !",
+    "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
+    "Welcome to Riot.im": "Bienvenue sur Riot.im",
+    " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))",
+    "Login": "S'identifier",
+    "Chat with Riot Bot": "Discussion avec le Robot Riot",
+    "Search the room directory": "Rechercher dans le répertoire de salon",
+    "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces du Robot Riot !",
+    "Riot/Android &amp; matrix-android-sdk chat": "Discussions Riot/Android &amp; matrix-android-sd",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Discussions Riot/iOS &amp; matrix-ios-sdk",
+    "General discussion about Matrix and Riot": "Discussion générale sur Matrix et Riot",
+    "Riot/Web &amp; Desktop chat": "Discussions Riot/Web &amp; Desktop",
+    "Running Matrix services": "Exécution de services Matrix",
+    "Admin support for Dendrite": "Support admin pour Dendrite",
+    "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapses",
+    "Matrix technical discussions": "Discussions techniques sur Matrix",
+    "Community-run support for Synapse": "Support communautaire sur Synape",
+    "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc",
+    "Building services on Matrix": ""
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 1b497ff3ad..d9e459d551 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1,42 +1,42 @@
 {
-    "Add an email address above to configure email notifications": "Voeg een email adres toe om email notificaties te ontvangen",
-    "Advanced notification settings": "Geavanceerde notificatie instellingen",
+    "Add an email address above to configure email notifications": "Voeg een e-mailadres toe om e-mailmeldingen te ontvangen",
+    "Advanced notification settings": "Geavanceerde meldingsinstellingen",
     "All messages": "Alle berichten",
     "All messages (loud)": "Alle berichten (luid)",
-    "All notifications are currently disabled for all targets.": "Alle notificaties zijn op het moment uitgeschakeld voor alle doelen.",
-    "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van jouw email notificatie voorkeuren.",
-    "Call invitation": "Audio gesprek uitnodiging",
-    "Cancel Sending": "Annuleren verzending",
-    "Can't update user notification settings": "Het is niet gelukt om de gebruiker notificatie instellingen bij te werken",
+    "All notifications are currently disabled for all targets.": "Alle meldingen zijn momenteel uitgeschakeld voor alle doelen.",
+    "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van uw e-mailmeldingsvoorkeuren.",
+    "Call invitation": "Oproep-uitnodiging",
+    "Cancel Sending": "Versturen annuleren",
+    "Can't update user notification settings": "Het is niet gelukt om de meldingsinstellingen van de gebruiker bij te werken",
     "Close": "Sluiten",
-    "Create new room": "Maak een nieuwe kamer",
+    "Create new room": "Een nieuwe kamer maken",
     "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix kamer te vinden",
-    "Custom Server Options": "Aangepaste server instellingen",
-    "customServer_text": "Je kunt de aangepaste server instellingen gebruiken om in te loggen bij andere Matrix servers door een andere home server URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix account op een andere home server.<br/><br/>Je kunt ook een aangepaste identiteit server instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een email adres of zelf uitgenodigt te worden met een email adres.",
+    "Custom Server Options": "Aangepaste serverinstellingen",
+    "customServer_text": "U kunt de aangepaste serverinstellingen gebruiken om in te loggen bij andere Matrix-servers door een andere homeserver-URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix-account op een andere homeserver.<br/><br/>U kunt ook een aangepaste identiteitsserver instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een e-mailadres of zelf uitgenodigd te worden met een e-mailadres.",
     "delete the alias.": "verwijder de alias.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Verwijder de alias %(alias)s en verwijder %(name)s uit de map?",
-    "Direct Chat": "Privé gesprek",
-    "Directory": "Kamer lijst",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "De alias %(alias)s verwijderen en %(name)s uit de kamerlijst verwijderen?",
+    "Direct Chat": "Privégesprek",
+    "Directory": "Kamerlijst",
     "Dismiss": "Afwijzen",
     "Download this file": "Download dit bestand",
-    "Enable audible notifications in web client": "Zet notificaties aan in de web client",
-    "Enable desktop notifications": "Zet desktop notificaties aan",
-    "Enable email notifications": "Zet email notificaties aan",
-    "Enable notifications for this account": "Zet notificaties aan voor dit account",
-    "Enable them now": "Zet ze nu aan",
+    "Enable audible notifications in web client": "Meldingen in de webclient aanzetten",
+    "Enable desktop notifications": "Desktopmeldingen aanzetten",
+    "Enable email notifications": "E-mailmeldingen aanzetten",
+    "Enable notifications for this account": "Meldingen voor dit account aanzetten",
+    "Enable them now": "Deze nu aanzetten",
     "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gesplitst door een komma:",
     "Error": "Fout",
-    "Error saving email notification preferences": "Fout bij het opslaan van de email notificatie voorkeuren",
+    "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
     "#example": "#voorbeeld",
     "Failed to": "Mislukt om",
     "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen",
-    "Failed to change settings": "Het is mislukt om de instellingen te wijzigen",
-    "Failed to forget room %(errCode)s": "Het is mislukt om de kamer te vergeten %(errCode)s",
-    "Failed to update keywords": "Het is mislukt om de trefwoorden bij te werken",
-    "Failed to get protocol list from Home Server": "Het is mislukt om de protocol lijst op te halen van de home server",
-    "Failed to get public room list": "Het is mislukt om de lijst van publieke kamers op te halen",
-    "Failed to join the room": "Het is mislukt om de kamer toe te treden",
-    "Failed to remove tag %(tagName)s from room": "Het is mislukt om de label %(tagName)s van de kamer te verwijderen",
+    "Failed to change settings": "Instellingen wijzigen mislukt",
+    "Failed to forget room %(errCode)s": "Kamer vergeten mislukt %(errCode)s",
+    "Failed to update keywords": "Sleutelwoorden bijwerken mislukt",
+    "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
+    "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt",
+    "Failed to join the room": "Kamer binnengaan mislukt",
+    "Failed to remove tag %(tagName)s from room": "Label %(tagName)s van de kamer verwijderen mislukt",
     "Failed to set direct chat tag": "Het is mislukt om de privé chat label weg te halen",
     "Favourite": "Favoriet",
     "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
@@ -54,38 +54,38 @@
     "Mentions only": "Alleen vermeldingen",
     "Messages containing my display name": "Berichten die mijn weergavenaam bevatten",
     "Messages containing my user name": "Berichten die mijn gebruikersnaam bevatten",
-    "Messages in group chats": "Berichten in groep gesprekken",
-    "Messages in one-to-one chats": "Berichten in één-op-één gesprekken",
+    "Messages in group chats": "Berichten in groepsgesprekken",
+    "Messages in one-to-one chats": "Berichten in één-op-één-gesprekken",
     "Messages sent by bot": "Berichten verzonden bij een bot",
     "more": "meer",
     "Mute": "Dempen",
     "No rooms to show": "Geen kamers om te laten zien",
     "Noisy": "Luidruchtig",
     "Notification targets": "Notificatie doelen",
-    "Notifications": "Notificaties",
+    "Notifications": "Meldingen",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificaties op de volgende trefwoorden volgen regels die hier niet kunnen worden laten zien:",
     "Notify for all other messages/rooms": "Informeer mij voor alle andere berichten/kamers",
     "Notify me for anything else": "Informeer mij voor al het andere",
     "Off": "Uit",
     "On": "Aan",
     "Operation failed": "Actie mislukt",
-    "Permalink": "Permalink",
-    "Please Register": "Registreer alsjeblieft",
-    "powered by Matrix": "aangedreven door Matrix",
-    "Quote": "Quote",
+    "Permalink": "Permanente link",
+    "Please Register": "Registreer alstublieft",
+    "powered by Matrix": "mogelijk gemaakt door Matrix",
+    "Quote": "Citaat",
     "Reject": "Afwijzen",
-    "Remove %(name)s from the directory?": "Verwijder %(name)s uit de kamer lijst?",
-    "Remove": "Verwijder",
-    "remove %(name)s from the directory.": "verwijder %(name)s uit de kamer lijst.",
-    "Remove from Directory": "Verwijder uit de kamer lijst",
+    "Remove %(name)s from the directory?": "%(name)s uit de kamerlijst verwijderen?",
+    "Remove": "Verwijderen",
+    "remove %(name)s from the directory.": "verwijder %(name)s uit de kamerlijst.",
+    "Remove from Directory": "Uit de kamerlijst verwijderen",
     "Resend": "Opnieuw verzenden",
     "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet toetreden tot een kamer op dit netwerk",
-    "Room directory": "Kamer lijst",
+    "Room directory": "Kamerlijst",
     "Room not found": "De kamer is niet gevonden",
-    "Search for a room": "Zoek naar een kamer",
+    "Search for a room": "Een kamer zoeken",
     "Settings": "Instellingen",
     "Source URL": "Bron URL",
-    "Start chat": "Start gesprek",
+    "Start chat": "Gesprek starten",
     "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen",
     "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet worden laten zien",
     "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbeladen",
@@ -95,7 +95,7 @@
     "Unable to join network": "Het is mislukt om toe te treden tot dit netwerk",
     "Unable to look up room ID from server": "Het is mislukt om de kamer ID op te halen van de server",
     "Unhide Preview": "Zichtbaar maken preview",
-    "unknown error code": "niet bekende foutcode",
+    "unknown error code": "onbekende foutcode",
     "Unnamed room": "Kamer zonder naam",
     "Uploaded on %(date)s by %(user)s": "Geüpload op %(date)s door %(user)s",
     "View Decrypted Source": "Bekijk gedecodeerde bron",
@@ -115,11 +115,77 @@
     "Saturday": "Zaterdag",
     "Today": "Vandaag",
     "Yesterday": "Gisteren",
-    "Welcome page": "Welkom pagina",
-    "Drop here %(toAction)s": "%(toAction)s hier naar toe verplaatsen",
+    "Welcome page": "Welkomstpagina",
+    "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen",
     "Failed to set Direct Message status of room": "Het is mislukt om de directe berichten status van de kamer in te stellen",
     "Redact": "Redigeren",
-    "A new version of Riot is available.": "Nieuwe Riot versie is beschikbaar.",
-    "All Rooms": "Alle Kamers",
-    "Cancel": "Annuleer"
+    "A new version of Riot is available.": "Nieuwe Riot-versie is beschikbaar.",
+    "All Rooms": "Alle kamers",
+    "Cancel": "Annuleren",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> en <a href=\"http://opera.com\">Opera</a> werken ook.",
+    "Changelog": "Logboek van wijzigingen",
+    "Collapse panel": "Paneel inklappen",
+    "Collecting app version information": "App-versieinformatie verzamelen",
+    "Collecting logs": "Logboeken verzamelen",
+    "Describe your problem here.": "Beschrijf uw probleem hier.",
+    "Expand panel": "Paneel uitklappen",
+    "Failed to send report: ": "Rapport verzenden mislukt: ",
+    "Forward Message": "Bericht doorsturen",
+    "Hide panel": "Paneel verbergen",
+    " (HTTP status %(httpStatus))": "(HTTP-status %(httpStatus))",
+    "I understand the risks and wish to continue": "Ik begrijp de risico's en wil graag verder gaan",
+    "Login": "Aanmelden",
+    "Loading bug report module": "Bugrapporteermodule laden",
+    "Messages containing <span>keywords</span>": "Berichten die <span>sleutelwoorden</span> bevatten",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Installeer <a href=\"https://www.google.com/chrome\">Chrome</a> of <a href=\"https://getfirefox.com\">Firefox</a> voor de beste ervaring.",
+    "Report a bug": "Een bug rapporteren",
+    "Riot Desktop on %(platformName)s": "Riot Desktop op %(platformName)s",
+    "Riot is not supported on mobile web. Install the app?": "Riot wordt niet ondersteund op het mobiele web. De app installeren?",
+    "Search": "Zoeken",
+    "Search…": "Zoeken…",
+    "Send": "Versturen",
+    "Send logs": "Logboeken versturen",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, uw browser werkt <b>niet</b> met Riot.",
+    "This Room": "Deze ruimte",
+    "Unavailable": "Niet beschikbaar",
+    "Unknown device": "Onbekend apparaat",
+    "Update": "Bijwerken",
+    "Uploading report": "Rapport uploaden",
+    "What's New": "Wat is er nieuw",
+    "What's new?": "Wat is er nieuw?",
+    "Waiting for response from server": "Wachten op antwoord van de server",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "U gebruikt Riot als gast. <a>Registreren</a> of <a>aanmelden</a> om voor meer ruimtes en functies!",
+    "OK": "OK",
+    "You need to be using HTTPS to place a screen-sharing call.": "U moet HTTPS gebruiken om een oproep met schermdelen te kunnen starten.",
+    "Welcome to Riot.im": "Welkom bij Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentaliseerd en versleuteld chatten &amp; samenwerking mogelijk gemaakt door [matrix]",
+    "Search the room directory": "De kamerlijst doorzoeken",
+    "Chat with Riot Bot": "Met Riot Bot chatten",
+    "Get started with some tips from Riot Bot!": "Begin met enkele tips van Riot-bot!",
+    "General discussion about Matrix and Riot": "Algemene discussie over Matrix en Riot",
+    "Discussion of all things Matrix!": "Discussie over alle Matrix-dingen!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-chat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-chat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-chat",
+    "Matrix technical discussions": "Technische discussies over Matrix",
+    "Running Matrix services": "Matrixdiensten beheren",
+    "Community-run support for Synapse": "Synapse-ondersteuning vanuit de gemeenschap",
+    "Admin support for Dendrite": "Beheerondersteuning voor Dendrite",
+    "Announcements about Synapse releases": "Aankondigingen over Synapse-uitgaven",
+    "Support for those using and running matrix-appservice-irc": "Ondersteuning voor hen die matrix-appservice-irc gebruiken en beheren",
+    "Building services on Matrix": "Diensten op Matrix bouwen",
+    "Support for those using the Matrix spec": "Ondersteuning voor hen die de Matrix-specificatie gebruiken",
+    "Contributing code to Matrix and Riot": "Code bijdragen aan Matrix en Riot",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Veel ruimtes bestaan al in Matrix, gelinkt aan bestaande netwerken (Slack, IRC, Gitter enz.) of onafhankelijk. Bekijk de kamerlijst!",
+    "Failed to change password. Is your password correct?": "Wachtwoord wijzigen mislukt. Is uw wachtwoord juist?",
+    "You have successfully set a password!": "U heeft met succes een wachtwoord ingesteld!",
+    "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u bent afgemeld, en aanmelden op andere apparaten.",
+    "Continue": "Doorgaan",
+    "Please set a password!": "Stel een wachtwoord in!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en aanmelden op andere apparaten.",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s op %(osName)s",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Beschrijf de bug. Wat deed u? Wat verwachtte u? Wat gebeurde er in werkelijkheid?",
+    "Please describe the bug and/or send logs.": "Beschrijf de bug en/of verstuur logboeken.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebrukt veel geavanceerde browserfuncties, waarvan enkele niet of experimenteel in uw webbrowser beschikbaar zijn.",
+    "Co-ordination for Riot/Web translators": "Coördinatie voor Riot/Web-vertalers"
 }

From c8416b0321d90a2d4219bd4c8585956e5a80dd5d Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 13 Jun 2017 18:31:35 +0100
Subject: [PATCH 057/172] i18n for setting email after password flow

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cb50de9556..bdf0c08222 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -196,5 +196,7 @@
   "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
   "Continue": "Continue",
   "Please set a password!": "Please set a password!",
-  "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices."
+  "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+  "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
+  "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind."
 }

From 5a9d8b062455bd2012fac6f13c293ba30c832245 Mon Sep 17 00:00:00 2001
From: Jean <jeangb@hotmail.fr>
Date: Tue, 13 Jun 2017 13:55:43 +0000
Subject: [PATCH 058/172] Translated using Weblate (French)

Currently translated at 92.9% (184 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 c57a6d17d3..8937da623a 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -133,7 +133,7 @@
     "A new version of Riot is available.": "Une nouvelle version de Riot est disponible.",
     "All Rooms": "Tous les salons",
     "Cancel": "Annuler",
-    "Changelog": "Journal des modif.",
+    "Changelog": "Journal des modif",
     "Collecting app version information": "Récupération des info de version de l’application",
     "Collecting logs": "Récupération des traces",
     "Describe your problem here.": "Décrivez votre problème ici.",

From 7e272f95ff2c79f8bc1f336af29c386811179678 Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Tue, 13 Jun 2017 16:06:09 +0000
Subject: [PATCH 059/172] Translated using Weblate (German)

Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 dfd84ecbd8..b1114fa37a 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -205,5 +205,5 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.",
     "Dev chat for the Dendrite dev team": "Entwickler-Chat für das Dendrite-Entwickler-Team",
     "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot",
-    " (HTTP status %(httpStatus))": "(HTTP Status %(httpStatus))"
+    " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))"
 }

From fbe5dfce4d6a3bfd6d6cce99ac3723d499f8f109 Mon Sep 17 00:00:00 2001
From: Krombel <krombel@krombel.de>
Date: Tue, 13 Jun 2017 18:00:18 +0000
Subject: [PATCH 060/172] Translated using Weblate (German)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 b1114fa37a..3a08540910 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -205,5 +205,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.",
     "Dev chat for the Dendrite dev team": "Entwickler-Chat für das Dendrite-Entwickler-Team",
     "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot",
-    " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))"
+    " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))",
+    "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Denk daran, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst."
 }

From 138555759d1834c1673fc0096096f3949bb69785 Mon Sep 17 00:00:00 2001
From: AmandineLP <amandine@matrix.org>
Date: Tue, 13 Jun 2017 23:06:29 +0000
Subject: [PATCH 061/172] Translated using Weblate (French)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 8937da623a..fa23cb5446 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -184,5 +184,20 @@
     "Matrix technical discussions": "Discussions techniques sur Matrix",
     "Community-run support for Synapse": "Support communautaire sur Synape",
     "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc",
-    "Building services on Matrix": ""
+    "Building services on Matrix": "Développement de services sur Matrix",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Discussion &amp; collaboration décentralisées et encryptées propulsé par [matrix]",
+    "Discussion of all things Matrix!": "Discussion de tous les sujets Matrix !",
+    "Support for those using the Matrix spec": "Support pour les utilisateurs de la spec Matrix",
+    "Design and implementation of E2E in Matrix": "Définition et implémentation de la crypto dans Matrix",
+    "Implementing VR services with Matrix": "Implémentation de de services de réalité virtuelle avec Matrix",
+    "Implementing VoIP services with Matrix": "Implémentation de de services de voix sur IP avec Matrix",
+    "Discussion of the Identity Service API": "Discussion sur l’API du Service Identité",
+    "Support for those using, running and writing other bridges": "Support pour les utilisateurs, administrateurs et développeurs de passerelles",
+    "Contributing code to Matrix and Riot": "Contribuer à Matrix et Riot",
+    "Dev chat for the Riot/Web dev team": "Forum pour les discussions sur les développements de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Forum pour les discussion sur les développements de Dendrite",
+    "Co-ordination for Riot/Web translators": "Coordination des traducteurs de Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Beaucoup de salons existent déjà dans Matrix, liés à des réseaux existants (Slsck, IRC, Gitter etc) ou indépendants. Jetez un oeil au répertoire !",
+    "You have successfully set a password and an email address!": "Vous avez configuré un mot de passe et une adresse e-mail avec succès !",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans la configuration utilisateur si vous changez d’avis."
 }

From 4f55f810afdf2f482d7adf2e2f6afd3f9c6c544d Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 14 Jun 2017 09:30:08 +0100
Subject: [PATCH 062/172] Ask for email address after setting password for the
 first time

This is so that the user can reset their password.
---
 .../views/dialogs/SetPasswordDialog.js        | 73 ++++++++++++-------
 src/skins/vector/css/_components.scss         |  1 +
 .../views/dialogs/_SetEmailDialog.scss        | 36 +++++++++
 3 files changed, 83 insertions(+), 27 deletions(-)
 create mode 100644 src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss

diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 47e13a1782..3e34d8b4b1 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -17,7 +17,42 @@ limitations under the License.
 import React from 'react';
 import sdk from 'matrix-react-sdk';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import Modal from 'matrix-react-sdk/lib/Modal';
 
+const WarmFuzzy = function(props) {
+    const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+    let title = _t('You have successfully set a password!');
+    if (props.didSetEmail) {
+        title = _t('You have successfully set a password and an email address!');
+    }
+    const advice = _t('You can now return to your account after signing out, and sign in on other devices.');
+    let extraAdvice = null;
+    if (!props.didSetEmail) {
+        extraAdvice = _t('Remember, you can always set an email address in user settings if you change your mind.');
+    }
+
+    return <BaseDialog className="mx_SetPasswordDialog"
+        onFinished={props.onFinished}
+        title={ title }
+    >
+        <div className="mx_Dialog_content">
+            <p>
+                { advice }
+            </p>
+            <p>
+                { extraAdvice }
+            </p>
+        </div>
+        <div className="mx_Dialog_buttons">
+            <button
+                className="mx_Dialog_primary"
+                autoFocus={true}
+                onClick={props.onFinished}>
+                    { _t('Continue') }
+            </button>
+        </div>
+    </BaseDialog>;
+};
 
 /**
  * Prompt the user to set a password
@@ -33,13 +68,19 @@ export default React.createClass({
     getInitialState: function() {
         return {
             error: null,
-            success: false,
         };
     },
 
-    _onPasswordChanged: function() {
-        this.setState({
-            success: true,
+    componentWillMount: function() {
+        console.info('SetPasswordDialog component will mount');
+    },
+
+    _onPasswordChanged: function(res) {
+        Modal.createDialog(WarmFuzzy, {
+            didSetEmail: res.didSetEmail,
+            onFinished: () => {
+                this._onContinueClicked();
+            },
         });
     },
 
@@ -66,29 +107,6 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const ChangePassword = sdk.getComponent('views.settings.ChangePassword');
 
-        if (this.state.success) {
-            return (
-                <BaseDialog className="mx_SetPasswordDialog"
-                    onFinished={this.props.onFinished}
-                    title={ _t('You have successfully set a password!') }
-                >
-                    <div className="mx_Dialog_content">
-                        <p>
-                            { _t('You can now return to your account after signing out, and sign in on other devices.') }
-                        </p>
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <button
-                            className="mx_Dialog_primary"
-                            autoFocus={true}
-                            onClick={this._onContinueClicked}>
-                                { _t('Continue') }
-                        </button>
-                    </div>
-                </BaseDialog>
-            );
-        }
-
         return (
             <BaseDialog className="mx_SetPasswordDialog"
                 onFinished={this.props.onFinished}
@@ -106,6 +124,7 @@ export default React.createClass({
                         buttonClassName="mx_Dialog_primary mx_SetPasswordDialog_change_password_button"
                         confirm={false}
                         autoFocusNewPasswordInput={true}
+                        shouldAskForEmail={true}
                         onError={this._onPasswordChangeError}
                         onFinished={this._onPasswordChanged} />
                     <div className="error">
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 4637530b56..4c4d7cc2a6 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -71,6 +71,7 @@
 @import "./vector-web/views/context_menus/_MessageContextMenu.scss";
 @import "./vector-web/views/context_menus/_RoomTileContextMenu.scss";
 @import "./vector-web/views/dialogs/_ChangelogDialog.scss";
+@import "./vector-web/views/dialogs/_SetEmailDialog.scss";
 @import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
 @import "./vector-web/views/directory/_NetworkDropdown.scss";
 @import "./vector-web/views/elements/_ImageView.scss";
diff --git a/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss b/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss
new file mode 100644
index 0000000000..588f10c9cb
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_SetEmailDialog_email_input {
+    border-radius: 3px;
+    border: 1px solid $input-border-color;
+    padding: 9px;
+    color: $input-fg-color;
+    background-color: $primary-bg-color;
+    font-size: 15px;
+    width: 100%;
+    max-width: 280px;
+    margin-bottom: 10px;
+}
+
+.mx_SetEmailDialog_email_input:focus {
+    outline: none;
+    box-shadow: none;
+    border: 1px solid $accent-color;
+}
+
+.mx_SetEmailDialog_email_input_placeholder {
+}

From 46d0e8da96356bf64a4f100feaca1dd512092619 Mon Sep 17 00:00:00 2001
From: Tom Tryfonidis <tomtryf@gnome.org>
Date: Wed, 14 Jun 2017 08:40:53 +0000
Subject: [PATCH 063/172] Translated using Weblate (Greek)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 821f2aa778..333a999760 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -196,5 +196,7 @@
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
     "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
-    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
+    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix",
+    "You have successfully set a password and an email address!": "Ο κωδικός πρόσβασης και η διεύθυνση ηλεκτρονικής αλληλογραφίας ορίστηκαν επιτυχώς!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Να θυμάστε ότι μπορείτε πάντα να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στις ρυθμίσεις χρήστη αν αλλάξετε γνώμη."
 }

From fa9ae945ed513b779f819adea4c8e6275fcaad88 Mon Sep 17 00:00:00 2001
From: Paul Evans <leonerd@leonerd.org.uk>
Date: Tue, 13 Jun 2017 21:52:40 +0000
Subject: [PATCH 064/172] Translated using Weblate (Esperanto)

Currently translated at 21.5% (43 of 200 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 9e26dfeeb6..49ccc6e60f 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1 +1,45 @@
-{}
\ No newline at end of file
+{
+    "A new version of Riot is available.": "Nova versio de \"Riot\" haveblas.",
+    "All messages": "Ĉiuj mesaĝoj",
+    "All messages (loud)": "Ĉiuj mesaĝoj (lauta)",
+    "All Rooms": "Ĉiuj babilejoj",
+    "Cancel": "Nuligu",
+    "Create new room": "Kreu novan babilejon",
+    "delete the alias.": "Forviŝu la alinomon.",
+    "Describe your problem here.": "Priskribu vian problemon ĉi-tie.",
+    "Direct Chat": "Rekta babilejo",
+    "Directory": "Dosierujo",
+    "Dismiss": "Eksigu",
+    "Download this file": "Elŝutu ĉi-tiun dosieron",
+    "#example": "#ekzemplo",
+    "Files": "Dosieroj",
+    "Forget": "Forgesu",
+    " from room": " el babilejo",
+    "Guests can join": "Gastoj povas aliĝi",
+    "Guest users can't invite users. Please register to invite.": "Gasta uzantoj ne povas inviti uzantojn. Bonvolu registri por inviti.",
+    "I understand the risks and wish to continue": "Mi komprenas la riskoj kaj volas daŭrigi",
+    "Invite to this room": "Invitu al ĉi-tiun babilejon",
+    "Keywords": "Ŝlosilvortoj",
+    "Leave": "Lasu",
+    "Low Priority": "Malalta prioritato",
+    "Messages containing my display name": "Mesaĝoj enhavantaj mia ekrano nomo",
+    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortoj</span>",
+    "Messages containing my user name": "Mesaĝoj enhavantaj mia uzantnomo",
+    "Messages in group chats": "Mesaĝoj en grupaj babilejoj",
+    "Mute": "Silentigu",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bonvolu priskribi la cimon. Kion vi faris? Kion vi atendis okazi? Kion fakte okazis?",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Bonvolu instali <a href=\"https://www.google.com/chrome\">\"Chrome\"</a> aŭ <a href=\"https://getfirefox.com\">\"Firefox\"</a> por la plej bona sperto.",
+    "Please Register": "Bonvolu registri",
+    "powered by Matrix": "funkciigata de \"Matrix\"",
+    "Quote": "Citu",
+    "Reject": "Malakceptu",
+    "Resend": "Resendu",
+    "Room directory": "Babilejo dosierujo",
+    "Room not found": "Babilejon ne trovis",
+    "Search": "Serĉu",
+    "Search…": "Serĉu…",
+    "Search for a room": "Serĉu por babilejon",
+    "Send": "Sendu",
+    "Start chat": "Komencu babilo",
+    "This Room": "Ĉi-tiu Babilejo"
+}

From 23c6ccc53652873b3e440a87ce43dc571bedfe76 Mon Sep 17 00:00:00 2001
From: AmandineLP <amandine@matrix.org>
Date: Tue, 13 Jun 2017 23:10:54 +0000
Subject: [PATCH 065/172] Translated using Weblate (French)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index fa23cb5446..88708d0bd3 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -165,22 +165,22 @@
     "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
     "You have successfully set a password!": "Vous avez paramétré un mot de passe avec succès !",
     "Continue": "Continuer",
-    "Please set a password!": "Veuillez paramétrer un mot de passe !",
+    "Please set a password!": "Veuillez définir un mot de passe !",
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
     "Welcome to Riot.im": "Bienvenue sur Riot.im",
     " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))",
     "Login": "S'identifier",
-    "Chat with Riot Bot": "Discussion avec le Robot Riot",
+    "Chat with Riot Bot": "Discussion avec Riot Bot",
     "Search the room directory": "Rechercher dans le répertoire de salon",
-    "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces du Robot Riot !",
+    "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces de Riot Bot !",
     "Riot/Android &amp; matrix-android-sdk chat": "Discussions Riot/Android &amp; matrix-android-sd",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Discussions Riot/iOS &amp; matrix-ios-sdk",
     "General discussion about Matrix and Riot": "Discussion générale sur Matrix et Riot",
     "Riot/Web &amp; Desktop chat": "Discussions Riot/Web &amp; Desktop",
-    "Running Matrix services": "Exécution de services Matrix",
+    "Running Matrix services": "Execution de services Matrix",
     "Admin support for Dendrite": "Support admin pour Dendrite",
-    "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapses",
+    "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapse",
     "Matrix technical discussions": "Discussions techniques sur Matrix",
     "Community-run support for Synapse": "Support communautaire sur Synape",
     "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc",

From cd8dc5f178fd9d4d5adf16c0eac6eb0421474ca4 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Wed, 14 Jun 2017 09:30:08 +0100
Subject: [PATCH 066/172] Ask for email address after setting password for the
 first time

This is so that the user can reset their password.
---
 .../views/dialogs/SetPasswordDialog.js        | 73 ++++++++++++-------
 src/skins/vector/css/_components.scss         |  1 +
 .../views/dialogs/_SetEmailDialog.scss        | 36 +++++++++
 3 files changed, 83 insertions(+), 27 deletions(-)
 create mode 100644 src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss

diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 47e13a1782..3e34d8b4b1 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -17,7 +17,42 @@ limitations under the License.
 import React from 'react';
 import sdk from 'matrix-react-sdk';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import Modal from 'matrix-react-sdk/lib/Modal';
 
+const WarmFuzzy = function(props) {
+    const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+    let title = _t('You have successfully set a password!');
+    if (props.didSetEmail) {
+        title = _t('You have successfully set a password and an email address!');
+    }
+    const advice = _t('You can now return to your account after signing out, and sign in on other devices.');
+    let extraAdvice = null;
+    if (!props.didSetEmail) {
+        extraAdvice = _t('Remember, you can always set an email address in user settings if you change your mind.');
+    }
+
+    return <BaseDialog className="mx_SetPasswordDialog"
+        onFinished={props.onFinished}
+        title={ title }
+    >
+        <div className="mx_Dialog_content">
+            <p>
+                { advice }
+            </p>
+            <p>
+                { extraAdvice }
+            </p>
+        </div>
+        <div className="mx_Dialog_buttons">
+            <button
+                className="mx_Dialog_primary"
+                autoFocus={true}
+                onClick={props.onFinished}>
+                    { _t('Continue') }
+            </button>
+        </div>
+    </BaseDialog>;
+};
 
 /**
  * Prompt the user to set a password
@@ -33,13 +68,19 @@ export default React.createClass({
     getInitialState: function() {
         return {
             error: null,
-            success: false,
         };
     },
 
-    _onPasswordChanged: function() {
-        this.setState({
-            success: true,
+    componentWillMount: function() {
+        console.info('SetPasswordDialog component will mount');
+    },
+
+    _onPasswordChanged: function(res) {
+        Modal.createDialog(WarmFuzzy, {
+            didSetEmail: res.didSetEmail,
+            onFinished: () => {
+                this._onContinueClicked();
+            },
         });
     },
 
@@ -66,29 +107,6 @@ export default React.createClass({
         const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
         const ChangePassword = sdk.getComponent('views.settings.ChangePassword');
 
-        if (this.state.success) {
-            return (
-                <BaseDialog className="mx_SetPasswordDialog"
-                    onFinished={this.props.onFinished}
-                    title={ _t('You have successfully set a password!') }
-                >
-                    <div className="mx_Dialog_content">
-                        <p>
-                            { _t('You can now return to your account after signing out, and sign in on other devices.') }
-                        </p>
-                    </div>
-                    <div className="mx_Dialog_buttons">
-                        <button
-                            className="mx_Dialog_primary"
-                            autoFocus={true}
-                            onClick={this._onContinueClicked}>
-                                { _t('Continue') }
-                        </button>
-                    </div>
-                </BaseDialog>
-            );
-        }
-
         return (
             <BaseDialog className="mx_SetPasswordDialog"
                 onFinished={this.props.onFinished}
@@ -106,6 +124,7 @@ export default React.createClass({
                         buttonClassName="mx_Dialog_primary mx_SetPasswordDialog_change_password_button"
                         confirm={false}
                         autoFocusNewPasswordInput={true}
+                        shouldAskForEmail={true}
                         onError={this._onPasswordChangeError}
                         onFinished={this._onPasswordChanged} />
                     <div className="error">
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 4637530b56..4c4d7cc2a6 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -71,6 +71,7 @@
 @import "./vector-web/views/context_menus/_MessageContextMenu.scss";
 @import "./vector-web/views/context_menus/_RoomTileContextMenu.scss";
 @import "./vector-web/views/dialogs/_ChangelogDialog.scss";
+@import "./vector-web/views/dialogs/_SetEmailDialog.scss";
 @import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
 @import "./vector-web/views/directory/_NetworkDropdown.scss";
 @import "./vector-web/views/elements/_ImageView.scss";
diff --git a/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss b/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss
new file mode 100644
index 0000000000..588f10c9cb
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/dialogs/_SetEmailDialog.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_SetEmailDialog_email_input {
+    border-radius: 3px;
+    border: 1px solid $input-border-color;
+    padding: 9px;
+    color: $input-fg-color;
+    background-color: $primary-bg-color;
+    font-size: 15px;
+    width: 100%;
+    max-width: 280px;
+    margin-bottom: 10px;
+}
+
+.mx_SetEmailDialog_email_input:focus {
+    outline: none;
+    box-shadow: none;
+    border: 1px solid $accent-color;
+}
+
+.mx_SetEmailDialog_email_input_placeholder {
+}

From 58a323b391725938dbaea0128557677807d9ae8c Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 13 Jun 2017 18:31:35 +0100
Subject: [PATCH 067/172] i18n for setting email after password flow

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index cb50de9556..bdf0c08222 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -196,5 +196,7 @@
   "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
   "Continue": "Continue",
   "Please set a password!": "Please set a password!",
-  "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices."
+  "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+  "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
+  "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind."
 }

From 452e35caa1393007c5cf34e04c1cf304fcdaacd7 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <contact@brendanabolivier.com>
Date: Wed, 14 Jun 2017 09:20:17 +0000
Subject: [PATCH 068/172] Translated using Weblate (French)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 88708d0bd3..f1f2c33a6c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -85,7 +85,7 @@
     "more": "plus",
     "Mute": "Couper le son",
     "No rooms to show": "Aucun salon à afficher",
-    "Noisy": "Sonore",
+    "Noisy": "Activer le son",
     "Notification targets": "Appareils recevant les notifications",
     "Notifications": "Notifications",
     "Notifications on the following keywords follow rules which can’t be displayed here": "Les mots-clés suivants suivent des règles de notification qui ne peuvent être affichées ici",
@@ -159,7 +159,7 @@
     "What's New": "Nouveautés",
     "What's new?": "Nouveautés ?",
     "Waiting for response from server": "En attente d’une réponse du serveur",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. <a>Enregistrez vous</a> ou <a>identifiez vous</a> pour accéder à plus de salons et de fonctionnalités !",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. <a>Enregistrez-vous</a> ou <a>identifiez-vous</a> pour accéder à plus de salons et de fonctionnalités !",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",

From c3ef2f86d69c33c2408b02c964982984b372fe3c Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Wed, 14 Jun 2017 10:55:42 +0100
Subject: [PATCH 069/172] Merge pull request #4305 from
 RiotTranslateBot/weblate-riot-web-riot-web

Update from Weblate.
---
 src/i18n/strings/de_DE.json |  4 +++-
 src/i18n/strings/el.json    | 20 ++++++++--------
 src/i18n/strings/eo.json    | 46 ++++++++++++++++++++++++++++++++++++-
 src/i18n/strings/fr.json    | 33 ++++++++++++++++++--------
 4 files changed, 83 insertions(+), 20 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index dfd84ecbd8..3a08540910 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -205,5 +205,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.",
     "Dev chat for the Dendrite dev team": "Entwickler-Chat für das Dendrite-Entwickler-Team",
     "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot",
-    " (HTTP status %(httpStatus))": "(HTTP Status %(httpStatus))"
+    " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))",
+    "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Denk daran, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst."
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index c060f3bdb3..333a999760 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -21,7 +21,7 @@
     "Enable audible notifications in web client": "Ενεργοποίηση ηχητικών ειδοποιήσεων",
     "Enable email notifications": "Ενεργοποίηση ειδοποιήσεων μέσω μηνυμάτων ηλ. αλληλογραφίας",
     "Enable notifications for this account": "Ενεργοποίηση ειδοποιήσεων για τον λογαριασμό",
-    "Enter keywords separated by a comma:": "Πρόσθεσε λέξεις κλειδιά χωρισμένες με κόμμα:",
+    "Enter keywords separated by a comma:": "Προσθέστε λέξεις κλειδιά χωρισμένες με κόμμα:",
     "Error": "Σφάλμα",
     "#example": "#παράδειγμα",
     "Expand panel": "Μεγιστοποίηση καρτέλας",
@@ -86,7 +86,7 @@
     "Update": "Ενημέρωση",
     "Enable desktop notifications": "Ενεργοποίηση ειδοποιήσεων στην επιφάνεια εργασίας",
     "Error saving email notification preferences": "Σφάλμα κατά την αποθήκευση των προτιμήσεων",
-    "Failed to send report: ": "Απέτυχε η αποστολή της αναφοράς: ",
+    "Failed to send report: ": "Δεν ήταν δυνατή η αποστολή της αναφοράς: ",
     "Loading bug report module": "Φόρτωση μονάδας αναφοράς σφαλμάτων",
     "Mentions only": "Μόνο αναφορές",
     "Messages containing my display name": "Μηνύματα που περιέχουν το όνομα μου",
@@ -167,11 +167,11 @@
     "Get started with some tips from Riot Bot!": "Ξεκινήστε με μερικές συμβουλές από το Riot Bot!",
     "General discussion about Matrix and Riot": "Γενική συζήτηση σχετικά με Matrix και Riot",
     "Discussion of all things Matrix!": "Συζήτηση για όλα τα πράγματα του Matrix!",
-    "Riot/Web &amp; Desktop chat": "Συνομιλία για Riot/Web &amp; Desktop",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Συνομιλία για Riot/iOS &amp; matrix-ios-sdk",
-    "Riot/Android &amp; matrix-android-sdk chat": "Συνομιλία για Riot/Android &amp; matrix-android-sdk",
+    "Riot/Web &amp; Desktop chat": "Συζήτηση για το Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Συζήτηση για το Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Συζήτηση για το Riot/Android &amp; matrix-android-sdk",
     "Matrix technical discussions": "Τεχνικές συζητήσεις σχετικά με το Matrix",
-    "Running Matrix services": "Εκτέλεση υπηρεσιών Matrix",
+    "Running Matrix services": "Χρησιμοποιώντας τις υπηρεσίες του Matrix",
     "Community-run support for Synapse": "Κοινοτική υποστήριξη για το Synapse",
     "Admin support for Dendrite": "Υποστήριξη διαχειριστή για το Dendrite",
     "Announcements about Synapse releases": "Ανακοινώσεις σχετικά με τις εκδόσεις του Synapse",
@@ -183,8 +183,8 @@
     "Implementing VoIP services with Matrix": "Υλοποίηση υπηρεσίων VoIP με το Matrix",
     "Discussion of the Identity Service API": "Συζήτηση σχετικά με το Identity Service API",
     "Contributing code to Matrix and Riot": "Συνεισφορά κώδικα στο Matrix και Riot",
-    "Dev chat for the Riot/Web dev team": "Συνομιλία για την ομάδα ανάπτυξης του Riot/Web",
-    "Dev chat for the Dendrite dev team": "Συνομιλία για την ομάδα ανάπτυξης του Dendrite",
+    "Dev chat for the Riot/Web dev team": "Συζήτηση με την ομάδα ανάπτυξης του Riot/Web",
+    "Dev chat for the Dendrite dev team": "Συζήτηση με την ομάδα ανάπτυξης του Dendrite",
     "Co-ordination for Riot/Web translators": "Συντονισμός για μεταφραστές του Riot/Web",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Αρκετά δωμάτια υπάρχουν ήδη στο Matrix, συνδεδεμένα σε υπάρχοντα δίκτυα (Slack, IRC, Gitter κ.λπ) ή αυτόνομα. Ρίξτε μια ματιά στο ευρετήριο!",
     "Failed to change password. Is your password correct?": "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης. Είναι σωστός ο κωδικός πρόσβασης;",
@@ -196,5 +196,7 @@
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Προκειμένου να διαγνωστούν προβλήματα, τα αρχεία καταγραφής από αυτόν τον πελάτη θα σταλούν με αυτήν την αναφορά σφάλματος. Αν προτιμάτε να στείλετε μόνο το παραπάνω κείμενο, απενεργοποιήστε:",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Με τον τρέχον περιηγητή, η εμφάνιση και η αίσθηση της εφαρμογής ενδέχεται να είναι εντελώς εσφαλμένη και ορισμένες ή όλες οι λειτουργίες ενδέχεται να μην λειτουργούν. Εάν θέλετε να το δοκιμάσετε ούτως ή άλλως μπορείτε να συνεχίσετε, αλλά είστε μόνοι σας σε ό, τι αφορά τα προβλήματα που μπορεί να αντιμετωπίσετε!",
     "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
-    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix"
+    "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix",
+    "You have successfully set a password and an email address!": "Ο κωδικός πρόσβασης και η διεύθυνση ηλεκτρονικής αλληλογραφίας ορίστηκαν επιτυχώς!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Να θυμάστε ότι μπορείτε πάντα να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στις ρυθμίσεις χρήστη αν αλλάξετε γνώμη."
 }
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 9e26dfeeb6..49ccc6e60f 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -1 +1,45 @@
-{}
\ No newline at end of file
+{
+    "A new version of Riot is available.": "Nova versio de \"Riot\" haveblas.",
+    "All messages": "Ĉiuj mesaĝoj",
+    "All messages (loud)": "Ĉiuj mesaĝoj (lauta)",
+    "All Rooms": "Ĉiuj babilejoj",
+    "Cancel": "Nuligu",
+    "Create new room": "Kreu novan babilejon",
+    "delete the alias.": "Forviŝu la alinomon.",
+    "Describe your problem here.": "Priskribu vian problemon ĉi-tie.",
+    "Direct Chat": "Rekta babilejo",
+    "Directory": "Dosierujo",
+    "Dismiss": "Eksigu",
+    "Download this file": "Elŝutu ĉi-tiun dosieron",
+    "#example": "#ekzemplo",
+    "Files": "Dosieroj",
+    "Forget": "Forgesu",
+    " from room": " el babilejo",
+    "Guests can join": "Gastoj povas aliĝi",
+    "Guest users can't invite users. Please register to invite.": "Gasta uzantoj ne povas inviti uzantojn. Bonvolu registri por inviti.",
+    "I understand the risks and wish to continue": "Mi komprenas la riskoj kaj volas daŭrigi",
+    "Invite to this room": "Invitu al ĉi-tiun babilejon",
+    "Keywords": "Ŝlosilvortoj",
+    "Leave": "Lasu",
+    "Low Priority": "Malalta prioritato",
+    "Messages containing my display name": "Mesaĝoj enhavantaj mia ekrano nomo",
+    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortoj</span>",
+    "Messages containing my user name": "Mesaĝoj enhavantaj mia uzantnomo",
+    "Messages in group chats": "Mesaĝoj en grupaj babilejoj",
+    "Mute": "Silentigu",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bonvolu priskribi la cimon. Kion vi faris? Kion vi atendis okazi? Kion fakte okazis?",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Bonvolu instali <a href=\"https://www.google.com/chrome\">\"Chrome\"</a> aŭ <a href=\"https://getfirefox.com\">\"Firefox\"</a> por la plej bona sperto.",
+    "Please Register": "Bonvolu registri",
+    "powered by Matrix": "funkciigata de \"Matrix\"",
+    "Quote": "Citu",
+    "Reject": "Malakceptu",
+    "Resend": "Resendu",
+    "Room directory": "Babilejo dosierujo",
+    "Room not found": "Babilejon ne trovis",
+    "Search": "Serĉu",
+    "Search…": "Serĉu…",
+    "Search for a room": "Serĉu por babilejon",
+    "Send": "Sendu",
+    "Start chat": "Komencu babilo",
+    "This Room": "Ĉi-tiu Babilejo"
+}
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index c57a6d17d3..f1f2c33a6c 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -85,7 +85,7 @@
     "more": "plus",
     "Mute": "Couper le son",
     "No rooms to show": "Aucun salon à afficher",
-    "Noisy": "Sonore",
+    "Noisy": "Activer le son",
     "Notification targets": "Appareils recevant les notifications",
     "Notifications": "Notifications",
     "Notifications on the following keywords follow rules which can’t be displayed here": "Les mots-clés suivants suivent des règles de notification qui ne peuvent être affichées ici",
@@ -133,7 +133,7 @@
     "A new version of Riot is available.": "Une nouvelle version de Riot est disponible.",
     "All Rooms": "Tous les salons",
     "Cancel": "Annuler",
-    "Changelog": "Journal des modif.",
+    "Changelog": "Journal des modif",
     "Collecting app version information": "Récupération des info de version de l’application",
     "Collecting logs": "Récupération des traces",
     "Describe your problem here.": "Décrivez votre problème ici.",
@@ -159,30 +159,45 @@
     "What's New": "Nouveautés",
     "What's new?": "Nouveautés ?",
     "Waiting for response from server": "En attente d’une réponse du serveur",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. <a>Enregistrez vous</a> ou <a>identifiez vous</a> pour accéder à plus de salons et de fonctionnalités !",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. <a>Enregistrez-vous</a> ou <a>identifiez-vous</a> pour accéder à plus de salons et de fonctionnalités !",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
     "You have successfully set a password!": "Vous avez paramétré un mot de passe avec succès !",
     "Continue": "Continuer",
-    "Please set a password!": "Veuillez paramétrer un mot de passe !",
+    "Please set a password!": "Veuillez définir un mot de passe !",
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
     "Welcome to Riot.im": "Bienvenue sur Riot.im",
     " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))",
     "Login": "S'identifier",
-    "Chat with Riot Bot": "Discussion avec le Robot Riot",
+    "Chat with Riot Bot": "Discussion avec Riot Bot",
     "Search the room directory": "Rechercher dans le répertoire de salon",
-    "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces du Robot Riot !",
+    "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces de Riot Bot !",
     "Riot/Android &amp; matrix-android-sdk chat": "Discussions Riot/Android &amp; matrix-android-sd",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Discussions Riot/iOS &amp; matrix-ios-sdk",
     "General discussion about Matrix and Riot": "Discussion générale sur Matrix et Riot",
     "Riot/Web &amp; Desktop chat": "Discussions Riot/Web &amp; Desktop",
-    "Running Matrix services": "Exécution de services Matrix",
+    "Running Matrix services": "Execution de services Matrix",
     "Admin support for Dendrite": "Support admin pour Dendrite",
-    "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapses",
+    "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapse",
     "Matrix technical discussions": "Discussions techniques sur Matrix",
     "Community-run support for Synapse": "Support communautaire sur Synape",
     "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc",
-    "Building services on Matrix": ""
+    "Building services on Matrix": "Développement de services sur Matrix",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Discussion &amp; collaboration décentralisées et encryptées propulsé par [matrix]",
+    "Discussion of all things Matrix!": "Discussion de tous les sujets Matrix !",
+    "Support for those using the Matrix spec": "Support pour les utilisateurs de la spec Matrix",
+    "Design and implementation of E2E in Matrix": "Définition et implémentation de la crypto dans Matrix",
+    "Implementing VR services with Matrix": "Implémentation de de services de réalité virtuelle avec Matrix",
+    "Implementing VoIP services with Matrix": "Implémentation de de services de voix sur IP avec Matrix",
+    "Discussion of the Identity Service API": "Discussion sur l’API du Service Identité",
+    "Support for those using, running and writing other bridges": "Support pour les utilisateurs, administrateurs et développeurs de passerelles",
+    "Contributing code to Matrix and Riot": "Contribuer à Matrix et Riot",
+    "Dev chat for the Riot/Web dev team": "Forum pour les discussions sur les développements de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Forum pour les discussion sur les développements de Dendrite",
+    "Co-ordination for Riot/Web translators": "Coordination des traducteurs de Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Beaucoup de salons existent déjà dans Matrix, liés à des réseaux existants (Slsck, IRC, Gitter etc) ou indépendants. Jetez un oeil au répertoire !",
+    "You have successfully set a password and an email address!": "Vous avez configuré un mot de passe et une adresse e-mail avec succès !",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans la configuration utilisateur si vous changez d’avis."
 }

From f9795232e092e5509204f9b482c70f5c3cfe5f18 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 14 Jun 2017 11:19:43 +0100
Subject: [PATCH 070/172] react-sdk 0.9.4

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

diff --git a/package.json b/package.json
index 51c366b1e6..429737faf4 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
     "matrix-js-sdk": "0.7.11",
-    "matrix-react-sdk": "0.9.3",
+    "matrix-react-sdk": "0.9.4",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From 9325eef650a6483c906c3093d45dfce3bfc5a8de Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 14 Jun 2017 11:20:05 +0100
Subject: [PATCH 071/172] v0.11.1

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

diff --git a/electron_app/package.json b/electron_app/package.json
index 0e08efd5c7..35ea86a116 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 90cff5d7bf69883afd66c5cbb95ced13b960dd00 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 14 Jun 2017 11:21:27 +0100
Subject: [PATCH 072/172] Prepare changelog for v0.11.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28b978c544..d8a39fd688 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+Changes in [0.11.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.1) (2017-06-14)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0...v0.11.1)
+
+ * Update to react-sdk 0.9.4 to prompt to set an
+   email address when setting a password and make
+   DM guessing smarter.
+
 Changes in [0.11.0](https://github.com/vector-im/riot-web/releases/tag/v0.11.0) (2017-06-12)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0-rc.2...v0.11.0)

From 4edd21ba8ae75369573c53769c032f529f9417ad Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 14 Jun 2017 11:21:27 +0100
Subject: [PATCH 073/172] v0.11.1

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

diff --git a/package.json b/package.json
index 429737faf4..ec4b827d38 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From c01df23040a1e388ac029b21b083ddaf88dd3808 Mon Sep 17 00:00:00 2001
From: GrigRUSS <grigruss@ya.ru>
Date: Wed, 14 Jun 2017 10:43:54 +0000
Subject: [PATCH 074/172] Translated using Weblate (Russian)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 b9dcf10d56..49bb935d54 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -203,5 +203,7 @@
     "Dev chat for the Riot/Web dev team": "Dev chat для группы разработчиков Riot/Web",
     "Dev chat for the Dendrite dev team": "Dev chat для группы разработчиков Dendrite",
     "Co-ordination for Riot/Web translators": "Координирование для переводчиков Riot / Web",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит Вам вернуться в свою учетную запись после выхода, и войти в систему на других устройствах."
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит Вам вернуться в свою учетную запись после выхода, и войти в систему на других устройствах.",
+    "You have successfully set a password and an email address!": "Пароль и адрес электронной почты успешно сохранены!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Помните, Вы всегда можете указать адрес электронной почты в пользовательских настройках, если передумаете."
 }

From 59da9043537418956bdbe6879bdf1137722f52a9 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <github@rvanderhoff.org.uk>
Date: Wed, 14 Jun 2017 16:59:00 +0100
Subject: [PATCH 075/172] Check that we don't register a guest account on
 /#/login (#4306)

If you go straight to a /#/login link, we shoudn't go registering guest
accounts or reanimating the saved creds.
---
 test/app-tests/loading.js | 53 ++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 3f98b4f11b..0248986b2c 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -237,6 +237,36 @@ describe('loading:', function () {
                 expect(localStorage.getItem('mx_is_url')).toEqual(DEFAULT_IS_URL);
             }).done(done, done);
         });
+
+        it('should not register as a guest when using a #/login link', function() {
+            loadApp({
+                uriFragment: "#/login",
+            });
+
+            return q.delay(100).then(() => {
+                // we expect a single <Login> component
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.login.Login'));
+
+                // the only outstanding request should be a GET /login
+                // (in particular there should be no /register request for
+                // guest registration).
+                for (const req of httpBackend.requests) {
+                    if (req.method === 'GET' && req.path.endsWith('/_matrix/client/r0/login')) {
+                        continue;
+                    }
+
+                    throw new Error(`Unexpected HTTP request to ${req}`);
+                }
+                return completeLogin(matrixChat);
+            }).then(() => {
+
+                // once the sync completes, we should have a room view
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.HomePage'));
+                expect(windowLocation.hash).toEqual("#/home");
+            });
+        });
     });
 
     describe("MatrixClient rehydrated from stored credentials:", function() {
@@ -308,28 +338,33 @@ describe('loading:', function () {
 
         describe('/#/login link:', function() {
             beforeEach(function() {
-                httpBackend.when('GET', '/pushrules').respond(200, {});
-                httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
-
                 loadApp({
                     uriFragment: "#/login",
                 });
-
-                return expectAndAwaitSync().then(() => {
-                    return q.delay(1);
-                });
             });
 
             it('shows a login view', function() {
                 // we expect a single <Login> component
-                const login = ReactTestUtils.findRenderedComponentWithType(
+                ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.login.Login')
                 );
+
+                // the only outstanding request should be a GET /login
+                // (in particular there should be no /register request for
+                // guest registration, nor /sync, etc).
+                for (const req of httpBackend.requests) {
+                    if (req.method === 'GET' && req.path.endsWith('/_matrix/client/r0/login')) {
+                        continue;
+                    }
+
+                    throw new Error(`Unexpected HTTP request to ${req}`);
+                }
             });
 
             it('shows the homepage after login', function() {
                 return completeLogin(matrixChat).then(() => {
-                    // we should see a home page if we previously had no room
+                    // we should see a home page, even though we previously had
+                    // a stored mx_last_room_id
                     ReactTestUtils.findRenderedComponentWithType(
                         matrixChat, sdk.getComponent('structures.HomePage'));
                     expect(windowLocation.hash).toEqual("#/home");

From 27d5704978ae0b4e30b571fc73c637c5757ec5ac Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 14 Jun 2017 16:06:39 +0100
Subject: [PATCH 076/172] Improve logging in mock-request

Try to make it a bit more obvious what's been going on in mock-request: add
timestamps to lines, and an identifier so that where we have two flushes in
parallel, we can see what's what.
---
 test/mock-request.js | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/test/mock-request.js b/test/mock-request.js
index 0ebabb038c..c58301100a 100644
--- a/test/mock-request.js
+++ b/test/mock-request.js
@@ -13,7 +13,7 @@ function HttpBackend() {
     // the request function dependency that the SDK needs.
     this.requestFn = function(opts, callback) {
         const req = new Request(opts, callback);
-        console.log("HTTP backend received request: " + req);
+        console.log(`${Date.now()} HTTP backend received request: ${req}`);
         self.requests.push(req);
 
         const abort = function() {
@@ -50,45 +50,42 @@ HttpBackend.prototype = {
         if (waitTime === undefined) {
             waitTime = 5;
         }
-        console.log(
-            "HTTP backend flushing... (path=" + path
+
+        function log(msg) {
+            console.log(`${Date.now()} flush[${path || ''}]: ${msg}`);
+        }
+
+        log("HTTP backend flushing... (path=" + path
             + " numToFlush=" + numToFlush
             + " waitTime=" + waitTime
             + ")",
         );
         const tryFlush = function() {
             // if there's more real requests and more expected requests, flush 'em.
-            console.log(
-                "  trying to flush queue => reqs=[" + self.requests
-                + "] expected=[" + self.expectedRequests
-                + "]",
+            log(`  trying to flush => reqs=[${self.requests}] ` +
+                `expected=[${self.expectedRequests}]`,
             );
             if (self._takeFromQueue(path)) {
                 // try again on the next tick.
                 flushed += 1;
                 if (numToFlush && flushed === numToFlush) {
-                    console.log("  Flushed assigned amount:", numToFlush);
+                    log(`Flushed assigned amount: ${numToFlush}`);
                     defer.resolve(flushed);
                 } else {
-                    console.log("  flushed. Trying for more.");
+                    log(`  flushed. Trying for more.`);
                     setTimeout(tryFlush, 0);
                 }
             } else if (flushed === 0 && !triedWaiting) {
                 // we may not have made the request yet, wait a generous amount of
                 // time before giving up.
-                console.log(
-                    "  nothing to flush yet; waiting " + waitTime +
-                    "ms for requests.")
+                log(`  nothing to flush yet; waiting for requests.`);
                 setTimeout(tryFlush, waitTime);
                 triedWaiting = true;
             } else {
                 if (flushed === 0) {
-                    console.log("  nothing to flush; giving up");
+                    log("nothing to flush; giving up");
                 } else {
-                    console.log(
-                        "  no more flushes after flushing", flushed,
-                        "requests",
-                    );
+                    log(`no more flushes after flushing ${flushed} requests`);
                 }
                 defer.resolve(flushed);
             }
@@ -138,7 +135,7 @@ HttpBackend.prototype = {
                     matchingReq.checks[j](req);
                 }
                 testResponse = matchingReq.response;
-                console.log("    responding to %s", matchingReq.path);
+                console.log(`${Date.now()}    responding to ${matchingReq.path}`);
                 let body = testResponse.body;
                 if (Object.prototype.toString.call(body) == "[object Function]") {
                     body = body(req.path, req.data);

From 5ff59b0c2342ddeed944cbe5dcca697190f9a2e7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 14 Jun 2017 17:08:49 +0100
Subject: [PATCH 077/172] Tests: delete indexeddbs after running

---
 test/app-tests/loading.js | 11 +++++++++--
 test/test-utils.js        | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 0248986b2c..0132be3ce0 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -30,7 +30,7 @@ import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
 
-import test_utils from '../test-utils';
+import * as test_utils from '../test-utils';
 import MockHttpBackend from '../mock-request';
 import {parseQs, parseQsFromFragment} from '../../src/vector/url_utils';
 
@@ -68,12 +68,19 @@ describe('loading:', function () {
         });
     });
 
-    afterEach(function() {
+    afterEach(async function() {
         if (parentDiv) {
             ReactDOM.unmountComponentAtNode(parentDiv);
             parentDiv.remove();
             parentDiv = null;
         }
+
+        // unmounting should have cleared the MatrixClientPeg
+        expect(MatrixClientPeg.get()).toBe(null);
+
+        // clear the indexeddbs so we can start from a clean slate next time.
+        await test_utils.deleteIndexedDB('matrix-js-sdk:crypto');
+        await test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync');
     });
 
     /* simulate the load process done by index.js
diff --git a/test/test-utils.js b/test/test-utils.js
index 53528e5ceb..a1c1cd0ad5 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -7,7 +7,7 @@ var q = require('q');
  * name to stdout.
  * @param {Mocha.Context} context  The test context
  */
-module.exports.beforeEach = function(context) {
+export function beforeEach(context) {
     var desc = context.currentTest.fullTitle();
     console.log();
     console.log(desc);
@@ -16,13 +16,40 @@ module.exports.beforeEach = function(context) {
     // some tests store things in localstorage. Improve independence of tests
     // by making sure that they don't inherit any old state.
     window.localStorage.clear();
-};
+}
 
 /**
  * returns true if the current environment supports webrtc
  */
-module.exports.browserSupportsWebRTC = function() {
+export function browserSupportsWebRTC() {
     var n = global.window.navigator;
     return n.getUserMedia || n.webkitGetUserMedia ||
         n.mozGetUserMedia;
-};
+}
+
+export function deleteIndexedDB(dbName) {
+    return new q.Promise((resolve, reject) => {
+        if (!window.indexedDB) {
+            resolve();
+            return;
+        }
+
+        console.log(`Removing indexeddb instance: ${dbName}`);
+        const req = window.indexedDB.deleteDatabase(dbName);
+
+        req.onblocked = () => {
+            console.log(`can't yet delete indexeddb because it is open elsewhere`);
+        };
+
+        req.onerror = (ev) => {
+            reject(new Error(
+                "unable to delete indexeddb: " + ev.target.error,
+            ));
+        };
+
+        req.onsuccess = () => {
+            console.log(`Removed indexeddb instance: ${dbName}`);
+            resolve();
+        };
+    });
+}

From 4ca009b9f7e8cd09e36362d4b8defc417b24d89c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 14 Jun 2017 18:00:02 +0100
Subject: [PATCH 078/172] Remove onload simulator from loading test

This used to exist to reproduce the functionality in the window.onload handler
in vector/index.js -- which got removed in 31915db. Having it here is confusing
at best.
---
 test/app-tests/loading.js | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 0132be3ce0..80fcc0202b 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -99,21 +99,14 @@ describe('loading:', function () {
             toString: function() { return this.search + this.hash; },
         };
 
-        let lastLoadedScreen = null;
-        let appLoaded = false;
-
         let loadCompleteDefer = q.defer();
         loadCompletePromise = loadCompleteDefer.promise;
 
         function onNewScreen(screen) {
             console.log(Date.now() + " newscreen "+screen);
-            if (!appLoaded) {
-                lastLoadedScreen = screen;
-            } else {
-                var hash = '#/' + screen;
-                windowLocation.hash = hash;
-                console.log(Date.now() + " browser URI now "+ windowLocation);
-            }
+            var hash = '#/' + screen;
+            windowLocation.hash = hash;
+            console.log(Date.now() + " browser URI now "+ windowLocation);
         }
 
         // Parse the given window.location and return parameters that can be used when calling
@@ -126,13 +119,6 @@ describe('loading:', function () {
             }
         }
 
-        function routeUrl(location, matrixChat) {
-            console.log(Date.now() + ` routing URL '${location}'`);
-            const s = getScreenFromLocation(location);
-            console.log("Showing screen ", s);
-            matrixChat.showScreen(s.screen, s.params);
-        }
-
         const MatrixChat = sdk.getComponent('structures.MatrixChat');
         const fragParts = parseQsFromFragment(windowLocation);
         var params = parseQs(windowLocation);
@@ -151,17 +137,6 @@ describe('loading:', function () {
                 makeRegistrationUrl={() => {throw new Error('Not implemented');}}
             />, parentDiv
         );
-
-        // pause for a cycle, then simulate the window.onload handler
-        window.setTimeout(() => {
-            console.log(Date.now() + " simulating window.onload");
-            routeUrl(windowLocation, matrixChat);
-            appLoaded = true;
-            if (lastLoadedScreen) {
-                onNewScreen(lastLoadedScreen);
-                lastLoadedScreen = null;
-            }
-        }, 0);
     }
 
     // set an expectation that we will get a call to /sync, then flush

From 181ef8ab7e7c342bbbaf31ac3dfd6f0438748b3a Mon Sep 17 00:00:00 2001
From: Olivier Nyssen <nyssen@yahoo.com>
Date: Wed, 14 Jun 2017 21:29:40 +0000
Subject: [PATCH 079/172] Added translation using Weblate (Indonesian)

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

diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/id.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 9649f279a3f82f3aedaad68c5ba1f9ef4d86d7fd Mon Sep 17 00:00:00 2001
From: Olivier Nyssen <nyssen@yahoo.com>
Date: Wed, 14 Jun 2017 21:30:07 +0000
Subject: [PATCH 080/172] Added translation using Weblate (Hindi)

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

diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/hi.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 6f2eee1f03ce44a5f6bfb35290d74f28c7ad818c Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 14 Jun 2017 16:07:40 +0100
Subject: [PATCH 081/172] Attempts to deflakify the joining test

Treat the waitTime passed into `flush` as a timeout rather than a
time-between-loops, so that we can pass in bigger times and not slow the tests
down too much.

Bump the timeout when waiting for /publicRooms and /initialSync in the joining
test.
---
 test/app-tests/joining.js | 10 ++++++----
 test/mock-request.js      | 10 +++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index e835ebb9cb..0aeb081a5e 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -68,7 +68,7 @@ describe('joining a room', function () {
             }
         });
 
-        it('should not get stuck at a spinner', function(done) {
+        it('should not get stuck at a spinner', function() {
             var ROOM_ALIAS = '#alias:localhost';
             var ROOM_ID = '!id:localhost';
 
@@ -140,12 +140,14 @@ describe('joining a room', function () {
                     .respond(401, {errcode: 'M_GUEST_ACCESS_FORBIDDEN'});
 
                 return q.all([
-                    httpBackend.flush('/directory/room/'+encodeURIComponent(ROOM_ALIAS)),
-                    httpBackend.flush('/rooms/'+encodeURIComponent(ROOM_ID)+"/initialSync"),
+                    httpBackend.flush('/directory/room/'+encodeURIComponent(ROOM_ALIAS), 1, 200),
+                    httpBackend.flush('/rooms/'+encodeURIComponent(ROOM_ID)+"/initialSync", 1, 200),
                 ]);
             }).then(() => {
                 httpBackend.verifyNoOutstandingExpectation();
 
+                return q.delay(1);
+            }).then(() => {
                 // we should now have a roomview, with a preview bar
                 roomView = ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, RoomView);
@@ -208,7 +210,7 @@ describe('joining a room', function () {
             }).then(() => {
                 // now the room should have loaded
                 expect(roomView.state.room).toExist();
-            }).done(done, done);
+            });
         });
     });
 });
diff --git a/test/mock-request.js b/test/mock-request.js
index c58301100a..46d165824d 100644
--- a/test/mock-request.js
+++ b/test/mock-request.js
@@ -46,9 +46,8 @@ HttpBackend.prototype = {
         const defer = q.defer();
         const self = this;
         let flushed = 0;
-        let triedWaiting = false;
         if (waitTime === undefined) {
-            waitTime = 5;
+            waitTime = 10;
         }
 
         function log(msg) {
@@ -60,6 +59,8 @@ HttpBackend.prototype = {
             + " waitTime=" + waitTime
             + ")",
         );
+        const endTime =  waitTime + Date.now();
+
         const tryFlush = function() {
             // if there's more real requests and more expected requests, flush 'em.
             log(`  trying to flush => reqs=[${self.requests}] ` +
@@ -75,12 +76,11 @@ HttpBackend.prototype = {
                     log(`  flushed. Trying for more.`);
                     setTimeout(tryFlush, 0);
                 }
-            } else if (flushed === 0 && !triedWaiting) {
+            } else if (flushed === 0 && Date.now() < endTime) {
                 // we may not have made the request yet, wait a generous amount of
                 // time before giving up.
                 log(`  nothing to flush yet; waiting for requests.`);
-                setTimeout(tryFlush, waitTime);
-                triedWaiting = true;
+                setTimeout(tryFlush, 5);
             } else {
                 if (flushed === 0) {
                     log("nothing to flush; giving up");

From 98e694646c7fa983ebeb87e94cf4b741cc342f03 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 15 Jun 2017 02:17:24 +0100
Subject: [PATCH 082/172] Add a test for the login flow when there is a
 teamserver

- just to check it keeps working.
---
 test/app-tests/loading.js | 45 +++++++++++++++++++++++++++++++++++----
 test/mock-request.js      | 27 +++++++++++++++++++++++
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 0132be3ce0..a507fb9683 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -135,14 +135,17 @@ describe('loading:', function () {
 
         const MatrixChat = sdk.getComponent('structures.MatrixChat');
         const fragParts = parseQsFromFragment(windowLocation);
+
+        const config = Object.assign({
+            default_hs_url: DEFAULT_HS_URL,
+            default_is_url: DEFAULT_IS_URL,
+        }, opts.config || {});
+
         var params = parseQs(windowLocation);
         matrixChat = ReactDOM.render(
             <MatrixChat
                 onNewScreen={onNewScreen}
-                config={{
-                    default_hs_url: DEFAULT_HS_URL,
-                    default_is_url: DEFAULT_IS_URL,
-                }}
+                config={config}
                 realQueryParams={params}
                 startingFragmentQueryParams={fragParts.params}
                 enableGuest={true}
@@ -343,6 +346,40 @@ describe('loading:', function () {
             }).done(done, done);
         });
 
+        it("registers correctly with a Riot Team Server", function() {
+            sdk.setFetch(httpBackend.fetchFn); // XXX: ought to restore this!
+
+            httpBackend.when('GET', '/pushrules').respond(200, {});
+            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
+
+            loadApp({
+                config: {
+                    teamServerConfig: {
+                        teamServerURL: 'http://my_team_server',
+                    },
+                },
+            });
+
+            return q.delay(1).then(() => {
+                // we expect a loading spinner while we log into the RTS
+                assertAtLoadingSpinner(matrixChat);
+
+                httpBackend.when('GET', 'my_team_server/login').respond(200, {
+                    team_token: 'nom',
+                });
+                return httpBackend.flush();
+            }).then(() => {
+                return awaitSyncingSpinner(matrixChat)
+            }).then(() => {
+                // we got a sync spinner - let the sync complete
+                return expectAndAwaitSync();
+            }).then(() => {
+                // once the sync completes, we should have a home page
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.HomePage'));
+            });
+        });
+
         describe('/#/login link:', function() {
             beforeEach(function() {
                 loadApp({
diff --git a/test/mock-request.js b/test/mock-request.js
index 0ebabb038c..cddeb1aeee 100644
--- a/test/mock-request.js
+++ b/test/mock-request.js
@@ -30,6 +30,33 @@ function HttpBackend() {
             abort: abort,
         };
     };
+
+    // very simplistic mapping from the whatwg fetch interface onto the request
+    // interface, so we can use the same mock backend for both.
+    this.fetchFn = function(input, init) {
+        init = init || {};
+        const requestOpts = {
+            uri: input,
+            method: init.method || 'GET',
+            body: init.body,
+        };
+
+        return new Promise((resolve, reject) => {
+            function callback(err, response, body) {
+                if (err) {
+                    reject(err);
+                }
+                resolve({
+                    ok: response.statusCode >= 200 && response.statusCode < 300,
+                    json: () => body,
+                });
+            };
+
+            const req = new Request(requestOpts, callback);
+            console.log(`HTTP backend received request: ${req}`);
+            self.requests.push(req);
+        });
+    };
 }
 HttpBackend.prototype = {
     /**

From 6709f922be8fea116d5f639a1722890f09586d6f Mon Sep 17 00:00:00 2001
From: Olivier Nyssen <nyssen@yahoo.com>
Date: Thu, 15 Jun 2017 04:10:16 +0000
Subject: [PATCH 083/172] Added translation using Weblate (Bengali
 (Bangladesh))

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

diff --git a/src/i18n/strings/bn_BD.json b/src/i18n/strings/bn_BD.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/bn_BD.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 59d67a483bada319379ba616c12819f5b0aa7ab2 Mon Sep 17 00:00:00 2001
From: Olivier Nyssen <nyssen@yahoo.com>
Date: Thu, 15 Jun 2017 08:57:35 +0000
Subject: [PATCH 084/172] Added translation using Weblate (Bengali (India))

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

diff --git a/src/i18n/strings/bn_IN.json b/src/i18n/strings/bn_IN.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/bn_IN.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 4f5f32d75c289944b44958f8b97c2475c8fee079 Mon Sep 17 00:00:00 2001
From: strixaluco <strixaluco@rocketmail.com>
Date: Wed, 14 Jun 2017 20:47:15 +0000
Subject: [PATCH 085/172] Translated using Weblate (Ukrainian)

Currently translated at 98.0% (196 of 200 strings)

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

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 9e26dfeeb6..8f4eee1475 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -1 +1,198 @@
-{}
\ No newline at end of file
+{
+    "A new version of Riot is available.": "Доступне оновлення для Riot.",
+    "All messages": "Усі повідомлення",
+    "All messages (loud)": "Усі повідомлення (гучно)",
+    "All Rooms": "Усі кімнати",
+    "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей на даний момент вимкнені.",
+    "An error occurred whilst saving your email notification preferences.": "Під час збереження налаштувань сповіщень е-поштою трапилася помилка.",
+    "Cancel": "Скасувати",
+    "Cancel Sending": "Скасувати надсилання",
+    "Can't update user notification settings": "Неможливо оновити налаштування користувацьких сповіщень",
+    "Changelog": "Журнал змін",
+    "Close": "Закрити",
+    "Collapse panel": "Згорнути панель",
+    "Collecting app version information": "Збір інформації про версію застосунка",
+    "Collecting logs": "Збір журналів",
+    "Create new room": "Створити нову кімнату",
+    "Couldn't find a matching Matrix room": "Неможливо знайти відповідну кімнату",
+    "Custom Server Options": "Нетипові параметри сервера",
+    "customServer_text": "Ви можете скористатись нетиповими параметрами сервера щоб увійти в інші сервери Matrix, зазначивши посилання на окремий Домашній сервер<br/>Це дозволяє вам використовувати Riot із вже існуючою обліковкою Matrix на іншому Домашньому сервері.<br/><br/>Ви також можете зазначити нетиповий сервер ідентифікації, але ви не матимете змоги ані запрошувати користувачів за е-поштою, ані бути запрошеними за е-поштою самі.",
+    "delete the alias.": "видалити псевдонім.",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s через %(browserName)s на %(osName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> та <a href=\"http://opera.com\">Opera</a> також підтримуються.",
+    "Add an email address above to configure email notifications": "Додайте вище адресу е-пошти щоб налаштувати сповіщення е-поштою",
+    "Advanced notification settings": "Додаткові налаштування сповіщень",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Видалити псевдонім %(alias)s та прибрати з каталогу %(name)s?",
+    "Describe your problem here.": "Опишіть вашу проблему тут.",
+    "Direct Chat": "Прямий чат",
+    "Directory": "Каталог",
+    "Dismiss": "Відхилити",
+    "Download this file": "Звантажити цей файл",
+    "Enable audible notifications in web client": "Увімкнути звукові сповіщення у мережевому застосунку",
+    "Enable desktop notifications": "Увімкнути сповіщення на стільниці",
+    "Enable email notifications": "Увімкнути сповіщення е-поштою",
+    "Enable notifications for this account": "Увімкнути сповіщення для цієї обліковки",
+    "Enable them now": "Увімкнути їх зараз",
+    "Enter keywords separated by a comma:": "Введіть ключові слова через кому:",
+    "Error": "Помилка",
+    "Error saving email notification preferences": "Помилка при збереженні параметрів сповіщень е-поштою",
+    "#example": "#зразок",
+    "Expand panel": "Розгорнути панель",
+    "Failed to": "Не вдалось",
+    "Failed to add tag %(tagName)s to room": "Не вдалось додати до кімнати мітку %(tagName)s",
+    "Failed to change settings": "Не вдалось змінити налаштування",
+    "Failed to forget room %(errCode)s": "Не вдалось забути кімнату %(errCode)s",
+    "Failed to update keywords": "Не вдалось оновити ключові слова",
+    "Failed to get protocol list from Home Server": "Не вдалось отримати перелік протоколів з Домашнього серверу",
+    "Failed to get public room list": "Не вдалось отримати перелік прилюдних кімнат",
+    "Failed to join the room": "Не вдалося приєднатись до кімнати",
+    "Failed to remove tag %(tagName)s from room": "Не вдалося прибрати з кімнати мітку %(tagName)s",
+    "Failed to send report: ": "Не вдалося надіслати звіт: ",
+    "Failed to set direct chat tag": "Не вдалося встановити мітку прямого чату",
+    "Favourite": "Вибране",
+    "Fetching third party location failed": "Не вдалось отримати стороннє місцеперебування",
+    "Files": "Файли",
+    "Filter room names": "Відфільтрувати назви кімнат",
+    "Forget": "Забути",
+    "Forward Message": "Переслати повідомлення",
+    " from room": " з кімнати",
+    "Guests can join": "Гості можуть приєднуватися",
+    "Guest users can't invite users. Please register to invite.": "Гості не можуть запрошувати користувачів. Зареєструйтесь, будь ласка, для видачі запрошень.",
+    "Hide panel": "Сховати панель",
+    " (HTTP status %(httpStatus))": "(статус HTTP %(httpStatus))",
+    "I understand the risks and wish to continue": "Я ознайомлений з ризиками і хочу продовжити",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "З метою діагностики проблем журнали з цього застосунку будуть надіслані разом зі звітом про вади. Якщо ви бажаєте надіслати лише вищенаведений текст, відозначте, будь ласка:",
+    "Invite to this room": "Запросити до цієї кімнати",
+    "Keywords": "Ключові слова",
+    "Leave": "Вийти",
+    "Login": "Зайти",
+    "Loading bug report module": "Завантаження модуля звітів про вади",
+    "Low Priority": "Неважливі",
+    "Members": "Члени",
+    "Mentions only": "Тільки згадки",
+    "Messages containing <span>keywords</span>": "Повідомлення, що містять <span>ключові слова</span>",
+    "Messages containing my user name": "Повідомлення, що містять моє ім'я користувача",
+    "Messages in group chats": "Повідомлення у групових чатах",
+    "Messages sent by bot": "Повідомлення, надіслані ботом",
+    "more": "докладніше",
+    "Mute": "Стишити",
+    "Notification targets": "Цілі сповіщень",
+    "Notifications": "Сповіщення",
+    "Notify for all other messages/rooms": "Сповіщати щодо всіх повідомлень/кімнат",
+    "Notify me for anything else": "Сповіщати мене про будь-що інше",
+    "Off": "Вимкнено",
+    "On": "Увімкнено",
+    "Operation failed": "Не вдалося виконати дію",
+    "Permalink": "Постійне посилання",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Опишіть, будь ласка, ваду. Що ви зробили? На що ви очікували? Що трапилось натомість?",
+    "Please describe the bug and/or send logs.": "Опишіть, будь ласка, ваду та/або надішліть журнали.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Для більшої зручності у використанні встановіть, будь ласка, <a href=\"https://www.google.com/chrome\">Chrome</a> або <a href=\"https://getfirefox.com\">Firefox</a>.",
+    "Please Register": "Зареєструйтеся, будь ласка",
+    "powered by Matrix": "працює на Matrix",
+    "Quote": "Цитувати",
+    "Redact": "Видалити",
+    "Reject": "Відмовитись",
+    "Remove %(name)s from the directory?": "Прибрати %(name)s з каталогу?",
+    "Remove": "Прибрати",
+    "remove %(name)s from the directory.": "прибрати %(name)s з каталогу.",
+    "Remove from Directory": "Прибрати з каталогу",
+    "Report a bug": "Звітувати про вади",
+    "Resend": "Перенадіслати",
+    "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s",
+    "Call invitation": "Запрошення до виклику",
+    "Drop here %(toAction)s": "Кидайте сюди %(toAction)s",
+    "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі",
+    "Riot is not supported on mobile web. Install the app?": "Riot не працює через оглядач на мобільних пристроях. Встановити застосунок?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot використовує багато новітніх функцій, деякі з яких не доступні або є експериментальними у вашому оглядачі.",
+    "Room directory": "Каталог кімнат",
+    "Room not found": "Кімнату не знайдено",
+    "Search": "Пошук",
+    "Search…": "Пошук…",
+    "Search for a room": "Пошук кімнати",
+    "Send": "Надіслати",
+    "Send logs": "Надіслати журнали",
+    "Settings": "Налаштування",
+    "Source URL": "Джерельне посилання",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Вибачте, ваш оглядач <b>не</b> спроможний запустити Riot.",
+    "Start chat": "Почати розмову",
+    "The Home Server may be too old to support third party networks": "Домашній сервер може бути застарим для підтримки сторонніх мереж",
+    "There are advanced notifications which are not shown here": "Є додаткові сповіщення, що не показуються тут",
+    "The server may be unavailable or overloaded": "Сервер може бути недосяжним або перевантаженим",
+    "This Room": "Ця кімната",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Ця кімната є недосяжною для гостей. Напевно ви матимете змогу приєднатись, якщо зареєструєтесь.",
+    " to room": " до кімнати",
+    "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення",
+    "Unable to join network": "Неможливо приєднатись до мережі",
+    "Unable to look up room ID from server": "Неможливо знайти ID кімнати на сервері",
+    "Unknown device": "Невідомий пристрій",
+    "unknown error code": "невідомий код помилки",
+    "Unnamed room": "Неназвана кімната",
+    "Update": "Оновити",
+    "Uploaded on %(date)s by %(user)s": "Завантажено %(date)s користувачем %(user)s",
+    "Uploading report": "Завантаження звіту",
+    "View Decrypted Source": "Переглянути розшифроване джерело",
+    "View Source": "Переглянути джерело",
+    "What's New": "Що нового",
+    "What's new?": "Що нового?",
+    "Waiting for response from server": "Очікується відповідь від сервера",
+    "When I'm invited to a room": "Коли мене запрошено до кімнати",
+    "World readable": "Відкрито для світу",
+    "You cannot delete this image. (%(code)s)": "Ви не можете видалити це зображення. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Ви не можете видалити це повідомлення. (%(code)s)",
+    "You are not receiving desktop notifications": "Ви не отримуєте сповіщення на стільниці",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Ви Riot'уєте як гість. <a>Зареєструйтеся</a> або <a>увійдіть</a> щоб мати ширший доступ до кімнат та функцій!",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Можливо, ви налаштували їх не у Riot, а у іншому застосунку. Ви не можете регулювати їх у Riot, але вони все ще мають силу",
+    "Sunday": "Неділя",
+    "Monday": "Понеділок",
+    "Tuesday": "Вівторок",
+    "Wednesday": "Середа",
+    "Thursday": "Четвер",
+    "Friday": "П'ятниця",
+    "Saturday": "Субота",
+    "Today": "Сьогодні",
+    "Yesterday": "Вчора",
+    "OK": "Гаразд",
+    "You need to be using HTTPS to place a screen-sharing call.": "Ви маєте використовувати HTTPS щоб зробити виклик із поширенням екрану.",
+    "Welcome page": "Ласкаво просимо",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "У вашому оглядачі вигляд застосунку може бути повністю іншим, а деякі або навіть усі функції можуть не працювати. Якщо ви наполягаєте, то можете продовжити користування, але ви маєте впоратись з усіма можливими проблемами власноруч!",
+    "Welcome to Riot.im": "Ласкаво просимо до Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентралізований, шифрований чат та засіб для співробітництва, що працює на [matrix]",
+    "Search the room directory": "Шукати у каталозі кімнат",
+    "Chat with Riot Bot": "Розмовляти з Riot-ботом",
+    "Get started with some tips from Riot Bot!": "Розпочніть за допомогою декількох підказок від Riot-боту!",
+    "General discussion about Matrix and Riot": "Загальне обговорення Matrix та Riot",
+    "Discussion of all things Matrix!": "Обговорення усіх деталей про Matrix!",
+    "Riot/Web &amp; Desktop chat": "Обговорення Riot для оглядачів та стільниці",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Обговорення Riot/iOS та matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Обговорення Riot/Android та matrix-android-sdk",
+    "Matrix technical discussions": "Технічні обговорення Matrix",
+    "Community-run support for Synapse": "Спільнота підтримки Synapse",
+    "Admin support for Dendrite": "Адміністрування Dendrite",
+    "Announcements about Synapse releases": "Оголошення випусків Synapse",
+    "Support for those using and running matrix-appservice-irc": "Підтримка користувачів matrix-appservice-irc",
+    "Building services on Matrix": "Створення служб на основі Matrix",
+    "Support for those using the Matrix spec": "Підтримка користувачів специфікацій Matrix",
+    "Design and implementation of E2E in Matrix": "Планування та впровадження E2E шифрування у Matrix",
+    "Implementing VR services with Matrix": "Впровадження служб віртуальної реальності в рамках Matrix",
+    "Implementing VoIP services with Matrix": "Впровадження служб VoIP через Matrix",
+    "Discussion of the Identity Service API": "Обговорення Identity Service API",
+    "Support for those using, running and writing other bridges": "Підтримка користувачів, адміністраторів та розробників інших Matrix-мостів",
+    "Contributing code to Matrix and Riot": "Тим, хто хоче долучитись до розробки Matrix та Riot",
+    "Dev chat for the Riot/Web dev team": "Чат команди розробників Riot/Web",
+    "Dev chat for the Dendrite dev team": "Чат команди розробників Dendrite",
+    "Co-ordination for Riot/Web translators": "Координація для перекладачів Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "У мережі Matrix вже існує багато кімнат, що з'єднані як з існуючими мережами (Slack, IRC, Gitter тощо), так і незалежними. Подивіться у каталозі кімнат!",
+    "Failed to change password. Is your password correct?": "Не вдалось змінити пароль. Ви впевнені, що пароль введено правильно?",
+    "You have successfully set a password!": "Пароль успішно встановлено!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Тепер ви можете повернутися до своєї обліковки після виходу з неї, та зайти з інших пристроїв.",
+    "Continue": "Продовжити",
+    "Please set a password!": "Встановіть пароль, будь ласка!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Це дозволить вам повернутися до своєї обліковки після виходу з неї, та заходити з інших пристроїв.",
+    "You have successfully set a password and an email address!": "Пароль та адресу е-пошти успішно встановлено!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Пам'ятайте, що ви завжди можете встановити адресу е-пошти у налаштуваннях, якщо передумаєте.",
+    "Messages in one-to-one chats": "Повідомлення у чатах \"сам на сам\"",
+    "No rooms to show": "Кімнати відсутні",
+    "Noisy": "Шумний",
+    "Unavailable": "Нема в наявності",
+    "Unhide Preview": "Відкрити попередній перегляд"
+}

From 8f3c0d6233d823c82c1466e89f4d5c290751dcde Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Thu, 15 Jun 2017 10:43:19 +0000
Subject: [PATCH 086/172] Added translation using Weblate (Korean)

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

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/ko.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 9de3c71a9be73e4dd4d613aa228041c43763ed34 Mon Sep 17 00:00:00 2001
From: Tom Tryfonidis <tomtryf@gnome.org>
Date: Thu, 15 Jun 2017 09:33:35 +0000
Subject: [PATCH 087/172] Translated using Weblate (Greek)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index 333a999760..f1dc8b8334 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -149,7 +149,7 @@
     "View Source": "Προβολή κώδικα",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά",
     "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο",
-    "Drop here %(toAction)s": "Απόθεση εδώ %(toAction)s",
+    "Drop here %(toAction)s": "Αποθέστε εδώ %(toAction)s",
     "Failed to": "Απέτυχε να",
     "Failed to get public room list": "Δεν ήταν δυνατή η λήψη της λίστας με τα δημόσια δωμάτια",
     "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1",

From 3b6c0e0f67c86b20e0ce8f40ef1c8d7e63e5582e Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Thu, 15 Jun 2017 13:48:00 +0000
Subject: [PATCH 088/172] Translated using Weblate (Korean)

Currently translated at 82.5% (165 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
---
 src/i18n/strings/ko.json | 168 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 167 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 9e26dfeeb6..3737a9058f 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -1 +1,167 @@
-{}
\ No newline at end of file
+{
+    "A new version of Riot is available.": "라이엇의 새 버전을 사용하실 수 있어요.",
+    "Add an email address above to configure email notifications": "이메일 알림을 설정하기 위해 이메일 주소를 추가해주세요",
+    "Advanced notification settings": "고급 알림 설정",
+    "All messages": "모든 메시지",
+    "All messages (loud)": "모든 메시지 (크게)",
+    "All Rooms": "모든 방",
+    "All notifications are currently disabled for all targets.": "현재 모든 알림이 모든 상대에게서 꺼졌어요.",
+    "An error occurred whilst saving your email notification preferences.": "이메일 알림을 설정하다가 오류가 일어났어요.",
+    "Call invitation": "전화가 왔어요",
+    "Cancel": "취소",
+    "Cancel Sending": "보내기 취소",
+    "Can't update user notification settings": "사용자 알림 설정을 갱신할 수 없어요",
+    "Changelog": "바뀐 점",
+    "Close": "닫기",
+    "Collapse panel": "패널 접기",
+    "Collecting app version information": "앱 버전 정보를 수집하는 중",
+    "Collecting logs": "로그 수집 중",
+    "Create new room": "새 방 만들기",
+    "Couldn't find a matching Matrix room": "일치하는 매트릭스 방을 찾을 수 없어요",
+    "Custom Server Options": "사용자 지정 서버 설정",
+    "delete the alias.": "별명을 삭제할게요.",
+    "Describe your problem here.": "여기에 일어난 문제를 적어주세요.",
+    "Direct Chat": "직접 얘기하기",
+    "Directory": "목록",
+    "Dismiss": "없애기",
+    "Download this file": "이 파일 받기",
+    "Enable desktop notifications": "데스크탑에서 알림 받기",
+    "Enable email notifications": "이메일로 알림 받기",
+    "Enable notifications for this account": "이 계정의 알림 받기",
+    "Error": "오류",
+    "Error saving email notification preferences": "이메일 알림을 설정하는데 오류가 일어났어요",
+    "#example": "#예",
+    "Expand panel": "확장 패널",
+    "Forget": "잊기",
+    "Hide panel": "패널 숨기기",
+    "Guest users can't invite users. Please register to invite.": "손님은 사용자를 초대할 수 없어요. 초대하려면 계정을 등록해주세요.",
+    "I understand the risks and wish to continue": "위험할 수 있는 걸 알고 계속하기를 바라요",
+    "Invite to this room": "이 방에 초대하기",
+    "Leave": "떠나기",
+    "Login": "로그인",
+    "Loading bug report module": "오류 보고 모듈을 불러오는 중",
+    "Low Priority": "낮은 우선순위",
+    "Members": "구성원",
+    "more": "더 보기",
+    "Mute": "알림 끄기",
+    "No rooms to show": "보여드릴 방이 없어요",
+    "Notification targets": "알림 대상",
+    "Notifications": "알림",
+    "Off": "끄기",
+    "On": "켜기",
+    "Permalink": "고유주소",
+    "Please describe the bug and/or send logs.": "오류를 적어주시거나 로그를 보내주세요.",
+    "Please Register": "계정을 등록해주세요",
+    "powered by Matrix": "매트릭스의 지원을 받고 있어요",
+    "Quote": "인용하기",
+    "Redact": "수정",
+    "Reject": "거절하기",
+    "Remove %(name)s from the directory?": "목록에서 %(name)s을 지우시겠어요?",
+    "Remove": "지우기",
+    "remove %(name)s from the directory.": "목록에서 %(name)s을 지웠어요.",
+    "Remove from Directory": "목록에서 지우기",
+    "Report a bug": "오류 보고하기",
+    "Resend": "다시 보내기",
+    "Riot Desktop on %(platformName)s": "%(platformName)s에서 라이엇 데스크탑",
+    "Riot is not supported on mobile web. Install the app?": "라이엇은 모바일 사이트를 지원하지 않아요. 앱을 설치하시겠어요?",
+    "Room directory": "방 목록",
+    "Room not found": "방을 찾지 못했어요",
+    "Search": "찾기",
+    "Search…": "찾기…",
+    "Search for a room": "방에서 찾기",
+    "Send": "보내기",
+    "Send logs": "로그 보내기",
+    "Settings": "설정",
+    "Source URL": "출처 URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "죄송해요. 브라우저에서 라이엇을 켤 수가 <b>없어요</b>.",
+    "Start chat": "얘기하기",
+    "This Room": "방",
+    "Unavailable": "이용할 수 없음",
+    "Unknown device": "알 수 없는 장치",
+    "unknown error code": "알 수 없는 오류 코드",
+    "Unnamed room": "이름없는 방",
+    "Update": "업데이트",
+    "Uploading report": "보고를 올리는 중",
+    "What's New": "새로운 점",
+    "What's new?": "새로운 점은?",
+    "Waiting for response from server": "서버에서 응답을 기다리는 중",
+    "You cannot delete this image. (%(code)s)": "이 사진을 지우실 수 없어요. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "이 메시지를 지우실 수 없어요. (%(code)s)",
+    "You are not receiving desktop notifications": "데스크탑 알림을 받지 않고 있어요",
+    "Sunday": "일요일",
+    "Monday": "월요일",
+    "Tuesday": "화요일",
+    "Wednesday": "수요일",
+    "Thursday": "목요일",
+    "Friday": "금요일",
+    "Saturday": "토요일",
+    "Today": "오늘",
+    "Yesterday": "어제",
+    "OK": "알았어요",
+    "Welcome page": "환영 화면",
+    "Welcome to Riot.im": "Riot.im에 오신 걸 환영해요",
+    "Chat with Riot Bot": "Riot 봇과 얘기하기",
+    "You have successfully set a password!": "비밀번호를 설정했어요!",
+    "Continue": "게속하기",
+    "Please set a password!": "비밀번호를 설정해주세요!",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">사파리</a>와 <a href=\"http://opera.com\">오페라</a>에서도 작동해요.",
+    "customServer_text": "사용자 지정 서버 설정에서 다른 홈 서버 URL을 지정해 다른 매트릭스 서버에 로그인할 수 있어요.<br/>이를 통해 라이엇과 다른 홈 서버의 기존 매트릭스 계정을 함께 쓸 수 있죠.<br/><br/>사용자 지정 ID 서버를 설정할 수도 있지만 이메일 주소로 사용자를 초대하거나 초대받을 수는 없답니다.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 별명 %(alias)s 을 지우고 목록에서 %(name)s를 지우실 거에요?",
+    "Drop here %(toAction)s": "여기로 끌어주세요 %(toAction)s",
+    "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기",
+    "Enable them now": "지금 켜기",
+    "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
+    "Failed to": "실패했어요",
+    "Failed to add tag %(tagName)s to room": "방에 %(tagName)s 태그를 추가하지 못했어요",
+    "Failed to change settings": "설정을 바꾸지 못했어요",
+    "Failed to forget room %(errCode)s": "방 %(errCode)s를 잊지 못했어요",
+    "Failed to update keywords": "키워드를 갱신하지 못했어요",
+    "Failed to get protocol list from Home Server": "홈 서버에서 프로토콜 목록을 얻지 못했어요",
+    "Failed to get public room list": "공개한 방 목록을 얻지 못했어요",
+    "Failed to join the room": "방에 들어가지 못했어요",
+    "Failed to remove tag %(tagName)s from room": "방에서 태그 %(tagName)s를 지우지 못했어요",
+    "Failed to send report: ": "보고를 보내지 못했어요: ",
+    "Failed to set direct chat tag": "직접 얘기 태그를 설정하지 못했어요",
+    "Failed to set Direct Message status of room": "방의 쪽지 상태를 설정하지 못했어요",
+    "Favourite": "즐겨찾기",
+    "Fetching third party location failed": "타사 위치를 불러오지 못했어요",
+    "Files": "파일",
+    "Filter room names": "방 이름 필터",
+    "Forward Message": "메시지 전달",
+    " from room": " 방에서",
+    "Guests can join": "손님이 들어올 수 있어요",
+    " (HTTP status %(httpStatus))": "(HTTP 상태 %(httpStatus))",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "문제를 진단하기 위해서, 이 클라이언트의 로그를 오류 보고서와 같이 보낼 거에요. 위 내용만 보내시려면, 체크를 해제하세요:",
+    "Keywords": "키워드",
+    "Mentions only": "답만 하기",
+    "Messages containing my display name": "내 별명이 적힌 메시지",
+    "Messages containing <span>keywords</span>": "<span>키워드</span>가 적힌 메시지",
+    "Messages containing my user name": "내 사용자 이름이 적힌 메시지",
+    "Messages in group chats": "애기 모임의 메시지",
+    "Messages in one-to-one chats": "1:1 얘기의 메시지",
+    "Messages sent by bot": "봇이 보낸 메시지",
+    "Noisy": "크게",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "여기 표시될 수 없는 규칙에 따라 다음 키워드는 알리지 않아요:",
+    "Notify for all other messages/rooms": "다른 모든 메시지/방 알리기",
+    "Notify me for anything else": "모든 걸 알리기",
+    "Operation failed": "작업 실패",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "오류를 설명해주세요. 무슨 일을 하셨나요? 어떤 일을 예상하셨나요? 실제로는 어떤 일이 일어났나요?",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "최상의 경험을 위해 <a href=\"https://www.google.com/chrome\">크롬</a>이나 <a href=\"https://getfirefox.com\">파이어폭스</a>를 설치해주세요.",
+    "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "라이엇은 많은 고급 브라우저 기능을 사용해요. 일부는 현재 브라우저에서 쓸 수 없거나 실험적이에요.",
+    "The Home Server may be too old to support third party networks": "타사 네트워크를 지원하기에는 홈 서버가 너무 오래된 걸 수 있어요",
+    "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요",
+    "The server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
+    "This room is inaccessible to guests. You may be able to join if you register.": "이 방은 손님이 들어가실 수 없어요. 계정을 등록하시면 들어가실 수 있을 거에요.",
+    " to room": " 방에서",
+    "Unable to fetch notification target list": "알림 대상 목록을 불러올 수 없어요",
+    "Unable to join network": "네트워크에 들어갈 수 없어요",
+    "Unable to look up room ID from server": "서버에서 방 ID를 찾아볼 수 없어요",
+    "Unhide Preview": "미리보기를 숨기지 않기",
+    "Uploaded on %(date)s by %(user)s": "by %(user)s가 %(date)s에 올림",
+    "View Decrypted Source": "해독된 출처 보기",
+    "View Source": "출처 보기",
+    "When I'm invited to a room": "방에 초대받았을 때",
+    "World readable": "세계에 보이기"
+}

From 680a345ce75d60ba5ea678d764af87133ec47a83 Mon Sep 17 00:00:00 2001
From: Alexandr Kornienko <zloyodyvanchik@mail.ru>
Date: Thu, 15 Jun 2017 09:28:58 +0000
Subject: [PATCH 089/172] Translated using Weblate (Ukrainian)

Currently translated at 98.0% (196 of 200 strings)

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

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 8f4eee1475..80cabf9a62 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -3,7 +3,7 @@
     "All messages": "Усі повідомлення",
     "All messages (loud)": "Усі повідомлення (гучно)",
     "All Rooms": "Усі кімнати",
-    "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей на даний момент вимкнені.",
+    "All notifications are currently disabled for all targets.": "Повідомлення для усіх цілей на даний момент вимкнені.",
     "An error occurred whilst saving your email notification preferences.": "Під час збереження налаштувань сповіщень е-поштою трапилася помилка.",
     "Cancel": "Скасувати",
     "Cancel Sending": "Скасувати надсилання",
@@ -21,7 +21,7 @@
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s через %(browserName)s на %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> та <a href=\"http://opera.com\">Opera</a> також підтримуються.",
     "Add an email address above to configure email notifications": "Додайте вище адресу е-пошти щоб налаштувати сповіщення е-поштою",
-    "Advanced notification settings": "Додаткові налаштування сповіщень",
+    "Advanced notification settings": "Додаткові налаштування повідомлень",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Видалити псевдонім %(alias)s та прибрати з каталогу %(name)s?",
     "Describe your problem here.": "Опишіть вашу проблему тут.",
     "Direct Chat": "Прямий чат",

From ca736cfce8ab9f8f9bf084e64b5ae337db8a75bf Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 15 Jun 2017 14:54:32 +0100
Subject: [PATCH 090/172] fix test description

logs in, not registers
---
 test/app-tests/loading.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a507fb9683..3792689da7 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -346,7 +346,7 @@ describe('loading:', function () {
             }).done(done, done);
         });
 
-        it("registers correctly with a Riot Team Server", function() {
+        it("logs in correctly with a Riot Team Server", function() {
             sdk.setFetch(httpBackend.fetchFn); // XXX: ought to restore this!
 
             httpBackend.when('GET', '/pushrules').respond(200, {});

From f3d29b305e9b334a1092f04d753603849517e90c Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Thu, 15 Jun 2017 14:39:14 +0000
Subject: [PATCH 091/172] Translated using Weblate (Korean)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
---
 src/i18n/strings/ko.json | 41 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 3737a9058f..3e0ee983f3 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -99,7 +99,7 @@
     "Yesterday": "어제",
     "OK": "알았어요",
     "Welcome page": "환영 화면",
-    "Welcome to Riot.im": "Riot.im에 오신 걸 환영해요",
+    "Welcome to Riot.im": "라이엇에 오신 걸 환영해요",
     "Chat with Riot Bot": "Riot 봇과 얘기하기",
     "You have successfully set a password!": "비밀번호를 설정했어요!",
     "Continue": "게속하기",
@@ -148,7 +148,7 @@
     "Operation failed": "작업 실패",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "오류를 설명해주세요. 무슨 일을 하셨나요? 어떤 일을 예상하셨나요? 실제로는 어떤 일이 일어났나요?",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "최상의 경험을 위해 <a href=\"https://www.google.com/chrome\">크롬</a>이나 <a href=\"https://getfirefox.com\">파이어폭스</a>를 설치해주세요.",
-    "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요.",
+    "Riot does not know how to join a room on this network": "라이엇이 이 네트워크에서 방에 들어가는 법을 알 수 없어요",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "라이엇은 많은 고급 브라우저 기능을 사용해요. 일부는 현재 브라우저에서 쓸 수 없거나 실험적이에요.",
     "The Home Server may be too old to support third party networks": "타사 네트워크를 지원하기에는 홈 서버가 너무 오래된 걸 수 있어요",
     "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요",
@@ -163,5 +163,40 @@
     "View Decrypted Source": "해독된 출처 보기",
     "View Source": "출처 보기",
     "When I'm invited to a room": "방에 초대받았을 때",
-    "World readable": "세계에 보이기"
+    "World readable": "세계에 보이기",
+    "You need to be using HTTPS to place a screen-sharing call.": "화면 공유를 하려면 HTTPS를 써야만 해요.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "현재 브라우저에서는, 응용 프로그램의 모양과 기능이 완벽하게 맞지 않거나, 일부 혹은 모든 기능이 작동하지 않을 수 있어요. 계속할 수는 있지만, 맞닥뜨리는 모든 문제는 직접 해결하셔야해요!",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "분산되고, 암호화된 대화 &amp; [matrix]의 지원으로 협력",
+    "Search the room directory": "방 목록을 찾기",
+    "Get started with some tips from Riot Bot!": "라이엇 봇에게 조언을 받고 시작하세요!",
+    "General discussion about Matrix and Riot": "매트릭스와 라이엇에 대한 일반 논의",
+    "Discussion of all things Matrix!": "매트릭스의 모든 것에 대한 토론!",
+    "Riot/Web &amp; Desktop chat": "라이엇/웹 &amp; 데스크탑 대화",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "라이엇/IOS &amp; matrix-ios-sdk 대화",
+    "Riot/Android &amp; matrix-android-sdk chat": "매트릭스/안드로이드 &amp; matrix-ios-sdk 대화",
+    "Matrix technical discussions": "매트릭스 기술 논의",
+    "Running Matrix services": "매트릭스 서비스 실행",
+    "Community-run support for Synapse": "시냅스 커뮤니티 운영 지원",
+    "Admin support for Dendrite": "덴드라이트 관리 지원",
+    "Announcements about Synapse releases": "시냅스 공개 발표",
+    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc를 사용하고 운영하는 사람들을 지원",
+    "Building services on Matrix": "매트릭스에서 서비스 구축",
+    "Support for those using the Matrix spec": "Matrix spec을 사용하는 사람들을 지원",
+    "Design and implementation of E2E in Matrix": "매트릭스에서 E2E 설계와 구현",
+    "Implementing VR services with Matrix": "매트릭스로 VR 서비스 구현",
+    "Implementing VoIP services with Matrix": "매트릭스로 인터넷전화 서비스 구현",
+    "Discussion of the Identity Service API": "ID 서비스 API에 대한 논의",
+    "Support for those using, running and writing other bridges": "다른 브릿지를 사용하고, 운영하고, 기록하는 사람들을 지원",
+    "Contributing code to Matrix and Riot": "매트릭스와 라이엇에 코드 기여하기",
+    "Dev chat for the Riot/Web dev team": "라이엇/웹 개발 팀을 위한 개발자 대화",
+    "Dev chat for the Dendrite dev team": "덴드라이트 개발 팀을 위한 개발자 대화",
+    "Co-ordination for Riot/Web translators": "라이엇/웹 번역자를 위한 조정",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방들이 이미 매트릭스에 있어요. 목록을 확인해보세요!",
+    "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했어요. 이 비밀번호가 정말 맞으세요?",
+    "You can now return to your account after signing out, and sign in on other devices.": "계정을 로그아웃하신 뒤에 계정으로 돌아가, 다른 기기에서 로그인하실 수 있어요.",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 기기에서 로그인하실 수 있어요.",
+    "You have successfully set a password and an email address!": "비밀번호와 이메일 주소를 설정했어요!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "잊지마세요, 마음이 바뀌면 언제라도 사용자 설정에서 이메일 주소를 바꾸실 수 있다는 걸요.",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "손님으로 라이엇에 들어오셨네요. <a>계정을 등록하거나</a> <a>로그인하시고</a> 더 많은 방과 기능을 즐기세요!",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "라이엇이 아닌 다른 클라이언트에서 구성하셨을 수도 있어요. 라이엇에서 조정할 수는 없지만 여전히 적용되있을 거에요"
 }

From a28af8bcc6e5ba1df09d957a8c9621e951c3c84e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 15 Jun 2017 16:01:26 +0100
Subject: [PATCH 092/172] Extend timeouts in joining tests again

this seems to work? maybe?
---
 test/app-tests/joining.js | 2 +-
 test/mock-request.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 0aeb081a5e..d967012567 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -119,8 +119,8 @@ describe('joining a room', function () {
                 httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
                 httpBackend.when('GET', '/thirdparty/protocols').respond(200, {});
                 return q.all([
-                    httpBackend.flush('/publicRooms'),
                     httpBackend.flush('/thirdparty/protocols'),
+                    httpBackend.flush('/publicRooms'),
                 ]);
             }).then(() => {
                 var roomDir = ReactTestUtils.findRenderedComponentWithType(
diff --git a/test/mock-request.js b/test/mock-request.js
index 46d165824d..8b5b0e0a16 100644
--- a/test/mock-request.js
+++ b/test/mock-request.js
@@ -37,7 +37,7 @@ HttpBackend.prototype = {
      * @param {string} path The path to flush (optional) default: all.
      * @param {integer} numToFlush The number of things to flush (optional), default: all.
      * @param {integer=} waitTime  The time (in ms) to wait for a request to happen.
-     *    default: 5
+     *    default: 100
      *
      * @return {Promise} resolves when there is nothing left to flush, with the
      *    number of requests flushed
@@ -47,7 +47,7 @@ HttpBackend.prototype = {
         const self = this;
         let flushed = 0;
         if (waitTime === undefined) {
-            waitTime = 10;
+            waitTime = 100;
         }
 
         function log(msg) {

From cb905e9be7fa262124495a2364bbd1e15c9dc3f8 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Jun 2017 17:18:33 +0100
Subject: [PATCH 093/172] released js-sdk & react-sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ec4b827d38..b2e532ec25 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.11",
-    "matrix-react-sdk": "0.9.4",
+    "matrix-js-sdk": "0.7.12-rc.1",
+    "matrix-react-sdk": "0.9.5-rc.1",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From e045b35c8696dceb16263d7e97560e5bd9d9ff61 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Jun 2017 17:20:22 +0100
Subject: [PATCH 094/172] v0.11.2-rc.1

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

diff --git a/electron_app/package.json b/electron_app/package.json
index 35ea86a116..0f176fe4a6 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.1",
+  "version": "0.11.2-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 5b43431bf0fcbafb7cd2b6044d8a18d3ae83de56 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Jun 2017 17:21:00 +0100
Subject: [PATCH 095/172] Prepare changelog for v0.11.2-rc.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8a39fd688..823f30dedb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+Changes in [0.11.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.2-rc.1) (2017-06-15)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.1...v0.11.2-rc.1)
+
+ * Attempts to deflakify the joining test
+   [\#4313](https://github.com/vector-im/riot-web/pull/4313)
+ * Add a test for the login flow when there is a teamserver
+   [\#4315](https://github.com/vector-im/riot-web/pull/4315)
+ * Remove onload simulator from loading test
+   [\#4314](https://github.com/vector-im/riot-web/pull/4314)
+ * Update from Weblate.
+   [\#4305](https://github.com/vector-im/riot-web/pull/4305)
+ * Test that we handle stored mx_last_room_id correctly
+   [\#4292](https://github.com/vector-im/riot-web/pull/4292)
+ * Ask for email address after setting password for the first time
+   [\#4301](https://github.com/vector-im/riot-web/pull/4301)
+ * i18n for setting email after password flow
+   [\#4299](https://github.com/vector-im/riot-web/pull/4299)
+ * Update from Weblate.
+   [\#4290](https://github.com/vector-im/riot-web/pull/4290)
+ * Don't show the tooltips when filtering rooms
+   [\#4282](https://github.com/vector-im/riot-web/pull/4282)
+ * Update from Weblate.
+   [\#4272](https://github.com/vector-im/riot-web/pull/4272)
+ * Add missing VOIP Dropdown width
+   [\#4266](https://github.com/vector-im/riot-web/pull/4266)
+ * Update import and directory path in the Translations dev guide
+   [\#4261](https://github.com/vector-im/riot-web/pull/4261)
+ * Use Thai string for Thai in Language-Chooser
+   [\#4260](https://github.com/vector-im/riot-web/pull/4260)
+
 Changes in [0.11.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.1) (2017-06-14)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.0...v0.11.1)

From 104cb7b99903860f72b6f689ce2ff9727dc18dbf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 15 Jun 2017 17:21:01 +0100
Subject: [PATCH 096/172] v0.11.2-rc.1

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

diff --git a/package.json b/package.json
index b2e532ec25..fcf8664514 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.1",
+  "version": "0.11.2-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From 1fcd462660a7d82bf4b610ba14f2bac3f73b5205 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 13 Jun 2017 14:45:05 +0100
Subject: [PATCH 097/172] Tweak tests to match updates to matrixchat

Mostly this is just making it look at the `view` state rather than the
individual boolean flags.

One other tweak merits explanation: we now implement the initial
couldn't-register-as-guest login with an explicit switch to the LOGIN view,
which means that the URL gets updated to #/login.
---
 test/app-tests/loading.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a323a26269..ed1875e004 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -29,6 +29,7 @@ import jssdk from 'matrix-js-sdk';
 import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+import {VIEWS} from 'matrix-react-sdk/lib/components/structures/MatrixChat';
 
 import * as test_utils from '../test-utils';
 import MockHttpBackend from '../mock-request';
@@ -153,8 +154,8 @@ describe('loading:', function () {
             .check((r) => {syncRequest = r;})
             .respond(200, response);
 
-        console.log("waiting for /sync");
         for (let attempts = 10; attempts > 0; attempts--) {
+            console.log(Date.now() + " waiting for /sync");
             if (syncRequest) {
                 return syncRequest;
             }
@@ -184,7 +185,7 @@ describe('loading:', function () {
                 // we expect a single <Login> component following session load
                 ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.login.Login'));
-                expect(windowLocation.hash).toEqual("");
+                expect(windowLocation.hash).toEqual("#/login");
             }).done(done, done);
         });
 
@@ -360,6 +361,9 @@ describe('loading:', function () {
                 loadApp({
                     uriFragment: "#/login",
                 });
+
+                // give the UI a chance to display
+                return q.delay(50);
             });
 
             it('shows a login view', function() {
@@ -589,7 +593,8 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading || matrixChat.state.loggingIn) {
+    if (matrixChat.state.view === VIEWS.LOADING ||
+            matrixChat.state.view === VIEWS.LOGGING_IN) {
         console.log(Date.now() + " Awaiting sync spinner: still loading.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not loaded after " +
@@ -628,8 +633,7 @@ function awaitRoomView(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading ||
-        !(matrixChat.state.loggedIn && matrixChat.state.ready)) {
+    if (matrixChat.state.view !== VIEWS.LOGGED_IN || !matrixChat.state.ready) {
         console.log(Date.now() + " Awaiting room view: not ready yet.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not ready after " +

From f5b2a92e840ecf630818a59c502733de15de59af Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 15 Jun 2017 18:17:00 +0100
Subject: [PATCH 098/172] Give the login panel a bit longer to appear

---
 test/app-tests/loading.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index ed1875e004..e660c91e9d 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -180,7 +180,7 @@ describe('loading:', function () {
                 return httpBackend.flush();
             }).then(() => {
                 // Wait for another trip around the event loop for the UI to update
-                return q.delay(1);
+                return q.delay(10);
             }).then(() => {
                 // we expect a single <Login> component following session load
                 ReactTestUtils.findRenderedComponentWithType(
@@ -206,7 +206,7 @@ describe('loading:', function () {
                 return httpBackend.flush();
             }).then(() => {
                 // Wait for another trip around the event loop for the UI to update
-                return q.delay(1);
+                return q.delay(10);
             }).then(() => {
                 return completeLogin(matrixChat);
             }).then(() => {

From 5da8839cebc05cf7d36e5b94c025d49e1f817a20 Mon Sep 17 00:00:00 2001
From: Silke <silke@slxh.nl>
Date: Thu, 15 Jun 2017 20:00:25 +0000
Subject: [PATCH 099/172] Translated using Weblate (Dutch)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
---
 src/i18n/strings/nl.json | 97 ++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 43 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index d9e459d551..c8f0079538 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -4,13 +4,13 @@
     "All messages": "Alle berichten",
     "All messages (loud)": "Alle berichten (luid)",
     "All notifications are currently disabled for all targets.": "Alle meldingen zijn momenteel uitgeschakeld voor alle doelen.",
-    "An error occurred whilst saving your email notification preferences.": "Er is een fout ontstaan tijdens het opslaan van uw e-mailmeldingsvoorkeuren.",
+    "An error occurred whilst saving your email notification preferences.": "Er is een fout opgetreden tijdens het opslaan van uw e-mailmeldingsvoorkeuren.",
     "Call invitation": "Oproep-uitnodiging",
     "Cancel Sending": "Versturen annuleren",
     "Can't update user notification settings": "Het is niet gelukt om de meldingsinstellingen van de gebruiker bij te werken",
     "Close": "Sluiten",
     "Create new room": "Een nieuwe kamer maken",
-    "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix kamer te vinden",
+    "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix-kamer te vinden",
     "Custom Server Options": "Aangepaste serverinstellingen",
     "customServer_text": "U kunt de aangepaste serverinstellingen gebruiken om in te loggen bij andere Matrix-servers door een andere homeserver-URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix-account op een andere homeserver.<br/><br/>U kunt ook een aangepaste identiteitsserver instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een e-mailadres of zelf uitgenodigd te worden met een e-mailadres.",
     "delete the alias.": "verwijder de alias.",
@@ -19,12 +19,12 @@
     "Directory": "Kamerlijst",
     "Dismiss": "Afwijzen",
     "Download this file": "Download dit bestand",
-    "Enable audible notifications in web client": "Meldingen in de webclient aanzetten",
+    "Enable audible notifications in web client": "Geluidsmeldingen in de webclient aanzetten",
     "Enable desktop notifications": "Desktopmeldingen aanzetten",
     "Enable email notifications": "E-mailmeldingen aanzetten",
     "Enable notifications for this account": "Meldingen voor dit account aanzetten",
     "Enable them now": "Deze nu aanzetten",
-    "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gesplitst door een komma:",
+    "Enter keywords separated by a comma:": "Voeg trefwoorden toe, gescheiden door een komma:",
     "Error": "Fout",
     "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
     "#example": "#voorbeeld",
@@ -32,20 +32,20 @@
     "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen",
     "Failed to change settings": "Instellingen wijzigen mislukt",
     "Failed to forget room %(errCode)s": "Kamer vergeten mislukt %(errCode)s",
-    "Failed to update keywords": "Sleutelwoorden bijwerken mislukt",
+    "Failed to update keywords": "Trefwoorden bijwerken mislukt",
     "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
     "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt",
     "Failed to join the room": "Kamer binnengaan mislukt",
     "Failed to remove tag %(tagName)s from room": "Label %(tagName)s van de kamer verwijderen mislukt",
-    "Failed to set direct chat tag": "Het is mislukt om de privé chat label weg te halen",
+    "Failed to set direct chat tag": "Het is mislukt om het privéchatlabel weg te halen",
     "Favourite": "Favoriet",
     "Fetching third party location failed": "Het ophalen van de locatie van de derde partij is mislukt",
     "Files": "Bestanden",
-    "Filter room names": "Filter kamer namen",
+    "Filter room names": "Filter kamernamen",
     "Forget": "Vergeten",
     " from room": " van kamer",
-    "Guests can join": "Gasten kunnen toe treden",
-    "Guest users can't invite users. Please register to invite.": "Gasten kunnen geen gebruikers uitnodigen. Om anderen uit te nodigen zult u moeten registreren.",
+    "Guests can join": "Gasten kunnen deelnemen",
+    "Guest users can't invite users. Please register to invite.": "Gasten kunnen geen gebruikers uitnodigen. Om anderen uit te nodigen zult u zich moeten registreren.",
     "Invite to this room": "Uitnodigen voor deze kamer",
     "Keywords": "Trefwoorden",
     "Leave": "Verlaten",
@@ -56,55 +56,55 @@
     "Messages containing my user name": "Berichten die mijn gebruikersnaam bevatten",
     "Messages in group chats": "Berichten in groepsgesprekken",
     "Messages in one-to-one chats": "Berichten in één-op-één-gesprekken",
-    "Messages sent by bot": "Berichten verzonden bij een bot",
+    "Messages sent by bot": "Berichten verzonden door een bot",
     "more": "meer",
     "Mute": "Dempen",
     "No rooms to show": "Geen kamers om te laten zien",
     "Noisy": "Luidruchtig",
-    "Notification targets": "Notificatie doelen",
+    "Notification targets": "Meldingsdoelen",
     "Notifications": "Meldingen",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificaties op de volgende trefwoorden volgen regels die hier niet kunnen worden laten zien:",
-    "Notify for all other messages/rooms": "Informeer mij voor alle andere berichten/kamers",
-    "Notify me for anything else": "Informeer mij voor al het andere",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Meldingen op de volgende trefwoorden volgen regels die hier niet kunnen worden getoond:",
+    "Notify for all other messages/rooms": "Stuur een melding voor alle andere berichten/kamers",
+    "Notify me for anything else": "Stuur een melding voor al het andere",
     "Off": "Uit",
     "On": "Aan",
     "Operation failed": "Actie mislukt",
     "Permalink": "Permanente link",
     "Please Register": "Registreer alstublieft",
     "powered by Matrix": "mogelijk gemaakt door Matrix",
-    "Quote": "Citaat",
+    "Quote": "Citeer",
     "Reject": "Afwijzen",
     "Remove %(name)s from the directory?": "%(name)s uit de kamerlijst verwijderen?",
     "Remove": "Verwijderen",
     "remove %(name)s from the directory.": "verwijder %(name)s uit de kamerlijst.",
     "Remove from Directory": "Uit de kamerlijst verwijderen",
     "Resend": "Opnieuw verzenden",
-    "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet toetreden tot een kamer op dit netwerk",
+    "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een kamer op dit netwerk",
     "Room directory": "Kamerlijst",
     "Room not found": "De kamer is niet gevonden",
-    "Search for a room": "Een kamer zoeken",
+    "Search for a room": "Een kamer opzoeken",
     "Settings": "Instellingen",
-    "Source URL": "Bron URL",
+    "Source URL": "Bron-URL",
     "Start chat": "Gesprek starten",
     "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen",
-    "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet worden laten zien",
-    "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbeladen",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Deze kamer is niet toegankelijk voor gasten. Je zou misschien toe kunnen treden als je geregistreerd bent.",
+    "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet getoond worden",
+    "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbelast",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Deze kamer is niet toegankelijk voor gasten. Je zou misschien kunnen deelnemen als je geregistreerd bent.",
     " to room": " naar kamer",
-    "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatie doelen op te halen",
+    "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatiedoelen op te halen",
     "Unable to join network": "Het is mislukt om toe te treden tot dit netwerk",
-    "Unable to look up room ID from server": "Het is mislukt om de kamer ID op te halen van de server",
+    "Unable to look up room ID from server": "Het is mislukt om de kamer-ID op te halen van de server",
     "Unhide Preview": "Zichtbaar maken preview",
     "unknown error code": "onbekende foutcode",
     "Unnamed room": "Kamer zonder naam",
     "Uploaded on %(date)s by %(user)s": "Geüpload op %(date)s door %(user)s",
-    "View Decrypted Source": "Bekijk gedecodeerde bron",
+    "View Decrypted Source": "Bekijk ontsleutelde bron",
     "View Source": "Bekijk bron",
-    "When I'm invited to a room": "Wanneer ik uitgenodigt wordt naar een kamer",
+    "When I'm invited to a room": "Wanneer ik uitgenodigd word voor een kamer",
     "World readable": "Door iedereen leesbaar",
     "You cannot delete this image. (%(code)s)": "Je kunt deze afbeelding niet verwijderen. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Je kunt dit bericht niet verwijderen. (%(code)s)",
-    "You are not receiving desktop notifications": "Je ontvangt momenteel geen desktop notificaties",
+    "You are not receiving desktop notifications": "Je ontvangt momenteel geen desktopmeldingen",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Je hebt ze mogelijk ingesteld in een andere client dan Riot. Je kunt ze niet aanpassen in Riot maar ze zijn wel actief",
     "Sunday": "Zondag",
     "Monday": "Maandag",
@@ -117,9 +117,9 @@
     "Yesterday": "Gisteren",
     "Welcome page": "Welkomstpagina",
     "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen",
-    "Failed to set Direct Message status of room": "Het is mislukt om de directe berichten status van de kamer in te stellen",
+    "Failed to set Direct Message status of room": "Het is mislukt om de directe-berichtenstatus van de kamer in te stellen",
     "Redact": "Redigeren",
-    "A new version of Riot is available.": "Nieuwe Riot-versie is beschikbaar.",
+    "A new version of Riot is available.": "Er is een nieuwe versie van Riot beschikbaar.",
     "All Rooms": "Alle kamers",
     "Cancel": "Annuleren",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> en <a href=\"http://opera.com\">Opera</a> werken ook.",
@@ -136,17 +136,17 @@
     "I understand the risks and wish to continue": "Ik begrijp de risico's en wil graag verder gaan",
     "Login": "Aanmelden",
     "Loading bug report module": "Bugrapporteermodule laden",
-    "Messages containing <span>keywords</span>": "Berichten die <span>sleutelwoorden</span> bevatten",
+    "Messages containing <span>keywords</span>": "Berichten die <span>trefwoorden</span> bevatten",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Installeer <a href=\"https://www.google.com/chrome\">Chrome</a> of <a href=\"https://getfirefox.com\">Firefox</a> voor de beste ervaring.",
     "Report a bug": "Een bug rapporteren",
     "Riot Desktop on %(platformName)s": "Riot Desktop op %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot wordt niet ondersteund op het mobiele web. De app installeren?",
+    "Riot is not supported on mobile web. Install the app?": "Riot wordt niet ondersteund op het mobiele web. Wil je de app installeren?",
     "Search": "Zoeken",
     "Search…": "Zoeken…",
     "Send": "Versturen",
     "Send logs": "Logboeken versturen",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, uw browser werkt <b>niet</b> met Riot.",
-    "This Room": "Deze ruimte",
+    "This Room": "Deze kamer",
     "Unavailable": "Niet beschikbaar",
     "Unknown device": "Onbekend apparaat",
     "Update": "Bijwerken",
@@ -154,16 +154,16 @@
     "What's New": "Wat is er nieuw",
     "What's new?": "Wat is er nieuw?",
     "Waiting for response from server": "Wachten op antwoord van de server",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "U gebruikt Riot als gast. <a>Registreren</a> of <a>aanmelden</a> om voor meer ruimtes en functies!",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "U gebruikt Riot als gast. <a>Registreren</a> of <a>aanmelden</a> om voor meer kamers en functies!",
     "OK": "OK",
     "You need to be using HTTPS to place a screen-sharing call.": "U moet HTTPS gebruiken om een oproep met schermdelen te kunnen starten.",
     "Welcome to Riot.im": "Welkom bij Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentaliseerd en versleuteld chatten &amp; samenwerking mogelijk gemaakt door [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Gedecentaliseerd en versleuteld chatten &amp; samenwerken mogelijk gemaakt door [matrix]",
     "Search the room directory": "De kamerlijst doorzoeken",
     "Chat with Riot Bot": "Met Riot Bot chatten",
-    "Get started with some tips from Riot Bot!": "Begin met enkele tips van Riot-bot!",
+    "Get started with some tips from Riot Bot!": "Begin met enkele tips van Riot Bot!",
     "General discussion about Matrix and Riot": "Algemene discussie over Matrix en Riot",
-    "Discussion of all things Matrix!": "Discussie over alle Matrix-dingen!",
+    "Discussion of all things Matrix!": "Discussie over alles wat met Matrix te maken heeft!",
     "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-chat",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-chat",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-chat",
@@ -172,20 +172,31 @@
     "Community-run support for Synapse": "Synapse-ondersteuning vanuit de gemeenschap",
     "Admin support for Dendrite": "Beheerondersteuning voor Dendrite",
     "Announcements about Synapse releases": "Aankondigingen over Synapse-uitgaven",
-    "Support for those using and running matrix-appservice-irc": "Ondersteuning voor hen die matrix-appservice-irc gebruiken en beheren",
+    "Support for those using and running matrix-appservice-irc": "Ondersteuning voor gebruikers en beheerders van matrix-appservice-irc",
     "Building services on Matrix": "Diensten op Matrix bouwen",
-    "Support for those using the Matrix spec": "Ondersteuning voor hen die de Matrix-specificatie gebruiken",
+    "Support for those using the Matrix spec": "Ondersteuning voor gebruikers van Matrix-specificatie",
     "Contributing code to Matrix and Riot": "Code bijdragen aan Matrix en Riot",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Veel ruimtes bestaan al in Matrix, gelinkt aan bestaande netwerken (Slack, IRC, Gitter enz.) of onafhankelijk. Bekijk de kamerlijst!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Veel kamers bestaan al in Matrix, gelinkt aan bestaande netwerken (Slack, IRC, Gitter, enz.) of onafhankelijk. Bekijk de kamerlijst!",
     "Failed to change password. Is your password correct?": "Wachtwoord wijzigen mislukt. Is uw wachtwoord juist?",
     "You have successfully set a password!": "U heeft met succes een wachtwoord ingesteld!",
-    "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u bent afgemeld, en aanmelden op andere apparaten.",
+    "You can now return to your account after signing out, and sign in on other devices.": "U kunt nu terugkeren naar uw account nadat u bent afgemeld, en u aanmelden op andere apparaten.",
     "Continue": "Doorgaan",
     "Please set a password!": "Stel een wachtwoord in!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en aanmelden op andere apparaten.",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hiermee kunt u naar uw account terugkeren nadat u zich heeft afgemeld, en u aanmelden op andere apparaten.",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s op %(osName)s",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Beschrijf de bug. Wat deed u? Wat verwachtte u? Wat gebeurde er in werkelijkheid?",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Beschrijf de bug. Wat deed u? Wat verwachtte u? Wat gebeurde er daadwerkelijk?",
     "Please describe the bug and/or send logs.": "Beschrijf de bug en/of verstuur logboeken.",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebrukt veel geavanceerde browserfuncties, waarvan enkele niet of experimenteel in uw webbrowser beschikbaar zijn.",
-    "Co-ordination for Riot/Web translators": "Coördinatie voor Riot/Web-vertalers"
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot gebrukt veel geavanceerde browserfuncties, waarvan enkele niet (of experimenteel) in uw webbrowser beschikbaar zijn.",
+    "Co-ordination for Riot/Web translators": "Coördinatie voor Riot/Web-vertalers",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Om diagnose van het probleem mogelijk te maken worden logboeken van deze client met het bugrapport meegestuurd. Schakel dit vinkje uit als u slechts de bovenstaande tekst mee wil sturen:",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Met uw huidige browser kan de applicatie er volledig incorrect uitzien. Tevens is het mogelijk dat niet alle functies naar behoren werken. U kunt doorgaan als u het toch wil proberen, maar bij problemen bent u volledig op uzelf aangewezen!",
+    "Design and implementation of E2E in Matrix": "Ontwerp en implementatie van E2E in Matrix",
+    "Implementing VR services with Matrix": "Implementatie van VR-diensten met Matrix",
+    "Implementing VoIP services with Matrix": "Implementatie van VoIP-diensten met Matrix",
+    "Discussion of the Identity Service API": "Discussie over de Identity Service API",
+    "Support for those using, running and writing other bridges": "Ondersteuning voor het gebruiken, draaien en ontwikkelen aan andere bruggen",
+    "Dev chat for the Riot/Web dev team": "Dev-chat voor het Riot/Web ontwikkelteam",
+    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite ontwikkelteam",
+    "You have successfully set a password and an email address!": "Het instellen van een wachtwoord en e-mailadres is geslaagd!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd een e-mailadres in kan stellen in de gebruikersinstellingen als u zich bedenkt."
 }

From 3bf7de8d47bb6eb462940bfd636866b3b68e372a Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Thu, 15 Jun 2017 18:36:15 +0000
Subject: [PATCH 100/172] Translated using Weblate (German)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 3a08540910..e5044c9758 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -51,7 +51,7 @@
     "Failed to set Direct Message status of room": "Konnte den direkten Benachrichtigungsstatus nicht setzen",
     "Favourite": "Favorit",
     "Fetching third party location failed": "Das Abrufen des Drittanbieterstandorts ist fehlgeschlagen",
-    "Forget": "Lösche",
+    "Forget": "Entfernen",
     "from the directory": "aus dem Verzeichnis",
     " from room": " aus dem Raum",
     "Keywords": "Schlüsselwörter",
@@ -75,7 +75,7 @@
     "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
     "unknown error code": "Unbekannter Fehlercode",
     "Unnamed room": "Unbenannter Raum",
-    "Notify me for anything else": "Benachrichtige mich für alles andere",
+    "Notify me for anything else": "Über alles andere benachrichtigen",
     "Off": "Aus",
     "On": "An",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Client als Riot konfiguriert. Sie können in Riot nicht verändert werden, gelten aber trotzdem",
@@ -88,7 +88,7 @@
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Soll der Raum-Alias %(alias)s gelöscht und der %(name)s aus dem Verzeichnis entfernt werden?",
     "Download this file": "Diese Datei herunterladen",
     "Failed to add tag %(tagName)s to room": "Das Hinzufügen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
-    "Failed to forget room %(errCode)s": "Das Entfernen des Raums %(errCode)s aus deiner Liste ist fehlgeschlagen",
+    "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
     "Failed to remove tag %(tagName)s from room": "Das Entfernen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to set direct chat tag": "Fehler beim Setzen der \"Direkter Chat\"-Kennzeichnung",
     "Mentions only": "Nur, wenn du erwähnt wirst",
@@ -165,7 +165,7 @@
     "Uploading report": "Lade Bericht hoch",
     "What's New": "Was ist neu",
     "What's new?": "Was ist neu?",
-    "Waiting for response from server": "Warte auf eine Antwort vom Server",
+    "Waiting for response from server": "Auf Antwort vom Server warten",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Du verwendest Riot als Gast. <a>Registriere</a> oder <a>melde dich an</a> um Zugang zu mehr Räumen und Funktionen zu bekommen!",
     "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.",
     "OK": "OK",

From 2477fddc073e9d5f48557dc3025713569c719887 Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Fri, 16 Jun 2017 08:55:17 +0000
Subject: [PATCH 101/172] Translated using Weblate (Korean)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 3e0ee983f3..a9fdcb5a94 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -19,9 +19,9 @@
     "Create new room": "새 방 만들기",
     "Couldn't find a matching Matrix room": "일치하는 매트릭스 방을 찾을 수 없어요",
     "Custom Server Options": "사용자 지정 서버 설정",
-    "delete the alias.": "별명을 삭제할게요.",
+    "delete the alias.": "가명을 지울게요.",
     "Describe your problem here.": "여기에 일어난 문제를 적어주세요.",
-    "Direct Chat": "직접 얘기하기",
+    "Direct Chat": "직접 이야기하기",
     "Directory": "목록",
     "Dismiss": "없애기",
     "Download this file": "이 파일 받기",
@@ -72,9 +72,9 @@
     "Send": "보내기",
     "Send logs": "로그 보내기",
     "Settings": "설정",
-    "Source URL": "출처 URL",
+    "Source URL": "출처 주소",
     "Sorry, your browser is <b>not</b> able to run Riot.": "죄송해요. 브라우저에서 라이엇을 켤 수가 <b>없어요</b>.",
-    "Start chat": "얘기하기",
+    "Start chat": "이야기하기",
     "This Room": "방",
     "Unavailable": "이용할 수 없음",
     "Unknown device": "알 수 없는 장치",
@@ -100,15 +100,15 @@
     "OK": "알았어요",
     "Welcome page": "환영 화면",
     "Welcome to Riot.im": "라이엇에 오신 걸 환영해요",
-    "Chat with Riot Bot": "Riot 봇과 얘기하기",
+    "Chat with Riot Bot": "Riot 봇과 이야기하기",
     "You have successfully set a password!": "비밀번호를 설정했어요!",
     "Continue": "게속하기",
     "Please set a password!": "비밀번호를 설정해주세요!",
     "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">사파리</a>와 <a href=\"http://opera.com\">오페라</a>에서도 작동해요.",
-    "customServer_text": "사용자 지정 서버 설정에서 다른 홈 서버 URL을 지정해 다른 매트릭스 서버에 로그인할 수 있어요.<br/>이를 통해 라이엇과 다른 홈 서버의 기존 매트릭스 계정을 함께 쓸 수 있죠.<br/><br/>사용자 지정 ID 서버를 설정할 수도 있지만 이메일 주소로 사용자를 초대하거나 초대받을 수는 없답니다.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 별명 %(alias)s 을 지우고 목록에서 %(name)s를 지우실 거에요?",
-    "Drop here %(toAction)s": "여기로 끌어주세요 %(toAction)s",
+    "customServer_text": "사용자 지정 서버 설정에서 다른 홈 서버 주소를 지정해 다른 매트릭스 서버에 로그인할 수 있어요.<br/>이를 통해 라이엇과 다른 홈 서버의 기존 매트릭스 계정을 함께 쓸 수 있죠.<br/><br/>사용자 지정 ID 서버를 설정할 수도 있지만 이메일 주소로 사용자를 초대하거나 초대받을 수는 없답니다.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 가명 %(alias)s 을 지우고 목록에서 %(name)s를 지우시겠어요?",
+    "Drop here %(toAction)s": "여기에 놓아주세요 %(toAction)s",
     "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기",
     "Enable them now": "지금 켜기",
     "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
@@ -122,12 +122,12 @@
     "Failed to join the room": "방에 들어가지 못했어요",
     "Failed to remove tag %(tagName)s from room": "방에서 태그 %(tagName)s를 지우지 못했어요",
     "Failed to send report: ": "보고를 보내지 못했어요: ",
-    "Failed to set direct chat tag": "직접 얘기 태그를 설정하지 못했어요",
+    "Failed to set direct chat tag": "직접 이야기 태그를 설정하지 못했어요",
     "Failed to set Direct Message status of room": "방의 쪽지 상태를 설정하지 못했어요",
     "Favourite": "즐겨찾기",
     "Fetching third party location failed": "타사 위치를 불러오지 못했어요",
     "Files": "파일",
-    "Filter room names": "방 이름 필터",
+    "Filter room names": "방 이름 거르기",
     "Forward Message": "메시지 전달",
     " from room": " 방에서",
     "Guests can join": "손님이 들어올 수 있어요",
@@ -138,8 +138,8 @@
     "Messages containing my display name": "내 별명이 적힌 메시지",
     "Messages containing <span>keywords</span>": "<span>키워드</span>가 적힌 메시지",
     "Messages containing my user name": "내 사용자 이름이 적힌 메시지",
-    "Messages in group chats": "애기 모임의 메시지",
-    "Messages in one-to-one chats": "1:1 얘기의 메시지",
+    "Messages in group chats": "이야기 모임의 메시지",
+    "Messages in one-to-one chats": "1:1 이야기의 메시지",
     "Messages sent by bot": "봇이 보낸 메시지",
     "Noisy": "크게",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "여기 표시될 수 없는 규칙에 따라 다음 키워드는 알리지 않아요:",
@@ -193,8 +193,8 @@
     "Co-ordination for Riot/Web translators": "라이엇/웹 번역자를 위한 조정",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "기존 네트워크(Slack, IRC, Gitter 등)에 연결되있거나 독립된 많은 방들이 이미 매트릭스에 있어요. 목록을 확인해보세요!",
     "Failed to change password. Is your password correct?": "비밀번호를 바꾸지 못했어요. 이 비밀번호가 정말 맞으세요?",
-    "You can now return to your account after signing out, and sign in on other devices.": "계정을 로그아웃하신 뒤에 계정으로 돌아가, 다른 기기에서 로그인하실 수 있어요.",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 기기에서 로그인하실 수 있어요.",
+    "You can now return to your account after signing out, and sign in on other devices.": "계정을 로그아웃하신 뒤에 계정으로 돌아가, 다른 장치에서 로그인하실 수 있어요.",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 장치에서 로그인하실 수 있어요.",
     "You have successfully set a password and an email address!": "비밀번호와 이메일 주소를 설정했어요!",
     "Remember, you can always set an email address in user settings if you change your mind.": "잊지마세요, 마음이 바뀌면 언제라도 사용자 설정에서 이메일 주소를 바꾸실 수 있다는 걸요.",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "손님으로 라이엇에 들어오셨네요. <a>계정을 등록하거나</a> <a>로그인하시고</a> 더 많은 방과 기능을 즐기세요!",

From 319cdd56e3a364f9fd5202ad1ae4840869ba69fc Mon Sep 17 00:00:00 2001
From: Enrique <mafrune@gmail.com>
Date: Thu, 15 Jun 2017 18:50:52 +0000
Subject: [PATCH 102/172] Translated using Weblate (Spanish)

Currently translated at 58.0% (116 of 200 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 9fd5dd5470..0fb34871e6 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -80,7 +80,7 @@
     "Room directory": "Directorio de salas",
     "Room not found": "Sala no encontrada",
     "Search for a room": "Buscar sala",
-    "Settings": "Ajustes",
+    "Settings": "Configuración",
     "Source URL": "URL de origen",
     "Start chat": "Comenzar chat",
     "The Home Server may be too old to support third party networks": "El Home Server puede ser demasiado antiguo para soportar redes de terceros",
@@ -112,5 +112,7 @@
     "Saturday": "Sábado",
     "Today": "Hoy",
     "Yesterday": "Ayer",
-    "Welcome page": "Página de bienvenida"
+    "Welcome page": "Página de bienvenida",
+    "Continue": "Continuar",
+    "Search": "Búsqueda"
 }

From 2c186aafaee56a50cd16be55e30806d675c433ac Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Jun 2017 11:36:24 +0100
Subject: [PATCH 103/172] Fix h2 in markdown being weird

Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.

Fixes https://github.com/vector-im/riot-web/issues/4328
---
 .../views/messages/DateSeparator.js           |  2 +-
 src/skins/vector/css/_components.scss         |  1 +
 .../structures/_RoomView.scss                 |  9 -------
 .../views/messages/_DateSeparator.scss        | 25 +++++++++++++++++++
 4 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 src/skins/vector/css/vector-web/views/messages/_DateSeparator.scss

diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index 3f75c3e749..84d63dd5ff 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -53,7 +53,7 @@ module.exports = React.createClass({
         }
 
         return (
-            <h2>{ label }</h2>
+            <h2 className="mx_DateSeparator">{ label }</h2>
         );
     }
 });
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index 4c4d7cc2a6..aef7f6db7b 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -77,6 +77,7 @@
 @import "./vector-web/views/elements/_ImageView.scss";
 @import "./vector-web/views/elements/_Spinner.scss";
 @import "./vector-web/views/globals/_MatrixToolbar.scss";
+@import "./vector-web/views/messages/_DateSeparator.scss";
 @import "./vector-web/views/messages/_MessageTimestamp.scss";
 @import "./vector-web/views/messages/_SenderProfile.scss";
 @import "./vector-web/views/rooms/_RoomDropTarget.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
index 6fd44d26f5..ae7735de8a 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -127,15 +127,6 @@ limitations under the License.
     clear: both;
 }
 
-.mx_RoomView_MessageList h2 {
-    clear: both;
-    margin-top: 32px;
-    margin-bottom: 8px;
-    margin-left: 63px;
-    padding-bottom: 6px;
-    border-bottom: 1px solid $primary-hairline-color;
-}
-
 .mx_RoomView_invitePrompt {
     order: 2;
 
diff --git a/src/skins/vector/css/vector-web/views/messages/_DateSeparator.scss b/src/skins/vector/css/vector-web/views/messages/_DateSeparator.scss
new file mode 100644
index 0000000000..f676d24bef
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/messages/_DateSeparator.scss
@@ -0,0 +1,25 @@
+/*
+Copyright 2017 Vector Creations Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_DateSeparator {
+    clear: both;
+    margin-top: 32px;
+    margin-bottom: 8px;
+    margin-left: 63px;
+    padding-bottom: 6px;
+    border-bottom: 1px solid $primary-hairline-color;
+}
+

From 5bc676a0426a3cfdeda89a271172fe3b51f1ae74 Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Fri, 16 Jun 2017 10:14:10 +0000
Subject: [PATCH 104/172] Translated using Weblate (Korean)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index a9fdcb5a94..95c100b4a8 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -113,16 +113,16 @@
     "Enable them now": "지금 켜기",
     "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
     "Failed to": "실패했어요",
-    "Failed to add tag %(tagName)s to room": "방에 %(tagName)s 태그를 추가하지 못했어요",
+    "Failed to add tag %(tagName)s to room": "방에 %(tagName)s로 지정하지 못했어요",
     "Failed to change settings": "설정을 바꾸지 못했어요",
     "Failed to forget room %(errCode)s": "방 %(errCode)s를 잊지 못했어요",
     "Failed to update keywords": "키워드를 갱신하지 못했어요",
     "Failed to get protocol list from Home Server": "홈 서버에서 프로토콜 목록을 얻지 못했어요",
     "Failed to get public room list": "공개한 방 목록을 얻지 못했어요",
     "Failed to join the room": "방에 들어가지 못했어요",
-    "Failed to remove tag %(tagName)s from room": "방에서 태그 %(tagName)s를 지우지 못했어요",
+    "Failed to remove tag %(tagName)s from room": "방에서 %(tagName)s 지정을 지우지 못했어요",
     "Failed to send report: ": "보고를 보내지 못했어요: ",
-    "Failed to set direct chat tag": "직접 이야기 태그를 설정하지 못했어요",
+    "Failed to set direct chat tag": "직접 이야기 지정을 설정하지 못했어요",
     "Failed to set Direct Message status of room": "방의 쪽지 상태를 설정하지 못했어요",
     "Favourite": "즐겨찾기",
     "Fetching third party location failed": "타사 위치를 불러오지 못했어요",

From 491d83b17fd88a0c7c2bfbeb70dfae094743c1c5 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Jun 2017 13:05:56 +0100
Subject: [PATCH 105/172] Enable Korean Translations

As it's now at 64% on react-sdk and looking good
---
 scripts/copy-res.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index b02946ae92..0e22907e62 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -16,6 +16,7 @@ const INCLUDE_LANGS = [
     {'value': 'nl', 'label': 'Nederlands'},
     {'value': 'de_DE', 'label': 'Deutsch'},
     {'value': 'fr', 'label': 'Français'},
+    {'value': 'ko', 'label': '한국어'},
     {'value': 'pt', 'label': 'Português'},
     {'value': 'pt_BR', 'label': 'Português do Brasil'},
     {'value': 'ru', 'label': 'Русский'},

From 1a1252863484131fb7be4703dd552a47a9fd0881 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Jun 2017 13:30:27 +0100
Subject: [PATCH 106/172] react-sdk rc.2

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

diff --git a/package.json b/package.json
index fcf8664514..dd17d4c9cb 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
     "matrix-js-sdk": "0.7.12-rc.1",
-    "matrix-react-sdk": "0.9.5-rc.1",
+    "matrix-react-sdk": "0.9.5-rc.2",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From 97611cfd27b83dd53c657b08dfe6ab7c3ceae73d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Jun 2017 13:30:49 +0100
Subject: [PATCH 107/172] v0.11.2-rc.2

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

diff --git a/electron_app/package.json b/electron_app/package.json
index 0f176fe4a6..25cb81a125 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.2-rc.1",
+  "version": "0.11.2-rc.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 37a219006d334a42d6afc0b6b42ccac28bf4df36 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Jun 2017 13:32:57 +0100
Subject: [PATCH 108/172] Prepare changelog for v0.11.2-rc.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 823f30dedb..f08c2073bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+Changes in [0.11.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.2-rc.2) (2017-06-16)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2-rc.1...v0.11.2-rc.2)
+
+ * Update react-sdk to pull in fixes for URL previews, CAS
+   login, h2 in markdown and CAPTCHA forms.
+ * Enable Korean translation
+ * Update from Weblate.
+   [\#4323](https://github.com/vector-im/riot-web/pull/4323)
+ * Fix h2 in markdown being weird
+   [\#4332](https://github.com/vector-im/riot-web/pull/4332)
+
 Changes in [0.11.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.11.2-rc.1) (2017-06-15)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.1...v0.11.2-rc.1)

From 8cf671242696e627780e50c5819b57cc7682fb6f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 16 Jun 2017 13:32:57 +0100
Subject: [PATCH 109/172] v0.11.2-rc.2

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

diff --git a/package.json b/package.json
index dd17d4c9cb..489779a9dd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.2-rc.1",
+  "version": "0.11.2-rc.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From 6df1574b8beeb3f6838f1ba7096019e0fcea9083 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 16 Jun 2017 15:05:14 +0100
Subject: [PATCH 110/172] onLoadCompleted is now onTokenLoginCompleted

---
 src/vector/index.js       | 18 ++++++++----------
 test/app-tests/loading.js |  8 +++++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/vector/index.js b/src/vector/index.js
index 9f16205164..da03327dab 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -216,18 +216,16 @@ function getConfig() {
     return deferred.promise;
 }
 
-function onLoadCompleted() {
+function onTokenLoginCompleted() {
     // if we did a token login, we're now left with the token, hs and is
     // url as query params in the url; a little nasty but let's redirect to
     // clear them.
-    if (window.location.search) {
-        var parsedUrl = url.parse(window.location.href);
-        parsedUrl.search = "";
-        var formatted = url.format(parsedUrl);
-        console.log("Redirecting to " + formatted + " to drop loginToken " +
-                    "from queryparams");
-        window.location.href = formatted;
-    }
+    var parsedUrl = url.parse(window.location.href);
+    parsedUrl.search = "";
+    var formatted = url.format(parsedUrl);
+    console.log("Redirecting to " + formatted + " to drop loginToken " +
+                "from queryparams");
+    window.location.href = formatted;
 }
 
 async function loadApp() {
@@ -288,7 +286,7 @@ async function loadApp() {
                 realQueryParams={params}
                 startingFragmentQueryParams={fragparts.params}
                 enableGuest={true}
-                onLoadCompleted={onLoadCompleted}
+                onTokenLoginCompleted={onTokenLoginCompleted}
                 initialScreenAfterLogin={getScreenFromLocation(window.location)}
                 defaultDeviceDisplayName={PlatformPeg.get().getDefaultDeviceDisplayName()}
             />,
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a323a26269..04c68377a9 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -47,7 +47,7 @@ describe('loading:', function () {
     // the mounted MatrixChat
     let matrixChat;
 
-    // a promise which resolves when the MatrixChat calls onLoadCompleted
+    // a promise which resolves when the MatrixChat calls onTokenLoginCompleted
     let loadCompletePromise;
 
     beforeEach(function() {
@@ -135,7 +135,7 @@ describe('loading:', function () {
                 realQueryParams={params}
                 startingFragmentQueryParams={fragParts.params}
                 enableGuest={true}
-                onLoadCompleted={loadCompleteDefer.resolve}
+                onTokenLoginCompleted={loadCompleteDefer.resolve}
                 initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
                 makeRegistrationUrl={() => {throw new Error('Not implemented');}}
             />, parentDiv
@@ -360,6 +360,8 @@ describe('loading:', function () {
                 loadApp({
                     uriFragment: "#/login",
                 });
+
+                return q.delay(1);
             });
 
             it('shows a login view', function() {
@@ -513,7 +515,7 @@ describe('loading:', function () {
 
                 return httpBackend.flush();
             }).then(() => {
-                // at this point, MatrixChat should fire onLoadCompleted, which
+                // at this point, MatrixChat should fire onTokenLoginCompleted, which
                 // makes index.js reload the app. We're not going to attempt to
                 // simulate the reload - just check that things are left in the
                 // right state for the reloaded app.

From 274536bf139c62a5753a976b5c264c63340e70e8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 16 Jun 2017 16:11:33 +0100
Subject: [PATCH 111/172] change dispatcher forward_event signature

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

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index e3f4d14042..bc82778aae 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -117,7 +117,7 @@ module.exports = React.createClass({
     onForwardClick: function() {
         dis.dispatch({
             action: 'forward_event',
-            content: this.props.mxEvent,
+            event: this.props.mxEvent,
         });
         this.closeMenu();
     },

From 3d0da059dcef4bed88fcd0cd0933c725c594e7f8 Mon Sep 17 00:00:00 2001
From: Szimszon <github@oregpreshaz.eu>
Date: Fri, 16 Jun 2017 17:48:10 +0000
Subject: [PATCH 112/172] Translated using Weblate (Hungarian)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 9f8b2bef8f..ac7497c1e6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -196,5 +196,7 @@
     "Continue": "Folytatás",
     "Please set a password!": "Kérlek, állíts be egy jelszót!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
-    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))"
+    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))",
+    "You have successfully set a password and an email address!": "Sikeresen beállítottad a jelszavad és e-mail címed!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál."
 }

From 7cdb73d74b49c0198f4404ab9127e668ffe40f14 Mon Sep 17 00:00:00 2001
From: Walter <studinsky@gmail.com>
Date: Fri, 16 Jun 2017 19:43:35 +0000
Subject: [PATCH 113/172] Translated using Weblate (Russian)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 49bb935d54..c3fa070ffc 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -7,7 +7,7 @@
     "Create new room": "Создать новую комнату",
     "Couldn't find a matching Matrix room": "Не возможно найти подходящую Матриксу комнату",
     "Custom Server Options": "Расширенные настройки сервера",
-    "delete the alias.": "удалить привязку.",
+    "delete the alias.": "удалить псевдоним.",
     "Delete the room alias": "Удалить привязку комнаты",
     "Direct Chat": "Приватный чат",
     "Directory": "Каталог",
@@ -35,7 +35,7 @@
     "Fetching third party location failed": "Не удалось получить местоположение",
     "Files": "Файлы",
     "Filter room names": "Фильтр по назв. комнаты",
-    "Forget": "Забыть",
+    "Forget": "Удалить",
     "from the directory": "из каталога",
     " from room": " из комнаты",
     "Guests can join": "Гость может присоединиться",
@@ -88,7 +88,7 @@
     "Drop here %(toAction)s": "Вставить сюда: %(toAction)s",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и очистить %(name)s из каталога?",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
-    "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
+    "Failed to forget room %(errCode)s": "Не удалось удалить комнату %(errCode)s",
     "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты",
     "Failed to set direct chat tag": "Не удалось пометить прямую беседу",
     "Unhide Preview": "Показать  анонс",
@@ -141,11 +141,11 @@
     "Forward Message": "Переслать сообщение дальше",
     "Hide panel": "Скрыть панель",
     "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжать",
-    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Что бы выявить проблему, будет отослан журнал этого клиента с сообщением о ошибке. Если ты только верхний текст отослать хочешь, отключи следующее:",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Что бы выявить проблему, будет отослан журнал этого клиента с сообщением о ошибке. Если Вы только верхний текст отослать хотите, отключите следующее:",
     "Loading bug report module": "Загрузи Модуль ошибок",
     "Messages containing <span>keywords</span>": "Сообщения, которые содержат определенные <span>ключевые слова</span>",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опиши (на Английском) ошибку. Что ты делал? Что ты ожидал получить? Что произошло?",
-    "Please describe the bug and/or send logs.": "Пожалуйста опиши ошибку и/или перешли протоколы.",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опишите (на Английском) ошибку. Что Вы делали? Что Вы ожидали получить? Что произошло?",
+    "Please describe the bug and/or send logs.": "Пожалуйста опишите ошибку и/или перешлите протоколы.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Пожалуйста установите <a href=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a> для лучшего результата.",
     "Report a bug": "Отчет о ошибке",
     "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s",
@@ -167,7 +167,7 @@
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы пользуетесь Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
     "OK": "ОК",
     "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видео звонком.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если ваш браузер не корректно отображает информацию и все или некоторые функции отключены, вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если Ваш браузер не корректно отображает информацию и все или некоторые функции отключены, Вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",
     "Login": "Войти",
     "Welcome to Riot.im": "Добро пожаловать на Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованное, шифрованное общение и сотрудничество на основе [matrix]",
@@ -193,7 +193,7 @@
     "Please set a password!": "Задайте пароль!",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix существует множество комнат, связанных с существующими сетями (Slack, IRC, Gitter и т.д.) Или независимыми. Ищите в каталоге!",
     "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
-    "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Теперь Вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
     "Support for those using the Matrix spec": "Поддержка для тех, кто использует спецификацию Matrix",
     "Design and implementation of E2E in Matrix": "Разработка и внедрение E2E в Matrix",
     "Implementing VR services with Matrix": "Внедрение служб VR с помощью Matrix",

From e6551e4590e57132c64c51d8f8f1bdcda95dbf6f Mon Sep 17 00:00:00 2001
From: Enrique <mafrune@gmail.com>
Date: Sat, 17 Jun 2017 10:19:31 +0000
Subject: [PATCH 114/172] Translated using Weblate (Spanish)

Currently translated at 58.5% (117 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
---
 src/i18n/strings/es.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 0fb34871e6..98aef49556 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -56,7 +56,7 @@
     "Messages in one-to-one chats": "Mensajes en chats uno a uno",
     "Messages sent by bot": "Mensajes enviados por bot",
     "more": "más",
-    "Mute": "Mute",
+    "Mute": "Silenciar",
     "No rooms to show": "Sin salas para mostrar",
     "Noisy": "Ruidoso",
     "Notification targets": "Objetivos de notificación",
@@ -65,9 +65,9 @@
     "Notify me for anything else": "Notificarme para cualquier otra cosa",
     "Off": "Apagado",
     "On": "Encendido",
-    "Operation failed": "Operación fallida",
+    "Operation failed": "Falló la operación",
     "Permalink": "Enlace permanente",
-    "Please Register": "Por favor regístrate",
+    "Please Register": "Por favor, regístrese",
     "Quote": "Citar",
     "Redact": "Redactar",
     "Reject": "Rechazar",
@@ -114,5 +114,6 @@
     "Yesterday": "Ayer",
     "Welcome page": "Página de bienvenida",
     "Continue": "Continuar",
-    "Search": "Búsqueda"
+    "Search": "Búsqueda",
+    "OK": "Correcto"
 }

From 9c8be7257488d250e03f0b3030cb2b4db621af98 Mon Sep 17 00:00:00 2001
From: Christopher Armstrong <radix@twistedmatrix.com>
Date: Sat, 17 Jun 2017 23:42:01 +0000
Subject: [PATCH 115/172] Translated using Weblate (English (United States))

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 63fadbe006..6e37469705 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -196,5 +196,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
     "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat"
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
+    "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind."
 }

From c585d80e3ef124bb0fea9774e5657d331b815b69 Mon Sep 17 00:00:00 2001
From: Elia <emrahkrkmz1@gmail.com>
Date: Sat, 17 Jun 2017 23:49:43 +0000
Subject: [PATCH 116/172] Added translation using Weblate (Turkish)

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

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/tr.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From d9b63a482cfcfda21963ffa4644de1a5f5bd57d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20P=C3=A9rez-Su=C3=A1rez?= <dps.helio@gmail.com>
Date: Sat, 17 Jun 2017 23:37:54 +0000
Subject: [PATCH 117/172] Translated using Weblate (Spanish)

Currently translated at 60.5% (121 of 200 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 98aef49556..84007782c1 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -115,5 +115,9 @@
     "Welcome page": "Página de bienvenida",
     "Continue": "Continuar",
     "Search": "Búsqueda",
-    "OK": "Correcto"
+    "OK": "Correcto",
+    "Failed to change password. Is your password correct?": "Falló al cambiar la clave, ¿Está correcta tu clave?",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> y <a href=\"http://opera.com\">Opera</a> también funcionan.",
+    "A new version of Riot is available.": "Una nueva versión de Riot está disponible.",
+    "Cancel": "Cancelar"
 }

From f2fa326c0c0e4f07bd6b85e4217a3bbd73ef4a17 Mon Sep 17 00:00:00 2001
From: Elia <emrahkrkmz1@gmail.com>
Date: Sun, 18 Jun 2017 02:06:23 +0000
Subject: [PATCH 118/172] Translated using Weblate (Turkish)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
---
 src/i18n/strings/tr.json | 203 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 202 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 9e26dfeeb6..761672f887 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1 +1,202 @@
-{}
\ No newline at end of file
+{
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName) işletim sisteminde %(browserName) ile %(appName)",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\"> Safari </a> ve<a href=\"http://opera.com\"> Opera </a> da çalışıyor.",
+    "A new version of Riot is available.": "Riot'un yeni bir versiyonu mevcuttur.",
+    "Add an email address above to configure email notifications": "E-posta bildirimlerini yapılandırmak için yukarıya bir e-posta adresi ekleyin",
+    "Advanced notification settings": "Gelişmiş bildirim ayarları",
+    "All messages": "Tüm mesajlar",
+    "All messages (loud)": "Tüm mesajlar (uzun)",
+    "All Rooms": "Tüm Odalar",
+    "All notifications are currently disabled for all targets.": "Tüm bildirimler şu anda tüm hedefler için devre dışı bırakılmıştır.",
+    "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.",
+    "Call invitation": "Arama davetiyesi",
+    "Cancel": "İptal Et",
+    "Cancel Sending": "Göndermeyi İptal Et",
+    "Can't update user notification settings": "Kullanıcı bildirim ayarları güncellenemiyor",
+    "Changelog": "Değişiklikler",
+    "Close": "Kapat",
+    "Collapse panel": "Katlanır panel",
+    "Collecting app version information": "Uygulama sürümü bilgileri toplanıyor",
+    "Collecting logs": "Kayıtlar toplanıyor",
+    "Create new room": "Yeni oda oluştur",
+    "Couldn't find a matching Matrix room": "Eşleşen bir Matrix odası bulunamadı",
+    "Custom Server Options": "Özel Sunucu Seçenekleri",
+    "customServer_text": "Farklı bir Ana Sunucu URL'si belirleyerek başka bir Matrix sunucusunda oturum açmak için Özel Sunucu Seçeneklerini kullanabilirsiniz. <br/> Bu , Riot'u mevcut Matrix hesabı ile farklı bir Ana Sunucuda kullanmanıza olanak tanır.<br/> <br/> Ayrıca Özel Kimlik Sunucu'da ayarlayabilirsiniz ama kullanıcıları e-posta adresleriyle veya kendi e-posta adresinizle davet edemezsiniz.",
+    "delete the alias.": "Tüm rumuzları sil.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias) oda rumuzu silinsin ve %(name) dizinden kaldırılsın mı ?",
+    "Describe your problem here.": "Probleminizi burada açıklayın.",
+    "Direct Chat": "Doğrudan Sohbet",
+    "Directory": "Dizin",
+    "Dismiss": "Reddet",
+    "Download this file": "Bu dosyayı indir",
+    "Drop here %(toAction)s": "Yapılacakları buraya bırak",
+    "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir",
+    "Enable desktop notifications": "Masaüstü bildirimlerini etkinleştir",
+    "Enable email notifications": "E-posta bildirimlerini etkinleştir",
+    "Enable notifications for this account": "Bu hesap için bildirimleri etkinleştir",
+    "Enable them now": "Onları şimdi etkinleştir",
+    "Enter keywords separated by a comma:": "Anahtar kelimeleri virgül ile ayırarak girin:",
+    "Error": "Hata",
+    "Error saving email notification preferences": "E-posta bildirim tercihlerini kaydetme hatası",
+    "#example": "örnek",
+    "Expand panel": "Genişletme paneli",
+    "Failed to": "Başaramadı",
+    "Failed to add tag %(tagName)s to room": "%(tagName) etiketi odaya eklenemedi",
+    "Failed to change settings": "Ayarlar değiştirilemedi",
+    "Failed to forget room %(errCode)s": "Odayı unutma başarısız oldu %(errCode)",
+    "Failed to update keywords": "Anahtar kelimeler güncellenemedi",
+    "Failed to get protocol list from Home Server": "Ana Sunucu'dan protokol listesi alınamadı",
+    "Failed to get public room list": "Genel odalar listesi alınamadı",
+    "Failed to join the room": "Odaya girilemedi",
+    "Failed to remove tag %(tagName)s from room": "Odadan %(tagName) etiketi kaldırılamadı",
+    "Failed to send report: ": "Rapor gönderilemedi: ",
+    "Failed to set direct chat tag": "Direkt sohbet etiketi ayarlanamadı",
+    "Failed to set Direct Message status of room": "Odanın Direkt Mesaj durumu ayarlanamadı",
+    "Favourite": "Favori",
+    "Fetching third party location failed": "Üçüncü parti konumunu çekemedi",
+    "Files": "Dosyalar",
+    "Filter room names": "Oda isimlerini filtrele",
+    "Forget": "Unut",
+    "Forward Message": "Mesajı İlet",
+    " from room": " Odadan",
+    "Guests can join": "Misafirler katılabilirler",
+    "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
+    "Hide panel": "Paneli gizle",
+    " (HTTP status %(httpStatus))": "(HTTP durumu &(httpStatus))",
+    "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Sorunları teşhis etmek için , bu istemciden kayıtlar hata raporu ile beraber gönderilecek . Yalnızca yukarıdaki metni göndermek isterseniz , lütfen işareti kaldırın:",
+    "Invite to this room": "Bu odaya davet et",
+    "Keywords": "Anahtar kelimeler",
+    "Leave": "Ayrıl",
+    "Login": "Oturum aç",
+    "Loading bug report module": "Hata raporlama modülü yükleniyor",
+    "Low Priority": "Düşük Öncelikli",
+    "Members": "Üyeler",
+    "Mentions only": "Sadece Mention'lar",
+    "Messages containing my display name": "İsmimi içeren mesajlar",
+    "Messages containing <span>keywords</span>": "<span> anahtar kelimeleri </span> içeren mesajlar",
+    "Messages containing my user name": "Kullanıcı ismimi içeren mesajlar",
+    "Messages in group chats": "Grup sohbetlerindeki mesajlar",
+    "Messages in one-to-one chats": "Bire bir sohbetlerdeki mesajlar",
+    "Messages sent by bot": "Bot tarafından gönderilen mesajlar",
+    "more": "Daha",
+    "Mute": "Sessiz",
+    "No rooms to show": "Gösterilecek oda yok",
+    "Noisy": "Gürültülü",
+    "Notification targets": "Bildirim hedefleri",
+    "Notifications": "Bildirimler",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Aşağıdaki anahtar kelimeleri ile ilgili bildirimler burada gösterilemeyen kuralları takip eder:",
+    "Notify for all other messages/rooms": "Diğer tüm mesajlar / odalar için bildirim yapın",
+    "Notify me for anything else": "Başka herhangi bir şey için bana bildirim yap",
+    "Off": "Kapalı",
+    "On": "Açık",
+    "Operation failed": "Operasyon başarısız",
+    "Permalink": "Kalıcı Bağlantı(permalink)",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Lütfen hatayı tanımlayın. Ne yaptınız ? Ne gerçekleşmesini beklediniz ? Ne gerçekleşti ?",
+    "Please describe the bug and/or send logs.": "Lütfen hatayı tanımlayın ve/veya kayıtları gönderin.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Lütfen <a href=\"https://www.google.com/chrome\"> Chrome </a> ya da <a href=\"https://getfirefox.com\"> Firefox </a> 'u en iyi deneyim için yükleyin.",
+    "Please Register": "Lütfen Kaydolun",
+    "powered by Matrix": "Matrix tarafından desteklenmektedir",
+    "Quote": "Alıntı",
+    "Redact": "Yazıya Dökme",
+    "Reject": "Reddet",
+    "Remove %(name)s from the directory?": "%(name)'i dizinden kaldırılsın mı ?",
+    "Remove": "Kaldır",
+    "remove %(name)s from the directory.": "%(name)'i dizinden kaldır.",
+    "Remove from Directory": "Dizinden Kaldır",
+    "Report a bug": "Hata Bildir",
+    "Resend": "Yeniden Gönder",
+    "Riot Desktop on %(platformName)s": "%(platformName) platformunda Riot Masaüstü",
+    "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
+    "Riot is not supported on mobile web. Install the app?": "Riot mobil web'de desteklenmiyor . Uygulamayı yükle ?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
+    "Room directory": "Oda dizini",
+    "Room not found": "Oda bulunamadı",
+    "Search": "Ara",
+    "Search…": "Arama…",
+    "Search for a room": "Oda ara",
+    "Send": "Gönder",
+    "Send logs": "Kayıtları gönder",
+    "Settings": "Ayarlar",
+    "Source URL": "Kaynak URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Üzgünüz , tarayıcınız Riot'u  <b> çalıştıramıyor </b>.",
+    "Start chat": "Sohbet başlat",
+    "The Home Server may be too old to support third party networks": "Ana Sunucu 3. parti ağları desteklemek için çok eski olabilir",
+    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
+    "The server may be unavailable or overloaded": "Sunucu kullanılamıyor veya aşırı yüklenmiş olabilir",
+    "This Room": "Bu Oda",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Bu odaya misafirler tarafından erişilemez . Kaydolursanız katılabilirsiniz.",
+    " to room": " odasına",
+    "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi",
+    "Unable to join network": "Ağa bağlanılamıyor",
+    "Unable to look up room ID from server": "Sunucudan oda ID'si aranamadı",
+    "Unavailable": "Kullanım dışı",
+    "Unhide Preview": "Önizlemeyi Göster",
+    "Unknown device": "Bilinmeyen aygıt",
+    "unknown error code": "Bilinmeyen hata kodu",
+    "Unnamed room": "İsimsiz oda",
+    "Update": "Güncelleştirme",
+    "Uploaded on %(date)s by %(user)s": "%(user) tarafında %(date) e yüklendi",
+    "Uploading report": "Rapor yükleniyor",
+    "View Decrypted Source": "Şifresi Çözülmüş(Decrypted) Kaynağı Görüntüle",
+    "View Source": "Kaynağı Görüntüle",
+    "What's New": "Yenilikler",
+    "What's new?": "Yeni olan ne ?",
+    "Waiting for response from server": "Sunucudan yanıt bekleniyor",
+    "When I'm invited to a room": "Bir odaya davet edildiğimde",
+    "World readable": "Okunabilir dünya",
+    "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code))",
+    "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code))",
+    "You are not receiving desktop notifications": "Masaüstü bildirimleri almıyorsunuz",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Konuk olarak Riotluyorsunuz. Daha fazla odaya ve özelliğe erişmek için <a> Kayıt Ol </a> ya da <a> Oturum Aç </a> !",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Onları Riot dışında bir istemciden yapılandırmış olabilirsiniz . Onları Riot içersinide ayarlayamazsınız ama hala geçerlidirler",
+    "Sunday": "Pazar",
+    "Monday": "Pazartesi",
+    "Tuesday": "Salı",
+    "Wednesday": "Çarşamba",
+    "Thursday": "Perşembe",
+    "Friday": "Cuma",
+    "Saturday": "Cumartesi",
+    "Today": "Bugün",
+    "Yesterday": "Dün",
+    "OK": "Tamam",
+    "You need to be using HTTPS to place a screen-sharing call.": "Ekran paylaşımlı arama yapmak için HTTPS kullanıyor olmalısınız.",
+    "Welcome page": "Karşılama sayfası",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
+    "Welcome to Riot.im": "Riot.im'e Hoş Geldiniz",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dağıtık , şifreli sohbet &amp; işbirliği ile Matrix tarafından desteklenmektedir",
+    "Search the room directory": "Oda dizinini ara",
+    "Chat with Riot Bot": "Riot Bot ile Sohbet Et",
+    "Get started with some tips from Riot Bot!": "Bazı Riot Bot ipuçları ile başlayın !",
+    "General discussion about Matrix and Riot": "Matrix ve Riot hakkında genel tartışma",
+    "Discussion of all things Matrix!": "Matrix'in tüm tartışması!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Masaüstü sohbet",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk sohbet",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk sohbet",
+    "Matrix technical discussions": "Matrix teknik tartışmalar",
+    "Running Matrix services": "Çalışan Matrix hizmetleri",
+    "Community-run support for Synapse": "Synapse için topluluk tarafından işlenen destek",
+    "Admin support for Dendrite": "Dendrite için Admin desteği",
+    "Announcements about Synapse releases": "Synapse sürümleri hakkında duyurular",
+    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc kullanan ve çalıştıran kullanıcılar için destek",
+    "Building services on Matrix": "Matrix üzerinde Yapı hizmetleri",
+    "Support for those using the Matrix spec": "Matrix teknik özelliklerini kullananlar için destek",
+    "Design and implementation of E2E in Matrix": "Matrix'te E2E ' nin Tasarım ve İmplementasyonu",
+    "Implementing VR services with Matrix": "Matrix'te VR hizmetlerini implement etmek",
+    "Implementing VoIP services with Matrix": "Matrix'te VoIP hizmetlerini implement etmek",
+    "Discussion of the Identity Service API": "Kimlik Hizmet API ( Identity Service API ) Tartışması",
+    "Support for those using, running and writing other bridges": "Diğer köprüleri kullanan , çalıştıran ve yazanlar için destek",
+    "Contributing code to Matrix and Riot": "Matrix ve Riot'a kod katkısı (contribution) sağla",
+    "Dev chat for the Riot/Web dev team": "Riot/Web Geliştirici takımı için Geliştirici sohbeti",
+    "Dev chat for the Dendrite dev team": "Dendrite Geliştirici Takımı için Geliştirici sohbeti",
+    "Co-ordination for Riot/Web translators": "Riot/Web çevirmenleri için koordinasyon",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix'te varolan ağlara (Slack , IRC , Gitter vb.) bağlı ya da bağımsız bir çok oda var . Dizini kontrol edin!",
+    "Failed to change password. Is your password correct?": "Şifre değiştirme başarısız oldu . Şifreniz doğru mu ?",
+    "You have successfully set a password!": "Başarıyla bir şifre ayarladınız!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Şimdi oturumunuzu iptal ettikten sonra başka cihazda oturum açarak hesabınıza dönebilirsiniz.",
+    "Continue": "Devam",
+    "Please set a password!": "Lütfen bir şifre ayarlayın !",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Bu oturumunuzu kapattıktan sonra hesabınıza dönmenizi ve diğer cihazlarda oturum açmanızı sağlar.",
+    "You have successfully set a password and an email address!": "Başarıyla bir şifre ve e-posta adresi ayarladın !",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Unutmayın , fikrinizi değiştirirseniz her zaman bir şifre ve e-posta adresi ayarlayabilirsiniz."
+}

From 851f4d4a879c4f577f2bca10b3ce80744b7f1ac8 Mon Sep 17 00:00:00 2001
From: alxlg <alexl@disroot.org>
Date: Sun, 18 Jun 2017 08:02:29 +0000
Subject: [PATCH 119/172] Added translation using Weblate (Italian)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/src/i18n/strings/it.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From 93a6e03f70e444929d12596af37d79574cb6c4bb Mon Sep 17 00:00:00 2001
From: Przemek Anuszek <przemas75@gmail.com>
Date: Sun, 18 Jun 2017 06:52:11 +0000
Subject: [PATCH 120/172] Translated using Weblate (Polish)

Currently translated at 84.5% (169 of 200 strings)

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

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 953aaa1f94..a60234c896 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -74,5 +74,98 @@
     "Messages containing my user name": "Wiadomości zawierające mój użytkownik",
     "Messages in group chats": "Wiadomości w czatach grupowych",
     "Messages sent by bot": "Wiadomości wysłane przez robota",
-    "more": "więcej"
+    "more": "więcej",
+    "Enable desktop notifications": "Włącz powiadomienia",
+    "Guest users can't invite users. Please register to invite.": "Gość nie ma uprawnień dow wysyłania zaproszeń. Proszę się zarejestrować.",
+    " (HTTP status %(httpStatus))": "(status HTTP %(httpStatus))",
+    "Leave": "Opuść",
+    "Login": "Logowanie",
+    "Members": "Członkowie",
+    "Messages containing my display name": "Wiadomości zawierające moją nazwę",
+    "Direct Chat": "Rozmowa bezpośrednia",
+    "Mute": "Wycisz",
+    "No rooms to show": "Brak pokoi",
+    "Notifications": "Powiadomienia",
+    "Failed to set direct chat tag": "Nie udało się ustawić znacznika rozmów bezpośrednich",
+    "Failed to set Direct Message status of room": "Nie udało się ustawić statusu Rozmów Bezpośrednich dla pokoju",
+    "Notification targets": "Cele powiadomień",
+    "Operation failed": "Operacja nieudana",
+    "Permalink": "Odnośnik bezpośredni",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Proszę opisz błąd. Co zostało zrobione? Czego oczekiwałeś? A co właściwie nastąpiło?",
+    "Please describe the bug and/or send logs.": "Proszę opisz błąd i/lub wyślij logi.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Zainstaluj proszę <a href=\"https://www.google.com/chrome\">Chrome</a> lub <a href=\"https://getfirefox.com\">Firefox</a>.",
+    "Please Register": "Proszę się zarejestrować",
+    "Quote": "Cytat",
+    "Remove %(name)s from the directory?": "Usunąć %(name)s z katalogu?",
+    "Remove from Directory": "Usuń z Katalogu",
+    "Report a bug": "Raportuj błąd",
+    "Resend": "Wyślij powtórnie",
+    "Riot Desktop on %(platformName)s": "Riot Desktop na %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot nie wie jak dołączyć do pokoju w tej sieci",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot używa wiele zaawansowanych technologii przeglądarki, które nie są dostępne lub są eksperymentalne w Twojej obecnej przeglądarce.",
+    "Room not found": "Pokój nie znaleziony",
+    "Send logs": "Wyślij logi",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie ma</b> możliwości uruchomienia Riot.",
+    "Start chat": "Rozpocznij rozmowę",
+    "powered by Matrix": "wspierane przez Matrix",
+    "Redact": "Zredaguj",
+    "Reject": "Odrzuć",
+    "Remove": "Usuń",
+    "remove %(name)s from the directory.": "usuń %(name)s z katalogu.",
+    "The Home Server may be too old to support third party networks": "Home Server może być za stary dla innych sieci",
+    "There are advanced notifications which are not shown here": "Są dodatkowe powiadomienia nie pokazane tutaj",
+    "The server may be unavailable or overloaded": "Server jest nieosiągalny lub jest przeciążony",
+    "This Room": "Ten pokój",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Ten pokój jest niedostępny dla gości. Może być po rejestracji.",
+    "Unable to join network": "Nie można dołączyć do sieci",
+    "Unable to look up room ID from server": "Nie można wyszukać ID pokoju na serwerze",
+    "Unavailable": "Niedostępny",
+    "Unhide Preview": "Odkryj podgląd",
+    "Unknown device": "Nieznane urządzenie",
+    "unknown error code": "nieznany kod błędu",
+    "Unnamed room": "Pokój bez nazwy",
+    "Update": "Uaktualnienie",
+    "Uploaded on %(date)s by %(user)s": "Wysłane %(date)s przez %(user)s",
+    "Uploading report": "Raport wysyłania",
+    "Messages in one-to-one chats": "Wiadomości w rozmowach jeden-do-jednego",
+    "Noisy": "Głośny",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Powiadomienia słów kluczowych, które spełniają reguły nie są tutaj wyświetlone:",
+    "Notify for all other messages/rooms": "Powiadom we wszystkich wiadomościach/pokojach",
+    "Notify me for anything else": "Powiadom mnie o całej reszcie",
+    "Off": "Wyłącz",
+    "On": "Włącz",
+    "Source URL": "Źródłowy URL",
+    " to room": " do pokoju",
+    "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomienia",
+    "View Decrypted Source": "Pokaż zdeszyfrowane źródło",
+    "View Source": "Pokaż źródło",
+    "What's New": "Co nowego",
+    "What's new?": "Co nowego?",
+    "Waiting for response from server": "Czekam na odpowiedź serwera",
+    "When I'm invited to a room": "Kiedy zostanę zaproszony do pokoju",
+    "World readable": "Całkowicie publiczne",
+    "You cannot delete this image. (%(code)s)": "Nie możesz usunąć tego obrazka. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Nie możesz usunąć tej wiadomości. (%(code)s)",
+    "You are not receiving desktop notifications": "Nie otrzymujesz powiadomień na pulpit",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting jako gość. <a>Zarejestruj się</a> albo <a>zaloguj się</a> aby uzyskać dostęp do pokojów lub dodatkowych możliwości!",
+    "Sunday": "Niedziela",
+    "Monday": "Poniedziałek",
+    "Tuesday": "Wtorek",
+    "Wednesday": "Środa",
+    "Thursday": "Czwartek",
+    "Friday": "Piątek",
+    "Saturday": "Sobota",
+    "Today": "Dzisiaj",
+    "Yesterday": "Wczoraj",
+    "OK": "OK",
+    "You need to be using HTTPS to place a screen-sharing call.": "Musisz używać bezpiecznego protokołu HTTPS aby użyć połączenia współdzielenia ekranu.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Z Twoją obecną przeglądarką, wygląd oraz wrażenia z używania aplikacji mogą być niepoprawne, a niektóre funkcje wcale nie działać. Kontynuuj jeśli chcesz spróbować, jednak trudno będzie pomóc w przypadku błędów, które mogą nastąpić!",
+    "Welcome to Riot.im": "Witamy w Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca wspierana przez [matrix]",
+    "Search the room directory": "Wyszukaj katalog pokojów",
+    "Chat with Riot Bot": "Rozmowa z Botem Riota",
+    "Get started with some tips from Riot Bot!": "Rozpocznij z wskazówkami Riot Bota!",
+    "General discussion about Matrix and Riot": "Generalna rozmowa o Matrix i Riot",
+    "Discussion of all things Matrix!": "Rozmowa o wszystkim Matrixowym!",
+    "Matrix technical discussions": "Dyskusje techniczne Matrixa"
 }

From 4d89e997b3639374cd55eb27c582d09d287815da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20=C5=81opaciuk?= <szymonlopaciuk@protonmail.ch>
Date: Sun, 18 Jun 2017 15:03:09 +0000
Subject: [PATCH 121/172] Translated using Weblate (Polish)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
---
 src/i18n/strings/pl.json | 71 +++++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 20 deletions(-)

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index a60234c896..6a44b4ee9a 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -25,12 +25,12 @@
     "Directory": "Księga adresowa",
     "Download this file": "Pobierz plik",
     "Welcome page": "Strona powitalna",
-    "Riot is not supported on mobile web. Install the app?": "Riot nie jest obsługiwany przez mobilną przeglądarkę internetową. Zainstaluj aplikację?",
-    "Room directory": "Katalog pokojowy",
+    "Riot is not supported on mobile web. Install the app?": "Riot nie jest obsługiwany przez przeglądarki mobilne. Zainstaluj aplikację?",
+    "Room directory": "Spis pokojów",
     "Search": "Szukaj",
     "Search…": "Szukaj…",
     "Search for a room": "Szukaj pokoju",
-    "Send": "Wysłać",
+    "Send": "Wyślij",
     "Settings": "Ustawienia",
     "Collapse panel": "Ukryj panel",
     "customServer_text": "Możesz używać opcji serwera niestandardowego do logowania się na inne serwery Matrix, określając inny adres URL serwera domowego.<br/>Pozwala to na wykorzystanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Można również ustawić niestandardowy serwer tożsamości, ale nie będzie można zapraszać użytkowników adresem e-mail, ani być zaproszony przez adres e-mailowy.",
@@ -70,10 +70,10 @@
     "Keywords": "Słowa kluczowe",
     "Loading bug report module": "Ładowanie modułu raportu błędów",
     "Low Priority": "Niski priorytet",
-    "Messages containing <span>keywords</span>": "Wiadomości zawierające słowa <span>kluczowe</span>",
-    "Messages containing my user name": "Wiadomości zawierające mój użytkownik",
+    "Messages containing <span>keywords</span>": "Wiadomości zawierające <span>słowa kluczowe</span>",
+    "Messages containing my user name": "Wiadomości zawierające moją nazwę użytkownika",
     "Messages in group chats": "Wiadomości w czatach grupowych",
-    "Messages sent by bot": "Wiadomości wysłane przez robota",
+    "Messages sent by bot": "Wiadomości wysłane przez bota",
     "more": "więcej",
     "Enable desktop notifications": "Włącz powiadomienia",
     "Guest users can't invite users. Please register to invite.": "Gość nie ma uprawnień dow wysyłania zaproszeń. Proszę się zarejestrować.",
@@ -81,31 +81,31 @@
     "Leave": "Opuść",
     "Login": "Logowanie",
     "Members": "Członkowie",
-    "Messages containing my display name": "Wiadomości zawierające moją nazwę",
+    "Messages containing my display name": "Wiadomości zawierające moją wyświetlaną nazwę",
     "Direct Chat": "Rozmowa bezpośrednia",
     "Mute": "Wycisz",
-    "No rooms to show": "Brak pokoi",
+    "No rooms to show": "Brak pokoi do wyświetlenia",
     "Notifications": "Powiadomienia",
     "Failed to set direct chat tag": "Nie udało się ustawić znacznika rozmów bezpośrednich",
     "Failed to set Direct Message status of room": "Nie udało się ustawić statusu Rozmów Bezpośrednich dla pokoju",
     "Notification targets": "Cele powiadomień",
     "Operation failed": "Operacja nieudana",
     "Permalink": "Odnośnik bezpośredni",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Proszę opisz błąd. Co zostało zrobione? Czego oczekiwałeś? A co właściwie nastąpiło?",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Proszę opisz problem (w miarę możliwości po angielsku). Co doprowadziło do błędu? Jakie było Twoje oczekiwanie, a co stało się zamiast tego?",
     "Please describe the bug and/or send logs.": "Proszę opisz błąd i/lub wyślij logi.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Zainstaluj proszę <a href=\"https://www.google.com/chrome\">Chrome</a> lub <a href=\"https://getfirefox.com\">Firefox</a>.",
     "Please Register": "Proszę się zarejestrować",
     "Quote": "Cytat",
     "Remove %(name)s from the directory?": "Usunąć %(name)s z katalogu?",
-    "Remove from Directory": "Usuń z Katalogu",
-    "Report a bug": "Raportuj błąd",
+    "Remove from Directory": "Usuń z katalogu",
+    "Report a bug": "Zgłoś błąd",
     "Resend": "Wyślij powtórnie",
     "Riot Desktop on %(platformName)s": "Riot Desktop na %(platformName)s",
-    "Riot does not know how to join a room on this network": "Riot nie wie jak dołączyć do pokoju w tej sieci",
+    "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot używa wiele zaawansowanych technologii przeglądarki, które nie są dostępne lub są eksperymentalne w Twojej obecnej przeglądarce.",
     "Room not found": "Pokój nie znaleziony",
     "Send logs": "Wyślij logi",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie ma</b> możliwości uruchomienia Riot.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić Riot.",
     "Start chat": "Rozpocznij rozmowę",
     "powered by Matrix": "wspierane przez Matrix",
     "Redact": "Zredaguj",
@@ -113,10 +113,10 @@
     "Remove": "Usuń",
     "remove %(name)s from the directory.": "usuń %(name)s z katalogu.",
     "The Home Server may be too old to support third party networks": "Home Server może być za stary dla innych sieci",
-    "There are advanced notifications which are not shown here": "Są dodatkowe powiadomienia nie pokazane tutaj",
-    "The server may be unavailable or overloaded": "Server jest nieosiągalny lub jest przeciążony",
+    "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj",
+    "The server may be unavailable or overloaded": "Serwer jest nieosiągalny lub jest przeciążony",
     "This Room": "Ten pokój",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Ten pokój jest niedostępny dla gości. Może być po rejestracji.",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Ten pokój jest niedostępny dla gości. Możliwe, że będziesz mógł dołączyć po rejestracji.",
     "Unable to join network": "Nie można dołączyć do sieci",
     "Unable to look up room ID from server": "Nie można wyszukać ID pokoju na serwerze",
     "Unavailable": "Niedostępny",
@@ -127,10 +127,10 @@
     "Update": "Uaktualnienie",
     "Uploaded on %(date)s by %(user)s": "Wysłane %(date)s przez %(user)s",
     "Uploading report": "Raport wysyłania",
-    "Messages in one-to-one chats": "Wiadomości w rozmowach jeden-do-jednego",
+    "Messages in one-to-one chats": "Wiadomości w rozmowach jeden-na-jeden",
     "Noisy": "Głośny",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Powiadomienia słów kluczowych, które spełniają reguły nie są tutaj wyświetlone:",
-    "Notify for all other messages/rooms": "Powiadom we wszystkich wiadomościach/pokojach",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Powiadomienia o słowach kluczowych spełniają reguły, które nie mogą być tu wyświetlone:",
+    "Notify for all other messages/rooms": "Powiadamiaj o wszystkich innych wiadomośsciach/pokojach",
     "Notify me for anything else": "Powiadom mnie o całej reszcie",
     "Off": "Wyłącz",
     "On": "Włącz",
@@ -167,5 +167,36 @@
     "Get started with some tips from Riot Bot!": "Rozpocznij z wskazówkami Riot Bota!",
     "General discussion about Matrix and Riot": "Generalna rozmowa o Matrix i Riot",
     "Discussion of all things Matrix!": "Rozmowa o wszystkim Matrixowym!",
-    "Matrix technical discussions": "Dyskusje techniczne Matrixa"
+    "Matrix technical discussions": "Dyskusje techniczne Matrixa",
+    "Fetching third party location failed": "Pobranie lokalizacji zewnętrznej nie powiodło się",
+    "Mentions only": "Tylko, gdy wymienieni",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Możliwe, że skofigurowałeś je w innym kliencie, niż Riot. Nie możesz ich zmieniać w Riot, ale nadal mają zastosowanie",
+    "Riot/Web &amp; Desktop chat": "Czat o Riot/Web i Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Czat o Riot/iOS i matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Czat o Riot/Android i matrix-android-sdk",
+    "Running Matrix services": "Utrzymywanie usług Matrix",
+    "Community-run support for Synapse": "Wsparcie społeczności dla Synapse",
+    "Admin support for Dendrite": "Wsparcie administratorskie dla Dendrite",
+    "Announcements about Synapse releases": "Ogłoszenia na temat Synapse",
+    "Support for those using and running matrix-appservice-irc": "Wsparcie dla hostujących i korzystających z matrix-appservice-irc",
+    "Building services on Matrix": "Tworzenie usług w oparciu o Matrix",
+    "Support for those using the Matrix spec": "Wsparcie dla używających specyfikacji Matrix",
+    "Design and implementation of E2E in Matrix": "Projektowanie i implementacja szyfrowania klient-klient (end-to-end) w Matrix",
+    "Implementing VR services with Matrix": "Implementowanie usług wirtualnej rzeczywistości w oparciu o Matrix",
+    "Implementing VoIP services with Matrix": "Implementowanie usług telefonii internetowej VoIP w oparciu o Matrix",
+    "Discussion of the Identity Service API": "Dyskusja na temat API Identity Service",
+    "Support for those using, running and writing other bridges": "Wsparcie dla używających, zapewniających i piszących inne mosty",
+    "Contributing code to Matrix and Riot": "Dokładanie kodu do Matrix lub Riot",
+    "Dev chat for the Riot/Web dev team": "Czat deweloperów zespołu Riot/Web",
+    "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite",
+    "Co-ordination for Riot/Web translators": "Koordynacja tłumaczy Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix ma wiele, już działających pokoi, połączonych z istniejącymi sieciami, takimi jak Slack, IRC lub Gitter, a także wiele zupełnie niezależnych. Możesz przejrzeć je wszystkie w spisie pokoi!",
+    "Failed to change password. Is your password correct?": "Zmiana hasła nie powiodła się. Czy Twoje hasło jest poprawne?",
+    "You have successfully set a password!": "Hasło zostało zmienione z powodzeniem!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Teraz możesz powrócić do swojego konta na innych urządzeniach po wylogowaniu i ponownym zalogowaniu się.",
+    "Continue": "Kontynuuj",
+    "Please set a password!": "Proszę, ustaw hasło!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "To pozwoli Ci powrócić do Twojego konta po wylogowaniu i ponownym zalogowaniu się na innych urządzeniach.",
+    "You have successfully set a password and an email address!": "Z powodzeniem ustawiono hasło i adres e-mail dla Twojego konta!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Pamiętaj, że zawsze możesz zmienić swój e-mail lub hasło w panelu ustawień użytkownika."
 }

From 886475af7eaa1f73de988949f8499ce6b3db7e9e Mon Sep 17 00:00:00 2001
From: Pitchaya Boonsarngsuk <brian.mwit@gmail.com>
Date: Sun, 18 Jun 2017 15:51:43 +0000
Subject: [PATCH 122/172] Translated using Weblate (Thai)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index c770dc3e43..976971c87e 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -197,5 +197,7 @@
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "ระบบแชทและประสานงาน ไร้ศูนย์กลางและเข้ารหัสได้ โดยใช้เทคโนโลยีจาก [matrix]",
     "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
-    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))"
+    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))",
+    "Remember, you can always set an email address in user settings if you change your mind.": "อย่าลืม คุณสามารถตั้งที่อยู่อีเมลในการตั้งค่าผู้ใช้ได้ทุกเมื่อหากคุณเปลี่ยนใจ",
+    "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!"
 }

From 7ae1a70a8d706f83c72c3eab5bda6d43bf3c4d1a Mon Sep 17 00:00:00 2001
From: zwindl <zwindl@protonmail.com>
Date: Sun, 18 Jun 2017 02:39:51 +0000
Subject: [PATCH 123/172] Translated using Weblate (Chinese (Simplified))

Currently translated at 16.0% (32 of 200 strings)

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

diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index f76aa160dd..ca0a9ccda8 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -3,5 +3,32 @@
     "Mute": "静音",
     "Notifications": "通知",
     "OK": "确定",
-    "Operation failed": "操作失败"
+    "Operation failed": "操作失败",
+    "%(appName)s via %(browserName)s on %(osName)s": "应用%(appName)通过%(osName)上的%(browserName)浏览器运行",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>和<a href=\"http://opera.com\">Opera</a>均可运行。",
+    "A new version of Riot is available.": "Riot 有更新可用。",
+    "Add an email address above to configure email notifications": "请在上方输入电子邮件地址以接收邮件通知",
+    "Advanced notification settings": "通知高级设置",
+    "All messages": "全部消息",
+    "All messages (loud)": "全部消息（高亮）",
+    "All Rooms": "全部房间",
+    "All notifications are currently disabled for all targets.": "当前所有目标的通知均已禁用。",
+    "An error occurred whilst saving your email notification preferences.": "保存邮件通知偏好设定时出现错误。",
+    "Call invitation": "语音邀请",
+    "Cancel": "取消",
+    "Cancel Sending": "取消发送",
+    "Can't update user notification settings": "不能更新用户通知设置",
+    "Changelog": "变更日志",
+    "Collecting app version information": "正在收集应用版本信息",
+    "Collecting logs": "正在收集日志",
+    "Create new room": "创建新房间",
+    "Couldn't find a matching Matrix room": "未找到符合的 Matrix 房间",
+    "Custom Server Options": "自定义服务器选项",
+    "customServer_text": "你可以通过指定自定义服务器选项中的其他 Home server URL 来登录其他 Matrix 服务器。<br/>该选项允许你在 Riot 上使用其他 Home server 上的帐号。<br/><br/>你也可以自定义身份验证服务器，但你将不能通过邮件邀请其他用户，同样的，你也不能通过邮件被其他用户邀请。",
+    "delete the alias.": "删除别名。",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除房间别名 %(alias) 并将 %(name) 从列表中删除吗？",
+    "Describe your problem here.": "在这里描述你的问题。",
+    "Directory": "房间列表",
+    "Dismiss": "设为已读",
+    "Download this file": "下载该文件"
 }

From 12dab61a6718739ef042413195d0ad340180bdc1 Mon Sep 17 00:00:00 2001
From: Raul <rauljgarcia@gmail.com>
Date: Sun, 18 Jun 2017 20:31:47 +0000
Subject: [PATCH 124/172] Translated using Weblate (Esperanto)

Currently translated at 49.5% (99 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
---
 src/i18n/strings/eo.json | 84 +++++++++++++++++++++++++++++++++-------
 1 file changed, 70 insertions(+), 14 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 49ccc6e60f..36efee22c5 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -3,30 +3,30 @@
     "All messages": "Ĉiuj mesaĝoj",
     "All messages (loud)": "Ĉiuj mesaĝoj (lauta)",
     "All Rooms": "Ĉiuj babilejoj",
-    "Cancel": "Nuligu",
-    "Create new room": "Kreu novan babilejon",
-    "delete the alias.": "Forviŝu la alinomon.",
-    "Describe your problem here.": "Priskribu vian problemon ĉi-tie.",
+    "Cancel": "Nuligi",
+    "Create new room": "Krei novan babilejon",
+    "delete the alias.": "Forviŝi la kromnomon.",
+    "Describe your problem here.": "Priskribi vian problemon ĉi tie.",
     "Direct Chat": "Rekta babilejo",
     "Directory": "Dosierujo",
     "Dismiss": "Eksigu",
     "Download this file": "Elŝutu ĉi-tiun dosieron",
     "#example": "#ekzemplo",
     "Files": "Dosieroj",
-    "Forget": "Forgesu",
+    "Forget": "Forgesi",
     " from room": " el babilejo",
     "Guests can join": "Gastoj povas aliĝi",
     "Guest users can't invite users. Please register to invite.": "Gasta uzantoj ne povas inviti uzantojn. Bonvolu registri por inviti.",
-    "I understand the risks and wish to continue": "Mi komprenas la riskoj kaj volas daŭrigi",
-    "Invite to this room": "Invitu al ĉi-tiun babilejon",
+    "I understand the risks and wish to continue": "Mi komprenas la riskonj kaj volas daŭrigi",
+    "Invite to this room": "Inviti en ĉi tiun babilejon",
     "Keywords": "Ŝlosilvortoj",
-    "Leave": "Lasu",
+    "Leave": "Foriri",
     "Low Priority": "Malalta prioritato",
-    "Messages containing my display name": "Mesaĝoj enhavantaj mia ekrano nomo",
-    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortoj</span>",
-    "Messages containing my user name": "Mesaĝoj enhavantaj mia uzantnomo",
+    "Messages containing my display name": "Mesaĝoj enhavantaj mian vidigan nomon",
+    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortojn</span>",
+    "Messages containing my user name": "Mesaĝoj enhavantaj mian uzantnomon",
     "Messages in group chats": "Mesaĝoj en grupaj babilejoj",
-    "Mute": "Silentigu",
+    "Mute": "Silentigi",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bonvolu priskribi la cimon. Kion vi faris? Kion vi atendis okazi? Kion fakte okazis?",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Bonvolu instali <a href=\"https://www.google.com/chrome\">\"Chrome\"</a> aŭ <a href=\"https://getfirefox.com\">\"Firefox\"</a> por la plej bona sperto.",
     "Please Register": "Bonvolu registri",
@@ -40,6 +40,62 @@
     "Search…": "Serĉu…",
     "Search for a room": "Serĉu por babilejon",
     "Send": "Sendu",
-    "Start chat": "Komencu babilo",
-    "This Room": "Ĉi-tiu Babilejo"
+    "Start chat": "Komenci babilo",
+    "This Room": "Ĉi-tiu Babilejo",
+    "Add an email address above to configure email notifications": "Aldonu retadreson supre por agordi retpoŝtajn sciigojn",
+    "Advanced notification settings": "Agordoj de sciigoj specialaj",
+    "Call invitation": "Invito al voko",
+    "All notifications are currently disabled for all targets.": "Ĉiuj sciigoj estas malvalidigitaj por ĉiu aparato.",
+    "An error occurred whilst saving your email notification preferences.": "Eraro okazis dum konservado de agordoj por retpoŝtaj sciigoj.",
+    "Cancel Sending": "Nuligi sendadon",
+    "Can't update user notification settings": "Ne eblas ĝisdatigi la agordojn de sciigoj al uzanto",
+    "Changelog": "Protokolo de ŝanĝoj",
+    "Close": "Fermi",
+    "Collapse panel": "Kaŝi panelon",
+    "Collecting app version information": "Kolektante informon pri versio de la aplikaĵo",
+    "Collecting logs": "Kolektante protokolon",
+    "Couldn't find a matching Matrix room": "Ne eblis trovi kongruantan ejon Matrix",
+    "Custom Server Options": "Opcioj pri personigo de servilo",
+    "customServer_text": "Vi povas uzi opciojn personigitajn de la servilo por ensaluti en aliajn servilojn Matrix specifante alian adreson URL-an de alia servilo Home.<br/>Tio permesas al vi uzi Riot per ekzistanta konto en alia Home servilo.<br/><br/>Vi povas ankaŭ agordi servilon identecan personigita, sed ne eblos inviti uzantojn pere de retpoŝtadreso, aŭ esti invitita pere de retpoŝtadreso vi mem.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Forviŝi la kromnomon de la ejo %(alias)s and forigi %(name)s el la dosierujo?",
+    "Enable audible notifications in web client": "Ebligi aŭdeblajn sciigojn en la retkliento",
+    "Enable desktop notifications": "Ebligi labortablajn sciigojn",
+    "Enable email notifications": "Ebligi retpoŝtajn sciigojn",
+    "Enable notifications for this account": "Ebligi sciigojn por tiu ĉi konto",
+    "Enable them now": "Ebligi ilin nun",
+    "Enter keywords separated by a comma:": "Entajpi ŝlosilvortojn apartigitaj per komoj:",
+    "Error": "Eraro",
+    "Error saving email notification preferences": "Eraro konservante agordojn pri retpoŝtaj sciigoj",
+    "Expand panel": "Pli grandigi panelon",
+    "Failed to": "Malsukcesis",
+    "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al la ejo",
+    "Failed to change settings": "Malsukcesis ŝanĝi la agordojn",
+    "Failed to forget room %(errCode)s": "Malsukcesis forgesi la ejon %(errCode)s",
+    "Failed to update keywords": "Malsukcesis ĝisdatigi la ŝlosilvortojn",
+    "Failed to get protocol list from Home Server": "Malsukcesis obteni la liston de protokoloj por la servilo Home",
+    "Failed to get public room list": "Malsukcesis obteni la liston de publikaj ejoj",
+    "Failed to join the room": "Malsukcesis aliĝi al la ejo",
+    "Failed to remove tag %(tagName)s from room": "Malsukcesis forigi la etikedon %(tagName)s el la ejo",
+    "Failed to send report: ": "Malsukcesis sendi raporton: ",
+    "Failed to set direct chat tag": "Malsukcesis agordi la etikedon de rekta babilejo",
+    "Failed to set Direct Message status of room": "Malsukcesis agordi la staton de Rekta Mesaĝo de la ejo",
+    "Forward Message": "Plusendi mesaĝon",
+    "Hide panel": "Kaŝi panelon",
+    " (HTTP status %(httpStatus))": "(stato HTTP %(httpStatus))",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Por diagnozi problemojn, protokoloj el tiu ĉi kliento sendiĝos kune kun tiu ĉi raporto de eraro. Se vi preferas sendi nur la supran tekston, bonvolu malŝalti:",
+    "Login": "Ensaluti",
+    "Loading bug report module": "Ŝarĝante modulon pri eraroraporto",
+    "Members": "Membroj",
+    "Mentions only": "Nur mencioj",
+    "Messages in one-to-one chats": "Mesaĝoj en unu-je-unu babilejoj",
+    "Messages sent by bot": "Mesaĝoj sendita per roboto",
+    "more": "pli",
+    "No rooms to show": "Neniu ejo por montri",
+    "Noisy": "Brua",
+    "Notification targets": "Celo de sciigoj",
+    "Notifications": "Sciigoj",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "La sciigoj de la sekvaj ŝlosilvortoj sekvas regulojn kiuj ne povas esti montrataj ĉi tie:",
+    "Notify for all other messages/rooms": "Sciigu min por ĉiu alia babilejo",
+    "Notify me for anything else": "Sciigu min por ĉio alia",
+    "Off": "Malŝaltita"
 }

From 0635a344ae99730a09c57bffc6bf1905aa26b23f Mon Sep 17 00:00:00 2001
From: Aviral Dasgupta <me@aviraldg.com>
Date: Sun, 18 Jun 2017 14:49:19 +0000
Subject: [PATCH 125/172] Translated using Weblate (Hindi)

Currently translated at 3.0% (6 of 200 strings)

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

diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
index 9e26dfeeb6..f8bfb088a8 100644
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -1 +1,8 @@
-{}
\ No newline at end of file
+{
+    "A new version of Riot is available.": "रायट के एक नया वर्शन उपलब्ध है।",
+    "All messages": "सारे संदेश",
+    "All Rooms": "सारे कमरे",
+    "Please set a password!": "कृपया एक पासवर्ड सेट करें!",
+    "Continue": "आगे बढ़ें",
+    "You have successfully set a password and an email address!": "आपने सफलतापूर्वक एक पासवर्ड और एक ईमेल एड्रेस सेट कर लिया है!"
+}

From ad57dd316902e5eb0405a52fa65817b9abc6553d Mon Sep 17 00:00:00 2001
From: alxlg <alexl@disroot.org>
Date: Sun, 18 Jun 2017 08:45:11 +0000
Subject: [PATCH 126/172] Translated using Weblate (Italian)

Currently translated at 31.5% (63 of 200 strings)

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

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 9e26dfeeb6..8dcc298406 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1 +1,65 @@
-{}
\ No newline at end of file
+{
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "Anche <a href=\"http://apple.com/safari\">Safari</a> e <a href=\"http://opera.com\"> Opera</a> funzionano.",
+    "A new version of Riot is available.": "È disponibile una nuova versione di Riot.",
+    "Add an email address above to configure email notifications": "Specifica un indirizzo email per configurazione le notifiche via email",
+    "Advanced notification settings": "Impostazioni notifiche avanzate",
+    "All messages": "Tutti i messaggi",
+    "All messages (loud)": "Tutti i messaggi (rumoroso)",
+    "All Rooms": "Tutte le stanze",
+    "An error occurred whilst saving your email notification preferences.": "È avvenuto un errore durante il salvataggio delle tue preferenze sulle notifiche email.",
+    "Call invitation": "Invito ad una chiamata",
+    "Cancel": "Annulla",
+    "Cancel Sending": "Annulla invio",
+    "Can't update user notification settings": "Impossibile aggiornare le impostazioni di notifica dell'utente",
+    "Changelog": "Cambiamenti",
+    "Close": "Chiudi",
+    "Collapse panel": "Riduci pannello",
+    "Collecting app version information": "Raccolta delle informazioni sulla versione dell'applicazione",
+    "Collecting logs": "Raccolta del registro",
+    "Create new room": "Crea una nuova stanza",
+    "Couldn't find a matching Matrix room": "Impossibile trovare una stanza Matrix corrispondente",
+    "Custom Server Options": "Opzioni server personale",
+    "customServer_text": "Puoi utilizzare un server personale per entrare in altri server Matrix specificando un diverso indirizzo per il server Home.<br/>Questo ti permetterà di usare Riot con un account Matrix già esistente su un altro server.<br/><br/>Puoi anche specificare un diverso server di identità ma non sarai in grado di invitare utenti o di essere invitato tramite indirizzo email.",
+    "delete the alias.": "Elimina gli alias.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminare l'alias %(alias)s e rimuovere %(name)s dalla lista?",
+    "Describe your problem here.": "Descrivi qui il tuo problema.",
+    "Direct Chat": "Chat diretta",
+    "Directory": "Lista",
+    "Dismiss": "Scarta",
+    "Download this file": "Scarica questo file",
+    "Enable audible notifications in web client": "Abilita notifiche audio nel client Web",
+    "Enable desktop notifications": "Abilita le notifiche desktop",
+    "Enable email notifications": "Abilita le notifiche email",
+    "Enable notifications for this account": "Abilita le notifiche per questo account",
+    "Enable them now": "Abilitale adesso",
+    "Enter keywords separated by a comma:": "Inserisci le parole chiave separate da virgole:",
+    "Error": "Errore",
+    "Error saving email notification preferences": "Errore nel salvataggio delle preferenze di notifica email",
+    "#example": "#esempio",
+    "Expand panel": "Espandi il pannello",
+    "Failed to": "Non si è riuscito a",
+    "Failed to add tag %(tagName)s to room": "Non si è riuscito ad aggiungere l'etichetta %(tagName)s alla stanza",
+    "Failed to change settings": "Non si è riuscito ad aggiornare le impostazioni",
+    "Failed to update keywords": "Non si è riuscito ad aggiornare le parole chiave",
+    "Failed to get protocol list from Home Server": "Non si è riuscito ad ottenere la lista protocollo dal server Home",
+    "Failed to get public room list": "Non si è riuscito ad ottenere la lista delle stanze pubbliche",
+    "Failed to join the room": "Non si è riuscito a entrare nella stanza",
+    "Failed to remove tag %(tagName)s from room": "Non si è riuscito a rimuovere il tag %(tagName)s dalla stanza",
+    "Failed to send report: ": "Non si è riuscito ad inviare il resoconto: ",
+    "Failed to set direct chat tag": "Non si è riuscito a impostare l'etichetta di chat diretta",
+    "Failed to set Direct Message status of room": "Non si è riuscito ad impostare lo stato di Messaggio Diretto alla stanza",
+    "Favourite": "Preferito",
+    "Files": "File",
+    "Filter room names": "Filtra i nomi delle stanze",
+    "Forget": "Dimentica",
+    "Forward Message": "Inoltra messaggio",
+    " from room": " dalla stanza",
+    "Guests can join": "Gli ospiti sono ammessi",
+    "Guest users can't invite users. Please register to invite.": "Gli utenti ospite non possono invitare  altri utenti. Registrati per invitare.",
+    "Hide panel": "Nascondi pannello",
+    "I understand the risks and wish to continue": "Sono consapevole dei rischi e vorrei continuare",
+    "Invite to this room": "Invita a entrare in questa stanza",
+    "Keywords": "Parole chiave",
+    "Leave": "Abbandona",
+    "Login": "Entra"
+}

From 5cc1f62839711292f825eccf44f6a30de42825d1 Mon Sep 17 00:00:00 2001
From: IMIN <2reeseenmin@gmail.com>
Date: Sun, 18 Jun 2017 06:00:03 +0000
Subject: [PATCH 127/172] Translated using Weblate (Korean)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 95c100b4a8..e0d1b40e5e 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -54,7 +54,7 @@
     "Please Register": "계정을 등록해주세요",
     "powered by Matrix": "매트릭스의 지원을 받고 있어요",
     "Quote": "인용하기",
-    "Redact": "수정",
+    "Redact": "지우기",
     "Reject": "거절하기",
     "Remove %(name)s from the directory?": "목록에서 %(name)s을 지우시겠어요?",
     "Remove": "지우기",
@@ -141,7 +141,7 @@
     "Messages in group chats": "이야기 모임의 메시지",
     "Messages in one-to-one chats": "1:1 이야기의 메시지",
     "Messages sent by bot": "봇이 보낸 메시지",
-    "Noisy": "크게",
+    "Noisy": "소리",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "여기 표시될 수 없는 규칙에 따라 다음 키워드는 알리지 않아요:",
     "Notify for all other messages/rooms": "다른 모든 메시지/방 알리기",
     "Notify me for anything else": "모든 걸 알리기",

From 9a203aab672532ad9c5f9959cb3556325d872f69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20=C5=81opaciuk?= <szymonlopaciuk@protonmail.ch>
Date: Sun, 18 Jun 2017 19:06:05 +0000
Subject: [PATCH 128/172] Translated using Weblate (Polish)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 6a44b4ee9a..ee68ad0a00 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -99,15 +99,15 @@
     "Remove %(name)s from the directory?": "Usunąć %(name)s z katalogu?",
     "Remove from Directory": "Usuń z katalogu",
     "Report a bug": "Zgłoś błąd",
-    "Resend": "Wyślij powtórnie",
+    "Resend": "Wyślij jeszcze raz",
     "Riot Desktop on %(platformName)s": "Riot Desktop na %(platformName)s",
     "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot używa wiele zaawansowanych technologii przeglądarki, które nie są dostępne lub są eksperymentalne w Twojej obecnej przeglądarce.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot używa wiele zaawansowanych technologii, które nie są dostępne lub są w fazie testów w Twojej przeglądarce.",
     "Room not found": "Pokój nie znaleziony",
     "Send logs": "Wyślij logi",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić Riot.",
     "Start chat": "Rozpocznij rozmowę",
-    "powered by Matrix": "wspierane przez Matrix",
+    "powered by Matrix": "zbudowane na Matrix",
     "Redact": "Zredaguj",
     "Reject": "Odrzuć",
     "Remove": "Usuń",
@@ -136,7 +136,7 @@
     "On": "Włącz",
     "Source URL": "Źródłowy URL",
     " to room": " do pokoju",
-    "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomienia",
+    "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień",
     "View Decrypted Source": "Pokaż zdeszyfrowane źródło",
     "View Source": "Pokaż źródło",
     "What's New": "Co nowego",

From 2b3ec5585025ffb51c1cf5a35a723f7563ff9595 Mon Sep 17 00:00:00 2001
From: GrigRUSS <grigruss@ya.ru>
Date: Fri, 16 Jun 2017 20:29:44 +0000
Subject: [PATCH 129/172] Translated using Weblate (Russian)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 c3fa070ffc..8c5ef574e4 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -119,7 +119,7 @@
     "Advanced notification settings": "Настройки уведомлений",
     "Call invitation": "Пригласительный звонок",
     "customServer_text": "Вы можете войти с помощью вашего сервера.<br/>Это позволяет вам использовать Riot с уже существующей учетной записью на другом сервере.<br/><br/>Вы также можете задать свой сервер идентификации, но тогда вы не можете приглашать пользователей с помощью email-адреса и не можете быть приглашены по нему.",
-    "Messages containing my display name": "Сообщения, содержащие мое отображаемое имя",
+    "Messages containing my display name": "Сообщения, содержащие мое имя",
     "Messages containing my user name": "Сообщение, содержащие мое имя пользователя",
     "Messages in group chats": "Сообщения в групповых чатах",
     "Messages in one-to-one chats": "Сообщения в приватных чатах",
@@ -164,7 +164,7 @@
     "What's New": "Что нового",
     "What's new?": "Что нового?",
     "Waiting for response from server": "Подождите ответа от сервера",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы пользуетесь Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы вошли в Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
     "OK": "ОК",
     "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видео звонком.",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если Ваш браузер не корректно отображает информацию и все или некоторые функции отключены, Вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",

From 8bc2b4a122ce98be06047d73545dcdd8d1b65875 Mon Sep 17 00:00:00 2001
From: "Carlos A. Carnero Delgado" <carloscarnero@gmail.com>
Date: Sun, 18 Jun 2017 01:04:59 +0000
Subject: [PATCH 130/172] Translated using Weblate (Spanish)

Currently translated at 74.5% (149 of 200 strings)

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

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 84007782c1..fe9a18c768 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -119,5 +119,33 @@
     "Failed to change password. Is your password correct?": "Falló al cambiar la clave, ¿Está correcta tu clave?",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> y <a href=\"http://opera.com\">Opera</a> también funcionan.",
     "A new version of Riot is available.": "Una nueva versión de Riot está disponible.",
-    "Cancel": "Cancelar"
+    "Cancel": "Cancelar",
+    "Describe your problem here.": "Describa su problema aquí.",
+    "Forward Message": "Reenviar mensaje",
+    "Hide panel": "Ocultar panel",
+    " (HTTP status %(httpStatus))": "(estado HTTP %(httpStatus))",
+    "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
+    "Changelog": "Bitácora de cambios",
+    "Collapse panel": "Colapsar panel",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Recuerde que, si es necesario, puede establecer una dirección de email en las preferencias de usuario.",
+    "All Rooms": "Todas las salas",
+    "Expand panel": "Expandir panel",
+    "Failed to": "Falló",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Para diagnosticar los problemas, las trazas de este cliente serán enviadas adjuntas a este informe de defecto. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
+    "Login": "Abrir sesión",
+    "Report a bug": "Informe un defecto",
+    "Search…": "Buscar…",
+    "Send": "Enviar",
+    "Send logs": "Enviar trazas",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "¡Lo sentimos! Su navegador <b>no puede</b> ejecutar Riot.",
+    "This Room": "Esta sala",
+    "Unavailable": "No disponible",
+    "Unknown device": "Dispositivo desconocido",
+    "Update": "Actualizar",
+    "Uploading report": "Enviando informe",
+    "What's New": "Lo que hay de nuevo",
+    "What's new?": "¿Qué hay de nuevo?",
+    "Waiting for response from server": "Esperando una respuesta del servidor",
+    "You have successfully set a password and an email address!": "¡Ha establecido exitosamente la contraseña y la dirección de email!",
+    "You have successfully set a password!": "¡Ha establecido exitosamente una contraseña!"
 }

From 6ace710a6506609e8fd516751af1960ef21f520f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Magr=C3=AD?= <sebasmagri@gmail.com>
Date: Sun, 18 Jun 2017 22:41:39 +0000
Subject: [PATCH 131/172] Translated using Weblate (Spanish)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
---
 src/i18n/strings/es.json | 53 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index fe9a18c768..97a6da536e 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -147,5 +147,56 @@
     "What's new?": "¿Qué hay de nuevo?",
     "Waiting for response from server": "Esperando una respuesta del servidor",
     "You have successfully set a password and an email address!": "¡Ha establecido exitosamente la contraseña y la dirección de email!",
-    "You have successfully set a password!": "¡Ha establecido exitosamente una contraseña!"
+    "You have successfully set a password!": "¡Ha establecido exitosamente una contraseña!",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s en %(osName)s",
+    "All messages (loud)": "Todos los mensajes (ruidoso)",
+    "All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas en todos los objetivos.",
+    "Collecting app version information": "Recolectando información de la versión de la aplicación",
+    "Collecting logs": "Recolectando registros",
+    "Dismiss": "Omitir",
+    "Failed to send report: ": "Error al enviar reporte: ",
+    "Loading bug report module": "Cargando módulo de reporte de errores",
+    "Messages containing <span>keywords</span>": "Mensajes que contienen <span>palabras clave</span>",
+    "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa el error. Qué acción ejecutó? Cuál era el resultado que esperaba? Que pasó realmente?",
+    "Please describe the bug and/or send logs.": "Por favor describa el error y/o envíe los registros.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Por favor instale <a href=\"https://www.google.com/chrome\">Google Chrome</a> o <a href=\"https://getfirefox.com\">Mozilla Firefox</a> para una mejor experiencia.",
+    "powered by Matrix": "con el poder de Matrix",
+    "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s",
+    "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. Quieres instalar la aplicación?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Está usando Riot como invitado. ¡<a>Regístrese</a> o <a>inicie sesión</a> para acceder más salas y características!",
+    "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
+    "Welcome to Riot.im": "Bienvenido a Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones &amp; colaboración cifradas y descentralizadas con el poder de [matrix]",
+    "Search the room directory": "Buscar en el directorio de salas",
+    "Chat with Riot Bot": "Conversar con el Bot de Riot",
+    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos tips de Riot Bot!",
+    "General discussion about Matrix and Riot": "Discusión general sobre Matrix y Riot",
+    "Discussion of all things Matrix!": "¡Discusión sobre todas las cosas de Matrix!",
+    "Riot/Web &amp; Desktop chat": "Conversaciones de Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Conversaciones sobre Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Conversaciones sobre Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Discusiones técnicas sobre Matrix",
+    "Running Matrix services": "Ejecutando servicios de Matrix",
+    "Community-run support for Synapse": "Soporte comunitario de Synapse",
+    "Admin support for Dendrite": "Soporte administrativo para Dendrite",
+    "Announcements about Synapse releases": "Anuncios de lanzamientos de Synapse",
+    "Support for those using and running matrix-appservice-irc": "Soporte para aquellos que usan o administran matrix-appservice-irc",
+    "Building services on Matrix": "Construyendo servicios con Matrix",
+    "Support for those using the Matrix spec": "Soporte para usuarios de la especificación de Matrix",
+    "Design and implementation of E2E in Matrix": "Diseño e implementación de E2E en Matrix",
+    "Implementing VR services with Matrix": "Implementación de servicios VR con Matrix",
+    "Implementing VoIP services with Matrix": "Implementación de servicios VoIP con Matrix",
+    "Discussion of the Identity Service API": "Discusión sobre el API de Identity Service",
+    "Support for those using, running and writing other bridges": "Soporte para usuarios, administradores y desarrolladores de otros puentes",
+    "Contributing code to Matrix and Riot": "Contribuciones de código para Matrix y Riot",
+    "Dev chat for the Riot/Web dev team": "Conversaciones del equipo de desarrollo de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Conversaciones del equipo de desarrollo de Dendrite",
+    "Co-ordination for Riot/Web translators": "Coordinación para traductores de Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muchas salas ya están disponibles en Matrix, enlazadas a redes existentes (Slack, IRC, Gitter, etc) o independientes. ¡Revisa el directorio!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Ahora puedes regresar a tu cuenta después de cerrar tu sesión, e iniciar sesión en otros dispositivos.",
+    "Please set a password!": "¡Por favor establece una contraseña!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto le permitirá regresar a su cuenta después de cerrar sesión, así como iniciar sesión en otros dispositivos."
 }

From a4abccdcefb62910162c63e3b454fbdc07362682 Mon Sep 17 00:00:00 2001
From: Raul <rauljgarcia@gmail.com>
Date: Sun, 18 Jun 2017 22:40:22 +0000
Subject: [PATCH 132/172] Translated using Weblate (Esperanto)

Currently translated at 83.0% (166 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
---
 src/i18n/strings/eo.json | 89 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 11 deletions(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 36efee22c5..4a50ff5609 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -32,16 +32,16 @@
     "Please Register": "Bonvolu registri",
     "powered by Matrix": "funkciigata de \"Matrix\"",
     "Quote": "Citu",
-    "Reject": "Malakceptu",
-    "Resend": "Resendu",
-    "Room directory": "Babilejo dosierujo",
-    "Room not found": "Babilejon ne trovis",
-    "Search": "Serĉu",
-    "Search…": "Serĉu…",
-    "Search for a room": "Serĉu por babilejon",
-    "Send": "Sendu",
-    "Start chat": "Komenci babilo",
-    "This Room": "Ĉi-tiu Babilejo",
+    "Reject": "Malakcepti",
+    "Resend": "Resendi",
+    "Room directory": "Babileja dosierujo",
+    "Room not found": "Babilejo ne trovita",
+    "Search": "Serĉi",
+    "Search…": "Serĉi…",
+    "Search for a room": "Serĉi babilejon",
+    "Send": "Sendi",
+    "Start chat": "Komenci babiladon",
+    "This Room": "Ĉi tiu Babilejo",
     "Add an email address above to configure email notifications": "Aldonu retadreson supre por agordi retpoŝtajn sciigojn",
     "Advanced notification settings": "Agordoj de sciigoj specialaj",
     "Call invitation": "Invito al voko",
@@ -97,5 +97,72 @@
     "Notifications on the following keywords follow rules which can’t be displayed here:": "La sciigoj de la sekvaj ŝlosilvortoj sekvas regulojn kiuj ne povas esti montrataj ĉi tie:",
     "Notify for all other messages/rooms": "Sciigu min por ĉiu alia babilejo",
     "Notify me for anything else": "Sciigu min por ĉio alia",
-    "Off": "Malŝaltita"
+    "Off": "Malŝaltita",
+    "On": "Ŝaltita",
+    "Operation failed": "La operacio malsukcesis",
+    "Permalink": "Konstanta ligilo",
+    "Please describe the bug and/or send logs.": "Bonvolu priskribi la cimon kaj/aŭ sendi protokolojn.",
+    "Redact": "Redakti",
+    "Remove %(name)s from the directory?": "Forigi %(name)s el la dosierujo?",
+    "Remove": "Forigi",
+    "remove %(name)s from the directory.": "forigi %(name)s el la dosierujo.",
+    "Remove from Directory": "Forigi el Dosierujo",
+    "Report a bug": "Raporti cimon",
+    "Riot Desktop on %(platformName)s": "Riot Labortablo sur %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot ne scias kiel aliĝi al ejo en tiu ĉi reto",
+    "Riot is not supported on mobile web. Install the app?": "Riot ne estas subtenita je mobile web. Instali la aplikaĵon?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uzas multajn specialajn trajtojn, kelkaj ne estas disponeblaj aŭ estas eksperimentaj en via nuna retumilo.",
+    "Send logs": "Sendi protokolojn",
+    "Settings": "Agordoj",
+    "Source URL": "Fonta URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Pardonu, via retumilo <b>ne kapablas</b> funkciigi Riot.",
+    "The Home Server may be too old to support third party networks": "La servilo Home povas esti tro malnova por subteni retoj de ekstera liveranto",
+    "There are advanced notifications which are not shown here": "Estas specialaj sciigoj kiuj ne estas montritaj ĉi tie",
+    "The server may be unavailable or overloaded": "La servilo povas esti maldisponebla aŭ tro ŝarĝita",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Ci tiu ejo estas neenirebla por gastoj. Vi povus aliĝi se vi registriĝas.",
+    " to room": " al ejo",
+    "Unable to fetch notification target list": "Ne eblis obteni la liston de celoj por sciigoj",
+    "Unable to join network": "Ne eblis kuniĝi kun la reto",
+    "Unable to look up room ID from server": "Ne eblis trovi la identigon el la servilo",
+    "Unavailable": "Maldisponebla",
+    "Unhide Preview": "Malkaŝi antaŭrigardon",
+    "Unknown device": "Nekonata aparato",
+    "unknown error code": "kodo de nekonata eraro",
+    "Unnamed room": "Nekonata ejo",
+    "Update": "Ĝisdatigi",
+    "Uploaded on %(date)s by %(user)s": "Alŝutita je %(date)s per %(user)s",
+    "Uploading report": "Alŝutante raporton",
+    "View Decrypted Source": "Vidi malĉifritan fonton",
+    "View Source": "Vidi fonton",
+    "What's New": "Kio novas",
+    "What's new?": "Kio novas?",
+    "Waiting for response from server": "Atendante respondon el la servilo",
+    "When I'm invited to a room": "Kiam mi estas invitita en ejon",
+    "World readable": "Legebla tutmonde",
+    "You cannot delete this image. (%(code)s)": "Vi ne povas forviŝi tiun ĉi bildon. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Vi ne povas forviŝi tiun ĉi mesaĝon. (%(code)s)",
+    "You are not receiving desktop notifications": "Vi ne estas ricevante sciigojn labortablan",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vi uzas Riot kiel gasto. <a>Registriĝu</a> aŭ <a>ensalutu</a> por atingi pli da ejoj kaj funkcioj!",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vi eble agordis ilin en kliento kiu ne estis Riot. Vi ne povas agordi ilin en Riot sed ili ankoraŭ validas",
+    "Sunday": "Dimanĉo",
+    "Monday": "Lundo",
+    "Tuesday": "Mardo",
+    "Wednesday": "Merkredo",
+    "Thursday": "Ĵaŭdo",
+    "Friday": "Vendredo",
+    "Saturday": "Sabato",
+    "Today": "Hodiaŭ",
+    "Yesterday": "Hieraŭ",
+    "OK": "Bone",
+    "You need to be using HTTPS to place a screen-sharing call.": "Vi devas uzi HTTPS por starigi ekranan vokon.",
+    "Welcome page": "Paĝo de bonveno",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Kun via nuna retumilo, la aspekto kaj funkciado de la aplikaĵo povas esti tute malĝusta, kaj kelkaj aŭ ĉiu funkcioj eble ne funkcios. Se vi volas provi ĉiuokaze vi rajtas daŭrigi, sed ne estos subteno se vi trafas problemojn!",
+    "Welcome to Riot.im": "Bonvenon al Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Malcentra, ĉifrita babilejo &amp; kunlaboro povigita de [matrix]",
+    "Search the room directory": "Serĉi la ejan dosierujon",
+    "Chat with Riot Bot": "Babili kun la roboto Riot Bot",
+    "Get started with some tips from Riot Bot!": "Eki per sugesto de la roboto Riot Bot!",
+    "General discussion about Matrix and Riot": "Ĝenerala diskutado pri Matrix kaj Riot",
+    "Discussion of all things Matrix!": "Diskutado pri ĉio rilate al Matrix!",
+    "Riot/Web &amp; Desktop chat": "Diskudato labortabla pri Riot/Web"
 }

From 0e00f708f10df5be47ca9d6891012366d0538ace Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szymon=20=C5=81opaciuk?= <szymonlopaciuk@protonmail.ch>
Date: Sun, 18 Jun 2017 22:38:54 +0000
Subject: [PATCH 133/172] Translated using Weblate (Polish)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index ee68ad0a00..4ca24868bc 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -112,7 +112,7 @@
     "Reject": "Odrzuć",
     "Remove": "Usuń",
     "remove %(name)s from the directory.": "usuń %(name)s z katalogu.",
-    "The Home Server may be too old to support third party networks": "Home Server może być za stary dla innych sieci",
+    "The Home Server may be too old to support third party networks": "Serwer domowy może być za stary dla innych sieci",
     "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj",
     "The server may be unavailable or overloaded": "Serwer jest nieosiągalny lub jest przeciążony",
     "This Room": "Ten pokój",

From f9ef5e84988a844c7d8cc3875dac7a065cf261df Mon Sep 17 00:00:00 2001
From: Raul <rauljgarcia@gmail.com>
Date: Sun, 18 Jun 2017 22:44:39 +0000
Subject: [PATCH 134/172] Translated using Weblate (Esperanto)

Currently translated at 84.0% (168 of 200 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 4a50ff5609..ae0e365eb7 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -164,5 +164,7 @@
     "Get started with some tips from Riot Bot!": "Eki per sugesto de la roboto Riot Bot!",
     "General discussion about Matrix and Riot": "Ĝenerala diskutado pri Matrix kaj Riot",
     "Discussion of all things Matrix!": "Diskutado pri ĉio rilate al Matrix!",
-    "Riot/Web &amp; Desktop chat": "Diskudato labortabla pri Riot/Web"
+    "Riot/Web &amp; Desktop chat": "Diskudato labortabla pri Riot/Web",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Diskutado pri Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Diskutado pri Riot/Android &amp; matrix-android-sdk"
 }

From 2fa05f8d615c9bd7f92637c8098b59345b78155d Mon Sep 17 00:00:00 2001
From: Raul <rauljgarcia@gmail.com>
Date: Sun, 18 Jun 2017 22:49:06 +0000
Subject: [PATCH 135/172] Translated using Weblate (Esperanto)

Currently translated at 87.0% (174 of 200 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index ae0e365eb7..7556aa83f1 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -166,5 +166,11 @@
     "Discussion of all things Matrix!": "Diskutado pri ĉio rilate al Matrix!",
     "Riot/Web &amp; Desktop chat": "Diskudato labortabla pri Riot/Web",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Diskutado pri Riot/iOS &amp; matrix-ios-sdk",
-    "Riot/Android &amp; matrix-android-sdk chat": "Diskutado pri Riot/Android &amp; matrix-android-sdk"
+    "Riot/Android &amp; matrix-android-sdk chat": "Diskutado pri Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Teknikaj diskutoj pri Matrix",
+    "Running Matrix services": "Funkciigado de servoj Matrix",
+    "Community-run support for Synapse": "Komunuma subtenado de Synapse",
+    "Admin support for Dendrite": "Administra subtenado por Dendrite",
+    "Announcements about Synapse releases": "Anoncoj pri eldonoj Synapse",
+    "Support for those using and running matrix-appservice-irc": "Subteno por tiuj, kiuj uzas kaj funkciigas matrix-appservice-irc"
 }

From eaf61526fbd6d4872f1b6bafd90f57226806f360 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 18 Jun 2017 23:50:13 +0100
Subject: [PATCH 136/172] add new languages

---
 scripts/copy-res.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 0e22907e62..e8f6684d21 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -13,16 +13,21 @@ const INCLUDE_LANGS = [
     {'value': 'en_US', 'label': 'English (US)'},
     {'value': 'da', 'label': 'Dansk'},
     {'value': 'el', 'label': 'Ελληνικά'},
+    {'value': 'eo', 'label': 'Esperanto'},
     {'value': 'nl', 'label': 'Nederlands'},
     {'value': 'de_DE', 'label': 'Deutsch'},
     {'value': 'fr', 'label': 'Français'},
+    {'value': 'hu', 'label': 'Magyar'},
     {'value': 'ko', 'label': '한국어'},
+    {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
+    {'value': 'pl', 'label': 'Polski'},
     {'value': 'pt', 'label': 'Português'},
     {'value': 'pt_BR', 'label': 'Português do Brasil'},
     {'value': 'ru', 'label': 'Русский'},
     {'value': 'sv', 'label': 'Svenska'},
     {'value': 'es', 'label': 'Español'},
     {'value': 'th', 'label': 'ไทย'},
+    {'value': 'tr', 'label': 'Türk'},
     {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
     {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
 ];

From 82eb69324d566dc34789204e3bde835520aa8e04 Mon Sep 17 00:00:00 2001
From: Raul <rauljgarcia@gmail.com>
Date: Sun, 18 Jun 2017 22:50:04 +0000
Subject: [PATCH 137/172] Translated using Weblate (Esperanto)

Currently translated at 88.0% (176 of 200 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 7556aa83f1..efa658e0e9 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -172,5 +172,7 @@
     "Community-run support for Synapse": "Komunuma subtenado de Synapse",
     "Admin support for Dendrite": "Administra subtenado por Dendrite",
     "Announcements about Synapse releases": "Anoncoj pri eldonoj Synapse",
-    "Support for those using and running matrix-appservice-irc": "Subteno por tiuj, kiuj uzas kaj funkciigas matrix-appservice-irc"
+    "Support for those using and running matrix-appservice-irc": "Subteno por tiuj, kiuj uzas kaj funkciigas matrix-appservice-irc",
+    "Building services on Matrix": "Konstruante servojn per Matrix",
+    "Support for those using the Matrix spec": "Subteno por tiuj, kiuj uzas la specifon Matrix"
 }

From 6b1ffaff7a69f2a41da1db87a358ff6219aa7a6f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 18 Jun 2017 23:54:29 +0100
Subject: [PATCH 138/172] fix broken http status i18n

---
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/el.json    | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 src/i18n/strings/en_US.json | 2 +-
 src/i18n/strings/eo.json    | 2 +-
 src/i18n/strings/es.json    | 2 +-
 src/i18n/strings/fr.json    | 2 +-
 src/i18n/strings/hu.json    | 2 +-
 src/i18n/strings/ko.json    | 2 +-
 src/i18n/strings/nl.json    | 2 +-
 src/i18n/strings/pl.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 src/i18n/strings/ru.json    | 2 +-
 src/i18n/strings/th.json    | 2 +-
 src/i18n/strings/tr.json    | 2 +-
 src/i18n/strings/uk.json    | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e5044c9758..19d43523ed 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -205,7 +205,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.",
     "Dev chat for the Dendrite dev team": "Entwickler-Chat für das Dendrite-Entwickler-Team",
     "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot",
-    " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-Status %(httpStatus)s)",
     "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
     "Remember, you can always set an email address in user settings if you change your mind.": "Denk daran, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst."
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index f1dc8b8334..c9f9373a5a 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -156,7 +156,7 @@
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
     "Quote": "Παράθεση",
     "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
-    " (HTTP status %(httpStatus))": "(Κατάσταση HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(Κατάσταση HTTP %(httpStatus)s)",
     "Login": "Σύνδεση",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το Riot χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
     "The Home Server may be too old to support third party networks": "Ο διακομιστής μπορεί να είναι αρκετά παλιός για να υποστηρίζει δίκτυα τρίτων",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bdf0c08222..4717e267ea 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -62,7 +62,7 @@
   "Guests can join": "Guests can join",
   "Guest users can't invite users. Please register to invite.": "Guest users can't invite users. Please register to invite.",
   "Hide panel": "Hide panel",
-  " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+  "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
   "I understand the risks and wish to continue": "I understand the risks and wish to continue",
   "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:",
   "Invite to this room": "Invite to this room",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 6e37469705..2d7a5fa148 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -164,7 +164,7 @@
     "Login": "Login",
     "Continue": "Continue",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
-    " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Welcome to Riot.im": "Welcome to Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
     "Chat with Riot Bot": "Chat with Riot Bot",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 4a50ff5609..bfc8bcd0a1 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -81,7 +81,7 @@
     "Failed to set Direct Message status of room": "Malsukcesis agordi la staton de Rekta Mesaĝo de la ejo",
     "Forward Message": "Plusendi mesaĝon",
     "Hide panel": "Kaŝi panelon",
-    " (HTTP status %(httpStatus))": "(stato HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(stato HTTP %(httpStatus)s)",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Por diagnozi problemojn, protokoloj el tiu ĉi kliento sendiĝos kune kun tiu ĉi raporto de eraro. Se vi preferas sendi nur la supran tekston, bonvolu malŝalti:",
     "Login": "Ensaluti",
     "Loading bug report module": "Ŝarĝante modulon pri eraroraporto",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 97a6da536e..af1efb60e8 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -123,7 +123,7 @@
     "Describe your problem here.": "Describa su problema aquí.",
     "Forward Message": "Reenviar mensaje",
     "Hide panel": "Ocultar panel",
-    " (HTTP status %(httpStatus))": "(estado HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(estado HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
     "Changelog": "Bitácora de cambios",
     "Collapse panel": "Colapsar panel",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f1f2c33a6c..13cf15ceaf 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -169,7 +169,7 @@
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
     "Welcome to Riot.im": "Bienvenue sur Riot.im",
-    " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(statut HTTP %(httpStatus)s)",
     "Login": "S'identifier",
     "Chat with Riot Bot": "Discussion avec Riot Bot",
     "Search the room directory": "Rechercher dans le répertoire de salon",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index ac7497c1e6..a08a8b8648 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -196,7 +196,7 @@
     "Continue": "Folytatás",
     "Please set a password!": "Kérlek, állíts be egy jelszót!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
-    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP állapot %(httpStatus)s)",
     "You have successfully set a password and an email address!": "Sikeresen beállítottad a jelszavad és e-mail címed!",
     "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál."
 }
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index e0d1b40e5e..862fbc0aa5 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -131,7 +131,7 @@
     "Forward Message": "메시지 전달",
     " from room": " 방에서",
     "Guests can join": "손님이 들어올 수 있어요",
-    " (HTTP status %(httpStatus))": "(HTTP 상태 %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP 상태 %(httpStatus)s)",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "문제를 진단하기 위해서, 이 클라이언트의 로그를 오류 보고서와 같이 보낼 거에요. 위 내용만 보내시려면, 체크를 해제하세요:",
     "Keywords": "키워드",
     "Mentions only": "답만 하기",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index c8f0079538..75c9cdfe3a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -132,7 +132,7 @@
     "Failed to send report: ": "Rapport verzenden mislukt: ",
     "Forward Message": "Bericht doorsturen",
     "Hide panel": "Paneel verbergen",
-    " (HTTP status %(httpStatus))": "(HTTP-status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
     "I understand the risks and wish to continue": "Ik begrijp de risico's en wil graag verder gaan",
     "Login": "Aanmelden",
     "Loading bug report module": "Bugrapporteermodule laden",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 4ca24868bc..2941f4b568 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -77,7 +77,7 @@
     "more": "więcej",
     "Enable desktop notifications": "Włącz powiadomienia",
     "Guest users can't invite users. Please register to invite.": "Gość nie ma uprawnień dow wysyłania zaproszeń. Proszę się zarejestrować.",
-    " (HTTP status %(httpStatus))": "(status HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(status HTTP %(httpStatus)s)",
     "Leave": "Opuść",
     "Login": "Logowanie",
     "Members": "Członkowie",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 436e15bc10..17e3eaa778 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -198,6 +198,6 @@
     "Continue": "Continuar",
     "Please set a password!": "Por favor, defina uma senha!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Isso permitirá que você possa retornar à sua conta após fazer logout, e também fazer login em outros dispositivos.",
-    " (HTTP status %(httpStatus))": "(Status HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(Status HTTP %(httpStatus)s)",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8c5ef574e4..1c3bb01638 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -183,7 +183,7 @@
     "Admin support for Dendrite": "Админ. помощь для Dendrite",
     "Building services on Matrix": "Построить услуги для Matrix",
     "Implementing VoIP services with Matrix": "Внедрение услуги VoIP с Matrix",
-    " (HTTP status %(httpStatus))": "(HTTP-Состояние %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-Состояние %(httpStatus)s)",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Чат",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk-Чат",
     "Announcements about Synapse releases": "Объявления релизов Synapse",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 976971c87e..27483243a0 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -197,7 +197,7 @@
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "ระบบแชทและประสานงาน ไร้ศูนย์กลางและเข้ารหัสได้ โดยใช้เทคโนโลยีจาก [matrix]",
     "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
-    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(สถานะ HTTP %(httpStatus)s)",
     "Remember, you can always set an email address in user settings if you change your mind.": "อย่าลืม คุณสามารถตั้งที่อยู่อีเมลในการตั้งค่าผู้ใช้ได้ทุกเมื่อหากคุณเปลี่ยนใจ",
     "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 761672f887..3540194329 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -62,7 +62,7 @@
     "Guests can join": "Misafirler katılabilirler",
     "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
     "Hide panel": "Paneli gizle",
-    " (HTTP status %(httpStatus))": "(HTTP durumu &(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP durumu &(httpStatus))",
     "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Sorunları teşhis etmek için , bu istemciden kayıtlar hata raporu ile beraber gönderilecek . Yalnızca yukarıdaki metni göndermek isterseniz , lütfen işareti kaldırın:",
     "Invite to this room": "Bu odaya davet et",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 80cabf9a62..a16cd75167 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -59,7 +59,7 @@
     "Guests can join": "Гості можуть приєднуватися",
     "Guest users can't invite users. Please register to invite.": "Гості не можуть запрошувати користувачів. Зареєструйтесь, будь ласка, для видачі запрошень.",
     "Hide panel": "Сховати панель",
-    " (HTTP status %(httpStatus))": "(статус HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Я ознайомлений з ризиками і хочу продовжити",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "З метою діагностики проблем журнали з цього застосунку будуть надіслані разом зі звітом про вади. Якщо ви бажаєте надіслати лише вищенаведений текст, відозначте, будь ласка:",
     "Invite to this room": "Запросити до цієї кімнати",

From 612cad5d9e3092a86d8b9d9f1e511c38935c8ccb Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 19 Jun 2017 00:01:11 +0100
Subject: [PATCH 139/172] fix broken vars

---
 .../views/dialogs/SetPasswordDialog.js        |  4 +--
 src/i18n/strings/ml.json                      |  2 +-
 src/i18n/strings/tr.json                      | 26 +++++++++----------
 src/i18n/strings/zh_Hans.json                 |  4 +--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 3e34d8b4b1..b82d03468c 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -93,8 +93,8 @@ export default React.createClass({
         if (err.httpStatus === 403) {
             errMsg = _t('Failed to change password. Is your password correct?');
         } else if (err.httpStatus) {
-            errMsg += _t(
-                ' (HTTP status %(httpStatus)s)',
+            errMsg += ' ' + _t(
+                '(HTTP status %(httpStatus)s)',
                 { httpStatus: err.httpStatus },
             );
         }
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 1059888544..9f2ad64a24 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -2,5 +2,5 @@
     "Add an email address above to configure email notifications": "ഇ മെയില്‍ അറിയിപ്പുകൾ ലഭിക്കാന്‍ മുകളില്‍ ഇ-മെയില്‍ വിലാസം നല്‍കൂ",
     "All messages": "എല്ലാ സന്ദേശങ്ങളും",
     "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)ല്‍  %(browserName) വഴി %(appName)"
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)sല്‍  %(browserName)s വഴി %(appName)s"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 3540194329..9d97d7cbbe 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1,5 +1,5 @@
 {
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName) işletim sisteminde %(browserName) ile %(appName)",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s işletim sisteminde %(browserName)s ile %(appName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\"> Safari </a> ve<a href=\"http://opera.com\"> Opera </a> da çalışıyor.",
     "A new version of Riot is available.": "Riot'un yeni bir versiyonu mevcuttur.",
     "Add an email address above to configure email notifications": "E-posta bildirimlerini yapılandırmak için yukarıya bir e-posta adresi ekleyin",
@@ -23,13 +23,13 @@
     "Custom Server Options": "Özel Sunucu Seçenekleri",
     "customServer_text": "Farklı bir Ana Sunucu URL'si belirleyerek başka bir Matrix sunucusunda oturum açmak için Özel Sunucu Seçeneklerini kullanabilirsiniz. <br/> Bu , Riot'u mevcut Matrix hesabı ile farklı bir Ana Sunucuda kullanmanıza olanak tanır.<br/> <br/> Ayrıca Özel Kimlik Sunucu'da ayarlayabilirsiniz ama kullanıcıları e-posta adresleriyle veya kendi e-posta adresinizle davet edemezsiniz.",
     "delete the alias.": "Tüm rumuzları sil.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias) oda rumuzu silinsin ve %(name) dizinden kaldırılsın mı ?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias)s oda rumuzu silinsin ve %(name)s dizinden kaldırılsın mı ?",
     "Describe your problem here.": "Probleminizi burada açıklayın.",
     "Direct Chat": "Doğrudan Sohbet",
     "Directory": "Dizin",
     "Dismiss": "Reddet",
     "Download this file": "Bu dosyayı indir",
-    "Drop here %(toAction)s": "Yapılacakları buraya bırak",
+    "Drop here %(toAction)s": "Burayı terket %(toAction)s",
     "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir",
     "Enable desktop notifications": "Masaüstü bildirimlerini etkinleştir",
     "Enable email notifications": "E-posta bildirimlerini etkinleştir",
@@ -41,14 +41,14 @@
     "#example": "örnek",
     "Expand panel": "Genişletme paneli",
     "Failed to": "Başaramadı",
-    "Failed to add tag %(tagName)s to room": "%(tagName) etiketi odaya eklenemedi",
+    "Failed to add tag %(tagName)s to room": "%(tagName)s etiketi odaya eklenemedi",
     "Failed to change settings": "Ayarlar değiştirilemedi",
-    "Failed to forget room %(errCode)s": "Odayı unutma başarısız oldu %(errCode)",
+    "Failed to forget room %(errCode)s": "Odayı unutma başarısız oldu %(errCode)s",
     "Failed to update keywords": "Anahtar kelimeler güncellenemedi",
     "Failed to get protocol list from Home Server": "Ana Sunucu'dan protokol listesi alınamadı",
     "Failed to get public room list": "Genel odalar listesi alınamadı",
     "Failed to join the room": "Odaya girilemedi",
-    "Failed to remove tag %(tagName)s from room": "Odadan %(tagName) etiketi kaldırılamadı",
+    "Failed to remove tag %(tagName)s from room": "Odadan %(tagName)s etiketi kaldırılamadı",
     "Failed to send report: ": "Rapor gönderilemedi: ",
     "Failed to set direct chat tag": "Direkt sohbet etiketi ayarlanamadı",
     "Failed to set Direct Message status of room": "Odanın Direkt Mesaj durumu ayarlanamadı",
@@ -62,7 +62,7 @@
     "Guests can join": "Misafirler katılabilirler",
     "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
     "Hide panel": "Paneli gizle",
-    "(HTTP status %(httpStatus)s)": "(HTTP durumu &(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP durumu %(httpStatus)s)",
     "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Sorunları teşhis etmek için , bu istemciden kayıtlar hata raporu ile beraber gönderilecek . Yalnızca yukarıdaki metni göndermek isterseniz , lütfen işareti kaldırın:",
     "Invite to this room": "Bu odaya davet et",
@@ -100,13 +100,13 @@
     "Quote": "Alıntı",
     "Redact": "Yazıya Dökme",
     "Reject": "Reddet",
-    "Remove %(name)s from the directory?": "%(name)'i dizinden kaldırılsın mı ?",
+    "Remove %(name)s from the directory?": "%(name)s'i dizinden kaldırılsın mı ?",
     "Remove": "Kaldır",
-    "remove %(name)s from the directory.": "%(name)'i dizinden kaldır.",
+    "remove %(name)s from the directory.": "%(name)s'i dizinden kaldır.",
     "Remove from Directory": "Dizinden Kaldır",
     "Report a bug": "Hata Bildir",
     "Resend": "Yeniden Gönder",
-    "Riot Desktop on %(platformName)s": "%(platformName) platformunda Riot Masaüstü",
+    "Riot Desktop on %(platformName)s": "%(platformName)s platformunda Riot Masaüstü",
     "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
     "Riot is not supported on mobile web. Install the app?": "Riot mobil web'de desteklenmiyor . Uygulamayı yükle ?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
@@ -136,7 +136,7 @@
     "unknown error code": "Bilinmeyen hata kodu",
     "Unnamed room": "İsimsiz oda",
     "Update": "Güncelleştirme",
-    "Uploaded on %(date)s by %(user)s": "%(user) tarafında %(date) e yüklendi",
+    "Uploaded on %(date)s by %(user)s": "%(user)s tarafında %(date)s e yüklendi",
     "Uploading report": "Rapor yükleniyor",
     "View Decrypted Source": "Şifresi Çözülmüş(Decrypted) Kaynağı Görüntüle",
     "View Source": "Kaynağı Görüntüle",
@@ -145,8 +145,8 @@
     "Waiting for response from server": "Sunucudan yanıt bekleniyor",
     "When I'm invited to a room": "Bir odaya davet edildiğimde",
     "World readable": "Okunabilir dünya",
-    "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code))",
-    "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code))",
+    "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code)s)",
     "You are not receiving desktop notifications": "Masaüstü bildirimleri almıyorsunuz",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Konuk olarak Riotluyorsunuz. Daha fazla odaya ve özelliğe erişmek için <a> Kayıt Ol </a> ya da <a> Oturum Aç </a> !",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Onları Riot dışında bir istemciden yapılandırmış olabilirsiniz . Onları Riot içersinide ayarlayamazsınız ama hala geçerlidirler",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index ca0a9ccda8..646cfc68d8 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -4,7 +4,7 @@
     "Notifications": "通知",
     "OK": "确定",
     "Operation failed": "操作失败",
-    "%(appName)s via %(browserName)s on %(osName)s": "应用%(appName)通过%(osName)上的%(browserName)浏览器运行",
+    "%(appName)s via %(browserName)s on %(osName)s": "应用%(appName)s通过%(osName)s上的%(browserName)s浏览器运行",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>和<a href=\"http://opera.com\">Opera</a>均可运行。",
     "A new version of Riot is available.": "Riot 有更新可用。",
     "Add an email address above to configure email notifications": "请在上方输入电子邮件地址以接收邮件通知",
@@ -26,7 +26,7 @@
     "Custom Server Options": "自定义服务器选项",
     "customServer_text": "你可以通过指定自定义服务器选项中的其他 Home server URL 来登录其他 Matrix 服务器。<br/>该选项允许你在 Riot 上使用其他 Home server 上的帐号。<br/><br/>你也可以自定义身份验证服务器，但你将不能通过邮件邀请其他用户，同样的，你也不能通过邮件被其他用户邀请。",
     "delete the alias.": "删除别名。",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除房间别名 %(alias) 并将 %(name) 从列表中删除吗？",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除房间别名 %(alias)s 并将 %(name)s 从列表中删除吗？",
     "Describe your problem here.": "在这里描述你的问题。",
     "Directory": "房间列表",
     "Dismiss": "设为已读",

From 1a72d3134c42c9a66452df66d2648c582a188d81 Mon Sep 17 00:00:00 2001
From: Raul <rauljgarcia@gmail.com>
Date: Sun, 18 Jun 2017 23:00:43 +0000
Subject: [PATCH 140/172] Translated using Weblate (Esperanto)

Currently translated at 90.0% (180 of 200 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index f873e9c011..feadadd603 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -174,5 +174,9 @@
     "Announcements about Synapse releases": "Anoncoj pri eldonoj Synapse",
     "Support for those using and running matrix-appservice-irc": "Subteno por tiuj, kiuj uzas kaj funkciigas matrix-appservice-irc",
     "Building services on Matrix": "Konstruante servojn per Matrix",
-    "Support for those using the Matrix spec": "Subteno por tiuj, kiuj uzas la specifon Matrix"
+    "Support for those using the Matrix spec": "Subteno por tiuj, kiuj uzas la specifon Matrix",
+    "Design and implementation of E2E in Matrix": "Dizajno kaj realigo de E2E en Matrix",
+    "Implementing VR services with Matrix": "Realigi VR-servojn per Matrix",
+    "Implementing VoIP services with Matrix": "Realigi VoIP-servojn per Matrix",
+    "Discussion of the Identity Service API": "Diskutado pri la API de Identiga Servo"
 }

From b7368fa93371c13c26af39a946186f447615399a Mon Sep 17 00:00:00 2001
From: Raul <rauljgarcia@gmail.com>
Date: Sun, 18 Jun 2017 23:29:54 +0000
Subject: [PATCH 141/172] Translated using Weblate (Esperanto)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index feadadd603..a7baa0430b 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -178,5 +178,25 @@
     "Design and implementation of E2E in Matrix": "Dizajno kaj realigo de E2E en Matrix",
     "Implementing VR services with Matrix": "Realigi VR-servojn per Matrix",
     "Implementing VoIP services with Matrix": "Realigi VoIP-servojn per Matrix",
-    "Discussion of the Identity Service API": "Diskutado pri la API de Identiga Servo"
+    "Discussion of the Identity Service API": "Diskutado pri la API de Identiga Servo",
+    "Support for those using, running and writing other bridges": "Subteno por tiuj, kiuj uzas, funkciigas kaj skribas aliajn pontojn",
+    "Contributing code to Matrix and Riot": "Kontribui kodon al Matrix kaj Riot",
+    "Dev chat for the Riot/Web dev team": "Programista babilado por la programteamo de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Programista babilado por la programteamo de Dendrite",
+    "Co-ordination for Riot/Web translators": "Kunordigado por tradukistoj de Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Multaj ejoj jam ekzistas en Matrix, ligitaj al ekzistantaj retoj (Slock, IRC, Gitter, ktp) aŭ sendependaj. Kontrolu la dosierujon!",
+    "Failed to change password. Is your password correct?": "Malsukcesis ŝanĝi la pasvorton. Ĉu via pasvorto pravas?",
+    "You have successfully set a password!": "Vi sukcese agordis pasvorton!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Vi nun rajtas reiri al via konto post elsaluto, kaj ensaluti per aliaj aparatoj.",
+    "Continue": "Daŭrigi",
+    "Please set a password!": "Bonvolu agordi pasvorton!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Tio ĉi permesos vin reiri al via konto post elsaluto, kaj ensaluti per alia aparato.",
+    "You have successfully set a password and an email address!": "Vi sukcese agordis pasvorton kaj retpoŝtadreson!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Memoru, vi ĉiam povas agordi retpoŝtadreson en via uzanta agordo se vi decidas ŝanĝi ĝin poste.",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s je %(osName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> kaj <a href=\"http://opera.com\">Opera</a> ankaŭ funkcias.",
+    "Drop here %(toAction)s": "Forlasi ĉi tie %(toAction)s",
+    "Favourite": "Plej ŝatata",
+    "Fetching third party location failed": "Venigado de ekstere liverita loko malsukcesis",
+    "Filter room names": "Filtri nomojn de ejoj"
 }

From 1c82b7b0c3954ed9c5688081e7944efc33ce99e8 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 19 Jun 2017 00:54:07 +0100
Subject: [PATCH 142/172] add register button

---
 src/components/structures/LoginBox.js                     | 7 +++++++
 .../vector/css/matrix-react-sdk/structures/_LoginBox.scss | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/LoginBox.js b/src/components/structures/LoginBox.js
index 445585a758..c9f8e87a10 100644
--- a/src/components/structures/LoginBox.js
+++ b/src/components/structures/LoginBox.js
@@ -47,6 +47,10 @@ module.exports = React.createClass({
         dis.dispatch({ action: 'start_login' });
     },
 
+    onRegisterClick: function() {
+        dis.dispatch({ action: 'start_registration' });
+    },
+
     render: function() {
         var TintableSvg = sdk.getComponent('elements.TintableSvg');
 
@@ -71,6 +75,9 @@ module.exports = React.createClass({
                     <AccessibleButton className="mx_LoginBox_loginButton" element="button" onClick={this.onLoginClick}>
                         { _t("Login") }
                     </AccessibleButton>
+                    <AccessibleButton className="mx_LoginBox_registerButton" element="button" onClick={this.onRegisterClick}>
+                        { _t("Register") }
+                    </AccessibleButton>
                 </div>
             );
         }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
index 3c8091fe9e..92d8833bc6 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
@@ -19,13 +19,15 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_LoginBox_loginButton {
+.mx_LoginBox_loginButton,
+.mx_LoginBox_registerButton {
     margin-top: -8px;
     height: 40px;
     border: 0px;
     border-radius: 40px;
-    padding-left: 1em;
-    padding-right: 1em;
+    margin-left: 4px;
+    margin-right: 4px;
+    width: 80px;
 
     background-color: $accent-color;
     color: $primary-bg-color;

From 641f20a4f62a30b9067f7ba20a4201655836fc68 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 13 Jun 2017 14:45:05 +0100
Subject: [PATCH 143/172] Tweak tests to match updates to matrixchat

Mostly this is just making it look at the `view` state rather than the
individual boolean flags.

One other tweak merits explanation: we now implement the initial
couldn't-register-as-guest login with an explicit switch to the LOGIN view,
which means that the URL gets updated to #/login.

We also now need to give the login panel a bit longer to appear.
---
 src/vector/index.js       | 18 ++++++++----------
 test/app-tests/loading.js | 24 ++++++++++++++----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/vector/index.js b/src/vector/index.js
index 9f16205164..da03327dab 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -216,18 +216,16 @@ function getConfig() {
     return deferred.promise;
 }
 
-function onLoadCompleted() {
+function onTokenLoginCompleted() {
     // if we did a token login, we're now left with the token, hs and is
     // url as query params in the url; a little nasty but let's redirect to
     // clear them.
-    if (window.location.search) {
-        var parsedUrl = url.parse(window.location.href);
-        parsedUrl.search = "";
-        var formatted = url.format(parsedUrl);
-        console.log("Redirecting to " + formatted + " to drop loginToken " +
-                    "from queryparams");
-        window.location.href = formatted;
-    }
+    var parsedUrl = url.parse(window.location.href);
+    parsedUrl.search = "";
+    var formatted = url.format(parsedUrl);
+    console.log("Redirecting to " + formatted + " to drop loginToken " +
+                "from queryparams");
+    window.location.href = formatted;
 }
 
 async function loadApp() {
@@ -288,7 +286,7 @@ async function loadApp() {
                 realQueryParams={params}
                 startingFragmentQueryParams={fragparts.params}
                 enableGuest={true}
-                onLoadCompleted={onLoadCompleted}
+                onTokenLoginCompleted={onTokenLoginCompleted}
                 initialScreenAfterLogin={getScreenFromLocation(window.location)}
                 defaultDeviceDisplayName={PlatformPeg.get().getDefaultDeviceDisplayName()}
             />,
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a323a26269..cad2b922a5 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -29,6 +29,7 @@ import jssdk from 'matrix-js-sdk';
 import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+import {VIEWS} from 'matrix-react-sdk/lib/components/structures/MatrixChat';
 
 import * as test_utils from '../test-utils';
 import MockHttpBackend from '../mock-request';
@@ -47,7 +48,7 @@ describe('loading:', function () {
     // the mounted MatrixChat
     let matrixChat;
 
-    // a promise which resolves when the MatrixChat calls onLoadCompleted
+    // a promise which resolves when the MatrixChat calls onTokenLoginCompleted
     let loadCompletePromise;
 
     beforeEach(function() {
@@ -135,7 +136,7 @@ describe('loading:', function () {
                 realQueryParams={params}
                 startingFragmentQueryParams={fragParts.params}
                 enableGuest={true}
-                onLoadCompleted={loadCompleteDefer.resolve}
+                onTokenLoginCompleted={loadCompleteDefer.resolve}
                 initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
                 makeRegistrationUrl={() => {throw new Error('Not implemented');}}
             />, parentDiv
@@ -153,8 +154,8 @@ describe('loading:', function () {
             .check((r) => {syncRequest = r;})
             .respond(200, response);
 
-        console.log("waiting for /sync");
         for (let attempts = 10; attempts > 0; attempts--) {
+            console.log(Date.now() + " waiting for /sync");
             if (syncRequest) {
                 return syncRequest;
             }
@@ -179,12 +180,12 @@ describe('loading:', function () {
                 return httpBackend.flush();
             }).then(() => {
                 // Wait for another trip around the event loop for the UI to update
-                return q.delay(1);
+                return q.delay(10);
             }).then(() => {
                 // we expect a single <Login> component following session load
                 ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.login.Login'));
-                expect(windowLocation.hash).toEqual("");
+                expect(windowLocation.hash).toEqual("#/login");
             }).done(done, done);
         });
 
@@ -205,7 +206,7 @@ describe('loading:', function () {
                 return httpBackend.flush();
             }).then(() => {
                 // Wait for another trip around the event loop for the UI to update
-                return q.delay(1);
+                return q.delay(10);
             }).then(() => {
                 return completeLogin(matrixChat);
             }).then(() => {
@@ -360,6 +361,9 @@ describe('loading:', function () {
                 loadApp({
                     uriFragment: "#/login",
                 });
+
+                // give the UI a chance to display
+                return q.delay(50);
             });
 
             it('shows a login view', function() {
@@ -513,7 +517,7 @@ describe('loading:', function () {
 
                 return httpBackend.flush();
             }).then(() => {
-                // at this point, MatrixChat should fire onLoadCompleted, which
+                // at this point, MatrixChat should fire onTokenLoginCompleted, which
                 // makes index.js reload the app. We're not going to attempt to
                 // simulate the reload - just check that things are left in the
                 // right state for the reloaded app.
@@ -589,7 +593,8 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading || matrixChat.state.loggingIn) {
+    if (matrixChat.state.view === VIEWS.LOADING ||
+            matrixChat.state.view === VIEWS.LOGGING_IN) {
         console.log(Date.now() + " Awaiting sync spinner: still loading.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not loaded after " +
@@ -628,8 +633,7 @@ function awaitRoomView(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading ||
-        !(matrixChat.state.loggedIn && matrixChat.state.ready)) {
+    if (matrixChat.state.view !== VIEWS.LOGGED_IN || !matrixChat.state.ready) {
         console.log(Date.now() + " Awaiting room view: not ready yet.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not ready after " +

From 60be24c66553adae0897f0a2197f886c21f71f47 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 19 Jun 2017 09:04:24 +0100
Subject: [PATCH 144/172] Rename promise

---
 test/app-tests/loading.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 04c68377a9..974bd8974a 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -48,7 +48,7 @@ describe('loading:', function () {
     let matrixChat;
 
     // a promise which resolves when the MatrixChat calls onTokenLoginCompleted
-    let loadCompletePromise;
+    let tokenLoginCompletePromise;
 
     beforeEach(function() {
         test_utils.beforeEach(this);
@@ -99,8 +99,8 @@ describe('loading:', function () {
             toString: function() { return this.search + this.hash; },
         };
 
-        let loadCompleteDefer = q.defer();
-        loadCompletePromise = loadCompleteDefer.promise;
+        let tokenLoginCompleteDefer = q.defer();
+        tokenLoginCompletePromise = tokenLoginCompleteDefer.promise;
 
         function onNewScreen(screen) {
             console.log(Date.now() + " newscreen "+screen);
@@ -135,7 +135,7 @@ describe('loading:', function () {
                 realQueryParams={params}
                 startingFragmentQueryParams={fragParts.params}
                 enableGuest={true}
-                onTokenLoginCompleted={loadCompleteDefer.resolve}
+                onTokenLoginCompleted={tokenLoginCompleteDefer.resolve}
                 initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
                 makeRegistrationUrl={() => {throw new Error('Not implemented');}}
             />, parentDiv
@@ -520,7 +520,7 @@ describe('loading:', function () {
                 // simulate the reload - just check that things are left in the
                 // right state for the reloaded app.
 
-                return loadCompletePromise;
+                return tokenLoginCompletePromise;
             }).then(() => {
                 // check that the localstorage has been set up in such a way that
                 // the reloaded app can pick up where we leave off.

From 557d4ae4c1c3cc51dcdd7e463f92245ede9de045 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 14 Jun 2017 20:27:02 +0100
Subject: [PATCH 145/172] Test 'return-to-app' functionality

Add a test for the 'log in as user' functionality, as well as the 'return to
app' functionality.
---
 test/app-tests/loading.js | 71 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index 17e487a0fe..b814560756 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -30,6 +30,7 @@ import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
 import {VIEWS} from 'matrix-react-sdk/lib/components/structures/MatrixChat';
+import dis from 'matrix-react-sdk/lib/dispatcher';
 
 import * as test_utils from '../test-utils';
 import MockHttpBackend from '../mock-request';
@@ -493,6 +494,76 @@ describe('loading:', function () {
                 expect(windowLocation.hash).toEqual("#/room/!room:id");
             }).done(done, done);
         });
+
+        describe('Login as user', function() {
+            beforeEach(function() {
+                // first we have to load the homepage
+                loadApp();
+
+                httpBackend.when('POST', '/register').check(function(req) {
+                    expect(req.queryParams.kind).toEqual('guest');
+                }).respond(200, {
+                    user_id: "@guest:localhost",
+                    access_token: "secret_token",
+                });
+
+                return httpBackend.flush().then(() => {
+                    return awaitSyncingSpinner(matrixChat);
+                }).then(() => {
+                    // we got a sync spinner - let the sync complete
+                    return expectAndAwaitSync();
+                }).then(() => {
+                    // once the sync completes, we should have a home page
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, sdk.getComponent('structures.HomePage'));
+
+                    // we simulate a click on the 'login' button by firing off
+                    // the relevant dispatch.
+                    //
+                    // XXX: is it an anti-pattern to access the react-sdk's
+                    // dispatcher in this way? Is it better to find the login
+                    // button and simulate a click? (we might have to arrange
+                    // for it to be shown - it's not always, due to the
+                    // collapsing left panel
+
+                    dis.dispatch({ action: 'start_login' });
+
+                    return q.delay(1);
+                });
+            });
+
+            it('should give us a login page', function() {
+                expect(windowLocation.hash).toEqual("#/login");
+
+                // we expect a single <Login> component
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.login.Login')
+                );
+            });
+
+            it('should allow us to return to the app', function() {
+                const login = ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.login.Login')
+                );
+
+                const linkText = 'Return to app';
+
+                const returnToApp = ReactTestUtils.scryRenderedDOMComponentsWithTag(
+                    login, 'a').find((e) => e.innerText === linkText);
+
+                if (!returnToApp) {
+                    throw new Error(`Couldn't find '${linkText}' link`);
+                }
+
+                ReactTestUtils.Simulate.click(returnToApp);
+
+                return q.delay(1).then(() => {
+                    // we should be straight back into the home page
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, sdk.getComponent('structures.HomePage'));
+                });
+            });
+        });
     });
 
     describe('Token login:', function() {

From a9dfd4da2d8e60fb06e0740b02a22ea7eff6b508 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Sun, 18 Jun 2017 21:37:17 +0100
Subject: [PATCH 146/172] Merge pull request #4259 from
 ollieh/code-block-border

Add border on hover for code blocks
---
 .../vector/css/matrix-react-sdk/views/rooms/_EventTile.scss  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index a980d1f9ce..7d8e4ba2b7 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -345,6 +345,11 @@ limitations under the License.
 }
 .mx_EventTile_body pre {
     position: relative;
+    border: 1px solid transparent;
+}
+.mx_EventTile:hover .mx_EventTile_body pre
+{
+    border: 1px solid $primary-hairline-color;
 }
 .mx_EventTile_body pre:hover .mx_EventTile_copyButton
 {

From adbe5c71b7a7699c2fed507b3841452126ddcafe Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Sun, 18 Jun 2017 23:45:12 +0100
Subject: [PATCH 147/172] Merge pull request #4337 from
 vector-im/t3chguy/fix_forwarding

change dispatcher forward_event signature
---
 src/components/views/context_menus/MessageContextMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index e3f4d14042..bc82778aae 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -117,7 +117,7 @@ module.exports = React.createClass({
     onForwardClick: function() {
         dis.dispatch({
             action: 'forward_event',
-            content: this.props.mxEvent,
+            event: this.props.mxEvent,
         });
         this.closeMenu();
     },

From 0da48343601081f40c74d2732e9fe11eddcb50f2 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Sun, 18 Jun 2017 23:49:20 +0100
Subject: [PATCH 148/172] Merge pull request #4346 from
 RiotTranslateBot/weblate-riot-web-riot-web

Update from Weblate.
---
 src/i18n/strings/en_US.json   |   4 +-
 src/i18n/strings/eo.json      | 167 ++++++++++++++++++++++++----
 src/i18n/strings/es.json      |  92 +++++++++++++++-
 src/i18n/strings/hi.json      |   9 +-
 src/i18n/strings/hu.json      |   4 +-
 src/i18n/strings/it.json      |  65 +++++++++++
 src/i18n/strings/ko.json      |  10 +-
 src/i18n/strings/pl.json      | 138 +++++++++++++++++++++--
 src/i18n/strings/ru.json      |  20 ++--
 src/i18n/strings/th.json      |   4 +-
 src/i18n/strings/tr.json      | 202 ++++++++++++++++++++++++++++++++++
 src/i18n/strings/zh_Hans.json |  29 ++++-
 12 files changed, 691 insertions(+), 53 deletions(-)
 create mode 100644 src/i18n/strings/it.json
 create mode 100644 src/i18n/strings/tr.json

diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 63fadbe006..6e37469705 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -196,5 +196,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
     "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat"
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
+    "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind."
 }
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 49ccc6e60f..4a50ff5609 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -3,43 +3,166 @@
     "All messages": "Ĉiuj mesaĝoj",
     "All messages (loud)": "Ĉiuj mesaĝoj (lauta)",
     "All Rooms": "Ĉiuj babilejoj",
-    "Cancel": "Nuligu",
-    "Create new room": "Kreu novan babilejon",
-    "delete the alias.": "Forviŝu la alinomon.",
-    "Describe your problem here.": "Priskribu vian problemon ĉi-tie.",
+    "Cancel": "Nuligi",
+    "Create new room": "Krei novan babilejon",
+    "delete the alias.": "Forviŝi la kromnomon.",
+    "Describe your problem here.": "Priskribi vian problemon ĉi tie.",
     "Direct Chat": "Rekta babilejo",
     "Directory": "Dosierujo",
     "Dismiss": "Eksigu",
     "Download this file": "Elŝutu ĉi-tiun dosieron",
     "#example": "#ekzemplo",
     "Files": "Dosieroj",
-    "Forget": "Forgesu",
+    "Forget": "Forgesi",
     " from room": " el babilejo",
     "Guests can join": "Gastoj povas aliĝi",
     "Guest users can't invite users. Please register to invite.": "Gasta uzantoj ne povas inviti uzantojn. Bonvolu registri por inviti.",
-    "I understand the risks and wish to continue": "Mi komprenas la riskoj kaj volas daŭrigi",
-    "Invite to this room": "Invitu al ĉi-tiun babilejon",
+    "I understand the risks and wish to continue": "Mi komprenas la riskonj kaj volas daŭrigi",
+    "Invite to this room": "Inviti en ĉi tiun babilejon",
     "Keywords": "Ŝlosilvortoj",
-    "Leave": "Lasu",
+    "Leave": "Foriri",
     "Low Priority": "Malalta prioritato",
-    "Messages containing my display name": "Mesaĝoj enhavantaj mia ekrano nomo",
-    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortoj</span>",
-    "Messages containing my user name": "Mesaĝoj enhavantaj mia uzantnomo",
+    "Messages containing my display name": "Mesaĝoj enhavantaj mian vidigan nomon",
+    "Messages containing <span>keywords</span>": "Mesaĝoj enhavantaj <span>ŝlosilovortojn</span>",
+    "Messages containing my user name": "Mesaĝoj enhavantaj mian uzantnomon",
     "Messages in group chats": "Mesaĝoj en grupaj babilejoj",
-    "Mute": "Silentigu",
+    "Mute": "Silentigi",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bonvolu priskribi la cimon. Kion vi faris? Kion vi atendis okazi? Kion fakte okazis?",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Bonvolu instali <a href=\"https://www.google.com/chrome\">\"Chrome\"</a> aŭ <a href=\"https://getfirefox.com\">\"Firefox\"</a> por la plej bona sperto.",
     "Please Register": "Bonvolu registri",
     "powered by Matrix": "funkciigata de \"Matrix\"",
     "Quote": "Citu",
-    "Reject": "Malakceptu",
-    "Resend": "Resendu",
-    "Room directory": "Babilejo dosierujo",
-    "Room not found": "Babilejon ne trovis",
-    "Search": "Serĉu",
-    "Search…": "Serĉu…",
-    "Search for a room": "Serĉu por babilejon",
-    "Send": "Sendu",
-    "Start chat": "Komencu babilo",
-    "This Room": "Ĉi-tiu Babilejo"
+    "Reject": "Malakcepti",
+    "Resend": "Resendi",
+    "Room directory": "Babileja dosierujo",
+    "Room not found": "Babilejo ne trovita",
+    "Search": "Serĉi",
+    "Search…": "Serĉi…",
+    "Search for a room": "Serĉi babilejon",
+    "Send": "Sendi",
+    "Start chat": "Komenci babiladon",
+    "This Room": "Ĉi tiu Babilejo",
+    "Add an email address above to configure email notifications": "Aldonu retadreson supre por agordi retpoŝtajn sciigojn",
+    "Advanced notification settings": "Agordoj de sciigoj specialaj",
+    "Call invitation": "Invito al voko",
+    "All notifications are currently disabled for all targets.": "Ĉiuj sciigoj estas malvalidigitaj por ĉiu aparato.",
+    "An error occurred whilst saving your email notification preferences.": "Eraro okazis dum konservado de agordoj por retpoŝtaj sciigoj.",
+    "Cancel Sending": "Nuligi sendadon",
+    "Can't update user notification settings": "Ne eblas ĝisdatigi la agordojn de sciigoj al uzanto",
+    "Changelog": "Protokolo de ŝanĝoj",
+    "Close": "Fermi",
+    "Collapse panel": "Kaŝi panelon",
+    "Collecting app version information": "Kolektante informon pri versio de la aplikaĵo",
+    "Collecting logs": "Kolektante protokolon",
+    "Couldn't find a matching Matrix room": "Ne eblis trovi kongruantan ejon Matrix",
+    "Custom Server Options": "Opcioj pri personigo de servilo",
+    "customServer_text": "Vi povas uzi opciojn personigitajn de la servilo por ensaluti en aliajn servilojn Matrix specifante alian adreson URL-an de alia servilo Home.<br/>Tio permesas al vi uzi Riot per ekzistanta konto en alia Home servilo.<br/><br/>Vi povas ankaŭ agordi servilon identecan personigita, sed ne eblos inviti uzantojn pere de retpoŝtadreso, aŭ esti invitita pere de retpoŝtadreso vi mem.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Forviŝi la kromnomon de la ejo %(alias)s and forigi %(name)s el la dosierujo?",
+    "Enable audible notifications in web client": "Ebligi aŭdeblajn sciigojn en la retkliento",
+    "Enable desktop notifications": "Ebligi labortablajn sciigojn",
+    "Enable email notifications": "Ebligi retpoŝtajn sciigojn",
+    "Enable notifications for this account": "Ebligi sciigojn por tiu ĉi konto",
+    "Enable them now": "Ebligi ilin nun",
+    "Enter keywords separated by a comma:": "Entajpi ŝlosilvortojn apartigitaj per komoj:",
+    "Error": "Eraro",
+    "Error saving email notification preferences": "Eraro konservante agordojn pri retpoŝtaj sciigoj",
+    "Expand panel": "Pli grandigi panelon",
+    "Failed to": "Malsukcesis",
+    "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al la ejo",
+    "Failed to change settings": "Malsukcesis ŝanĝi la agordojn",
+    "Failed to forget room %(errCode)s": "Malsukcesis forgesi la ejon %(errCode)s",
+    "Failed to update keywords": "Malsukcesis ĝisdatigi la ŝlosilvortojn",
+    "Failed to get protocol list from Home Server": "Malsukcesis obteni la liston de protokoloj por la servilo Home",
+    "Failed to get public room list": "Malsukcesis obteni la liston de publikaj ejoj",
+    "Failed to join the room": "Malsukcesis aliĝi al la ejo",
+    "Failed to remove tag %(tagName)s from room": "Malsukcesis forigi la etikedon %(tagName)s el la ejo",
+    "Failed to send report: ": "Malsukcesis sendi raporton: ",
+    "Failed to set direct chat tag": "Malsukcesis agordi la etikedon de rekta babilejo",
+    "Failed to set Direct Message status of room": "Malsukcesis agordi la staton de Rekta Mesaĝo de la ejo",
+    "Forward Message": "Plusendi mesaĝon",
+    "Hide panel": "Kaŝi panelon",
+    " (HTTP status %(httpStatus))": "(stato HTTP %(httpStatus))",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Por diagnozi problemojn, protokoloj el tiu ĉi kliento sendiĝos kune kun tiu ĉi raporto de eraro. Se vi preferas sendi nur la supran tekston, bonvolu malŝalti:",
+    "Login": "Ensaluti",
+    "Loading bug report module": "Ŝarĝante modulon pri eraroraporto",
+    "Members": "Membroj",
+    "Mentions only": "Nur mencioj",
+    "Messages in one-to-one chats": "Mesaĝoj en unu-je-unu babilejoj",
+    "Messages sent by bot": "Mesaĝoj sendita per roboto",
+    "more": "pli",
+    "No rooms to show": "Neniu ejo por montri",
+    "Noisy": "Brua",
+    "Notification targets": "Celo de sciigoj",
+    "Notifications": "Sciigoj",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "La sciigoj de la sekvaj ŝlosilvortoj sekvas regulojn kiuj ne povas esti montrataj ĉi tie:",
+    "Notify for all other messages/rooms": "Sciigu min por ĉiu alia babilejo",
+    "Notify me for anything else": "Sciigu min por ĉio alia",
+    "Off": "Malŝaltita",
+    "On": "Ŝaltita",
+    "Operation failed": "La operacio malsukcesis",
+    "Permalink": "Konstanta ligilo",
+    "Please describe the bug and/or send logs.": "Bonvolu priskribi la cimon kaj/aŭ sendi protokolojn.",
+    "Redact": "Redakti",
+    "Remove %(name)s from the directory?": "Forigi %(name)s el la dosierujo?",
+    "Remove": "Forigi",
+    "remove %(name)s from the directory.": "forigi %(name)s el la dosierujo.",
+    "Remove from Directory": "Forigi el Dosierujo",
+    "Report a bug": "Raporti cimon",
+    "Riot Desktop on %(platformName)s": "Riot Labortablo sur %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot ne scias kiel aliĝi al ejo en tiu ĉi reto",
+    "Riot is not supported on mobile web. Install the app?": "Riot ne estas subtenita je mobile web. Instali la aplikaĵon?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uzas multajn specialajn trajtojn, kelkaj ne estas disponeblaj aŭ estas eksperimentaj en via nuna retumilo.",
+    "Send logs": "Sendi protokolojn",
+    "Settings": "Agordoj",
+    "Source URL": "Fonta URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Pardonu, via retumilo <b>ne kapablas</b> funkciigi Riot.",
+    "The Home Server may be too old to support third party networks": "La servilo Home povas esti tro malnova por subteni retoj de ekstera liveranto",
+    "There are advanced notifications which are not shown here": "Estas specialaj sciigoj kiuj ne estas montritaj ĉi tie",
+    "The server may be unavailable or overloaded": "La servilo povas esti maldisponebla aŭ tro ŝarĝita",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Ci tiu ejo estas neenirebla por gastoj. Vi povus aliĝi se vi registriĝas.",
+    " to room": " al ejo",
+    "Unable to fetch notification target list": "Ne eblis obteni la liston de celoj por sciigoj",
+    "Unable to join network": "Ne eblis kuniĝi kun la reto",
+    "Unable to look up room ID from server": "Ne eblis trovi la identigon el la servilo",
+    "Unavailable": "Maldisponebla",
+    "Unhide Preview": "Malkaŝi antaŭrigardon",
+    "Unknown device": "Nekonata aparato",
+    "unknown error code": "kodo de nekonata eraro",
+    "Unnamed room": "Nekonata ejo",
+    "Update": "Ĝisdatigi",
+    "Uploaded on %(date)s by %(user)s": "Alŝutita je %(date)s per %(user)s",
+    "Uploading report": "Alŝutante raporton",
+    "View Decrypted Source": "Vidi malĉifritan fonton",
+    "View Source": "Vidi fonton",
+    "What's New": "Kio novas",
+    "What's new?": "Kio novas?",
+    "Waiting for response from server": "Atendante respondon el la servilo",
+    "When I'm invited to a room": "Kiam mi estas invitita en ejon",
+    "World readable": "Legebla tutmonde",
+    "You cannot delete this image. (%(code)s)": "Vi ne povas forviŝi tiun ĉi bildon. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Vi ne povas forviŝi tiun ĉi mesaĝon. (%(code)s)",
+    "You are not receiving desktop notifications": "Vi ne estas ricevante sciigojn labortablan",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vi uzas Riot kiel gasto. <a>Registriĝu</a> aŭ <a>ensalutu</a> por atingi pli da ejoj kaj funkcioj!",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vi eble agordis ilin en kliento kiu ne estis Riot. Vi ne povas agordi ilin en Riot sed ili ankoraŭ validas",
+    "Sunday": "Dimanĉo",
+    "Monday": "Lundo",
+    "Tuesday": "Mardo",
+    "Wednesday": "Merkredo",
+    "Thursday": "Ĵaŭdo",
+    "Friday": "Vendredo",
+    "Saturday": "Sabato",
+    "Today": "Hodiaŭ",
+    "Yesterday": "Hieraŭ",
+    "OK": "Bone",
+    "You need to be using HTTPS to place a screen-sharing call.": "Vi devas uzi HTTPS por starigi ekranan vokon.",
+    "Welcome page": "Paĝo de bonveno",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Kun via nuna retumilo, la aspekto kaj funkciado de la aplikaĵo povas esti tute malĝusta, kaj kelkaj aŭ ĉiu funkcioj eble ne funkcios. Se vi volas provi ĉiuokaze vi rajtas daŭrigi, sed ne estos subteno se vi trafas problemojn!",
+    "Welcome to Riot.im": "Bonvenon al Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Malcentra, ĉifrita babilejo &amp; kunlaboro povigita de [matrix]",
+    "Search the room directory": "Serĉi la ejan dosierujon",
+    "Chat with Riot Bot": "Babili kun la roboto Riot Bot",
+    "Get started with some tips from Riot Bot!": "Eki per sugesto de la roboto Riot Bot!",
+    "General discussion about Matrix and Riot": "Ĝenerala diskutado pri Matrix kaj Riot",
+    "Discussion of all things Matrix!": "Diskutado pri ĉio rilate al Matrix!",
+    "Riot/Web &amp; Desktop chat": "Diskudato labortabla pri Riot/Web"
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 0fb34871e6..97a6da536e 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -56,7 +56,7 @@
     "Messages in one-to-one chats": "Mensajes en chats uno a uno",
     "Messages sent by bot": "Mensajes enviados por bot",
     "more": "más",
-    "Mute": "Mute",
+    "Mute": "Silenciar",
     "No rooms to show": "Sin salas para mostrar",
     "Noisy": "Ruidoso",
     "Notification targets": "Objetivos de notificación",
@@ -65,9 +65,9 @@
     "Notify me for anything else": "Notificarme para cualquier otra cosa",
     "Off": "Apagado",
     "On": "Encendido",
-    "Operation failed": "Operación fallida",
+    "Operation failed": "Falló la operación",
     "Permalink": "Enlace permanente",
-    "Please Register": "Por favor regístrate",
+    "Please Register": "Por favor, regístrese",
     "Quote": "Citar",
     "Redact": "Redactar",
     "Reject": "Rechazar",
@@ -114,5 +114,89 @@
     "Yesterday": "Ayer",
     "Welcome page": "Página de bienvenida",
     "Continue": "Continuar",
-    "Search": "Búsqueda"
+    "Search": "Búsqueda",
+    "OK": "Correcto",
+    "Failed to change password. Is your password correct?": "Falló al cambiar la clave, ¿Está correcta tu clave?",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> y <a href=\"http://opera.com\">Opera</a> también funcionan.",
+    "A new version of Riot is available.": "Una nueva versión de Riot está disponible.",
+    "Cancel": "Cancelar",
+    "Describe your problem here.": "Describa su problema aquí.",
+    "Forward Message": "Reenviar mensaje",
+    "Hide panel": "Ocultar panel",
+    " (HTTP status %(httpStatus))": "(estado HTTP %(httpStatus))",
+    "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
+    "Changelog": "Bitácora de cambios",
+    "Collapse panel": "Colapsar panel",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Recuerde que, si es necesario, puede establecer una dirección de email en las preferencias de usuario.",
+    "All Rooms": "Todas las salas",
+    "Expand panel": "Expandir panel",
+    "Failed to": "Falló",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Para diagnosticar los problemas, las trazas de este cliente serán enviadas adjuntas a este informe de defecto. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
+    "Login": "Abrir sesión",
+    "Report a bug": "Informe un defecto",
+    "Search…": "Buscar…",
+    "Send": "Enviar",
+    "Send logs": "Enviar trazas",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "¡Lo sentimos! Su navegador <b>no puede</b> ejecutar Riot.",
+    "This Room": "Esta sala",
+    "Unavailable": "No disponible",
+    "Unknown device": "Dispositivo desconocido",
+    "Update": "Actualizar",
+    "Uploading report": "Enviando informe",
+    "What's New": "Lo que hay de nuevo",
+    "What's new?": "¿Qué hay de nuevo?",
+    "Waiting for response from server": "Esperando una respuesta del servidor",
+    "You have successfully set a password and an email address!": "¡Ha establecido exitosamente la contraseña y la dirección de email!",
+    "You have successfully set a password!": "¡Ha establecido exitosamente una contraseña!",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s en %(osName)s",
+    "All messages (loud)": "Todos los mensajes (ruidoso)",
+    "All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas en todos los objetivos.",
+    "Collecting app version information": "Recolectando información de la versión de la aplicación",
+    "Collecting logs": "Recolectando registros",
+    "Dismiss": "Omitir",
+    "Failed to send report: ": "Error al enviar reporte: ",
+    "Loading bug report module": "Cargando módulo de reporte de errores",
+    "Messages containing <span>keywords</span>": "Mensajes que contienen <span>palabras clave</span>",
+    "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa el error. Qué acción ejecutó? Cuál era el resultado que esperaba? Que pasó realmente?",
+    "Please describe the bug and/or send logs.": "Por favor describa el error y/o envíe los registros.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Por favor instale <a href=\"https://www.google.com/chrome\">Google Chrome</a> o <a href=\"https://getfirefox.com\">Mozilla Firefox</a> para una mejor experiencia.",
+    "powered by Matrix": "con el poder de Matrix",
+    "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s",
+    "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. Quieres instalar la aplicación?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Está usando Riot como invitado. ¡<a>Regístrese</a> o <a>inicie sesión</a> para acceder más salas y características!",
+    "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
+    "Welcome to Riot.im": "Bienvenido a Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones &amp; colaboración cifradas y descentralizadas con el poder de [matrix]",
+    "Search the room directory": "Buscar en el directorio de salas",
+    "Chat with Riot Bot": "Conversar con el Bot de Riot",
+    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos tips de Riot Bot!",
+    "General discussion about Matrix and Riot": "Discusión general sobre Matrix y Riot",
+    "Discussion of all things Matrix!": "¡Discusión sobre todas las cosas de Matrix!",
+    "Riot/Web &amp; Desktop chat": "Conversaciones de Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Conversaciones sobre Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Conversaciones sobre Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Discusiones técnicas sobre Matrix",
+    "Running Matrix services": "Ejecutando servicios de Matrix",
+    "Community-run support for Synapse": "Soporte comunitario de Synapse",
+    "Admin support for Dendrite": "Soporte administrativo para Dendrite",
+    "Announcements about Synapse releases": "Anuncios de lanzamientos de Synapse",
+    "Support for those using and running matrix-appservice-irc": "Soporte para aquellos que usan o administran matrix-appservice-irc",
+    "Building services on Matrix": "Construyendo servicios con Matrix",
+    "Support for those using the Matrix spec": "Soporte para usuarios de la especificación de Matrix",
+    "Design and implementation of E2E in Matrix": "Diseño e implementación de E2E en Matrix",
+    "Implementing VR services with Matrix": "Implementación de servicios VR con Matrix",
+    "Implementing VoIP services with Matrix": "Implementación de servicios VoIP con Matrix",
+    "Discussion of the Identity Service API": "Discusión sobre el API de Identity Service",
+    "Support for those using, running and writing other bridges": "Soporte para usuarios, administradores y desarrolladores de otros puentes",
+    "Contributing code to Matrix and Riot": "Contribuciones de código para Matrix y Riot",
+    "Dev chat for the Riot/Web dev team": "Conversaciones del equipo de desarrollo de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Conversaciones del equipo de desarrollo de Dendrite",
+    "Co-ordination for Riot/Web translators": "Coordinación para traductores de Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muchas salas ya están disponibles en Matrix, enlazadas a redes existentes (Slack, IRC, Gitter, etc) o independientes. ¡Revisa el directorio!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Ahora puedes regresar a tu cuenta después de cerrar tu sesión, e iniciar sesión en otros dispositivos.",
+    "Please set a password!": "¡Por favor establece una contraseña!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto le permitirá regresar a su cuenta después de cerrar sesión, así como iniciar sesión en otros dispositivos."
 }
diff --git a/src/i18n/strings/hi.json b/src/i18n/strings/hi.json
index 9e26dfeeb6..f8bfb088a8 100644
--- a/src/i18n/strings/hi.json
+++ b/src/i18n/strings/hi.json
@@ -1 +1,8 @@
-{}
\ No newline at end of file
+{
+    "A new version of Riot is available.": "रायट के एक नया वर्शन उपलब्ध है।",
+    "All messages": "सारे संदेश",
+    "All Rooms": "सारे कमरे",
+    "Please set a password!": "कृपया एक पासवर्ड सेट करें!",
+    "Continue": "आगे बढ़ें",
+    "You have successfully set a password and an email address!": "आपने सफलतापूर्वक एक पासवर्ड और एक ईमेल एड्रेस सेट कर लिया है!"
+}
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 9f8b2bef8f..ac7497c1e6 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -196,5 +196,7 @@
     "Continue": "Folytatás",
     "Please set a password!": "Kérlek, állíts be egy jelszót!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
-    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))"
+    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))",
+    "You have successfully set a password and an email address!": "Sikeresen beállítottad a jelszavad és e-mail címed!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál."
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
new file mode 100644
index 0000000000..8dcc298406
--- /dev/null
+++ b/src/i18n/strings/it.json
@@ -0,0 +1,65 @@
+{
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "Anche <a href=\"http://apple.com/safari\">Safari</a> e <a href=\"http://opera.com\"> Opera</a> funzionano.",
+    "A new version of Riot is available.": "È disponibile una nuova versione di Riot.",
+    "Add an email address above to configure email notifications": "Specifica un indirizzo email per configurazione le notifiche via email",
+    "Advanced notification settings": "Impostazioni notifiche avanzate",
+    "All messages": "Tutti i messaggi",
+    "All messages (loud)": "Tutti i messaggi (rumoroso)",
+    "All Rooms": "Tutte le stanze",
+    "An error occurred whilst saving your email notification preferences.": "È avvenuto un errore durante il salvataggio delle tue preferenze sulle notifiche email.",
+    "Call invitation": "Invito ad una chiamata",
+    "Cancel": "Annulla",
+    "Cancel Sending": "Annulla invio",
+    "Can't update user notification settings": "Impossibile aggiornare le impostazioni di notifica dell'utente",
+    "Changelog": "Cambiamenti",
+    "Close": "Chiudi",
+    "Collapse panel": "Riduci pannello",
+    "Collecting app version information": "Raccolta delle informazioni sulla versione dell'applicazione",
+    "Collecting logs": "Raccolta del registro",
+    "Create new room": "Crea una nuova stanza",
+    "Couldn't find a matching Matrix room": "Impossibile trovare una stanza Matrix corrispondente",
+    "Custom Server Options": "Opzioni server personale",
+    "customServer_text": "Puoi utilizzare un server personale per entrare in altri server Matrix specificando un diverso indirizzo per il server Home.<br/>Questo ti permetterà di usare Riot con un account Matrix già esistente su un altro server.<br/><br/>Puoi anche specificare un diverso server di identità ma non sarai in grado di invitare utenti o di essere invitato tramite indirizzo email.",
+    "delete the alias.": "Elimina gli alias.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminare l'alias %(alias)s e rimuovere %(name)s dalla lista?",
+    "Describe your problem here.": "Descrivi qui il tuo problema.",
+    "Direct Chat": "Chat diretta",
+    "Directory": "Lista",
+    "Dismiss": "Scarta",
+    "Download this file": "Scarica questo file",
+    "Enable audible notifications in web client": "Abilita notifiche audio nel client Web",
+    "Enable desktop notifications": "Abilita le notifiche desktop",
+    "Enable email notifications": "Abilita le notifiche email",
+    "Enable notifications for this account": "Abilita le notifiche per questo account",
+    "Enable them now": "Abilitale adesso",
+    "Enter keywords separated by a comma:": "Inserisci le parole chiave separate da virgole:",
+    "Error": "Errore",
+    "Error saving email notification preferences": "Errore nel salvataggio delle preferenze di notifica email",
+    "#example": "#esempio",
+    "Expand panel": "Espandi il pannello",
+    "Failed to": "Non si è riuscito a",
+    "Failed to add tag %(tagName)s to room": "Non si è riuscito ad aggiungere l'etichetta %(tagName)s alla stanza",
+    "Failed to change settings": "Non si è riuscito ad aggiornare le impostazioni",
+    "Failed to update keywords": "Non si è riuscito ad aggiornare le parole chiave",
+    "Failed to get protocol list from Home Server": "Non si è riuscito ad ottenere la lista protocollo dal server Home",
+    "Failed to get public room list": "Non si è riuscito ad ottenere la lista delle stanze pubbliche",
+    "Failed to join the room": "Non si è riuscito a entrare nella stanza",
+    "Failed to remove tag %(tagName)s from room": "Non si è riuscito a rimuovere il tag %(tagName)s dalla stanza",
+    "Failed to send report: ": "Non si è riuscito ad inviare il resoconto: ",
+    "Failed to set direct chat tag": "Non si è riuscito a impostare l'etichetta di chat diretta",
+    "Failed to set Direct Message status of room": "Non si è riuscito ad impostare lo stato di Messaggio Diretto alla stanza",
+    "Favourite": "Preferito",
+    "Files": "File",
+    "Filter room names": "Filtra i nomi delle stanze",
+    "Forget": "Dimentica",
+    "Forward Message": "Inoltra messaggio",
+    " from room": " dalla stanza",
+    "Guests can join": "Gli ospiti sono ammessi",
+    "Guest users can't invite users. Please register to invite.": "Gli utenti ospite non possono invitare  altri utenti. Registrati per invitare.",
+    "Hide panel": "Nascondi pannello",
+    "I understand the risks and wish to continue": "Sono consapevole dei rischi e vorrei continuare",
+    "Invite to this room": "Invita a entrare in questa stanza",
+    "Keywords": "Parole chiave",
+    "Leave": "Abbandona",
+    "Login": "Entra"
+}
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index a9fdcb5a94..e0d1b40e5e 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -54,7 +54,7 @@
     "Please Register": "계정을 등록해주세요",
     "powered by Matrix": "매트릭스의 지원을 받고 있어요",
     "Quote": "인용하기",
-    "Redact": "수정",
+    "Redact": "지우기",
     "Reject": "거절하기",
     "Remove %(name)s from the directory?": "목록에서 %(name)s을 지우시겠어요?",
     "Remove": "지우기",
@@ -113,16 +113,16 @@
     "Enable them now": "지금 켜기",
     "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
     "Failed to": "실패했어요",
-    "Failed to add tag %(tagName)s to room": "방에 %(tagName)s 태그를 추가하지 못했어요",
+    "Failed to add tag %(tagName)s to room": "방에 %(tagName)s로 지정하지 못했어요",
     "Failed to change settings": "설정을 바꾸지 못했어요",
     "Failed to forget room %(errCode)s": "방 %(errCode)s를 잊지 못했어요",
     "Failed to update keywords": "키워드를 갱신하지 못했어요",
     "Failed to get protocol list from Home Server": "홈 서버에서 프로토콜 목록을 얻지 못했어요",
     "Failed to get public room list": "공개한 방 목록을 얻지 못했어요",
     "Failed to join the room": "방에 들어가지 못했어요",
-    "Failed to remove tag %(tagName)s from room": "방에서 태그 %(tagName)s를 지우지 못했어요",
+    "Failed to remove tag %(tagName)s from room": "방에서 %(tagName)s 지정을 지우지 못했어요",
     "Failed to send report: ": "보고를 보내지 못했어요: ",
-    "Failed to set direct chat tag": "직접 이야기 태그를 설정하지 못했어요",
+    "Failed to set direct chat tag": "직접 이야기 지정을 설정하지 못했어요",
     "Failed to set Direct Message status of room": "방의 쪽지 상태를 설정하지 못했어요",
     "Favourite": "즐겨찾기",
     "Fetching third party location failed": "타사 위치를 불러오지 못했어요",
@@ -141,7 +141,7 @@
     "Messages in group chats": "이야기 모임의 메시지",
     "Messages in one-to-one chats": "1:1 이야기의 메시지",
     "Messages sent by bot": "봇이 보낸 메시지",
-    "Noisy": "크게",
+    "Noisy": "소리",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "여기 표시될 수 없는 규칙에 따라 다음 키워드는 알리지 않아요:",
     "Notify for all other messages/rooms": "다른 모든 메시지/방 알리기",
     "Notify me for anything else": "모든 걸 알리기",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 953aaa1f94..4ca24868bc 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -25,12 +25,12 @@
     "Directory": "Księga adresowa",
     "Download this file": "Pobierz plik",
     "Welcome page": "Strona powitalna",
-    "Riot is not supported on mobile web. Install the app?": "Riot nie jest obsługiwany przez mobilną przeglądarkę internetową. Zainstaluj aplikację?",
-    "Room directory": "Katalog pokojowy",
+    "Riot is not supported on mobile web. Install the app?": "Riot nie jest obsługiwany przez przeglądarki mobilne. Zainstaluj aplikację?",
+    "Room directory": "Spis pokojów",
     "Search": "Szukaj",
     "Search…": "Szukaj…",
     "Search for a room": "Szukaj pokoju",
-    "Send": "Wysłać",
+    "Send": "Wyślij",
     "Settings": "Ustawienia",
     "Collapse panel": "Ukryj panel",
     "customServer_text": "Możesz używać opcji serwera niestandardowego do logowania się na inne serwery Matrix, określając inny adres URL serwera domowego.<br/>Pozwala to na wykorzystanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Można również ustawić niestandardowy serwer tożsamości, ale nie będzie można zapraszać użytkowników adresem e-mail, ani być zaproszony przez adres e-mailowy.",
@@ -70,9 +70,133 @@
     "Keywords": "Słowa kluczowe",
     "Loading bug report module": "Ładowanie modułu raportu błędów",
     "Low Priority": "Niski priorytet",
-    "Messages containing <span>keywords</span>": "Wiadomości zawierające słowa <span>kluczowe</span>",
-    "Messages containing my user name": "Wiadomości zawierające mój użytkownik",
+    "Messages containing <span>keywords</span>": "Wiadomości zawierające <span>słowa kluczowe</span>",
+    "Messages containing my user name": "Wiadomości zawierające moją nazwę użytkownika",
     "Messages in group chats": "Wiadomości w czatach grupowych",
-    "Messages sent by bot": "Wiadomości wysłane przez robota",
-    "more": "więcej"
+    "Messages sent by bot": "Wiadomości wysłane przez bota",
+    "more": "więcej",
+    "Enable desktop notifications": "Włącz powiadomienia",
+    "Guest users can't invite users. Please register to invite.": "Gość nie ma uprawnień dow wysyłania zaproszeń. Proszę się zarejestrować.",
+    " (HTTP status %(httpStatus))": "(status HTTP %(httpStatus))",
+    "Leave": "Opuść",
+    "Login": "Logowanie",
+    "Members": "Członkowie",
+    "Messages containing my display name": "Wiadomości zawierające moją wyświetlaną nazwę",
+    "Direct Chat": "Rozmowa bezpośrednia",
+    "Mute": "Wycisz",
+    "No rooms to show": "Brak pokoi do wyświetlenia",
+    "Notifications": "Powiadomienia",
+    "Failed to set direct chat tag": "Nie udało się ustawić znacznika rozmów bezpośrednich",
+    "Failed to set Direct Message status of room": "Nie udało się ustawić statusu Rozmów Bezpośrednich dla pokoju",
+    "Notification targets": "Cele powiadomień",
+    "Operation failed": "Operacja nieudana",
+    "Permalink": "Odnośnik bezpośredni",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Proszę opisz problem (w miarę możliwości po angielsku). Co doprowadziło do błędu? Jakie było Twoje oczekiwanie, a co stało się zamiast tego?",
+    "Please describe the bug and/or send logs.": "Proszę opisz błąd i/lub wyślij logi.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Zainstaluj proszę <a href=\"https://www.google.com/chrome\">Chrome</a> lub <a href=\"https://getfirefox.com\">Firefox</a>.",
+    "Please Register": "Proszę się zarejestrować",
+    "Quote": "Cytat",
+    "Remove %(name)s from the directory?": "Usunąć %(name)s z katalogu?",
+    "Remove from Directory": "Usuń z katalogu",
+    "Report a bug": "Zgłoś błąd",
+    "Resend": "Wyślij jeszcze raz",
+    "Riot Desktop on %(platformName)s": "Riot Desktop na %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot nie wie, jak dołączyć do pokoju w tej sieci",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot używa wiele zaawansowanych technologii, które nie są dostępne lub są w fazie testów w Twojej przeglądarce.",
+    "Room not found": "Pokój nie znaleziony",
+    "Send logs": "Wyślij logi",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić Riot.",
+    "Start chat": "Rozpocznij rozmowę",
+    "powered by Matrix": "zbudowane na Matrix",
+    "Redact": "Zredaguj",
+    "Reject": "Odrzuć",
+    "Remove": "Usuń",
+    "remove %(name)s from the directory.": "usuń %(name)s z katalogu.",
+    "The Home Server may be too old to support third party networks": "Serwer domowy może być za stary dla innych sieci",
+    "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj",
+    "The server may be unavailable or overloaded": "Serwer jest nieosiągalny lub jest przeciążony",
+    "This Room": "Ten pokój",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Ten pokój jest niedostępny dla gości. Możliwe, że będziesz mógł dołączyć po rejestracji.",
+    "Unable to join network": "Nie można dołączyć do sieci",
+    "Unable to look up room ID from server": "Nie można wyszukać ID pokoju na serwerze",
+    "Unavailable": "Niedostępny",
+    "Unhide Preview": "Odkryj podgląd",
+    "Unknown device": "Nieznane urządzenie",
+    "unknown error code": "nieznany kod błędu",
+    "Unnamed room": "Pokój bez nazwy",
+    "Update": "Uaktualnienie",
+    "Uploaded on %(date)s by %(user)s": "Wysłane %(date)s przez %(user)s",
+    "Uploading report": "Raport wysyłania",
+    "Messages in one-to-one chats": "Wiadomości w rozmowach jeden-na-jeden",
+    "Noisy": "Głośny",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Powiadomienia o słowach kluczowych spełniają reguły, które nie mogą być tu wyświetlone:",
+    "Notify for all other messages/rooms": "Powiadamiaj o wszystkich innych wiadomośsciach/pokojach",
+    "Notify me for anything else": "Powiadom mnie o całej reszcie",
+    "Off": "Wyłącz",
+    "On": "Włącz",
+    "Source URL": "Źródłowy URL",
+    " to room": " do pokoju",
+    "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień",
+    "View Decrypted Source": "Pokaż zdeszyfrowane źródło",
+    "View Source": "Pokaż źródło",
+    "What's New": "Co nowego",
+    "What's new?": "Co nowego?",
+    "Waiting for response from server": "Czekam na odpowiedź serwera",
+    "When I'm invited to a room": "Kiedy zostanę zaproszony do pokoju",
+    "World readable": "Całkowicie publiczne",
+    "You cannot delete this image. (%(code)s)": "Nie możesz usunąć tego obrazka. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Nie możesz usunąć tej wiadomości. (%(code)s)",
+    "You are not receiving desktop notifications": "Nie otrzymujesz powiadomień na pulpit",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting jako gość. <a>Zarejestruj się</a> albo <a>zaloguj się</a> aby uzyskać dostęp do pokojów lub dodatkowych możliwości!",
+    "Sunday": "Niedziela",
+    "Monday": "Poniedziałek",
+    "Tuesday": "Wtorek",
+    "Wednesday": "Środa",
+    "Thursday": "Czwartek",
+    "Friday": "Piątek",
+    "Saturday": "Sobota",
+    "Today": "Dzisiaj",
+    "Yesterday": "Wczoraj",
+    "OK": "OK",
+    "You need to be using HTTPS to place a screen-sharing call.": "Musisz używać bezpiecznego protokołu HTTPS aby użyć połączenia współdzielenia ekranu.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Z Twoją obecną przeglądarką, wygląd oraz wrażenia z używania aplikacji mogą być niepoprawne, a niektóre funkcje wcale nie działać. Kontynuuj jeśli chcesz spróbować, jednak trudno będzie pomóc w przypadku błędów, które mogą nastąpić!",
+    "Welcome to Riot.im": "Witamy w Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Zdecentralizowany, szyfrowany czat &amp; współpraca wspierana przez [matrix]",
+    "Search the room directory": "Wyszukaj katalog pokojów",
+    "Chat with Riot Bot": "Rozmowa z Botem Riota",
+    "Get started with some tips from Riot Bot!": "Rozpocznij z wskazówkami Riot Bota!",
+    "General discussion about Matrix and Riot": "Generalna rozmowa o Matrix i Riot",
+    "Discussion of all things Matrix!": "Rozmowa o wszystkim Matrixowym!",
+    "Matrix technical discussions": "Dyskusje techniczne Matrixa",
+    "Fetching third party location failed": "Pobranie lokalizacji zewnętrznej nie powiodło się",
+    "Mentions only": "Tylko, gdy wymienieni",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Możliwe, że skofigurowałeś je w innym kliencie, niż Riot. Nie możesz ich zmieniać w Riot, ale nadal mają zastosowanie",
+    "Riot/Web &amp; Desktop chat": "Czat o Riot/Web i Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Czat o Riot/iOS i matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Czat o Riot/Android i matrix-android-sdk",
+    "Running Matrix services": "Utrzymywanie usług Matrix",
+    "Community-run support for Synapse": "Wsparcie społeczności dla Synapse",
+    "Admin support for Dendrite": "Wsparcie administratorskie dla Dendrite",
+    "Announcements about Synapse releases": "Ogłoszenia na temat Synapse",
+    "Support for those using and running matrix-appservice-irc": "Wsparcie dla hostujących i korzystających z matrix-appservice-irc",
+    "Building services on Matrix": "Tworzenie usług w oparciu o Matrix",
+    "Support for those using the Matrix spec": "Wsparcie dla używających specyfikacji Matrix",
+    "Design and implementation of E2E in Matrix": "Projektowanie i implementacja szyfrowania klient-klient (end-to-end) w Matrix",
+    "Implementing VR services with Matrix": "Implementowanie usług wirtualnej rzeczywistości w oparciu o Matrix",
+    "Implementing VoIP services with Matrix": "Implementowanie usług telefonii internetowej VoIP w oparciu o Matrix",
+    "Discussion of the Identity Service API": "Dyskusja na temat API Identity Service",
+    "Support for those using, running and writing other bridges": "Wsparcie dla używających, zapewniających i piszących inne mosty",
+    "Contributing code to Matrix and Riot": "Dokładanie kodu do Matrix lub Riot",
+    "Dev chat for the Riot/Web dev team": "Czat deweloperów zespołu Riot/Web",
+    "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite",
+    "Co-ordination for Riot/Web translators": "Koordynacja tłumaczy Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix ma wiele, już działających pokoi, połączonych z istniejącymi sieciami, takimi jak Slack, IRC lub Gitter, a także wiele zupełnie niezależnych. Możesz przejrzeć je wszystkie w spisie pokoi!",
+    "Failed to change password. Is your password correct?": "Zmiana hasła nie powiodła się. Czy Twoje hasło jest poprawne?",
+    "You have successfully set a password!": "Hasło zostało zmienione z powodzeniem!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Teraz możesz powrócić do swojego konta na innych urządzeniach po wylogowaniu i ponownym zalogowaniu się.",
+    "Continue": "Kontynuuj",
+    "Please set a password!": "Proszę, ustaw hasło!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "To pozwoli Ci powrócić do Twojego konta po wylogowaniu i ponownym zalogowaniu się na innych urządzeniach.",
+    "You have successfully set a password and an email address!": "Z powodzeniem ustawiono hasło i adres e-mail dla Twojego konta!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Pamiętaj, że zawsze możesz zmienić swój e-mail lub hasło w panelu ustawień użytkownika."
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 49bb935d54..8c5ef574e4 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -7,7 +7,7 @@
     "Create new room": "Создать новую комнату",
     "Couldn't find a matching Matrix room": "Не возможно найти подходящую Матриксу комнату",
     "Custom Server Options": "Расширенные настройки сервера",
-    "delete the alias.": "удалить привязку.",
+    "delete the alias.": "удалить псевдоним.",
     "Delete the room alias": "Удалить привязку комнаты",
     "Direct Chat": "Приватный чат",
     "Directory": "Каталог",
@@ -35,7 +35,7 @@
     "Fetching third party location failed": "Не удалось получить местоположение",
     "Files": "Файлы",
     "Filter room names": "Фильтр по назв. комнаты",
-    "Forget": "Забыть",
+    "Forget": "Удалить",
     "from the directory": "из каталога",
     " from room": " из комнаты",
     "Guests can join": "Гость может присоединиться",
@@ -88,7 +88,7 @@
     "Drop here %(toAction)s": "Вставить сюда: %(toAction)s",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и очистить %(name)s из каталога?",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
-    "Failed to forget room %(errCode)s": "Не удалось забыть комнату %(errCode)s",
+    "Failed to forget room %(errCode)s": "Не удалось удалить комнату %(errCode)s",
     "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты",
     "Failed to set direct chat tag": "Не удалось пометить прямую беседу",
     "Unhide Preview": "Показать  анонс",
@@ -119,7 +119,7 @@
     "Advanced notification settings": "Настройки уведомлений",
     "Call invitation": "Пригласительный звонок",
     "customServer_text": "Вы можете войти с помощью вашего сервера.<br/>Это позволяет вам использовать Riot с уже существующей учетной записью на другом сервере.<br/><br/>Вы также можете задать свой сервер идентификации, но тогда вы не можете приглашать пользователей с помощью email-адреса и не можете быть приглашены по нему.",
-    "Messages containing my display name": "Сообщения, содержащие мое отображаемое имя",
+    "Messages containing my display name": "Сообщения, содержащие мое имя",
     "Messages containing my user name": "Сообщение, содержащие мое имя пользователя",
     "Messages in group chats": "Сообщения в групповых чатах",
     "Messages in one-to-one chats": "Сообщения в приватных чатах",
@@ -141,11 +141,11 @@
     "Forward Message": "Переслать сообщение дальше",
     "Hide panel": "Скрыть панель",
     "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжать",
-    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Что бы выявить проблему, будет отослан журнал этого клиента с сообщением о ошибке. Если ты только верхний текст отослать хочешь, отключи следующее:",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Что бы выявить проблему, будет отослан журнал этого клиента с сообщением о ошибке. Если Вы только верхний текст отослать хотите, отключите следующее:",
     "Loading bug report module": "Загрузи Модуль ошибок",
     "Messages containing <span>keywords</span>": "Сообщения, которые содержат определенные <span>ключевые слова</span>",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опиши (на Английском) ошибку. Что ты делал? Что ты ожидал получить? Что произошло?",
-    "Please describe the bug and/or send logs.": "Пожалуйста опиши ошибку и/или перешли протоколы.",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опишите (на Английском) ошибку. Что Вы делали? Что Вы ожидали получить? Что произошло?",
+    "Please describe the bug and/or send logs.": "Пожалуйста опишите ошибку и/или перешлите протоколы.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Пожалуйста установите <a href=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a> для лучшего результата.",
     "Report a bug": "Отчет о ошибке",
     "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s",
@@ -164,10 +164,10 @@
     "What's New": "Что нового",
     "What's new?": "Что нового?",
     "Waiting for response from server": "Подождите ответа от сервера",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы пользуетесь Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы вошли в Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
     "OK": "ОК",
     "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видео звонком.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если ваш браузер не корректно отображает информацию и все или некоторые функции отключены, вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если Ваш браузер не корректно отображает информацию и все или некоторые функции отключены, Вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",
     "Login": "Войти",
     "Welcome to Riot.im": "Добро пожаловать на Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованное, шифрованное общение и сотрудничество на основе [matrix]",
@@ -193,7 +193,7 @@
     "Please set a password!": "Задайте пароль!",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix существует множество комнат, связанных с существующими сетями (Slack, IRC, Gitter и т.д.) Или независимыми. Ищите в каталоге!",
     "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
-    "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Теперь Вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
     "Support for those using the Matrix spec": "Поддержка для тех, кто использует спецификацию Matrix",
     "Design and implementation of E2E in Matrix": "Разработка и внедрение E2E в Matrix",
     "Implementing VR services with Matrix": "Внедрение служб VR с помощью Matrix",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index c770dc3e43..976971c87e 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -197,5 +197,7 @@
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "ระบบแชทและประสานงาน ไร้ศูนย์กลางและเข้ารหัสได้ โดยใช้เทคโนโลยีจาก [matrix]",
     "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
-    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))"
+    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))",
+    "Remember, you can always set an email address in user settings if you change your mind.": "อย่าลืม คุณสามารถตั้งที่อยู่อีเมลในการตั้งค่าผู้ใช้ได้ทุกเมื่อหากคุณเปลี่ยนใจ",
+    "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
new file mode 100644
index 0000000000..761672f887
--- /dev/null
+++ b/src/i18n/strings/tr.json
@@ -0,0 +1,202 @@
+{
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName) işletim sisteminde %(browserName) ile %(appName)",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\"> Safari </a> ve<a href=\"http://opera.com\"> Opera </a> da çalışıyor.",
+    "A new version of Riot is available.": "Riot'un yeni bir versiyonu mevcuttur.",
+    "Add an email address above to configure email notifications": "E-posta bildirimlerini yapılandırmak için yukarıya bir e-posta adresi ekleyin",
+    "Advanced notification settings": "Gelişmiş bildirim ayarları",
+    "All messages": "Tüm mesajlar",
+    "All messages (loud)": "Tüm mesajlar (uzun)",
+    "All Rooms": "Tüm Odalar",
+    "All notifications are currently disabled for all targets.": "Tüm bildirimler şu anda tüm hedefler için devre dışı bırakılmıştır.",
+    "An error occurred whilst saving your email notification preferences.": "E-posta bildirim tercihlerinizi kaydetme işlemi sırasında bir hata oluştu.",
+    "Call invitation": "Arama davetiyesi",
+    "Cancel": "İptal Et",
+    "Cancel Sending": "Göndermeyi İptal Et",
+    "Can't update user notification settings": "Kullanıcı bildirim ayarları güncellenemiyor",
+    "Changelog": "Değişiklikler",
+    "Close": "Kapat",
+    "Collapse panel": "Katlanır panel",
+    "Collecting app version information": "Uygulama sürümü bilgileri toplanıyor",
+    "Collecting logs": "Kayıtlar toplanıyor",
+    "Create new room": "Yeni oda oluştur",
+    "Couldn't find a matching Matrix room": "Eşleşen bir Matrix odası bulunamadı",
+    "Custom Server Options": "Özel Sunucu Seçenekleri",
+    "customServer_text": "Farklı bir Ana Sunucu URL'si belirleyerek başka bir Matrix sunucusunda oturum açmak için Özel Sunucu Seçeneklerini kullanabilirsiniz. <br/> Bu , Riot'u mevcut Matrix hesabı ile farklı bir Ana Sunucuda kullanmanıza olanak tanır.<br/> <br/> Ayrıca Özel Kimlik Sunucu'da ayarlayabilirsiniz ama kullanıcıları e-posta adresleriyle veya kendi e-posta adresinizle davet edemezsiniz.",
+    "delete the alias.": "Tüm rumuzları sil.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias) oda rumuzu silinsin ve %(name) dizinden kaldırılsın mı ?",
+    "Describe your problem here.": "Probleminizi burada açıklayın.",
+    "Direct Chat": "Doğrudan Sohbet",
+    "Directory": "Dizin",
+    "Dismiss": "Reddet",
+    "Download this file": "Bu dosyayı indir",
+    "Drop here %(toAction)s": "Yapılacakları buraya bırak",
+    "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir",
+    "Enable desktop notifications": "Masaüstü bildirimlerini etkinleştir",
+    "Enable email notifications": "E-posta bildirimlerini etkinleştir",
+    "Enable notifications for this account": "Bu hesap için bildirimleri etkinleştir",
+    "Enable them now": "Onları şimdi etkinleştir",
+    "Enter keywords separated by a comma:": "Anahtar kelimeleri virgül ile ayırarak girin:",
+    "Error": "Hata",
+    "Error saving email notification preferences": "E-posta bildirim tercihlerini kaydetme hatası",
+    "#example": "örnek",
+    "Expand panel": "Genişletme paneli",
+    "Failed to": "Başaramadı",
+    "Failed to add tag %(tagName)s to room": "%(tagName) etiketi odaya eklenemedi",
+    "Failed to change settings": "Ayarlar değiştirilemedi",
+    "Failed to forget room %(errCode)s": "Odayı unutma başarısız oldu %(errCode)",
+    "Failed to update keywords": "Anahtar kelimeler güncellenemedi",
+    "Failed to get protocol list from Home Server": "Ana Sunucu'dan protokol listesi alınamadı",
+    "Failed to get public room list": "Genel odalar listesi alınamadı",
+    "Failed to join the room": "Odaya girilemedi",
+    "Failed to remove tag %(tagName)s from room": "Odadan %(tagName) etiketi kaldırılamadı",
+    "Failed to send report: ": "Rapor gönderilemedi: ",
+    "Failed to set direct chat tag": "Direkt sohbet etiketi ayarlanamadı",
+    "Failed to set Direct Message status of room": "Odanın Direkt Mesaj durumu ayarlanamadı",
+    "Favourite": "Favori",
+    "Fetching third party location failed": "Üçüncü parti konumunu çekemedi",
+    "Files": "Dosyalar",
+    "Filter room names": "Oda isimlerini filtrele",
+    "Forget": "Unut",
+    "Forward Message": "Mesajı İlet",
+    " from room": " Odadan",
+    "Guests can join": "Misafirler katılabilirler",
+    "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
+    "Hide panel": "Paneli gizle",
+    " (HTTP status %(httpStatus))": "(HTTP durumu &(httpStatus))",
+    "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Sorunları teşhis etmek için , bu istemciden kayıtlar hata raporu ile beraber gönderilecek . Yalnızca yukarıdaki metni göndermek isterseniz , lütfen işareti kaldırın:",
+    "Invite to this room": "Bu odaya davet et",
+    "Keywords": "Anahtar kelimeler",
+    "Leave": "Ayrıl",
+    "Login": "Oturum aç",
+    "Loading bug report module": "Hata raporlama modülü yükleniyor",
+    "Low Priority": "Düşük Öncelikli",
+    "Members": "Üyeler",
+    "Mentions only": "Sadece Mention'lar",
+    "Messages containing my display name": "İsmimi içeren mesajlar",
+    "Messages containing <span>keywords</span>": "<span> anahtar kelimeleri </span> içeren mesajlar",
+    "Messages containing my user name": "Kullanıcı ismimi içeren mesajlar",
+    "Messages in group chats": "Grup sohbetlerindeki mesajlar",
+    "Messages in one-to-one chats": "Bire bir sohbetlerdeki mesajlar",
+    "Messages sent by bot": "Bot tarafından gönderilen mesajlar",
+    "more": "Daha",
+    "Mute": "Sessiz",
+    "No rooms to show": "Gösterilecek oda yok",
+    "Noisy": "Gürültülü",
+    "Notification targets": "Bildirim hedefleri",
+    "Notifications": "Bildirimler",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Aşağıdaki anahtar kelimeleri ile ilgili bildirimler burada gösterilemeyen kuralları takip eder:",
+    "Notify for all other messages/rooms": "Diğer tüm mesajlar / odalar için bildirim yapın",
+    "Notify me for anything else": "Başka herhangi bir şey için bana bildirim yap",
+    "Off": "Kapalı",
+    "On": "Açık",
+    "Operation failed": "Operasyon başarısız",
+    "Permalink": "Kalıcı Bağlantı(permalink)",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Lütfen hatayı tanımlayın. Ne yaptınız ? Ne gerçekleşmesini beklediniz ? Ne gerçekleşti ?",
+    "Please describe the bug and/or send logs.": "Lütfen hatayı tanımlayın ve/veya kayıtları gönderin.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Lütfen <a href=\"https://www.google.com/chrome\"> Chrome </a> ya da <a href=\"https://getfirefox.com\"> Firefox </a> 'u en iyi deneyim için yükleyin.",
+    "Please Register": "Lütfen Kaydolun",
+    "powered by Matrix": "Matrix tarafından desteklenmektedir",
+    "Quote": "Alıntı",
+    "Redact": "Yazıya Dökme",
+    "Reject": "Reddet",
+    "Remove %(name)s from the directory?": "%(name)'i dizinden kaldırılsın mı ?",
+    "Remove": "Kaldır",
+    "remove %(name)s from the directory.": "%(name)'i dizinden kaldır.",
+    "Remove from Directory": "Dizinden Kaldır",
+    "Report a bug": "Hata Bildir",
+    "Resend": "Yeniden Gönder",
+    "Riot Desktop on %(platformName)s": "%(platformName) platformunda Riot Masaüstü",
+    "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
+    "Riot is not supported on mobile web. Install the app?": "Riot mobil web'de desteklenmiyor . Uygulamayı yükle ?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
+    "Room directory": "Oda dizini",
+    "Room not found": "Oda bulunamadı",
+    "Search": "Ara",
+    "Search…": "Arama…",
+    "Search for a room": "Oda ara",
+    "Send": "Gönder",
+    "Send logs": "Kayıtları gönder",
+    "Settings": "Ayarlar",
+    "Source URL": "Kaynak URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Üzgünüz , tarayıcınız Riot'u  <b> çalıştıramıyor </b>.",
+    "Start chat": "Sohbet başlat",
+    "The Home Server may be too old to support third party networks": "Ana Sunucu 3. parti ağları desteklemek için çok eski olabilir",
+    "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
+    "The server may be unavailable or overloaded": "Sunucu kullanılamıyor veya aşırı yüklenmiş olabilir",
+    "This Room": "Bu Oda",
+    "This room is inaccessible to guests. You may be able to join if you register.": "Bu odaya misafirler tarafından erişilemez . Kaydolursanız katılabilirsiniz.",
+    " to room": " odasına",
+    "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi",
+    "Unable to join network": "Ağa bağlanılamıyor",
+    "Unable to look up room ID from server": "Sunucudan oda ID'si aranamadı",
+    "Unavailable": "Kullanım dışı",
+    "Unhide Preview": "Önizlemeyi Göster",
+    "Unknown device": "Bilinmeyen aygıt",
+    "unknown error code": "Bilinmeyen hata kodu",
+    "Unnamed room": "İsimsiz oda",
+    "Update": "Güncelleştirme",
+    "Uploaded on %(date)s by %(user)s": "%(user) tarafında %(date) e yüklendi",
+    "Uploading report": "Rapor yükleniyor",
+    "View Decrypted Source": "Şifresi Çözülmüş(Decrypted) Kaynağı Görüntüle",
+    "View Source": "Kaynağı Görüntüle",
+    "What's New": "Yenilikler",
+    "What's new?": "Yeni olan ne ?",
+    "Waiting for response from server": "Sunucudan yanıt bekleniyor",
+    "When I'm invited to a room": "Bir odaya davet edildiğimde",
+    "World readable": "Okunabilir dünya",
+    "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code))",
+    "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code))",
+    "You are not receiving desktop notifications": "Masaüstü bildirimleri almıyorsunuz",
+    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Konuk olarak Riotluyorsunuz. Daha fazla odaya ve özelliğe erişmek için <a> Kayıt Ol </a> ya da <a> Oturum Aç </a> !",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Onları Riot dışında bir istemciden yapılandırmış olabilirsiniz . Onları Riot içersinide ayarlayamazsınız ama hala geçerlidirler",
+    "Sunday": "Pazar",
+    "Monday": "Pazartesi",
+    "Tuesday": "Salı",
+    "Wednesday": "Çarşamba",
+    "Thursday": "Perşembe",
+    "Friday": "Cuma",
+    "Saturday": "Cumartesi",
+    "Today": "Bugün",
+    "Yesterday": "Dün",
+    "OK": "Tamam",
+    "You need to be using HTTPS to place a screen-sharing call.": "Ekran paylaşımlı arama yapmak için HTTPS kullanıyor olmalısınız.",
+    "Welcome page": "Karşılama sayfası",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
+    "Welcome to Riot.im": "Riot.im'e Hoş Geldiniz",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dağıtık , şifreli sohbet &amp; işbirliği ile Matrix tarafından desteklenmektedir",
+    "Search the room directory": "Oda dizinini ara",
+    "Chat with Riot Bot": "Riot Bot ile Sohbet Et",
+    "Get started with some tips from Riot Bot!": "Bazı Riot Bot ipuçları ile başlayın !",
+    "General discussion about Matrix and Riot": "Matrix ve Riot hakkında genel tartışma",
+    "Discussion of all things Matrix!": "Matrix'in tüm tartışması!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Masaüstü sohbet",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk sohbet",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk sohbet",
+    "Matrix technical discussions": "Matrix teknik tartışmalar",
+    "Running Matrix services": "Çalışan Matrix hizmetleri",
+    "Community-run support for Synapse": "Synapse için topluluk tarafından işlenen destek",
+    "Admin support for Dendrite": "Dendrite için Admin desteği",
+    "Announcements about Synapse releases": "Synapse sürümleri hakkında duyurular",
+    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc kullanan ve çalıştıran kullanıcılar için destek",
+    "Building services on Matrix": "Matrix üzerinde Yapı hizmetleri",
+    "Support for those using the Matrix spec": "Matrix teknik özelliklerini kullananlar için destek",
+    "Design and implementation of E2E in Matrix": "Matrix'te E2E ' nin Tasarım ve İmplementasyonu",
+    "Implementing VR services with Matrix": "Matrix'te VR hizmetlerini implement etmek",
+    "Implementing VoIP services with Matrix": "Matrix'te VoIP hizmetlerini implement etmek",
+    "Discussion of the Identity Service API": "Kimlik Hizmet API ( Identity Service API ) Tartışması",
+    "Support for those using, running and writing other bridges": "Diğer köprüleri kullanan , çalıştıran ve yazanlar için destek",
+    "Contributing code to Matrix and Riot": "Matrix ve Riot'a kod katkısı (contribution) sağla",
+    "Dev chat for the Riot/Web dev team": "Riot/Web Geliştirici takımı için Geliştirici sohbeti",
+    "Dev chat for the Dendrite dev team": "Dendrite Geliştirici Takımı için Geliştirici sohbeti",
+    "Co-ordination for Riot/Web translators": "Riot/Web çevirmenleri için koordinasyon",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix'te varolan ağlara (Slack , IRC , Gitter vb.) bağlı ya da bağımsız bir çok oda var . Dizini kontrol edin!",
+    "Failed to change password. Is your password correct?": "Şifre değiştirme başarısız oldu . Şifreniz doğru mu ?",
+    "You have successfully set a password!": "Başarıyla bir şifre ayarladınız!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Şimdi oturumunuzu iptal ettikten sonra başka cihazda oturum açarak hesabınıza dönebilirsiniz.",
+    "Continue": "Devam",
+    "Please set a password!": "Lütfen bir şifre ayarlayın !",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Bu oturumunuzu kapattıktan sonra hesabınıza dönmenizi ve diğer cihazlarda oturum açmanızı sağlar.",
+    "You have successfully set a password and an email address!": "Başarıyla bir şifre ve e-posta adresi ayarladın !",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Unutmayın , fikrinizi değiştirirseniz her zaman bir şifre ve e-posta adresi ayarlayabilirsiniz."
+}
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index f76aa160dd..ca0a9ccda8 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -3,5 +3,32 @@
     "Mute": "静音",
     "Notifications": "通知",
     "OK": "确定",
-    "Operation failed": "操作失败"
+    "Operation failed": "操作失败",
+    "%(appName)s via %(browserName)s on %(osName)s": "应用%(appName)通过%(osName)上的%(browserName)浏览器运行",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>和<a href=\"http://opera.com\">Opera</a>均可运行。",
+    "A new version of Riot is available.": "Riot 有更新可用。",
+    "Add an email address above to configure email notifications": "请在上方输入电子邮件地址以接收邮件通知",
+    "Advanced notification settings": "通知高级设置",
+    "All messages": "全部消息",
+    "All messages (loud)": "全部消息（高亮）",
+    "All Rooms": "全部房间",
+    "All notifications are currently disabled for all targets.": "当前所有目标的通知均已禁用。",
+    "An error occurred whilst saving your email notification preferences.": "保存邮件通知偏好设定时出现错误。",
+    "Call invitation": "语音邀请",
+    "Cancel": "取消",
+    "Cancel Sending": "取消发送",
+    "Can't update user notification settings": "不能更新用户通知设置",
+    "Changelog": "变更日志",
+    "Collecting app version information": "正在收集应用版本信息",
+    "Collecting logs": "正在收集日志",
+    "Create new room": "创建新房间",
+    "Couldn't find a matching Matrix room": "未找到符合的 Matrix 房间",
+    "Custom Server Options": "自定义服务器选项",
+    "customServer_text": "你可以通过指定自定义服务器选项中的其他 Home server URL 来登录其他 Matrix 服务器。<br/>该选项允许你在 Riot 上使用其他 Home server 上的帐号。<br/><br/>你也可以自定义身份验证服务器，但你将不能通过邮件邀请其他用户，同样的，你也不能通过邮件被其他用户邀请。",
+    "delete the alias.": "删除别名。",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除房间别名 %(alias) 并将 %(name) 从列表中删除吗？",
+    "Describe your problem here.": "在这里描述你的问题。",
+    "Directory": "房间列表",
+    "Dismiss": "设为已读",
+    "Download this file": "下载该文件"
 }

From c55d292840a1553e764fe0a98f7382ecedcf1205 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 18 Jun 2017 23:50:13 +0100
Subject: [PATCH 149/172] add new languages

---
 scripts/copy-res.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 0e22907e62..e8f6684d21 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -13,16 +13,21 @@ const INCLUDE_LANGS = [
     {'value': 'en_US', 'label': 'English (US)'},
     {'value': 'da', 'label': 'Dansk'},
     {'value': 'el', 'label': 'Ελληνικά'},
+    {'value': 'eo', 'label': 'Esperanto'},
     {'value': 'nl', 'label': 'Nederlands'},
     {'value': 'de_DE', 'label': 'Deutsch'},
     {'value': 'fr', 'label': 'Français'},
+    {'value': 'hu', 'label': 'Magyar'},
     {'value': 'ko', 'label': '한국어'},
+    {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
+    {'value': 'pl', 'label': 'Polski'},
     {'value': 'pt', 'label': 'Português'},
     {'value': 'pt_BR', 'label': 'Português do Brasil'},
     {'value': 'ru', 'label': 'Русский'},
     {'value': 'sv', 'label': 'Svenska'},
     {'value': 'es', 'label': 'Español'},
     {'value': 'th', 'label': 'ไทย'},
+    {'value': 'tr', 'label': 'Türk'},
     {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
     {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
 ];

From 79816c572606688d6b013b60ce34d6928d55cc65 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 18 Jun 2017 23:54:29 +0100
Subject: [PATCH 150/172] fix broken http status i18n

---
 src/i18n/strings/de_DE.json | 2 +-
 src/i18n/strings/el.json    | 2 +-
 src/i18n/strings/en_EN.json | 2 +-
 src/i18n/strings/en_US.json | 2 +-
 src/i18n/strings/eo.json    | 2 +-
 src/i18n/strings/es.json    | 2 +-
 src/i18n/strings/fr.json    | 2 +-
 src/i18n/strings/hu.json    | 2 +-
 src/i18n/strings/ko.json    | 2 +-
 src/i18n/strings/nl.json    | 2 +-
 src/i18n/strings/pl.json    | 2 +-
 src/i18n/strings/pt_BR.json | 2 +-
 src/i18n/strings/ru.json    | 2 +-
 src/i18n/strings/th.json    | 2 +-
 src/i18n/strings/tr.json    | 2 +-
 src/i18n/strings/uk.json    | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e5044c9758..19d43523ed 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -205,7 +205,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Dies erlaubt dir, dich wieder an deinem Konto anzumelden, nachdem du dich abgemeldet hast.",
     "Dev chat for the Dendrite dev team": "Entwickler-Chat für das Dendrite-Entwickler-Team",
     "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot",
-    " (HTTP status %(httpStatus))": "(HTTP-Status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-Status %(httpStatus)s)",
     "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
     "Remember, you can always set an email address in user settings if you change your mind.": "Denk daran, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst."
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index f1dc8b8334..c9f9373a5a 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -156,7 +156,7 @@
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
     "Quote": "Παράθεση",
     "Fetching third party location failed": "Η λήψη τοποθεσίας απέτυχε",
-    " (HTTP status %(httpStatus))": "(Κατάσταση HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(Κατάσταση HTTP %(httpStatus)s)",
     "Login": "Σύνδεση",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Το Riot χρησιμοποιεί αρκετά προχωρημένα χαρακτηριστικά των περιηγητών Ιστού, ορισμένα από τα οποία δεν είναι διαθέσιμα ή είναι σε πειραματικό στάδιο στον περιηγητή σας.",
     "The Home Server may be too old to support third party networks": "Ο διακομιστής μπορεί να είναι αρκετά παλιός για να υποστηρίζει δίκτυα τρίτων",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index bdf0c08222..4717e267ea 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -62,7 +62,7 @@
   "Guests can join": "Guests can join",
   "Guest users can't invite users. Please register to invite.": "Guest users can't invite users. Please register to invite.",
   "Hide panel": "Hide panel",
-  " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+  "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
   "I understand the risks and wish to continue": "I understand the risks and wish to continue",
   "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:",
   "Invite to this room": "Invite to this room",
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 6e37469705..2d7a5fa148 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -164,7 +164,7 @@
     "Login": "Login",
     "Continue": "Continue",
     "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
-    " (HTTP status %(httpStatus))": "(HTTP status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
     "Welcome to Riot.im": "Welcome to Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
     "Chat with Riot Bot": "Chat with Riot Bot",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 4a50ff5609..bfc8bcd0a1 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -81,7 +81,7 @@
     "Failed to set Direct Message status of room": "Malsukcesis agordi la staton de Rekta Mesaĝo de la ejo",
     "Forward Message": "Plusendi mesaĝon",
     "Hide panel": "Kaŝi panelon",
-    " (HTTP status %(httpStatus))": "(stato HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(stato HTTP %(httpStatus)s)",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Por diagnozi problemojn, protokoloj el tiu ĉi kliento sendiĝos kune kun tiu ĉi raporto de eraro. Se vi preferas sendi nur la supran tekston, bonvolu malŝalti:",
     "Login": "Ensaluti",
     "Loading bug report module": "Ŝarĝante modulon pri eraroraporto",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index 97a6da536e..af1efb60e8 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -123,7 +123,7 @@
     "Describe your problem here.": "Describa su problema aquí.",
     "Forward Message": "Reenviar mensaje",
     "Hide panel": "Ocultar panel",
-    " (HTTP status %(httpStatus))": "(estado HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(estado HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
     "Changelog": "Bitácora de cambios",
     "Collapse panel": "Colapsar panel",
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index f1f2c33a6c..13cf15ceaf 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -169,7 +169,7 @@
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
     "Welcome to Riot.im": "Bienvenue sur Riot.im",
-    " (HTTP status %(httpStatus))": "(statut HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(statut HTTP %(httpStatus)s)",
     "Login": "S'identifier",
     "Chat with Riot Bot": "Discussion avec Riot Bot",
     "Search the room directory": "Rechercher dans le répertoire de salon",
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index ac7497c1e6..a08a8b8648 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -196,7 +196,7 @@
     "Continue": "Folytatás",
     "Please set a password!": "Kérlek, állíts be egy jelszót!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
-    " (HTTP status %(httpStatus))": "(HTTP állapot %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP állapot %(httpStatus)s)",
     "You have successfully set a password and an email address!": "Sikeresen beállítottad a jelszavad és e-mail címed!",
     "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál."
 }
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index e0d1b40e5e..862fbc0aa5 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -131,7 +131,7 @@
     "Forward Message": "메시지 전달",
     " from room": " 방에서",
     "Guests can join": "손님이 들어올 수 있어요",
-    " (HTTP status %(httpStatus))": "(HTTP 상태 %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP 상태 %(httpStatus)s)",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "문제를 진단하기 위해서, 이 클라이언트의 로그를 오류 보고서와 같이 보낼 거에요. 위 내용만 보내시려면, 체크를 해제하세요:",
     "Keywords": "키워드",
     "Mentions only": "답만 하기",
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index c8f0079538..75c9cdfe3a 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -132,7 +132,7 @@
     "Failed to send report: ": "Rapport verzenden mislukt: ",
     "Forward Message": "Bericht doorsturen",
     "Hide panel": "Paneel verbergen",
-    " (HTTP status %(httpStatus))": "(HTTP-status %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
     "I understand the risks and wish to continue": "Ik begrijp de risico's en wil graag verder gaan",
     "Login": "Aanmelden",
     "Loading bug report module": "Bugrapporteermodule laden",
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 4ca24868bc..2941f4b568 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -77,7 +77,7 @@
     "more": "więcej",
     "Enable desktop notifications": "Włącz powiadomienia",
     "Guest users can't invite users. Please register to invite.": "Gość nie ma uprawnień dow wysyłania zaproszeń. Proszę się zarejestrować.",
-    " (HTTP status %(httpStatus))": "(status HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(status HTTP %(httpStatus)s)",
     "Leave": "Opuść",
     "Login": "Logowanie",
     "Members": "Członkowie",
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 436e15bc10..17e3eaa778 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -198,6 +198,6 @@
     "Continue": "Continuar",
     "Please set a password!": "Por favor, defina uma senha!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Isso permitirá que você possa retornar à sua conta após fazer logout, e também fazer login em outros dispositivos.",
-    " (HTTP status %(httpStatus))": "(Status HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(Status HTTP %(httpStatus)s)",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 8c5ef574e4..1c3bb01638 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -183,7 +183,7 @@
     "Admin support for Dendrite": "Админ. помощь для Dendrite",
     "Building services on Matrix": "Построить услуги для Matrix",
     "Implementing VoIP services with Matrix": "Внедрение услуги VoIP с Matrix",
-    " (HTTP status %(httpStatus))": "(HTTP-Состояние %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP-Состояние %(httpStatus)s)",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Чат",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk-Чат",
     "Announcements about Synapse releases": "Объявления релизов Synapse",
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 976971c87e..27483243a0 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -197,7 +197,7 @@
     "Discussion of the Identity Service API": "พูดคุยเกี่ยวกับ Identity Service API",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "ระบบแชทและประสานงาน ไร้ศูนย์กลางและเข้ารหัสได้ โดยใช้เทคโนโลยีจาก [matrix]",
     "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
-    " (HTTP status %(httpStatus))": "(สถานะ HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(สถานะ HTTP %(httpStatus)s)",
     "Remember, you can always set an email address in user settings if you change your mind.": "อย่าลืม คุณสามารถตั้งที่อยู่อีเมลในการตั้งค่าผู้ใช้ได้ทุกเมื่อหากคุณเปลี่ยนใจ",
     "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 761672f887..3540194329 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -62,7 +62,7 @@
     "Guests can join": "Misafirler katılabilirler",
     "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
     "Hide panel": "Paneli gizle",
-    " (HTTP status %(httpStatus))": "(HTTP durumu &(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP durumu &(httpStatus))",
     "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Sorunları teşhis etmek için , bu istemciden kayıtlar hata raporu ile beraber gönderilecek . Yalnızca yukarıdaki metni göndermek isterseniz , lütfen işareti kaldırın:",
     "Invite to this room": "Bu odaya davet et",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 80cabf9a62..a16cd75167 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -59,7 +59,7 @@
     "Guests can join": "Гості можуть приєднуватися",
     "Guest users can't invite users. Please register to invite.": "Гості не можуть запрошувати користувачів. Зареєструйтесь, будь ласка, для видачі запрошень.",
     "Hide panel": "Сховати панель",
-    " (HTTP status %(httpStatus))": "(статус HTTP %(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Я ознайомлений з ризиками і хочу продовжити",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "З метою діагностики проблем журнали з цього застосунку будуть надіслані разом зі звітом про вади. Якщо ви бажаєте надіслати лише вищенаведений текст, відозначте, будь ласка:",
     "Invite to this room": "Запросити до цієї кімнати",

From e3a63c3a6d3524a1af39ea9133bb15ee8eacbe35 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 19 Jun 2017 00:01:11 +0100
Subject: [PATCH 151/172] fix broken vars

---
 .../views/dialogs/SetPasswordDialog.js        |  4 +--
 src/i18n/strings/ml.json                      |  2 +-
 src/i18n/strings/tr.json                      | 26 +++++++++----------
 src/i18n/strings/zh_Hans.json                 |  4 +--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/components/views/dialogs/SetPasswordDialog.js b/src/components/views/dialogs/SetPasswordDialog.js
index 3e34d8b4b1..b82d03468c 100644
--- a/src/components/views/dialogs/SetPasswordDialog.js
+++ b/src/components/views/dialogs/SetPasswordDialog.js
@@ -93,8 +93,8 @@ export default React.createClass({
         if (err.httpStatus === 403) {
             errMsg = _t('Failed to change password. Is your password correct?');
         } else if (err.httpStatus) {
-            errMsg += _t(
-                ' (HTTP status %(httpStatus)s)',
+            errMsg += ' ' + _t(
+                '(HTTP status %(httpStatus)s)',
                 { httpStatus: err.httpStatus },
             );
         }
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 1059888544..9f2ad64a24 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -2,5 +2,5 @@
     "Add an email address above to configure email notifications": "ഇ മെയില്‍ അറിയിപ്പുകൾ ലഭിക്കാന്‍ മുകളില്‍ ഇ-മെയില്‍ വിലാസം നല്‍കൂ",
     "All messages": "എല്ലാ സന്ദേശങ്ങളും",
     "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)ല്‍  %(browserName) വഴി %(appName)"
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)sല്‍  %(browserName)s വഴി %(appName)s"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 3540194329..9d97d7cbbe 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -1,5 +1,5 @@
 {
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName) işletim sisteminde %(browserName) ile %(appName)",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s işletim sisteminde %(browserName)s ile %(appName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\"> Safari </a> ve<a href=\"http://opera.com\"> Opera </a> da çalışıyor.",
     "A new version of Riot is available.": "Riot'un yeni bir versiyonu mevcuttur.",
     "Add an email address above to configure email notifications": "E-posta bildirimlerini yapılandırmak için yukarıya bir e-posta adresi ekleyin",
@@ -23,13 +23,13 @@
     "Custom Server Options": "Özel Sunucu Seçenekleri",
     "customServer_text": "Farklı bir Ana Sunucu URL'si belirleyerek başka bir Matrix sunucusunda oturum açmak için Özel Sunucu Seçeneklerini kullanabilirsiniz. <br/> Bu , Riot'u mevcut Matrix hesabı ile farklı bir Ana Sunucuda kullanmanıza olanak tanır.<br/> <br/> Ayrıca Özel Kimlik Sunucu'da ayarlayabilirsiniz ama kullanıcıları e-posta adresleriyle veya kendi e-posta adresinizle davet edemezsiniz.",
     "delete the alias.": "Tüm rumuzları sil.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias) oda rumuzu silinsin ve %(name) dizinden kaldırılsın mı ?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "%(alias)s oda rumuzu silinsin ve %(name)s dizinden kaldırılsın mı ?",
     "Describe your problem here.": "Probleminizi burada açıklayın.",
     "Direct Chat": "Doğrudan Sohbet",
     "Directory": "Dizin",
     "Dismiss": "Reddet",
     "Download this file": "Bu dosyayı indir",
-    "Drop here %(toAction)s": "Yapılacakları buraya bırak",
+    "Drop here %(toAction)s": "Burayı terket %(toAction)s",
     "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir",
     "Enable desktop notifications": "Masaüstü bildirimlerini etkinleştir",
     "Enable email notifications": "E-posta bildirimlerini etkinleştir",
@@ -41,14 +41,14 @@
     "#example": "örnek",
     "Expand panel": "Genişletme paneli",
     "Failed to": "Başaramadı",
-    "Failed to add tag %(tagName)s to room": "%(tagName) etiketi odaya eklenemedi",
+    "Failed to add tag %(tagName)s to room": "%(tagName)s etiketi odaya eklenemedi",
     "Failed to change settings": "Ayarlar değiştirilemedi",
-    "Failed to forget room %(errCode)s": "Odayı unutma başarısız oldu %(errCode)",
+    "Failed to forget room %(errCode)s": "Odayı unutma başarısız oldu %(errCode)s",
     "Failed to update keywords": "Anahtar kelimeler güncellenemedi",
     "Failed to get protocol list from Home Server": "Ana Sunucu'dan protokol listesi alınamadı",
     "Failed to get public room list": "Genel odalar listesi alınamadı",
     "Failed to join the room": "Odaya girilemedi",
-    "Failed to remove tag %(tagName)s from room": "Odadan %(tagName) etiketi kaldırılamadı",
+    "Failed to remove tag %(tagName)s from room": "Odadan %(tagName)s etiketi kaldırılamadı",
     "Failed to send report: ": "Rapor gönderilemedi: ",
     "Failed to set direct chat tag": "Direkt sohbet etiketi ayarlanamadı",
     "Failed to set Direct Message status of room": "Odanın Direkt Mesaj durumu ayarlanamadı",
@@ -62,7 +62,7 @@
     "Guests can join": "Misafirler katılabilirler",
     "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
     "Hide panel": "Paneli gizle",
-    "(HTTP status %(httpStatus)s)": "(HTTP durumu &(httpStatus))",
+    "(HTTP status %(httpStatus)s)": "(HTTP durumu %(httpStatus)s)",
     "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
     "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Sorunları teşhis etmek için , bu istemciden kayıtlar hata raporu ile beraber gönderilecek . Yalnızca yukarıdaki metni göndermek isterseniz , lütfen işareti kaldırın:",
     "Invite to this room": "Bu odaya davet et",
@@ -100,13 +100,13 @@
     "Quote": "Alıntı",
     "Redact": "Yazıya Dökme",
     "Reject": "Reddet",
-    "Remove %(name)s from the directory?": "%(name)'i dizinden kaldırılsın mı ?",
+    "Remove %(name)s from the directory?": "%(name)s'i dizinden kaldırılsın mı ?",
     "Remove": "Kaldır",
-    "remove %(name)s from the directory.": "%(name)'i dizinden kaldır.",
+    "remove %(name)s from the directory.": "%(name)s'i dizinden kaldır.",
     "Remove from Directory": "Dizinden Kaldır",
     "Report a bug": "Hata Bildir",
     "Resend": "Yeniden Gönder",
-    "Riot Desktop on %(platformName)s": "%(platformName) platformunda Riot Masaüstü",
+    "Riot Desktop on %(platformName)s": "%(platformName)s platformunda Riot Masaüstü",
     "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
     "Riot is not supported on mobile web. Install the app?": "Riot mobil web'de desteklenmiyor . Uygulamayı yükle ?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
@@ -136,7 +136,7 @@
     "unknown error code": "Bilinmeyen hata kodu",
     "Unnamed room": "İsimsiz oda",
     "Update": "Güncelleştirme",
-    "Uploaded on %(date)s by %(user)s": "%(user) tarafında %(date) e yüklendi",
+    "Uploaded on %(date)s by %(user)s": "%(user)s tarafında %(date)s e yüklendi",
     "Uploading report": "Rapor yükleniyor",
     "View Decrypted Source": "Şifresi Çözülmüş(Decrypted) Kaynağı Görüntüle",
     "View Source": "Kaynağı Görüntüle",
@@ -145,8 +145,8 @@
     "Waiting for response from server": "Sunucudan yanıt bekleniyor",
     "When I'm invited to a room": "Bir odaya davet edildiğimde",
     "World readable": "Okunabilir dünya",
-    "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code))",
-    "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code))",
+    "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code)s)",
     "You are not receiving desktop notifications": "Masaüstü bildirimleri almıyorsunuz",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Konuk olarak Riotluyorsunuz. Daha fazla odaya ve özelliğe erişmek için <a> Kayıt Ol </a> ya da <a> Oturum Aç </a> !",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Onları Riot dışında bir istemciden yapılandırmış olabilirsiniz . Onları Riot içersinide ayarlayamazsınız ama hala geçerlidirler",
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index ca0a9ccda8..646cfc68d8 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -4,7 +4,7 @@
     "Notifications": "通知",
     "OK": "确定",
     "Operation failed": "操作失败",
-    "%(appName)s via %(browserName)s on %(osName)s": "应用%(appName)通过%(osName)上的%(browserName)浏览器运行",
+    "%(appName)s via %(browserName)s on %(osName)s": "应用%(appName)s通过%(osName)s上的%(browserName)s浏览器运行",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>和<a href=\"http://opera.com\">Opera</a>均可运行。",
     "A new version of Riot is available.": "Riot 有更新可用。",
     "Add an email address above to configure email notifications": "请在上方输入电子邮件地址以接收邮件通知",
@@ -26,7 +26,7 @@
     "Custom Server Options": "自定义服务器选项",
     "customServer_text": "你可以通过指定自定义服务器选项中的其他 Home server URL 来登录其他 Matrix 服务器。<br/>该选项允许你在 Riot 上使用其他 Home server 上的帐号。<br/><br/>你也可以自定义身份验证服务器，但你将不能通过邮件邀请其他用户，同样的，你也不能通过邮件被其他用户邀请。",
     "delete the alias.": "删除别名。",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除房间别名 %(alias) 并将 %(name) 从列表中删除吗？",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除房间别名 %(alias)s 并将 %(name)s 从列表中删除吗？",
     "Describe your problem here.": "在这里描述你的问题。",
     "Directory": "房间列表",
     "Dismiss": "设为已读",

From 6e64dd32c8a08e4fddf57bae90722feec410deed Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 19 Jun 2017 00:54:07 +0100
Subject: [PATCH 152/172] add register button

---
 src/components/structures/LoginBox.js                     | 7 +++++++
 .../vector/css/matrix-react-sdk/structures/_LoginBox.scss | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/structures/LoginBox.js b/src/components/structures/LoginBox.js
index 445585a758..c9f8e87a10 100644
--- a/src/components/structures/LoginBox.js
+++ b/src/components/structures/LoginBox.js
@@ -47,6 +47,10 @@ module.exports = React.createClass({
         dis.dispatch({ action: 'start_login' });
     },
 
+    onRegisterClick: function() {
+        dis.dispatch({ action: 'start_registration' });
+    },
+
     render: function() {
         var TintableSvg = sdk.getComponent('elements.TintableSvg');
 
@@ -71,6 +75,9 @@ module.exports = React.createClass({
                     <AccessibleButton className="mx_LoginBox_loginButton" element="button" onClick={this.onLoginClick}>
                         { _t("Login") }
                     </AccessibleButton>
+                    <AccessibleButton className="mx_LoginBox_registerButton" element="button" onClick={this.onRegisterClick}>
+                        { _t("Register") }
+                    </AccessibleButton>
                 </div>
             );
         }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
index 3c8091fe9e..92d8833bc6 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
@@ -19,13 +19,15 @@ limitations under the License.
     width: 100%;
 }
 
-.mx_LoginBox_loginButton {
+.mx_LoginBox_loginButton,
+.mx_LoginBox_registerButton {
     margin-top: -8px;
     height: 40px;
     border: 0px;
     border-radius: 40px;
-    padding-left: 1em;
-    padding-right: 1em;
+    margin-left: 4px;
+    margin-right: 4px;
+    width: 80px;
 
     background-color: $accent-color;
     color: $primary-bg-color;

From 45bb74d8f6fcc2c0294866821bb9bd82d3127884 Mon Sep 17 00:00:00 2001
From: Nathan van Beelen <nathan@vanbeelen.org>
Date: Mon, 19 Jun 2017 10:31:51 +0000
Subject: [PATCH 153/172] Translated using Weblate (Dutch)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 75c9cdfe3a..d3d9483c3f 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -31,7 +31,7 @@
     "Failed to": "Mislukt om",
     "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen",
     "Failed to change settings": "Instellingen wijzigen mislukt",
-    "Failed to forget room %(errCode)s": "Kamer vergeten mislukt %(errCode)s",
+    "Failed to forget room %(errCode)s": "Ruimte vergeten mislukt %(errCode)s",
     "Failed to update keywords": "Trefwoorden bijwerken mislukt",
     "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
     "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt",
@@ -70,7 +70,7 @@
     "On": "Aan",
     "Operation failed": "Actie mislukt",
     "Permalink": "Permanente link",
-    "Please Register": "Registreer alstublieft",
+    "Please Register": "Registreer Alstublieft",
     "powered by Matrix": "mogelijk gemaakt door Matrix",
     "Quote": "Citeer",
     "Reject": "Afwijzen",

From c9715e02d935921d02e12bfbc805f4d1842b48ae Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Jun 2017 11:37:55 +0100
Subject: [PATCH 154/172] Merge remote-tracking branch 'weblate/develop' into
 develop

---
 src/i18n/strings/eo.json | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index bfc8bcd0a1..a7baa0430b 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -164,5 +164,39 @@
     "Get started with some tips from Riot Bot!": "Eki per sugesto de la roboto Riot Bot!",
     "General discussion about Matrix and Riot": "Ĝenerala diskutado pri Matrix kaj Riot",
     "Discussion of all things Matrix!": "Diskutado pri ĉio rilate al Matrix!",
-    "Riot/Web &amp; Desktop chat": "Diskudato labortabla pri Riot/Web"
+    "Riot/Web &amp; Desktop chat": "Diskudato labortabla pri Riot/Web",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Diskutado pri Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Diskutado pri Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Teknikaj diskutoj pri Matrix",
+    "Running Matrix services": "Funkciigado de servoj Matrix",
+    "Community-run support for Synapse": "Komunuma subtenado de Synapse",
+    "Admin support for Dendrite": "Administra subtenado por Dendrite",
+    "Announcements about Synapse releases": "Anoncoj pri eldonoj Synapse",
+    "Support for those using and running matrix-appservice-irc": "Subteno por tiuj, kiuj uzas kaj funkciigas matrix-appservice-irc",
+    "Building services on Matrix": "Konstruante servojn per Matrix",
+    "Support for those using the Matrix spec": "Subteno por tiuj, kiuj uzas la specifon Matrix",
+    "Design and implementation of E2E in Matrix": "Dizajno kaj realigo de E2E en Matrix",
+    "Implementing VR services with Matrix": "Realigi VR-servojn per Matrix",
+    "Implementing VoIP services with Matrix": "Realigi VoIP-servojn per Matrix",
+    "Discussion of the Identity Service API": "Diskutado pri la API de Identiga Servo",
+    "Support for those using, running and writing other bridges": "Subteno por tiuj, kiuj uzas, funkciigas kaj skribas aliajn pontojn",
+    "Contributing code to Matrix and Riot": "Kontribui kodon al Matrix kaj Riot",
+    "Dev chat for the Riot/Web dev team": "Programista babilado por la programteamo de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Programista babilado por la programteamo de Dendrite",
+    "Co-ordination for Riot/Web translators": "Kunordigado por tradukistoj de Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Multaj ejoj jam ekzistas en Matrix, ligitaj al ekzistantaj retoj (Slock, IRC, Gitter, ktp) aŭ sendependaj. Kontrolu la dosierujon!",
+    "Failed to change password. Is your password correct?": "Malsukcesis ŝanĝi la pasvorton. Ĉu via pasvorto pravas?",
+    "You have successfully set a password!": "Vi sukcese agordis pasvorton!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Vi nun rajtas reiri al via konto post elsaluto, kaj ensaluti per aliaj aparatoj.",
+    "Continue": "Daŭrigi",
+    "Please set a password!": "Bonvolu agordi pasvorton!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Tio ĉi permesos vin reiri al via konto post elsaluto, kaj ensaluti per alia aparato.",
+    "You have successfully set a password and an email address!": "Vi sukcese agordis pasvorton kaj retpoŝtadreson!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Memoru, vi ĉiam povas agordi retpoŝtadreson en via uzanta agordo se vi decidas ŝanĝi ĝin poste.",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s je %(osName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> kaj <a href=\"http://opera.com\">Opera</a> ankaŭ funkcias.",
+    "Drop here %(toAction)s": "Forlasi ĉi tie %(toAction)s",
+    "Favourite": "Plej ŝatata",
+    "Fetching third party location failed": "Venigado de ekstere liverita loko malsukcesis",
+    "Filter room names": "Filtri nomojn de ejoj"
 }

From 578fa1c1607559b43d5794930999e2f6a5c09aa3 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Mon, 19 Jun 2017 11:38:55 +0100
Subject: [PATCH 155/172] Merge pull request #4354 from
 RiotTranslateBot/weblate-riot-web-riot-web

Update from Weblate.
---
 src/i18n/strings/nl.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 75c9cdfe3a..d3d9483c3f 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -31,7 +31,7 @@
     "Failed to": "Mislukt om",
     "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen",
     "Failed to change settings": "Instellingen wijzigen mislukt",
-    "Failed to forget room %(errCode)s": "Kamer vergeten mislukt %(errCode)s",
+    "Failed to forget room %(errCode)s": "Ruimte vergeten mislukt %(errCode)s",
     "Failed to update keywords": "Trefwoorden bijwerken mislukt",
     "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
     "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt",
@@ -70,7 +70,7 @@
     "On": "Aan",
     "Operation failed": "Actie mislukt",
     "Permalink": "Permanente link",
-    "Please Register": "Registreer alstublieft",
+    "Please Register": "Registreer Alstublieft",
     "powered by Matrix": "mogelijk gemaakt door Matrix",
     "Quote": "Citeer",
     "Reject": "Afwijzen",

From f420a1869681ce3f4fb0a31433ce8c9c281e96ad Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Jun 2017 13:12:40 +0100
Subject: [PATCH 156/172] Released js-sdk & react-sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 489779a9dd..c5562ea6ef 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,8 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.12-rc.1",
-    "matrix-react-sdk": "0.9.5-rc.2",
+    "matrix-js-sdk": "0.7.12",
+    "matrix-react-sdk": "0.9.5",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From 3e279746d573ab16084330f43587d1573da2842e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Jun 2017 13:19:09 +0100
Subject: [PATCH 157/172] v0.11.2

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

diff --git a/electron_app/package.json b/electron_app/package.json
index 25cb81a125..26cfe095f9 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.2-rc.2",
+  "version": "0.11.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 88950f29c542cb1cd2d06a6801e11a5829cca789 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Jun 2017 13:20:44 +0100
Subject: [PATCH 158/172] Prepare changelog for v0.11.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f08c2073bb..f961181509 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.11.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.2) (2017-06-19)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2-rc.2...v0.11.2)
+
+ * Add more languages and translations
+ * Add a 'register' button
+
 Changes in [0.11.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.2-rc.2) (2017-06-16)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2-rc.1...v0.11.2-rc.2)

From 448e33bb65753cec30ba02020e134d565bd98614 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Jun 2017 13:20:45 +0100
Subject: [PATCH 159/172] v0.11.2

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

diff --git a/package.json b/package.json
index c5562ea6ef..9d29f1cb27 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.2-rc.2",
+  "version": "0.11.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From 7523251098d6f8b9528f357dc47190bb731f2925 Mon Sep 17 00:00:00 2001
From: daniel tygel <dtygel@gmail.com>
Date: Mon, 19 Jun 2017 13:22:43 +0000
Subject: [PATCH 160/172] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 17e3eaa778..e93fc1979b 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -199,5 +199,7 @@
     "Please set a password!": "Por favor, defina uma senha!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Isso permitirá que você possa retornar à sua conta após fazer logout, e também fazer login em outros dispositivos.",
     "(HTTP status %(httpStatus)s)": "(Status HTTP %(httpStatus)s)",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]"
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]",
+    "You have successfully set a password and an email address!": "Você definiu uma senha e um endereço de e-mail com sucesso!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre-se: você pode sempre definir um endereço de e-mail nas configurações de usuário, se mudar de ideia."
 }

From 8b7692cf3bb7791d7bf09dab543273c1ae9e5170 Mon Sep 17 00:00:00 2001
From: russian <tbhs@arur01.tk>
Date: Mon, 19 Jun 2017 13:24:27 +0000
Subject: [PATCH 161/172] Translated using Weblate (Russian)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 1c3bb01638..1eb04f4b11 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -34,7 +34,7 @@
     "Favourite": "Избранное",
     "Fetching third party location failed": "Не удалось получить местоположение",
     "Files": "Файлы",
-    "Filter room names": "Фильтр по назв. комнаты",
+    "Filter room names": "Поиск по названию комнат",
     "Forget": "Удалить",
     "from the directory": "из каталога",
     " from room": " из комнаты",

From 241ebe50d24c595439739daabe7058d6bb4a1b2f Mon Sep 17 00:00:00 2001
From: Bamstam <max.strube@posteo.de>
Date: Mon, 19 Jun 2017 15:54:57 +0000
Subject: [PATCH 162/172] Translated using Weblate (German)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 19d43523ed..e6ae460ec4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -86,7 +86,7 @@
     "Cancel Sending": "Senden abbrechen",
     "Close": "Schließen",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Soll der Raum-Alias %(alias)s gelöscht und der %(name)s aus dem Verzeichnis entfernt werden?",
-    "Download this file": "Diese Datei herunterladen",
+    "Download this file": "Datei herunterladen",
     "Failed to add tag %(tagName)s to room": "Das Hinzufügen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
     "Failed to remove tag %(tagName)s from room": "Das Entfernen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
@@ -95,14 +95,14 @@
     "Mute": "Stummschalten",
     "Permalink": "Permanenter Link",
     "Quote": "Zitat",
-    "Redact": "Redaktionell entfernen",
+    "Redact": "Löschen",
     "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
     "remove %(name)s from the directory.": "entferne %(name)s aus dem Verzeichnis.",
     "Resend": "Erneut senden",
     "Source URL": "Quell-URL",
     "Unable to look up room ID from server": "Es ist nicht möglich, die Raum-ID auf dem Server nachzuschlagen",
     "Unhide Preview": "Vorschau wieder anzeigen",
-    "Uploaded on %(date)s by %(user)s": "Hochgeladen am %(date)s durch %(user)s",
+    "Uploaded on %(date)s by %(user)s": "Hochgeladen am %(date)s von %(user)s",
     "View Decrypted Source": "Entschlüsselten Quellcode ansehen",
     "View Source": "Quellcode ansehen",
     "You cannot delete this image. (%(code)s)": "Das Bild kann nicht gelöscht werden. (%(code)s)",

From 133f3d24f53eb01286216dfed38868e6ff12b512 Mon Sep 17 00:00:00 2001
From: GrigRUSS <grigruss@ya.ru>
Date: Mon, 19 Jun 2017 17:18:11 +0000
Subject: [PATCH 163/172] Translated using Weblate (Russian)

Currently translated at 100.0% (200 of 200 strings)

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

diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1eb04f4b11..d10c19b50e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -5,8 +5,8 @@
     "and remove": "и удалить",
     "Can't update user notification settings": "Не возможно обновить пользовательские настройки оповещения",
     "Create new room": "Создать новую комнату",
-    "Couldn't find a matching Matrix room": "Не возможно найти подходящую Матриксу комнату",
-    "Custom Server Options": "Расширенные настройки сервера",
+    "Couldn't find a matching Matrix room": "Не возможно найти подходящую комнату Matrix",
+    "Custom Server Options": "Собственные настройки сервера",
     "delete the alias.": "удалить псевдоним.",
     "Delete the room alias": "Удалить привязку комнаты",
     "Direct Chat": "Приватный чат",
@@ -30,16 +30,16 @@
     "Failed to get public room list": "Не удалось получить список открытых комнат",
     "Failed to join the room": "Не удалось войти в комнату",
     "Failed to remove tag ": "Не удалось удалить тег ",
-    "Failed to set Direct Message status of room": "Не удалось задать статус комнаты Персональное Сообщение",
+    "Failed to set Direct Message status of room": "Не удалось установить статус прямого сообщения в комнате",
     "Favourite": "Избранное",
     "Fetching third party location failed": "Не удалось получить местоположение",
     "Files": "Файлы",
-    "Filter room names": "Поиск по названию комнат",
+    "Filter room names": "Фильтр по названию комнат",
     "Forget": "Удалить",
     "from the directory": "из каталога",
     " from room": " из комнаты",
     "Guests can join": "Гость может присоединиться",
-    "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглашений.",
+    "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Пожалуйста зарегистрируйтесь.",
     "Invite to this room": "Пригласить",
     "Keywords": "Ключевые слова",
     "Leave": "Покинуть",
@@ -51,12 +51,12 @@
     "Notifications": "Уведомления",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по следующим ключевым словам соответствуют правилам, которые нельзя отобразить здесь:",
     "Notify for all other messages/rooms": "Уведомить обо всех других сообщениях/комнатах",
-    "Notify me for anything else": "Уведомить меня обо всем кроме",
+    "Notify me for anything else": "Уведомить меня о чем либо еще",
     "Off": "Выключить",
     "On": "Включить",
     "Operation failed": "Действие не удалось",
     "Please Register": "Пожалуйста, зарегистрируйтесь",
-    "powered by Matrix": "управляемый с Matrix",
+    "powered by Matrix": "Основано на Matrix",
     "Reject": "Отклонить",
     "Remove": "Удалить",
     "remove": "удалить",
@@ -86,14 +86,14 @@
     "Close": "Закрыть",
     "Download this file": "Скачать этот файл",
     "Drop here %(toAction)s": "Вставить сюда: %(toAction)s",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и очистить %(name)s из каталога?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и удалить %(name)s из каталога?",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
     "Failed to forget room %(errCode)s": "Не удалось удалить комнату %(errCode)s",
     "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты",
-    "Failed to set direct chat tag": "Не удалось пометить прямую беседу",
+    "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
     "Unhide Preview": "Показать  анонс",
     "Uploaded on %(date)s by %(user)s": "Загружено %(date)s  %(user)s",
-    "View Decrypted Source": "Просмотр зашифрованного источника",
+    "View Decrypted Source": "Просмотр расшифрованного источника",
     "View Source": "Просмотр источника",
     "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Вы не можете удалить это сообщение. (%(code)s)",
@@ -113,7 +113,7 @@
     "Redact": "Удалить",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
     "remove %(name)s from the directory.": "удалить %(name)s из каталога.",
-    "Resend": "Переслать снова",
+    "Resend": "Отправить снова",
     "Source URL": "Исходный URL",
     "Welcome page": "Домашняя страница",
     "Advanced notification settings": "Настройки уведомлений",
@@ -131,31 +131,31 @@
     "Cancel": "Отмена",
     "Changelog": "История изменений",
     "Collapse panel": "Свернуть панель",
-    "Collecting app version information": "Сбор информации о версиях программы",
+    "Collecting app version information": "Сбор информации о версии приложения",
     "Collecting logs": "Сбор протоколов",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s с %(browserName)s на %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> и <a href=\"http://opera.com\">Opera</a> работают тоже.",
     "Describe your problem here.": "Опиши здесь свою проблему.",
-    "Expand panel": "Открыть панель",
+    "Expand panel": "Развернуть панель",
     "Failed to send report: ": "Не удалось отослать отчет: ",
-    "Forward Message": "Переслать сообщение дальше",
+    "Forward Message": "Переслать сообщение",
     "Hide panel": "Скрыть панель",
-    "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжать",
-    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Что бы выявить проблему, будет отослан журнал этого клиента с сообщением о ошибке. Если Вы только верхний текст отослать хотите, отключите следующее:",
-    "Loading bug report module": "Загрузи Модуль ошибок",
+    "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжить",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Чтобы диагностировать проблемы, логи этого клиента будут отправляться с этим сообщением об ошибке. Если вы предпочитаете отправить только текст выше, пожалуйста, отключите:",
+    "Loading bug report module": "Загрузка Модуля отчета об ошибках",
     "Messages containing <span>keywords</span>": "Сообщения, которые содержат определенные <span>ключевые слова</span>",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опишите (на Английском) ошибку. Что Вы делали? Что Вы ожидали получить? Что произошло?",
-    "Please describe the bug and/or send logs.": "Пожалуйста опишите ошибку и/или перешлите протоколы.",
-    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Пожалуйста установите <a href=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a> для лучшего результата.",
-    "Report a bug": "Отчет о ошибке",
+    "Please describe the bug and/or send logs.": "Пожалуйста опишите ошибку и/или перешлите логи.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Пожалуйста установите <a href=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a> для корректной работы чата.",
+    "Report a bug": "Отчет об ошибке",
     "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot не будет на мобильном Интернете работать. Программу инсталлировать?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует некоторые расширенные функции интернет-проводника - некоторые из них отсутствуют или экспериментальные в этом проводнике.",
+    "Riot is not supported on mobile web. Install the app?": "Riot может некорректно работать в мобильном браузере. Установить мобильное приложение?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует много расширенных функции интернет-браузера - некоторые из них отсутствуют или экспериментальные в этом браузере.",
     "Search": "Поиск",
     "Search…": "Поиск.…",
     "Send": "Отослать",
-    "Send logs": "Отослать протокол",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Извините, ваш браузер <b>не может</b> Riot запустить.",
+    "Send logs": "Отослать логи",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Извините, ваш браузер <b>не может</b> запустить Riot.",
     "This Room": "Эта комната",
     "Unavailable": "Недоступен",
     "Unknown device": "Неизвестное устройство",
@@ -178,16 +178,16 @@
     "Discussion of all things Matrix!": "Дискуссия обо всем Matrix!",
     "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop-Чат",
     "Matrix technical discussions": "Техническая дискуссия о Matrix",
-    "Running Matrix services": "Предлагать Matrix-Сервис",
+    "Running Matrix services": "Запуск сервиса Matrix",
     "Community-run support for Synapse": "Поддержка Synapse от сообщества",
     "Admin support for Dendrite": "Админ. помощь для Dendrite",
-    "Building services on Matrix": "Построить услуги для Matrix",
+    "Building services on Matrix": "Разработка сервисов на Matrix",
     "Implementing VoIP services with Matrix": "Внедрение услуги VoIP с Matrix",
-    "(HTTP status %(httpStatus)s)": "(HTTP-Состояние %(httpStatus)s)",
+    "(HTTP status %(httpStatus)s)": "(HTTP-статус %(httpStatus)s)",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Чат",
-    "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk-Чат",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk чат",
     "Announcements about Synapse releases": "Объявления релизов Synapse",
-    "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто matrix-appservice-irc  эксплуатирует и использует",
+    "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто использует matrix-appservice-irc",
     "You have successfully set a password!": "Вы успешно установили пароль!",
     "Continue": "Продолжить",
     "Please set a password!": "Задайте пароль!",

From 3ff0ed52b2d1c08e47cc47c9487b3715a547f15e Mon Sep 17 00:00:00 2001
From: GrigRUSS <grigruss@ya.ru>
Date: Mon, 19 Jun 2017 17:28:59 +0000
Subject: [PATCH 164/172] Translated using Weblate (Russian)

Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/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 d10c19b50e..aac71dfd9f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -32,7 +32,7 @@
     "Failed to remove tag ": "Не удалось удалить тег ",
     "Failed to set Direct Message status of room": "Не удалось установить статус прямого сообщения в комнате",
     "Favourite": "Избранное",
-    "Fetching third party location failed": "Не удалось получить местоположение",
+    "Fetching third party location failed": "Не удалось получить другую локацию",
     "Files": "Файлы",
     "Filter room names": "Фильтр по названию комнат",
     "Forget": "Удалить",
@@ -166,17 +166,17 @@
     "Waiting for response from server": "Подождите ответа от сервера",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы вошли в Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
     "OK": "ОК",
-    "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видео звонком.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Используйте протокол HTTPS чтобы совершать видео вызов.",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если Ваш браузер не корректно отображает информацию и все или некоторые функции отключены, Вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",
     "Login": "Войти",
-    "Welcome to Riot.im": "Добро пожаловать на Riot.im",
+    "Welcome to Riot.im": "Добро пожаловать в Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованное, шифрованное общение и сотрудничество на основе [matrix]",
     "Search the room directory": "Поиск по директории комнат",
-    "Chat with Riot Bot": "Пообщаться с Riot Bot",
+    "Chat with Riot Bot": "Пообщаться с ботом Riot",
     "Get started with some tips from Riot Bot!": "Начните с некоторых советов от Riot бота!",
     "General discussion about Matrix and Riot": "Общая дискуссия о Matrix и Riot",
     "Discussion of all things Matrix!": "Дискуссия обо всем Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop-Чат",
+    "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop чат",
     "Matrix technical discussions": "Техническая дискуссия о Matrix",
     "Running Matrix services": "Запуск сервиса Matrix",
     "Community-run support for Synapse": "Поддержка Synapse от сообщества",
@@ -184,7 +184,7 @@
     "Building services on Matrix": "Разработка сервисов на Matrix",
     "Implementing VoIP services with Matrix": "Внедрение услуги VoIP с Matrix",
     "(HTTP status %(httpStatus)s)": "(HTTP-статус %(httpStatus)s)",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Чат",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; matrix-ios-sdk чат",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk чат",
     "Announcements about Synapse releases": "Объявления релизов Synapse",
     "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто использует matrix-appservice-irc",

From f5d9af9b0b467dc53f75c4046dfe6e5e6058c7bc Mon Sep 17 00:00:00 2001
From: strixaluco <strixaluco@rocketmail.com>
Date: Tue, 20 Jun 2017 01:34:05 +0000
Subject: [PATCH 165/172] Translated using Weblate (Ukrainian)

Currently translated at 98.0% (196 of 200 strings)

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

diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index a16cd75167..59852cf1bc 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -3,7 +3,7 @@
     "All messages": "Усі повідомлення",
     "All messages (loud)": "Усі повідомлення (гучно)",
     "All Rooms": "Усі кімнати",
-    "All notifications are currently disabled for all targets.": "Повідомлення для усіх цілей на даний момент вимкнені.",
+    "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей на даний момент вимкнені.",
     "An error occurred whilst saving your email notification preferences.": "Під час збереження налаштувань сповіщень е-поштою трапилася помилка.",
     "Cancel": "Скасувати",
     "Cancel Sending": "Скасувати надсилання",
@@ -21,7 +21,7 @@
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s через %(browserName)s на %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> та <a href=\"http://opera.com\">Opera</a> також підтримуються.",
     "Add an email address above to configure email notifications": "Додайте вище адресу е-пошти щоб налаштувати сповіщення е-поштою",
-    "Advanced notification settings": "Додаткові налаштування повідомлень",
+    "Advanced notification settings": "Додаткові налаштування сповіщень",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Видалити псевдонім %(alias)s та прибрати з каталогу %(name)s?",
     "Describe your problem here.": "Опишіть вашу проблему тут.",
     "Direct Chat": "Прямий чат",

From d5d29c1c929c0e199b52c01b26cb69cfe2e30199 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 20 Jun 2017 11:23:34 +0100
Subject: [PATCH 166/172] Give _t to PasswordNagBar, add CSS for UserSettings
 password warning

Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
---
 src/components/views/globals/PasswordNagBar.js      | 10 +++++-----
 .../matrix-react-sdk/structures/_UserSettings.scss  | 13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
index 37d011a605..56eb7bd761 100644
--- a/src/components/views/globals/PasswordNagBar.js
+++ b/src/components/views/globals/PasswordNagBar.js
@@ -20,6 +20,7 @@ import React from 'react';
 import sdk from 'matrix-react-sdk';
 import Modal from 'matrix-react-sdk/lib/Modal';
 import dis from 'matrix-react-sdk/lib/dispatcher';
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 export default React.createClass({
     onUpdateClicked: function() {
@@ -33,12 +34,11 @@ export default React.createClass({
                 dis.dispatch({
                     action: 'password_changed',
                 });
-            }
+            },
         });
     },
 
     render: function() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const toolbarClasses = "mx_MatrixToolbar mx_MatrixToolbar_clickable";
         return (
             <div className={toolbarClasses} onClick={this.onUpdateClicked}>
@@ -49,12 +49,12 @@ export default React.createClass({
                     alt="Warning"
                 />
                 <div className="mx_MatrixToolbar_content">
-                    To return to your account in future you need to <u>set a password</u>
+                    { _t("To return to your account in future you need to <u>set a password</u>") }
                 </div>
                 <button className="mx_MatrixToolbar_action">
-                    Set Password
+                    { _t("Set Password") }
                 </button>
             </div>
         );
-    }
+    },
 });
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
index 9809a81ab1..7fa8ceb8c8 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@@ -102,6 +102,19 @@ limitations under the License.
     padding-right: 1em;
 }
 
+.mx_UserSettings_passwordWarning {
+    padding: 6px;
+    background-color: #76cfa6;
+    border-radius: 3px;
+    color: #fff;
+    margin-bottom: 5px;
+}
+
+.mx_UserSettings_passwordWarning_icon {
+    vertical-align: -6px;
+    margin-right: 3px;
+}
+
 .mx_UserSettings_importExportButtons {
     padding-top: 10px;
     padding-left: 40px;

From 6bae293bdf77ca0456ae4f9274af4b08e02869dc Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Tue, 20 Jun 2017 10:19:34 +0100
Subject: [PATCH 167/172] Merge pull request #4361 from
 RiotTranslateBot/weblate-riot-web-riot-web

Update from Weblate.
---
 src/i18n/strings/de_DE.json |  6 ++--
 src/i18n/strings/ru.json    | 70 ++++++++++++++++++-------------------
 src/i18n/strings/uk.json    |  4 +--
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 19d43523ed..e6ae460ec4 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -86,7 +86,7 @@
     "Cancel Sending": "Senden abbrechen",
     "Close": "Schließen",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Soll der Raum-Alias %(alias)s gelöscht und der %(name)s aus dem Verzeichnis entfernt werden?",
-    "Download this file": "Diese Datei herunterladen",
+    "Download this file": "Datei herunterladen",
     "Failed to add tag %(tagName)s to room": "Das Hinzufügen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
     "Failed to forget room %(errCode)s": "Das Entfernen des Raums ist fehlgeschlagen %(errCode)s",
     "Failed to remove tag %(tagName)s from room": "Das Entfernen des Tags %(tagName)s für den Raum ist fehlgeschlagen",
@@ -95,14 +95,14 @@
     "Mute": "Stummschalten",
     "Permalink": "Permanenter Link",
     "Quote": "Zitat",
-    "Redact": "Redaktionell entfernen",
+    "Redact": "Löschen",
     "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
     "remove %(name)s from the directory.": "entferne %(name)s aus dem Verzeichnis.",
     "Resend": "Erneut senden",
     "Source URL": "Quell-URL",
     "Unable to look up room ID from server": "Es ist nicht möglich, die Raum-ID auf dem Server nachzuschlagen",
     "Unhide Preview": "Vorschau wieder anzeigen",
-    "Uploaded on %(date)s by %(user)s": "Hochgeladen am %(date)s durch %(user)s",
+    "Uploaded on %(date)s by %(user)s": "Hochgeladen am %(date)s von %(user)s",
     "View Decrypted Source": "Entschlüsselten Quellcode ansehen",
     "View Source": "Quellcode ansehen",
     "You cannot delete this image. (%(code)s)": "Das Bild kann nicht gelöscht werden. (%(code)s)",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1c3bb01638..aac71dfd9f 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -5,8 +5,8 @@
     "and remove": "и удалить",
     "Can't update user notification settings": "Не возможно обновить пользовательские настройки оповещения",
     "Create new room": "Создать новую комнату",
-    "Couldn't find a matching Matrix room": "Не возможно найти подходящую Матриксу комнату",
-    "Custom Server Options": "Расширенные настройки сервера",
+    "Couldn't find a matching Matrix room": "Не возможно найти подходящую комнату Matrix",
+    "Custom Server Options": "Собственные настройки сервера",
     "delete the alias.": "удалить псевдоним.",
     "Delete the room alias": "Удалить привязку комнаты",
     "Direct Chat": "Приватный чат",
@@ -30,16 +30,16 @@
     "Failed to get public room list": "Не удалось получить список открытых комнат",
     "Failed to join the room": "Не удалось войти в комнату",
     "Failed to remove tag ": "Не удалось удалить тег ",
-    "Failed to set Direct Message status of room": "Не удалось задать статус комнаты Персональное Сообщение",
+    "Failed to set Direct Message status of room": "Не удалось установить статус прямого сообщения в комнате",
     "Favourite": "Избранное",
-    "Fetching third party location failed": "Не удалось получить местоположение",
+    "Fetching third party location failed": "Не удалось получить другую локацию",
     "Files": "Файлы",
-    "Filter room names": "Фильтр по назв. комнаты",
+    "Filter room names": "Фильтр по названию комнат",
     "Forget": "Удалить",
     "from the directory": "из каталога",
     " from room": " из комнаты",
     "Guests can join": "Гость может присоединиться",
-    "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Зарегистрируйтесь для приглашений.",
+    "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Пожалуйста зарегистрируйтесь.",
     "Invite to this room": "Пригласить",
     "Keywords": "Ключевые слова",
     "Leave": "Покинуть",
@@ -51,12 +51,12 @@
     "Notifications": "Уведомления",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по следующим ключевым словам соответствуют правилам, которые нельзя отобразить здесь:",
     "Notify for all other messages/rooms": "Уведомить обо всех других сообщениях/комнатах",
-    "Notify me for anything else": "Уведомить меня обо всем кроме",
+    "Notify me for anything else": "Уведомить меня о чем либо еще",
     "Off": "Выключить",
     "On": "Включить",
     "Operation failed": "Действие не удалось",
     "Please Register": "Пожалуйста, зарегистрируйтесь",
-    "powered by Matrix": "управляемый с Matrix",
+    "powered by Matrix": "Основано на Matrix",
     "Reject": "Отклонить",
     "Remove": "Удалить",
     "remove": "удалить",
@@ -86,14 +86,14 @@
     "Close": "Закрыть",
     "Download this file": "Скачать этот файл",
     "Drop here %(toAction)s": "Вставить сюда: %(toAction)s",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и очистить %(name)s из каталога?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и удалить %(name)s из каталога?",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
     "Failed to forget room %(errCode)s": "Не удалось удалить комнату %(errCode)s",
     "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты",
-    "Failed to set direct chat tag": "Не удалось пометить прямую беседу",
+    "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
     "Unhide Preview": "Показать  анонс",
     "Uploaded on %(date)s by %(user)s": "Загружено %(date)s  %(user)s",
-    "View Decrypted Source": "Просмотр зашифрованного источника",
+    "View Decrypted Source": "Просмотр расшифрованного источника",
     "View Source": "Просмотр источника",
     "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Вы не можете удалить это сообщение. (%(code)s)",
@@ -113,7 +113,7 @@
     "Redact": "Удалить",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
     "remove %(name)s from the directory.": "удалить %(name)s из каталога.",
-    "Resend": "Переслать снова",
+    "Resend": "Отправить снова",
     "Source URL": "Исходный URL",
     "Welcome page": "Домашняя страница",
     "Advanced notification settings": "Настройки уведомлений",
@@ -131,31 +131,31 @@
     "Cancel": "Отмена",
     "Changelog": "История изменений",
     "Collapse panel": "Свернуть панель",
-    "Collecting app version information": "Сбор информации о версиях программы",
+    "Collecting app version information": "Сбор информации о версии приложения",
     "Collecting logs": "Сбор протоколов",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s с %(browserName)s на %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> и <a href=\"http://opera.com\">Opera</a> работают тоже.",
     "Describe your problem here.": "Опиши здесь свою проблему.",
-    "Expand panel": "Открыть панель",
+    "Expand panel": "Развернуть панель",
     "Failed to send report: ": "Не удалось отослать отчет: ",
-    "Forward Message": "Переслать сообщение дальше",
+    "Forward Message": "Переслать сообщение",
     "Hide panel": "Скрыть панель",
-    "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжать",
-    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Что бы выявить проблему, будет отослан журнал этого клиента с сообщением о ошибке. Если Вы только верхний текст отослать хотите, отключите следующее:",
-    "Loading bug report module": "Загрузи Модуль ошибок",
+    "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжить",
+    "In order to diagnose problems, logs from this client will be sent with this bug report. If you would prefer to only send the text above, please untick:": "Чтобы диагностировать проблемы, логи этого клиента будут отправляться с этим сообщением об ошибке. Если вы предпочитаете отправить только текст выше, пожалуйста, отключите:",
+    "Loading bug report module": "Загрузка Модуля отчета об ошибках",
     "Messages containing <span>keywords</span>": "Сообщения, которые содержат определенные <span>ключевые слова</span>",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опишите (на Английском) ошибку. Что Вы делали? Что Вы ожидали получить? Что произошло?",
-    "Please describe the bug and/or send logs.": "Пожалуйста опишите ошибку и/или перешлите протоколы.",
-    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Пожалуйста установите <a href=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a> для лучшего результата.",
-    "Report a bug": "Отчет о ошибке",
+    "Please describe the bug and/or send logs.": "Пожалуйста опишите ошибку и/или перешлите логи.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Пожалуйста установите <a href=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a> для корректной работы чата.",
+    "Report a bug": "Отчет об ошибке",
     "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot не будет на мобильном Интернете работать. Программу инсталлировать?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует некоторые расширенные функции интернет-проводника - некоторые из них отсутствуют или экспериментальные в этом проводнике.",
+    "Riot is not supported on mobile web. Install the app?": "Riot может некорректно работать в мобильном браузере. Установить мобильное приложение?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует много расширенных функции интернет-браузера - некоторые из них отсутствуют или экспериментальные в этом браузере.",
     "Search": "Поиск",
     "Search…": "Поиск.…",
     "Send": "Отослать",
-    "Send logs": "Отослать протокол",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Извините, ваш браузер <b>не может</b> Riot запустить.",
+    "Send logs": "Отослать логи",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Извините, ваш браузер <b>не может</b> запустить Riot.",
     "This Room": "Эта комната",
     "Unavailable": "Недоступен",
     "Unknown device": "Неизвестное устройство",
@@ -166,28 +166,28 @@
     "Waiting for response from server": "Подождите ответа от сервера",
     "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы вошли в Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
     "OK": "ОК",
-    "You need to be using HTTPS to place a screen-sharing call.": "Вы должны пользоваться HTTPS чтобы пользоваться видео звонком.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Используйте протокол HTTPS чтобы совершать видео вызов.",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если Ваш браузер не корректно отображает информацию и все или некоторые функции отключены, Вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",
     "Login": "Войти",
-    "Welcome to Riot.im": "Добро пожаловать на Riot.im",
+    "Welcome to Riot.im": "Добро пожаловать в Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованное, шифрованное общение и сотрудничество на основе [matrix]",
     "Search the room directory": "Поиск по директории комнат",
-    "Chat with Riot Bot": "Пообщаться с Riot Bot",
+    "Chat with Riot Bot": "Пообщаться с ботом Riot",
     "Get started with some tips from Riot Bot!": "Начните с некоторых советов от Riot бота!",
     "General discussion about Matrix and Riot": "Общая дискуссия о Matrix и Riot",
     "Discussion of all things Matrix!": "Дискуссия обо всем Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop-Чат",
+    "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop чат",
     "Matrix technical discussions": "Техническая дискуссия о Matrix",
-    "Running Matrix services": "Предлагать Matrix-Сервис",
+    "Running Matrix services": "Запуск сервиса Matrix",
     "Community-run support for Synapse": "Поддержка Synapse от сообщества",
     "Admin support for Dendrite": "Админ. помощь для Dendrite",
-    "Building services on Matrix": "Построить услуги для Matrix",
+    "Building services on Matrix": "Разработка сервисов на Matrix",
     "Implementing VoIP services with Matrix": "Внедрение услуги VoIP с Matrix",
-    "(HTTP status %(httpStatus)s)": "(HTTP-Состояние %(httpStatus)s)",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Чат",
-    "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk-Чат",
+    "(HTTP status %(httpStatus)s)": "(HTTP-статус %(httpStatus)s)",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; matrix-ios-sdk чат",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk чат",
     "Announcements about Synapse releases": "Объявления релизов Synapse",
-    "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто matrix-appservice-irc  эксплуатирует и использует",
+    "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто использует matrix-appservice-irc",
     "You have successfully set a password!": "Вы успешно установили пароль!",
     "Continue": "Продолжить",
     "Please set a password!": "Задайте пароль!",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index a16cd75167..59852cf1bc 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -3,7 +3,7 @@
     "All messages": "Усі повідомлення",
     "All messages (loud)": "Усі повідомлення (гучно)",
     "All Rooms": "Усі кімнати",
-    "All notifications are currently disabled for all targets.": "Повідомлення для усіх цілей на даний момент вимкнені.",
+    "All notifications are currently disabled for all targets.": "Сповіщення для усіх цілей на даний момент вимкнені.",
     "An error occurred whilst saving your email notification preferences.": "Під час збереження налаштувань сповіщень е-поштою трапилася помилка.",
     "Cancel": "Скасувати",
     "Cancel Sending": "Скасувати надсилання",
@@ -21,7 +21,7 @@
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s через %(browserName)s на %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> та <a href=\"http://opera.com\">Opera</a> також підтримуються.",
     "Add an email address above to configure email notifications": "Додайте вище адресу е-пошти щоб налаштувати сповіщення е-поштою",
-    "Advanced notification settings": "Додаткові налаштування повідомлень",
+    "Advanced notification settings": "Додаткові налаштування сповіщень",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Видалити псевдонім %(alias)s та прибрати з каталогу %(name)s?",
     "Describe your problem here.": "Опишіть вашу проблему тут.",
     "Direct Chat": "Прямий чат",

From 6ef32f182ad55d991f7d89a13a781e8f4336dad1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Jun 2017 13:13:03 +0100
Subject: [PATCH 168/172] react-sdk 0.9.6

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

diff --git a/package.json b/package.json
index 9d29f1cb27..a362162567 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
     "matrix-js-sdk": "0.7.12",
-    "matrix-react-sdk": "0.9.5",
+    "matrix-react-sdk": "0.9.6",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",

From eda3f20b262598a4a3abec2205f8cf1f39ad94ca Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Jun 2017 13:13:28 +0100
Subject: [PATCH 169/172] v0.11.3

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

diff --git a/electron_app/package.json b/electron_app/package.json
index 26cfe095f9..8144c20904 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From ea8a49f1b7274b496d1954f8a1a637e3c2c2bfbc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Jun 2017 13:15:35 +0100
Subject: [PATCH 170/172] Prepare changelog for v0.11.3

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f961181509..d0586b97e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+Changes in [0.11.3](https://github.com/vector-im/riot-web/releases/tag/v0.11.3) (2017-06-20)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2...v0.11.3)
+
+ * Update to matrix-react-sdk 0.9.6 to fix infinite spinner bugs
+   and some parts of the app that had missed translation.
+
 Changes in [0.11.2](https://github.com/vector-im/riot-web/releases/tag/v0.11.2) (2017-06-19)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.2-rc.2...v0.11.2)

From 639b17c66358d7c446fd870a31f50e659718bdc6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 20 Jun 2017 13:15:36 +0100
Subject: [PATCH 171/172] v0.11.3

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

diff --git a/package.json b/package.json
index a362162567..7c03844871 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {

From 047b255e144304858a6708792c6500ca876fcd4b Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 20 Jun 2017 13:33:38 +0100
Subject: [PATCH 172/172] Add en_EN translations

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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4717e267ea..99b961a07a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -198,5 +198,7 @@
   "Please set a password!": "Please set a password!",
   "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
   "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
-  "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind."
+  "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
+  "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
+  "Set Password"
 }