Revert "Merge pull request #2 from drlellinger/AppUpdateURL-fix"

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 6e9bfe9346a3645d99a3d86b595927e84034894a..8cafcfa8d79905a13bf89db606f1a250e495ccf9 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,12 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="1.0" schemaVersion="1.0" >
+<?xml version="1.0" encoding="utf-8"?>
+<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_FF64">Firefox 64 or later, Firefox 60.4 ESR or later</string>
+      <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="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="SUPPORTED_FF71">Firefox 71 or later, Firefox 68.3 ESR or later</string>

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

+      <string id="Camera_group">Camera</string>
+      <string id="Microphone_group">Microphone</string>
+      <string id="Location_group">Location</string>
+      <string id="Notifications_group">Notifications</string>

       <string id="Authentication_group">Authentication</string>
       <string id="Bookmarks_group">Bookmarks</string>
       <string id="Certificates_group">Certificates</string>
       <string id="Authentication_group">Authentication</string>
       <string id="Bookmarks_group">Bookmarks</string>
       <string id="Certificates_group">Certificates</string>


@@ -16,70 +33,160 @@
       <string id="Extensions_group">Extensions</string>
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
       <string id="Extensions_group">Extensions</string>
       <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="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>
       <string id="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>

+      <string id="AppUpdateURL">Custom Update URL</string>
+      <string id="AppUpdateURL_Explain">If this policy is enabled, you can set a URL to an update server other than the default. This could be helpful if you run your own update server on your network.
+
+If this policy is disabled or not configured, the default update URL is used.</string>

       <string id="Authentication_SPNEGO">SPNEGO</string>
       <string id="Authentication_SPNEGO">SPNEGO</string>

-      <string id="Authentication_SPNEGO_Explain">List of sites that are permitted to engage in SPNEGO authentication with the browser.</string>
+      <string id="Authentication_SPNEGO_Explain">If this policy is enabled, the specified websites are permitted to engage in SPNEGO authentication with the browser. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
+
+If this policy is disabled or not configured, no websites are permitted to engage in SPNEGO authentication with the browser.
+
+For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication.</string>

       <string id="Authentication_Delegated">Delegated</string>
       <string id="Authentication_Delegated">Delegated</string>

-      <string id="Authentication_Delegated_Explain">List of sites for which the browser may delegate user authorization to the server.</string>
+      <string id="Authentication_Delegated_Explain">If this policy is enabled, the browser may delegate user authorization to the server for the specified websites. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
+
+If this policy is disabled or not configured, the browser will not delegate user authorization to the server for any websites.
+
+For more information, see https://developer.mozilla.org/en-US/docs/Mozilla/Integrated_authentication.</string>

       <string id="Authentication_NTLM">NTLM</string>
       <string id="Authentication_NTLM">NTLM</string>

