Merge strings for train 52994 (#849)

Co-authored-by: Bug Mirror <bugmirror@restmail.net>

locale/en/settings.ftl

@@ -1364,17 +1364,6 @@ account-recovery-confirm-key-button = Confirm account recovery key
 # Link that leads to the password reset page (without recovery code)
 account-recovery-lost-recovery-key-link = Don’t have an account recovery key?
 
-## Account recovery reset password page
-
-# Header for form to create new password
-create-new-password-header = Create new password
-account-restored-success-message = You have successfully restored your account using your account recovery key. Create a new password to secure your data, and store it in a safe location.
-# Feedback displayed in alert bar when password reset is successful
-account-recovery-reset-password-success-alert = Password set
-# An error case was hit that we cannot account for.
-account-recovery-reset-password-unexpected-error = Unexpected error encountered
-account-recovery-reset-password-redirecting = Redirecting
-
 ## CompleteResetPassword component
 ## User followed a password reset link and is now prompted to create a new password
 
@@ -1389,36 +1378,7 @@ complete-reset-password-error-alert = Sorry, there was a problem setting your pa
 complete-reset-password-recovery-key-error-v2 = Sorry, there was a problem checking if you have an account recovery key.
 complete-reset-password-recovery-key-link = Reset your password with your account recovery key.
 
-## Confirm Reset Password Component
+account-restored-success-message = You have successfully restored your account using your account recovery key. Create a new password to secure your data, and store it in a safe location.
-
-# Second step of password reset flow for Firefox accounts
-# Header confirming that a password reset email has been sent to the user's email address
-confirm-pw-reset-header = Reset email sent
-
-# Instructions to continue the password reset process
-# { $email } is the email entered by the user and where the password reset instructions were sent
-confirm-pw-reset-instructions = Click the link emailed to { $email } within the next hour to create a new password.
-
-## ResetPassword page
-
-# Strings within the <span> elements appear as a subheading.
-# If more appropriate in a locale, the string within the <span>, "to continue to account settings" can stand alone as "Continue to account settings"
-reset-password-heading-w-default-service = Reset password <span>to continue to account settings</span>
-# Strings within the <span> elements appear as a subheading.
-# If more appropriate in a locale, the string within the <span>, "to continue to { $serviceName }" can stand alone as "Continue to { $serviceName }"
-# { $serviceName } represents a product name (e.g., Mozilla VPN) that will be passed in as a variable
-reset-password-heading-w-custom-service = Reset password <span>to continue to { $serviceName }</span>
-reset-password-warning-message-2 = <span>Note:</span> When you reset your password, you reset your account. You may lose some of your personal information (including history, bookmarks, and passwords). That’s because we encrypt your data with your password to protect your privacy. You’ll still keep any subscriptions you may have and { -product-pocket } data will not be affected.
-# Users type their email address in this field to start a password reset
-reset-password-password-input =
-  .label = Email
-reset-password-button = Begin reset
-# Error message displayed in a tooltip when a user attempts to submit a password reset form without entering an email address
-reset-password-email-required-error = Email required
-
-reset-password-with-recovery-key-verified-page-title = Password reset successful
-reset-password-with-recovery-key-verified-generate-new-key = Generate a new account recovery key
-reset-password-with-recovery-key-verified-continue-to-account = Continue to my account
 
 ## Confirm Reset Password With Code
 
@@ -1453,6 +1413,10 @@ password-reset-email-input =
 
 password-reset-submit-button = Send me reset instructions
 
+reset-password-with-recovery-key-verified-page-title = Password reset successful
+reset-password-with-recovery-key-verified-generate-new-key = Generate a new account recovery key
+reset-password-with-recovery-key-verified-continue-to-account = Continue to my account
+
 ## CompleteSignin component
 
 # This is a label that precedes any error which could arise from trying to validate the user's signin

locale/fy/LC_MESSAGES/client.po

@@ -1,10 +1,10 @@
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-09 20:08+0000\n"
-"PO-Revision-Date: 2024-07-30 09:56+0000\n"
+"PO-Revision-Date: 2024-09-16 15:00+0000\n"
 "Last-Translator: Fjoerfoks <fryskefirefox@gmail.com>\n"
 "Language-Team: Frisian <LL@li.org>\n"
 "Language: fy\n"
@@ -838,9 +838,7 @@ msgid "Invalid Token"
 msgstr "Unjildich token"
 
 #: .es5/lib/strings.js:26
-msgid ""
+msgid "By proceeding, you agree to the <a id=\"service-tos\" href=\"%(termsUri)s\">Terms of Service</a> and<a id=\"service-pp\" href=\"%(privacyUri)s\">Privacy Notice</a> of %(serviceName)s (%(serviceUri)s)."
-"By proceeding, you agree to the <a id=\"service-tos\" href=\"%(termsUri)s\">Terms of Service</a> and<a id=\"service-pp\" href=\"%(privacyUri)s\">Privacy Notice</a> of %(serviceName)s "
-"(%(serviceUri)s)."
 msgstr ""
 "Troch fierder te gean gean jo akkoard me de <a id=\"service-tos\" href=\"%(termsUri)s\">Servicebetingsten</a> en <a id=\"service-pp\" href=\"%(privacyUri)s\">Privacyferklearring</a> fan de "
 "%(serviceName)s fan %(serviceUri)s."
@@ -909,8 +907,7 @@ msgid "Please enter the one time use account recovery key you stored in a safe p
 msgstr "Fier de ien kear te brûken accountwerstelkaai dy’t jo op in feilich plak bewarre hawwe yn om wer tagong ta jo Mozilla-account te krijen."
 
 #: .es5/templates/account_recovery_confirm_key.mustache:8
-msgid ""
+msgid "<span class=\"note\">NOTE:</span> If you reset your password and don't have account recovery key saved, some of your data will be erased (including synced server data like history and bookmarks)."
-"<span class=\"note\">NOTE:</span> If you reset your password and don't have account recovery key saved, some of your data will be erased (including synced server data like history and bookmarks)."
 msgstr ""
 "<span class=\"note\">NOAT:</span> as jo jo wachtwurd opnij ynstelle en gjin kaai foar accountwerstel bewarre hawwe, wurdt in part fan jo gegevens wiske (wêrûnder syngronisearre servergegevens lykas "
 "skiednis en blêdwizers)."
@@ -1127,43 +1124,36 @@ msgstr "Wachtwurd"
 msgid ""
 "\n"
 "            By proceeding, you agree to the:<br />\n"
-"            Pocket <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Terms of Service</a> and <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/"
+"            Pocket <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Terms of Service</a> and <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/\">Privacy Notice</a><br />\n"
-"\">Privacy Notice</a><br />\n"
 "            Mozilla Accounts <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Terms of Service</a> and <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacy Notice</a>\n"
 "          "
 msgstr ""
 "\n"
 "            As jo trochgean, stimme jo yn mei:<br />\n"
-"            De <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Tsjinstbetingsten</a> en <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/"
+"            De <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Tsjinstbetingsten</a> en <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/\">Privacyferklearring</a> fan Pocket<br />\n"
-"\">Privacyferklearring</a> fan Pocket<br />\n"
+"            De <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla-accounts.\n"
-"            De <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla-"
-"accounts.\n"
 "          "
 
 #: .es5/templates/force_auth.mustache:10 .es5/templates/sign_in_password.mustache:15 .es5/templates/sign_up_password.mustache:17
 msgid ""
 "\n"
 "              By proceeding, you agree to the:<br />\n"
-"              Mozilla Subscription Services <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Terms of Service</a> and <a "
+"              Mozilla Subscription Services <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Terms of Service</a> and <a class=\"link-grey\" id=\"moz-subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacy Notice</a><br />\n"
-"class=\"link-grey\" id=\"moz-subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacy Notice</a><br />\n"
 "              Mozilla Accounts <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Terms of Service</a> and <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacy Notice</a>\n"
 "            "
 msgstr ""
 "\n"
 "              Troch fierder te gean, geane jo akkoard mei de<br />\n"
-"              <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"moz-"
+"              <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"moz-subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacyferklearring</a> fan Mozilla Subscription Services<br />\n"
-"subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacyferklearring</a> fan Mozilla Subscription Services<br />\n"
+"              <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla Accounts\n"
-"              <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla "
-"Accounts\n"
 "            "
 
 #: .es5/templates/force_auth.mustache:12 .es5/templates/index.mustache:16 .es5/templates/sign_in_password.mustache:17 .es5/templates/sign_up_password.mustache:19
 #: .es5/templates/post_verify/third_party_auth/set_password.mustache:10 .es5/templates/post_verify/finish_account_setup/set_password.mustache:10
-msgid ""
+msgid "By proceeding, you agree to the <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Terms of Service</a> and <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacy Notice</a>."
-"By proceeding, you agree to the <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Terms of Service</a> and <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacy Notice</a>."
 msgstr ""
-"Troch fierder te gean, geane jo akkoard mei de <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/"
+"Troch fierder te gean, geane jo akkoard mei de <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" "
-"privacy\">Privacyferklearring</a>."
+"href=\"/legal/privacy\">Privacyferklearring</a>."
 
 #: .es5/templates/force_auth.mustache:13 .es5/templates/sign_in_password.mustache:18 .es5/templates/sign_in_totp_code.mustache:6
 msgid "Use a different account"
@@ -1201,34 +1191,28 @@ msgstr "In Mozilla-account jout ek tagong ta mear privacybeskermjende produkten
 msgid ""
 "\n"
 "          By proceeding, you agree to the:<br />\n"
-"          Pocket <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Terms of Service</a> and <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/"
+"          Pocket <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Terms of Service</a> and <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/\">Privacy Notice</a><br />\n"
-"\">Privacy Notice</a><br />\n"
 "          Mozilla Accounts <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Terms of Service</a> and <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacy Notice</a>\n"
 "        "
 msgstr ""
 "\n"
 "            As jo trochgean, stimme jo yn mei:<br />\n"
-"            De <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Tsjinstbetingsten</a> en <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/"
+"            De <a class=\"link-grey\" id=\"pocket-tos\" href=\"https://getpocket.com/tos/\">Tsjinstbetingsten</a> en <a id=\"pocket-pp\" class=\"link-grey\" href=\"https://getpocket.com/privacy/\">Privacyferklearring</a> fan Pocket<br />\n"
-"\">Privacyferklearring</a> fan Pocket<br />\n"
+"            De <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla-accounts.\n"
-"            De <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla-"
-"accounts.\n"
 "          "
 
 #: .es5/templates/index.mustache:14
 msgid ""
 "\n"
 "            By proceeding, you agree to the:<br />\n"
-"            Mozilla Subscription Services <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Terms of Service</a> and <a "
+"            Mozilla Subscription Services <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Terms of Service</a> and <a class=\"link-grey\" id=\"moz-subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacy Notice</a><br />\n"
-"class=\"link-grey\" id=\"moz-subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacy Notice</a><br />\n"
 "            Mozilla Accounts <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Terms of Service</a> and <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacy Notice</a>\n"
 "          "
 msgstr ""
 "\n"
 "            As jo trochgean, stimme jo yn mei:<br />\n"
-"            De <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"moz-"
+"            De <a class=\"link-grey\" id=\"moz-subscription-tos\" href=\"https://www.mozilla.org/about/legal/terms/subscription-services/\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"moz-subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacyferklearring</a> fan Mozilla Subscription Services<br />\n"
-"subscription-privacy\" href=\"https://www.mozilla.org/privacy/subscription-services/\">Privacyferklearring</a> fan Mozilla Subscription Services<br />\n"
+"            De <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla Accounts\n"
-"            De <a class=\"link-grey\" id=\"fxa-tos\" href=\"/legal/terms\">Tsjinstbetingsten</a> en <a class=\"link-grey\" id=\"fxa-pp\" href=\"/legal/privacy\">Privacyferklearring</a> fan Mozilla "
-"Accounts\n"
 "          "
 
 #: .es5/templates/inline_recovery_setup.mustache:1
@@ -2012,15 +1996,15 @@ msgstr "Goedkarring <small class=\"card-subheader\">fan jo oare apparaat ôf</sm
 
 #: .es5/templates/pair/failure.mustache:1
 msgid "Device pairing failed"
-msgstr ""
+msgstr "Apparaatkeppeling mislearre"
 
 #: .es5/templates/pair/failure.mustache:2
 msgid "The setup couldn’t be completed."
-msgstr ""
+msgstr "De ynstallaasje koe net foltôge wurde."
 
 #: .es5/templates/pair/failure.mustache:3
 msgid "Please sign in with your email."
-msgstr ""
+msgstr "Meld jo oan mei jo e-mailadres."
 
 #: .es5/templates/pair/index.mustache:5
 msgid "Sync your Firefox experience"
@@ -2128,16 +2112,16 @@ msgstr "Hawwe jo de systeemkamera brûkt? Jo moatte fan in Firefox-app út keppe
 
 #: .es5/templates/pair/unsupported.mustache:14
 msgid "Download Firefox now"
-msgstr ""
+msgstr "Firefox no downloade"
 
 #: .es5/templates/pair/unsupported.mustache:16
 msgid "Connecting your mobile device with your Mozilla account"
-msgstr ""
+msgstr "Jo mobile apparaat ferbine mei jo Mozilla-account"
 
 #: .es5/templates/pair/unsupported.mustache:19
 msgid "Oops! Something went wrong."
-msgstr ""
+msgstr "Oeps, der is wat misgien."
 
 #: .es5/templates/pair/unsupported.mustache:20
 msgid "Please close this tab and try again."
-msgstr ""
+msgstr "Slút dit ljepblêd en probearje it nochris."

locale/fy/settings.ftl

@@ -207,13 +207,25 @@ security-shield-aria-label =
 # Used for an image of a single key.
 recovery-key-image-aria-label =
     .aria-label = Yllustraasje om in accountwerstelkaai wer te jaan.
-lock-image-aria-label =
+password-image-aria-label =
-    .aria-label = In yllustraasje fan in slot
+    .aria-label = In yllustraasje om it ynfieren fan in wachtwurd wer te jaan.
 lightbulb-aria-label =
     .aria-label = Yllustraasje om it meitsjen fan in ûnthâldhint wer te jaan.
 email-code-image-aria-label =
     .aria-label = Yllustraasje om in e-mailberjocht mei in koade wer te jaan.
 
+## InlineRecoveryKeySetupCreate component
+## Users see this view when we prompt them to generate an account recovery key
+## after signing in.
+
+inline-recovery-key-setup-signed-in-firefox = Jo binne oanmeld by { -brand-firefox }
+inline-recovery-key-setup-create-header = Befeiligje jo account
+# This is a subheader asking users to create an account recovery key, indicating it will only take a moment to complete.
+inline-recovery-key-setup-create-subheader = Hawwe jo in minút om jo gegevens te beskermjen?
+inline-recovery-key-setup-info = Meitsje in accountwerstelkaai oan, sadat jo jo syngronisearre navigaasjegegevens weromsette kinne as jo jo wachtwurd ea ferjitte.
+inline-recovery-key-setup-start-button = Accountwerstelkaai oanmeitsje
+inline-recovery-key-setup-later-button = Letter
+
 ## Input Password
 
 # Tooltip displayed on a password input visibility toggle. Expresses the toggle action, where clicking on the toggle will hide the password.
@@ -271,6 +283,12 @@ primary-email-confirmation-link-reused = Primêr e-mailadres al befêstige
 # The user followed a sign-in confirmation link, but that link has been used and is no longer valid
 signin-confirmation-link-reused = Oanmelding is al befêstige
 confirmation-link-reused-message = Dy befêstigingskeppeling is al brûkt en kin mar ien kear brûkt wurde.
+
+## Notification Promo Banner component
+
+account-recovery-notification-cta = Oanmeitsje
+account-recovery-notification-header-value = Ferlies jo gegevens net as jo jo wachtwurd ferjitte
+account-recovery-notification-header-description = Meitsje in accountwerstelkaai oan, sadat jo jo syngronisearre navigaasjegegevens weromsette kinne as jo jo wachtwurd ea ferjitte.
 # Users will see this heading when the URL or network request is malformed, e.g. a query parameter is required and is invalid
 error-bad-request = Unjildige oanfraach
 
@@ -306,6 +324,17 @@ sign-in-complete-header = Oanmelding befêstige
 sign-up-complete-header = Account befêstige
 primary-email-verified-header = Primêr e-mailadres befêstige
 
+## Users see this view when they are generating a new account recovery key
+## This screen displays the generated key and allows users to download or copy the key
+
+# This heading is shown above a list of options for storing the account recovery key
+# "key" here refers to "account recovery key"
+flow-recovery-key-download-storage-ideas-heading-v2 = Plakken om jo kaai te bewarjen:
+flow-recovery-key-download-storage-ideas-folder-v2 = Map op befeilige apparaat
+flow-recovery-key-download-storage-ideas-cloud = Fertroude cloudûnthâld
+flow-recovery-key-download-storage-ideas-print-v2 = Ofdrukt fysyk eksimplaar
+flow-recovery-key-download-storage-ideas-pwd-manager = Wachtwurdbehearder
+
 ## Alert Bar
 
 alert-bar-close-message = Berjocht slute
@@ -449,13 +478,6 @@ flow-recovery-key-download-heading-v2 = Accountwerstelkaai oanmakke – Download
 flow-recovery-key-download-info-v2 = Mei dizze kaai kinne jo jo gegevens weromhelje as jo jo wachtwurd ferjitten binne. Download it no en bewarje it op in plak dat jo ûnthâlde kinne – jo kinne letter net werom nei dizze side.
 # This link allows user to proceed to the next step without clicking the download button
 flow-recovery-key-download-next-link-v2 = Trochgean sûnder te downloaden
-# This heading is shown above a list of options for storing the account recovery key
-# "key" here refers to "account recovery key"
-flow-recovery-key-download-storage-ideas-heading-v2 = Plakken om jo kaai te bewarjen:
-flow-recovery-key-download-storage-ideas-folder-v2 = Map op befeilige apparaat
-flow-recovery-key-download-storage-ideas-cloud = Fertroude cloudûnthâld
-flow-recovery-key-download-storage-ideas-print-v2 = Ofdrukt fysyk eksimplaar
-flow-recovery-key-download-storage-ideas-pwd-manager = Wachtwurdbehearder
 
 ## FlowRecoveryKeyHint
 ## This is the fourth and final step in the account recovery key creation flow
@@ -1079,6 +1101,13 @@ index-account-info = In { -product-mozilla-account } ûntskoattelet ek de tagong
 index-email-input =
     .label = Fier jo e-mailadres yn
 
+## InlineRecoveryKeySetup page component
+
+inline-recovery-key-setup-recovery-created = Kaai foar accountwerstel oanmakke
+inline-recovery-key-setup-download-header = Befeiligje jo account
+inline-recovery-key-setup-download-subheader = No downloade en bewarje
+inline-recovery-key-setup-download-info = Bewarje dizze kaai op in plak dy’t jo ûnthâlde kinne – jo kinne dizze side letter net mear iepenje.
+
 ## InlineRecoverySetup page
 ## When users are creating an account, they may get pushed to setup 2FA
 ## in this case, they will encounter this page in the signup process (hence calling it "Inline)
@@ -1415,6 +1444,25 @@ signin-bounced-help = As dit in jildich e-mailadres is, <linkExternal>lit dit da
 signin-bounced-create-new-account = Hawwe jo dat e-mailadres net mear? Meitsje in nije account
 back = Tebek
 
+## SigninPushCode page
+## This page is used to send a push notification to the user's device for two-factor authentication (2FA).
+
+signin-push-code-heading-w-default-service = Ferifiearje dizze oanmelding <span>om troch te gean nei jo accountynstellingen</span>
+signin-push-code-heading-w-custom-service = Ferifiearje dizze oanmelding <span>om troch te gean nei { $serviceName }</span>
+signin-push-code-instruction = Kontrolearje jo oare apparaten en kar dizze oanmelding goed fan jo { -brand-firefox }-browser út.
+signin-push-code-did-not-recieve = Hawwe jo de melding net ûntfongen?
+signin-push-code-send-email-link = Ferstjoer de koade fia e-mail
+
+## SigninPushCodeConfirmPage
+
+signin-push-code-confirm-instruction = Befêstigje jo oanmelding
+signin-push-code-confirm-description = Wy hawwe in oanmeldbesykjen fan it folgjende apparaat ôf detektearre. As jo dit wiene, kar dan de oanmelding goed
+signin-push-code-confirm-verifying = Ferifiearje
+signin-push-code-confirm-login = Oanmelding befêstigje
+signin-push-code-confirm-wasnt-me = Dit wie ik net, wizigje wachtwurd.
+signin-push-code-confirm-login-approved = Jo oanmelding is goedkard. Slút dit finster.
+signin-push-code-confirm-link-error = Keppeling is skansearre. Probearje it nochris.
+
 ## SigninRecoveryCode page
 ## Users are prompted to enter a backup authentication code
 ## (provided to the user when they first set up two-step authentication)

locale/pt/settings.ftl

@@ -207,13 +207,25 @@ security-shield-aria-label =
 # Used for an image of a single key.
 recovery-key-image-aria-label =
     .aria-label = Ilustração para representar uma chave de recuperação da conta.
-lock-image-aria-label =
+password-image-aria-label =
-    .aria-label = Uma ilustração de um cadeado
+    .aria-label = Uma imagem para representar a escrita de uma palavra-passe.
 lightbulb-aria-label =
     .aria-label = Ilustração para representar a criação de uma dica de armazenamento.
 email-code-image-aria-label =
     .aria-label = Imagem para representar um e-mail que contém um código.
 
+## InlineRecoveryKeySetupCreate component
+## Users see this view when we prompt them to generate an account recovery key
+## after signing in.
+
+inline-recovery-key-setup-signed-in-firefox = Está autenticado no { -brand-firefox }
+inline-recovery-key-setup-create-header = Proteger a sua conta
+# This is a subheader asking users to create an account recovery key, indicating it will only take a moment to complete.
+inline-recovery-key-setup-create-subheader = Tem um minuto para proteger os seus dados?
+inline-recovery-key-setup-info = Crie uma chave de recuperação da conta para que possa restaurar os seus dados de navegação sincronizados se algum dia se esquecer da sua palavra-passe.
+inline-recovery-key-setup-start-button = Criar chave de recuperação da conta
+inline-recovery-key-setup-later-button = Fazer mais tarde
+
 ## Input Password
 
 # Tooltip displayed on a password input visibility toggle. Expresses the toggle action, where clicking on the toggle will hide the password.
@@ -271,6 +283,12 @@ primary-email-confirmation-link-reused = O e-mail primário já foi confirmado
 # The user followed a sign-in confirmation link, but that link has been used and is no longer valid
 signin-confirmation-link-reused = O início de sessão já foi confirmado
 confirmation-link-reused-message = A ligação de confirmação já foi utilizada e só pode ser utilizada uma vez.
+
+## Notification Promo Banner component
+
+account-recovery-notification-cta = Criar
+account-recovery-notification-header-value = Não perca os seus dados se se esquecer da sua palavra-passe
+account-recovery-notification-header-description = Crie uma chave de recuperação da conta para restaurar os seus dados de navegação sincronizados caso se esqueça da sua palavra-passe.
 # Users will see this heading when the URL or network request is malformed, e.g. a query parameter is required and is invalid
 error-bad-request = Pedido inválido
 
@@ -306,6 +324,17 @@ sign-in-complete-header = Início de sessão confirmado
 sign-up-complete-header = Conta confirmada
 primary-email-verified-header = E-mail primário confirmado
 
+## Users see this view when they are generating a new account recovery key
+## This screen displays the generated key and allows users to download or copy the key
+
+# This heading is shown above a list of options for storing the account recovery key
+# "key" here refers to "account recovery key"
+flow-recovery-key-download-storage-ideas-heading-v2 = Locais para guardar a sua chave:
+flow-recovery-key-download-storage-ideas-folder-v2 = Pasta num dispositivo seguro
+flow-recovery-key-download-storage-ideas-cloud = Armazenamento de confiança na nuvem
+flow-recovery-key-download-storage-ideas-print-v2 = Cópia física impressa
+flow-recovery-key-download-storage-ideas-pwd-manager = Gestor de palavras-passe
+
 ## Alert Bar
 
 alert-bar-close-message = Fechar mensagem
@@ -443,13 +472,6 @@ flow-recovery-key-download-heading-v2 = Chave de recuperação da conta criada
 flow-recovery-key-download-info-v2 = Esta chave permite-lhe recuperar os seus dados caso se esqueça da sua palavra-passe. Transfira e guarde a mesma agora, num lugar que se lembre – não poderá voltar a esta página mais tarde.
 # This link allows user to proceed to the next step without clicking the download button
 flow-recovery-key-download-next-link-v2 = Continuar sem transferir
-# This heading is shown above a list of options for storing the account recovery key
-# "key" here refers to "account recovery key"
-flow-recovery-key-download-storage-ideas-heading-v2 = Locais para guardar a sua chave:
-flow-recovery-key-download-storage-ideas-folder-v2 = Pasta num dispositivo seguro
-flow-recovery-key-download-storage-ideas-cloud = Armazenamento de confiança na nuvem
-flow-recovery-key-download-storage-ideas-print-v2 = Cópia física impressa
-flow-recovery-key-download-storage-ideas-pwd-manager = Gestor de palavras-passe
 
 ## FlowRecoveryKeyHint
 ## This is the fourth and final step in the account recovery key creation flow
@@ -1066,6 +1088,13 @@ index-account-info = Uma { -product-mozilla-account } também desbloqueia o aces
 index-email-input =
     .label = Introduza o seu email
 
+## InlineRecoveryKeySetup page component
+
+inline-recovery-key-setup-recovery-created = Chave de recuperação da conta criada
+inline-recovery-key-setup-download-header = Proteger a sua conta
+inline-recovery-key-setup-download-subheader = Transferir e guardar agora
+inline-recovery-key-setup-download-info = Guarde esta chave num lugar onde se lembre - não irá conseguir voltar a esta página mais tarde.
+
 ## InlineRecoverySetup page
 ## When users are creating an account, they may get pushed to setup 2FA
 ## in this case, they will encounter this page in the signup process (hence calling it "Inline)

locale/sv/settings.ftl

@@ -207,13 +207,25 @@ security-shield-aria-label =
 # Used for an image of a single key.
 recovery-key-image-aria-label =
     .aria-label = Illustration som representerar en kontoåterställningsnyckel.
-lock-image-aria-label =
+password-image-aria-label =
-    .aria-label = En illustration av ett lås
+    .aria-label = En illustration för att representera att skriva in ett lösenord.
 lightbulb-aria-label =
     .aria-label = Illustration som representerar att skapa ett lagringstips.
 email-code-image-aria-label =
     .aria-label = Illustration för att representera ett e-postmeddelande som innehåller en kod.
 
+## InlineRecoveryKeySetupCreate component
+## Users see this view when we prompt them to generate an account recovery key
+## after signing in.
+
+inline-recovery-key-setup-signed-in-firefox = Du är inloggad på { -brand-firefox }
+inline-recovery-key-setup-create-header = Säkra ditt konto
+# This is a subheader asking users to create an account recovery key, indicating it will only take a moment to complete.
+inline-recovery-key-setup-create-subheader = Har du en minut för att skydda din data?
+inline-recovery-key-setup-info = Skapa en kontoåterställningsnyckel så att du kan återställa din synkroniserade surfdata om du glömmer ditt lösenord.
+inline-recovery-key-setup-start-button = Skapa kontoåterställningsnyckel
+inline-recovery-key-setup-later-button = Gör det senare
+
 ## Input Password
 
 # Tooltip displayed on a password input visibility toggle. Expresses the toggle action, where clicking on the toggle will hide the password.
@@ -271,6 +283,12 @@ primary-email-confirmation-link-reused = Primär e-postadress redan bekräftad
 # The user followed a sign-in confirmation link, but that link has been used and is no longer valid
 signin-confirmation-link-reused = Inloggning redan bekräftad
 confirmation-link-reused-message = Den bekräftelselänken har redan använts och kan bara användas en gång.
+
+## Notification Promo Banner component
+
+account-recovery-notification-cta = Skapa
+account-recovery-notification-header-value = Förlora inte din data om du glömmer ditt lösenord
+account-recovery-notification-header-description = Skapa en kontoåterställningsnyckel för att återställa din synkroniserade webbläsardata om du glömmer ditt lösenord.
 # Users will see this heading when the URL or network request is malformed, e.g. a query parameter is required and is invalid
 error-bad-request = Felaktig begäran
 
@@ -306,6 +324,17 @@ sign-in-complete-header = Inloggning bekräftad
 sign-up-complete-header = Kontot bekräftat
 primary-email-verified-header = Primär e-postadress bekräftad
 
+## Users see this view when they are generating a new account recovery key
+## This screen displays the generated key and allows users to download or copy the key
+
+# This heading is shown above a list of options for storing the account recovery key
+# "key" here refers to "account recovery key"
+flow-recovery-key-download-storage-ideas-heading-v2 = Platser att lagra din nyckel:
+flow-recovery-key-download-storage-ideas-folder-v2 = Mapp på säker enhet
+flow-recovery-key-download-storage-ideas-cloud = Pålitlig molnlagring
+flow-recovery-key-download-storage-ideas-print-v2 = Utskrivet fysiskt exemplar
+flow-recovery-key-download-storage-ideas-pwd-manager = Lösenordshanterare
+
 ## Alert Bar
 
 alert-bar-close-message = Stäng meddelande
@@ -445,13 +474,6 @@ flow-recovery-key-download-heading-v2 = Kontoåterställningsnyckel skapad — L
 flow-recovery-key-download-info-v2 = Denna nyckel låter dig återställa dina data om du glömmer ditt lösenord. Ladda ner den nu och lagra den någonstans du kommer ihåg — du kommer inte att kunna återvända till den här sidan senare.
 # This link allows user to proceed to the next step without clicking the download button
 flow-recovery-key-download-next-link-v2 = Fortsätt utan att ladda ner
-# This heading is shown above a list of options for storing the account recovery key
-# "key" here refers to "account recovery key"
-flow-recovery-key-download-storage-ideas-heading-v2 = Platser att lagra din nyckel:
-flow-recovery-key-download-storage-ideas-folder-v2 = Mapp på säker enhet
-flow-recovery-key-download-storage-ideas-cloud = Pålitlig molnlagring
-flow-recovery-key-download-storage-ideas-print-v2 = Utskrivet fysiskt exemplar
-flow-recovery-key-download-storage-ideas-pwd-manager = Lösenordshanterare
 
 ## FlowRecoveryKeyHint
 ## This is the fourth and final step in the account recovery key creation flow
@@ -1077,6 +1099,13 @@ index-account-info = Ett { -product-mozilla-account } låser också upp åtkomst
 index-email-input =
     .label = Ange din e-postadress
 
+## InlineRecoveryKeySetup page component
+
+inline-recovery-key-setup-recovery-created = Kontoåterställningsnyckel skapad
+inline-recovery-key-setup-download-header = Säkra ditt konto
+inline-recovery-key-setup-download-subheader = Ladda ner och lagra den nu
+inline-recovery-key-setup-download-info = Förvara den här nyckeln någonstans du kommer ihåg — du kommer inte att kunna komma tillbaka till den här sidan senare.
+
 ## InlineRecoverySetup page
 ## When users are creating an account, they may get pushed to setup 2FA
 ## in this case, they will encounter this page in the signup process (hence calling it "Inline)

locale/templates/settings.ftl

@@ -1364,17 +1364,6 @@ account-recovery-confirm-key-button = Confirm account recovery key
 # Link that leads to the password reset page (without recovery code)
 account-recovery-lost-recovery-key-link = Don’t have an account recovery key?
 
-## Account recovery reset password page
-
-# Header for form to create new password
-create-new-password-header = Create new password
-account-restored-success-message = You have successfully restored your account using your account recovery key. Create a new password to secure your data, and store it in a safe location.
-# Feedback displayed in alert bar when password reset is successful
-account-recovery-reset-password-success-alert = Password set
-# An error case was hit that we cannot account for.
-account-recovery-reset-password-unexpected-error = Unexpected error encountered
-account-recovery-reset-password-redirecting = Redirecting
-
 ## CompleteResetPassword component
 ## User followed a password reset link and is now prompted to create a new password
 
@@ -1389,36 +1378,7 @@ complete-reset-password-error-alert = Sorry, there was a problem setting your pa
 complete-reset-password-recovery-key-error-v2 = Sorry, there was a problem checking if you have an account recovery key.
 complete-reset-password-recovery-key-link = Reset your password with your account recovery key.
 
-## Confirm Reset Password Component
+account-restored-success-message = You have successfully restored your account using your account recovery key. Create a new password to secure your data, and store it in a safe location.
-
-# Second step of password reset flow for Firefox accounts
-# Header confirming that a password reset email has been sent to the user's email address
-confirm-pw-reset-header = Reset email sent
-
-# Instructions to continue the password reset process
-# { $email } is the email entered by the user and where the password reset instructions were sent
-confirm-pw-reset-instructions = Click the link emailed to { $email } within the next hour to create a new password.
-
-## ResetPassword page
-
-# Strings within the <span> elements appear as a subheading.
-# If more appropriate in a locale, the string within the <span>, "to continue to account settings" can stand alone as "Continue to account settings"
-reset-password-heading-w-default-service = Reset password <span>to continue to account settings</span>
-# Strings within the <span> elements appear as a subheading.
-# If more appropriate in a locale, the string within the <span>, "to continue to { $serviceName }" can stand alone as "Continue to { $serviceName }"
-# { $serviceName } represents a product name (e.g., Mozilla VPN) that will be passed in as a variable
-reset-password-heading-w-custom-service = Reset password <span>to continue to { $serviceName }</span>
-reset-password-warning-message-2 = <span>Note:</span> When you reset your password, you reset your account. You may lose some of your personal information (including history, bookmarks, and passwords). That’s because we encrypt your data with your password to protect your privacy. You’ll still keep any subscriptions you may have and { -product-pocket } data will not be affected.
-# Users type their email address in this field to start a password reset
-reset-password-password-input =
-  .label = Email
-reset-password-button = Begin reset
-# Error message displayed in a tooltip when a user attempts to submit a password reset form without entering an email address
-reset-password-email-required-error = Email required
-
-reset-password-with-recovery-key-verified-page-title = Password reset successful
-reset-password-with-recovery-key-verified-generate-new-key = Generate a new account recovery key
-reset-password-with-recovery-key-verified-continue-to-account = Continue to my account
 
 ## Confirm Reset Password With Code
 
@@ -1453,6 +1413,10 @@ password-reset-email-input =
 
 password-reset-submit-button = Send me reset instructions
 
+reset-password-with-recovery-key-verified-page-title = Password reset successful
+reset-password-with-recovery-key-verified-generate-new-key = Generate a new account recovery key
+reset-password-with-recovery-key-verified-continue-to-account = Continue to my account
+
 ## CompleteSignin component
 
 # This is a label that precedes any error which could arise from trying to validate the user's signin