Merge pull request #1152 from mozilla/FirefoxLabs

Add Firefox Labs policy

diff --git a/docs/index.md b/docs/index.md
index 7f038872f96ea5c24e9ded4276c4665e39071039..adb94e025f37ec1bfb2a4b68d7ba1c8474ed8be5 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -6719,11 +6719,13 @@ Prevent Firefox from messaging the user in certain situations.
 
 `MoreFromMozilla` If false, don't show the "More from Mozilla" section in Preferences. (Firefox 98)
 
+`FirefoxLabs` If false, don't show the "Firefox Labs" section in Preferences. (Firefox 130.0.1)
+
 `Locked` prevents the user from changing user messaging preferences.
 
 **Compatibility:** Firefox 75, Firefox ESR 68.7\
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features`, `browser.aboutwelcome.enabled`, `browser.preferences.moreFromMozilla`
+**Preferences Affected:** `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons`, `browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features`, `browser.aboutwelcome.enabled`, `browser.preferences.moreFromMozilla`, `browser.preferences.experimental`
 
 #### Windows (GPO)
 ```
@@ -6732,6 +6734,7 @@ Software\Policies\Mozilla\Firefox\UserMessaging\FeatureRecommendations = 0x1 | 0
 Software\Policies\Mozilla\Firefox\UserMessaging\UrlbarInterventions = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\UserMessaging\SkipOnboarding = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\UserMessaging\MoreFromMozilla = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\UserMessaging\FirefoxLabs = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\UserMessaging\Locked = 0x1 | 0x0
 ```
 #### Windows (Intune)
@@ -6742,6 +6745,7 @@ OMA-URI:
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_UrlbarInterventions
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_SkipOnboarding
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_MoreFromMozilla
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_FirefoxLabs
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~UserMessaging/UserMessaging_Locked
 ```
 Value (string):
@@ -6763,6 +6767,8 @@ Value (string):
     <true/> | <false/>
     <key>MoreFromMozilla</key>
     <true/> | <false/>
+    <key>FirefoxLabs</key>
+    <true/> | <false/>
     <key>Locked</key>
     <true/> | <false/>
   </dict>
@@ -6778,6 +6784,7 @@ Value (string):
       "UrlbarInterventions": true | false,
       "SkipOnboarding": true | false,
       "MoreFromMozilla": true | false,
+      "FirefoxLabs": true | false,
       "Locked": true | false
     }
   }

diff --git a/linux/policies.json b/linux/policies.json
index 7a2957bbb1a3faf98ca1996b403e94c544501539..2b6f031e19a4503e21091bb029eb9f87d5086136 100644 (file)
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -357,6 +357,7 @@
       "UrlbarInterventions": true | false,
       "SkipOnboarding": true | false,
       "MoreFromMozilla": true | false,
+      "FirefoxLabs": true | false,
       "Locked": true | false
     },
     "UseSystemPrintDialog": true | false.,

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index d15519f647e0cc9d6689c29a174d7241a6180622..c3a39132e2f72d9a6af4c201b9568f2f93814578 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -669,6 +669,8 @@
                <true/>
                <key>MoreFromMozilla</key>
                <true/>
+               <key>FirefoxLabs</key>
+               <true/>
                <key>Locked</key>
                <true/>
        </dict>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 599de0b4d04a3d1a78135e75c8827c01febf1fd8..31f5d0c9917ceff3b6888b3b689accd7521536d8 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -73,6 +73,7 @@
       <string id="SUPPORTED_FF128">Firefox 128 oder höher, Firefox 115.13 ESR oder höher</string>
       <string id="SUPPORTED_FF129">Firefox 129 oder höher, Firefox 115.14 ESR oder höher</string>
       <string id="SUPPORTED_FF130">Firefox 130 oder höher, Firefox 115.15 ESR oder höher</string>
+      <string id="SUPPORTED_FF130_ONLY">Firefox 130 oder höher</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Berechtigungen</string>
       <string id="Camera_group">Kamera</string>
@@ -867,6 +868,10 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werde
       <string id="UserMessaging_MoreFromMozilla_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird der Abschnitt "Mehr von Mozilla" in den Einstellungen nicht angezeigt.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird der Abschnitt "Mehr von Mozilla" in den Einstellungen angezeigt.</string>
+      <string id="UserMessaging_FirefoxLabs">Firefox Labs</string>
+      <string id="UserMessaging_FirefoxLabs_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird der Abschnitt "Firefox Labs" in den Einstellungen nicht angezeigt.
+
+Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird der Abschnitt "Firefox Labs" in den Einstellungen angezeigt.</string>
       <string id="UserMessaging_Locked">Keine Änderung der Einstellungen für die Nachrichtenübermittlung zulassen</string>
       <string id="UserMessaging_Locked_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, können die Einstellungen für die Nachrichtenübermittlung vom Benutzer geändert werden.
 

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 2661beae940b1a0a94e016b9d73aee753a2a85cd..c31787c7f3e112b5a0a7223955fba3ea94163000 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -73,6 +73,7 @@
       <string id="SUPPORTED_FF128">Firefox 128 or later, Firefox 115.13 ESR or later</string>
       <string id="SUPPORTED_FF129">Firefox 129 or later, Firefox 115.14 ESR or later</string>
       <string id="SUPPORTED_FF130">Firefox 130 or later, Firefox 115.15 ESR or later</string>
+      <string id="SUPPORTED_FF130_ONLY">Firefox 130 or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
@@ -867,6 +868,10 @@ If this policy is disabled or not configured, onboarding messages will be shown
       <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="UserMessaging_FirefoxLabs">Firefox Labs</string>
+      <string id="UserMessaging_FirefoxLabs_Explain">If this policy is disabled, the Firefox Labs section will not be shown in preferences.
+
+If this policy is enabled or not configured, the Firefox Labs section will be shown in preferences.</string>
       <string id="UserMessaging_Locked">Do not allow user messaging preferences to be changed</string>
       <string id="UserMessaging_Locked_Explain">If this policy is disabled, user messaging preferences can be changed by the user.
 

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 523f924fdc5f22fe8148a14460039cb97a534758..354759c00132efd2cf927319c29570afecdc2974 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -75,6 +75,7 @@
       <definition name="SUPPORTED_FF128" displayName="$(string.SUPPORTED_FF128)"/>
       <definition name="SUPPORTED_FF129" displayName="$(string.SUPPORTED_FF129)"/>
       <definition name="SUPPORTED_FF130" displayName="$(string.SUPPORTED_FF130)"/>
+      <definition name="SUPPORTED_FF130_ONLY" displayName="$(string.SUPPORTED_FF130_ONLY)"/>
     </definitions>
   </supportedOn>
   <categories>
@@ -3693,6 +3694,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="UserMessaging_FirefoxLabs" class="Both" displayName="$(string.UserMessaging_FirefoxLabs)" explainText="$(string.UserMessaging_FirefoxLabs)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="FirefoxLabs">
+      <parentCategory ref="UserMessaging"/>
+      <supportedOn ref="SUPPORTED_FF130_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="UserMessaging_Locked" class="Both" displayName="$(string.UserMessaging_Locked)" explainText="$(string.UserMessaging_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\UserMessaging" valueName="Locked">
       <parentCategory ref="UserMessaging"/>
       <supportedOn ref="SUPPORTED_FF75"/>