Bug 1577459 - Update Tracking Content description copy and remove Site Still Broken copy. r=johannh
authorNihanth Subramanya <nhnt11@gmail.com>
Fri, 30 Aug 2019 10:27:01 +0000
changeset 490841 4de1432a4cd729d10c005f43a92944c6145a8afd
parent 490840 dd6e8cc3c3d4d155c69de00c8357d45a8e5d94b7
child 490842 c5ad764d28355ec966faaed00e94076fd39a9a4a
push id94078
push usernhnt11@gmail.com
push dateFri, 30 Aug 2019 10:36:00 +0000
treeherderautoland@4de1432a4cd7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1577459
milestone70.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 1577459 - Update Tracking Content description copy and remove Site Still Broken copy. r=johannh Differential Revision: https://phabricator.services.mozilla.com/D44127
browser/components/controlcenter/content/protectionsPanel.inc.xul
browser/locales/en-US/chrome/browser/browser.dtd
--- a/browser/components/controlcenter/content/protectionsPanel.inc.xul
+++ b/browser/components/controlcenter/content/protectionsPanel.inc.xul
@@ -170,29 +170,28 @@
             <html:ul id="protections-popup-siteNotWorkingView-body-issue-list">
               <html:li>&protections.siteNotWorkingView.issueList.logInFields;</html:li>
               <html:li>&protections.siteNotWorkingView.issueList.forms;</html:li>
               <html:li>&protections.siteNotWorkingView.issueList.payments;</html:li>
               <html:li>&protections.siteNotWorkingView.issueList.comments;</html:li>
               <html:li>&protections.siteNotWorkingView.issueList.videos;</html:li>
             </html:ul>
           </label>
-          <label id="protections-popup-siteNotWorkingView-siteStillBroken">&protections.siteNotWorkingView.siteStillBroken.label;</label>
           <label id="protections-popup-siteNotWorkingView-sendReport"
             onclick="gProtectionsHandler.showSendReportView(); gProtectionsHandler.recordClick('send_report_link');"
             class="text-link">&protections.siteNotWorkingView.sendReport.label;</label>
         </vbox>
     </panelview>
 
     <!-- Trackers SubView -->
     <panelview id="protections-popup-trackersView"
                role="document"
                descriptionheightworkaround="true">
         <vbox id="protections-popup-trackersView-description" class="protections-popup-description">
-          <description>&protections.trackingContent.description;</description>
+          <description>&protections.trackingContent2.description;</description>
         </vbox>
         <vbox id="protections-popup-trackersView-list" class="protections-popup-list">
         </vbox>
         <vbox class="panel-footer">
           <button id="protections-popup-trackersView-settings-button"
                   label="&contentBlocking.manageSettings2.label;"
                   accesskey="&contentBlocking.manageSettings.accesskey;"
                   oncommand="gProtectionsHandler.openPreferences(); gProtectionsHandler.recordClick('subview_settings', 'trackers');"/>
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -738,17 +738,16 @@ you can use these alternative items. Oth
      protections.siteNotWorkingView.header: The header of the list
      protections.siteNotWorkingView.issueList.*: The list items, shown in a <ul> -->
 <!ENTITY protections.siteNotWorkingView.header "Turn off protections if you’re having issues with:">
 <!ENTITY protections.siteNotWorkingView.issueList.logInFields "Login fields">
 <!ENTITY protections.siteNotWorkingView.issueList.forms "Forms">
 <!ENTITY protections.siteNotWorkingView.issueList.payments "Payments">
 <!ENTITY protections.siteNotWorkingView.issueList.comments "Comments">
 <!ENTITY protections.siteNotWorkingView.issueList.videos "Videos">
-<!ENTITY protections.siteNotWorkingView.siteStillBroken.label "Site still broken after turning off protections?">
 <!ENTITY protections.siteNotWorkingView.sendReport.label "Send a report">
 
 <!-- LOCALIZATION NOTE (protections.blocking2.label, protections.notBlocking2.label, protections.notFound.label):
      In the protections panel, Content Blocking category items are in three sections:
      "Blocked" for categories being blocked in the current page,
      "Allowed" for categories detected but not blocked in the current page, and
      "None Detected" for categories not detected in the current page.
      These strings are used in the header labels of each of these sections. -->
@@ -766,17 +765,17 @@ you can use these alternative items. Oth
 <!ENTITY protections.trackingContent.label "Tracking Content">
 <!ENTITY protections.fingerprinters.label "Fingerprinters">
 <!ENTITY protections.cryptominers.label "Cryptominers">
 <!ENTITY protections.noTrackersFound.description "No trackers known to &brandShortName; were detected on this page.">
 
 <!ENTITY protections.crossSiteTrackingCookies.description "These cookies follow you from site to site to gather data about what you do online. They are set by third parties such as advertisers and analytics companies.">
 <!ENTITY protections.cryptominers.description "Cryptominers use your system’s computing power to mine digital money. Cryptomining scripts drain your battery, slow down your computer, and can increase your energy bill.">
 <!ENTITY protections.fingerprinters.description "Fingerprinters collect settings from your browser and computer to create a profile of you. Using this digital fingerprint, they can track you across different websites.">
-<!ENTITY protections.trackingContent.description "Websites may load external ads, videos, and other content that contain tracking code. Blocking tracking content can help sites load faster, but some buttons, forms, and login fields might not work.">
+<!ENTITY protections.trackingContent2.description "Websites may load external ads, videos, and other content with tracking code. Blocking tracking content can help sites load faster, but some buttons, forms, and login fields might not work.">
 <!ENTITY protections.socialMediaTrackers.description "Social networks place trackers on other websites to follow what you do, see, and watch online. This allows social media companies to learn more about you beyond what you share on your social media profiles.">
 
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Browser tabs">
 
 <!ENTITY syncedTabs.sidebar.label              "Synced Tabs">