Merge pull request #999 from mozilla/ProxyCategory

[policy-templates.git] / windows / fr-FR / firefox.adml

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 04c0c9c2b0005ad36cf1c162c139e38f6e764e7c..0af0b133f0d9070a0d554061f876553ebb912d34 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <?xml version="1.0" encoding="utf-8"?>\r

-<policyDefinitionResources revision="4.4" schemaVersion="1.0" >\r
+<policyDefinitionResources revision="4.7" schemaVersion="1.0" >\r

   <displayName/>\r
   <description/>\r
   <resources >\r
   <displayName/>\r
   <description/>\r
   <resources >\r


@@ -80,6 +80,7 @@
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>\r
       <string id="PDFjs_group">PDF.js</string>\r
       <string id="PictureInPicture_group">Picture-in-Picture</string>\r
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>\r
       <string id="PDFjs_group">PDF.js</string>\r
       <string id="PictureInPicture_group">Picture-in-Picture</string>\r

+      <string id="ProxySettings_group">Proxy Settings</string>\r

       <string id="Allow">Sites autorisés</string>\r
       <string id="AllowSession">Sites autorisés (Session Only)</string>\r
       <string id="Block">Sites bloqués</string>\r
       <string id="Allow">Sites autorisés</string>\r
       <string id="AllowSession">Sites autorisés (Session Only)</string>\r
       <string id="Block">Sites bloqués</string>\r


@@ -951,6 +952,46 @@ If this policy is disabled or not configured, typing single word entries in the
       <string id="AppUpdatePin_Explain">If this policy is enabled, you can specify a Firefox version as xx. or xx.xx. and Firefox will not be updated beyond that major or minor version.\r
 \r
 If this policy is disabled or not configured, Firefox will update normally.</string>\r
       <string id="AppUpdatePin_Explain">If this policy is enabled, you can specify a Firefox version as xx. or xx.xx. and Firefox will not be updated beyond that major or minor version.\r
 \r
 If this policy is disabled or not configured, Firefox will update normally.</string>\r

