Merge strings for train 23924

locale/en/settings.ftl

@@ -684,6 +684,7 @@ flow-setup-phone-confirm-code-button = Confirm
 # followed by a button to resend a code
 flow-setup-phone-confirm-code-expired = Code expired?
 flow-setup-phone-confirm-code-resend-code-button = Resend code
+flow-setup-phone-confirm-code-resend-code-success = Code sent
 flow-setup-phone-confirm-code-success-message-v2 = Recovery phone added
 
 ## FlowSetupPhoneConfirmCode
@@ -757,7 +758,7 @@ tfa-create-code-error = There was a problem creating your backup authentication
 tfa-replace-code-success-1 = New codes have been created. Save these one-time use
   backup authentication codes in a safe place — you’ll need them to access your account if you don’t
   have your mobile device.
-tfa-replace-code-success-alert-3 = Account backup authentication codes updated
+tfa-replace-code-success-alert-4 = Backup authentication codes updated
 tfa-replace-code-1-2 = Step 1 of 2
 tfa-replace-code-2-2 = Step 2 of 2
 
@@ -990,6 +991,8 @@ verify-secondary-email-success-alert-2 = { $email } successfully added
 
 # Link to delete account on main Settings page
 delete-account-link = Delete account
+# Success message displayed in alert bar after the user has successfully confirmed their account is not inactive.
+inactive-update-status-success-alert = Signed in successfully. Your { -product-mozilla-account } and data will stay active.
 
 ## Two Step Authentication
 
@@ -1270,12 +1273,21 @@ auth-error-114-generic = You’ve tried too many times. Please try again later.
 #                          the prefix as required by the current locale (for example, "in 15 minutes", "dans 15 minutes").
 auth-error-114 = You’ve tried too many times. Please try again { $retryAfter }.
 auth-error-125 = The request was blocked for security reasons
+auth-error-129 = Invalid phone number
 auth-error-138-2 = Unconfirmed session
 auth-error-139 = Secondary email must be different than your account email
 auth-error-155 = TOTP token not found
+# Error shown when the user submits an invalid backup authentication code
+auth-error-156 = Backup authentication code not found
 auth-error-159 = Invalid account recovery key
 auth-error-183-2 = Invalid or expired confirmation code
+auth-error-202 = Feature not enabled
+auth-error-203 = System unavailable, try again soon
 auth-error-206 = Can not create password, password already set
+auth-error-214 = Recovery phone number already exists
+auth-error-215 = Recovery phone number does not exist
+auth-error-216 = Text message limit reached
+auth-error-218 = Unable to remove recovery phone, missing backup authentication codes.
 auth-error-999 = Unexpected error
 auth-error-1001 = Login attempt cancelled
 auth-error-1002 = Session expired. Sign in to continue.
@@ -1286,6 +1298,7 @@ auth-error-1011 = Valid email required
 auth-error-1031 = You must enter your age to sign up
 auth-error-1032 = You must enter a valid age to sign up
 auth-error-1054 = Invalid two-step authentication code
+auth-error-1056 = Invalid backup authentication code
 auth-error-1062 = Invalid redirect
 
 oauth-error-1000 = Something went wrong. Please close this tab and try again.
@@ -1739,19 +1752,34 @@ signin-push-code-confirm-login = Confirm login
 signin-push-code-confirm-wasnt-me = This wasn’t me, change password.
 signin-push-code-confirm-login-approved = Your login has been approved. Please close this window.
 signin-push-code-confirm-link-error = Link is damaged. Please try again.
+## Signin recovery method page
+## This page is shown to users when they are having trouble signing in with
+## their password, and they previously had set up an account recovery method.
+
+signin-recovery-method-header = Sign in
+signin-recovery-method-subheader = Choose a recovery method
+signin-recovery-method-details = Let’s make sure it’s you using your recovery methods.
+signin-recovery-method-phone = Recovery phone
+signin-recovery-method-code-v2 = Backup authentication codes
+# Variable: $numberOfCodes (String) - The number of authentication codes the user has left, e.g. 4
+signin-recovery-method-code-info = { $numberOfCodes } codes remaining
+# Shown when a backend service fails and a code cannot be sent to the user's recovery phone.
+signin-recovery-method-send-code-error-heading = There was a problem sending a code to your recovery phone
+signin-recovery-method-send-code-error-description = Please try again later or use your backup authentication codes.
+
 ## SigninRecoveryCode page
 ## Users are prompted to enter a backup authentication code
 ## (provided to the user when they first set up two-step authentication)
 ## when they are unable to sign in with two-step authentication (e.g., Authy, Duo, etc.)
 
 signin-recovery-code-heading = Sign in
 signin-recovery-code-sub-heading = Enter backup authentication code
