Merge branch 'master' into 1429177_Proxy

[policy-templates.git] / windows / en-US / firefox.adml

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 5272681098ab0bbebe0d99faa6ec469c07bf61c8..d67882d8bf15b5ccb1f359f41cc2b2d1539fce84 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -72,7 +72,9 @@
       <string id="Bookmark5">Bookmark 5</string>
       <string id="Bookmark_Explain">Bookmark Explanation</string>
       <string id="BookmarkPlacementToolbar">Toolbar</string>
-      <string id="BookmarkPlacementFolder">Folder</string>
+      <string id="BookmarkPlacementMenu">Menu</string>
+      <string id="NoDefaultBookmarks">No Default Bookmarks</string>
+      <string id="NoDefaultBookmarks_Explain">Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.</string>
       <string id="HomepageURL">URL for Home page</string>
       <string id="HomepageURL_Explain">Homepage Settings</string>
       <string id="HomepageAdditional">Additional Homepages</string>
@@ -91,6 +93,12 @@
       <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>
@@ -99,6 +107,9 @@
       <presentation id="CookiesBlock"><listBox refId="CookiesBlockDesc">Block cookies for websites</listBox></presentation>
       <presentation id="FlashAllow"><listBox refId="FlashAllowDesc">Allow Flash for websites</listBox></presentation>
       <presentation id="FlashBlock"><listBox refId="FlashBlockDesc">Block Flash for websites</listBox></presentation>
+      <presentation id="TrackingProtection">
+        <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
+      </presentation>
       <presentation id="HomepageURL">
         <text>URL:</text>
         <textBox refId="HomepageURL">
@@ -130,13 +141,14 @@
         </textBox>
       </presentation>
       <presentation id="Proxy">
-        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox> 
-          <dropdownList refId="ConnectionType"/>
+        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
+        <text>Connection Type:</text>
+        <dropdownList refId="ConnectionType"/>
         <text>HTTP Proxy:</text>
         <textBox refId="HTTPProxy">
           <label/>
         </textBox>
-               <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
+        <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
         <text>SSL Proxy:</text>
         <textBox refId="SSLProxy">
           <label/>
@@ -149,6 +161,7 @@
         <textBox refId="SOCKSProxy">
           <label/>
         </textBox>
+        <text>SOCKS Version:</text>
         <dropdownList refId="SOCKSVersion"/>
         <text>No proxy for</text>
         <textBox refId="Passthrough">
@@ -159,7 +172,7 @@
         <textBox refId="AutoConfigURL">
           <label/>
         </textBox>
-               <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
+        <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
         <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
       </presentation>
     </presentationTable>