Merge pull request #625 from mozilla/PictureInPicture

Picture in picture

diff --git a/README.md b/README.md
index 9cd4d11bdce051221f08cda13b2ac2932c4e2a4b..0bbe39305151e08aa73b1150a0f6b5ccbb528b46 100644 (file)
--- 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 63cb963e84c981f23e74f766552fd7c93005d14e..a0ac3e463f2b4b53cd428d965cbdc4f1d2ad2e6b 100644 (file)
--- 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 4377035d324492d4b5acdf889da673d1fc86d643..5c189633f01232addae49eee742e937bd2088976 100644 (file)
--- 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 138c750604ba5ad13d4367985e180f9c315db6ac..94552c5e87a5aeeb8f853263c10093395a30eeb7 100644 (file)
--- 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 2ba4c6ce67470bd4e376d41dd8e97c2311f8b750..5af5baad586292f11b2b8b4737a19239b21472c3 100644 (file)
--- 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 bb88e20a6ca786e393768e714071ac0b38231d29..18b555f17475ab5e5a2c00f4888dc27e58ba0d9e 100644 (file)
--- 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>\r
       <string id="Homepage">Page d'accueil</string>\r
       <string id="PreviousSession">Session précédente</string>\r
+      <string id="HomepageLocked">Homepage (Locked)</string>\r
       <string id="PasswordManagerEnabled">Gestionnaire de mots de passe</string>\r
       <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.\r
 \r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 6cc07ea3336e8aaaa390a51870c0bfcd7c271806..c71c82c0d6f87bb6a96a0964b6244d9a4f227261 100644 (file)
--- 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 c515c2a5b0954d60310e34b5e9430c8f6c56e0f5..10d46693ec9900cc012aa3f785ab54127543605c 100644 (file)
--- 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">若停用此原則，將無法於偏好設定中使用密碼管理員。