Merge strings for train 41503

Author: Bug Mirror

locale/en/auth.ftl

@@ -9,12 +9,23 @@ session-verify-send-push-body-2 = Click here to confirm it’s you
 # $code  - 6 digit code used to verify phone ownership when registering a recovery phone
 recovery-phone-setup-sms-body = { $code } is your { -brand-mozilla } verification code. Expires in 5 minutes.
 
+# Shorter message sent by SMS with limited character length, please test translation with the messaging segment calculator
+# https://twiliodeved.github.io/message-segment-calculator/
+# Messages should be limited to one segment
+# $code  - 6 digit code used to verify phone ownership when registering a recovery phone
+recovery-phone-setup-sms-short-body = { -brand-mozilla } verification code: { $code }
+
 # Message sent by SMS with limited character length, please test translation with the messaging segment calculator
 # https://twiliodeved.github.io/message-segment-calculator/
 # Messages should be limited to one segment
 # $code  - 6 digit code used to sign in with a recovery phone as backup for two-step authentication
 recovery-phone-signin-sms-body = { $code } is your { -brand-mozilla } recovery code. Expires in 5 minutes.
 
+# Shorter message sent by SMS with limited character length, please test translation with the messaging segment calculator
+# https://twiliodeved.github.io/message-segment-calculator/
+# Messages should be limited to one segment
+# $code  - 6 digit code used to sign in with a recovery phone as backup for two-step authentication
+recovery-phone-signin-sms-short-body = { -brand-mozilla } code: { $code }
 
 ## Email content
 ## Emails do not contain buttons, only links. Emails have a rich HTML version and a plaintext

locale/en/payments-next.ftl

@@ -87,9 +87,18 @@ next-new-user-card-title = Enter your card information
 
 ## Component - PurchaseDetails
 
+next-plan-details-header = Product details
+next-plan-details-list-price = List Price
+next-plan-details-tax = Taxes and Fees
+next-plan-details-total-label = Total
+
 next-plan-details-hide-button = Hide details
 next-plan-details-show-button = Show details
 
+next-coupon-success = Your plan will automatically renew at the list price.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+next-coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
+
 ## Select Tax Location
 
 select-tax-location-title = Location
@@ -123,23 +132,6 @@ next-new-user-subscribe-product-updates-mozilla = I’d like to receive product
 next-new-user-subscribe-product-updates-snp = I’d like to receive security and privacy news and updates from { -brand-mozilla }
 next-new-user-subscribe-product-assurance = We only use your email to create your account. We will never sell it to a third party.
 
-## Component - Details
-
-next-plan-details-header = Product details
-next-plan-details-list-price = List Price
-next-plan-details-tax = Taxes and Fees
-next-plan-details-total-label = Total
-
-## Purchase details - shared by multiple components, including purchase details and payment form
-## $amount (Number) - The amount billed. It will be formatted as currency.
-
-list-positive-amount = { $amount }
-list-negative-amount = - { $amount }
-
-next-coupon-success = Your plan will automatically renew at the list price.
-# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
-next-coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
-
 ## Component - PriceInterval
 
 ## PriceInterval - shared by multiple components, including Details and PurchaseDetails
@@ -157,6 +149,7 @@ next-subscription-create-title = Set up your subscription
 next-subscription-success-title = Subscription confirmation
 next-subscription-processing-title = Confirming subscription…
 next-subscription-error-title = Error confirming subscription…
+subscription-title-plan-change-heading = Review your change
 
 next-sub-guarantee = 30-day money-back guarantee
 
