Switch to one panel for all proxy settings

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index e52cd964d070e990b6b48c20e61ff8257e4bf6f1..5272681098ab0bbebe0d99faa6ec469c07bf61c8 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -13,7 +13,6 @@
       <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>
@@ -78,27 +77,20 @@
       <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="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="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>
@@ -137,50 +129,38 @@
           <label/>
         </textBox>
       </presentation>
-      <presentation id="HTTPProxy">
+      <presentation id="Proxy">
+        <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox> 
+          <dropdownList refId="ConnectionType"/>
         <text>HTTP Proxy:</text>
         <textBox refId="HTTPProxy">
           <label/>
         </textBox>
-        <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
-         </presentation>
-      <presentation id="SSLProxy">
+               <checkBox refId="UseHTTPProxyForAllProtocols">Use this proxy server for all protocols.</checkBox>
         <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="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>