Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge strings for train 53269 #877

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions locale/en/settings.ftl
Original file line number Diff line number Diff line change
@@ -1184,6 +1184,7 @@ auth-error-139 = Secondary email must be different than your account email
auth-error-155 = TOTP token not found
auth-error-159 = Invalid account recovery key
auth-error-183-2 = Invalid or expired confirmation code
auth-error-206 = Can not create password, password already set
auth-error-999 = Unexpected error
auth-error-1001 = Login attempt cancelled
auth-error-1002 = Session expired. Sign in to continue.
@@ -1508,6 +1509,10 @@ complete-reset-pw-recovery-key-link = Use account recovery key
# Displayed on the sign in page
reset-password-complete-banner-heading = Your password has been reset.
reset-password-complete-banner-message = Don’t forget to generate a new account recovery key from your { -product-mozilla-account } settings to prevent future sign-in issues.
# 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.
complete-reset-password-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## Confirm Reset Password With Code

@@ -1598,6 +1603,10 @@ signin-header = Sign in
signin-use-a-different-account-link = Use a different account
signin-forgot-password-link = Forgot password?
signin-password-button-label = Password
# 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-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## ReportSignin Page
## When users receive an "Is this you signing in?" email with an unblock code,
@@ -1656,6 +1665,10 @@ signin-recovery-code-back-link = Back
signin-recovery-code-support-link = Are you locked out?
# Error displayed in a tooltip when form is submitted witout a code
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 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.

@@ -1681,6 +1694,10 @@ signin-token-code-resend-code-link = Email new code.
# Error displayed in a tooltip when the form is submitted without a code
signin-token-code-required-error = Confirmation code required
signin-token-code-resend-error = Something went wrong. A new code could not be sent.
# 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-token-code-instruction-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## SigninTOTPCode page
## TOTP (time-based one-time password) is a form of two-factor authentication (2FA).
@@ -1696,6 +1713,10 @@ signin-totp-code-other-account-link = Use a different account
signin-totp-code-recovery-code-link = Trouble entering code?
# Error displayed in a tooltip when the form is submitted without a code
signin-totp-code-required-error = 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-totp-code-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## Signin Unblock Page
## Page shown when signin has been blocked by rate limiting (too many requests)
@@ -1711,6 +1732,10 @@ signin-unblock-code-incorrect-length = Authorization code must contain 8 charact
signin-unblock-code-incorrect-format-2 = Authorization code can only contain letters and/or numbers
signin-unblock-resend-code-button = Not in inbox or spam folder? Resend
signin-unblock-support-link = Why is this happening?
# 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-unblock-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## ConfirmSignupCode page
## Users see this page after they have initiated account sign up,
@@ -1734,6 +1759,10 @@ confirm-signup-code-resend-code-link = Email new code.
confirm-signup-code-success-alert = Account confirmed successfully
# Error displayed in tooltip.
confirm-signup-code-is-required-error = Confirmation code is 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.
confirm-signup-code-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## Account Signup page
## This is the second page of the sign up flow, users have already entered their email
2 changes: 1 addition & 1 deletion locale/pt/payments.ftl
Original file line number Diff line number Diff line change
@@ -361,7 +361,7 @@ coupon-expired = Parece que este código promocional expirou.
card-error = Não foi possível processar sua transação. Verifique as informações do seu cartão de crédito e tente novamente.
country-currency-mismatch = A moeda desta subscrição não é válida para o país associado ao seu pagamento.
currency-currency-mismatch = Pedimos desculpa. Não pode alternar entre moedas.
location-unsupported = De acordo com os nossos Termos de serviço, a sua localização atual não é suportada.
location-unsupported = De acordo com os nossos Termos de Serviço, a sua localização atual não é suportada.
no-subscription-change = Lamentamos mas não pode alterar o seu plano de subscrição.
# $mobileAppStore (String) - "Google Play Store" or "App Store", localized when the translation is available.
iap-already-subscribed = Já está subscrito através da { $mobileAppStore }.
4 changes: 2 additions & 2 deletions locale/pt/settings.ftl
Original file line number Diff line number Diff line change
@@ -1049,7 +1049,7 @@ se-secondary-email-none = Nenhum

