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 fb30c5d128bc4e160b9a0ca73a035e3f07398025..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
-<policyDefinitionResources revision="1.6.1" schemaVersion="1.0" >\r
+<policyDefinitionResources revision="1.9" schemaVersion="1.0" >\r
   <displayName/>\r
   <description/>\r
   <resources >\r
@@ -14,6 +14,8 @@
       <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_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
@@ -214,9 +216,11 @@ Si cette stratégie est désactivée ou non configurée, aucune extension n'est
 \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. For detailed information, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings\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.</string>\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
@@ -775,10 +779,7 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>\r
       </presentation>\r
       <presentation id="ExtensionSettings">\r
-<!--        <multiTextBox refId="ExtensionSettings"/> -->\r
-        <textBox refId="ExtensionSettings">\r
-          <label/>\r
-        </textBox>\r
+        <multiTextBox refId="ExtensionSettings"/>\r
       </presentation>\r
     </presentationTable>\r
   </resources>\r