Merge branch 'master' into streamlined-scan-results

smileys2 · Feb 14, 2019 · 0269c90 · 0269c90
2 parents 20afd2f + 2325984
commit 0269c90
Show file tree

Hide file tree

Showing 30 changed files with 181 additions and 20 deletions.
diff --git a/.env-dist b/.env-dist
@@ -18,6 +18,9 @@ DATABASE_URL="postgres://postgres@localhost:5432/blurts"
 # How many seconds can unverified subscribers remain in the database
 DELETE_UNVERIFIED_SUBSCRIBERS_TIMER=86400
 
+# How many seconds until page tokens expire?
+PAGE_TOKEN_TIMER=0
+
 # Email server
 SMTP_URL=""
 # From: address used in emails

diff --git a/app-constants.js b/app-constants.js
@@ -33,6 +33,7 @@ const kEnvironmentVariables = [
   "HIBP_THROTTLE_MAX_TRIES",
   "HIBP_NOTIFY_TOKEN",
   "DATABASE_URL",
+  "PAGE_TOKEN_TIMER",
   "SENTRY_DSN",
   "SERVER_URL",
   "SUPPORTED_LOCALES",

diff --git a/locales/cak/app.ftl b/locales/cak/app.ftl
@@ -9,6 +9,8 @@
 -brand-Quantum = Firefox Quantum
 -brand-Mozilla = Mozilla
 -brand-HIBP = Have I Been Pwned
+-brand-fxa = Firefox Taqoya'l
+-brand-Chrome = Chrome
 layout-Firefox = { -brand-name }
 # Descriptive headline for a column of links where users can give feedback, or get additional information about, Firefox Monitor.
 layout-support = To'ïk
@@ -17,6 +19,7 @@ about-firefox-alerts = Chi rij Retal taq Ruk'ayewal Firefox
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Titaq Na'oj
 terms-and-privacy = Taq Ojqanem chuqa' Ichinanem
+error-could-not-add-email = Man xya' ta qa ri rochochib'al taqoya'l pa kicholxe'el tzij.
 error-not-subscribed = Man rutz'ib'an ta rub'i' re rochochib'al taqoya'l re' { -product-name }.
 error-hibp-throttled = K'ïy taq rokem ri { -brand-HIBP }.
 error-hibp-connect = Xsach toq nok pa { -brand-HIBP }.
@@ -30,6 +33,7 @@ scan-title = { -product-name } : Ruq'i'oj Tz'ajwachib'enïk
 user-add-invalid-email = Man okel ta ri Taqoya'l
 user-add-email-verify-subject = Tanik'oj ri rutz'ib'axik ab'i' pa { -product-name }.
 user-add-title = { -product-name } : Tajikib'a' Taqoya'l
+error-headline = Sachoj
 user-verify-token-error = K'atzinel ri rutoken jikib'anïk.
 user-verify-email-report-subject = Ri { -product-name } atzijol
 user-verify-title = { -product-name } : Xtz'ib'äx Rub'i'

diff --git a/locales/cs/app.ftl b/locales/cs/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = O oznámeních od Firefoxu
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Poskytnout zpětnou vazbu
 terms-and-privacy = Podmínky a ochrana soukromí
+error-scan-page-token = Pokusili jste se zkontrolovat příliš mnoho e-mailových adres ve velmi krátkém čase. Z bezpečnostních důvodů jsme další vyhledávání dočasně zablokovali. Zkuste to prosím znovu později.
 error-could-not-add-email = E-mailovou adresu se nepodařilo přidat do databáze.
 error-not-subscribed = Tato e-mailová adresa není přihlášena k odběru ze služby { -product-name }.
 error-hibp-throttled = Příliš mnoho spojení ke službě { -brand-HIBP }.

diff --git a/locales/cy/app.ftl b/locales/cy/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = Ynghylch Rhybuddion Firefox
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Rhoi Adborth
 terms-and-privacy = Telerau a Phreifatrwydd
+error-scan-page-token = Rydych wedi ceisio sganio gormod o gyfeiriadau e-bost mewn cyfnod byr. Am resymau diogelwch, rydym wedi eich rhwystro dros dro rhag chwiliadau newydd. Fe gewch chi geisio eto yn ddiweddarach.
 error-could-not-add-email = Methu ychwanegu cyfeiriad e-bost i gronfa ddata.
 error-not-subscribed = Nid yw'r cyfeiriad e-bost hwn wedi'i danysgrifio i { -product-name }.
 error-hibp-throttled = Gormod o gysylltiadau i { -brand-HIBP }.

diff --git a/locales/da/app.ftl b/locales/da/app.ftl
@@ -194,6 +194,7 @@ share-facebook-headline = Find ud af, om du er blevet udsat for en datalæk.
 share-facebook-blurb = Er dine online-konti blevet ramt i en datalæk?
 og-site-description = Brug { -product-name } til at finde ud af, om du er blevet ramt af en datalæk. Tilmeld dig for at få advarsler om nye datalæk og få tips til at beskytte dine konti.
 show-all = Vis alle
+fxa-scan-label = Se om du har været omfattet af en datalæk.
 fxa-welcome-headline = Velkommen til { -product-name }.
 # Search Firefox Monitor
 fxa-scan-submit = Søg i { -product-name }

diff --git a/locales/de/app.ftl b/locales/de/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = Über Firefox-Warnmeldungen
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Feedback geben
 terms-and-privacy = Nutzungsbedingungen und Datenschutzerklärung
+error-scan-page-token = Sie haben versucht, zu viele E-Mail-Adressen in kurzer Zeit zu überprüfen. Aus Sicherheitsgründen haben wir Sie vorübergehend für neue Suchanfragen gesperrt. Sie können es später erneut versuchen.
 error-could-not-add-email = E-Mail-Adresse konnte nicht zur Datenbank hinzugefügt werden.
 error-not-subscribed = Diese E-Mail-Adresse hat { -product-name } nicht abonniert.
 error-hibp-throttled = Zu viele Verbindungen mit { -brand-HIBP }.

diff --git a/locales/el/app.ftl b/locales/el/app.ftl
@@ -125,6 +125,7 @@ unsub-button = Κατάργηση εγγραφής
 unsub-survey-headline = Δεν είστε πλέον εγγεγραμμένοι.
 unsub-reason-2 = Λαμβάνω πάρα πολλά emails από το { -product-name-nowrap }
 unsub-reason-3 = Δεν βρίσκω χρήσιμη αυτή την υπηρεσία
+unsub-reason-5 = Χρησιμοποιώ άλλη υπηρεσία για την εποπτεία των λογαριασμών μου
 unsub-reason-6 = Κανένα από τα παραπάνω
 unsub-survey-thankyou = Ευχαριστούμε για τα σχόλιά σας.
 unsub-survey-error = Παρακαλούμε επιλέξτε ένα.

diff --git a/locales/en-CA/app.ftl b/locales/en-CA/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = About Firefox Alerts
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Give Feedback
 terms-and-privacy = Terms and Privacy
+error-scan-page-token = You tried to scan too many email addresses in a short time period. For security reasons, we’ve temporarily blocked you from new searches. You’ll be able to try again later.
 error-could-not-add-email = Could not add email address to database.
 error-not-subscribed = This email address is not subscribed to { -product-name }.
 error-hibp-throttled = Too many connections to { -brand-HIBP }.
@@ -281,6 +282,15 @@ user-generic-fb-not-compromised-blurb =
         [one] This email was not in the { $breachName } breach, but was found in another.
        *[other] This email was not in the { $breachName } breach, but was found in others.
     }