+      <string id="Proxy_Locked">Do not allow proxy settings to be changed</string>\r
+      <string id="Proxy_Locked_Explain">If this policy is enabled, proxy settings cannot be changed by the user.\r
+\r
+If this policy is disabled or not configured, the user can change their proxy settings.</string>\r
+      <string id="Proxy_ConnectionType">Connection Type</string>\r
+      <string id="Proxy_ConnectionType_Explain">If this policy is enabled, you can set the connection type.\r
+\r
+If this policy is disabled or not configured, Firefox defaults to using the system proxy.</string>\r
+      <string id="Proxy_HTTPProxy">HTTP Proxy</string>\r
+      <string id="Proxy_HTTPProxy_Explain">If this policy is enabled, you can set the HTTP Proxy used when manual proxy configuration is specified.\r
+\r
+If this policy is disabled or not configured, Firefox does not use an HTTP Proxy.</string>\r
+      <string id="Proxy_UseHTTPProxyForAllProtocols">Use HTTP proxy for HTTPS</string>\r
+      <string id="Proxy_UseHTTPProxyForAllProtocols_Explain">If this policy is enabled, the HTTP Proxy is used for HTTPS when manual proxy configuration is specified.\r
+\r
+If this policy is disabled or not configured, Firefox does not use an HTTPS Proxy unless specified.</string>\r
+      <string id="Proxy_SSLProxy">HTTPS Proxy</string>\r
+      <string id="Proxy_SSLProxy_Explain">If this policy is enabled, you can set the HTTPS Proxy used when manual proxy configuration is specified.\r
+\r
+If this policy is disabled or not configured, Firefox does not use an HTTPS Proxy.</string>\r
+      <string id="Proxy_SOCKSProxy">SOCKS Host</string>\r
+      <string id="Proxy_SOCKSProxy_Explain">If this policy is enabled, you can set the SOCKS Host and version used when manual proxy configuration is specified.\r
+\r
+If this policy is disabled or not configured, Firefox does not use a SOCKS Host.</string>\r
+      <string id="Proxy_AutoConfigURL">Automatic proxy configuration URL</string>\r
+      <string id="Proxy_AutoConfigURL_Explain">If this policy is enabled, you can set the automatic proxy configuration URL.\r
+\r
+If this policy is disabled or not configured, Firefox does not use an automatic proxy configuration URL.</string>\r
+      <string id="Proxy_Passthrough">Proxy Passthrough</string>\r
+      <string id="Proxy_Passthrough_Explain">If this policy is enabled, the proxy settings are bypassed for the locations specified.\r
+\r
+If this policy is disabled or not configured, Firefox does not bypass the proxy.</string>\r
+      <string id="Proxy_AutoLogin">Do not prompt for authentication if password is saved</string>\r
+      <string id="Proxy_AutoLogin_Explain">If this policy is enabled, Firefox will not prompt for proxy authentication when a password is saved.\r
+\r
+If this policy is disabled or not configured, Firefox will always prompt for proxy authentication.</string>\r
+      <string id="Proxy_UseProxyForDNS">Proxy DNS when using SOCKS v5</string>\r
+      <string id="Proxy_UseProxyForDNS_Explain">If this policy is enabled, DNS is proxied when using SOCKS v5.\r
+\r
+If this policy is disabled or not configured, DNS is not proxied when using SOCKS v5.</string>\r

       <string id="Preferences_Boolean_Explain">Si cette stratégie est activée, la préférence est verrouillée sur true. Si cette stratégie est désactivée, la préférence est verrouillée sur false.\r
 \r
 Pour une description de la préférence, voir:\r
       <string id="Preferences_Boolean_Explain">Si cette stratégie est activée, la préférence est verrouillée sur true. Si cette stratégie est désactivée, la préférence est verrouillée sur false.\r
 \r
 Pour une description de la préférence, voir:\r


@@ -1275,6 +1316,40 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="JSON">\r
         <multiTextBox refId="JSON"/>\r
       </presentation>\r
       <presentation id="JSON">\r
         <multiTextBox refId="JSON"/>\r
       </presentation>\r

+      <presentation id="Proxy_ConnectionType">\r
+        <dropdownList refId="Proxy_ConnectionType"/>\r
+      </presentation>\r
+      <presentation id="Proxy_HTTPProxy">\r
+        <textBox refId="Proxy_HTTPProxy">\r
+          <label>Host including port:</label>\r
+        </textBox>\r
+      </presentation>\r
+      <presentation id="Proxy_SSLProxy">\r
+        <textBox refId="Proxy_SSLProxy">\r
+          <label>Host including port:</label>\r
+        </textBox>\r
+      </presentation>\r
+      <presentation id="Proxy_SOCKSProxy">\r
+        <text>Host including port:</text>\r
+        <textBox refId="Proxy_SOCKSProxy">\r
+          <label/>\r
+        </textBox>\r
+        <text>SOCKS Version:</text>\r
+        <dropdownList refId="Proxy_SOCKSVersion"/>\r
+      </presentation>\r
+      <presentation id="Proxy_AutoConfigURL">\r
+        <textBox refId="Proxy_AutoConfigURL">\r
+          <label>URL:</label>\r
+        </textBox>\r
+      </presentation>\r
+      <presentation id="Proxy_Passthrough">\r
+        <text>No proxy for</text>\r
+        <textBox refId="Proxy_Passthrough">\r
+          <label/>\r
+        </textBox>\r
+        <text>Example: .mozilla.org, .net.nz, 192.168.1.0/24</text>\r
+        <text>Connections to localhost, 127.0.0.1/8, and ::1 are never proxied.</text>\r
+      </presentation>\r

     </presentationTable>\r
   </resources>\r
 </policyDefinitionResources>\r
     </presentationTable>\r
   </resources>\r
 </policyDefinitionResources>\r