Merge pull request #838 from mozilla/sponsored

Support for SponsoredTopSites and SponsoredPocket

diff --git a/README.md b/README.md
index d21c047d085e98d536800ba9a4f59ff3e54d902b..e4f1fe40effc6ff47ad9ed89b1612b249ffca91f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2889,16 +2889,18 @@ Value (string):
 ### FirefoxHome
 Customize the Firefox Home page.
 
-**Compatibility:** Firefox 68, Firefox ESR 68\
+**Compatibility:** Firefox 68, Firefox ESR 68 (SponsoredTopSites and SponsoredPocket were added in Firefox 95, Firefox ESR 91.4)
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets`
+**Preferences Affected:** `browser.newtabpage.activity-stream.showSearch`, `browser.newtabpage.activity-stream.feeds.topsites`, `browser.newtabpage.activity-stream.feeds.section.highlights`, `browser.newtabpage.activity-stream.feeds.section.topstories`, `browser.newtabpage.activity-stream.feeds.snippets`, `browser.newtabpage.activity-stream.showSponsoredTopSites`, `browser.newtabpage.activity-stream.showSponsored`
 
 #### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\FirefoxHome\Search = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\TopSites = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredTopSites = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Highlights = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Pocket = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\FirefoxHome\SponsoredPocket = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Snippets = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\FirefoxHome\Locked = 0x1 | 0x0
 ```
@@ -2912,8 +2914,10 @@ Value (string):
 <enabled/>
 <data id="FirefoxHome_Search"  value="true | false"/>
 <data id="FirefoxHome_TopSites"  value="true | false"/>
+<data id="FirefoxHome_SponsoredTopSites"  value="true | false"/>
 <data id="FirefoxHome_Highlights"  value="true | false"/>
 <data id="FirefoxHome_Pocket"  value="true | false"/>
