Bug 1572528 - [Protections Panel] Update category item subviews. r=johannh
authorNihanth Subramanya <nhnt11@gmail.com>
Mon, 12 Aug 2019 20:09:13 +0000
changeset 11902 b36c4afabddc0b1c19b8368f63e0500b581f07d3
parent 11901 483787e395e7e1fe36619972ef5dfd6afd5c9668
child 11903 f62b1979b454a4b503371e8b4b645c15a5d90ac9
push id161
push userflodolo@mozilla.com
push dateWed, 14 Aug 2019 04:07:12 +0000
reviewersjohannh
bugs1572528
Bug 1572528 - [Protections Panel] Update category item subviews. r=johannh Differential Revision: https://phabricator.services.mozilla.com/D41271 X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: e7737e46df84e682cae0ef31969bc919ee345970 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: e5d98eda2ec359a0968c567076b1a625cb6c99ce X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 2fb19d0466d2f61674c0af80813645cccd510593 X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: a8da73ce90a4110e14caaba3e93d8a086b3a0669
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -906,18 +906,16 @@ you can use these alternative items. Oth
 <!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.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.">
 
-<!ENTITY protections.manageProtectionSettings.label "Manage Protection Settings">
-
 <!-- 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">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu3.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu3.label     "Synced Tabs">
 
 <!ENTITY syncedTabs.sidebar.label              "Synced Tabs">
@@ -944,31 +942,34 @@ you can use these alternative items. Oth
 <!ENTITY getUserMedia.allWindowsShared.message "All visible windows on your screen will be shared.">
 
 <!ENTITY contentBlocking.title "Content Blocking">
 <!ENTITY contentBlocking.detected "Blockable content detected on this site.">
 <!ENTITY contentBlocking.notDetected "No blockable content detected on this page.">
 
 <!ENTITY contentBlocking.trackingProtection3.label "Trackers">
 
+<!ENTITY contentBlocking.manageSettings.label "Manage Content Blocking">
+
 <!ENTITY contentBlocking.trackingProtection4.label "Tracking Content">
 
-<!ENTITY contentBlocking.manageSettings.label "Manage Content Blocking">
+<!ENTITY contentBlocking.manageSettings2.label "Manage Protection Settings">
 <!ENTITY contentBlocking.manageSettings.accesskey "M">
 
 <!ENTITY contentBlocking.trackersView.label "Trackers">
+
 <!ENTITY contentBlocking.trackersView.strictInfo.label "To block all trackers, set content blocking to “Strict”.">
 
-<!ENTITY contentBlocking.socialblock.label "Social Media Trackers">
-<!ENTITY contentBlocking.socialblockView.label "Social Media Trackers Blocked">
-<!ENTITY contentBlocking.socialblockView.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.">
-
 <!ENTITY contentBlocking.cookies.label "Cookies">
 <!ENTITY contentBlocking.cookiesView.label "Cookies and Site Data">
 
+<!ENTITY contentBlocking.socialblock.label "Social Media Trackers">
+
+<!ENTITY contentBlocking.cookies2.label "Cross-Site Tracking Cookies">
+
 <!ENTITY contentBlocking.cryptominers.label "Cryptominers">
 <!ENTITY contentBlocking.cryptominersView.label "Cryptominers">
 
 <!ENTITY contentBlocking.fingerprinters.label "Fingerprinters">
 <!ENTITY contentBlocking.fingerprintersView.label "Fingerprinters">
 
 <!ENTITY contentBlocking.openBreakageReportView2.label "Report a problem">
 <!ENTITY contentBlocking.breakageReportView.label "Report Problems">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -554,29 +554,30 @@ contentBlocking.cookies.allowed.label=Al
 # See localization note for contentBlocking.trackers.blocking.label to get recommendations on translating "Blocking".
 contentBlocking.cookies.blockingTrackers.label=Blocking Tracking Cookies
 contentBlocking.cookies.blocking3rdParty.label=Blocking Third-Party Cookies
 contentBlocking.cookies.blockingUnvisited.label=Blocking Unvisited Site Cookies
 contentBlocking.cookies.blockingAll.label=Blocking All Cookies
 
 # LOCALIZATION NOTE (contentBlocking.cookies.blockingTrackers.label, contentBlocking.cookies.blocking3rdParty.label,
 #   contentBlocking.cookies.blockingUnvisited.label,contentBlocking.cookies.blockingAll.label):
-# See localization note for contentBlocking.trackers.blocking.label to get recommendations on translating "Blocking".
-contentBlocking.cookies.blockingTrackers2.label=Tracking Cookies
+contentBlocking.cookies.blockingTrackers3.label=Cross-Site Tracking Cookies
 contentBlocking.cookies.blocking3rdParty2.label=Third-Party Cookies
 contentBlocking.cookies.blockingUnvisited2.label=Unvisited Site Cookies
 contentBlocking.cookies.blockingAll2.label=All Cookies
 
 contentBlocking.cookiesView.firstParty.label=From This Site
 # LOCALIZATION NOTE (contentBlocking.cookiesView.firstParty.empty.label):
 #  This references the header from contentBlocking.cookiesView.firstParty.label:
 #  "[Cookies] From This Site: None detected on this site".
 contentBlocking.cookiesView.firstParty.empty.label=None detected on this site
 
 contentBlocking.cookiesView.trackers.label=Tracking Cookies
+
+contentBlocking.cookiesView.trackers2.label=Cross-Site Tracking Cookies
 # LOCALIZATION NOTE (contentBlocking.cookiesView.trackers.empty.label):
 #  This references the header from contentBlocking.cookiesView.trackers.label:
 #  "Tracking Cookies: None detected on this site".
 contentBlocking.cookiesView.trackers.empty.label=None detected on this site
 
 contentBlocking.cookiesView.thirdParty.label=Third-Party Cookies
 # LOCALIZATION NOTE (contentBlocking.cookiesView.thirdParty.empty.label):
 #  This references the header from contentBlocking.cookiesView.thirdParty.label:
@@ -685,17 +686,20 @@ protections.disableAriaLabel=Disable pro
 # LOCALIZATION NOTE (protections.enableAriaLabel):
 # Text that gets spoken by a screen reader if the button will enable protections.
 # %s is the site's hostname.
 protections.enableAriaLabel=Enable protections for %S
 
 # Blocking and Not Blocking sub-views in the Protections Panel
 protections.blocking.fingerprinters.title=Fingerprinters Blocked
 protections.blocking.cryptominers.title=Cryptominers Blocked
-protections.blocking.crossSiteTrackingCookies.title=Cross-Site Tracking Cookies Blocked
+protections.blocking.cookies.trackers.title=Cross-Site Tracking Cookies Blocked
+protections.blocking.cookies.3rdParty.title=Third-Party Cookies Blocked
+protections.blocking.cookies.all.title=All Cookies Blocked
+protections.blocking.cookies.unvisited.title=Unvisited Site Cookies Blocked
 protections.blocking.trackingContent.title=Tracking Content Blocked
 protections.blocking.socialMediaTrackers.title=Social Media Trackers Blocked
 protections.notBlocking.fingerprinters.title=Not Blocking Fingerprinters
 protections.notBlocking.cryptominers.title=Not Blocking Cryptominers
 protections.notBlocking.crossSiteTrackingCookies.title=Not Blocking Cross-Site Tracking Cookies
 protections.notBlocking.trackingContent.title=Not Blocking Tracking Content
 protections.notBlocking.socialMediaTrackers.title=Not Blocking Social Media Trackers