Backed out changeset 46b19ac773fa (bug 1518293) or browser chrome failures on browser_search_subdialogs_within_preferences_6.
authorCosmin Sabou <csabou@mozilla.com>
Wed, 23 Jan 2019 20:56:39 +0200
changeset 515154 5c5222d1050a7567501f466525273e2f4ba7fc73
parent 515153 5f9e44c1bbd59e0008481de2c199ed5a897927cd
child 515167 23e27b3097c686fa3ae79f2589290387dc91aba8
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1518293
milestone66.0a1
backs out46b19ac773fa06edea4e04f9ee945852c0d9e867
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
Backed out changeset 46b19ac773fa (bug 1518293) or browser chrome failures on browser_search_subdialogs_within_preferences_6.
browser/components/preferences/blocklists.js
browser/components/preferences/blocklists.xul
browser/components/preferences/in-content/privacy.xul
browser/locales/en-US/browser/preferences/blocklists.ftl
--- a/browser/components/preferences/blocklists.js
+++ b/browser/components/preferences/blocklists.js
@@ -132,18 +132,18 @@ var gBlocklistManager = {
 
     this._updateTree();
   },
 
   async _createBlockList(id) {
     let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH);
     let l10nKey = branch.getCharPref(id);
     let [listName, description] = await document.l10n.formatValues([
-      {id: `blocklist-item-${l10nKey}-listName`},
-      {id: `blocklist-item-${l10nKey}-description`},
+      {id: `blocklist-item-${l10nKey}-name`},
+      {id: `blocklist-item-${l10nKey}-desc`},
     ]);
     let name = await document.l10n.formatValue(
       "blocklist-item-list-template", {listName, description});
 
     return {
       id,
       name,
       selected: this._getActiveList() === id,
--- a/browser/components/preferences/blocklists.xul
+++ b/browser/components/preferences/blocklists.xul
@@ -7,17 +7,16 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 
 <window id="BlocklistsDialog"
         windowtype="Browser:Blocklists"
         data-l10n-id="blocklist-window"
         data-l10n-attrs="title, style"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="gBlocklistManager.onLoad();"
         onunload="gBlocklistManager.uninit();"
         persist="screenX screenY width height"
         onkeypress="gBlocklistManager.onWindowKeyPress(event);">
 
   <linkset>
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="browser/preferences/blocklists.ftl"/>
@@ -25,19 +24,17 @@
 
   <script src="chrome://browser/content/preferences/blocklists.js"/>
 
   <keyset>
     <key data-l10n-id="blocklist-close-key" modifiers="accel" oncommand="window.close();"/>
   </keyset>
 
   <vbox class="contentPane">
-    <description id="blocklistsText" data-l10n-id="blocklist-description" control="url">
-      <html:a target="_blank" class="text-link" data-l10n-name="disconnect-link" href="https://disconnect.me/"/>
-    </description>
+    <description id="blocklistsText" data-l10n-id="blocklist-desc" control="url"/>
     <separator class="thin"/>
     <tree id="blocklistsTree" flex="1" style="height: 18em;"
           hidecolumnpicker="true"
           onselect="gBlocklistManager.onListSelected();">
       <treecols>
         <treecol id="selectionCol" label="" flex="1" sortable="false"
                  type="checkbox"/>
         <treecol id="listCol" data-l10n-id="blocklist-treehead-list" flex="80"
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -144,17 +144,17 @@
                         <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-description, blocklist-button-cancel.label, blocklist-button-ok.label"/>
+                       search-l10n-ids="blocklist-window.title, blocklist-desc, blocklist-button-cancel.label, blocklist-button-ok.label"/>
                 <hbox class="reject-trackers-ui custom-option">
                   <checkbox id="contentBlockingBlockCookiesCheckbox"
                             class="content-blocking-checkbox" flex="1"
                             data-l10n-id="content-blocking-cookies-label"
                             aria-describedby="contentBlockingCustomDesc"
                             preference="network.cookie.cookieBehavior"
                             onsyncfrompreference="return gPrivacyPane.readBlockCookies();"
                             onsynctopreference="return gPrivacyPane.writeBlockCookies();"/>
--- a/browser/locales/en-US/browser/preferences/blocklists.ftl
+++ b/browser/locales/en-US/browser/preferences/blocklists.ftl
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 blocklist-window =
     .title = Block Lists
     .style = width: 55em
 
-blocklist-description = Choose the list { -brand-short-name } uses to block online trackers. Lists provided by <a data-l10n-name="disconnect-link" title="Disconnect">Disconnect</a>.
+blocklist-desc = You can choose which list { -brand-short-name } will use to block Web elements that may track your browsing activity.
 blocklist-close-key =
     .key = w
 
 blocklist-treehead-list =
     .label = List
 
 blocklist-button-cancel =
     .label = Cancel
@@ -25,12 +25,12 @@ blocklist-button-ok =
 # It combines the list name and description.
 # e.g. "Standard (Recommended). This list does a pretty good job."
 #
 # Variables:
 #   $listName {string, "Standard (Recommended)."} - List name.
 #   $description {string, "This list does a pretty good job."} - Description of the list.
 blocklist-item-list-template = { $listName } { $description }
 
-blocklist-item-moz-std-listName = Level 1 block list (Recommended).
-blocklist-item-moz-std-description = Allows some trackers so fewer websites break.
-blocklist-item-moz-full-listName = Level 2 block list.
-blocklist-item-moz-full-description = Blocks all detected trackers. Some websites or content may not load properly.
+blocklist-item-moz-std-name = Disconnect.me basic protection (Recommended).
+blocklist-item-moz-std-desc = Allows some trackers so websites function properly.
+blocklist-item-moz-full-name = Disconnect.me strict protection.
+blocklist-item-moz-full-desc = Blocks known trackers. Some websites may not function properly.