Merge pull request #701 from petercpg/1022_zhtw

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index de5d5a7f3ad755b51ed717f0e61ed934625ec21e..759d576adbe35e9816f890717044c61ddfb80231 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"?>
-<policyDefinitionResources revision="2.2" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.4" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
@@ -32,6 +32,11 @@
       <string id="SUPPORTED_FF79">Firefox 79 or later, Firefox 78.1 ESR or later</string>
       <string id="SUPPORTED_FF80">Firefox 80 or later, Firefox 78.2 ESR or later</string>
       <string id="SUPPORTED_FF81">Firefox 81 or later, Firefox 78.3 ESR or later</string>
+      <string id="SUPPORTED_FF82">Firefox 82 or later, Firefox 78.4 ESR or later</string>
+      <string id="SUPPORTED_FF83">Firefox 83 or later, Firefox 78.5 ESR or later</string>
+      <string id="SUPPORTED_FF84">Firefox 84 or later, Firefox 78.6 ESR or later</string>
+      <string id="SUPPORTED_FF85">Firefox 85 or later, Firefox 78.7 ESR or later</string>
+      <string id="SUPPORTED_FF86">Firefox 86 or later, Firefox 78.8 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
@@ -50,7 +55,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
       <string id="Search_group">Search</string>
-      <string id="Preferences_group">Preferences</string>
+      <string id="Preferences_group">Preferences (Deprecated)</string>
       <string id="UserMessaging_group">User Messaging</string>
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
@@ -176,7 +181,7 @@ If this policy is disabled or not configured, the browser receives updates.</str
       <string id="DisableBuiltinPDFViewer_Explain">If this policy is enabled, PDF files are not viewed within Firefox.
 
 If this policy is disabled or not configured, PDF files are viewed within Firefox.</string>
-      <string id="DisableDefaultBrowserAgent">Disable the default browser agent.</string>
+      <string id="DisableDefaultBrowserAgent">Disable the default browser agent</string>
       <string id="DisableDefaultBrowserAgent_Explain">If this policy is enabled, the default browser agent is disabled.
 
 If this policy is disabled or not configured, the default browser agent is enabled.
@@ -804,6 +809,12 @@ If this policy is not configured, users can choose to create a primary password.
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="Preferences">Preferences</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
       <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.
 
 For a description of the preference, see:
@@ -1108,6 +1119,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>