+<data id="FirefoxHome_SponsoredPocket"  value="true | false"/>
 <data id="FirefoxHome_Snippets"  value="true | false"/>
 <data id="FirefoxHome_Locked"  value="true | false"/>
 ```
@@ -2926,10 +2930,14 @@ Value (string):
     <true/> | <false/>
     <key>TopSites</key>
     <true/> | <false/>
+    <key>SponsoredTopSites</key>
+    <true/> | <false/>
     <key>Highlights</key>
     <true/> | <false/>
     <key>Pocket</key>
     <true/> | <false/>
+    <key>SponsoredPocket</key>
+    <true/> | <false/>
     <key>Snippets</key>
     <true/> | <false/>
     <key>Locked</key>
@@ -2944,8 +2952,10 @@ Value (string):
     "FirefoxHome": {
       "Search": true | false,
       "TopSites": true | false,
+      "SponsoredTopSites": true | false,
       "Highlights": true | false,
       "Pocket": true | false,
+      "SponsoredPocket": true | false,
       "Snippets": true | false,
       "Locked": true | false
     }

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 6b1c1a8e12b8e1c6db06c0339834fd71e2e04640..733afeb1b98d97a57020d19082310006accb6c73 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -284,10 +284,14 @@
                <true/>
                <key>TopSites</key>
                <true/>
+               <key>SponsoredTopSites</key>
+               <false/>
                <key>Highlights</key>
                <true/>
                <key>Pocket</key>
                <false/>
+               <key>SponsoredPocket</key>
+               <false/>
                <key>Snippets</key>
                <false/>
                <key>Locked</key>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index d45970500467fecf227ddc444150e407da8ea1f3..1c4bc26c604e2e03d83f0383e7e2c11241ec5085 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1161,8 +1161,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Suche</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Top Seiten</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>
         <checkBox refId="FirefoxHome_Highlights">Download Verlauf</checkBox>
         <checkBox refId="FirefoxHome_Pocket">Von Pocket empfohlen</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <checkBox refId="FirefoxHome_Locked">Es ist nicht erlaubt, dass Einstellungen geändert werden.</checkBox>
       </presentation>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index f3085d72e99fe06d897438eee1afd3b95331fa99..d279adc118b1614b9accc7dc54e449b12d5f1911 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1160,8 +1160,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Search</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Top Sites</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>
         <checkBox refId="FirefoxHome_Highlights">Download History</checkBox>
         <checkBox refId="FirefoxHome_Pocket">Recommended by Pocket</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 8fae8d686816d10ce99568e2a0fdc138c66e9ec0..c7a8b12b14c5217916739f80babfd1f834d19708 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -1160,8 +1160,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Búsqueda</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Sitios populares</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>
         <checkBox refId="FirefoxHome_Highlights">Historial de descargas</checkBox>
         <checkBox refId="FirefoxHome_Pocket">Recomendado por Pocket</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>
         <checkBox refId="FirefoxHome_Snippets">Fragmentos</checkBox>
         <checkBox refId="FirefoxHome_Locked">No permitir que se cambie la configuración</checkBox>
       </presentation>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index d4fc2e724c70eb95115e8ab4dd28b7cbbb339fd3..aea314bcfdc9219c596617e57bf65c79f7158809 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1106,6 +1106,14 @@
             <decimal value="0"/>
           </falseValue>
         </boolean>
+        <boolean id="FirefoxHome_SponsoredTopSites" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="SponsoredTopSites">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
         <boolean id="FirefoxHome_Highlights" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="Highlights">
           <trueValue>
             <decimal value="1"/>
@@ -1122,6 +1130,14 @@
             <decimal value="0"/>
           </falseValue>
         </boolean>
+        <boolean id="FirefoxHome_SponsoredPocket" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="SponsoredPocket">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
         <boolean id="FirefoxHome_Snippets" key="Software\Policies\Mozilla\Firefox\FirefoxHome" valueName="Snippets">
           <trueValue>
             <decimal value="1"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index d25d776b086c91d6cc4648e32ac722bf1b7fb1bb..8ca32b1190b34029a41901dbf854622fb771c1cd 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1159,8 +1159,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="FirefoxHome">\r
         <checkBox refId="FirefoxHome_Search">Rechercher</checkBox>\r
         <checkBox refId="FirefoxHome_TopSites">Meilleurs sites</checkBox>\r
+        <checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>\r
         <checkBox refId="FirefoxHome_Highlights">Historique de téléchargement</checkBox>\r
         <checkBox refId="FirefoxHome_Pocket">Enregistré dans Pocket</checkBox>\r
+        <checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>\r
         <checkBox refId="FirefoxHome_Snippets">Brèves</checkBox>\r
         <checkBox refId="FirefoxHome_Locked">Ne pas autoriser la modification des paramètres</checkBox>\r
       </presentation>\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index e4ece5d394786a4053e7165e7e481c7da4fd1df1..15276cc9b462d2781dc953803b93f399857571d4 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -1161,8 +1161,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">Ricerca sul Web</checkBox>
         <checkBox refId="FirefoxHome_TopSites">Siti principali</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>
         <checkBox refId="FirefoxHome_Highlights">Cronologia dei download</checkBox>
         <checkBox refId="FirefoxHome_Pocket">Raccomandati da Pocket</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>
         <checkBox refId="FirefoxHome_Snippets">Snippet</checkBox>
         <checkBox refId="FirefoxHome_Locked">Non consentire la modifica delle preferenze</checkBox>
       </presentation>

diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index e3425dd1beb1d5e6c755c6ca5eadbd1a3c5dc6aa..ade9f1009a564351f49e0a55c21f5d0d3454e5d5 100644 (file)
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1160,8 +1160,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. <
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search"> Поиск </checkBox>
         <checkBox refId="FirefoxHome_TopSites"> Популярные сайты </checkBox>
+        <checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>
         <checkBox refId="FirefoxHome_Highlights"> История загрузок </checkBox>
         <checkBox refId="FirefoxHome_Pocket"> Рекомендуется Pocket </checkBox>
+        <checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>
         <checkBox refId="FirefoxHome_Snippets"> Фрагменты </checkBox>
         <checkBox refId="FirefoxHome_Locked"> Запретить изменение настроек</checkBox>
       </presentation>

diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 260e664966daee4590e7c0e51c1571fd4a78c96b..b114a53ac4daf639324d4ae7b2afbe08b596c1f7 100644 (file)
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -1158,8 +1158,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
    <presentation id="FirefoxHome">
 <checkBox refId="FirefoxHome_Search">搜索</checkBox>
 <checkBox refId="FirefoxHome_TopSites">热门网站</checkBox>
+<checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>
 <checkBox refId="FirefoxHome_Highlights">下载记录</checkBox>
 <checkBox refId="FirefoxHome_Pocket">Pocket 推荐项</checkBox>
+<checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>
 <checkBox refId="FirefoxHome_Snippets">只字片语</checkBox>
 <checkBox refId="FirefoxHome_Locked">不允许变更设置</checkBox>
    </presentation>

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 9e8ddd0ede02a9bb24e537d871320041460b84de..9495c90d58a17b8f3c4669503d8132471e77aa04 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -1158,8 +1158,10 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
       <presentation id="FirefoxHome">
         <checkBox refId="FirefoxHome_Search">搜尋</checkBox>
         <checkBox refId="FirefoxHome_TopSites">熱門網站</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredTopSites">Sponsored Top Sites</checkBox>
         <checkBox refId="FirefoxHome_Highlights">下載紀錄</checkBox>
         <checkBox refId="FirefoxHome_Pocket">Pocket 推薦項目</checkBox>
+        <checkBox refId="FirefoxHome_SponsoredPocket">Sponsored Pocket Stories</checkBox>
         <checkBox refId="FirefoxHome_Snippets">隻字片語</checkBox>
         <checkBox refId="FirefoxHome_Locked">不允許變更設定</checkBox>
       </presentation>