Merge pull request #414 from mozilla/ExtensionSettings

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 01ebeae8c8a5de0328f1631aee407f6c2cec6699..0dde6b6c9e06fd9c460c212cddc39071c79405fb 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="1.5" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.6.1" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
@@ -12,6 +12,7 @@
       <string id="SUPPORTED_FF66">Firefox 66 or later, Firefox 60.6 ESR or later</string>
       <string id="SUPPORTED_FF67">Firefox 67 or later, Firefox 60.7 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="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
@@ -97,7 +98,7 @@ If this policy is disabled or not configured, the default Firefox download direc
       <string id="DownloadDirectory">Download Directory</string>
       <string id="DownloadDirectory_Explain">If this policy is enabled, you can set and lock the directory for downloads. ${home} can be used for the native home path.
 
-If this policy is disabled or not configured, the default Firefox download directory is used and the user cna change it.</string>
+If this policy is disabled or not configured, the default Firefox download directory is used and the user can change it.</string>
       <string id="DNSOverHTTPS">Configure DNS Over HTTPS</string>
       <string id="DNSOverHTTPS_Explain">If this policy is enabled, the default configuration for DNS over HTTPS can be changed.
 
@@ -212,6 +213,14 @@ 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="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
+
+You must remove all new lines when inserting the JSON. We will be fixing this in a future release.</string>
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
@@ -335,6 +344,10 @@ If this policy is disabled or not configured, any site that is not in the Block
       <string id="Notifications_Locked_Explain">If this policy is enabled, notification preferences cannot be changed by the user.
 
 If this policy is disabled or not configured, the user can change their notification preferences.</string>
+      <string id="FirefoxHome">Customize Firefox Home</string>
+      <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.
+
+If this policy is disabled or not configured, the default sections are displayed and the user can change them.</string>
       <string id="FlashPlugin_Allow_Explain">If this policy is enabled, Flash is activated by default for the origins indicated unless Flash is completely disabled. If a top level domain is specified (http://example.org), Flash is allowed for all subdomains as well.
 
 If this policy is disabled or not configured, the default Flash policy is followed.</string>
@@ -478,6 +491,7 @@ If this policy is disabled, tracking protection is disabled and locked in both t
 
 If this policy is enabled, private browsing is enabled by default in both the browser and private browsing and you can choose whether or not to prevent the user from changing it.</string>
       <string id="RequestedLocales">Requested locale</string>
+      <string id="RequestedLocalesString">Requested locale (string)</string>
       <string id="RequestedLocales_Explain">If this policy is enabled, you can specify a list of requested locales for the application in order of preference. It will cause the corresponding language pack to become active.
 
 If this policy is disabled or not configured, the application will use the default locale.</string>
@@ -531,6 +545,10 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
       <string id="TLS1_1">TLS 1.1</string>
       <string id="TLS1_2">TLS 1.2</string>
       <string id="TLS1_3">TLS 1.3</string>
+      <string id="SupportMenu">Support Menu</string>
+      <string id="SupportMenu_Explain">If this policy is enabled, a new menuitem is added to the help menu with support information.
+
+If this policy is disabled or not configured, no menuitem is added.</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.</string>
       <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>
       <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>
@@ -659,6 +677,9 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
         <textBox refId="SearchEngine_SuggestURLTemplate">
           <label>Suggest URL Template:</label>
         </textBox>
+        <textBox refId="SearchEngine_PostData">
+          <label>POST data:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
@@ -714,6 +735,20 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
       <presentation id="SSLVersion">
         <dropdownList refId="SSLVersion"/>
       </presentation>
+      <presentation id="SupportMenu">
+        <text>Title:</text>
+        <textBox refId="SupportMenuTitle">
+          <label/>
+        </textBox>
+        <text>URL:</text>
+        <textBox refId="SupportMenuURL">
+          <label/>
+        </textBox>
+        <text>Access key:</text>
+        <textBox refId="SupportMenuAccessKey">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Preferences_String">
         <textBox refId="Preferences_String">
           <label/>
@@ -735,6 +770,20 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
         <checkBox refId="SanitizeOnShutdown_SiteSettings">Site Preferences</checkBox>
         <checkBox refId="SanitizeOnShutdown_OfflineApps">Offline Website Data</checkBox>
       </presentation>
+      <presentation id="FirefoxHome">
+        <checkBox refId="FirefoxHome_Search">Search</checkBox>
+        <checkBox refId="FirefoxHome_TopSites">Top Sites</checkBox>
+        <checkBox refId="FirefoxHome_Highlights">Download History</checkBox>
+        <checkBox refId="FirefoxHome_Pocket">Recommended by Pocket</checkBox>
+        <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"/> -->
+        <textBox refId="ExtensionSettings">
+          <label/>
+        </textBox>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>