From 82b2741ed9ddec996b4d567909fd87dcaee57566 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 26 May 2017 13:33:00 +0100 Subject: [PATCH] Move english custom server text to en file As it is in English and not German --- src/i18n/de_DE.json | 1 - src/i18n/en_EN.json | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/de_DE.json b/src/i18n/de_DE.json index 0831ff8e2e..d0eff4c5bc 100644 --- a/src/i18n/de_DE.json +++ b/src/i18n/de_DE.json @@ -12,7 +12,6 @@ "Settings": "Einstellungen", "powered by Matrix": "gebaut mit Matrix", "Custom Server Options": "Optionen für eigenen Server", - "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

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": "ausblenden", "Failed to get protocol list from Home Server": "Fehler beim Abrufen der Protokollliste vom Home Server", "The Home Server may be too old to support third party networks": "Der Home Server kann zu alt sein, um Drittanbieter-Netzwerke zu unterstützen", diff --git a/src/i18n/en_EN.json b/src/i18n/en_EN.json index 89df1d225f..c4fdf44bd1 100644 --- a/src/i18n/en_EN.json +++ b/src/i18n/en_EN.json @@ -12,6 +12,7 @@ "Create new room": "Create new room", "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room", "Custom Server Options": "Custom Server Options", + "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.
This allows you to use Riot with an existing Matrix account on a different home server.

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.", "delete the alias": "delete the alias", "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?", "Direct Chat": "Direct Chat",