Merge pull request #446 from Jonathan57500/master

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 27ba1db490553a8b37e9ec9b7e8cfd34dd65b02d..41a58156cad432a92e97380c502c90c307be4f88 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="1.6" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.9" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -14,6 +14,8 @@
       <string id="SUPPORTED_FF68">Firefox 68 or later, Firefox 68 ESR or later</string>
       <string id="SUPPORTED_FF6801">Firefox 68.0.1 or later, Firefox 68.0.1 ESR or later</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>
       <string id="SUPPORTED_FF68">Firefox 68 or later, Firefox 68 ESR or later</string>
       <string id="SUPPORTED_FF6801">Firefox 68.0.1 or later, Firefox 68.0.1 ESR or later</string>
       <string id="SUPPORTED_FF60ESR">Firefox 60 ESR or later</string>

+      <string id="SUPPORTED_FF69">Firefox 69 or later, Firefox 68.1 ESR or later</string>
+      <string id="SUPPORTED_FF70">Firefox 70 or later, Firefox 68.2 ESR or later</string>

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


@@ -213,6 +215,12 @@ If this policy is disabled or not configured, no extensions are locked</string>
       <string id="ExtensionUpdate_Explain">If this policy is disabled, extensions will not be updated automatically.
 
 If this policy is enabled or not configured, extensions will be updated automatically.</string>
       <string id="ExtensionUpdate_Explain">If this policy is disabled, extensions will not be updated automatically.
 
 If this policy is enabled or not configured, extensions will be updated automatically.</string>

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

       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 


@@ -770,6 +778,9 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>

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

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>