Bug 1508712 - New strings for the trackers dropdown menulist. r=flod
authorErica Wright <ewright@mozilla.com>
Thu, 22 Nov 2018 17:57:56 +0000
changeset 506941 333df4b787d2bb1ca15b1985a2dc008ddd07fb37
parent 506940 edc1ed1cf16731fe81ce50efaa8edc17a386fb42
child 506942 522388759018a97cce929697edef86f5f72a7caf
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflod
bugs1508712
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508712 - New strings for the trackers dropdown menulist. r=flod Differential Revision: https://phabricator.services.mozilla.com/D12674
browser/components/preferences/in-content/privacy.xul
browser/locales/en-US/browser/preferences/preferences.ftl
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -133,17 +133,17 @@
                   <checkbox id="contentBlockingTrackingProtectionCheckbox"
                             class="content-blocking-checkbox" flex="1"
                             data-l10n-id="content-blocking-tracking-protection-trackers-label"
                             aria-describedby="contentBlockingCustomDesc"/>
                   <vbox>
                     <menulist id="trackingProtectionMenu">
                       <menupopup>
                         <menuitem data-l10n-id="content-blocking-tracking-protection-option-private" value="private"/>
-                        <menuitem data-l10n-id="content-blocking-tracking-protection-option-always" value="always"/>
+                        <menuitem data-l10n-id="content-blocking-tracking-protection-option-all-windows" value="always"/>
                       </menupopup>
                     </menulist>
                   </vbox>
                 </hbox>
                 <label id="changeBlockListLink"
                        data-l10n-id="content-blocking-tracking-protection-change-block-list"
                        class="text-link"
                        search-l10n-ids="blocklist-window.title, blocklist-desc, blocklist-button-cancel.label, blocklist-button-ok.label"/>
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -841,21 +841,21 @@ content-blocking-warning-desc = Blocking cookies and trackers can cause some websites to break. It’s easy to disable blocking for sites you trust.
 content-blocking-learn-how = Learn how
 
 content-blocking-tracking-protection-trackers-label =
   .label = Trackers
   .accesskey = T
 content-blocking-tracking-protection-all-detected-trackers-label =
   .label = All Detected Trackers
   .accesskey = T
-content-blocking-tracking-protection-option-always =
-  .label = Always
+content-blocking-tracking-protection-option-all-windows =
+  .label = In all windows
   .accesskey = A
 content-blocking-tracking-protection-option-private =
-  .label = Only in private windows
+  .label = Only in Private Windows
   .accesskey = p
 content-blocking-tracking-protection-change-block-list = Change block list
 
 content-blocking-cookies-label =
   .label = Cookies
   .accesskey = C
 
 ## Privacy Section - Tracking