-signin-recovery-code-instruction-v2 = Enter one of the one-time use backup authentication codes you saved during two-step authentication setup.
-signin-recovery-code-input-label-v2 = Enter 10-character code
+# codes here refers to backup authentication codes
+signin-recovery-code-instruction-v3 = Enter one of the one-time-use codes you saved when you set up two-step authentication.
 # Form button to confirm if the backup authentication code entered by the user is valid
 signin-recovery-code-confirm-button = Confirm
-# Link to return to signin with two-step authentication code
-signin-recovery-code-back-link = Back
+# Link to go to the page to use recovery phone instead
+signin-recovery-code-phone-link = Use recovery phone
 # External link for support if the user can't use two-step autentication or a backup authentication code
 # https://support.mozilla.org/kb/what-if-im-locked-out-two-step-authentication
 signin-recovery-code-support-link = Are you locked out?
@@ -1760,34 +1788,37 @@ signin-recovery-code-required-error = Backup authentication code required
 # Message to user after they were redirected to the Mozilla account sign-in page in a new browser
 # tab. Firefox will attempt to send the user back to their original tab to use an email mask after
 # they successfully sign in or sign up for a Mozilla account to receive a free email mask.
-signin-recovery-code-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.
-
-## Signin recovery method page
-## This page is shown to users when they are having trouble signing in with
-## their password, and they previously had set up an account recovery method.
-
-signin-recovery-method-header = Sign in
-signin-recovery-method-subheader = Choose a recovery method
-signin-recovery-method-details = Let’s make sure it’s you using your recovery methods.
-signin-recovery-method-phone = Recovery phone
-signin-recovery-method-code = Authentication codes
-# Variable: $numberOfCodes (String) - The number of authentication codes the user has left, e.g. 4
-signin-recovery-method-code-info = { $numberOfCodes } codes remaining
+signin-recovery-code-use-phone-failure = There was a problem sending a code to your recovery phone
+signin-recovery-code-use-phone-failure-description = Please try again later.
 
-## SigninRecoveryPhoneCodeConfirm page
+## SigninRecoveryPhone page
 
-recovery-phone-code-confirm-flow-heading = Sign in
+signin-recovery-phone-flow-heading = Sign in
 
 # A recovery code in context of this page is a one time code sent to the user's phone
-recovery-phone-code-confirm-with-code-heading = Enter recovery code
+signin-recovery-phone-heading = Enter recovery code
 
 # Text that explains the user should check their phone for a recovery code
 # $maskedPhoneNumber - The users masked phone number
-recovery-phone-code-confirm-code-instruction = A six-digit code was sent to <span>{ $maskedPhoneNumber }</span> by text message. This code expires after 5 minutes.
+signin-recovery-phone-instruction = A six-digit code was sent to <span>{ $maskedPhoneNumber }</span> by text message. This code expires after 5 minutes.
+
+signin-recovery-phone-input-label = Enter 6-digit code
+
+signin-recovery-phone-code-submit-button = Confirm
+
+signin-recovery-phone-resend-code-button = Resend code
+signin-recovery-phone-resend-success = Code sent
+
+# links to https://support.mozilla.org/kb/what-if-im-locked-out-two-step-authentication
+signin-recovery-phone-locked-out-link = Are you locked out?
+
+signin-recovery-phone-send-code-error-heading = There was a problem sending a code
+
+signin-recovery-phone-code-verification-error-heading = There was a problem verifying your code
 
-recovery-phone-code-confirm-input-group-label = Enter 6-digit code
+# Follows the error message (e.g, "There was a problem sending a code")
+signin-recovery-phone-general-error-description = Please try again later.
 
