Merge pull request #464 from drlellinger/patch-1

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index fef1dae17ea540e19579161b16c119cea21ce08a..43d4ffb150e79cceaae41846e7d38caa35ad84f0 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="1.7" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.10" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
     <stringTable >
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>
   <displayName/>
   <description/>
   <resources >
     <stringTable >
       <string id="SUPPORTED_WINXPSP2">Microsoft Windows XP SP2 or later</string>

+      <string id="UNSUPPORTED">No longer supported.</string>

       <string id="SUPPORTED_FF60">Firefox 60 or later, Firefox 60 ESR or later</string>
       <string id="SUPPORTED_FF62">Firefox 62 or later, Firefox 60.2 ESR or later</string>
       <string id="SUPPORTED_FF63">Firefox 63 or later</string>
       <string id="SUPPORTED_FF60">Firefox 60 or later, Firefox 60 ESR or later</string>
       <string id="SUPPORTED_FF62">Firefox 62 or later, Firefox 60.2 ESR or later</string>
       <string id="SUPPORTED_FF63">Firefox 63 or later</string>


@@ -14,6 +15,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>


@@ -56,9 +59,13 @@ If this policy is disabled or not configured, no websites are trusted to use NTL
 
 For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication.</string>
       <string id="Authentication_AllowNonFQDN">Allow Non FQDN</string>
 
 For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication.</string>
       <string id="Authentication_AllowNonFQDN">Allow Non FQDN</string>

-      <string id="Authentication_AllowNonFQDN_Explain">If this policy is enabled, you can always allow SPNEGO or NTLM on non FQDNs (fully qualified domain names).
+      <string id="Authentication_AllowNonFQDN_Explain">If this policy is enabled (and the checkboxes are checked), you can always allow SPNEGO or NTLM on non FQDNs (fully qualified domain names).

 
 If this policy is disabled or not configured, NTLM and SPNEGO are not enabled on non FQDNs.</string>
 
 If this policy is disabled or not configured, NTLM and SPNEGO are not enabled on non FQDNs.</string>

+      <string id="Authentication_AllowProxies">Allow Proxies</string>
+      <string id="Authentication_AllowProxies_Explain">If this disabled, SPNEGO and NTLM will not authenticate with proxy servers.
+
+If this policy is enabled (and the checkboxes are checked) or not configured, NTLM and SPNEGO will always authenticate with proxies.</string>

       <string id="BlockAboutAddons">Block Add-ons Manager</string>
       <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user cannot access the Add-ons Manager or about:addons.
 
       <string id="BlockAboutAddons">Block Add-ons Manager</string>
       <string id="BlockAboutAddons_Explain" >If this policy is enabled, the user cannot access the Add-ons Manager or about:addons.
 


@@ -218,13 +225,15 @@ If this policy is enabled or not configured, extensions will be updated automati
 
 If this policy is disabled or not configured, extensions will not be managed.
 
 
 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>
+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.
 
 If this policy is enabled or not configured, hardware acceleration is enabled.</string>
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
 If this policy is enabled or not configured, hardware acceleration is enabled.</string>

+      <string id="LegacyProfiles">Legacy Profiles</string>
+      <string id="LegacyProfiles_Explain">If this policy is enabled, Firefox will not try to create different profiles for installations of Firefox in different directories. This is the equivalent of the MOZ_LEGACY_PROFILES environment variable.
+
+If this policy is disabled or not configured, Firefox will create a new profile for each unique installation of Firefox.</string>

       <string id="LocalFileLinks">Local File Links</string>
       <string id="LocalFileLinks_Explain">If this policy is enabled, you can specify origins where linking to local files is allowed.
 
       <string id="LocalFileLinks">Local File Links</string>
       <string id="LocalFileLinks_Explain">If this policy is enabled, you can specify origins where linking to local files is allowed.
 


@@ -549,34 +558,65 @@ If this policy is disabled or not configured, Firefox defaults to a maximum of T
       <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="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>
