From a9430a3f1d4036cd8f22bcef867cf7712ce8ea09 Mon Sep 17 00:00:00 2001
From: Erica Wright <ewright@mozilla.com>
Date: Wed, 11 Sep 2019 18:14:25 +0000
Subject: [PATCH] Bug 1579705 - Update level labels for Enhanced Tracking
 Protection. r=fluent-reviewers,johannh,flod

Differential Revision: https://phabricator.services.mozilla.com/D45384

--HG--
extra : moz-landing-system : lando
---
 .../preferences/in-content/privacy.inc.xul    |  6 ++--
 .../en-US/browser/preferences/preferences.ftl | 11 +++---
 .../en-US/chrome/browser/browser.properties   |  9 -----
 ...enhanced_tracking_protection_categories.py | 34 +++++++++++++++++++
 4 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 python/l10n/fluent_migrations/bug_1579705_enhanced_tracking_protection_categories.py

diff --git a/browser/components/preferences/in-content/privacy.inc.xul b/browser/components/preferences/in-content/privacy.inc.xul
index 8af48728c979..29966f7f67ef 100644
--- a/browser/components/preferences/in-content/privacy.inc.xul
+++ b/browser/components/preferences/in-content/privacy.inc.xul
@@ -55,7 +55,7 @@
             <hbox>
               <radio id="standardRadio"
                      value="standard"
-                     data-l10n-id="content-blocking-setting-standard"
+                     data-l10n-id="enhanced-tracking-protection-setting-standard"
                      flex="1"/>
               <button id="standardArrow"
                       is="highlightable-button"
@@ -136,7 +136,7 @@
             <hbox>
               <radio id="strictRadio"
                      value="strict"
-                     data-l10n-id="content-blocking-setting-strict"
+                     data-l10n-id="enhanced-tracking-protection-setting-strict"
                      flex="1"/>
               <button id="strictArrow"
                       is="highlightable-button"
@@ -232,7 +232,7 @@
           <hbox>
             <radio id="customRadio"
                    value="custom"
-                   data-l10n-id="content-blocking-setting-custom"
+                   data-l10n-id="enhanced-tracking-protection-setting-custom"
                    flex="1"/>
             <button id="customArrow"
                     is="highlightable-button"
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
index b663214520ee..3b74d40331fd 100644
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -902,17 +902,20 @@ content-blocking-section-top-level-description = Trackers follow you around onli
 
 content-blocking-learn-more = Learn more
 
-# The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
 # "Standard" in this case is an adjective, meaning "default" or "normal".
-content-blocking-setting-standard =
+enhanced-tracking-protection-setting-standard =
   .label = Standard
   .accesskey = d
-content-blocking-setting-strict =
+enhanced-tracking-protection-setting-strict =
   .label = Strict
   .accesskey = r
-content-blocking-setting-custom =
+enhanced-tracking-protection-setting-custom =
   .label = Custom
   .accesskey = C
+##
 
 content-blocking-etp-standard-desc = Balanced for protection and performance. Pages will load normally.
 content-blocking-etp-strict-desc = Stronger protection, but may cause some sites or content to break.
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index 05e956653b76..df61628fa4d3 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -497,15 +497,6 @@ identity.showDetails.tooltip=Show connection details
 protectionReport.title=Privacy Protections
 protectionReport.tooltip=Go to your privacy report
 
-# LOCALIZATION NOTE (contentBlocking.category.*):
-# The terminology used to refer to levels of Content Blocking is also used
-# in preferences and should be translated consistently.
-# LOCALIZATION NOTE (contentBlocking.category.standard):
-# "Standard" in this case is an adjective, meaning "default" or "normal"
-contentBlocking.category.standard=Standard
-contentBlocking.category.strict=Strict
-contentBlocking.category.custom=Custom
-
 # LOCALIZATION NOTE (contentBlocking.trackersView.blocked.label):
 #   This label is shown next to a tracker in the trackers subview.
 #   It forms the end of the (imaginary) sentence "www.example.com [was] Blocked"
diff --git a/python/l10n/fluent_migrations/bug_1579705_enhanced_tracking_protection_categories.py b/python/l10n/fluent_migrations/bug_1579705_enhanced_tracking_protection_categories.py
new file mode 100644
index 000000000000..cb290e260a75
--- /dev/null
+++ b/python/l10n/fluent_migrations/bug_1579705_enhanced_tracking_protection_categories.py
@@ -0,0 +1,34 @@
+# coding=utf8
+
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from __future__ import absolute_import
+import fluent.syntax.ast as FTL
+from fluent.migrate.helpers import transforms_from
+from fluent.migrate import COPY_PATTERN
+
+TARGET_FILE = "browser/browser/preferences/preferences.ftl"
+SOURCE_FILE = TARGET_FILE
+
+
+def migrate(ctx):
+    """Bug 1579705 - Update level labels for Enhanced Tracking Protection, part {index}."""
+
+    ctx.add_transforms(
+        TARGET_FILE,
+        SOURCE_FILE,
+        transforms_from(
+            """
+enhanced-tracking-protection-setting-standard =
+    .label = {COPY_PATTERN(from_path, "content-blocking-setting-standard.label")}
+    .accesskey = {COPY_PATTERN(from_path, "content-blocking-setting-standard.accesskey")}
+enhanced-tracking-protection-setting-strict =
+    .label = {COPY_PATTERN(from_path, "content-blocking-setting-strict.label")}
+    .accesskey = {COPY_PATTERN(from_path, "content-blocking-setting-strict.accesskey")}
+enhanced-tracking-protection-setting-custom =
+    .label = {COPY_PATTERN(from_path, "content-blocking-setting-custom.label")}
+    .accesskey = {COPY_PATTERN(from_path, "content-blocking-setting-custom.accesskey")}
+""",
+            from_path=SOURCE_FILE),
+    )