Bug 1183553 - [Control Center] Update copy for TP section r=bgrins

This commit is contained in:
Tim Taubert 2015-07-14 11:21:53 +02:00
parent 4527ae8558
commit 347cd26917
3 changed files with 23 additions and 12 deletions

View File

@ -44,23 +44,28 @@
<label id="tracking-blocked"
class="identity-popup-text"
crop="end">&trackingProtection.detectedBlocked;</label>
crop="end">&trackingProtection.detectedBlocked2;</label>
<label id="tracking-loaded"
class="identity-popup-text"
crop="end">&trackingProtection.detectedNotBlocked;</label>
crop="end">&trackingProtection.detectedNotBlocked2;</label>
<label id="tracking-not-detected"
class="identity-popup-text"
crop="end">&trackingProtection.notDetected;</label>
crop="end">&trackingProtection.notDetected2;</label>
<button id="tracking-action-unblock"
label="&trackingProtection.unblock.label;"
class="identity-popup-button"
accesskey="&trackingProtection.unblock.accesskey;"
oncommand="TrackingProtection.disableForCurrentPage();" />
<button id="tracking-action-block"
label="&trackingProtection.block.label;"
<button id="tracking-action-unblock-private"
label="&trackingProtection.unblockPrivate.label;"
class="identity-popup-button"
accesskey="&trackingProtection.block.accesskey;"
accesskey="&trackingProtection.unblock.accesskey;"
oncommand="TrackingProtection.disableForCurrentPage();" />
<button id="tracking-action-block"
label="&trackingProtection.block2.label;"
class="identity-popup-button"
accesskey="&trackingProtection.block2.accesskey;"
oncommand="TrackingProtection.enableForCurrentPage();" />
</vbox>
</hbox>

View File

@ -770,13 +770,15 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY mixedContentBlocked2.disabled.message "Protection is disabled">
<!ENTITY trackingProtection.title "Tracking Protection">
<!ENTITY trackingProtection.detectedBlocked "Attempts to track your online behavior have been blocked.">
<!ENTITY trackingProtection.detectedNotBlocked "Tracking elements detected. You have disabled protection on this site.">
<!ENTITY trackingProtection.notDetected "No tracking elements detected on this website.">
<!ENTITY trackingProtection.detectedBlocked2 "&brandShortName; is blocking attempts to track your browsing.">
<!ENTITY trackingProtection.detectedNotBlocked2 "This site includes content that tracks your browsing. You have disabled protection.">
<!ENTITY trackingProtection.notDetected2 "This site doesnt include any content that tracks your browsing.">
<!ENTITY trackingProtection.unblock.label "Disable protection for this site">
<!ENTITY trackingProtection.unblock.accesskey "D">
<!ENTITY trackingProtection.block.label "Enable protection for this site">
<!ENTITY trackingProtection.block.accesskey "E">
<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate.label): Uses trackingProtection.unblock.accesskey as its accesskey. -->
<!ENTITY trackingProtection.unblockPrivate.label "Disable protection for this session">
<!ENTITY trackingProtection.block2.label "Enable protection">
<!ENTITY trackingProtection.block2.accesskey "E">
<!ENTITY trackingContentBlocked.message "Tracking">
<!ENTITY trackingContentBlocked.moreinfo "Parts of the page that track your online activity have been blocked.">

View File

@ -267,13 +267,17 @@
}
#tracking-action-block,
#tracking-action-unblock {
#tracking-action-unblock,
#tracking-action-unblock-private {
margin: 1em 0 0;
}
#tracking-protection-content[state] > #tracking-not-detected,
#tracking-protection-content:not([state="blocked-tracking-content"]) > #tracking-blocked,
#main-window[privatebrowsingmode] #tracking-action-unblock,
#main-window:not([privatebrowsingmode]) #tracking-action-unblock-private,
#tracking-protection-content:not([state="blocked-tracking-content"]) #tracking-action-unblock,
#tracking-protection-content:not([state="blocked-tracking-content"]) #tracking-action-unblock-private,
#tracking-protection-content:not([state="loaded-tracking-content"]) > #tracking-loaded,
#tracking-protection-content:not([state="loaded-tracking-content"]) #tracking-action-block,
#tracking-protection-content:not([state]) > #tracking-actions {