Bug 1183240 - Update label copy on for Do Not Track setting in About:Preferences. r=jaws

This commit is contained in:
Panos Astithas 2015-07-22 11:53:22 +03:00
parent c91f019d0b
commit e5eda04ed9
4 changed files with 24 additions and 16 deletions

View File

@ -89,8 +89,8 @@
<vbox>
<hbox align="center">
<checkbox id="privacyDoNotTrackCheckbox"
label="&dntTrackingNotOkay2.label;"
accesskey="&dntTrackingNotOkay2.accesskey;"
label="&dntTrackingNotOkay3.label;"
accesskey="&dntTrackingNotOkay3.accesskey;"
preference="privacy.donottrackheader.enabled"/>
<label id="doNotTrackInfo"
class="text-link"
@ -103,8 +103,8 @@
<hbox align="center">
<checkbox id="trackingProtection"
preference="privacy.trackingprotection.enabled"
accesskey="&trackingProtection2.accesskey;"
label="&trackingProtection2.label;" />
accesskey="&trackingProtection3.accesskey;"
label="&trackingProtection3.label;" />
<label id="trackingProtectionLearnMore"
class="text-link"
value="&trackingProtectionLearnMore.label;"/>
@ -114,8 +114,8 @@
<hbox align="center">
<checkbox id="trackingProtectionPBM"
preference="privacy.trackingprotection.pbmode.enabled"
accesskey="&trackingProtectionPBM2.accesskey;"
label="&trackingProtectionPBM2.label;" />
accesskey="&trackingProtectionPBM3.accesskey;"
label="&trackingProtectionPBM3.label;" />
<label id="trackingProtectionPBMLearnMore"
class="text-link"
value="&trackingProtectionPBMLearnMore.label;"/>

View File

@ -96,8 +96,8 @@
<hbox align="center">
<checkbox id="trackingProtection"
preference="privacy.trackingprotection.enabled"
accesskey="&trackingProtection2.accesskey;"
label="&trackingProtection2.label;" />
accesskey="&trackingProtection3.accesskey;"
label="&trackingProtection3.label;" />
<image id="trackingProtectionImage"
src="chrome://browser/skin/bad-content-blocked-16.png"/>
</hbox>
@ -111,8 +111,8 @@
<vbox>
<hbox align="center">
<checkbox id="privacyDoNotTrackCheckbox"
label="&dntTrackingNotOkay2.label;"
accesskey="&dntTrackingNotOkay2.accesskey;"
label="&dntTrackingNotOkay3.label;"
accesskey="&dntTrackingNotOkay3.accesskey;"
preference="privacy.donottrackheader.enabled"/>
</hbox>
<hbox align="center"

View File

@ -4,14 +4,14 @@
<!ENTITY tracking.label "Tracking">
<!ENTITY dntTrackingNotOkay2.label "Tell sites that I do not want to be tracked.">
<!ENTITY dntTrackingNotOkay2.accesskey "n">
<!ENTITY dntTrackingNotOkay3.label "Request that sites not track you.">
<!ENTITY dntTrackingNotOkay3.accesskey "n">
<!ENTITY doNotTrackInfo.label "Learn More">
<!ENTITY trackingProtection2.label "Prevent sites from tracking me.">
<!ENTITY trackingProtection2.accesskey "m">
<!ENTITY trackingProtection3.label "Stop sites from tracking you.">
<!ENTITY trackingProtection3.accesskey "m">
<!ENTITY trackingProtectionLearnMore.label "Learn more">
<!ENTITY trackingProtectionPBM2.label "Prevent sites from tracking my online activity in Private Windows.">
<!ENTITY trackingProtectionPBM2.accesskey "y">
<!ENTITY trackingProtectionPBM3.label "Stop sites from tracking you in Private Windows.">
<!ENTITY trackingProtectionPBM3.accesskey "y">
<!ENTITY trackingProtectionPBMLearnMore.label "Learn more">
<!ENTITY history.label "History">

View File

@ -195,6 +195,14 @@ treecol {
-moz-margin-end: 8px !important;
}
/* Privacy pane */
#doNotTrackInfo,
#trackingProtectionPBMLearnMore,
#trackingProtectionLearnMore {
margin-top: 0;
}
/* Collapse the non-active vboxes in decks to use only the height the
active vbox needs */
#historyPane:not([selectedIndex="1"]) > #historyDontRememberPane,