From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 23 Jun 2020 22:08:33 +0000 (-0500)
Subject: Merge pull request #625 from mozilla/PictureInPicture
X-Git-Tag: v2.0~10
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/cc0bada4298da8a689850dd9f20a6b6dde7b4a2f?hp=55d1d84bbc71aa851f2727fdeabbec32d7084f8e

Merge pull request #625 from mozilla/PictureInPicture

Picture in picture
---

diff --git a/README.md b/README.md
index 9cd4d11..0bbe393 100644
--- a/README.md
+++ b/README.md
@@ -2480,7 +2480,9 @@ Configure the default homepage and how Firefox starts.
 
 `StartPage` is how Firefox starts. The choices are no homepage, the default homepage or the previous session.
 
-**Compatibility:** Firefox 60, Firefox ESR 60 (StartPage was added in Firefox 60, Firefox ESR 60.4)\
+With Firefox 78, an additional option as added for `Startpage`, `homepage-locked`. This allows for locking the homepage, but still allowing the user to choose whether or not they want to restore their session.
+
+**Compatibility:** Firefox 60, Firefox ESR 60 (StartPage was added in Firefox 60, Firefox ESR 60.4, homepage-locked added in Firefox 78)\
 **CCK2 Equivalent:** `homePage`,`lockHomePage`\
 **Preferences Affected:** `browser.startup.homepage`,`browser.startup.page`
 
@@ -2490,7 +2492,7 @@ Software\Policies\Mozilla\Firefox\Homepage\URL = "https://example.com"
 Software\Policies\Mozilla\Firefox\Homepage\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Homepage\Additional\1 = "https://example.org"
 Software\Policies\Mozilla\Firefox\Homepage\Additional\2 = "https://example.edu"
-Software\Policies\Mozilla\Firefox\Homepage\StartPage = "none" | "homepage" |  "previous-session"
+Software\Policies\Mozilla\Firefox\Homepage\StartPage = "none" | "homepage" | "previous-session" | "homepage-locked"
 ```
 #### Windows (Intune)
 OMA-URI:
@@ -2539,7 +2541,7 @@ Value (string):
       <string>http://example.edu</string>
     </array>
     <key>StartPage</key>
-    <string>none | homepage | previous-session</string>
+    <string>none | homepage | previous-session | homepage-locked</string>
   </dict>
 </dict>
 ```
@@ -2552,7 +2554,7 @@ Value (string):
       "Locked": true | false,
       "Additional": ["http://example.org/",
                      "http://example.edu/"],
-      "StartPage": "none" | "homepage" | "previous-session"
+      "StartPage": "none" | "homepage" | "previous-session" | "homepage-locked"
     }
   }
 }
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 63cb963..a0ac3e4 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -599,6 +599,7 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird
       <string id="None">Leere Seite</string>
       <string id="Homepage">Startseite</string>
       <string id="PreviousSession">Letzte Sitzung</string>
+      <string id="HomepageLocked">Homepage (Locked)</string>
       <string id="PasswordManagerEnabled">Passwort-Manager</string>
       <string id="PasswordManagerEnabled_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, ist der Passwort-Manager nicht über die Einstellungen verfügbar.
 
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 4377035..5c18963 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -601,6 +601,7 @@ If this policy is disabled or not configured, the start page defaults to the pre
       <string id="None">None</string>
       <string id="Homepage">Homepage</string>
       <string id="PreviousSession">Previous Session</string>
+      <string id="HomepageLocked">Homepage (Locked)</string>
       <string id="PasswordManagerEnabled">Password Manager</string>
       <string id="PasswordManagerEnabled_Explain">If this policy is disabled, the password manager is not available via preferences.
 
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 138c750..94552c5 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -601,6 +601,7 @@ Si esta política está deshabilitada o no está configurada, la página de inic
       <string id="None">Ninguno</string>
       <string id="Homepage">Página de inicio</string>
       <string id="PreviousSession">Sesión anterior</string>
+      <string id="HomepageLocked">Homepage (Locked)</string>
       <string id="PasswordManagerEnabled">Administrador de contraseñas</string>
       <string id="PasswordManagerEnabled_Explain">Si esta política está deshabilitada, el administrador de contraseñas no estará disponible a través de las preferencias.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 2ba4c6c..5af5baa 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1274,6 +1274,11 @@
               <string>previous-session</string>
             </value>
           </item>
+          <item displayName="$(string.HomepageLocked)">
+            <value>
+              <string>homepage-locked</string>
+            </value>
+          </item>
         </enum>
       </elements>
     </policy>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index bb88e20..18b555f 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -600,6 +600,7 @@ Si cette stratégie est désactivée ou non configurée, la page de démarrage a
       <string id="None">Page vierge</string>
       <string id="Homepage">Page d'accueil</string>
       <string id="PreviousSession">Session précédente</string>
+      <string id="HomepageLocked">Homepage (Locked)</string>
       <string id="PasswordManagerEnabled">Gestionnaire de mots de passe</string>
       <string id="PasswordManagerEnabled_Explain">Si cette stratégie est désactivée, le gestionnaire de mots de passe n'est pas disponible via les préférences.
 
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 6cc07ea..c71c82c 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -601,6 +601,7 @@ Se questo criterio è disabilitato o non configurato, per impostazione predefini
       <string id="None">Nessuna</string>
       <string id="Homepage">Pagina iniziale</string>
       <string id="PreviousSession">Sessione precedente</string>
+      <string id="HomepageLocked">Homepage (Locked)</string>
       <string id="PasswordManagerEnabled">Gestore password</string>
       <string id="PasswordManagerEnabled_Explain">Se questo criterio è disabilitato, il gestore password non è disponibile nelle Preferenze.
 
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index c515c2a..10d4669 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -599,6 +599,7 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可
       <string id="None">無</string>
       <string id="Homepage">首頁</string>
       <string id="PreviousSession">先前的瀏覽狀態</string>
+      <string id="HomepageLocked">Homepage (Locked)</string>
       <string id="PasswordManagerEnabled">密碼管理員</string>
       <string id="PasswordManagerEnabled_Explain">若停用此原則，將無法於偏好設定中使用密碼管理員。