Merge pull request #56 from mozilla/SearchBar_Policy

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 7e962f8e54b2d77f915288997be722058fcbfa89..f4abe8558e594d1f88a29087407c3a7a3572eedb 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -175,6 +175,10 @@ If this policy is disabled or not configured the first run page is displayed.</s
       <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, data is not cleared when the browser is closed.</string>
       <string id="Bookmark1">Bookmark 1</string>
       <string id="Bookmark2">Bookmark 2</string>
       <string id="Bookmark3">Bookmark 3</string>
@@ -209,6 +213,12 @@ If this policy is disabled or not configured the upgrade is displayed.</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="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>
+      <string id="SearchBar_Unified">Unified</string>
+      <string id="SearchBar_Separate">Separate</string>
     </stringTable>
     <presentationTable>
       <presentation id="Authentication">
@@ -222,6 +232,9 @@ If this policy is enabled, private browsing is enabled by default in both the br
       <presentation id="Cookies_AcceptThirdParty">
         <dropdownList refId="Cookies_AcceptThirdParty"/>
       </presentation>
+      <presentation id="SearchBar">
+        <dropdownList refId="SearchBar"/>
+      </presentation>
       <presentation id="TrackingProtection">
         <checkBox refId="TrackingProtectionLocked">Don't allow tracking protection preferences to be changed.</checkBox>
       </presentation>