From 667556f3ce11cadae54fffe883876c07f98f1015 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 20 Oct 2017 13:48:00 +0100
Subject: [PATCH] Custom server text was i18ned by key

And therefore got replaced by the key by the i18n script
---
 src/components/views/login/VectorCustomServerDialog.js | 9 ++++++++-
 src/i18n/strings/en_EN.json                            | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/views/login/VectorCustomServerDialog.js b/src/components/views/login/VectorCustomServerDialog.js
index 80cd6800..8395f139 100644
--- a/src/components/views/login/VectorCustomServerDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,7 +32,13 @@ module.exports = React.createClass({
                     { _t('Custom Server Options') }
                 </div>
                 <div className="mx_Dialog_content">
-                    <span dangerouslySetInnerHTML={{__html: sanitizeHtml(_t('customServer_text'))}} />
+                    <span dangerouslySetInnerHTML={{__html: sanitizeHtml(_t(
+                        "You can use the custom server options to sign into other Matrix "+
+                        "servers by specifying a different Home server URL.<br/>This allows "+
+                        "you to use Riot with an existing Matrix account on a different home "+
+                        "server.<br/><br/>You can also set a custom identity server but you won't "+
+                        "be able to invite users by email address, or be invited by email address yourself.",
+                    ))}} />
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.props.onFinished} autoFocus={true}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 1dc710ba..543ee7bb 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -60,7 +60,7 @@
     "Today": "Today",
     "Yesterday": "Yesterday",
     "Custom Server Options": "Custom Server Options",
-    "customServer_text": "customServer_text",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
     "Dismiss": "Dismiss",
     "powered by Matrix": "powered by Matrix",
     "You are not receiving desktop notifications": "You are not receiving desktop notifications",