From 7098ca9df0675debe7351480ba3dad22750c8150 Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver@hunt.bz>
Date: Tue, 6 Jun 2017 00:24:30 +0100
Subject: [PATCH 1/6] Added styling for copy to clipboard button - currently
 using the edit button's image as a placeholder

Signed-off-by: Oliver Hunt <oliver@hunt.bz>
---
 .../views/rooms/_EventTile.scss                | 18 ++++++++++++++++++
 1 file changed, 18 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 9d970ad4..e99609e0 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
@@ -332,6 +332,24 @@ limitations under the License.
 .mx_EventTile_content .markdown-body code {
     background-color: #f8f8f8;
 }
+.mx_EventTile_copyButton {
+    position: absolute;
+    display: inline-block;
+    visibility: hidden;
+    cursor: pointer;
+    top: 6px;
+    right: 6px;
+    width: 19px;
+    height: 19px;
+    background-image: url($edit-button-url);
+}
+.mx_EventTile_body pre {
+    position: relative;
+}
+.mx_EventTile_body pre:hover .mx_EventTile_copyButton
+{
+    visibility: visible;
+}
 
 .mx_EventTile_content .markdown-body h1,
 .mx_EventTile_content .markdown-body h2,

From fd42698cf02a750cd94a9854cf74a2cf847f750f Mon Sep 17 00:00:00 2001
From: Oliver Hunt <oliver@hunt.bz>
Date: Tue, 6 Jun 2017 13:21:50 +0100
Subject: [PATCH 2/6] Added svg for copy icon - I'm not a designer, someone
 else should probably replace these!

Signed-off-by: Oliver Hunt <oliver@hunt.bz>
---
 .../views/rooms/_EventTile.scss               |  2 +-
 src/skins/vector/css/themes/_base.scss        |  3 +-
 src/skins/vector/css/themes/_dark.scss        |  1 +
 src/skins/vector/img/icon_copy_message.svg    | 86 +++++++++++++++++++
 .../vector/img/icon_copy_message_dark.svg     | 77 +++++++++++++++++
 5 files changed, 167 insertions(+), 2 deletions(-)
 create mode 100644 src/skins/vector/img/icon_copy_message.svg
 create mode 100644 src/skins/vector/img/icon_copy_message_dark.svg

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 e99609e0..8f3c6d6c 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
@@ -341,7 +341,7 @@ limitations under the License.
     right: 6px;
     width: 19px;
     height: 19px;
