Bug 1579705 - Update level labels for Enhanced Tracking Protection. r=fluent-reviewers,johannh a=lizzard l10n=flod DEVEDITION_70_0b7_BUILD1 DEVEDITION_70_0b7_RELEASE FIREFOX_70_0b7_BUILD1 FIREFOX_70_0b7_RELEASE
authorErica Wright <ewright@mozilla.com>
Wed, 11 Sep 2019 18:14:25 +0000
changeset 555073 2771f6fe489942ec0091773e98ff00f0409f876e
parent 555072 2395cdb35d69ed300de56073cb17d39b511a3122
child 555074 11aa39c007a2d8a66c1e942057de70649f46b256
push id2165
push userffxbld-merge
push dateMon, 14 Oct 2019 16:30:58 +0000
treeherdermozilla-release@0eae18af659f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfluent-reviewers, johannh, lizzard
bugs1579705
milestone70.0
Bug 1579705 - Update level labels for Enhanced Tracking Protection. r=fluent-reviewers,johannh a=lizzard l10n=flod Differential Revision: https://phabricator.services.mozilla.com/D45384
browser/components/preferences/in-content/privacy.inc.xul
browser/locales/en-US/browser/preferences/preferences.ftl
browser/locales/en-US/chrome/browser/browser.properties
python/l10n/fluent_migrations/bug_1579705_enhanced_tracking_protection_categories.py
--- a/browser/components/preferences/in-content/privacy.inc.xul
+++ b/browser/components/preferences/in-content/privacy.inc.xul
@@ -50,17 +50,17 @@
     <vbox id="contentBlockingCategories">
         <radiogroup id="contentBlockingCategoryRadio"
                     preference="browser.contentblocking.category"
                     aria-labelledby="trackingProtectionMenuDesc">
           <vbox id="contentBlockingOptionStandard" class="content-blocking-category">
             <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"
                       class="arrowhead default-content-blocking-ui"
                       data-l10n-id="content-blocking-expand-section"
                       aria-expanded="false"/>
             </hbox>
             <vbox class="indent default-content-blocking-ui">
@@ -131,17 +131,17 @@
                 </vbox>
               </vbox>
             </vbox>
           </vbox>
           <vbox id="contentBlockingOptionStrict" class="content-blocking-category">
             <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"
                       class="arrowhead"
                       data-l10n-id="content-blocking-expand-section"
                       aria-expanded="false"/>
             </hbox>
             <vbox class="indent">
@@ -227,17 +227,17 @@
                 </vbox>
               </vbox>
             </vbox>
           </vbox>
         <vbox id="contentBlockingOptionCustom" class="tracking-protection-ui content-blocking-category">
           <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"
                     class="arrowhead"
                     data-l10n-id="content-blocking-expand-section"
                     aria-expanded="false"/>
           </hbox>
           <vbox class="indent">
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -897,27 +897,30 @@ addressbar-suggestions-settings = Change
 ## Privacy Section - Content Blocking
 
 content-blocking-enhanced-tracking-protection = Enhanced Tracking Protection
 
 content-blocking-section-top-level-description = Trackers follow you around online to collect information about your browsing habits and interests. { -brand-short-name } blocks many of these trackers and other malicious scripts.
 
 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.
 content-blocking-etp-custom-desc = Choose which trackers and scripts to block.
 
 content-blocking-private-windows = Tracking content in Private Windows
 content-blocking-cross-site-tracking-cookies = Cross-site tracking cookies
 content-blocking-social-media-trackers = Social media trackers
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -491,25 +491,16 @@ identity.notSecure.tooltip=Connection is
 
 identity.extension.label=Extension (%S)
 identity.extension.tooltip=Loaded by extension: %S
 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"
 contentBlocking.trackersView.blocked.label=Blocked
 
 contentBlocking.trackersView.empty.label=None detected on this site
 
 # LOCALIZATION NOTE (contentBlocking.cookies.blockingTrackers.label, contentBlocking.cookies.blocking3rdParty.label,
new file mode 100644
--- /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),
+    )