Merge strings for train 29084

Author: Bug Mirror

locale/en/payments-next.ftl

@@ -1,8 +1,3 @@
-## Checkout Page
-## Common strings used in multiple checkout pages
-
-next-payment-processing-message = Please wait while we process your payment…
-
 next-payment-error-manage-subscription-button = Manage my subscription
 next-iap-upgrade-contact-support = You can still get this product — please contact support so we can help you.
 next-payment-error-retry-button = Try again
@@ -22,29 +17,53 @@ next-payment-method-header = Choose your payment method
 payment-method-header-second-step-next = 2. { next-payment-method-header }
 next-payment-method-first-approve = First you’ll need to approve your subscription
 
-next-payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
+## Page - Upgrade page
 
+upgrade-page-payment-information = Payment Information
+
+# $nextInvoiceDate (number) - The date of the next invoice
+upgrade-page-acknowledgment =  Your plan will change immediately, and you’ll be charged a prorated amount today for the rest of this billing cycle. Starting { $nextInvoiceDate } you’ll be charged the full amount.
+
+checkout-error-boundary-retry-button = Try again
+checkout-error-boundary-basic-error-message = Something went wrong. Please try again or <contactSupportLink>contact support.</contactSupportLink>
+
+## Error pages - /checkout and /upgrade
+## Common strings used in multiple pages
+next-payment-error-manage-subscription-button = Manage my subscription
+next-iap-upgrade-contact-support = You can still get this product — please contact support so we can help you.
+next-payment-error-retry-button = Try again
+next-basic-error-message = Something went wrong. Please try again later.
+checkout-error-contact-support-button = Contact Support
+checkout-error-not-eligible = You are not eligible to subscribe to this product - please contact support so we can help you.
+checkout-error-contact-support = Please contact support so we can help you.
+
+## Processing page and Needs Input page - /checkout and /upgrade
+## Common strings used in multiple pages
+next-payment-processing-message = Please wait while we process your payment…
+
+## Success page - /checkout and /upgrade
+## Common strings used in multiple checkout pages
+next-payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
 # $email (String) - The user's email.
 payment-confirmation-thanks-subheading-account-exists-2 = You’ll receive an email at { $email } with instructions about your subscription, as well as your payment details.
-
 next-payment-confirmation-order-heading = Order details
 # $invoiceNumber (String) - Invoice number of the successful payment
 next-payment-confirmation-invoice-number = Invoice #{ $invoiceNumber }
-
 # $invoiceDate (Date) - Start date of the latest invoice
 next-payment-confirmation-invoice-date = { $invoiceDate }
-
 next-payment-confirmation-details-heading-2 = Payment information
 # $amount (Number) - The amount billed. It will be formatted as currency.
 # $interval (String) - The interval between payments.
-next-payment-confirmation-amount = { $amount } per { $interval }
-# $last4 (Number) - Last four numbers of credit card
-next-payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
+success-page-payment-confirmation-amount = { $amount } per { $interval }
 
+## Success pages (/checkout and /upgrade)
+## Common strings used in multiple checkout pages
 next-payment-confirmation-download-button = Continue to download
 
-checkout-error-boundary-retry-button = Try again
-checkout-error-boundary-basic-error-message = Something went wrong. Please try again or <contactSupportLink>contact support.</contactSupportLink>
+## Success pages (/checkout and /upgrade), Start page (/upgrade)
+## Common strings used in multiple checkout pages
+# $last4 (Number) - Last four numbers of credit card
+next-payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
 
 ## Component - Payment Consent Checkbox
 
@@ -140,7 +159,7 @@ next-new-user-subscribe-product-assurance = We only use your email to create you
 plan-price-interval-daily = { $amount } daily
 plan-price-interval-weekly = { $amount } weekly
 plan-price-interval-monthly = { $amount } monthly
-plan-price-interval-6monthly = { $amount } every 6 months
+plan-price-interval-halfyearly = { $amount } every 6 months
 plan-price-interval-yearly = { $amount } yearly
 
 ## Component - SubscriptionTitle