+guest-fb-not-compromised-blurb =
+    { $breachCount ->
+        [one]
+            This email was not in the { $breachName } breach, but was found in another. 
+            Sign up for a { -brand-fxa } to get your full report and alerts about new breaches.
+       *[other]
+            This email was not in the { $breachName } breach, but was found in others. 
+            Sign up for a { -brand-fxa } to get your full report and alerts about new breaches.
+    }
 # While English doesn’t use the actual number of breaches in this sentence,
 # you can use {$breachCount} to display the number of breaches in your localization.
 user-found-breaches-blurb =
@@ -295,6 +305,17 @@ user-generic-found-breaches-blurb =
         [one] This breach exposed the following personal info.
        *[other] These breaches exposed the following personal info.
     }
+# While English doesn’t use the actual number of breaches in this sentence,
+# you can use {$breachCount} to display the number of breaches in your localization.
+guest-found-breaches-blurb =
+    { $breachCount ->
+        [one]
+            This breach exposed the following personal info. Sign up for a 
+            { -brand-fxa } to get your full report and alerts about new breaches.
+       *[other]
+            These breaches exposed the following personal info. Sign up for a { -brand-fxa } 
+            to get your full report and alerts about new breaches.
+    }
 have-an-account = Already have an account?
 signup-banner-sensitive-blurb =
     Find out what hackers already know about you, and learn how to 

