Merge branch 'master' into master

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

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 9edcf89dc6c08b8160fe1a9482feb62cce590011..916dd40b483481132fc433b5e36698fbe15133b2 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="1.6" schemaVersion="1.0" >\r
+<policyDefinitionResources revision="1.9" schemaVersion="1.0" >\r

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


@@ -12,7 +12,10 @@
       <string id="SUPPORTED_FF66">Firefox 66 ou superieur, Firefox 60.6 ESR ou superieur</string>\r
       <string id="SUPPORTED_FF67">Firefox 67 ou superieur, Firefox 60.7 ESR ou superieur</string>\r
       <string id="SUPPORTED_FF68">Firefox 68 ou superieur, Firefox 68 ESR ou superieur</string>\r
       <string id="SUPPORTED_FF66">Firefox 66 ou superieur, Firefox 60.6 ESR ou superieur</string>\r
       <string id="SUPPORTED_FF67">Firefox 67 ou superieur, Firefox 60.7 ESR ou superieur</string>\r
       <string id="SUPPORTED_FF68">Firefox 68 ou superieur, Firefox 68 ESR ou superieur</string>\r

+      <string id="SUPPORTED_FF6801">Firefox 68.0.1 ou superieur, Firefox 68.0.1 ESR ou superieur</string>\r

       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR ou superieur</string>\r
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR ou superieur</string>\r

+      <string id="SUPPORTED_FF69">Firefox 69 ou superieur, Firefox 68.1 ESR ou superieur</string>\r
+      <string id="SUPPORTED_FF70">Firefox 70 ou superieur, Firefox 68.2 ESR ou superieur</string>\r

       <string id="firefox">Firefox</string>\r
       <string id="Permissions_group">Permissions</string>\r
       <string id="Camera_group">Camera</string>\r
       <string id="firefox">Firefox</string>\r
       <string id="Permissions_group">Permissions</string>\r
       <string id="Camera_group">Camera</string>\r


@@ -212,6 +215,12 @@ Si cette stratégie est désactivée ou non configurée, aucune extension n'est
       <string id="ExtensionUpdate_Explain">Si cette stratégie est désactivée, les extensions ne seront pas mise à jour automatiquement.\r
 \r
 Si cette stratégie est activée ou non configurée, les extensions seront mise à jour automatiquement.</string>\r
       <string id="ExtensionUpdate_Explain">Si cette stratégie est désactivée, les extensions ne seront pas mise à jour automatiquement.\r
 \r
 Si cette stratégie est activée ou non configurée, les extensions seront mise à jour automatiquement.</string>\r

+      <string id="ExtensionSettings">Extension Management</string>\r
+      <string id="ExtensionSettings_Explain">If this policy is enabled, you can use JSON to describe the extension management policy.\r
+\r
+If this policy is disabled or not configured, extensions will not be managed.\r
+\r
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>\r

       <string id="HardwareAcceleration">Accélération matérielle</string>\r
       <string id="HardwareAcceleration_Explain">Si cette stratégie est désactivée, l'accélération matérielle ne peut pas être activée.\r
 \r
       <string id="HardwareAcceleration">Accélération matérielle</string>\r
       <string id="HardwareAcceleration_Explain">Si cette stratégie est désactivée, l'accélération matérielle ne peut pas être activée.\r
 \r


@@ -536,6 +545,10 @@ Si cette stratégie est désactivée ou non configurée, Firefox utilise par dé
       <string id="TLS1_1">TLS 1.1</string>\r
       <string id="TLS1_2">TLS 1.2</string>\r
       <string id="TLS1_3">TLS 1.3</string>\r
       <string id="TLS1_1">TLS 1.1</string>\r
       <string id="TLS1_2">TLS 1.2</string>\r
       <string id="TLS1_3">TLS 1.3</string>\r

+      <string id="SupportMenu">Support Menu</string>\r
+      <string id="SupportMenu_Explain">If this policy is enabled, a new menuitem is added to the help menu with support information.\r
+\r
+If this policy is disabled or not configured, no menuitem is added.</string>\r

       <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.</string>\r
       <string id="Preferences_String_Explain">If this policy is enabled, the preference is locked to the string entered. If this policy is disabled, it has no effect.</string>\r
       <string id="Preferences_Enum_Explain">If this policy is enabled, the preference is locked to the value selected. If this policy is disabled, it has no effect.</string>\r
       <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.</string>\r
       <string id="Preferences_String_Explain">If this policy is enabled, the preference is locked to the string entered. If this policy is disabled, it has no effect.</string>\r
       <string id="Preferences_Enum_Explain">If this policy is enabled, the preference is locked to the value selected. If this policy is disabled, it has no effect.</string>\r


@@ -722,6 +735,20 @@ Si cette stratégie est désactivée ou non configurée, Firefox utilise par dé
       <presentation id="SSLVersion">\r
         <dropdownList refId="SSLVersion"/>\r
       </presentation>\r
       <presentation id="SSLVersion">\r
         <dropdownList refId="SSLVersion"/>\r
       </presentation>\r

+      <presentation id="SupportMenu">\r
+        <text>Title:</text>\r
+        <textBox refId="SupportMenuTitle">\r
+          <label/>\r
+        </textBox>\r
+        <text>URL:</text>\r
+        <textBox refId="SupportMenuURL">\r
+          <label/>\r
+        </textBox>\r
+        <text>Access key:</text>\r
+        <textBox refId="SupportMenuAccessKey">\r
+          <label/>\r
+        </textBox>\r
+      </presentation>\r

       <presentation id="Preferences_String">\r
         <textBox refId="Preferences_String">\r
           <label/>\r
       <presentation id="Preferences_String">\r
         <textBox refId="Preferences_String">\r
           <label/>\r


@@ -751,6 +778,9 @@ Si cette stratégie est désactivée ou non configurée, Firefox utilise par dé
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>\r
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>\r
       </presentation>\r
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>\r
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>\r
       </presentation>\r

+      <presentation id="ExtensionSettings">\r
+        <multiTextBox refId="ExtensionSettings"/>\r
+      </presentation>\r

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