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

--HG--
extra : moz-landing-system : lando

browser/components/preferences/in-content/privacy.xul

@@ -132,12 +132,12 @@
                 <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>
@@ -163,10 +163,10 @@
                                 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>

browser/locales/en-US/browser/preferences/preferences.ftl

@@ -770,13 +770,13 @@ sitedata-disallow-cookies-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 =
@@ -842,16 +842,13 @@ 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