diff --git a/locales/en/app.ftl b/locales/en/app.ftl
@@ -21,6 +21,7 @@ about-firefox-alerts = About Firefox Alerts
 give-feedback = Give Feedback
 terms-and-privacy = Terms and Privacy
 
+error-scan-page-token = You tried to scan too many email addresses in a short time period. For security reasons, we’ve temporarily blocked you from new searches. You’ll be able to try again later.
 error-could-not-add-email = Could not add email address to database.
 error-not-subscribed = This email address is not subscribed to {-product-name}.
 error-hibp-throttled = Too many connections to {-brand-HIBP}.

diff --git a/locales/es-AR/app.ftl b/locales/es-AR/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = Acerca de las alertas de Firefox
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Dar opinión
 terms-and-privacy = Términos y privacidad
+error-scan-page-token = Intentaste escanear demasiadas direcciones de correo electrónico en un corto período de tiempo. Por razones de seguridad, bloqueamos tus búsquedas temporariamente. Podés probar de nuevo dentro de un rato.
 error-could-not-add-email = No se pudo agregar la dirección de correo electrónico a la base de datos.
 error-not-subscribed = Esta dirección de correo electrónico no está suscrita a { -product-name }.
 error-hibp-throttled = Demasiadas conexiones a { -brand-HIBP }.

diff --git a/locales/hu/app.ftl b/locales/hu/app.ftl
@@ -186,11 +186,6 @@ download-firefox-mobile = Mobil { -brand-name } letöltése
 features = Funkciók
 # beta-nightly-developer-edition refers to additional versions of Firefox Browser
 beta-nightly-developer-edition = Beta, Nightly, Developer Edition
-# The following string contains HTML markup which should not be translated. 
-# Without HTML markup: copyright-info = Portions of this content are 1998-2018 by individual mozilla.org contributors. Content available under a Creative Commons license.
-copyright-info =
-    A tartalom egyes részeire egyéni mozilla.org közreműködők szerzői jogai vonatkoznak: &#x24B8; 1998-2018.<br />
-    A tartalom <a href="https://www.mozilla.org/foundation/licensing/website-content/" target="_blank" rel="noopener">Creative Commons licenc</a> alatt érhető el.
 # Breach data provided by Have I Been Pwned.
 hibp-attribution = Az adatszegési adatokat a { $hibp-link } biztosítja
 site-description = A fiókjai kiszivárogtak vagy ellopták őket egy adatszegés során? Tudjon meg többet a { -product-name } segítségével. Keressen az adatbázisunkban, és iratkozzon fel a figyelmeztetésekre.
@@ -208,9 +203,11 @@ mozilla-security-blog = { -brand-Mozilla } biztonsági blog
 layout-social = Közösségi média
 show-all = Összes megjelenítése
 fxa-signup-banner-headline = Kísérje figyelemmel az online fiókjait érintő fenyegetéseket.
+fxa-welcome-headline = Üdvözli a { -product-name }.
 fxa-scan-another-email = Szeretne ellenőrizni egy másik e-mail címet is?
 # Search Firefox Monitor
 fxa-scan-submit = { -product-name } keresés
+sign-up-to-check = Regisztráció az ellenőrzéshez
 sign-in = Bejelentkezés
 sign-out = Kijelentkezés
 full-report-headline = A { -product-name } jelentése

diff --git a/locales/ia/app.ftl b/locales/ia/app.ftl
@@ -273,5 +273,36 @@ user-generic-fb-not-compromised-blurb =
         [one] Iste adresse email non esseva in le violation { $breachName }, ma esseva trovate in un altero
        *[other] Iste adresse email non esseva in le violation { $breachName }, ma esseva trovate in alteros
     }
