From b0fe7f4701daab8270560c52b8828f7985b8a032 Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 10 Jan 2023 15:50:34 -0500
Subject: [PATCH] New DisplayBookmarksToolbar policy

---
 README.md                  | 43 ++++++++++++++++++++++++++++++++++++++
 windows/de-DE/firefox.adml | 12 ++++++++++-
 windows/en-US/firefox.adml | 12 ++++++++++-
 windows/es-ES/firefox.adml | 12 ++++++++++-
 windows/firefox.admx       | 23 ++++++++++++++++++++
 windows/fr-FR/firefox.adml | 12 ++++++++++-
 windows/it-IT/firefox.adml | 12 ++++++++++-
 windows/ru-RU/firefox.adml | 12 ++++++++++-
 windows/zh-CN/firefox.adml | 14 +++++++++++--
 windows/zh-TW/firefox.adml | 12 ++++++++++-
 10 files changed, 155 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index af46f0f..e71e853 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ Policies can be specified using the [Group Policy templates on Windows](https://
 | **[`DisableSystemAddonUpdate`](#disablesystemaddonupdate)** | Prevent system add-ons from being installed or updated.
 | **[`DisableTelemetry`](#disabletelemetry)** | DisableTelemetry
 | **[`DisplayBookmarksToolbar`](#displaybookmarkstoolbar)** | Set the initial state of the bookmarks toolbar.
+| **[`DisplayBookmarksToolbar (Deprecated)`](#displaybookmarkstoolbar-deprecated)** | Set the initial state of the bookmarks toolbar.
 | **[`DisplayMenuBar`](#displaymenubar)** | Set the state of the menubar.
 | **[`DisplayMenuBar (Deprecated)`](#displaymenubar-deprecated)** | Set the initial state of the menubar.
 | **[`DNSOverHTTPS`](#dnsoverhttps)** | Configure DNS over HTTPS.
@@ -2050,6 +2051,48 @@ Value (string):
 }
 ```
 ### DisplayBookmarksToolbar
+Set the initial state of the bookmarks toolbar. A user can still change how it is displayed.
+
+`always` means the bookmarks toolbar is always shown.
+
+`never` means the bookmarks toolbar is not shown.
+
+`newtab` means the bookmarks toolbar is only shown on the new tab page.
+
+**Compatibility:** Firefox 109, Firefox ESR 102.7\
+**CCK2 Equivalent:** N/A\
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\DisplayBookmarksToolbar = "always", "never", "newtab"
+```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/DisplayBookmarksToolbar_Enum
+```
+Value (string):
+```
+<enabled/>
+<data id="DisplayBookmarksToolbar" value="always | never | newtab"/>
+```
+#### macOS
+```
+<dict>
+  <key>DisplayBookmarksToolbar</key>
+  <string>always | never | newtab</string>
+</dict>
+```
+#### policies.json
+```
+{
+  "policies": {
+    "DisplayBookmarksToolbar": always | never | newtab
+  }
+}
+```
+### DisplayBookmarksToolbar (Deprecated)
 Set the initial state of the bookmarks toolbar. A user can still hide it and it will stay hidden.
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 9382db8..62dab93 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -279,10 +279,17 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werde
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden Telemetriedaten versendet.
 
 Mozilla empfiehlt, die Telemetrie nicht zu deaktivieren. Durch Telemetrie gesammelte Informationen helfen uns, ein besseres Produkt für Unternehmen wie Ihres zu erstellen.</string>
-      <string id="DisplayBookmarksToolbar">Lesezeichenleiste anzeigen</string>
+      <string id="DisplayBookmarksToolbar">Lesezeichenleiste anzeigen (Veraltet)</string>
       <string id="DisplayBookmarksToolbar_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, wird die Lesezeichenleiste standardmäßig in der Menüleiste angezeigt, der Benutzer kann diese wieder ausblenden.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, wird die Lesezeichenleiste nicht in der Menüleiste angzeigt.</string>
+      <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
       <string id="DisplayMenuBar">Menüleiste anzeigen (Veraltet)</string>
       <string id="DisplayMenuBar_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, wird die Menüleiste standardmäßig angezeigt, der Benutzer kann diese wieder ausblenden.
 
@@ -1252,6 +1259,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
       <presentation id="String">
         <textBox refId="String">
           <label/>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 27747e8..e29172d 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -279,10 +279,17 @@ 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.
 
 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 (Deprecated)</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="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
       <string id="DisplayMenuBar">Display Menu Bar (Deprecated)</string>
       <string id="DisplayMenuBar_Explain">If this policy is enabled, the menu bar is displayed by default. The user can still hide it.
 
@@ -1250,6 +1257,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
       <presentation id="String">
         <textBox refId="String">
           <label/>
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 21ad8ce..8f45959 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -279,10 +279,17 @@ Si esta política está deshabilitada o no está configurada, los complementos d
 Si esta política está deshabilitada o no está configurada, la telemetría se recopila y carga.
 
 Mozilla recomienda que no deshabilite la telemetría. La información recopilada a través de la telemetría nos ayuda a construir un mejor producto para empresas como la suya.</string>
-      <string id="DisplayBookmarksToolbar">Mostrar barra de herramientas de marcadores</string>
+      <string id="DisplayBookmarksToolbar">Mostrar barra de herramientas de marcadores (deprecata)</string>
       <string id="DisplayBookmarksToolbar_Explain">Si esta política está habilitada, la barra de herramientas de marcadores se mostrará de manera predeterminada. El usuario aún podrá ocultarlo.
 
 Si esta política está deshabilitada o no está configurada, la barra de herramientas de marcadores no se mostrará de forma predeterminada.</string>
+      <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
       <string id="DisplayMenuBar">Mostrar barra de menú (obsoleto)</string>
       <string id="DisplayMenuBar_Explain">Si esta política está habilitada, la barra de menú se mostrará de forma predeterminada. El usuario aún puede ocultarlo.
 
@@ -1252,6 +1259,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
       <presentation id="String">
         <textBox refId="String">
           <label/>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index c768a81..d30e96a 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -951,6 +951,29 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisplayBookmarksToolbar_Enum" class="Both" displayName="$(string.DisplayBookmarksToolbar_Enum)" explainText="$(string.DisplayBookmarksToolbar_Enum_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.DisplayBookmarksToolbar)">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF109"/>
+        <elements>
+        <enum id="DisplayBookmarksToolbar" valueName="DisplayBookmarksToolbar">
+          <item displayName="$(string.DisplayBookmarksToolbar_Always)">
+            <value>
+              <string>always</string>
+            </value>
+          </item>
+          <item displayName="$(string.DisplayBookmarksToolbar_Never)">
+            <value>
+              <string>never</string>
+            </value>
+          </item>
+          <item displayName="$(string.DisplayBookmarksToolbar_NewTab)">
+            <value>
+              <string>newtab</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
     <policy name="DisplayMenuBar" class="Both" displayName="$(string.DisplayMenuBar)" explainText="$(string.DisplayMenuBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayMenuBar">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 0dc8569..04c0c9c 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -279,10 +279,17 @@ Si cette stratégie est désactivée ou non configurée, les modules complément
 Si cette stratégie est désactivée ou non configurée, la télémétrie est collectée et téléchargée.
 
 Mozilla vous recommande de ne pas désactiver la télémétrie. Les informations recueillies par télémétrie nous aident à créer un meilleur produit pour des entreprises comme la vôtre.</string>
-      <string id="DisplayBookmarksToolbar">Afficher la Barre d'outils des signets</string>
+      <string id="DisplayBookmarksToolbar">Afficher la Barre d'outils des signets (Deprecated)</string>
       <string id="DisplayBookmarksToolbar_Explain">Si cette stratégie est activée, la barre d'outils des signets est affichée par défaut. L'utilisateur peut toujours le cacher.
 
 Si cette stratégie est désactivée ou non configurée, la barre d’outils des signets ne s’affiche pas par défaut. </string>
+      <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
       <string id="DisplayMenuBar">Afficher la Barre de menus (Deprecated)</string>
       <string id="DisplayMenuBar_Explain">Si cette stratégie est activée, la barre de menus est affichée par défaut. L'utilisateur peut toujours le cacher.
 
@@ -1251,6 +1258,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
       <presentation id="String">
         <textBox refId="String">
           <label/>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index d5ba89a..ce24cb1 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -279,10 +279,17 @@ Se questo criterio è disabilitato o non configurato, i componenti aggiuntivi di
 Se questo criterio è disabilitato o non configurato, la telemetria è raccolta e caricata.
 
 Mozilla consiglia di non disabilitare la telemetria. Le informazioni raccolte tramite la telemetria ci consentono di realizzare un prodotto migliore per le aziende come la tua.</string>
-      <string id="DisplayBookmarksToolbar">Visualizza barra degli strumenti Segnalibri</string>
+      <string id="DisplayBookmarksToolbar">Visualizza barra degli strumenti Segnalibri (deprecata)</string>
       <string id="DisplayBookmarksToolbar_Explain">Se questo criterio è abilitato, la barra degli strumenti Segnalibri è visualizzata per impostazione predefinita. L'utente può sempre nasconderla.
 
 Se questo criterio è disabilitato o non configurato, la barra degli strumenti Segnalibri non è visualizzata per impostazione predefinita.</string>
+      <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
       <string id="DisplayMenuBar">Visualizza barra dei menù (deprecata)</string>
       <string id="DisplayMenuBar_Explain">Se questo criterio è abilitato, la barra dei menù è visualizzata per impostazione predefinita. L'utente può sempre nasconderla.
 
@@ -1253,6 +1260,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
       <presentation id="String">
         <textBox refId="String">
           <label/>
diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index e2b950c..552c743 100644
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -279,10 +279,17 @@
 Если эта политика отключена или не настроена, данные телеметрии собираются и выгружаются.
 
 Mozilla рекомендует не отключать телеметрию. Информация, собранная с помощью телеметрии, помогает нам создавать лучший продукт для таких компаний, как ваша.</string>
-      <string id="DisplayBookmarksToolbar">Показывать панель закладок</string>
+      <string id="DisplayBookmarksToolbar">Показывать панель закладок (устарело)</string>
       <string id="DisplayBookmarksToolbar_Explain">Если эта политика включена, панель закладок по умолчанию отображается. Пользователь может её скрыть.
 
 Если эта политика отключена или не настроена, панель закладок по умолчанию не отображается.</string>
+      <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
       <string id="DisplayMenuBar">Показывать строку меню (устарело)</string>
       <string id="DisplayMenuBar_Explain">Если эта политика включена, строка меню по умолчанию отображается. Пользователь может её скрыть.
 
@@ -1252,6 +1259,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
       <presentation id="String">
         <textBox refId="String">
           <label/>
diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 7842432..060d635 100644
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -279,10 +279,17 @@
 若禁用或不设定此原则，则会收集并上传 Telemetry 资料。 
 
 Mozilla 建议您不要禁用 Telemetry。 透过 Telemetry 收集到的信息可帮助为企业用户打造更好的产品。 </string>
-   <string id="DisplayBookmarksToolbar">显示书签工具栏</string>
+   <string id="DisplayBookmarksToolbar">显示书签工具栏（已弃用）</string>
    <string id="DisplayBookmarksToolbar_Explain">若启用此原则，默认将显示书签工具栏。 用户还是可以将其隐藏。 
 
 若禁用或不设定此原则，则默认不会显示书签工具栏。 </string>
+   <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+   <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+   <string id="DisplayBookmarksToolbar_Always">Always</string>
+   <string id="DisplayBookmarksToolbar_Never">Never</string>
+   <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
    <string id="DisplayMenuBar">显示菜单列（已弃用）</string>
    <string id="DisplayMenuBar_Explain">若启用此原则，默认将显示菜单列。 用户还是可以将其隐藏。 
 
@@ -1249,7 +1256,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
    </presentation>
    <presentation id="DisplayMenuBar">
 <dropdownList refId="DisplayMenuBar"/>
-   </presentation>
+   </presentation>\
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
    <presentation id="String">
 <textBox refId="String">
      <label/>
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 2cc4df4..4b10aeb 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -279,10 +279,17 @@
 若停用或不設定此原則，則會收集並上傳 Telemetry 資料。
 
 Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可幫助為企業使用者打造更好的產品。</string>
-      <string id="DisplayBookmarksToolbar">顯示書籤工具列</string>
+      <string id="DisplayBookmarksToolbar">顯示書籤工具列（已棄用）</string>
       <string id="DisplayBookmarksToolbar_Explain">若啟用此原則，預設將顯示書籤工具列。使用者還是可以將其隱藏。
 
 若停用或不設定此原則，則預設不會顯示書籤工具列。</string>
+      <string id="DisplayBookmarksToolbar_Enum">Display Bookmarks Toolbar</string>
+      <string id="DisplayBookmarksToolbar_Enum_Explain">If this policy is enabled, the default bokmarks toolbar display can be configured.
+
+If this policy is disabled or not configured, the bookmarks toolbar is displayed on the new tab page by default.</string>
+      <string id="DisplayBookmarksToolbar_Always">Always</string>
+      <string id="DisplayBookmarksToolbar_Never">Never</string>
+      <string id="DisplayBookmarksToolbar_NewTab">New Tab</string>
       <string id="DisplayMenuBar">顯示選單列（已棄用）</string>
       <string id="DisplayMenuBar_Explain">若啟用此原則，預設將顯示選單列。使用者還是可以將其隱藏。
 
@@ -1250,6 +1257,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
       <presentation id="DisplayMenuBar">
         <dropdownList refId="DisplayMenuBar"/>
       </presentation>
+      <presentation id="DisplayBookmarksToolbar">
+        <dropdownList refId="DisplayBookmarksToolbar"/>
+      </presentation>
       <presentation id="String">
         <textBox refId="String">
           <label/>
-- 
2.34.1