Bug 1470020 - Part 3 - Updates to TP copy in the identity popup. r=florian
MozReview-Commit-ID: 9LPReDTgjxJ
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -68,47 +68,47 @@
value="&trackingProtection.off;" />
<toolbarbutton id="tracking-protection-preferences-button"
class="identity-popup-preferences-button subviewbutton"
tooltiptext="&trackingProtection.tooltip;"
oncommand="TrackingProtection.openPreferences('identityPopup-TP-preferencesButton');" />
</hbox>
<description id="tracking-blocked"
- crop="end">&trackingProtection.detectedBlocked3;</description>
+ crop="end">&trackingProtection.detectedBlocked4;</description>
<description id="tracking-loaded"
- crop="end">&trackingProtection.detectedNotBlocked4;</description>
+ crop="end">&trackingProtection.detectedNotBlocked5;</description>
<description id="tracking-not-detected"
- crop="end">&trackingProtection.notDetected4;</description>
+ crop="end">&trackingProtection.notDetected5;</description>
<description id="tracking-loaded-exception"
crop="end">&trackingProtection.detectedException;</description>
<description id="tracking-not-detected-exception"
crop="end">&trackingProtection.notDetectedException;</description>
<description id="tracking-reload-required"
- crop="end">&trackingProtection.reloadRequired;</description>
+ crop="end">&trackingProtection.reloadRequired2;</description>
<button id="tracking-action-reload"
class="tracking-protection-button"
- label="&trackingProtection.reload.label;"
- accesskey="&trackingProtection.reload.accesskey;"
+ label="&trackingProtection.reload2.label;"
+ accesskey="&trackingProtection.reload2.accesskey;"
oncommand="TrackingProtection.hideIdentityPopupAndReload();" />
<button id="tracking-action-unblock"
class="tracking-protection-button"
- label="&trackingProtection.unblock2.label;"
- accesskey="&trackingProtection.unblock2.accesskey;"
+ label="&trackingProtection.unblock3.label;"
+ accesskey="&trackingProtection.unblock3.accesskey;"
oncommand="TrackingProtection.disableForCurrentPage();" />
<button id="tracking-action-unblock-private"
class="tracking-protection-button"
- label="&trackingProtection.unblockPrivate2.label;"
- accesskey="&trackingProtection.unblockPrivate2.accesskey;"
+ label="&trackingProtection.unblockPrivate3.label;"
+ accesskey="&trackingProtection.unblockPrivate3.accesskey;"
oncommand="TrackingProtection.disableForCurrentPage();" />
<button id="tracking-action-block"
class="tracking-protection-button"
- label="&trackingProtection.block3.label;"
- accesskey="&trackingProtection.block3.accesskey;"
+ label="&trackingProtection.block4.label;"
+ accesskey="&trackingProtection.block4.accesskey;"
oncommand="TrackingProtection.enableForCurrentPage();" />
</vbox>
</hbox>
<!-- Permissions Section -->
<hbox class="identity-popup-section"
when-connection="not-secure secure secure-ev secure-cert-user-overridden file extension">
<vbox id="identity-popup-permissions-content" flex="1">
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -901,37 +901,37 @@ you can use these alternative items. Oth
<!ENTITY getUserMedia.selectMicrophone.accesskey "M">
<!ENTITY getUserMedia.audioCapture.label "Audio from the tab will be shared.">
<!ENTITY getUserMedia.allWindowsShared.message "All visible windows on your screen will be shared.">
<!ENTITY trackingProtection.on "Tracking Protection: ON">
<!ENTITY trackingProtection.off "Tracking Protection: OFF">
<!ENTITY trackingProtection.title "Tracking Protection">
<!ENTITY trackingProtection.tooltip "Open Tracking Protection Preferences">
-<!ENTITY trackingProtection.detectedBlocked3 "&brandShortName; is blocking parts of the page that may track your browsing.">
-<!ENTITY trackingProtection.detectedNotBlocked4 "Trackers have been detected on this webpage.">
-<!ENTITY trackingProtection.notDetected4 "No trackers detected on this page.">
+<!ENTITY trackingProtection.detectedBlocked4 "&brandShortName; is blocking parts of this page that may track your browsing.">
+<!ENTITY trackingProtection.detectedNotBlocked5 "&brandShortName; has detected elements that may track your browsing.">
<!ENTITY trackingProtection.detectedException "&brandShortName; has detected elements that may track your browsing. You have disabled protection for this site.">
+<!ENTITY trackingProtection.notDetected5 "No tracking elements detected on this page.">
<!ENTITY trackingProtection.notDetectedException "No tracking elements detected on this page. You have disabled protection for this site.">
-<!ENTITY trackingProtection.reloadRequired "You have enabled Tracking Protection. To block all trackers please reload the current webpage.">
-<!-- LOCALIZATION NOTE (trackingProtection.unblock.label, trackingProtection.unblock.accesskey):
+<!ENTITY trackingProtection.reloadRequired2 "You have enabled Tracking Protection. Reload this page to block all trackers.">
+<!-- LOCALIZATION NOTE (trackingProtection.unblock3.label, trackingProtection.unblock3.accesskey):
The associated button with this label and accesskey is only shown when opening the control
center while looking at a site with trackers in NON-private browsing mode. -->
-<!ENTITY trackingProtection.unblock2.label "Trust this site">
-<!ENTITY trackingProtection.unblock2.accesskey "T">
-<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate.label, trackingProtection.unblockPrivate.accesskey):
+<!ENTITY trackingProtection.unblock3.label "Disable For This Site">
+<!ENTITY trackingProtection.unblock3.accesskey "D">
+<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate3.label, trackingProtection.unblockPrivate3.accesskey):
The associated button with this label and accesskey is only shown when opening the control
center while looking at a site with trackers in PRIVATE browsing mode. -->
-<!ENTITY trackingProtection.unblockPrivate2.label "Trust this site for this session">
-<!ENTITY trackingProtection.unblockPrivate2.accesskey "T">
-<!ENTITY trackingProtection.block3.label "Turn Tracking Protection ON">
-<!ENTITY trackingProtection.block3.accesskey "T">
-<!ENTITY trackingProtection.reload.label "Reload This Page">
-<!ENTITY trackingProtection.reload.accesskey "R">
+<!ENTITY trackingProtection.unblockPrivate3.label "Disable For This Session">
+<!ENTITY trackingProtection.unblockPrivate3.accesskey "D">
+<!ENTITY trackingProtection.block4.label "Enable For This Site">
+<!ENTITY trackingProtection.block4.accesskey "E">
+<!ENTITY trackingProtection.reload2.label "Reload Page">
+<!ENTITY trackingProtection.reload2.accesskey "R">
<!ENTITY pluginNotification.showAll.label "Show All">
<!ENTITY pluginNotification.showAll.accesskey "S">
<!-- LOCALIZATION NOTE (pluginActivateNow.label, pluginActivateAlways.label, pluginBlockNow.label): These should be the same as the matching strings in browser.properties -->
<!ENTITY pluginActivateNow.label "Allow Now">
<!ENTITY pluginActivateAlways.label "Allow and Remember">
<!ENTITY pluginBlockNow.label "Block Plugin">