Bug 1518293 - Update copy for blocklist settings in about:preferences. r=ewright,flod

Differential Revision: https://phabricator.services.mozilla.com/D17291

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

browser/components/preferences/blocklists.js

@@ -137,8 +137,8 @@ var gBlocklistManager = {
     let branch = Services.prefs.getBranch(LISTS_PREF_BRANCH);
     let l10nKey = branch.getCharPref(id);
     let [listName, description] = await document.l10n.formatValues([
-      {id: `blocklist-item-${l10nKey}-name`},
-      {id: `blocklist-item-${l10nKey}-desc`},
+      {id: `blocklist-item-${l10nKey}-listName`},
+      {id: `blocklist-item-${l10nKey}-description`},
     ]);
     let name = await document.l10n.formatValue(
       "blocklist-item-list-template", {listName, description});

browser/components/preferences/blocklists.xul

@@ -12,6 +12,7 @@
         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"
@@ -29,7 +30,9 @@
   </keyset>
 
   <vbox class="contentPane">
-    <description id="blocklistsText" data-l10n-id="blocklist-desc" control="url"/>
+    <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>
     <separator class="thin"/>
     <tree id="blocklistsTree" flex="1" style="height: 18em;"
           hidecolumnpicker="true"

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

@@ -149,7 +149,7 @@
                 <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"/>
+                       search-l10n-ids="blocklist-window.title, blocklist-description, blocklist-button-cancel.label, blocklist-button-ok.label"/>
                 <hbox class="reject-trackers-ui custom-option">
                   <checkbox id="contentBlockingBlockCookiesCheckbox"
                             class="content-blocking-checkbox" flex="1"

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

@@ -6,7 +6,7 @@ blocklist-window =
     .title = Block Lists
     .style = width: 55em
 
-blocklist-desc = You can choose which list { -brand-short-name } will use to block Web elements that may track your browsing activity.
+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-close-key =
     .key = w
 
@@ -30,7 +30,7 @@ blocklist-button-ok =
 #   $description {string, "This list does a pretty good job."} - Description of the list.
 blocklist-item-list-template = { $listName } { $description }
 
-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.
+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.