Bug 1509936 - Fix l10n ids in content blocking. r=flod
authorErica Wright <ewright@mozilla.com>
Mon, 26 Nov 2018 18:52:43 +0000
changeset 507304 47e8f9bb6fc26d5b42bae3f8459ae5317a22e918
parent 507303 e9e34c0b62ac841810517ebb5c5a3dd4c7dd439a
child 507305 4242055088b10a03bbd9570446cac1d4b33d83b6
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
bugs1509936
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 1509936 - Fix l10n ids in content blocking. r=flod This changes the strings' l10n ids for the strings that changed context but did not previously change their ids. Differential Revision: https://phabricator.services.mozilla.com/D12958
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
@@ -127,22 +127,22 @@
                 <description control="contentBlockingDisableTrackingProtectionExtension" flex="1"/>
                 <button id="contentBlockingDisableTrackingProtectionExtension"
                         class="extension-controlled-button accessory-button"
                         data-l10n-id="disable-extension" hidden="true"/>
               </hbox>
                 <hbox class="custom-option">
                   <checkbox id="contentBlockingTrackingProtectionCheckbox"
                             class="content-blocking-checkbox" flex="1"
-                            data-l10n-id="content-blocking-tracking-protection-trackers-label"
+                            data-l10n-id="content-blocking-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-option-private" value="private"/>
                         <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"
@@ -158,20 +158,20 @@
                   <vbox>
                     <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
                     <hbox>
                       <menulist id="blockCookiesMenu"
                                 preference="network.cookie.cookieBehavior"
                                 onsyncfrompreference="return gPrivacyPane.readBlockCookiesFrom();"
                                 onsynctopreference="return gPrivacyPane.writeBlockCookiesFrom();">
                         <menupopup>
-                          <menuitem data-l10n-id="sitedata-block-trackers-option" value="trackers"/>
-                          <menuitem data-l10n-id="sitedata-block-unvisited-option" value="unvisited"/>
-                          <menuitem data-l10n-id="sitedata-block-all-third-party-option" value="all-third-parties"/>
-                          <menuitem data-l10n-id="sitedata-block-all-option" value="always"/>
+                          <menuitem data-l10n-id="sitedata-option-block-trackers" value="trackers"/>
+                          <menuitem data-l10n-id="sitedata-option-block-unvisited" value="unvisited"/>
+                          <menuitem data-l10n-id="sitedata-option-block-all-third-party" value="all-third-parties"/>
+                          <menuitem data-l10n-id="sitedata-option-block-all" value="always"/>
                         </menupopup>
                       </menulist>
                     </hbox>
                   </vbox>
                 </hbox>
               <vbox class="content-blocking-warning">
                 <vbox class="indent">
                   <hbox>
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -765,23 +765,23 @@ sitedata-disallow-cookies-option =
     .label = Block cookies and site data
     .accesskey = B
 
 # This label means 'type of content that is blocked', and is followed by a drop-down list with content types below.
 # The list items are the strings named sitedata-block-*-option*.
 sitedata-block-desc = Type blocked
     .accesskey = T
 
-sitedata-block-trackers-option =
+sitedata-option-block-trackers =
     .label = Third-party trackers
-sitedata-block-unvisited-option =
+sitedata-option-block-unvisited =
     .label = Cookies from unvisited websites
-sitedata-block-all-third-party-option =
+sitedata-option-block-all-third-party =
     .label = All third-party cookies (may cause websites to break)
-sitedata-block-all-option =
+sitedata-option-block-all =
     .label = All cookies (will cause websites to break)
 
 sitedata-clear =
     .label = Clear Data…
     .accesskey = l
 
 sitedata-settings =
     .label = Manage Data…
@@ -837,26 +837,23 @@ content-blocking-private-trackers = Know
 content-blocking-third-party-cookies = Third-party tracking cookies
 content-blocking-all-windows-trackers = Known trackers in all windows
 content-blocking-all-third-party-cookies = All third-party cookies
 
 content-blocking-warning-title = Heads up!
 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 =
+content-blocking-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-all-windows =
   .label = In all windows
   .accesskey = A
-content-blocking-tracking-protection-option-private =
+content-blocking-option-private =
   .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