X-Git-Url: https://git.p6c8.net/policy-templates.git/blobdiff_plain/b6ec8586f5dd0fe21c54c63f450df1ffa016a912..f80bc2895c548cab2876f08a1c246dfcc1434147:/windows/en-US/firefox.adml?ds=sidebyside

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 5575e19..1cc7f45 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -16,6 +16,7 @@
       <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="Allow">Allowed Sites</string>
       <string id="Block">Blocked Sites</string>
       <string id="Authentication_SPNEGO">SPNEGO</string>
@@ -68,6 +69,10 @@ If this policy is disabled or not configured, the &quot;Forget&quot; button is a
       <string id="DisablePocket_Explain">Prevents ability to save webpages to Pocket.</string>
       <string id="DisablePrivateBrowsing">Disable Private Browsing</string>
       <string id="DisablePrivateBrowsing_Explain">Disables private browsing.</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.
 
@@ -82,36 +87,40 @@ If this policy is disabled or not configured, certificate errors can be overridd
       <string id="DisableSecurityBypass_SafeBrowsing_Explain">If this policy is enabled, a user can not 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="DisableSysAddonUpdate">Disable System Addon Updates</string>
-      <string id="DisableSysAddonUpdate_Explain">Prevent the browser from installing and updating system addons.</string>
+      <string id="DisableSystemAddonUpdate">Disable System Addon Updates</string>
+      <string id="DisableSystemAddonUpdate_Explain">If this policy is enabled, new system add-ons will not be installed and existing system add-ons will not be updated.
+
+If this policy is disabled or not configured, system add-ons are installed and updated.</string>
       <string id="DisableTelemetry">Disable Telemetry</string>
       <string id="DisableTelemetry_Explain">If this policy is enabled, telemetry is not 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_Explain">Causes the bookmarks toolbar to be displayed by default.</string>
       <string id="DisplayMenuBar">Display Menu Bar</string>
       <string id="DisplayMenuBar_Explain">Causes the menu bar to be displayed by default.</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="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_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_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.
 
 If this policy is disabled or not configured, no extensions are locked.</string>
-      <string id="RememberPasswords">Remember Passwords</string>
-      <string id="RememberPasswords_Explain">Enforces the setting to allow Firefox to remember saved logins and passwords. Both true and false values are accepted.</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.
+
+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 or not configured, the default pop-up policy is followed.</string>
@@ -123,11 +132,11 @@ If this policy is not configured or enabled, popups are not allowed from website
       <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>
-      <string id="InstallAddons_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 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.
 
 If this policy is disabled or not configured, the default add-on policy is followed.</string>
-      <string id="InstallAddons_Default">Allow add-on installs from websites</string>
-      <string id="InstallAddons_Default_Explain">If this policy is disabled, add-ons cannot be installed.
+      <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.
@@ -183,6 +192,14 @@ If this policy is disabled or not configured the upgrade is displayed.</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, 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.",
+
+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.",
+
+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>
@@ -221,8 +238,26 @@ If this policy is enabled, private browsing is enabled by default in both the br
       <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>
+      <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 not configured or disabled, a new search engine is not added.</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 type the name of a search engine to be used as the default.
+
+If this policy is not configured or disabled, 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 not configured or disabled, search engines can be installed from web pages.</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -231,6 +266,9 @@ If this policy is not configured or disabled, new users get a unified search bar
       <presentation id="Extensions">
         <listBox refId="Extensions"/>
       </presentation>
+      <presentation id="WebsiteFilter">
+        <listBox refId="WebsiteFilter"/>
+      </presentation>
       <presentation id="Permissions"><listBox refId="Permissions"/></presentation>
       <presentation id="PopupsAllow"><listBox refId="PopupsAllowDesc">Allow popups for websites</listBox></presentation>
       <presentation id="Cookies_AcceptThirdParty">
@@ -277,6 +315,33 @@ If this policy is not configured or disabled, new users get a unified search bar
           <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>
+      </presentation>
+      <presentation id="SearchEngines_Default">
+        <textBox refId="SearchEngines_Default">
+          <label/>
+        </textBox>
+      </presentation>
       <presentation id="Proxy">
         <checkBox refId="ProxyLocked">Don't allow proxy settings to be changed.</checkBox>
         <text>Connection Type:</text>