@@ -177,4 +196,5 @@ upgrade-purchase-details-prorated-upgrade = Prorated Upgrade
 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-halfyearly = { $productName } (6-month)
 upgrade-purchase-details-new-plan-yearly = { $productName } (Yearly)

locale/en/settings.ftl

@@ -1832,7 +1832,7 @@ 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
-signin-recovery-phone-instruction-v3 = A six-digit code was sent to the phone number ending in <span>{ $lastFourPhoneDigits }</span> by text message. This code expires after 5 minutes. Donʼt share this code with anyone.
+signin-recovery-phone-instruction-v3 = A 6-digit code was sent to the phone number ending in <span>{ $lastFourPhoneDigits }</span> by text message. This code expires after 5 minutes. Donʼt share this code with anyone.
 
 signin-recovery-phone-input-label = Enter 6-digit code
 
@@ -1851,6 +1851,9 @@ signin-recovery-phone-code-verification-error-heading = There was a problem veri
 # Follows the error message (e.g, "There was a problem sending a code")
 signin-recovery-phone-general-error-description = Please try again later.
 
+signin-recovery-phone-invalid-code-error-description = The code is invalid or expired.
+signin-recovery-phone-invalid-code-error-link = Use backup authentication codes instead?
+
 ## 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/es/payments-next.ftl

@@ -58,7 +58,14 @@ next-new-user-card-title = Escribe la información de tu tarjeta
 
 ## Component - PurchaseDetails
 
+next-plan-details-header = Detalles del producto
+next-plan-details-list-price = Lista de precios
+next-plan-details-tax = Impuestos y tasas
+next-plan-details-total-label = Total
 next-plan-details-show-button = Mostrar detalles
+next-coupon-success = Tu plan se renovará automáticamente al precio de la lista.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+next-coupon-success-repeating = Tu plan se renovará automáticamente después de { $couponDurationDate } al precio de lista.
 
 ## Select Tax Location
 
@@ -70,20 +77,6 @@ next-new-user-subscribe-product-updates-mozilla = Me gustaría recibir noticias
 next-new-user-subscribe-product-updates-snp = Me gustaría recibir noticias y actualizaciones sobre seguridad y privacidad de { -brand-mozilla }
 next-new-user-subscribe-product-assurance = Utilizamos tu dirección únicamente para crear tu cuenta. Jamás la venderemos a terceros.
 
-## Component - Details
-
-next-plan-details-header = Detalles del producto
-next-plan-details-list-price = Lista de precios
-next-plan-details-tax = Impuestos y tasas
-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.
-
-next-coupon-success = Tu plan se renovará automáticamente al precio de la lista.
-# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
-next-coupon-success-repeating = Tu plan se renovará automáticamente después de { $couponDurationDate } al precio de lista.
-
 ## Component - PriceInterval
 
 