+guest-fb-not-compromised-blurb =
+    { $breachCount ->
+        [one]
+            Iste adresse email non esseva in le viuolation { $breachName }, ma esseva trovate in un altero.
+            Inscribe te pro un { -brand-fxa } pro obtener le reporto complete e avisos re nove violationes
+       *[other]
+            Iste adresse email non esseva in le viuolation { $breachName }, ma esseva trovate in alteros.
+            Inscribe te pro un { -brand-fxa } pro obtener le reporto complete e avisos re nove violationes
+    }
+# While English doesn’t use the actual number of breaches in this sentence,
+# you can use {$breachCount} to display the number of breaches in your localization.
+user-found-breaches-blurb =
+    { $breachCount ->
+        [one] Iste violation de datos ha exponite le sequente informationes personal. Si tu non lo ha jam facite, cambia tu contrasigno
+       *[other] Iste violationes de datos ha exponite le sequente informationes personal. Si tu non lo ha jam facite, cambia tu contrasigno.
+    }
+# While English doesn’t use the actual number of breaches in this sentence,
+# you can use {$breachCount} to display the number of breaches in your localization.
+user-generic-found-breaches-blurb =
+    { $breachCount ->
+        [one] Iste violation de datos ha exponite le sequente informationes personal.
+       *[other] Iste violationes de datos ha exponite le sequente informationes personal.
+    }
+# While English doesn’t use the actual number of breaches in this sentence,
+# you can use {$breachCount} to display the number of breaches in your localization.
+guest-found-breaches-blurb =
+    { $breachCount ->
+        [one] Iste violation de datos ha exponite le sequente informationes personal. Inscribe te pro un { -brand-fxa } pro procurar te tu reporto complete e avisos re nove violationes.
+       *[other] Iste violationes de datos ha exponite le sequente informationes personal. Inscribe te pro un { -brand-fxa } pro procurar te tu reporto complete e avisos re nove violationes.
+    }
 have-an-account = Ha tu ja un conto?
+fb-landing-headline = Ha essite tu info exponite in le violation de datos { $breachName }?
 content-available = Contento disponibile sub licentia Creative Commons.
diff --git a/locales/it/app.ftl b/locales/it/app.ftl
@@ -251,6 +251,19 @@ user-generic-fb-compromised-blurb =
     }
 user-fb-compromised-single = Questa violazione di dati ha coinvolto le seguenti informazioni personali. Se non l’hai fatto, cambia le password.
 user-generic-fb-compromised-single = Questa violazione di dati ha coinvolto le seguenti informazioni personali.
+user-fb-not-compromised-blurb =
+    { $breachCount ->
+        [one] Non sei stato coinvolto nella violazione di { $breachName } ma abbiamo trovato quell'indirizzo email in un’altra violazione.
+       *[other] Non sei stato coinvolto nella violazione di { $breachName } ma abbiamo trovato quell'indirizzo email in altre violazioni.
+    }
+user-generic-fb-not-compromised-blurb =
+    { $breachCount ->
+        [one] Questa email non era nella violazione di { $breachName } ma è stata coinvolta in un’altra violazione.
+       *[other] Questa email non era nella violazione di { $breachName } ma è stata coinvolta in altre violazioni.
+    }
 have-an-account = Hai già un account?
+fxa-what-to-do-subhead-4 = Usa strumenti che ti aiutino a ricordare tutte le tue password e tenerle al sicuro.
+fxa-what-to-do-blurb-4 = I gestori di password come 1Password, LastPass, Dashlane e Bitwarden memorizzano le tue password in modo sicuro e le inseriscono nei siti web per te. Usa un gestore di password sia sul telefono che sul computer per evitare di dovertele ricordare tutte a memoria.
 fb-landing-headline = I tuoi dati sono stati esposti nella violazione di { $breachName }?
+copyright = Parti di questo contenuto sono protette da © 1999-{ $year } dei singoli collaboratori di mozilla.org.
 content-available = Contenuto disponibile sotto licenza Creative Commons.
diff --git a/locales/pt-PT/app.ftl b/locales/pt-PT/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = Acerca dos alertas do Firefox
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Dar feedback
 terms-and-privacy = Termos e privacidade