-recovery-phone-code-confirm-otp-submit-button = Confirm
 ## Signin reported page: this page is shown when a user receives an email notifying them of a new account signin, and the user clicks a button indicating that the signin was not them so that we know it was someone trying to break into their account.
 
 signin-reported-header = Thank you for your vigilance

locale/fy/payments-next.ftl

@@ -80,6 +80,8 @@ select-tax-location-save-button = Bewarje
 select-tax-location-country-code-label = Lân
 select-tax-location-country-code-placeholder = Selektearje jo lân
 select-tax-location-error-missing-country-code = Selektearje jo lân
+#  $productName (String) - The name of the product to be downloaded, e.g. Mozilla VPN
+select-tax-location-product-not-available = { $productName } is net beskikber op dizze lokaasje.
 select-tax-location-postal-code-label = Postkoade
 select-tax-location-postal-code =
     .placeholder = Fier jo postkoade yn

locale/fy/settings.ftl

@@ -889,6 +889,7 @@ settings-recovery-phone-remove-recommend = Wy riede jo oan dat jo dizze metoade
 settings-recovery-phone-remove-recovery-methods = As jo de add-on fuortsmite, soargje der dan foar dat o jo bewarre reserve-autentikaasjekoaden noch hawwe. <linkExternal>Werstelmetoaden fergelykje</linkExternal>
 settings-recovery-phone-remove-button = Telefoannûmer fuortsmite
 settings-recovery-phone-remove-cancel = Annulearje
+settings-recovery-phone-remove-success = Wersteltelefoannûmer fuortsmiten
 
 ## PageSetupRecoveryPhone
 

locale/pt/payments-next.ftl

@@ -80,6 +80,8 @@ select-tax-location-save-button = Guardar
 select-tax-location-country-code-label = País
 select-tax-location-country-code-placeholder = Selecione o seu país
 select-tax-location-error-missing-country-code = Por favor, selecione o seu país
+#  $productName (String) - The name of the product to be downloaded, e.g. Mozilla VPN
+select-tax-location-product-not-available = { $productName } não está disponível nesta localização.
 select-tax-location-postal-code-label = Código postal
 select-tax-location-postal-code =
     .placeholder = Introduza o seu código postal

locale/pt/settings.ftl

@@ -880,6 +880,7 @@ settings-recovery-phone-remove-recommend = Recomendamos que mantenha este métod
 settings-recovery-phone-remove-recovery-methods = Se apagá-la, certifique-se que ainda tem os seus códigos de recuperação de autenticação guardados. <linkExternal>Comparar métodos de recuperação</linkExternal>
 settings-recovery-phone-remove-button = Remover número de telefone
 settings-recovery-phone-remove-cancel = Cancelar
+settings-recovery-phone-remove-success = Telefone de recuperação removido
 
 ## PageSetupRecoveryPhone
 

locale/sv/payments-next.ftl

@@ -80,6 +80,8 @@ select-tax-location-save-button = Spara
 select-tax-location-country-code-label = Land
 select-tax-location-country-code-placeholder = Välj ditt land
 select-tax-location-error-missing-country-code = Välj ditt land
+#  $productName (String) - The name of the product to be downloaded, e.g. Mozilla VPN
+select-tax-location-product-not-available = { $productName } är inte tillgänglig på den här platsen.
 select-tax-location-postal-code-label = Postnummer
 select-tax-location-postal-code =
     .placeholder = Ange ditt postnummer

locale/sv/settings.ftl

@@ -885,6 +885,7 @@ settings-recovery-phone-remove-recommend = Vi rekommenderar att du behåller den
 settings-recovery-phone-remove-recovery-methods = Om du tar bort den, se till att du fortfarande har kvar dina sparade reservautentiseringskoder. <linkExternal>Jämför återställningsmetoder</linkExternal>
 settings-recovery-phone-remove-button = Ta bort telefonnummer
 settings-recovery-phone-remove-cancel = Avbryt
+settings-recovery-phone-remove-success = Återställningstelefon borttagen
 
 ## PageSetupRecoveryPhone