+      <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:
+
+https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</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.
+
+For a description of the preference, see:
+
+https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</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.
+
+For a description of the preference, see:
+
+https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
+      <string id="Preferences_Unsupported_Explain">This preference is no longer support on Windows. We are investigating creating a policy.</string>
+      <string id="Preferences_accessibility_force_disabled_auto">Auto (0)</string>
+      <string id="Preferences_accessibility_force_disabled_off">Always Off (1)</string>

       <string id="Preferences_security_default_personal_cert_Ask_Every_Time">Ask Every Time</string>
       <string id="Preferences_security_default_personal_cert_Select_Automatically">Select Automatically</string>
       <string id="Preferences_security_default_personal_cert_Ask_Every_Time">Ask Every Time</string>
       <string id="Preferences_security_default_personal_cert_Select_Automatically">Select Automatically</string>

-      <string id="app_update_auto">app.update.auto</string>
+      <string id="accessibility_force_disabled">accessibility.force_disabled</string>
+      <string id="app_update_auto">app.update.auto (Deprecated)</string>
+      <string id="browser_bookmarks_autoExportHTML">browser.bookmarks.autoExportHTML</string>
+      <string id="browser_bookmarks_file">browser.bookmarks.file</string>
+      <string id="browser_bookmarks_restore_default_bookmarks">browser.bookmarks.restore_default_bookmarks</string>

       <string id="browser_cache_disk_enable">browser.cache.disk.enable</string>
       <string id="browser_fixup_dns_first_for_single_words">browser.fixup.dns_first_for_single_words</string>
       <string id="browser_cache_disk_enable">browser.cache.disk.enable</string>
       <string id="browser_fixup_dns_first_for_single_words">browser.fixup.dns_first_for_single_words</string>

+      <string id="browser_places_importBookmarksHTML">browser.places.importBookmarksHTML</string>
+      <string id="browser_safebrowsing_phishing_enabled">browser.safebrowsing.phishing.enabled</string>
+      <string id="browser_safebrowsing_malware_enabled">browser.safebrowsing.malware.enabled</string>

       <string id="browser_search_update">browser.search.update</string>
       <string id="browser_tabs_warnOnClose">browser.tabs.warnOnClose</string>
       <string id="browser_cache_disk_parent_directory">browser.cache.disk.parent_directory</string>
       <string id="browser_search_update">browser.search.update</string>
       <string id="browser_tabs_warnOnClose">browser.tabs.warnOnClose</string>
       <string id="browser_cache_disk_parent_directory">browser.cache.disk.parent_directory</string>

+      <string id="browser_slowStartup_notificationDisabled">browser.slowStartup.notificationDisabled</string>
+      <string id="browser_taskbar_previews_enable">browser.taskbar.previews.enable</string>

       <string id="browser_urlbar_suggest_bookmark">browser.urlbar.suggest.bookmark</string>
       <string id="browser_urlbar_suggest_history">browser.urlbar.suggest.history</string>
       <string id="browser_urlbar_suggest_openpage">browser.urlbar.suggest.openpage</string>
       <string id="datareporting_policy_dataSubmissionPolicyBypassNotification">datareporting.policy.dataSubmissionPolicyBypassNotification</string>
       <string id="browser_urlbar_suggest_bookmark">browser.urlbar.suggest.bookmark</string>
       <string id="browser_urlbar_suggest_history">browser.urlbar.suggest.history</string>
       <string id="browser_urlbar_suggest_openpage">browser.urlbar.suggest.openpage</string>
       <string id="datareporting_policy_dataSubmissionPolicyBypassNotification">datareporting.policy.dataSubmissionPolicyBypassNotification</string>

+      <string id="dom_allow_scripts_to_close_windows">dom.allow_scripts_to_close_windows</string>

       <string id="dom_disable_window_flip">browser.dom.disable_window_flip</string>
       <string id="dom_disable_window_move_resize">dom.disable_window_move_resize</string>
       <string id="dom_event_contextmenu_enabled">dom.event.contextmenu.enabled</string>
       <string id="dom_keyboardevent_keypress_hack_dispatch_non_printable_keys_addl">dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl</string>
       <string id="dom_keyboardevent_keypress_hack_use_legacy_keycode_and_charcode_addl">dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl</string>
       <string id="dom_disable_window_flip">browser.dom.disable_window_flip</string>
       <string id="dom_disable_window_move_resize">dom.disable_window_move_resize</string>
       <string id="dom_event_contextmenu_enabled">dom.event.contextmenu.enabled</string>
       <string id="dom_keyboardevent_keypress_hack_dispatch_non_printable_keys_addl">dom.keyboardevent.keypress.hack.dispatch_non_printable_keys.addl</string>
       <string id="dom_keyboardevent_keypress_hack_use_legacy_keycode_and_charcode_addl">dom.keyboardevent.keypress.hack.use_legacy_keycode_and_charcode.addl</string>

