Undo Localazy key clobber (#11630)

* Iterate Signed-off-by: Michael Telatynski <[email protected]> * Iterate Signed-off-by: Michael Telatynski <[email protected]> * Iterate Signed-off-by: Michael Telatynski <[email protected]> * Iterate Signed-off-by: Michael Telatynski <[email protected]> --------- Signed-off-by: Michael Telatynski <[email protected]>
matrix-org · Sep 20, 2023 · 1c16eab · 1c16eab
1 parent 51ec7f0
commit 1c16eab
Show file tree

Hide file tree

Showing 37 changed files with 74 additions and 20 deletions.
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
@@ -591,7 +591,7 @@ export default class Registration extends React.Component<IProps, IState> {
         const signIn = (
             <span className="mx_AuthBody_changeFlow">
                 {_t(
-                    "auth|sign_in_instead",
+                    "auth|sign_in_instead_prompt",
                     {},
                     {
                         a: (sub) => (
@@ -682,7 +682,7 @@ export default class Registration extends React.Component<IProps, IState> {
                             title={_t("Create account")}
                             serverPicker={
                                 <ServerPicker
-                                    title={_t("auth|server_picker_title")}
+                                    title={_t("auth|server_picker_title_registration")}
                                     dialogTitle={_t("auth|server_picker_dialog_title")}
                                     serverConfig={this.props.serverConfig}
                                     onServerConfigChange={

diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
@@ -2141,7 +2141,7 @@
         "sso": "Single Sign On",
         "continue_with_sso": "Продължаване с %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s Или %(usernamePassword)s",
-        "sign_in_instead": "Вече имате профил? <a>Влезте от тук</a>",
+        "sign_in_instead_prompt": "Вече имате профил? <a>Влезте от тук</a>",
         "account_clash": "Новият ви профил (%(newAccountId)s) е регистриран, но вече сте влезли с друг профил (%(loggedInUserId)s).",
         "account_clash_previous_account": "Продължи с предишния профил",
         "log_in_new_account": "<a>Влезте</a> в новия си профил.",

diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
@@ -3844,11 +3844,13 @@
         "reset_password_title": "Obnovení vašeho hesla",
         "continue_with_sso": "Pokračovat s %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s nebo %(usernamePassword)s",
+        "sign_in_instead_prompt": "Namísto toho se přihlásit",
         "sign_in_instead": "Namísto toho se přihlásit",
         "account_clash": "nový účet (%(newAccountId)s) je registrován, ale už jste přihlášeni pod jiným účtem (%(loggedInUserId)s).",
         "account_clash_previous_account": "Pokračovat s předchozím účtem",
         "log_in_new_account": "<a>Přihlaste se</a> svým novým účtem.",
         "registration_successful": "Úspěšná registrace",
+        "server_picker_title_registration": "Hostovat účet na",
         "server_picker_title": "Přihlaste se do svého domovského serveru",
         "server_picker_dialog_title": "Rozhodněte, kde je váš účet hostován",
         "footer_powered_by_matrix": "používá protokol Matrix",

diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
@@ -3844,11 +3844,13 @@
         "reset_password_title": "Setze dein Passwort zurück",
         "continue_with_sso": "Mit %(ssoButtons)s anmelden",
         "sso_or_username_password": "%(ssoButtons)s oder %(usernamePassword)s",
+        "sign_in_instead_prompt": "Stattdessen anmelden",
         "sign_in_instead": "Stattdessen anmelden",
         "account_clash": "Dein neues Konto (%(newAccountId)s) ist registriert, aber du hast dich bereits in mit einem anderen Konto (%(loggedInUserId)s) angemeldet.",
         "account_clash_previous_account": "Mit vorherigem Konto fortfahren",
         "log_in_new_account": "Mit deinem neuen Konto <a>anmelden</a>.",
         "registration_successful": "Registrierung erfolgreich",
+        "server_picker_title_registration": "Konto betreiben auf",
         "server_picker_title": "Melde dich bei deinem Heim-Server an",
         "server_picker_dialog_title": "Entscheide, wo sich dein Konto befinden soll",
         "footer_powered_by_matrix": "Betrieben mit Matrix",

diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
@@ -3186,11 +3186,12 @@
         "sso": "Single Sign On",
         "continue_with_sso": "Συνέχεια με %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s Ή %(usernamePassword)s",
-        "sign_in_instead": "Έχετε ήδη λογαριασμό; <a>Συνδεθείτε εδώ</a>",
+        "sign_in_instead_prompt": "Έχετε ήδη λογαριασμό; <a>Συνδεθείτε εδώ</a>",
         "account_clash": "Ο νέος λογαριασμός σας (%(newAccountId)s) έχει εγγραφεί, αλλά έχετε ήδη συνδεθεί με διαφορετικό λογαριασμό (%(loggedInUserId)s).",
         "account_clash_previous_account": "Συνέχεια με τον προηγούμενο λογαριασμό",
         "log_in_new_account": "<a>Συνδεθείτε</a> στον νέο σας λογαριασμό.",
         "registration_successful": "Επιτυχής Εγγραφή",
+        "server_picker_title_registration": "Φιλοξενία λογαριασμού στο",
         "server_picker_title": "Σύνδεση στον κεντρικό διακομιστή σας",
         "server_picker_dialog_title": "Αποφασίστε πού θα φιλοξενείται ο λογαριασμός σας",
         "footer_powered_by_matrix": "λειτουργεί με το Matrix",

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -42,11 +42,12 @@
         "3pid_in_use": "That e-mail address or phone number is already in use.",
         "continue_with_sso": "Continue with %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s Or %(usernamePassword)s",
-        "sign_in_instead": "Sign in instead",
+        "sign_in_instead_prompt": "Already have an account? <a>Sign in here</a>",
         "account_clash": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
         "account_clash_previous_account": "Continue with previous account",
         "log_in_new_account": "<a>Log in</a> to your new account.",
         "registration_successful": "Registration Successful",
+        "server_picker_title_registration": "Host account on",
         "server_picker_dialog_title": "Decide where your account is hosted",
         "incorrect_password": "Incorrect password",
         "failed_soft_logout_auth": "Failed to re-authenticate",
@@ -64,6 +65,7 @@
         "enter_email_explainer": "<b>%(homeserver)s</b> will send you a verification link to let you reset your password.",
         "forgot_password_email_required": "The email address linked to your account must be entered.",
         "forgot_password_email_invalid": "The email address doesn't appear to be valid.",
+        "sign_in_instead": "Sign in instead",
         "verify_email_heading": "Verify your email to continue",
         "verify_email_explainer": "We need to know it’s you before resetting your password. Click the link in the email we just sent to <b>%(email)s</b>"
     },

diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
@@ -2844,11 +2844,13 @@
         "reset_password_title": "Restarigu vian pasvorton",
         "continue_with_sso": "Daŭrigi per %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s aŭ %(usernamePassword)s",
+        "sign_in_instead_prompt": "Aliĝu anstataŭe",
         "sign_in_instead": "Aliĝu anstataŭe",
         "account_clash": "Via nova konto (%(newAccountId)s) estas registrita, sed vi jam salutis per alia konto (%(loggedInUserId)s).",
         "account_clash_previous_account": "Daŭrigi per antaŭa konto",
         "log_in_new_account": "<a>Saluti</a> per via nova konto.",
         "registration_successful": "Registro sukcesis",
+        "server_picker_title_registration": "Gastigi konton ĉe",
         "server_picker_title": "Salutu vian hejmservilon",
         "server_picker_dialog_title": "Decidu, kie via konto gastiĝos",
         "footer_powered_by_matrix": "funkciigata de Matrix",

diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
@@ -3659,11 +3659,12 @@
         "sso": "Single Sign On",
         "continue_with_sso": "Continuar con %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s o %(usernamePassword)s",
-        "sign_in_instead": "¿Ya tienes una cuenta? <a>Inicia sesión aquí</a>",
+        "sign_in_instead_prompt": "¿Ya tienes una cuenta? <a>Inicia sesión aquí</a>",
         "account_clash": "Su nueva cuenta (%(newAccountId)s) está registrada, pero ya inició sesión en una cuenta diferente (%(loggedInUserId)s).",
         "account_clash_previous_account": "Continuar con la cuenta anterior",
         "log_in_new_account": "<a>Inicie sesión</a> en su nueva cuenta.",
         "registration_successful": "Registro exitoso",
+        "server_picker_title_registration": "Alojar la cuenta en",
         "server_picker_title": "Inicia sesión en tu servidor base",
         "server_picker_dialog_title": "Decide dónde quieres alojar tu cuenta",
         "footer_powered_by_matrix": "con el poder de Matrix",

diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
@@ -3839,11 +3839,13 @@
         "reset_password_title": "Lähtesta oma salasõna",
         "continue_with_sso": "Jätkamiseks kasuta %(ssoButtons)s teenuseid",
         "sso_or_username_password": "%(ssoButtons)s või %(usernamePassword)s",
+        "sign_in_instead_prompt": "Pigem logi sisse",
         "sign_in_instead": "Pigem logi sisse",
         "account_clash": "Sinu uus kasutajakonto (%(newAccountId)s) on registreeritud, kuid sa jube oled sisse loginud teise kasutajakontoga (%(loggedInUserId)s).",
         "account_clash_previous_account": "Jätka senise konto kasutamist",
         "log_in_new_account": "<a>Logi sisse</a> oma uuele kasutajakontole.",
         "registration_successful": "Registreerimine õnnestus",
+        "server_picker_title_registration": "Sinu kasutajakontot teenindab",
         "server_picker_title": "Logi sisse oma koduserverisse",
         "server_picker_dialog_title": "Vali kes võiks sinu kasutajakontot teenindada",
         "footer_powered_by_matrix": "põhineb Matrix'il",

diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
@@ -2548,11 +2548,12 @@
         "sso": "ورود یکپارچه",
         "continue_with_sso": "با %(ssoButtons)s ادامه بده",
         "sso_or_username_password": "%(ssoButtons)s یا %(usernamePassword)s",
-        "sign_in_instead": "حساب کاربری دارید؟ <a>وارد شوید</a>",
+        "sign_in_instead_prompt": "حساب کاربری دارید؟ <a>وارد شوید</a>",
         "account_clash": "حساب جدید شما (%(newAccountId)s) s) ثبت شده‌است ، اما شما قبلاً به حساب کاربری دیگری (%(loggedInUserId)s) وارد شده‌اید.",
         "account_clash_previous_account": "با حساب کاربری قبلی ادامه دهید",
         "log_in_new_account": "به حساب کاربری جدید خود <a>وارد شوید</a>.",
         "registration_successful": "ثبت‌نام موفقیت‌آمیز بود",
+        "server_picker_title_registration": "ساختن حساب کاربری بر روی",
         "server_picker_title": "وارد سرور خود شوید",
         "server_picker_dialog_title": "حساب کاربری شما بر روی کجا ساخته شود",
         "footer_powered_by_matrix": "قدرت‌یافته از ماتریکس",

diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
@@ -3485,11 +3485,12 @@
         "reset_password_title": "Nollaa salasanasi",
         "continue_with_sso": "Jatka %(ssoButtons)slla",
         "sso_or_username_password": "%(ssoButtons)s Tai %(usernamePassword)s",
-        "sign_in_instead": "Onko sinulla jo tili? <a>Kirjaudu tästä</a>",
+        "sign_in_instead_prompt": "Onko sinulla jo tili? <a>Kirjaudu tästä</a>",
         "account_clash": "Uusi tilisi (%(newAccountId)s) on rekisteröity, mutta olet jo kirjautuneena toisella tilillä (%(loggedInUserId)s).",
         "account_clash_previous_account": "Jatka aiemmalla tilillä",
         "log_in_new_account": "<a>Kirjaudu</a> uudelle tilillesi.",
         "registration_successful": "Rekisteröityminen onnistui",
+        "server_picker_title_registration": "Ylläpidä tiliä osoitteessa",
         "server_picker_title": "Kirjaudu sisään kotipalvelimellesi",
         "server_picker_dialog_title": "Päätä, missä tiliäsi isännöidään",
         "footer_powered_by_matrix": "moottorina Matrix",

diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
@@ -3839,11 +3839,13 @@
         "reset_password_title": "Réinitialise votre mot de passe",
         "continue_with_sso": "Continuer avec %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s ou %(usernamePassword)s",
+        "sign_in_instead_prompt": "Se connecter à la place",
         "sign_in_instead": "Se connecter à la place",
         "account_clash": "Votre nouveau compte (%(newAccountId)s) est créé, mais vous êtes déjà connecté avec un autre compte (%(loggedInUserId)s).",
         "account_clash_previous_account": "Continuer avec le compte précédent",
         "log_in_new_account": "<a>Connectez-vous</a> à votre nouveau compte.",
         "registration_successful": "Inscription réussie",
+        "server_picker_title_registration": "Héberger le compte sur",
         "server_picker_title": "Connectez-vous sur votre serveur d’accueil",
         "server_picker_dialog_title": "Décidez où votre compte est hébergé",
         "footer_powered_by_matrix": "propulsé par Matrix",

diff --git a/src/i18n/strings/ga.json b/src/i18n/strings/ga.json
@@ -789,6 +789,8 @@
     },
     "auth": {
         "sso": "Single Sign On",
+        "sign_in_instead_prompt": "An bhfuil cuntas agat cheana? <a>Sínigh isteach anseo</a>",
+        "server_picker_title_registration": "Óstáil cuntas ar",
         "sign_in_instead": "An bhfuil cuntas agat cheana? <a>Sínigh isteach anseo</a>",
         "server_picker_title": "Óstáil cuntas ar",
         "failed_query_registration_methods": "Ní féidir iarratas a dhéanamh faoi modhanna cláraithe tacaithe.",

diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
@@ -3400,11 +3400,12 @@
         "sso": "Single Sign On",
         "continue_with_sso": "Continúa con %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s Ou %(usernamePassword)s",
-        "sign_in_instead": "Xa tes unha conta? <a>Conecta aquí</a>",
+        "sign_in_instead_prompt": "Xa tes unha conta? <a>Conecta aquí</a>",
         "account_clash": "A tú conta (%(newAccountId)s) foi rexistrada, pero iniciaches sesión usando outra conta (%(loggedInUserId)s).",
         "account_clash_previous_account": "Continúa coa conta anterior",
         "log_in_new_account": "<a>Accede</a> usando a conta nova.",
         "registration_successful": "Rexistro correcto",
+        "server_picker_title_registration": "Crea a conta en",
         "server_picker_title": "Conecta co teu servidor de inicio",
         "server_picker_dialog_title": "Decide onde queres crear a túa conta",
         "footer_powered_by_matrix": "funciona grazas a Matrix",

diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
@@ -2697,11 +2697,13 @@
         "sso": "כניסה חד שלבית",
         "continue_with_sso": "המשך עם %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s או %(usernamePassword)s",
+        "sign_in_instead_prompt": "התחבר במקום זאת",
         "sign_in_instead": "התחבר במקום זאת",
         "account_clash": "החשבון החדש שלך (%(newAccountId)s) רשום, אך אתה כבר מחובר לחשבון אחר (%(loggedInUserId)s).",
         "account_clash_previous_account": "המשך בחשבון הקודם",
         "log_in_new_account": "<a> היכנס </a> לחשבונך החדש.",
         "registration_successful": "ההרשמה בוצעה בהצלחה",
+        "server_picker_title_registration": "חשבון מארח ב",
         "server_picker_title": "היכנס לשרת הבית שלך",
         "server_picker_dialog_title": "החלט היכן מתארח חשבונך",
         "footer_powered_by_matrix": "מופעל ע\"י Matrix",

diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
@@ -3744,11 +3744,13 @@
         "reset_password_title": "Jelszó megváltoztatása",
         "continue_with_sso": "Folytatás ezzel: %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s vagy %(usernamePassword)s",
+        "sign_in_instead_prompt": "Bejelentkezés inkább",
         "sign_in_instead": "Bejelentkezés inkább",
         "account_clash": "Az új (%(newAccountId)s) fiókod elkészült, de jelenleg egy másik fiókba (%(loggedInUserId)s) vagy bejelentkezve.",
         "account_clash_previous_account": "Folytatás az előző fiókkal",
         "log_in_new_account": "<a>Belépés</a> az új fiókodba.",
         "registration_successful": "Regisztráció sikeres",
+        "server_picker_title_registration": "Fiók létrehozása itt:",
         "server_picker_title": "Bejelentkezés a Matrix-kiszolgálójába",
         "server_picker_dialog_title": "Döntse el, hol szeretne fiókot létrehozni",
         "footer_powered_by_matrix": "a gépházban: Matrix",

diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
@@ -3844,11 +3844,13 @@
         "reset_password_title": "Atur ulang kata sandi Anda",
         "continue_with_sso": "Lanjutkan dengan %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s Atau %(usernamePassword)s",
+        "sign_in_instead_prompt": "Masuk saja",
         "sign_in_instead": "Masuk saja",
         "account_clash": "Akun Anda yang baru (%(newAccountId)s) telah didaftarkan, tetapi Anda telah masuk ke akun yang lain (%(loggedInUserId)s).",
         "account_clash_previous_account": "Lanjutkan dengan akun sebelumnya",
         "log_in_new_account": "<a>Masuk</a> ke akun yang baru.",
         "registration_successful": "Pendaftaran Berhasil",
+        "server_picker_title_registration": "Host akun di",
         "server_picker_title": "Masuk ke homeserver Anda",
         "server_picker_dialog_title": "Putuskan di mana untuk menghost akun Anda",
         "footer_powered_by_matrix": "diberdayakan oleh Matrix",

diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json
@@ -3267,11 +3267,13 @@
         "reset_password_title": "Endurstilltu lykilorðið þitt",
         "continue_with_sso": "Halda áfram með %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s eða %(usernamePassword)s",
+        "sign_in_instead_prompt": "Skrá inn í staðinn",
         "sign_in_instead": "Skrá inn í staðinn",
         "account_clash": "Nýi aðgangurinn þinn (%(newAccountId)s) er skráður, eð þú ert þegar skráð/ur inn á öðrum notandaaðgangi (%(loggedInUserId)s).",
         "account_clash_previous_account": "Halda áfram með fyrri aðgangi",
         "log_in_new_account": "<a>Skráðu þig inn</a> í nýja notandaaðganginn þinn.",
         "registration_successful": "Nýskráning tókst",
+        "server_picker_title_registration": "Hýsa notandaaðgang á",
         "server_picker_title": "Skráðu þig inn á heimaþjóninn þinn",
         "server_picker_dialog_title": "Ákveddu hvar aðgangurinn þinn er hýstur",
         "footer_powered_by_matrix": "keyrt með Matrix",

diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
@@ -3844,11 +3844,13 @@
         "reset_password_title": "Reimposta la tua password",
         "continue_with_sso": "Continua con %(ssoButtons)s",
         "sso_or_username_password": "%(ssoButtons)s o %(usernamePassword)s",
+        "sign_in_instead_prompt": "Oppure accedi",
         "sign_in_instead": "Oppure accedi",
         "account_clash": "Il tuo nuovo account (%(newAccountId)s) è registrato, ma hai già fatto l'accesso in un account diverso (%(loggedInUserId)s).",
         "account_clash_previous_account": "Continua con l'account precedente",
         "log_in_new_account": "<a>Accedi</a> al tuo nuovo account.",
         "registration_successful": "Registrazione riuscita",
+        "server_picker_title_registration": "Ospita account su",
         "server_picker_title": "Accedi al tuo homeserver",
         "server_picker_dialog_title": "Decidi dove ospitare il tuo account",
         "footer_powered_by_matrix": "offerto da Matrix",