Merge pull request #880 from maiki/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 7a7c6be31a28766aec83a12ee63bf4e492b11000..5915f0357835ac2bd72eb18106ee375e1527eea3 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="3.4" schemaVersion="1.0" >
+<policyDefinitionResources revision="3.7" schemaVersion="1.0" >
   <displayName/>
   <description/>
   <resources >
@@ -45,7 +45,7 @@
       <string id="SUPPORTED_FF96">Firefox 96 or later, Firefox 91.5 ESR or later</string>
       <string id="SUPPORTED_FF96_ONLY">Firefox 96 or later</string>
       <string id="SUPPORTED_FF97">Firefox 97 or later, Firefox 91.6 ESR or later</string>
-      <string id="SUPPORTED_FF98">Firefox 98 or later, Firefox 91.7 ESR or later</string>
+      <string id="SUPPORTED_FF98_ONLY">Firefox 98 or later</string>
       <string id="SUPPORTED_FF99">Firefox 99 or later, Firefox 91.8 ESR or later</string>
       <string id="SUPPORTED_FF100">Firefox 100 or later, Firefox 91.9 ESR or later</string>
       <string id="firefox">Firefox</string>
@@ -636,7 +636,7 @@ If this policy is disabled or not configured, there are no exceptions to the web
       <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.
+      <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>
@@ -805,6 +805,10 @@ If this policy is enabled or not configured, actions will be recommended based o
       <string id="UserMessaging_SkipOnboarding_Explain">If this policy is enabled, onboarding messages will not be shown on the new tab page.
 
 If this policy is disabled or not configured, onboarding messages will be shown on the new tab page.</string>
+      <string id="UserMessaging_MoreFromMozilla">More from Mozilla</string>
+      <string id="UserMessaging_MoreFromMozilla_Explain">If this policy is disabled, the More from Mozilla section will not be shown in preferences.
+
+If this policy is enabled or not configured, the More from Mozilla section will be shown in preferences.</string>
       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_128_CBC_SHA">TLS_DHE_RSA_WITH_AES_128_CBC_SHA</string>
       <string id="DisabledCiphers_TLS_DHE_RSA_WITH_AES_256_CBC_SHA">TLS_DHE_RSA_WITH_AES_256_CBC_SHA</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA">TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</string>