tfa-row-header = Autenticação de dois fatores
tfa-row-enabled = Ativado
tfa-row-disabled-status = Desativado
tfa-row-disabled-status = Desativada
tfa-row-action-add = Adicionar
tfa-row-action-disable = Desativar
tfa-row-button-refresh =
@@ -1451,7 +1451,7 @@ confirm-totp-reset-password-confirm-button = Confirmar
confirm-totp-reset-password-input-label-v2 = Inserir código de 6 dígitos
confirm-totp-reset-password-use-different-account = Utilizar uma conta diferente
confirm-recovery-code-reset-password-input-label = Inserir código de 10 caracteres
confirm-recovery-code-reset-password-trouble-code = Retroceder
confirm-recovery-code-reset-password-trouble-code = Voltar

## ResetPassword start page

29 changes: 29 additions & 0 deletions locale/templates/settings.ftl
Original file line number Diff line number Diff line change
@@ -1184,6 +1184,7 @@ auth-error-139 = Secondary email must be different than your account email
auth-error-155 = TOTP token not found
auth-error-159 = Invalid account recovery key
auth-error-183-2 = Invalid or expired confirmation code
auth-error-206 = Can not create password, password already set
auth-error-999 = Unexpected error
auth-error-1001 = Login attempt cancelled
auth-error-1002 = Session expired. Sign in to continue.
@@ -1508,6 +1509,10 @@ complete-reset-pw-recovery-key-link = Use account recovery key
# Displayed on the sign in page
reset-password-complete-banner-heading = Your password has been reset.
reset-password-complete-banner-message = Don’t forget to generate a new account recovery key from your { -product-mozilla-account } settings to prevent future sign-in issues.
# 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.
complete-reset-password-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## Confirm Reset Password With Code

@@ -1598,6 +1603,10 @@ signin-header = Sign in
signin-use-a-different-account-link = Use a different account
signin-forgot-password-link = Forgot password?
signin-password-button-label = Password
# 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-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## ReportSignin Page
## When users receive an "Is this you signing in?" email with an unblock code,
@@ -1656,6 +1665,10 @@ signin-recovery-code-back-link = Back
signin-recovery-code-support-link = Are you locked out?
# Error displayed in a tooltip when form is submitted witout a code
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 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.

@@ -1681,6 +1694,10 @@ signin-token-code-resend-code-link = Email new code.
# Error displayed in a tooltip when the form is submitted without a code
signin-token-code-required-error = Confirmation code required
signin-token-code-resend-error = Something went wrong. A new code could not be sent.
# 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-token-code-instruction-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## SigninTOTPCode page
## TOTP (time-based one-time password) is a form of two-factor authentication (2FA).
@@ -1696,6 +1713,10 @@ signin-totp-code-other-account-link = Use a different account
signin-totp-code-recovery-code-link = Trouble entering code?
# Error displayed in a tooltip when the form is submitted without a code
signin-totp-code-required-error = 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-totp-code-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## Signin Unblock Page
## Page shown when signin has been blocked by rate limiting (too many requests)
@@ -1711,6 +1732,10 @@ signin-unblock-code-incorrect-length = Authorization code must contain 8 charact
signin-unblock-code-incorrect-format-2 = Authorization code can only contain letters and/or numbers
signin-unblock-resend-code-button = Not in inbox or spam folder? Resend
signin-unblock-support-link = Why is this happening?
# 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-unblock-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## ConfirmSignupCode page
## Users see this page after they have initiated account sign up,
@@ -1734,6 +1759,10 @@ confirm-signup-code-resend-code-link = Email new code.
confirm-signup-code-success-alert = Account confirmed successfully
# Error displayed in tooltip.
confirm-signup-code-is-required-error = Confirmation code is 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.
confirm-signup-code-desktop-relay = { -brand-firefox } will try sending you back to use an email mask after you sign in.

## Account Signup page
## This is the second page of the sign up flow, users have already entered their email