+      <string id="extensions_blocklist_enabled">extensions.blocklist.enabled</string>
+      <string id="geo_enabled">geo.enabled</string>

       <string id="extensions_getAddons_showPane">extensions.getAddons.showPane</string>
       <string id="extensions_getAddons_showPane">extensions.getAddons.showPane</string>

+      <string id="intl_accept_languages">intl.accept_languages</string>
+      <string id="media_eme_enabled">media.eme.enabled</string>

       <string id="media_gmp-gmpopenh264_enabled">media.gmp-gmpopenh264.enabled</string>
       <string id="media_gmp-widevinecdm_enabled">media.gmp-widevinecdm.enabled</string>
       <string id="network_dns_disableIPv6">network.dns.disableIPv6</string>
       <string id="network_IDN_show_punycode">network.IDN_show_punycode</string>
       <string id="places_history_enabled">places.history.enabled</string>
       <string id="media_gmp-gmpopenh264_enabled">media.gmp-gmpopenh264.enabled</string>
       <string id="media_gmp-widevinecdm_enabled">media.gmp-widevinecdm.enabled</string>
       <string id="network_dns_disableIPv6">network.dns.disableIPv6</string>
       <string id="network_IDN_show_punycode">network.IDN_show_punycode</string>
       <string id="places_history_enabled">places.history.enabled</string>

+      <string id="print_save_print_settings">print.save_print_settings</string>

       <string id="security_default_personal_cert">security.default_personal_cert</string>
       <string id="security_ssl_errorReporting_enabled">security.ssl.errorReporting.enabled</string>
       <string id="security_default_personal_cert">security.default_personal_cert</string>
       <string id="security_ssl_errorReporting_enabled">security.ssl.errorReporting.enabled</string>

+      <string id="security_mixed_content_block_active_content">security.mixed_content.block_active_content</string>

       <string id="ui_key_menuAccessKeyFocuses">ui.key.menuAccessKeyFocuses</string>
     </stringTable>
     <presentationTable>
       <string id="ui_key_menuAccessKeyFocuses">ui.key.menuAccessKeyFocuses</string>
     </stringTable>
     <presentationTable>


@@ -592,6 +632,10 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="Authentication_AllowNonFQDN_NTLM">Always allow NTLM on non FQDNs</checkBox>
         <checkBox refId="Authentication_AllowNonFQDN_SPNEGO">Always allow SPNEGO on non FQDNs</checkBox>
       </presentation>
         <checkBox refId="Authentication_AllowNonFQDN_NTLM">Always allow NTLM on non FQDNs</checkBox>
         <checkBox refId="Authentication_AllowNonFQDN_SPNEGO">Always allow SPNEGO on non FQDNs</checkBox>
       </presentation>

+      <presentation id="Authentication_AllowProxies">
+        <checkBox refId="Authentication_AllowProxies_NTLM">Allow NTLM to automatically authenticate with proxy servers</checkBox>
+        <checkBox refId="Authentication_AllowProxies_SPNEGO">Allow SPNEGO to automatically authenticate with proxy servers</checkBox>
+      </presentation>

       <presentation id="Certificates_Install">
         <listBox refId="Certificates_Install"/>
       </presentation>
       <presentation id="Certificates_Install">
         <listBox refId="Certificates_Install"/>
       </presentation>


@@ -754,6 +798,9 @@ If this policy is disabled or not configured, no menuitem is added.</string>
           <label/>
         </textBox>
       </presentation>
           <label/>
         </textBox>
       </presentation>

+      <presentation id="Preferences_accessibility_force_disabled">
+        <dropdownList refId="Preferences_accessibility_force_disabled"/>
+      </presentation>

       <presentation id="Preferences_security_default_personal_cert">
         <dropdownList refId="Preferences_security_default_personal_cert"/>
       </presentation>
       <presentation id="Preferences_security_default_personal_cert">
         <dropdownList refId="Preferences_security_default_personal_cert"/>
       </presentation>


@@ -779,10 +826,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>
       </presentation>
       <presentation id="ExtensionSettings">
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">

-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>

       </presentation>
     </presentationTable>
   </resources>
       </presentation>
     </presentationTable>
   </resources>