From 26e1cdb82ccd59fcc1c08335f543a71577a954ae Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 1 Dec 2020 12:04:41 +0000
Subject: [PATCH] Update i18n

---
 src/components/structures/auth/Registration.tsx | 10 ++++++++--
 src/i18n/strings/en_EN.json                     |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index 512972d0b4..e1a2fc5590 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -467,9 +467,13 @@ export default class Registration extends React.Component<IProps, IState> {
                     || this.state.ssoFlow["identity_providers"] || [];
                 // when there is only a single (or 0) providers we show a wide button with `Continue with X` text
                 if (providers.length > 1) {
-                    continueWithSection = <h3 className="mx_AuthBody_centered">{_t("Continue with")}</h3>;
+                    // i18n: ssoButtons is a placeholder to help translators understand context
+                    continueWithSection = <h3 className="mx_AuthBody_centered">
+                        { _t("Continue with %(ssoButtons)s", { ssoButtons: "" }).trim() }
+                    </h3>;
                 }
 
+                // i18n: ssoButtons & usernamePassword are placeholders to help translators understand context
                 ssoSection = <React.Fragment>
                     { continueWithSection }
                     <SSOButtons
@@ -478,7 +482,9 @@ export default class Registration extends React.Component<IProps, IState> {
                         loginType={this.state.ssoFlow.type === "m.login.sso" ? "sso" : "cas"}
                         fragmentAfterLogin={this.props.fragmentAfterLogin}
                     />
-                    <h3 className="mx_AuthBody_centered">{_t("Or")}</h3>
+                    <h3 className="mx_AuthBody_centered">
+                        { _t("%(ssoButtons)s Or %(usernamePassword)s", { ssoButtons: "", usernamePassword: ""}).trim() }
+                    </h3>
                 </React.Fragment>;
             }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4ae0019e5e..5760cf9ca1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2510,8 +2510,8 @@
     "Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
     "This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
     "That username already exists, please try another.": "That username already exists, please try another.",
-    "Continue with": "Continue with",
-    "Or": "Or",
+    "Continue with %(ssoButtons)s": "Continue with %(ssoButtons)s",
+    "%(ssoButtons)s Or %(usernamePassword)s": "%(ssoButtons)s Or %(usernamePassword)s",
     "Already have an account? <a>Sign in here</a>": "Already have an account? <a>Sign in here</a>",
     "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
     "Continue with previous account": "Continue with previous account",