Merge branch 'main' into node-skip-unstable

.lintstagedrc.js

@@ -5,8 +5,11 @@ const buildEslintCommand = (filenames) =>
     .map((f) => path.relative(process.cwd(), f))
     .join(" --file ")}`;
 
+/**
+ * @type {import("lint-staged").Configuration}
+ */
 export default {
   "*.{js,cjs,mjs,jsx,ts,tsx}": [buildEslintCommand],
   "*.{scss,css}": "stylelint --allow-empty-input --fix",
-  "*.{ts,tsx,jsx,cjs,mjs,scss,css,md,html}": "prettier --write",
+  "*.{js,ts,tsx,jsx,cjs,mjs,scss,css,md,html}": "prettier --write",
 };

config/nimbus.yaml

@@ -120,8 +120,8 @@ features:
         }
       - channel: staging
         value: {
-          "enabled": false,
-          "variant": default,
+          "enabled": true,
+          "variant": redesign,
         }
       - channel: production
         value: {

locales-pending/emails-all.ftl

@@ -68,13 +68,13 @@ email-breach-alert-plus-scan-results-data-points-label =
         [one] Data exposure
        *[other] Data exposures
     }
-email-breach-alert-plus-scan-results-cta-label = Take action to resolve these exposures
 email-breach-alert-plus-scan-results-trailer = We’ll guide you step-by-step through the process
+email-breach-alert-scan-results-cta-label = Resolve exposures
 
 # Monthly Report Free User
 
 email-monthly-report-hero-free-heading = Your monthly { -brand-mozilla-monitor } report
-email-monthly-report-hero-free-body = A summary of what needs your attention, and what’s been resolved over the past month.
+email-monthly-report-hero-free-subtitle = A summary of what needs attention and what’s been resolved this month.
 
 ## This string is displayed under a large numeral that indicates the total
 ## number of data breaches that have exposed the user’s information.
@@ -91,30 +91,19 @@ email-monthly-report-no-scan-results-data-points-label =
     }
 email-monthly-report-free-summary-auto-removed =
   { $data_point_count ->
-        [one] Auto-removed exposure
-       *[other] Auto-removed exposures
-    }
-email-monthly-report-free-summary-resolved-breaches =
-  { $data_point_count ->
-        [one] Manually resolved data breach
-       *[other] Manually resolved data breaches
-    }
-email-monthly-report-free-summary-manually-resolved-exposures =
-  { $data_point_count ->
-        [one] Manually resolved exposure
-       *[other] Manually resolved exposures
+        [one] Auto-removed exposure*
+       *[other] Auto-removed exposures*
     }
+email-monthly-report-free-broker-scan-available = Free data broker scan available
+email-monthly-report-free-breaches-resolved-manually = Data breaches resolved manually
 
 ##
 
 email-monthly-report-free-results-heading = Current exposures
 email-monthly-report-free-summary-heading = What’s happened in the last month
-email-monthly-report-free-upgrade-cta = Unlock with { -brand-monitor-plus }
-email-monthly-report-free-banner-heading = { -brand-monitor } now protects you even more
-email-monthly-report-free-banner-body = We can find your personal info on data broker sites that sell it for a profit.
-email-monthly-report-free-banner-cta-free-scan = Get first scan free
-email-monthly-report-free-banner-cta-upgrade = Get { -brand-monitor-plus }
+email-monthly-report-free-upgrade-cta = * Unlock with { -brand-monitor-plus }
+email-monthly-report-free-view-details = View details
 email-monthly-report-hero-free-no-breaches-heading = Great news!
-email-monthly-report-hero-free-no-breaches-body = You currently have no data breaches that need action.
-email-monthly-report-hero-free-no-breaches-cta = View your Dashboard
+email-monthly-report-hero-free-no-breaches-body = { -brand-monitor } didn’t find any data exposures to be resolved.
+email-monthly-report-hero-free-no-breaches-cta = View your dashboard
 email-unsubscribe-link = <link_to_unsub>Unsubscribe from this email</link_to_unsub> anytime.

locales/ca/add-email.ftl

@@ -6,4 +6,5 @@
 ### Dialog window that allows a user to add a new email address to be monitored
 
 add-email-add-another-heading = Afegeix una altra adreça electrònica
-
+add-email-address-input-label = Adreça electrònica
+add-email-send-verification-button = Envia un enllaç de verificació

locales/ca/app.ftl

@@ -2,90 +2,67 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+
 # Strings for the main app
 
 
 ## The following messages are brand and should be kept entirely in English
 ## unless otherwise indicated.
 
 -product-name = Mozilla Monitor
--product-name-nowrap = <span class="nowrap">{ -product-name }</span>
 -product-short-name = Monitor
 -brand-name = Firefox
--brand-Mozilla = Mozilla
 -brand-HIBP = Have I Been Pwned
 -brand-fxa = Compte del Firefox
 -brand-pocket = Pocket
 -brand-lockwise = Firefox Lockwise
--brand-send = Firefox Send
--brand-fpn = Firefox Private Network
+-brand-firefox = Firefox
+-brand-monitor = Monitor
+-brand-fx-monitor = Mozilla Monitor
+-brand-mozilla = Mozilla
+-brand-github = GitHub
+-brand-mozilla-vpn = Mozilla VPN
+-brand-relay = Firefox Relay
 
 ##
 
-error-could-not-add-email = No s'ha pogut afegir l'adreça electrònica a la base de dades.
 error-not-subscribed = Aquesta adreça electrònica no està subscrita al { -product-name }.
 error-hibp-throttled = Hi ha massa connexions a { -brand-HIBP }.
 error-hibp-connect = S'ha produït un error en connectar-se a { -brand-HIBP }.
-
 user-add-invalid-email = L'adreça electrònica no és vàlida
 user-add-too-many-emails = Esteu supervisant el nombre màxim d'adreces electròniques.
 user-add-duplicate-email = Aquesta adreça electrònica ja s'ha afegit al { -product-name }.
-
 user-verify-token-error = Cal el testimoni de verificació.
-
-user-unsubscribe-token-error = Cal un testimoni per cancel·lar la subscripció.
-
 # compromised-data = the kind of user data exposed to hackers in data breach.
 compromised-data = Dades afectades:
-
 # Breach data provided by Have I Been Pwned.
+# Variables:
+#   $hibp-link (String) - Link to Have I Been Pwned
 hibp-attribution = Informació de les filtracions proporcionada per { $hibp-link }
-
 show-all = Mostra-ho tot
-
 sign-out = Tanca la sessió
-
 # Manage Firefox Account, link to page where account holders can change their account settings.
 manage-fxa = Gestiona el { -brand-fxa }
-
-# Link title
-frequently-asked-questions = Preguntes més freqüents
-
 # Link title
 preferences = Preferències
-
 # Link title
 home = Inici
-
 # Link title
 security-tips = Consells de seguretat
-
 # Link title
 more-about-this-breach = Més informació sobre aquesta filtració
-
 website-breach = Filtració de lloc web
-
 what-is-data-agg = Què és un agregador de dades?
 what-is-data-agg-blurb = Els agregadors de dades, o intermediaris de dades, recopilen informació de registres públics i la compren a altres empreses. Recopilen aquestes dades per vendre-les a empreses amb finalitats de màrqueting. Les víctimes d'aquestes filtracions són menys propenses a sofrir frau financer, però els pirates informàtics podrien fer servir aquestes dades per suplantar-les o crear perfils seus.
-
-## What to do after data breach tips
-
 # This string is a header on the user preferences page and
 # appears above a check-box list of user options which allow
 # the user to choose whether or not they want to receive breach
-# alerts for all of their monitored email addresses to a single 
+# alerts for all of their monitored email addresses to a single
 # email address.
 breach-summary = Resum de filtracions
 
-## Variables:
-##   $userName (String) - Username
-
 ##
 
-
-## Variables:
-##   $breachName (String) - Number of the breach
-
 # Title that appears in the mobile menu bar and opens the mobile menu when clicked.
 menu = Menú
 
@@ -95,40 +72,15 @@ menu = Menú
 
 ##
 
-## Updated error messages
-
-
-# Monitor V2
-
-
-## The following messages are brands and should be kept entirely in English
-
-
--brand-mozilla-vpn = Mozilla VPN
--brand-relay = Firefox Relay
-
-##
-
-##
-
-## This string contains nested markup that becomes a link later in the code.
-## Please do not modify or remove "<a>" and "</a>".
-
-
-##
-
-
-## These strings contain nested markup that is later used to style the text inside of it.
-## Please do not modify or remove "<span>" and "</span>".
-
+# A status indicator that appears in the top right corner of new breach cards
+new-breach = Nou
 
 ##
 
-## VPN promotional banner.  HTML tags should not be translated, e.g. `<em>`
-
-
-## Relay and VPN educational/ad units
-
+# “account” can be localized, “Mozilla” must be treated as a brand,
+# and kept in English.
+-brand-mozilla-account = Compte de Mozilla
+open-in-new-tab-alt = Obre l’enllaç en una pestanya nova
 
 ## Search Engine Optimization
 
@@ -139,19 +91,33 @@ sign-in = Inicia la sessió
 
 ## Site navigation
 
+mobile-menu-label = Menú principal
+main-nav-label = Navegació
+main-nav-link-home-label = Inici
+main-nav-link-dashboard-label = Tauler de control
+main-nav-link-settings-label = Paràmetres
+main-nav-link-faq-label = PMF
+main-nav-link-faq-tooltip = Preguntes més freqüents
 
 ## User menu
 
+user-menu-trigger-label = Obre el menú d’usuari
+user-menu-trigger-tooltip = Perfil
+user-menu-settings-label = Paràmetres
+user-menu-help-label = Ajuda i assistència
 
 ## Footer
 
+privacy-notice = Avís de privadesa
+
 ## Error page
 
+
 ## Breach overview page
 
+
 ## Public breach detail page
 
-## Floating banner
 
 ## Firefox Monitor -> Mozilla Monitor rebrand banner
 

locales/ml/landing-all.ftl

@@ -0,0 +1,20 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+# Value Proposition
+
+
+# Quote
+
+
+# Non-US FAQ
+
+landing-all-close-faq-alt = അടയ്ക്കുക
+
+# Social proof
+
+
+# Here's How We Help
+