+error-scan-page-token = Tentou verificar muitos endereços de email num curto período de tempo. Por motivos de segurança, bloqueámos-lhe de novas pesquisas. Irá poder tentar novamente mais tarde.
 error-could-not-add-email = Não foi possível adicionar o endereço de email para a base de dados.
 error-not-subscribed = Este endereço de email não está subscrito no { -product-name }.
 error-hibp-throttled = Demasiadas ligações para { -brand-HIBP }.

diff --git a/locales/sl/app.ftl b/locales/sl/app.ftl
@@ -199,6 +199,7 @@ fxa-welcome-headline = Dobrodošli v { -product-name }.
 sign-in = Prijava
 sign-out = Odjava
 full-report-headline = Vaše poročilo { -product-name }
+see-full-report = Prikaži celotno poročilo
 # Manage Firefox Account, link to page where account holders can change their account settings.
 manage-fxa = Upravljaj { -brand-fxa }
 fxa-download-firefox-bar-link = Prenesi zdaj
@@ -221,4 +222,8 @@ guest-scan-results-headline =
         [few] Ta e-poštni naslov se je pojavil v { $breachCount } krajah podatkov.
        *[other] Ta e-poštni naslov se je pojavil v { $breachCount } krajah podatkov.
     }
+user-no-breaches-blurb = Opozorili vas bomo, v kolikor se bo ta e-poštni naslov pojavil v novi kraji podatkov.
+user-one-breach-blurb = Ta kraja podatkov je razkrila naslednje osebne podatke.
 have-an-account = Že imate račun?
+fb-landing-headline = Ali so bili vaši podatki izpostavljeni v kraji podatkov { $breachName }?
+content-available = Vsebina je na voljo pod licenco Creative Commons.
diff --git a/locales/sv-SE/app.ftl b/locales/sv-SE/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = Om Firefox-varningar
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Ge återkoppling
 terms-and-privacy = Villkor och sekretess
+error-scan-page-token = Du försökte skanna för många e-postadresser inom en kort tidsperiod. Av säkerhetsskäl har vi tillfälligt blockerat dig från nya sökningar. Du kommer att kunna försöka igen senare.
 error-could-not-add-email = Kunde inte lägga till e-postadress i databasen.
 error-not-subscribed = Den här e-postadressen prenumererar inte på { -product-name }.
 error-hibp-throttled = För många anslutningar till { -brand-HIBP }.

diff --git a/locales/vi/app.ftl b/locales/vi/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = Về cảnh báo Firefox
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = Gửi phản hồi
 terms-and-privacy = Điều khoản và chính sách riêng tư
+error-scan-page-token = Bạn đang cố quét quá nhiều địa chỉ email trong một khoảng thời gian ngắn. Vì lý do bảo mật, chúng tôi đã tạm thời chặn bạn khỏi các tìm kiếm mới. Bạn có thể thử lại sau.
 error-could-not-add-email = Không thể thêm địa chỉ email vào cơ sở dữ liệu.
 error-not-subscribed = Địa chỉ email này không được đăng ký với { -product-name }.
 error-hibp-throttled = Quá nhiều kết nối đến { -brand-HIBP }.

diff --git a/locales/zh-CN/app.ftl b/locales/zh-CN/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = 关于 Firefox 警报
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = 提供反馈
 terms-and-privacy = 使用条款和隐私
+error-scan-page-token = 您试图在短时间内扫描过多的电子邮件地址。出于安全原因，我们暂时阻止您进行新的搜索。请您稍后再试。
 error-could-not-add-email = 无法将电子邮件地址添加到数据库。
 error-not-subscribed = 此电子邮件地址未订阅 { -product-name }。
 error-hibp-throttled = 与 { -brand-HIBP } 的连接过多。

diff --git a/locales/zh-TW/app.ftl b/locales/zh-TW/app.ftl
@@ -19,6 +19,7 @@ about-firefox-alerts = 關於 Firefox 警報
 # Link that takes the user to a Firefox Monitor survey. 
 give-feedback = 提供意見回饋
 terms-and-privacy = 使用條款及隱私權
+error-scan-page-token = 您在短時間內嘗試搜尋太多電子郵件地址，由於安全因素，我們暫時無法讓您進行新搜尋。請稍候再試一次。
 error-could-not-add-email = 無法將電子郵件地址新增到資料庫。
 error-not-subscribed = 此電子郵件地址未訂閱 { -product-name }。
 error-hibp-throttled = 與 { -brand-HIBP } 的連線太多。