Merge branch 'master' into 1429177_Proxy

diff --cc README.md
Simple merge

diff --cc windows/en-US/firefox.adml
index 4b2b76e34a226587444bc1b3461e5ef99bf57700,c0b69c7c029600dfd8471f410273751f156004bb..ebb57c870c0fad2b26a32f489446532fdcf9e543
--- 1/windows/en-US/firefox.adml
--- 2/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@@ -77,20 -79,12 +79,26 @@@
        <string id="HomepageURL_Explain">Homepage Settings</string>
        <string id="HomepageAdditional">Additional Homepages</string>
        <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
 +      <string id="Proxy">Proxy Settings</string>
 +      <string id="Proxy_Explain">If this policy is enabled, you should select the connection type and then fill in the appropriate sections. Due to a bug, you must select a value for the SOCKS proxy version.</string>
 +      <string id="SOCKSVersion4">SOCKS v4</string>
 +      <string id="SOCKSVersion5">SOCKS v5</string>
 +      <string id="AutoConfigURL">Automatic proxy configuration URL</string>
 +      <string id="AutoConfigURL_Explain">These should only be set if you selected autoConfig</string>
 +      <string id="Passthrough">Proxy bypass URLs</string>
 +      <string id="Passthrough_Explain">These should only be set if you selected manual proxy</string>
 +      <string id="Connection">Connection Type</string>
 +      <string id="NoProxy">No Proxy</string>
 +      <string id="SystemProxy">Use system proxy settings</string>
 +      <string id="ManualProxy">Manual proxy configuration</string>
 +      <string id="AutoDetectProxy">Auto-detect proxy settings</string>
 +      <string id="AutoConfigProxy">Automatic proxy configuration</string>
+       <string id="TrackingProtection">Tracking Protection</string>
+       <string id="TrackingProtection_Explain">If this policy is not configured, tracking protection is not enabled by default in the browser but it is enabled by default in private browsing and the user can change it.
+ 
+ If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing.
+ 
+ If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>
      </stringTable>
      <presentationTable>
        <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>

diff --cc windows/firefox.admx
Simple merge