-    background-image: url($edit-button-url);
+    background-image: url($copy-button-url);
 }
 .mx_EventTile_body pre {
     position: relative;
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index b6011913..fc24af93 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -102,6 +102,7 @@ $event-redacted-img: url('../../img/redacted.jpg');
 $event-timestamp-color: #acacac;
 
 $edit-button-url: "../../img/icon_context_message.svg";
+$copy-button-url: "../../img/icon_copy_message.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
@@ -114,4 +115,4 @@ $lightbox-fg-color: #ffffff;
 $lightbox-border-color: #ffffff;
 
 // unused?
-$progressbar-color: #000;
\ No newline at end of file
+$progressbar-color: #000;
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index 72c21b75..fe2e7591 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -102,6 +102,7 @@ $event-redacted-img: url('../../img/redacted-dark.jpg');
 $event-timestamp-color: #acacac;
 
 $edit-button-url: "../../img/icon_context_message_dark.svg";
+$copy-button-url: "../../img/icon_copy_message_dark.svg";
 
 // e2e
 $e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
diff --git a/src/skins/vector/img/icon_copy_message.svg b/src/skins/vector/img/icon_copy_message.svg
new file mode 100644
index 00000000..8d8887bb
--- /dev/null
+++ b/src/skins/vector/img/icon_copy_message.svg
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19px"
+   height="19px"
+   viewBox="0 0 19 19"
+   version="1.1"
+   id="svg3734"
+   sodipodi:docname="icon_copy_message.svg"
+   inkscape:version="0.92.1 r">
+  <metadata
+     id="metadata3738">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ED5D3E59-2561-4AC1-9B43-82FBC51767FC</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1596"
+     inkscape:window-height="846"
+     id="namedview3736"
+     showgrid="false"
+     inkscape:zoom="12.421053"
+     inkscape:cx="3.4935767"
+     inkscape:cy="2.469644"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Symbols" />
+  <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title3722">ED5D3E59-2561-4AC1-9B43-82FBC51767FC</title>
+  <desc
+     id="desc3724">Created with sketchtool.</desc>
+  <defs
+     id="defs3726" />
+  <g
+     id="Symbols"
+     stroke="none"
+     stroke-width="1"
+     fill="none"
+     fill-rule="evenodd">
+    <path
+       d="M 9.5,19 C 14.746705,19 19,14.746705 19,9.5 19,4.2532949 14.746705,0 9.5,0 4.2532949,0 0,4.2532949 0,9.5 0,14.746705 4.2532949,19 9.5,19 Z"
+       id="Oval-69"
+       inkscape:connector-curvature="0"
+       style="fill:#ececec" />
+    <g
+       id="g4632"
+       transform="translate(-2.3841858e-7,-1)">
+      <rect
+         style="stroke:#9b9b9b;stroke-width:0.91585475;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         y="4.3017478"
+         x="4.6289611"
+         height="10.396504"
+         width="7.7420783"
+         id="rect3745-3" />
+      <rect
+         style="fill:#ececec;fill-opacity:1;stroke:#9b9b9b;stroke-width:0.91585475;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         y="6.3017478"
+         x="6.6289611"
+         height="10.396504"
+         width="7.7420783"
+         id="rect3745" />
+    </g>
+  </g>
+</svg>
diff --git a/src/skins/vector/img/icon_copy_message_dark.svg b/src/skins/vector/img/icon_copy_message_dark.svg
new file mode 100644
index 00000000..b81e617d
--- /dev/null
+++ b/src/skins/vector/img/icon_copy_message_dark.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="19px"
+   height="19px"
+   viewBox="0 0 19 19"
+   version="1.1"
+   id="svg3734"
+   sodipodi:docname="icon_copy_message_dark.svg"
+   inkscape:version="0.92.1 r"
+   enable-background="new">
+  <metadata
+     id="metadata3738">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>ED5D3E59-2561-4AC1-9B43-82FBC51767FC</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1596"
+     inkscape:window-height="846"
+     id="namedview3736"
+     showgrid="false"
+     inkscape:zoom="12.421053"
+     inkscape:cx="3.4935767"
+     inkscape:cy="2.469644"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3734" />
+  <!-- Generator: sketchtool 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
+  <title
+     id="title3722">ED5D3E59-2561-4AC1-9B43-82FBC51767FC</title>
+  <desc
+     id="desc3724">Created with sketchtool.</desc>
+  <defs
+     id="defs3726" />
+  <path
+     style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
+     inkscape:connector-curvature="0"
+     id="Oval-69"
+     d="M 9.5,19 C 14.746705,19 19,14.746705 19,9.5 19,4.2532949 14.746705,0 9.5,0 4.2532949,0 0,4.2532949 0,9.5 0,14.746705 4.2532949,19 9.5,19 Z" />
+  <g
+     id="g4675"
+     style="stroke:#ffffff;stroke-opacity:1;opacity:0.6">
+    <path
+       id="rect3745-3"
+       d="M 4.6289062 3.3007812 L 4.6289062 13.699219 L 6.6289062 13.699219 L 6.6289062 5.3007812 L 12.371094 5.3007812 L 12.371094 3.3007812 L 4.6289062 3.3007812 z "
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.91585475;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       id="rect3745-7"
+       width="7.7420783"
+       height="10.396504"
+       x="6.6289062"
+       y="5.3007812"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.91585475;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

From 873656232fceba83979edffc0deda41fa8e3029b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Jun 2017 11:42:03 +0100
Subject: [PATCH 3/6] fix vector-im/riot-web#3298 correctly, and unbreak
 scrolling

fixes https://github.com/vector-im/riot-web/issues/4241 and https://github.com/vector-im/riot-web/issues/4154
---
 res/home.html                                 | 117 +++++++++++++++++-
 res/home/css/welcome.css                      | 106 ----------------
 .../css/vector-web/structures/_HomePage.scss  |   5 +-
 3 files changed, 118 insertions(+), 110 deletions(-)
 delete mode 100644 res/home/css/welcome.css

diff --git a/res/home.html b/res/home.html
index c77b3809..efe2da4b 100644
--- a/res/home.html
+++ b/res/home.html
@@ -1,5 +1,118 @@
-<link href="home/css/welcome.css" rel="stylesheet">
-<div style="display: none" class="mx_HomePage_container">
+<style type="text/css">
+
+/* we deliberately inline style here to avoid flash-of-CSS problems, and to avoid
+ * voodoo where we have to set display: none by default
+ */
+
+.mx_HomePage_header h1 {
+    margin-left: 0px;
+    margin-bottom: 0px;
+    margin-top: 20px;
+    margin-right: 20px;
+}
+
+.mx_HomePage_header h2 {
+    margin-left: 0px;
+    margin-top: 5px;
+    margin-bottom: 20px;
+    margin-right: 20px;
+}
+
+.mx_HomePage h3 {
+    margin-top: 30px;
+}
+
+.mx_HomePage_header {
+    border: 1px solid #76CFA6;
+    background-color: #eaf5f0;
+    border-radius: 5px;
+    color: #454545;
+    align-items: center;
+}
+
+.mx_HomePage_col {
+    display: flex;
+    flex-direction: row;
+}
+
+.mx_HomePage_toprow {
+    flex-wrap: wrap;
+}
+
+.mx_HomePage_row {
+    flex: 1 1 0;
+    margin-right: 20px;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+.mx_HomePage_logo {
+    margin-top: 20px;
+    margin-left: 40px;
+    margin-right: 40px;
+    margin-bottom: 20px;
+    display: inline;
+    height: 100px;
+}
+
+.mx_HomePage_room {
+    cursor: pointer;
+    float: left;
+    text-decoration: none;
+    text-align: center;
+    padding-left: 10px;
+    padding-right: 10px;
+    width: 120px;
+}
+
+.mx_HomePage_toprow .mx_HomePage_room {
+    width: 64px;
+}
+
+
+.mx_HomePage_room .mx_HomePage_icon {
+    border-radius: 50%;
+    width: 64px;
+    height: 64px;
+}
+
+.mx_HomePage_room .mx_HomePage_name {
+    display: block;
+}
+
+.mx_HomePage_room .mx_HomePage_desc {
+    display: block;
+    font-size: 12px;
+    margin-top: 8px;
+}
+
+.mx_HomePage_comment {
+    display: flex;
+    align-items: center;
+    margin-left: 100px;
+    min-height: 64px;
+}
+
+.mx_HomePage_container h3::after,
+.mx_HomePage_container h4::after {
+    content: ":";
+}
+
+.mx_HomePage_container {
+    display: block ! important;
+    margin: 20px;
+}
+
+.mx_HomePage_container h1, 
+.mx_HomePage_container h2, 
+.mx_HomePage_container h3, 
+.mx_HomePage_container h4 {
+    font-weight: 600;
+}
+</style>
+
+<div class="mx_HomePage_container">
     <div class="mx_HomePage_col mx_HomePage_header">
         <a href="https://riot.im"><img src="home/images/logo.svg" class="mx_HomePage_logo"></a>
         <div>
diff --git a/res/home/css/welcome.css b/res/home/css/welcome.css
deleted file mode 100644
index 3b840c0f..00000000
--- a/res/home/css/welcome.css
+++ /dev/null
@@ -1,106 +0,0 @@
-.mx_HomePage_header h1 {
-    margin-left: 0px;
-    margin-bottom: 0px;
-    margin-top: 20px;
-    margin-right: 20px;
-}
-
-.mx_HomePage_header h2 {
-    margin-left: 0px;
-    margin-top: 5px;
-    margin-bottom: 20px;
-    margin-right: 20px;
-}
-
-.mx_HomePage h3 {
-    margin-top: 30px;
-}
-
-.mx_HomePage_header {
-    border: 1px solid #76CFA6;
-    background-color: #eaf5f0;
-    border-radius: 5px;
-    color: #454545;
-    align-items: center;
-}
-
-.mx_HomePage_col {
-    display: flex;
-    flex-direction: row;
-}
-
-.mx_HomePage_toprow {
-    flex-wrap: wrap;
-}
-
-.mx_HomePage_row {
-    flex: 1 1 0;
-    margin-right: 20px;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-}
-
-.mx_HomePage_logo {
-    margin-top: 20px;
-    margin-left: 40px;
-    margin-right: 40px;
-    margin-bottom: 20px;
-    display: inline;
-    height: 100px;
-}
-
-.mx_HomePage_room {
-    cursor: pointer;
-    float: left;
-    text-decoration: none;
-    text-align: center;
-    padding-left: 10px;
-    padding-right: 10px;
-    width: 120px;
-}
-
-.mx_HomePage_toprow .mx_HomePage_room {
-    width: 64px;
-}
-
-
-.mx_HomePage_room .mx_HomePage_icon {
-    border-radius: 50%;
-    width: 64px;
-    height: 64px;
-}
-
-.mx_HomePage_room .mx_HomePage_name {
-    display: block;
-}
-
-.mx_HomePage_room .mx_HomePage_desc {
-    display: block;
-    font-size: 12px;
-    margin-top: 8px;
-}
-
-.mx_HomePage_comment {
-    display: flex;
-    align-items: center;
-    margin-left: 100px;
-    min-height: 64px;
-}
-
-.mx_HomePage_container h3::after,
-.mx_HomePage_container h4::after {
-    content: ":";
-}
-
-.mx_HomePage_container {
-    display: block ! important;
-    margin: 20px;
-}
-
-.mx_HomePage_container h1, 
-.mx_HomePage_container h2, 
-.mx_HomePage_container h3, 
-.mx_HomePage_container h4 {
-    font-weight: 600;
-}
\ No newline at end of file
diff --git a/src/skins/vector/css/vector-web/structures/_HomePage.scss b/src/skins/vector/css/vector-web/structures/_HomePage.scss
index 81adb3ce..cdac1bcc 100644
--- a/src/skins/vector/css/vector-web/structures/_HomePage.scss
+++ b/src/skins/vector/css/vector-web/structures/_HomePage.scss
@@ -19,13 +19,14 @@ limitations under the License.
     max-width: 960px;
     width: 100%;
     height: 100%;
-    overflow-y: hidden;
     margin-left: auto;
     margin-right: auto;
 }
+
 .mx_HomePage iframe {
+    display: block;
 	width: 100%;
-	height: 90%;
+	height: 100%;
 	border: 0px;
 }
 

From 0cbd5de1d3cfee84a279da2f40f40d06e06b94ec Mon Sep 17 00:00:00 2001
From: RiotTranslate <info@nordgedanken.de>
Date: Thu, 8 Jun 2017 13:05:19 +0200
Subject: [PATCH 4/6] Update from Weblate. (#4231)

* Translated using Weblate (Hungarian)

Currently translated at 100.0% (162 of 162 strings)

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

* Translated using Weblate (Russian)

Currently translated at 100.0% (162 of 162 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (162 of 162 strings)

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

* Translated using Weblate (Russian)

Currently translated at 100.0% (162 of 162 strings)

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

* Translated using Weblate (German)

Currently translated at 82.7% (163 of 197 strings)

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

* Translated using Weblate (German)

Currently translated at 83.2% (164 of 197 strings)

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

* Translated using Weblate (German)

Currently translated at 83.7% (165 of 197 strings)

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

* Translated using Weblate (German)

Currently translated at 83.7% (165 of 197 strings)

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

* Translated using Weblate (German)

Currently translated at 83.7% (165 of 197 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (197 of 197 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (197 of 197 strings)

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

* Translated using Weblate (Russian)

Currently translated at 84.7% (167 of 197 strings)

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

* Translated using Weblate (Thai)

Currently translated at 97.9% (193 of 197 strings)

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

* Translated using Weblate (Thai)

Currently translated at 100.0% (197 of 197 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (197 of 197 strings)

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

* Translated using Weblate (Thai)

Currently translated at 100.0% (197 of 197 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
---
 src/i18n/strings/de_DE.json | 6 +++---
 src/i18n/strings/th.json    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e89edc15..d1c33a82 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -175,7 +175,7 @@
     "Search the room directory": "Durchsuche Raum-Verzeichnis",
     "Chat with Riot Bot": "Chatte mit dem Riot-Bot",
     "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!",
-    "General discussion about Matrix": "Generelle Diskussion über Matrix",
+    "General discussion about Matrix": "Allgemeine Diskussion über Matrix",
     "Discussion of all things Matrix!": "\"Diskussion über alle Dinge\"-Matrix!",
     "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop-Chat",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Chat",
@@ -196,12 +196,12 @@
     "Contributing code to Matrix and Riot": "Code zu Matrix und Riot beitragen",
     "Dev chat for the Riot/Web dev team": "Entwickler-Chat für das Riot-Web-Entwickler-Team",
     "Co-ordination for Riot/Web translators": "Koordination für Riot-Web-Übersetzer",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Viele Räume, die in Matrix existieren, sind verknüpft mit existierenden Netzwerken (Slack, IRC, Gitter usw.) oder unabhängig. Schau mal ins Verzeichnis!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Im Matrix-Netzwerk gibt es bereits jetzt zahlreiche Räume, die entweder mit bekannten Netzwerken wie Slack, IRC, Gitter, usw. verknüpft sind oder auch komplett eigenständig betrieben werden. Einen genauen Überblick erhältst du im Raum-Verzeichnis!",
     "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?",
     "You have successfully set a password!": "Du hast erfolgreich ein Passwort gesetzt!",
     "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Konto zurückkehren nach dem du dich an anderen Geräten ab- und angemeldet hast.",
     "Continue": "Fortfahren",
-    "Please set a password!": "Bitte setze ein Passwort!",
+    "Please set a password!": "Bitte ein Passwort einrichten!",
     "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 for das Dendrite-Entwickler-Team"
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 16ba2a8f..f2f6d17c 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -138,7 +138,7 @@
     "All notifications are currently disabled for all targets.": "การแจ้งเตือนทั้งหมดถูกปิดใช้งานสำหรับทุกอุปกรณ์",
     "An error occurred whilst saving your email notification preferences.": "เกิดข้อผิดพลาดระหว่างบันทึกการตั้งค่าการแจ้งเตือนทางอีเมล",
     "Couldn't find a matching Matrix room": "ไม่พบห้อง Matrix ที่ตรงกับคำค้นหา",
-    "customServer_text": "คุณสามารถกำหนดเซิร์ฟเวอร์บ้านเองได้โดยใส่ URL ของเซิร์ฟเวอร์นั้น เพื่อเข้าสู่ระบบของเซิร์ฟเวอร์ Matrix อื่น<br/>ทั้งนี่เพื่อให้คุณสามารถใช้ Riot กับบัญชี Matrix ที่มีอยู่แล้วบนเซิร์ฟเวอร์บ้านอื่น ๆ ได้<br/><br/>คุณอาจเลือกเซิร์ฟเวอร์ยืนยันตัวตนเองด้วยก็ได้ แต่คุณจะไม่สามารถเชิญผู้ใช้อื่นด้วยที่อยู่อีเมล หรือรับคำเชิญจากผู้ใช้อื่นทางที่อยู่อีเมลได้",
+    "customServer_text": "คุณสามารถกำหนดเซิร์ฟเวอร์บ้านเองได้โดยใส่ URL ของเซิร์ฟเวอร์นั้น เพื่อเข้าสู่ระบบของเซิร์ฟเวอร์ Matrix อื่น<br/>ทั้งนี่เพื่อให้คุณสามารถใช้ Riot กับบัญชี Matrix ที่มีอยู่แล้วบนเซิร์ฟเวอร์บ้านอื่น ๆ ได้<br/><br/>คุณอาจเลือกเซิร์ฟเวอร์ระบุตัวตนเองด้วยก็ได้ แต่คุณจะไม่สามารถเชิญผู้ใช้อื่นด้วยที่อยู่อีเมล หรือรับคำเชิญจากผู้ใช้อื่นทางที่อยู่อีเมลได้",
     "delete the alias.": "ลบนามแฝง",
     "Drop here %(toAction)s": "ปล่อยที่นี่ %(toAction)s",
     "Error saving email notification preferences": "การบันทึกการตั้งค่าการแจ้งเตือนทางอีเมลผิดพลาด",
@@ -150,7 +150,7 @@
     "Failed to set Direct Message status of room": "การตั้งสถานะข้อความตรงของห้องล้มเหลว",
     "Favourite": "รายการโปรด",
     "Failed to": "ล้มเหลวในการ",
-    "Fetching third party location failed": "กำลังเรียกข้อมูลตำแหน่งจากบุคคลที่สามล้มเหลว",
+    "Fetching third party location failed": "การเรียกข้อมูลตำแหน่งจากบุคคลที่สามล้มเหลว",
     "Guest users can't invite users. Please register to invite.": "แขกไม่สามารถเชิญผู้ใช้ได้ กรุณาลงทะเบียนเพื่อเชิญผู้อื่น",
     "The Home Server may be too old to support third party networks": "เซิร์ฟเวอร์บ้านอาจเก่าเกินกว่าจะรองรับเครือข่ายของบุคคลที่สาม",
     "The server may be unavailable or overloaded": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งานหรือทำงานหนักเกินไป",
@@ -181,7 +181,7 @@
     "Support for those using the Matrix spec": "ฝ่ายสนับสนุนสำหรับผู้ใช้สเปค Matrix",
     "Implementing VR services with Matrix": "การอิมพลีเมนต์บริการ VR ด้วย Matrix",
     "Implementing VoIP services with Matrix": "การอิมพลีเมนต์บริการ VoIP ด้วย Matrix",
-    "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อม Matrix",
+    "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อมอื่น ๆ",
     "Contributing code to Matrix and Riot": "สมทบโค๊ดกับ Matrix และ Riot",
     "Dev chat for the Riot/Web dev team": "แชทสำหรับทีมพัฒนา Riot บนเว็บ",
     "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite",

From cabbd16dd3c8399a0f111b674aa6a6bc32dc4888 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Jun 2017 12:06:45 +0100
Subject: [PATCH 5/6] fix colour & hyperlink for home page header

---
 res/home.html                         | 7 ++++++-
 src/components/structures/HomePage.js | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/res/home.html b/res/home.html
index efe2da4b..3072fcac 100644
--- a/res/home.html
+++ b/res/home.html
@@ -9,6 +9,7 @@
     margin-bottom: 0px;
     margin-top: 20px;
     margin-right: 20px;
+    color: #454545;
 }
 
 .mx_HomePage_header h2 {
@@ -16,6 +17,11 @@
     margin-top: 5px;
     margin-bottom: 20px;
     margin-right: 20px;
+    color: #454545;
+}
+
+.mx_HomePage_header h1 a {
+    color: #454545;
 }
 
 .mx_HomePage h3 {
@@ -26,7 +32,6 @@
     border: 1px solid #76CFA6;
     background-color: #eaf5f0;
     border-radius: 5px;
-    color: #454545;
     align-items: center;
 }
 
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index c646f1ce..6e2bd51f 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -45,6 +45,13 @@ 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">Riot.im</a>');
+        return s;
+    },
+
     componentWillMount: function() {
         if (this.props.teamToken && this.props.teamServerUrl) {
             this.setState({
@@ -66,7 +73,7 @@ module.exports = React.createClass({
                         this.setState({ page: "Couldn't load home page" });
                     }
 
-                    body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1)=>{ return sanitizeHtml(_t(g1)) });
+                    body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1)=>this.translate(g1));
                     this.setState({ page: body });
                 }
             );

From da69d03b1d763088bc5a2275d39c682cb3e213ae Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 8 Jun 2017 13:50:53 +0100
Subject: [PATCH 6/6] i18n powered by [matrix] sanely

---
 res/home.html                         | 2 +-
 src/components/structures/HomePage.js | 3 ++-
 src/i18n/strings/de_DE.json           | 2 +-
 src/i18n/strings/en_EN.json           | 2 +-
 src/i18n/strings/ru.json              | 2 +-
 src/i18n/strings/th.json              | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/res/home.html b/res/home.html
index 3072fcac..3ba2e964 100644
--- a/res/home.html
+++ b/res/home.html
@@ -122,7 +122,7 @@
         <a href="https://riot.im"><img src="home/images/logo.svg" class="mx_HomePage_logo"></a>
         <div>
             <h1>_t("Welcome to Riot.im")</h1>
-            <h2>_t("Decentralised, encrypted chat &amp; collaboration powered by") <a href="https://matrix.org"><img width="79" height="34" alt="[matrix]" style="padding-left: 1px;vertical-align: middle" src="home/images/matrix.svg"/></a></h2>
+            <h2>_t("Decentralised, encrypted chat &amp; collaboration powered by [matrix]")</h2>
         </div>
     </div>
     <div class="mx_HomePage_col mx_HomePage_toprow">
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index 6e2bd51f..a9f2bbd0 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -48,7 +48,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">Riot.im</a>');
+        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>');
         return s;
     },
 
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index d1c33a82..b9578e82 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -171,7 +171,7 @@
     "OK": "OK",
     "Login": "Anmeldung",
     "Welcome to Riot.im": "Willkommen bei Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von [matrix]",
     "Search the room directory": "Durchsuche Raum-Verzeichnis",
     "Chat with Riot Bot": "Chatte mit dem Riot-Bot",
     "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!",
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index afc8cc68..c6f461e0 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -163,7 +163,7 @@
   "Welcome page": "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!": "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": "Welcome to Riot.im",
-  "Decentralised, encrypted chat &amp; collaboration powered by": "Decentralised, encrypted chat &amp; collaboration powered by",
+  "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
   "Search the room directory": "Search the room directory",
   "Chat with Riot Bot": "Chat with Riot Bot",
   "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 1fa04d95..8075a28e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -170,7 +170,7 @@
     "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": "Децентрализованное, шифрованное общение и сотрудничество на основе",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованное, шифрованное общение и сотрудничество на основе [matrix]",
     "Search the room directory": "Поиск по директории комнат",
     "Chat with Riot Bot": "Пообщаться с Riot Bot"
 }
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index f2f6d17c..66df9f4b 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -195,5 +195,5 @@
     "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": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก"
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "แชทและประสานงานบนระบบที่ทั้งเข้ารหัสได้และกระจายศูนย์กลาง โดยใช้เทคโนโลยีจาก [matrix]"
 }