X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/3bb1b83862820bb82dab163787a3be642f34203f..24980c2056a99b798320157ebd395018c512f125:/windows/en-US/firefox.adml?ds=sidebyside

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 027211d..e52cd96 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -13,6 +13,7 @@
       <string id="Addons_group">Addons</string>
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
+      <string id="Proxy_group">Proxy server</string>
       <string id="Allow">Allow</string>
       <string id="Block">Block</string>
       <string id="BlockAboutAddons">Block About Addons</string>
@@ -33,6 +34,8 @@
       <string id="DisableBuiltinPDFViewer_Explain">Disables PDF.js, which displays PDFs within Firefox.</string>
       <string id="DisableDeveloperTools">Disable Developer Tools</string>
       <string id="DisableDeveloperTools_Explain">Prevents access to developer tools.</string>
+      <string id="DisableFeedbackCommands">Disable Feedback Commands</string>
+      <string id="DisableFeedbackCommands_Explain">Prevents ability to send feedback from the help menu (&quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot;).</string>
       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>
       <string id="DisableFirefoxAccounts_Explain">Disables Firefox Account based services, including Sync.</string>
       <string id="DisableFirefoxScreenshots">Disable Firefox Screenshots</string>
@@ -45,6 +48,8 @@
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>
+      <string id="DisableSafeMode">Disable Safe Mode</string>
+      <string id="DisableSafeMode_Explain">Prevents ability to restart in safe mode.</string>
       <string id="DisableSysAddonUpdate">Disable System Addon Updates</string>
       <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
@@ -73,6 +78,27 @@
       <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="HTTPProxy">HTTP Proxy Settings</string>
+      <string id="HTTPProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="SSLProxy">SSL Proxy Settings</string>
+      <string id="SSLProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="FTPProxy">FTP Proxy Settings</string>
+      <string id="FTPProxy_Explain">This should only be set if you selected manual proxy</string>
+      <string id="SOCKSProxy">SOCKS Host Settings</string>
+      <string id="SOCKSProxy_Explain">This should only be set if you selected manual proxy</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="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="ProxyMode">Proxy Mode</string>
+      <string id="ProxyMode_Explain">Select the proxy mode</string>
     </stringTable>
     <presentationTable>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
@@ -111,6 +137,51 @@
           <label/>
         </textBox>
       </presentation>
+      <presentation id="HTTPProxy">
+        <text>HTTP Proxy:</text>
+        <textBox refId="HTTPProxy">
+          <label/>
+        </textBox>
+        <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
+	  </presentation>
+      <presentation id="SSLProxy">
+        <text>SSL Proxy:</text>
+        <textBox refId="SSLProxy">
+          <label/>
+        </textBox>
+	  </presentation>
+      <presentation id="FTPProxy">
+        <text>FTP Proxy:</text>
+        <textBox refId="FTPProxy">
+          <label/>
+        </textBox>
+	  </presentation>
+      <presentation id="SOCKSProxy">
+        <text>SOCKS Host:</text>
+        <textBox refId="SOCKSProxy">
+          <label/>
+        </textBox>
+        <dropdownList refId="SOCKSVersion"/>
+      </presentation>
+      <presentation id="Passthrough">
+        <text>No proxy for</text>
+        <textBox refId="Passthrough">
+          <label/>
+        </textBox>
+        <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>
+	  </presentation>
+      <presentation id="AutoConfigURL">
+        <text>Automatic proxy configuration URL:</text>
+        <textBox refId="AutoConfigURL">
+          <label/>
+        </textBox>
+	  </presentation>
+      <presentation id="ProxyMode">
+        <dropdownList refId="ProxyMode"/>
+        <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
+        <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
+        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>