-      <string id="Authentication_NTLM_Explain">List of sites trusted to use NTLM authentification.</string>
-      <string id="BlockAboutAddons">Block About Addons</string>
-      <string id="BlockAboutAddons_Explain" >Block access to the Add-ons Mananger (about:addons).</string>      
-      <string id="BlockAboutConfig">Block About Config</string>
-      <string id="BlockAboutConfig_Explain">Blocks access to the about:config page.</string>
-      <string id="BlockAboutProfiles">Block About Profiles</string>
-      <string id="BlockAboutProfiles_Explain">Blocks access to the about:profiles page.</string>
-      <string id="BlockAboutSupport">Block About Support</string>
-      <string id="BlockAboutSupport_Explain">Blocks access to the about:support page.</string>
+      <string id="Authentication_NTLM_Explain">If this policy is enabled, the specified websites are trusted to use NTLM authentification. Entries in the list are formatted as mydomain.com or https://myotherdomain.com.
+
+If this policy is disabled or not configured, no websites are trusted to use NTLM authentification.
+
+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 (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>
+      <string id="Authentication_AllowProxies">Allow Proxies</string>
+      <string id="Authentication_AllowProxies_Explain">If this policy is 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="Authentication_Locked">Do not allow authentication preferences to be changed</string>
+      <string id="Authentication_Locked_Explain">If this policy is disabled, authentication preferences can be changed by the user.
+
+If this policy is enabled or not configured, authentication preferences cannot be changed by the user.</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.
+
+If this policy is disabled or not configured, the user can access the Add-ons Manager and about:addons.</string>
+      <string id="BlockAboutConfig">Block about:config</string>
+      <string id="BlockAboutConfig_Explain">If this policy is enabled, the user cannot access about:config.
+
+If this policy is disabled or not configured, the user can access about:config.</string>
+      <string id="BlockAboutProfiles">Block about:profiles</string>
+      <string id="BlockAboutProfiles_Explain">If this policy is enabled, the user cannot access about:profiles.
+
+If this policy is disabled or not configured, the user can access about:profiles.</string>
+      <string id="BlockAboutSupport">Block Troubleshooting Information</string>
+      <string id="BlockAboutSupport_Explain">If this policy is enabled, the user cannot access Troubleshooting Information or about:support.
+
+If this policy is disabled or not configured, the user can access Troubleshooting Information and about:support.</string>

       <string id="DisableSetDesktopBackground">Disable Set Desktop Background</string>
       <string id="DisableSetDesktopBackground">Disable Set Desktop Background</string>

-      <string id="DisableSetDesktopBackground_Explain">If this policy is enabled, the user can not set an image as their desktop background.
+      <string id="DisableSetDesktopBackground_Explain">If this policy is enabled, the user cannot set an image as their desktop background.

 
 If this policy is disabled or not configured, users can set images as their desktop background.</string>
 
 If this policy is disabled or not configured, users can set images as their desktop background.</string>

+      <string id="CaptivePortal">Captive Portal</string>
+      <string id="CaptivePortal_Explain">If this policy is disabled, captive portal support is disabled.
+
+If this policy is enabled or not configured, captive portal support is enabled.</string>

       <string id="Certificates_ImportEnterpriseRoots">Import Enterprise Roots</string>
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
 If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store.</string>
       <string id="Certificates_ImportEnterpriseRoots">Import Enterprise Roots</string>
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
 If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store.</string>

+      <string id="Certificates_Install">Install Certificates</string>
+      <string id="Certificates_Install_Explain">If this policy is enabled, Firefox will install the listed certificates into Firefox. It will look in %USERPROFILE%\AppData\Local\Mozilla\Certificates and %USERPROFILE%\AppData\Roaming\Mozilla\Certificates.
+
+If this policy is disabled or not configured, Firefox will not install additional certificates.</string>
+      <string id="DefaultDownloadDirectory">Default Download Directory</string>
+      <string id="DefaultDownloadDirectory_Explain">If this policy is enabled, you can set the default 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.</string>
+      <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 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.
+
+If this policy is disabled or not configured, DNS Over HTTPS uses the default Firefox configuration.</string>

       <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
       <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
 
 If this policy is disabled or not configured, users can create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>
       <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
       <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
 
 If this policy is disabled or not configured, users can create a master password.</string>
       <string id="DisableAppUpdate">Disable Update</string>

-      <string id="DisableAppUpdate_Explain">Prevent the browser from updating.</string>
-      <string id="DisableBuiltinPDFViewer">Disable Builtin PDF Viewer</string>
-      <string id="DisableBuiltinPDFViewer_Explain">Disables PDF.js, which displays PDFs within Firefox.</string>
+      <string id="DisableAppUpdate_Explain">If this policy is enabled, the browser does not receive updates.
+
+If this policy is disabled or not configured, the browser receives updates.</string>
+      <string id="DisableBuiltinPDFViewer">Disable Built-in PDF Viewer (PDF.js)</string>
+      <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="DisableDeveloperTools">Disable Developer Tools</string>
       <string id="DisableDeveloperTools">Disable Developer Tools</string>

-      <string id="DisableDeveloperTools_Explain">Prevents access to developer tools.</string>
+      <string id="DisableDeveloperTools_Explain">If this policy is enabled, web developer tools are not available within Firefox.
+
+If this policy is disabled or not configured, web developer tools are available within Firefox.</string>

       <string id="DisableFeedbackCommands">Disable Feedback Commands</string>
       <string id="DisableFeedbackCommands">Disable Feedback Commands</string>

-      <string id="DisableFeedbackCommands_Explain">Prevents ability to send feedback from the help menu (&quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot;).</string>
+      <string id="DisableFeedbackCommands_Explain">If this policy is enabled, the &quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot; menuitems are not available from the help menu.
+
+If this policy is disabled or not configured, the &quot;Submit Feedback&quot; and &quot;Report Deceptive Site&quot; menuitems are available from the help menu.</string>

       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>
       <string id="DisableFirefoxAccounts">Disable Firefox Accounts</string>

-      <string id="DisableFirefoxAccounts_Explain">Disables Firefox Account based services, including Sync.</string>
+      <string id="DisableFirefoxAccounts_Explain">If this policy is enabled, Firefox Accounts is disabled which includes disabling Sync.
+
+If this policy is disabled or not configured, Firefox Accounts and Sync are available.</string>

       <string id="DisableFirefoxScreenshots">Disable Firefox Screenshots</string>
       <string id="DisableFirefoxScreenshots">Disable Firefox Screenshots</string>

-      <string id="DisableFirefoxScreenshots_Explain">Prevents usage of the Firefox Screenshots feature.</string>
+      <string id="DisableFirefoxScreenshots_Explain">If this policy is enabled, Firefox Screenshots is not available.
+
+If this policy is disabled or not configured, Firefox Screenshots is available.</string>

       <string id="DisableFirefoxStudies">Disable Firefox Studies</string>
       <string id="DisableFirefoxStudies">Disable Firefox Studies</string>

-      <string id="DisableFirefoxStudies_Explain">Prevents Firefox from running studies.</string>
+      <string id="DisableFirefoxStudies_Explain">If this policy is enabled, Firefox will never run SHIELD studies or do Heartbeat surveys.
+
+If this policy is disabled or not configured, the user can choose to enable SHIELD studies or Heartbeat surveys.
+
+For more information, see https://support.mozilla.org/en-US/kb/shield and https://wiki.mozilla.org/Firefox/Shield/Heartbeat</string>

       <string id="DisableForgetButton">Disable Forget Button</string>
       <string id="DisableForgetButton_Explain">If this policy is enabled, the &quot;Forget&quot; button is not available.
 
 If this policy is disabled or not configured, the &quot;Forget&quot; button is available.</string>
       <string id="DisableFormHistory">Disable Form History</string>
       <string id="DisableForgetButton">Disable Forget Button</string>
       <string id="DisableForgetButton_Explain">If this policy is enabled, the &quot;Forget&quot; button is not available.
 
 If this policy is disabled or not configured, the &quot;Forget&quot; button is available.</string>
       <string id="DisableFormHistory">Disable Form History</string>

-      <string id="DisableFormHistory_Explain">Don't remember search and form history.</string>
+      <string id="DisableFormHistory_Explain">If this policy is enabled, Firefox will not remember form or search history.
+
+If this policy is disabled or not configured, Firefox will remember form and search history.</string>
+      <string id="DisablePasswordReveal">Do not allow passwords to be revealed in saved logins</string>
+      <string id="DisablePasswordReveal_Explain">If this policy is enabled, users cannot show passwords in saved logins.
+
+If this policy is disabled or not configured, users can show passwords in saved logins.</string>

       <string id="DisablePocket">Disable Pocket</string>
       <string id="DisablePocket">Disable Pocket</string>

-      <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
+      <string id="DisablePocket_Explain">If this policy is enabled, Pocket is not available.
+
+If this policy is disabled or not configured, Pocket is available.</string>

       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>

-      <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</string>
+      <string id="DisablePrivateBrowsing_Explain">If this policy is enabled, private browsing is not allowed.
+
+If this policy is disabled or not configured, private browsing is allowed.</string>
+      <string id="DisableProfileImport">Disable Profile Import</string>
+      <string id="DisableProfileImport_Explain">If this policy is enabled, the &quot;Import data from another browser&quot; option is not available in the bookmarks window.
+
+If this policy is disabled or not configured, the &quot;Import data from another browser&quot; option is available.</string>

       <string id="DisableProfileRefresh">Disable Profile Refresh</string>
       <string id="DisableProfileRefresh_Explain">If this policy is enabled, the &quot;Refresh Firefox&quot; button is not available on the about:support page or on support.mozilla.org.
 
 If this policy is disabled or not configured, the &quot;Refresh Firefox&quot; button is available.</string>
       <string id="DisableSafeMode">Disable Safe Mode</string>
       <string id="DisableProfileRefresh">Disable Profile Refresh</string>
       <string id="DisableProfileRefresh_Explain">If this policy is enabled, the &quot;Refresh Firefox&quot; button is not available on the about:support page or on support.mozilla.org.
 
 If this policy is disabled or not configured, the &quot;Refresh Firefox&quot; button is available.</string>
       <string id="DisableSafeMode">Disable Safe Mode</string>

-      <string id="DisableSafeMode_Explain">Prevents ability to restart in safe mode.</string>
+      <string id="DisableSafeMode_Explain">If this policy is enabled, the user cannot restart the browser into safe mode.
+
+If this policy is disabled or not configured, safe mode is allowed.</string>

       <string id="DisableSecurityBypass_InvalidCertificate">Prevent overriding certificate errors</string>
       <string id="DisableSecurityBypass_InvalidCertificate_Explain">If this policy is enabled, the &quot;Add Exception&quot; button is not available when a certificate is invalid. This prevents the user from overriding the certificate error.
 
 If this policy is disabled or not configured, certificate errors can be overridden.</string>
       <string id="DisableSecurityBypass_SafeBrowsing">Prevent overriding safe browsing errors</string>
       <string id="DisableSecurityBypass_InvalidCertificate">Prevent overriding certificate errors</string>
       <string id="DisableSecurityBypass_InvalidCertificate_Explain">If this policy is enabled, the &quot;Add Exception&quot; button is not available when a certificate is invalid. This prevents the user from overriding the certificate error.
 
 If this policy is disabled or not configured, certificate errors can be overridden.</string>
       <string id="DisableSecurityBypass_SafeBrowsing">Prevent overriding safe browsing errors</string>

-      <string id="DisableSecurityBypass_SafeBrowsing_Explain">If this policy is enabled, a user can not bypass the warning and visit a harmful site.
+      <string id="DisableSecurityBypass_SafeBrowsing_Explain">If this policy is enabled, a user cannot bypass the warning and visit a harmful site.

 
 If this policy is disabled or not configured, a user can choose to visit a harmful site.</string>
       <string id="DisableSystemAddonUpdate">Disable System Addon Updates</string>
 
 If this policy is disabled or not configured, a user can choose to visit a harmful site.</string>
       <string id="DisableSystemAddonUpdate">Disable System Addon Updates</string>


@@ -91,32 +198,74 @@ If this policy is disabled or not configured, system add-ons are installed and u
 
 If this policy is disabled or not configured, telemetry is collected and uploaded.
 
 
 If this policy is disabled or not configured, telemetry is collected and uploaded.
 

-Mozilla strongly recommends that you do NOT disable telemetry if you do not have a business need to do so.</string>
+Mozilla recommends that you do not disable telemetry. Information collected through telemetry helps us build a better product for businesses like yours.</string>

       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>
       <string id="DisplayBookmarksToolbar">Display Bookmarks Toolbar</string>

-      <string id="DisplayBookmarksToolbar_Explain">Causes the bookmarks toolbar to be displayed by default.</string>
+      <string id="DisplayBookmarksToolbar_Explain">If this policy is enabled, the bookmarks toolbar is displayed by default. The user can still hide it.
+
+If this policy is disabled or not configured, the bookmarks toolbar is not displayed by default.</string>

       <string id="DisplayMenuBar">Display Menu Bar</string>
       <string id="DisplayMenuBar">Display Menu Bar</string>

-      <string id="DisplayMenuBar_Explain">Causes the menu bar to be displayed by default.</string>
+      <string id="DisplayMenuBar_Explain">If this policy is enabled, the menu bar is displayed by default. The user can still hide it.
+
+If this policy is disabled or not configured, the menu bar is not displayed by default.</string>

       <string id="DontCheckDefaultBrowser">Don't Check Default Browser</string>
       <string id="DontCheckDefaultBrowser">Don't Check Default Browser</string>

-      <string id="DontCheckDefaultBrowser_Explain">Don't check for the default browser on startup.</string>
-      <string id="Extensions_Install">Install</string>
+      <string id="DontCheckDefaultBrowser_Explain">If this policy is enabled, Firefox does not check to see if it is the default browser at startup.
+
+If this policy is disabled or not configured, Firefox checks to see if it is the default browser at startup.</string>
+      <string id="Extensions_Install">Extensions to Install</string>

       <string id="Extensions_Install_Explain">If this policy is enabled, you can specify a list of extension URLs or paths that will be installed when Firefox is started.
 Anytime this list is changed, the extensions will be reinstalled.
 
 If this policy is disabled or not configured, no extensions are installed.</string>
       <string id="Extensions_Install_Explain">If this policy is enabled, you can specify a list of extension URLs or paths that will be installed when Firefox is started.
 Anytime this list is changed, the extensions will be reinstalled.
 
 If this policy is disabled or not configured, no extensions are installed.</string>

-      <string id="Extensions_Uninstall">Uninstall</string>
+      <string id="Extensions_Uninstall">Extensions to Uninstall</string>

       <string id="Extensions_Uninstall_Explain">If this policy is enabled, you can specify a list of extension IDs that will be uninstalled.
 Anytime this list is changed, the extensions will be uninstalled.
 
 If this policy is disabled or not configured, no extensions are uninstalled.</string>
       <string id="Extensions_Uninstall_Explain">If this policy is enabled, you can specify a list of extension IDs that will be uninstalled.
 Anytime this list is changed, the extensions will be uninstalled.
 
 If this policy is disabled or not configured, no extensions are uninstalled.</string>

-      <string id="Extensions_Locked">Locked</string>
+      <string id="Extensions_Locked">Prevent extensions from being disabled or removed</string>

       <string id="Extensions_Locked_Explain">If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable.
 
       <string id="Extensions_Locked_Explain">If this policy is enabled, you can specify a list of extension IDs that the user will be unable to uninstall or disable.
 

-If this policy is disabled or not configured, no extensions are locked.</string>
+If this policy is disabled or not configured, no extensions are locked</string>
+      <string id="ExtensionUpdate">Extension Update</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.
+
+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.
+
+If this policy is disabled or not configured, websites can't link to local files.</string>
+      <string id="NetworkPrediction">Network Prediction</string>
+      <string id="NetworkPrediction_Explain">If this policy is disabled, network prediction (DNS prefetching) will be disabled.
+
+If this policy is enabled or not configured, network prediction (DNS prefetching) will be enabled.</string>
+      <string id="NewTabPage">New Tab Page</string>
+      <string id="NewTabPage_Explain">If this policy is disabled, the new tab page will be blank.
+
+If this policy is enabled or not configured, the new tab page will be the default.</string>

       <string id="OfferToSaveLogins">Offer to save logins</string>
       <string id="OfferToSaveLogins_Explain">If this policy is enabled or not configured, Firefox will offer to save website logins and passwords.
 
       <string id="OfferToSaveLogins">Offer to save logins</string>
       <string id="OfferToSaveLogins_Explain">If this policy is enabled or not configured, Firefox will offer to save website logins and passwords.
 

-If this policy is disabled, firefox will not offer to save website logins and passwords.</string>
-      <string id="PopupBlocking_Allow_Explain">If this policy is enabled, pop-up windows are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well.
+If this policy is disabled, Firefox will not offer to save website logins and passwords.</string>
+      <string id="OfferToSaveLoginsDefault">Offer to save logins (default)</string>
+      <string id="OfferToSaveLoginsDefault_Explain">If this policy is enabled or not configured, Firefox will offer to save website logins and passwords.
+
+If this policy is disabled, Firefox will not offer to save website logins and passwords.
+
+In either case, the user will be able to change the value (it is not locked).</string>
+      <string id="PopupBlocking_Allow_Explain">If this policy is enabled, pop-up windows are always allowed for the origins indicated. If a top level domain is specified (http://example.org), pop-up windows are allowed for all subdomains as well.

 
 If this policy is disabled or not configured, the default pop-up policy is followed.</string>
       <string id="PopupBlocking_Default">Allow pop-ups from websites</string>
 
 If this policy is disabled or not configured, the default pop-up policy is followed.</string>
       <string id="PopupBlocking_Default">Allow pop-ups from websites</string>


@@ -124,20 +273,20 @@ If this policy is disabled or not configured, the default pop-up policy is follo
 
 If this policy is not configured or enabled, popups are not allowed from websites.</string>
       <string id="PopupBlocking_Locked">Do not allow preferences to be changed</string>
 
 If this policy is not configured or enabled, popups are not allowed from websites.</string>
       <string id="PopupBlocking_Locked">Do not allow preferences to be changed</string>

-      <string id="PopupBlocking_Locked_Explain">If this policy is enabled pop-up preferences cannot be changed by the user.
+      <string id="PopupBlocking_Locked_Explain">If this policy is enabled, pop-up preferences cannot be changed by the user.

 
 If this policy is disabled or not configured, the user can change their pop-up preferences.</string>
 
 If this policy is disabled or not configured, the user can change their pop-up preferences.</string>

-      <string id="InstallAddonsPermission_Allow_Explain">If this policy is enabled, add-ons are always allowed for the URLS indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well.
+      <string id="InstallAddonsPermission_Allow_Explain">If this policy is enabled, add-ons are always allowed for the origins indicated unless add-on install is disabled. If a top level domain is specified (http://example.org), add-ons are allowed for all subdomains as well.

 
 If this policy is disabled or not configured, the default add-on policy is followed.</string>
       <string id="InstallAddonsPermission_Default">Allow add-on installs from websites</string>
       <string id="InstallAddonsPermission_Default_Explain">If this policy is disabled, add-ons cannot be installed.
 
 If this policy is not configured or enabled, add-ons can be installed.</string>
 
 If this policy is disabled or not configured, the default add-on policy is followed.</string>
       <string id="InstallAddonsPermission_Default">Allow add-on installs from websites</string>
       <string id="InstallAddonsPermission_Default_Explain">If this policy is disabled, add-ons cannot be installed.
 
 If this policy is not configured or enabled, add-ons can be installed.</string>

-      <string id="Cookies_Allow_Explain">If this policy is enabled, cookies are always allowed for the URLS indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.
+      <string id="Cookies_Allow_Explain">If this policy is enabled, cookies are always allowed for the origins indicated. If a top level domain is specified (http://example.org), cookies are allowed for all subdomains as well.

 
 If this policy is disabled or not configured, the default cookie policy is followed.</string>
 
 If this policy is disabled or not configured, the default cookie policy is followed.</string>

-      <string id="Cookies_Block_Explain">If this policy is enabled, cookies are blocked for the URLS indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well.
+      <string id="Cookies_Block_Explain">If this policy is enabled, cookies are blocked for the origins indicated. If a top level domain is specified (http://example.org), cookies are blocked from all subdomains as well.

 
 If this policy is disabled or not configured, cookies are not blocked by default.</string>
       <string id="Cookies_Default">Accept cookies from websites</string>
 
 If this policy is disabled or not configured, cookies are not blocked by default.</string>
       <string id="Cookies_Default">Accept cookies from websites</string>


@@ -154,63 +303,203 @@ This setting is ignored if this policy is disabled or not configured or if cooki
       <string id="Cookies_ExpireAtSessionEnd">Keep cookies until Firefox is closed</string>
       <string id="Cookies_ExpireAtSessionEnd_Explain">If this policy is enabled and cookies are allowed, they will expire when Firefox is closed.
 
       <string id="Cookies_ExpireAtSessionEnd">Keep cookies until Firefox is closed</string>
       <string id="Cookies_ExpireAtSessionEnd_Explain">If this policy is enabled and cookies are allowed, they will expire when Firefox is closed.
 

+This setting is ignored if this policy is disabled or not configured or if cookies are not allowed.</string>
+      <string id="Cookies_RejectTracker">Reject trackers</string>
+      <string id="Cookies_RejectTracker_Explain">If this policy is enabled and cookies are allowed, Firefox will reject tracker cookies by default.
+

 This setting is ignored if this policy is disabled or not configured or if cookies are not allowed.</string>
       <string id="Cookies_Locked">Do not allow preferences to be changed</string>
 This setting is ignored if this policy is disabled or not configured or if cookies are not allowed.</string>
       <string id="Cookies_Locked">Do not allow preferences to be changed</string>

-      <string id="Cookies_Locked_Explain">If this policy is enabled cookie preferences cannot be changed by the user.
+      <string id="Cookies_Locked_Explain">If this policy is enabled, cookie preferences cannot be changed by the user.

 
 If this policy is disabled or not configured, the user can change their cookie preferences.</string>
 
 If this policy is disabled or not configured, the user can change their cookie preferences.</string>

-      <string id="FlashPlugin_Allow_Explain">If this policy is enabled, Flash is activated by default for the URLS indicated unless Flash is completely disabled. If a top level domain is specified (http://example.org), Flash is allowed for all subdomains as well.
+      <string id="Camera_Allow_Explain">If this policy is enabled, access to the camera is always allowed for the origins indicated.
+
+If this policy is disabled or not configured, the default camera policy is followed.</string>
+      <string id="Camera_Block_Explain">If this policy is enabled, access to the camera is blocked for the origins indicated.
+
+If this policy is disabled or not configured, access to the camera is not blocked by default.</string>
+      <string id="Camera_BlockNewRequests">Block new requests asking to access the camera</string>
+      <string id="Camera_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the camera.
+
+If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the camera.</string>
+      <string id="Camera_Locked">Do not allow preferences to be changed</string>
+      <string id="Camera_Locked_Explain">If this policy is enabled, camera preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change their camera preferences.</string>
+      <string id="Microphone_Allow_Explain">If this policy is enabled, access to the microphone is always allowed for the origins indicated.
+
+If this policy is disabled or not configured, the default microphone policy is followed.</string>
+      <string id="Microphone_Block_Explain">If this policy is enabled, access to the microphone is blocked for the origins indicated.
+
+If this policy is disabled or not configured, access to the microphone is not blocked by default.</string>
+      <string id="Microphone_BlockNewRequests">Block new requests asking to access the microphone</string>
+      <string id="Microphone_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access the microphone.
+
+If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access the microphone.</string>
+      <string id="Microphone_Locked">Do not allow preferences to be changed</string>
+      <string id="Microphone_Locked_Explain">If this policy is enabled, microphone preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change their camera preferences.</string>
+      <string id="Location_Allow_Explain">If this policy is enabled, access to location is always allowed for the origins indicated.
+
+If this policy is disabled or not configured, the default location policy is followed.</string>
+      <string id="Location_Block_Explain">If this policy is enabled, access to location is blocked for the origins indicated.
+
+If this policy is disabled or not configured, access to location is not blocked by default.</string>
+      <string id="Location_BlockNewRequests">Block new requests asking to access location</string>
+      <string id="Location_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to access location.
+
+If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to access location.</string>
+      <string id="Location_Locked">Do not allow preferences to be changed</string>
+      <string id="Location_Locked_Explain">If this policy is enabled, location preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change location preferences.</string>
+      <string id="Notifications_Allow_Explain">If this policy is enabled, notifications can always be sent for the origins indicated.
+
+If this policy is disabled or not configured, the default notification policy is followed.</string>
+      <string id="Notifications_Block_Explain">If this policy is enabled, notifications are always blocked for the origins indicated.
+
+If this policy is disabled or not configured, notifications are not blocked by default.</string>
+      <string id="Notifications_BlockNewRequests">Block new requests asking to send notifications</string>
+      <string id="Notifications_BlockNewRequests_Explain">If this policy is enabled, sites that are not in the Allow policy will not be allowed to ask permission to send notifications.
+
+If this policy is disabled or not configured, any site that is not in the Block policy can ask permission to send notifications.</string>
+      <string id="Notifications_Locked">Do not allow preferences to be changed</string>
+      <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>
 
 If this policy is disabled or not configured, the default Flash policy is followed.</string>

-      <string id="FlashPlugin_Block_Explain">If this policy is enabled, Flash is blocked for the URLS indicated. If a top level domain is specified (http://example.org), Flas is blocked from all subdomains as well.
+      <string id="FlashPlugin_Block_Explain">If this policy is enabled, Flash is blocked for the origins indicated. If a top level domain is specified (http://example.org), Flash is blocked from all subdomains as well.

 
 If this policy is disabled or not configured, the default Flash policy is followed.</string>
       <string id="FlashPlugin_Default">Activate Flash on websites</string>
 
 If this policy is disabled or not configured, the default Flash policy is followed.</string>
       <string id="FlashPlugin_Default">Activate Flash on websites</string>

-      <string id="FlashPlugin_Default_Explain">If this policy is enabled, Flash is always activates on websites.
+      <string id="FlashPlugin_Default_Explain">If this policy is enabled, Flash is always activated on websites.

 
 If this policy is disabled, Flash is never activated on websites, even if they are in the specified in the Allow list.
 
 
 If this policy is disabled, Flash is never activated on websites, even if they are in the specified in the Allow list.
 

-If this policy is not configured Flash, Flash is click to play.</string>
+If this policy is not configured, Flash is click to play.</string>

       <string id="FlashPlugin_Locked">Do not allow preferences to be changed</string>
       <string id="FlashPlugin_Locked">Do not allow preferences to be changed</string>

-      <string id="FlashPlugin_Locked_Explain">If this policy is enabled Flash preferences cannot be changed by the user.
+      <string id="FlashPlugin_Locked_Explain">If this policy is enabled, Flash preferences cannot be changed by the user.

 
 If this policy is disabled or not configured, the user can change their Flash preferences.</string>
       <string id="OverrideFirstRunPage">Override the first run page</string>
       <string id="OverrideFirstRunPage_Explain">If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown.
 
 
 If this policy is disabled or not configured, the user can change their Flash preferences.</string>
       <string id="OverrideFirstRunPage">Override the first run page</string>
       <string id="OverrideFirstRunPage_Explain">If this policy is enabled, you can specify a URL to be used as the first run page. If you leave the URL blank, no first run page will be shown.
 

-If this policy is disabled or not configured the first run page is displayed.</string>
+If this policy is disabled or not configured, the first run page is displayed.</string>

       <string id="OverridePostUpdatePage">Override the upgrade page</string>
       <string id="OverridePostUpdatePage_Explain">If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown.
 
       <string id="OverridePostUpdatePage">Override the upgrade page</string>
       <string id="OverridePostUpdatePage_Explain">If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown.
 

-If this policy is disabled or not configured the upgrade is displayed.</string>
-      <string id="SanitizeOnShutdown">Clear all data when browser is closed</string>
-      <string id="SanitizeOnShutdown_Explain">If this policy is enabled, all data is cleared when Firefox is closed. This includes Browsing &amp; Download History, Cookies, Active Logins, Cache, Form &amp; Search History, Site Preferences and Offline Website Data.
+If this policy is disabled or not configured, the upgrade is displayed.</string>
+      <string id="SanitizeOnShutdown">Clear data when browser is closed</string>
+      <string id="SanitizeOnShutdown_Explain">If this policy is enabled, you can choose data to be cleared when Firefox is closed.

 
 If this policy is disabled or not configured, data is not cleared when the browser is closed.</string>
       <string id="WebsiteFilter_Block">Blocked websites</string>
 
 If this policy is disabled or not configured, data is not cleared when the browser is closed.</string>
       <string id="WebsiteFilter_Block">Blocked websites</string>

-      <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. There is a 1000 entry limit.",
+      <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.

 
 If this policy is disabled or not configured, no websites are blocked.</string>
       <string id="WebsiteFilter_Exceptions">Exceptions to blocked websites</string>
 
 If this policy is disabled or not configured, no websites are blocked.</string>
       <string id="WebsiteFilter_Exceptions">Exceptions to blocked websites</string>

-      <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https accesses are supported at the moment. There is a 1000 entry limit.",
+      <string id="WebsiteFilter_Exceptions_Explain">If this policy is enabled, and the website filter is enabled, you can specify match patterns for sites you do not want to block. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.

 
 If this policy is disabled or not configured, there are no exceptions to the website filter.</string>
 
 If this policy is disabled or not configured, there are no exceptions to the website filter.</string>

-      <string id="Bookmark1">Bookmark 1</string>
-      <string id="Bookmark2">Bookmark 2</string>
-      <string id="Bookmark3">Bookmark 3</string>
-      <string id="Bookmark4">Bookmark 4</string>
-      <string id="Bookmark5">Bookmark 5</string>
-      <string id="Bookmark_Explain">Bookmark Explanation</string>
+      <string id="Bookmark01">Bookmark 01</string>
+      <string id="Bookmark02">Bookmark 02</string>
+      <string id="Bookmark03">Bookmark 03</string>
+      <string id="Bookmark04">Bookmark 04</string>
+      <string id="Bookmark05">Bookmark 05</string>
+      <string id="Bookmark06">Bookmark 06</string>
+      <string id="Bookmark07">Bookmark 07</string>
+      <string id="Bookmark08">Bookmark 08</string>
+      <string id="Bookmark09">Bookmark 09</string>
+      <string id="Bookmark10">Bookmark 10</string>
+      <string id="Bookmark11">Bookmark 11</string>
+      <string id="Bookmark12">Bookmark 12</string>
+      <string id="Bookmark13">Bookmark 13</string>
+      <string id="Bookmark14">Bookmark 14</string>
+      <string id="Bookmark15">Bookmark 15</string>
+      <string id="Bookmark16">Bookmark 16</string>
+      <string id="Bookmark17">Bookmark 17</string>
+      <string id="Bookmark18">Bookmark 18</string>
+      <string id="Bookmark19">Bookmark 19</string>
+      <string id="Bookmark20">Bookmark 20</string>
+      <string id="Bookmark21">Bookmark 21</string>
+      <string id="Bookmark22">Bookmark 22</string>
+      <string id="Bookmark23">Bookmark 23</string>
+      <string id="Bookmark24">Bookmark 24</string>
+      <string id="Bookmark25">Bookmark 25</string>
+      <string id="Bookmark26">Bookmark 26</string>
+      <string id="Bookmark27">Bookmark 27</string>
+      <string id="Bookmark28">Bookmark 28</string>
+      <string id="Bookmark29">Bookmark 29</string>
+      <string id="Bookmark30">Bookmark 30</string>
+      <string id="Bookmark31">Bookmark 31</string>
+      <string id="Bookmark32">Bookmark 32</string>
+      <string id="Bookmark33">Bookmark 33</string>
+      <string id="Bookmark34">Bookmark 34</string>
+      <string id="Bookmark35">Bookmark 35</string>
+      <string id="Bookmark36">Bookmark 36</string>
+      <string id="Bookmark37">Bookmark 37</string>
+      <string id="Bookmark38">Bookmark 38</string>
+      <string id="Bookmark39">Bookmark 39</string>
+      <string id="Bookmark40">Bookmark 40</string>
+      <string id="Bookmark41">Bookmark 41</string>
+      <string id="Bookmark42">Bookmark 42</string>
+      <string id="Bookmark43">Bookmark 43</string>
+      <string id="Bookmark44">Bookmark 44</string>
+      <string id="Bookmark45">Bookmark 45</string>
+      <string id="Bookmark46">Bookmark 46</string>
+      <string id="Bookmark47">Bookmark 47</string>
+      <string id="Bookmark48">Bookmark 48</string>
+      <string id="Bookmark49">Bookmark 49</string>
+      <string id="Bookmark50">Bookmark 50</string>
+      <string id="Bookmark_Explain">If this policy is enabled, you can configure a bookmark be added to Firefox.  Due to a bug, you must select the location. Note that you must specify the bookmarks in order.
+
+If this policy is disabled or not configured, a new bookmark is not added.</string>

       <string id="BookmarkPlacementToolbar">Toolbar</string>
       <string id="BookmarkPlacementMenu">Menu</string>
       <string id="NoDefaultBookmarks">No Default Bookmarks</string>
       <string id="BookmarkPlacementToolbar">Toolbar</string>
       <string id="BookmarkPlacementMenu">Menu</string>
       <string id="NoDefaultBookmarks">No Default Bookmarks</string>

-      <string id="NoDefaultBookmarks_Explain">Don't create the default bookmarks or the Smart Bookmarks (Most Visited, Recent Tags). Note: this policy is only effective if used before the first run of the profile.</string>
+      <string id="NoDefaultBookmarks_Explain">If this policy is enabled, the default bookmarks and Smart Bookmarks (Most Visited, Recent Tags) are not created.
+
+If this policy is disabled or not configured, default bookmarks and Smart Bookmarks (Most Visited, Recent Tags) are created.
+
+Note: this policy is only effective if used before the first run of the profile.</string>

       <string id="HomepageURL">URL for Home page</string>
       <string id="HomepageURL">URL for Home page</string>

-      <string id="HomepageURL_Explain">Homepage Settings</string>
+      <string id="HomepageURL_Explain">If this policy is enabled, you can set a default home page. You can also lock the home page.
+
+If this policy is disabled or not configured, the user can set and change the home page.</string>

       <string id="HomepageAdditional">Additional Homepages</string>
       <string id="HomepageAdditional">Additional Homepages</string>

-      <string id="HomepageAdditional_Explain">If you want to have more than one homepage</string>
+      <string id="HomepageAdditional_Explain">If this policy is enabled, you can have additional home pages. They are opened in multiple tabs.
+
+If this policy is disabled or not configured, there is only one home page.</string>
+      <string id="HomepageStartPage">Start Page</string>
+      <string id="HomepageStartPage_Explain">If this policy is enabled, you can change what is displayed when Firefox starts. It can be the homepage, the previous session, or a blank page.
+
+If this policy is disabled or not configured, the start page defaults to the previous session.</string>
+      <string id="None">None</string>
+      <string id="Homepage">Homepage</string>
+      <string id="PreviousSession">Previous Session</string>
+      <string id="PasswordManagerEnabled">Password Manager</string>
+      <string id="PasswordManagerEnabled_Explain">If this policy is disabled, the password manager is not available via preferences.
+
+If this policy is enabled or not configured, the password manager is available via preferences.</string>
+      <string id="PromptForDownloadLocation">Prompt for download location</string>
+      <string id="PromptForDownloadLocation_Explain">If this policy is disabled, the user is not prompted for a download location.
+
+If this policy is enabled, the user is always prompted for a download location.
+
+If this policy is not configured, the user is prompted for a download location, but can change the default.</string>

       <string id="Proxy">Proxy Settings</string>
       <string id="Proxy">Proxy Settings</string>

-      <string id="Proxy_Explain">If this policy is enabled, you should select the connection type and then fill in the appropriate sections. Due to a bug, you must select a value for the SOCKS proxy version.</string>
+      <string id="Proxy_Explain">If this policy is enabled, you can configure and lock network settings.
+
+Select the connection type and then fill in the appropriate sections. Due to a bug, you must select a value for the SOCKS proxy version.
+
+If this policy is disabled or not configured, the default network settings are used and user can change them.</string>

       <string id="SOCKSVersion4">SOCKS v4</string>
       <string id="SOCKSVersion5">SOCKS v5</string>
       <string id="AutoConfigURL">Automatic proxy configuration URL</string>
       <string id="SOCKSVersion4">SOCKS v4</string>
       <string id="SOCKSVersion5">SOCKS v5</string>
       <string id="AutoConfigURL">Automatic proxy configuration URL</string>


@@ -229,17 +518,152 @@ If this policy is disabled or not configured, there are no exceptions to the web
 If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing.
 
 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>
 If this policy is disabled, tracking protection is disabled and locked in both the browser and private browsing.
 
 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>
+      <string id="SecurityDevices">Security Devices</string>
+      <string id="SecurityDevices_Explain">If this policy is enabled, you can specify a list of PKCS #11 modules to be installed. Modules are specified as a name and a fully qualified path.
+
+If this policy is disabled or not configured, no additional PKCS #11 modules will be installed.</string>

       <string id="SearchBar">Search bar location</string>
       <string id="SearchBar_Explain">If this policy is enabled, you can set whether the search bar is separate from the URL bar.
 
       <string id="SearchBar">Search bar location</string>
       <string id="SearchBar_Explain">If this policy is enabled, you can set whether the search bar is separate from the URL bar.
 

-If this policy is not configured or disabled, new users get a unified search bar, users upgrading from Firefox 56 and below get a separate search bar.</string>
+If this policy is disabled or not configured, new users get a unified search bar, users upgrading from Firefox 56 and below get a separate search bar.</string>
+      <string id="SearchEngines_1">Search Engine One</string>
+      <string id="SearchEngines_2">Search Engine Two</string>
+      <string id="SearchEngines_3">Search Engine Three</string>
+      <string id="SearchEngines_4">Search Engine Four</string>
+      <string id="SearchEngines_5">Search Engine Five</string>
+      <string id="SearchEngines_Explain">If this policy is enabled, you can configure a search engine to be added to Firefox. Use {searchTerms} to indicate where the search term is placed. Due to a bug, you must select the method (usually GET). Note that you must specify the search engines in order.
+
+If this policy is disabled or not configured, a new search engine is not added.</string>

       <string id="SearchBar_Unified">Unified</string>
       <string id="SearchBar_Separate">Separate</string>
       <string id="SearchBar_Unified">Unified</string>
       <string id="SearchBar_Separate">Separate</string>

+      <string id="SearchEngine_Method_GET">GET</string>
+      <string id="SearchEngine_Method_POST">POST</string>
+      <string id="SearchEngines_Default">Default Search Engine</string>
+      <string id="SearchEngines_Default_Explain">If this policy is enabled, you can set the name of a search engine to be used as the default.
+
+If this policy is disabled or not configured, the Firefox default engine is used.</string>
+      <string id="SearchEngines_PreventInstalls">Prevent Search Engine Installs</string>
+      <string id="SearchEngines_PreventInstalls_Explain">If this policy is enabled, the user cannot install search engines from web page.
+
+If this policy is disabled or not configured, search engines can be installed from web pages.</string>
+      <string id="SearchEngines_Remove">Remove Search Engines</string>
+      <string id="SearchEngines_Remove_Explain">If this policy is enabled, you can specify the names of engines to be removed or hidden.
+
+If this policy is disabled or not configured, search engines will not be removed or hidden.</string>
+      <string id="SearchSuggestEnabled">Search Suggestions</string>
+      <string id="SearchSuggestEnabled_Explain">If this policy is disabled, search suggestions will be disabled.
+
+If this policy is enabled, search suggestions will be enabled.
+
+If this policy is not configured, search suggestions will be enabled, but the user can turn them off.</string>
+      <string id="SSLVersionMin">Minimum SSL version enabled</string>
+      <string id="SSLVersionMin_Explain">If this policy is enabled, Firefox will not use SSL/TLS versions less than the value specified.
+
+If this policy is disabled or not configured, Firefox defaults to a minimum of TLS 1.0.</string>
+      <string id="SSLVersionMax">Maximum SSL version enabled</string>
+      <string id="SSLVersionMax_Explain">If this policy is enabled, Firefox will not use SSL/TLS versions greater than the value specified.
+
+If this policy is disabled or not configured, Firefox defaults to a maximum of TLS 1.3.</string>
+      <string id="TLS1">TLS 1.0</string>
+      <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.
+
+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="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_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_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="dom_allow_scripts_to_close_windows">dom.allow_scripts_to_close_windows</string>
+      <string id="dom_disable_window_flip">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="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="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_mixed_content_block_active_content">security.mixed_content.block_active_content</string>
+      <string id="ui_key_menuAccessKeyFocuses">ui.key.menuAccessKeyFocuses</string>

     </stringTable>
     <presentationTable>
     </stringTable>
     <presentationTable>

+      <presentation id="AppUpdateURL">
+        <textBox refId="AppUpdateURL">
+          <label>URL:</label>
+        </textBox>
+      </presentation>

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

+      <presentation id="Authentication_AllowNonFQDN">
+        <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="RequestedLocales">
+        <listBox refId="RequestedLocales"/>
+      </presentation>
+      <presentation id="SecurityDevices">
+        <listBox refId="SecurityDevices"/>
+      </presentation>

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


@@ -256,6 +680,8 @@ If this policy is not configured or disabled, new users get a unified search bar
       </presentation>
       <presentation id="TrackingProtection">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
       </presentation>
       <presentation id="TrackingProtection">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>

+        <checkBox refId="Cryptomining">Block cryptomining scripts.</checkBox>
+        <checkBox refId="Fingerprinting">Block fingerprinting scripts.</checkBox>

       </presentation>
       <presentation id="OverridePage">
         <textBox refId="OverridePage">
       </presentation>
       <presentation id="OverridePage">
         <textBox refId="OverridePage">


@@ -272,6 +698,9 @@ If this policy is not configured or disabled, new users get a unified search bar
       <presentation id="HomepageAdditional">
         <listBox refId="HomepageAdditional">Additional homepages</listBox>
       </presentation>
       <presentation id="HomepageAdditional">
         <listBox refId="HomepageAdditional">Additional homepages</listBox>
       </presentation>

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

       <presentation id="Bookmark">
         <text>Title:</text>
         <textBox refId="BookmarkTitle">
       <presentation id="Bookmark">
         <text>Title:</text>
         <textBox refId="BookmarkTitle">


@@ -292,6 +721,39 @@ If this policy is not configured or disabled, new users get a unified search bar
           <label/>
         </textBox>
       </presentation>
           <label/>
         </textBox>
       </presentation>

+      <presentation id="SearchEngine">
+        <textBox refId="SearchEngine_Name">
+          <label>Name:</label>
+        </textBox>
+        <textBox refId="SearchEngine_URLTemplate">
+          <label>URL Template:</label>
+        </textBox>
+        <text>Method:</text>
+        <dropdownList refId="SearchEngine_Method"/>
+        <textBox refId="SearchEngine_IconURL">
+          <label>Icon URL:</label>
+        </textBox>
+        <textBox refId="SearchEngine_Alias">
+          <label>Alias:</label>
+        </textBox>
+        <textBox refId="SearchEngine_Description">
+          <label>Description:</label>
+        </textBox>
+        <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">
+          <label/>
+        </textBox>
+      </presentation>
+      <presentation id="SearchEngines_Remove">
+        <listBox refId="SearchEngines_Remove"/>
+      </presentation>

       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
         <text>Connection Type:</text>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
         <text>Connection Type:</text>


@@ -327,6 +789,66 @@ If this policy is not configured or disabled, new users get a unified search bar
         <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
         <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
       </presentation>
         <checkBox refId="AutoLogin">Do not prompt for authentication if password is saved.</checkBox>
         <checkBox refId="UseProxyForDNS">Proxy DNS when using SOCKS v5.</checkBox>
       </presentation>

+      <presentation id="DNSOverHTTPS">
+        <text>Provider URL:</text>
+        <textBox refId="ProviderURL">
+          <label/>
+        </textBox>
+        <checkBox refId="DNSOverHTTPSEnabled">Enable DNS over HTTPS.</checkBox>
+        <checkBox refId="DNSOverHTTPSLocked">Don't allow DNS over HTTPS preferences to be changed.</checkBox>
+      </presentation>
+      <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/>
+        </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="LocalFileLinks">
+        <listBox refId="LocalFileLinks"/>
+      </presentation>
+      <presentation id="SanitizeOnShutdown">
+        <checkBox refId="SanitizeOnShutdown_Cache">Cache</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Cookies">Cookies</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Downloads">Download History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_FormData">Form &amp; Search History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_History">Browsing History</checkBox>
+        <checkBox refId="SanitizeOnShutdown_Sessions">Active Logins</checkBox>
+        <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"/>
+      </presentation>

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