@@ -107,3 +100,10 @@ next-subplat-mozilla-accounts-legal-heading = { -product-mozilla-accounts(capita
 next-terms = Términos del servicio
 next-privacy = Aviso de privacidad
 next-terms-download = Descargar términos
+
+## Component - UpdatedPurchaseDetails
+
+
+## $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
+

locale/es/settings.ftl

@@ -981,8 +981,6 @@ signout-sync-session-expired = Lo sentimos, algo ha salido mal. Cierra la sesió
 # Only shown for users that have 2FA enabled and verified, but all backup authentication codes have been consumed
 # Users that have not enabled or verified 2FA will not see this
 tfa-row-backup-codes-not-available = No hay códigos disponibles
-# 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 = Obtener nuevos códigos
 # 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 = Añadir

locale/fy/auth.ftl

@@ -7,11 +7,21 @@ session-verify-send-push-body-2 = Klik hjir om te befêstigjen dat jo it binne
 # 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-body = { $code } is jo { -brand-mozilla }-ferifikaasjekoade. Ferrint oer 5 minuten.
+# 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 }-ferifikaasjekoade: { $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 jo { -brand-mozilla }-werstelkoade. Ferrint oer 5 minuten.
+# 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 }-koade: { $code }
 
 ## Email content
 ## Emails do not contain buttons, only links. Emails have a rich HTML version and a plaintext
@@ -368,6 +378,9 @@ postAddLinkedAccount-action = Account beheare
 postAddRecoveryPhone-subject = Wersteltelefoannûmer tafoege
 postAddRecoveryPhone-preview = Account beskerme troch twa-stapsautentikaasje
 postAddRecoveryPhone-title = Jo hawwe in wersteltelefoannûmer oanmakke
+# Variables:
+#  $maskedLastFourPhoneNumber (String) - A bullet point mask with the last four digits of the user's phone number, e.g. ••••••1234
+postAddRecoveryPhone-description-v2 = Jo hawwe { $maskedLastFourPhoneNumber } as jo wersteltelefoannûmer tafoege
 # Links out to a support article about two factor authentication
 postAddRecoveryPhone-how-protect = Hoe dit jo account beskermet
 postAddRecoveryPhone-how-protect-plaintext = Hoe dit jo account beskermet:

locale/fy/payments-next.ftl

@@ -72,8 +72,15 @@ next-new-user-card-title = Fier jo kaartgegevens yn
 
 ## Component - PurchaseDetails
 
+next-plan-details-header = Produktdetails
+next-plan-details-list-price = Normale priis
+next-plan-details-tax = Belestingen en heffingen
+next-plan-details-total-label = Totaal
 next-plan-details-hide-button = Details ferstopje
 next-plan-details-show-button = Details toane
+next-coupon-success = Jo abonnemint wurdt automatysk ferlinge tsjin de normale priis.
+# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
+next-coupon-success-repeating = Jo abonnemint wurdt nei { $couponDurationDate } automatysk ferlinge tsjin de standertpriis.
 
 ## Select Tax Location
 
@@ -101,22 +108,6 @@ next-new-user-subscribe-product-updates-mozilla = Ik wol graach produktnijs en -
 next-new-user-subscribe-product-updates-snp = Ik wol graach befeiligings- en privacynijs en updates fan { -brand-mozilla } ûntfange
 next-new-user-subscribe-product-assurance = Wy brûke jo e-mailadres allinnich om jo account oan te meitsjen. Wy sille it nea oan in tredde partij ferkeapje.
 
-## Component - Details
-
-next-plan-details-header = Produktdetails
-next-plan-details-list-price = Normale priis
-next-plan-details-tax = Belestingen en heffingen
-next-plan-details-total-label = Totaal
-
-## 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 = Jo abonnemint wurdt automatysk ferlinge tsjin de normale priis.
-# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
-next-coupon-success-repeating = Jo abonnemint wurdt nei { $couponDurationDate } automatysk ferlinge tsjin de standertpriis.
-
 ## Component - PriceInterval
 
 
@@ -135,6 +126,7 @@ next-subscription-create-title = Jo abonnemint ynstelle
 next-subscription-success-title = Abonnemintsbefêstiging
 next-subscription-processing-title = Abonnemint befêstigje…
 next-subscription-error-title = Flater by befêstigjen abonnemint…
+subscription-title-plan-change-heading = Jo wiziging besjen
 next-sub-guarantee = 30-dagen-jildweromgarânsje
 
 ## Component - TermsAndPrivacy
@@ -145,3 +137,20 @@ next-subplat-mozilla-accounts-legal-heading = { -product-mozilla-accounts(capita
 next-terms = Tsjinstbetingsten
 next-privacy = Privacyferklearring
 next-terms-download = Betingsten downloade
+
+## Component - UpdatedPurchaseDetails
+
+upgrade-purchase-details-current-plan-label = Aktuele abonnemint
+upgrade-purchase-details-new-plan-label = Nij abonnemint
+upgrade-purchase-details-promo-code = Promoasjekoade
+upgrade-purchase-details-tax-label = Belestingen en heffingen
+upgrade-purchase-details-new-total-label = Nij totaalbedrach
+upgrade-purchase-details-prorated-upgrade = Nei rato opwurdearje
+
+## $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 } (deistich)
+upgrade-purchase-details-new-plan-weekly = { $productName } (wykliks)
+upgrade-purchase-details-new-plan-monthly = { $productName } (moanliks)
+upgrade-purchase-details-new-plan-yearly = { $productName } (jierliks)