Skip to content

Commit 18b78c4

Browse files
mozilla-pontoonBug Mirrorbcolsson
authored
Merge strings for train 62062 (#915)
* Merge strings for train 62062 * Removed libs/payments/ui/src/lib/client/components/Header/en.ftl stings --------- Co-authored-by: Bug Mirror <[email protected]> Co-authored-by: Bryan Olsson <[email protected]>
1 parent 7d39844 commit 18b78c4

16 files changed

+313
-216
lines changed

locale/en/payments-next.ftl

+42-25
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
## Checkout Page
2-
## Common strings used in multiple checkout pages
3-
4-
next-payment-processing-message = Please wait while we process your payment…
5-
6-
next-payment-error-manage-subscription-button = Manage my subscription
7-
next-iap-upgrade-contact-support = You can still get this product — please contact support so we can help you.
8-
next-payment-error-retry-button = Try again
9-
next-basic-error-message = Something went wrong. Please try again later.
10-
checkout-error-contact-support-button = Contact Support
11-
checkout-error-not-eligible = You are not eligible to subscribe to this product - please contact support so we can help you.
12-
checkout-error-contact-support = Please contact support so we can help you.
13-
141
## Page
152
checkout-signin-or-create = 1. Sign in or create a { -product-mozilla-account }
163
checkout-create-account = Create a { -product-mozilla-account }
@@ -22,29 +9,50 @@ next-payment-method-header = Choose your payment method
229
payment-method-header-second-step-next = 2. { next-payment-method-header }
2310
next-payment-method-first-approve = First you’ll need to approve your subscription
2411
25-
next-payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
12+
## Page - Upgrade page
13+
14+
upgrade-page-payment-information = Payment Information
15+
16+
# $nextInvoiceDate (number) - The date of the next invoice
17+
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.
18+
19+
checkout-error-boundary-retry-button = Try again
20+
checkout-error-boundary-basic-error-message = Something went wrong. Please try again or <contactSupportLink>contact support.</contactSupportLink>
21+
22+
## Error pages - /checkout and /upgrade
23+
## Common strings used in multiple pages
24+
next-payment-error-manage-subscription-button = Manage my subscription
25+
next-iap-upgrade-contact-support = You can still get this product — please contact support so we can help you.
26+
next-payment-error-retry-button = Try again
27+
next-basic-error-message = Something went wrong. Please try again later.
28+
checkout-error-contact-support-button = Contact Support
29+
checkout-error-not-eligible = You are not eligible to subscribe to this product - please contact support so we can help you.
30+
checkout-error-contact-support = Please contact support so we can help you.
31+
32+
## Processing page and Needs Input page - /checkout and /upgrade
33+
## Common strings used in multiple pages
34+
next-payment-processing-message = Please wait while we process your payment…
2635
36+
## Success page - /checkout and /upgrade
37+
## Common strings used in multiple checkout pages
38+
next-payment-confirmation-thanks-heading-account-exists = Thanks, now check your email!
2739
# $email (String) - The user's email.
2840
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.
29-
3041
next-payment-confirmation-order-heading = Order details
3142
# $invoiceNumber (String) - Invoice number of the successful payment
3243
next-payment-confirmation-invoice-number = Invoice #{ $invoiceNumber }
33-
3444
# $invoiceDate (Date) - Start date of the latest invoice
3545
next-payment-confirmation-invoice-date = { $invoiceDate }
36-
3746
next-payment-confirmation-details-heading-2 = Payment information
38-
# $amount (Number) - The amount billed. It will be formatted as currency.
39-
# $interval (String) - The interval between payments.
40-
next-payment-confirmation-amount = { $amount } per { $interval }
41-
# $last4 (Number) - Last four numbers of credit card
42-
next-payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
4347
48+
## Success pages (/checkout and /upgrade)
49+
## Common strings used in multiple checkout pages
4450
next-payment-confirmation-download-button = Continue to download
4551
46-
checkout-error-boundary-retry-button = Try again
47-
checkout-error-boundary-basic-error-message = Something went wrong. Please try again or <contactSupportLink>contact support.</contactSupportLink>
52+
## Success pages (/checkout and /upgrade), Start page (/upgrade)
53+
## Common strings used in multiple checkout pages
54+
# $last4 (Number) - Last four numbers of credit card
55+
next-payment-confirmation-cc-card-ending-in = Card ending in { $last4 }
4856
4957
## Component - Payment Consent Checkbox
5058

@@ -140,7 +148,7 @@ next-new-user-subscribe-product-assurance = We only use your email to create you
140148
plan-price-interval-daily = { $amount } daily
141149
plan-price-interval-weekly = { $amount } weekly
142150
plan-price-interval-monthly = { $amount } monthly
143-
plan-price-interval-6monthly = { $amount } every 6 months
151+
plan-price-interval-halfyearly = { $amount } every 6 months
144152
plan-price-interval-yearly = { $amount } yearly
145153
146154
## Component - SubscriptionTitle
@@ -163,6 +171,14 @@ next-terms = Terms of Service
163171
next-privacy = Privacy Notice
164172
next-terms-download = Download Terms
165173
174+
terms-and-privacy-stripe-label = { -brand-mozilla } uses { -brand-name-stripe } for secure payment processing.
175+
terms-and-privacy-stripe-link = { -brand-name-stripe } privacy policy
176+
177+
terms-and-privacy-paypal-label= { -brand-mozilla } uses { -brand-paypal } for secure payment processing.
178+
terms-and-privacy-paypal-link = { -brand-paypal } privacy policy
179+
180+
terms-and-privacy-stripe-and-paypal-label = { -brand-mozilla } uses { -brand-name-stripe } and { -brand-paypal } for secure payment processing.
181+
166182
## Component - UpdatedPurchaseDetails
167183

168184
upgrade-purchase-details-current-plan-label = Current plan
@@ -177,4 +193,5 @@ upgrade-purchase-details-prorated-upgrade = Prorated Upgrade
177193
upgrade-purchase-details-new-plan-daily = { $productName } (Daily)
178194
upgrade-purchase-details-new-plan-weekly = { $productName } (Weekly)
179195
upgrade-purchase-details-new-plan-monthly = { $productName } (Monthly)
196+
upgrade-purchase-details-new-plan-halfyearly = { $productName } (6-month)
180197
upgrade-purchase-details-new-plan-yearly = { $productName } (Yearly)

locale/en/settings.ftl

+22-3
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ flow-setup-phone-confirm-code-heading = Enter verification code
677677
678678
# $phoneNumber is a partially obfuscated phone number with only the last 4 digits showing (e.g., *** *** 1234)
679679
# span element applies formatting to ensure the number is always displayed left-to-right
680-
flow-setup-phone-confirm-code-instruction = A six-digit code was sent to <span>{ $phoneNumber }</span> by text message. This code expires after 5 minutes.
680+
flow-setup-phone-confirm-code-instruction = A 6-digit code was sent to <span>{ $phoneNumber }</span> by text message. This code expires after 5 minutes.
681681
flow-setup-phone-confirm-code-input-label = Enter 6-digit code
682682
flow-setup-phone-confirm-code-button = Confirm
683683
# button to resend a code by text message to the user's phone
@@ -1141,7 +1141,7 @@ tfa-row-backup-phone-delete-button = Remove
11411141
tfa-row-backup-phone-delete-title-v2 = Remove recovery phone
11421142
tfa-row-backup-phone-delete-restriction-v2 = If you want to remove your recovery phone, add backup authentication codes or disable two-step authentication first to avoid getting locked out of your account.
11431143
# "this" refers to recovery phone
1144-
tfa-row-backup-phone-description = This is the easier recovery method if you canʼt use your authenticator app.
1144+
tfa-row-backup-phone-description-v2 = This is the easiest recovery method if you canʼt use your authenticator app.
11451145
# A SIM swap attack is a type of identity theft where an attacker tricks or bribes a mobile carrier
11461146
# into transferring a victim's phone number to their own SIM card, enabling access to accounts secured
11471147
# with SMS-based two-factor authentication.
@@ -1315,11 +1315,17 @@ auth-error-1003 = Local storage or cookies are still disabled
13151315
auth-error-1008 = Your new password must be different
13161316
auth-error-1010 = Valid password required
13171317
auth-error-1011 = Valid email required
1318+
auth-error-1018 = Your confirmation email was just returned. Mistyped email?
1319+
auth-error-1020 = Mistyped email? firefox.com isn’t a valid email service
13181320
auth-error-1031 = You must enter your age to sign up
13191321
auth-error-1032 = You must enter a valid age to sign up
13201322
auth-error-1054 = Invalid two-step authentication code
13211323
auth-error-1056 = Invalid backup authentication code
13221324
auth-error-1062 = Invalid redirect
1325+
# Shown when a user tries to sign up with an email address with a domain that doesn't receive emails
1326+
auth-error-1064 = Mistyped email? { $domain } isn’t a valid email service
1327+
auth-error-1066 = Email masks can’t be used to create an account.
1328+
auth-error-1067 = Mistyped email?
13231329
13241330
# Displayed when we want to reference a user's previously set up recovery phone
13251331
# number, but they are not completely signed in yet. We'll only show the last 4 digits.
@@ -1378,6 +1384,8 @@ cookies-disabled-learn-more = Learn more
13781384
index-header = Enter your email
13791385
index-sync-header = Continue to your { -product-mozilla-account }
13801386
index-sync-subheader = Sync your passwords, tabs, and bookmarks everywhere you use { -brand-firefox }.
1387+
index-relay-header = Create an email mask
1388+
index-relay-subheader = Please provide the email address where you’d like to forward emails from your masked email.
13811389
# $serviceName - the service (e.g., Pontoon) that the user is signing into with a Mozilla account
13821390
index-subheader-with-servicename = Continue to { $serviceName }
13831391
index-subheader-with-logo = Continue to <span>{ $serviceLogo }</span>
@@ -1386,6 +1394,10 @@ index-cta = Sign up or sign in
13861394
index-account-info = A { -product-mozilla-account } also unlocks access to more privacy-protecting products from { -brand-mozilla }.
13871395
index-email-input =
13881396
.label = Enter your email
1397+
# When users delete their Mozilla account inside account Settings, they are redirected to this page with a success message
1398+
index-account-delete-success = Account deleted successfully
1399+
# Displayed when users try to sign up for an account and their confirmation code email bounces
1400+
index-email-bounced = Your confirmation email was just returned. Mistyped email?
13891401
13901402
## InlineRecoveryKeySetup page component
13911403

@@ -1832,7 +1844,7 @@ signin-recovery-phone-heading = Enter recovery code
18321844
18331845
# Text that explains the user should check their phone for a recovery code
18341846
# $maskedPhoneNumber - The users masked phone number
1835-
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.
1847+
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.
18361848
18371849
signin-recovery-phone-input-label = Enter 6-digit code
18381850
@@ -1851,6 +1863,13 @@ signin-recovery-phone-code-verification-error-heading = There was a problem veri
18511863
# Follows the error message (e.g, "There was a problem sending a code")
18521864
signin-recovery-phone-general-error-description = Please try again later.
18531865
1866+
signin-recovery-phone-invalid-code-error-description = The code is invalid or expired.
1867+
signin-recovery-phone-invalid-code-error-link = Use backup authentication codes instead?
1868+
1869+
# "Limits" refers to potential restrictions on how often a recovery phone number can be used for signing in within a given time period.
1870+
# If limits are reached, users may have to use an alternate two-step authentication method or wait until the restriction period is over.
1871+
signin-recovery-phone-success-message = Signed in successfully. Limits may apply if you use your recovery phone again.
1872+
18541873
## 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.
18551874

18561875
signin-reported-header = Thank you for your vigilance

locale/es/payments-next.ftl

+14-14
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,14 @@ next-new-user-card-title = Escribe la información de tu tarjeta
5858
5959
## Component - PurchaseDetails
6060

61+
next-plan-details-header = Detalles del producto
62+
next-plan-details-list-price = Lista de precios
63+
next-plan-details-tax = Impuestos y tasas
64+
next-plan-details-total-label = Total
6165
next-plan-details-show-button = Mostrar detalles
66+
next-coupon-success = Tu plan se renovará automáticamente al precio de la lista.
67+
# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
68+
next-coupon-success-repeating = Tu plan se renovará automáticamente después de { $couponDurationDate } al precio de lista.
6269
6370
## Select Tax Location
6471

@@ -70,20 +77,6 @@ next-new-user-subscribe-product-updates-mozilla = Me gustaría recibir noticias
7077
next-new-user-subscribe-product-updates-snp = Me gustaría recibir noticias y actualizaciones sobre seguridad y privacidad de { -brand-mozilla }
7178
next-new-user-subscribe-product-assurance = Utilizamos tu dirección únicamente para crear tu cuenta. Jamás la venderemos a terceros.
7279
73-
## Component - Details
74-
75-
next-plan-details-header = Detalles del producto
76-
next-plan-details-list-price = Lista de precios
77-
next-plan-details-tax = Impuestos y tasas
78-
next-plan-details-total-label = Total
79-
80-
## Purchase details - shared by multiple components, including purchase details and payment form
81-
## $amount (Number) - The amount billed. It will be formatted as currency.
82-
83-
next-coupon-success = Tu plan se renovará automáticamente al precio de la lista.
84-
# $couponDurationDate (Date) - The date at which the coupon is no longer valid, and the subscription is billed the list price.
85-
next-coupon-success-repeating = Tu plan se renovará automáticamente después de { $couponDurationDate } al precio de lista.
86-
8780
## Component - PriceInterval
8881

8982

@@ -107,3 +100,10 @@ next-subplat-mozilla-accounts-legal-heading = { -product-mozilla-accounts(capita
107100
next-terms = Términos del servicio
108101
next-privacy = Aviso de privacidad
109102
next-terms-download = Descargar términos
103+
104+
## Component - UpdatedPurchaseDetails
105+
106+
107+
## $productName (String) - Name of the upgraded product (e.g. Mozilla VPN)
108+
## Daily/Weekly/Monthly/Yearly refers to the subscription interval/amount of time between billing occurrences
109+

locale/es/settings.ftl

-2
Original file line numberDiff line numberDiff line change
@@ -981,8 +981,6 @@ signout-sync-session-expired = Lo sentimos, algo ha salido mal. Cierra la sesió
981981
# Only shown for users that have 2FA enabled and verified, but all backup authentication codes have been consumed
982982
# Users that have not enabled or verified 2FA will not see this
983983
tfa-row-backup-codes-not-available = No hay códigos disponibles
984-
# Shown to users who have backup authentication codes - this will allow them to generate new codes to replace the previous ones
985-
tfa-row-backup-codes-get-new-cta = Obtener nuevos códigos
986984
# Shown to users who have no backup authentication codes
987985
# Button to add backup authentication codes when none are configured
988986
tfa-row-backup-codes-add-cta = Añadir

locale/fy/auth.ftl

+13
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,21 @@ session-verify-send-push-body-2 = Klik hjir om te befêstigjen dat jo it binne
77
# Messages should be limited to one segment
88
# $code - 6 digit code used to verify phone ownership when registering a recovery phone
99
recovery-phone-setup-sms-body = { $code } is jo { -brand-mozilla }-ferifikaasjekoade. Ferrint oer 5 minuten.
10+
# Shorter message sent by SMS with limited character length, please test translation with the messaging segment calculator
11+
# https://twiliodeved.github.io/message-segment-calculator/
12+
# Messages should be limited to one segment
13+
# $code - 6 digit code used to verify phone ownership when registering a recovery phone
14+
recovery-phone-setup-sms-short-body = { -brand-mozilla }-ferifikaasjekoade: { $code }
1015
# Message sent by SMS with limited character length, please test translation with the messaging segment calculator
1116
# https://twiliodeved.github.io/message-segment-calculator/
1217
# Messages should be limited to one segment
1318
# $code - 6 digit code used to sign in with a recovery phone as backup for two-step authentication
1419
recovery-phone-signin-sms-body = { $code } is jo { -brand-mozilla }-werstelkoade. Ferrint oer 5 minuten.
20+
# Shorter message sent by SMS with limited character length, please test translation with the messaging segment calculator
21+
# https://twiliodeved.github.io/message-segment-calculator/
22+
# Messages should be limited to one segment
23+
# $code - 6 digit code used to sign in with a recovery phone as backup for two-step authentication
24+
recovery-phone-signin-sms-short-body = { -brand-mozilla }-koade: { $code }
1525
1626
## Email content
1727
## Emails do not contain buttons, only links. Emails have a rich HTML version and a plaintext
@@ -368,6 +378,9 @@ postAddLinkedAccount-action = Account beheare
368378
postAddRecoveryPhone-subject = Wersteltelefoannûmer tafoege
369379
postAddRecoveryPhone-preview = Account beskerme troch twa-stapsautentikaasje
370380
postAddRecoveryPhone-title = Jo hawwe in wersteltelefoannûmer oanmakke
381+
# Variables:
382+
# $maskedLastFourPhoneNumber (String) - A bullet point mask with the last four digits of the user's phone number, e.g. ••••••1234
383+
postAddRecoveryPhone-description-v2 = Jo hawwe { $maskedLastFourPhoneNumber } as jo wersteltelefoannûmer tafoege
371384
# Links out to a support article about two factor authentication
372385
postAddRecoveryPhone-how-protect = Hoe dit jo account beskermet
373386
postAddRecoveryPhone-how-protect-plaintext = Hoe dit jo account beskermet:

0 commit comments

Comments
 (0)