mozilla-inbound: changeset 202028:f5bf94faa19c854feedd2f1e59d7cf3ad0a44850

author	Monica Chew <mmc@mozilla.com>
	Wed, 27 Aug 2014 14:13:04 -0700
changeset 202028	f5bf94faa19c854feedd2f1e59d7cf3ad0a44850
parent 202027	0ab80c637571d0555719be9b9428ecf4d42bc8dd
child 202029	7bd309e55a3dfe86debfa3fe06eeb2ca50e95694
child 202078	a1e51bc80bdb01ab2d72e0e9e98d591a10909a3b
push id	48309
push user	kwierso@gmail.com
push date	Wed, 27 Aug 2014 23:59:44 +0000
treeherder	mozilla-inbound@a531fd3f3ab7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	adw
bugs	1031033
milestone	34.0a1
first release with	nightly linux32 3be45b58fc47 / 34.0a1 / 20140828030205 / files nightly linux64 3be45b58fc47 / 34.0a1 / 20140828030205 / files nightly mac 3be45b58fc47 / 34.0a1 / 20140828030205 / files nightly win32 3be45b58fc47 / 34.0a1 / 20140828030205 / files nightly win64 3be45b58fc47 / 34.0a1 / 20140828030205 / files
last release without	nightly linux32 0753f7b93ab7 / 34.0a1 / 20140827030202 / files nightly linux64 0753f7b93ab7 / 34.0a1 / 20140827030202 / files nightly mac 0753f7b93ab7 / 34.0a1 / 20140827030202 / files nightly win32 0753f7b93ab7 / 34.0a1 / 20140827030202 / files nightly win64 0753f7b93ab7 / 34.0a1 / 20140827030202 / files

--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -5,16 +5,19 @@
 <!ENTITY tracking.label                 "Tracking">
 
 <!ENTITY dntTrackingNopref.label2       "Do not tell sites anything about my tracking preferences">
 <!ENTITY dntTrackingNopref.accesskey    "o">
 <!ENTITY dntTrackingNotOkay.label2      "Tell sites that I do not want to be tracked">
 <!ENTITY dntTrackingNotOkay.accesskey   "n">
 <!ENTITY dntTrackingOkay.label2         "Tell sites that I want to be tracked">
 <!ENTITY dntTrackingOkay.accesskey      "h">
+<!ENTITY trackingProtection.label       "Prevent sites from tracking me">
+<!ENTITY trackingProtection.accesskey   "m">
+<!ENTITY trackingProtectionLearnMore.label "Learn more">
 <!ENTITY doNotTrackInfo.label           "Learn More">
 
 <!ENTITY  history.label                 "History">
 
 <!ENTITY  locationBar.label             "Location Bar">
 
 <!ENTITY  locbar.pre.label              "When using the location bar, suggest:">
 <!ENTITY  locbar.pre.accessKey          "u">