@@ -169,3 +162,19 @@ next-subplat-mozilla-accounts-legal-heading = { -product-mozilla-accounts(capita
 next-terms = Terms of Service
 next-privacy = Privacy Notice
 next-terms-download = Download Terms
+
+## Component - UpdatedPurchaseDetails
+
+upgrade-purchase-details-current-plan-label = Current plan
+upgrade-purchase-details-new-plan-label = New plan
+upgrade-purchase-details-promo-code = Promo Code
+upgrade-purchase-details-tax-label = Taxes and Fees
+upgrade-purchase-details-new-total-label = New total
+upgrade-purchase-details-prorated-upgrade = Prorated Upgrade
+
+## $productName (String) - Name of the upgraded product (e.g. Mozilla VPN)
+## Daily/Weekly/Monthly/Yearly refers to the subscription interval/amount of time between billing occurrences
+upgrade-purchase-details-new-plan-daily = { $productName } (Daily)
+upgrade-purchase-details-new-plan-weekly = { $productName } (Weekly)
+upgrade-purchase-details-new-plan-monthly = { $productName } (Monthly)
+upgrade-purchase-details-new-plan-yearly = { $productName } (Yearly)

locale/en/settings.ftl

@@ -964,6 +964,8 @@ settings-recovery-phone-remove-success = Recovery phone removed
 page-setup-recovery-phone-heading = Add recovery phone
 
 page-setup-recovery-phone-back-button-title = Back to settings
+# Back arrow to return to step 1 of recovery phone setup flow
+page-setup-recovery-phone-step2-back-button-title = Change phone number
 
 ## Add secondary email page
 
@@ -1117,7 +1119,7 @@ tfa-row-backup-codes-available-v2 = { $numCodesAvailable ->
   *[other] { $numCodesAvailable } codes remaining
 }
 # Shown to users who have backup authentication codes - this will allow them to generate new codes to replace the previous ones
-tfa-row-backup-codes-get-new-cta = Get new codes
+tfa-row-backup-codes-get-new-cta-v2 = Create new codes
 # Shown to users who have no backup authentication codes
 # Button to add backup authentication codes when none are configured
 tfa-row-backup-codes-add-cta = Add
@@ -1128,7 +1130,7 @@ tfa-row-backup-codes-description-2 = This is the safest recovery method if you c
 # A recovery code can be sent to the user's phone
 tfa-row-backup-phone-title-v2 = Recovery phone
 # Shown with an alert icon to indicate that no recovery phone is configured
-tfa-row-backup-phone-not-available = No recovery phone number available
+tfa-row-backup-phone-not-available-v2 = No phone number added
 # button to change the configured recovery phone
 tfa-row-backup-phone-change-cta = Change
 # button to add/configure a recovery phone

locale/es/auth.ftl

@@ -254,6 +254,7 @@ inactiveAccountFinalWarning-subject = Última oportunidad para conservar tu { -p
 inactiveAccountFinalWarning-title = Tu cuenta de { -brand-mozilla } y sus datos serán eliminados
 inactiveAccountFinalWarning-preview = Inicia sesión para mantener tu cuenta
 inactiveAccountFinalWarning-account-description = Tu { -product-mozilla-account } se usa para acceder a productos gratuitos de privacidad y navegación como { -brand-firefox } sync, { -product-mozilla-monitor }, { -product-firefox-relay } y { -product-mdn }.
+inactiveAccountFirstWarning-inactive-status = Notamos que no has iniciado sesión durante 2 años.
 # The user has a low number of valid recovery codes remaining for use
 codes-reminder-title-zero = ¡Te has quedado sin códigos de autenticación de respaldo!
 codes-reminder-title-one = Estás en tu último código de autenticación de respaldo

locale/es/payments-next.ftl

@@ -9,9 +9,8 @@ next-basic-error-message = Algo ha salido mal. Por favor, inténtalo de nuevo m
 
 ## Page
 
-continue-signin-with-google-button = Continuar con { -brand-google }
-continue-signin-with-apple-button = Continuar con { -brand-apple }
-next-payment-method-header = Elige tu método de pago
+continue-signin-with-google-button = Seguir con { -brand-google }
+continue-signin-with-apple-button = Seguir con { -brand-apple }
 # This message is used to indicate the second step in a multi step process.
 payment-method-header-second-step-next = 2. { next-payment-method-header }
 next-payment-method-first-approve = Primero tendrás que aprobar tu suscripción
@@ -49,14 +48,16 @@ next-coupon-promo-code = Código promocional
 next-coupon-promo-code-applied = Código promocional aplicado
 next-coupon-remove = Eliminar
 next-coupon-submit = Aplicar
+payments-client-loading-spinner =
+    .aria-label = Cargando…
+    .alt = Cargando…
 
 ## Payment Section
 
 next-new-user-card-title = Escribe la información de tu tarjeta
 
 ## Component - PurchaseDetails
 
-next-plan-details-hide-button = Ocultar detalles
 next-plan-details-show-button = Mostrar detalles
 
 ## Select Tax Location

locale/pt/settings.ftl

@@ -1230,6 +1230,7 @@ auth-error-214 = O número de telefone de recuperação já existe
 auth-error-215 = O número de telefone de recuperação não existe
 auth-error-216 = Limite de mensagens de texto atingido
 auth-error-218 = Não foi possível remover o telefone de recuperação, códigos de autenticação de recuperação em falta.
+auth-error-219 = Este número de telefone foi registado com demasiadas contas. Por favor, tente um número diferente.
 auth-error-999 = Erro inesperado
 auth-error-1001 = Tentativa de início de sessão cancelada
 auth-error-1002 = A sessão expirou. Inicie sessão para continuar.

locale/sv/settings.ftl

@@ -1243,6 +1243,7 @@ auth-error-214 = Telefonnumret för återställning finns redan
 auth-error-215 = Telefonnumret för återställning finns inte
 auth-error-216 = Gränsen för textmeddelanden har nåtts
 auth-error-218 = Det går inte att ta bort återställningstelefon, saknar reservautentiseringskoder.
+auth-error-219 = Det här telefonnumret har registrerats på för många konton. Försök med ett annat nummer.
 auth-error-999 = Oväntat fel
 auth-error-1001 = Inloggningsförsök avbröts
 auth-error-1002 = Sessionen upphörde. Logga in för att fortsätta.

locale/templates/auth.ftl

@@ -9,12 +9,23 @@ session-verify-send-push-body-2 = Click here to confirm it’s you
 # $code  - 6 digit code used to verify phone ownership when registering a recovery phone
 recovery-phone-setup-sms-body = { $code } is your { -brand-mozilla } verification code. Expires in 5 minutes.
 
+# Shorter message sent by SMS with limited character length, please test translation with the messaging segment calculator
+# https://twiliodeved.github.io/message-segment-calculator/
+# Messages should be limited to one segment
+# $code  - 6 digit code used to verify phone ownership when registering a recovery phone
+recovery-phone-setup-sms-short-body = { -brand-mozilla } verification code: { $code }
+
 # Message sent by SMS with limited character length, please test translation with the messaging segment calculator
 # https://twiliodeved.github.io/message-segment-calculator/
 # Messages should be limited to one segment
 # $code  - 6 digit code used to sign in with a recovery phone as backup for two-step authentication
 recovery-phone-signin-sms-body = { $code } is your { -brand-mozilla } recovery code. Expires in 5 minutes.
 
+# Shorter message sent by SMS with limited character length, please test translation with the messaging segment calculator
+# https://twiliodeved.github.io/message-segment-calculator/
+# Messages should be limited to one segment
+# $code  - 6 digit code used to sign in with a recovery phone as backup for two-step authentication
+recovery-phone-signin-sms-short-body = { -brand-mozilla } code: { $code }
 
 ## Email content
 ## Emails do not contain buttons, only links. Emails have a rich HTML version and a plaintext

locale/templates/payments-next.ftl

@@ -87,9 +87,18 @@ next-new-user-card-title = Enter your card information
 
 ## Component - PurchaseDetails
 
+next-plan-details-header = Product details
+next-plan-details-list-price = List Price
+next-plan-details-tax = Taxes and Fees
+next-plan-details-total-label = Total
+
 next-plan-details-hide-button = Hide details
 next-plan-details-show-button = Show details
 
+next-coupon-success = Your plan will automatically renew at the list price.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+next-coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
+
 ## Select Tax Location
 
 select-tax-location-title = Location
@@ -123,23 +132,6 @@ next-new-user-subscribe-product-updates-mozilla = I’d like to receive product
 next-new-user-subscribe-product-updates-snp = I’d like to receive security and privacy news and updates from { -brand-mozilla }
 next-new-user-subscribe-product-assurance = We only use your email to create your account. We will never sell it to a third party.
 
-## Component - Details
-
-next-plan-details-header = Product details
-next-plan-details-list-price = List Price
-next-plan-details-tax = Taxes and Fees
-next-plan-details-total-label = Total
-
-## Purchase details - shared by multiple components, including purchase details and payment form
-## $amount (Number) - The amount billed. It will be formatted as currency.
-
-list-positive-amount = { $amount }
-list-negative-amount = - { $amount }
-
-next-coupon-success = Your plan will automatically renew at the list price.
-# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
-next-coupon-success-repeating = Your plan will automatically renew after { $couponDurationDate } at the list price.
-
 ## Component - PriceInterval
 
 ## PriceInterval - shared by multiple components, including Details and PurchaseDetails
@@ -157,6 +149,7 @@ next-subscription-create-title = Set up your subscription
 next-subscription-success-title = Subscription confirmation
 next-subscription-processing-title = Confirming subscription…
 next-subscription-error-title = Error confirming subscription…
+subscription-title-plan-change-heading = Review your change
 
 next-sub-guarantee = 30-day money-back guarantee
 
@@ -169,3 +162,19 @@ next-subplat-mozilla-accounts-legal-heading = { -product-mozilla-accounts(capita
 next-terms = Terms of Service
 next-privacy = Privacy Notice
 next-terms-download = Download Terms
+
+## Component - UpdatedPurchaseDetails
+
+upgrade-purchase-details-current-plan-label = Current plan
+upgrade-purchase-details-new-plan-label = New plan
+upgrade-purchase-details-promo-code = Promo Code
+upgrade-purchase-details-tax-label = Taxes and Fees
+upgrade-purchase-details-new-total-label = New total
+upgrade-purchase-details-prorated-upgrade = Prorated Upgrade
+
+## $productName (String) - Name of the upgraded product (e.g. Mozilla VPN)
+## Daily/Weekly/Monthly/Yearly refers to the subscription interval/amount of time between billing occurrences
+upgrade-purchase-details-new-plan-daily = { $productName } (Daily)
+upgrade-purchase-details-new-plan-weekly = { $productName } (Weekly)
+upgrade-purchase-details-new-plan-monthly = { $productName } (Monthly)
+upgrade-purchase-details-new-plan-yearly = { $productName } (Yearly)

locale/templates/settings.ftl

@@ -964,6 +964,8 @@ settings-recovery-phone-remove-success = Recovery phone removed
 page-setup-recovery-phone-heading = Add recovery phone
 
 page-setup-recovery-phone-back-button-title = Back to settings
+# Back arrow to return to step 1 of recovery phone setup flow
+page-setup-recovery-phone-step2-back-button-title = Change phone number
 
 ## Add secondary email page
 
@@ -1117,7 +1119,7 @@ tfa-row-backup-codes-available-v2 = { $numCodesAvailable ->
   *[other] { $numCodesAvailable } codes remaining
 }
 # Shown to users who have backup authentication codes - this will allow them to generate new codes to replace the previous ones
-tfa-row-backup-codes-get-new-cta = Get new codes
+tfa-row-backup-codes-get-new-cta-v2 = Create new codes
 # Shown to users who have no backup authentication codes
 # Button to add backup authentication codes when none are configured
 tfa-row-backup-codes-add-cta = Add
@@ -1128,7 +1130,7 @@ tfa-row-backup-codes-description-2 = This is the safest recovery method if you c
 # A recovery code can be sent to the user's phone
 tfa-row-backup-phone-title-v2 = Recovery phone
 # Shown with an alert icon to indicate that no recovery phone is configured
-tfa-row-backup-phone-not-available = No recovery phone number available
+tfa-row-backup-phone-not-available-v2 = No phone number added
 # button to change the configured recovery phone
 tfa-row-backup-phone-change-cta = Change
 # button to add/configure a recovery phone