From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 14 Sep 2020 20:50:16 +0000 (-0500)
Subject: Final changes for preferences
X-Git-Tag: v2.3~5^2
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/e4134c8b4ce38b8b340f24f3c13ac9ea9132ffed?ds=sidebyside;hp=--cc

Final changes for preferences
---

e4134c8b4ce38b8b340f24f3c13ac9ea9132ffed
diff --git a/README.md b/README.md
index 6a6faad..dc293d6 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,8 @@ Policies can be specified using the [Group Policy templates on Windows](https://
 | **[`Permissions`](#permissions)** | Set permissions associated with camera, microphone, location, and notifications.
 | **[`PictureInPicture`](#pictureinpicture)** | Enable or disable Picture-in-Picture.
 | **[`PopupBlocking`](#popupblocking)** | Configure the default pop-up window policy as well as origins for which pop-up windows are allowed.
-| **[`Preferences`](#preferences)** | Set and lock some preferences.
-| **[`Preferences (deprecated)`](#preferences--deprecated)** | Set and lock some preferences.
+| **[`Preferences`](#preferences)** | Set and lock preferences.
+| **[`Preferences (Deprecated)`](#preferences--deprecated)** | Set and lock some preferences.
 | **[`PromptForDownloadLocation`](#promptfordownloadlocation)** | Ask where to save each file before downloading.
 | **[`Proxy`](#proxy)** | Configure proxy settings.
 | **[`RequestedLocales`](#requestedlocales)** | Set the the list of requested locales for the application in order of preference.
@@ -3750,9 +3750,9 @@ Value (string):
 }
 ```
 ### Preferences
-Set the default and user values of certain preferences, as well as lock and clear them.
+Set and lock preferences.
 
-IMPORTANT: If you set a preference using this mechanism that has be set by a different policy, the behavior is undefined. You should only use one method for setting preferences.
+Previously you could only set and lock a subset of preferences. Starting with Firefox 81 and Firefox ESR 78.3 you can set many more preferences. You can also set default preferences, user preferences and you can clear preferences.
 
 Preferences that start with the following prefixes are supported:
 ```
@@ -3783,7 +3783,7 @@ security.ssl.errorReporting.enabled
 security.tls.hello_downgrade_check
 security.warn_submit_secure_to_insecure
 ```
-For a given preferences, set the `Value` to the corresponding preference value.
+Using the preference as the key, set the `Value` to the corresponding preference value.
 
 `Status` can be "default", "locked", "user" or "clear"
 
@@ -3791,18 +3791,22 @@ If a value is locked, it is also set as the default.
 
 User preferences persist across invocations of Firefox.
 
+See the examples below for more detail.
+
+IMPORTANT: Make sure you're only setting a particular preference using this mechanism and not some other way.
+
 Status
 **Compatibility:** Firefox 81, Firefox ESR 78.3\
 **CCK2 Equivalent:** `preferences`\
-**Preferences Affected:** See below
+**Preferences Affected:** Many
 
 #### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\Preferences (REG_MULTI_SZ) =
 {
   "accessibility.force_disabled": {
-    "Value": 1
-    "Status": "default",
+    "Value": 1,
+    "Status": "default"
   },
   "browser.cache.disk.parent_directory": {
     "Value": "SOME_NATIVE_PATH",
@@ -3825,8 +3829,8 @@ Value (string):
 <data id="Preferences" value='
 {
   "accessibility.force_disabled": {
-    "Value": 1
-    "Status": "default",
+    "Value": 1,
+    "Status": "default"
   },
   "browser.cache.disk.parent_directory": {
     "Value": "SOME_NATIVE_PATH",
@@ -3873,8 +3877,8 @@ Value (string):
   "policies": {
     "Preferences": {
       "accessibility.force_disabled": {
-        "Value": 1
-        "Status": "default",
+        "Value": 1,
+        "Status": "default"
       },
       "browser.cache.disk.parent_directory": {
         "Value": "SOME_NATIVE_PATH",
@@ -3888,7 +3892,7 @@ Value (string):
   }
 }
 ```
-### Preferences (deprecated)
+### Preferences (Deprecated)
 Set and lock certain preferences.
 
 **Compatibility:** See below\
diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 6b0026a..3070383 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -512,10 +512,27 @@
 	</dict>
 	<key>Preferences</key>
 	<dict>
-		<key>app.update.auto</key>
-		<true/>
-		<key>security.default_personal_cert</key>
-		<string>Ask Every Time</string>
+		<key>accessibility.force_disabled</key>
+		<dict>
+			<key>Value</key>
+			<integer>1</integer>
+			<key>Status</key>
+			<string>default</string>
+			</dict>
+		<key>browser.cache.disk.parent_directory</key>
+		<dict>
+			<key>Value</key>
+			<string>SOME_NATIVE_PATH</string>
+			<key>Status</key>
+			<string>user</string>
+		</dict>
+		<key>browser.tabs.warnOnClose</key>
+		<dict>
+			<key>Value</key>
+			<false/>
+			<key>Status</key>
+			<string>locked</string>
+		</dict>
 	</dict>
 	<key>Proxy</key>
 	<dict>
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 898aca9..4e45b30 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -50,7 +50,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Startseite</string>
       <string id="Search_group">Suche</string>
-      <string id="Preferences_group">Einstellungen</string>
+      <string id="Preferences_group">Einstellungen (Veraltet)</string>
       <string id="UserMessaging_group">Benutzer-Benachrichtigungen</string>
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">DRM-Medien Erweiterungen</string>
@@ -803,6 +803,12 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werde
 
 Für eine Beschreibung der Einstellung, siehe:
 https://github.com/mozilla/policy-templates/blob/master/README.md#handlers (Englisch)</string>
+      <string id="Preferences">Einstellungen</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
       <string id="Preferences_Boolean_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist die Einstellung auf true gesperrt. Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Einstellung auf false gesperrt.
 
 Für eine Beschreibung der Einstellung, siehe:
@@ -1108,6 +1114,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index de5d5a7..4f42c02 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -50,7 +50,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Home page</string>
       <string id="Search_group">Search</string>
-      <string id="Preferences_group">Preferences</string>
+      <string id="Preferences_group">Preferences (Deprecated)</string>
       <string id="UserMessaging_group">User Messaging</string>
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
@@ -804,6 +804,12 @@ If this policy is not configured, users can choose to create a primary password.
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="Preferences">Preferences</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
       <string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
 
 For a description of the preference, see:
@@ -1108,6 +1114,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index ab3e4b1..ff1ccf9 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -50,7 +50,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Página de inicio</string>
       <string id="Search_group">Búsqueda</string>
-      <string id="Preferences_group">Preferencias</string>
+      <string id="Preferences_group">Preferencias (obsoleto)</string>
       <string id="UserMessaging_group">Mensajería del usuario</string>
       <string id="DisabledCiphers_group">Cifrados deshabilitados</string>
       <string id="EncryptedMediaExtensions_group">Extensiones de medios cifrados</string>
@@ -804,6 +804,12 @@ If this policy is not configured, users can choose to create a primary password.
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="Preferences">Preferencias</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
       <string id="Preferences_Boolean_Explain">Si esta política está habilitada, la preferencia se bloquea en true. Si esta política está deshabilitada, la preferencia está bloqueada en false.
 
 Para una descripción de la preferencia, visita:
@@ -1108,6 +1114,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index a63eb85..8a72161 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -3688,5 +3688,12 @@
         <multiText id="Handlers" valueName="Handlers"  maxLength="2048"/>
       </elements>
     </policy>
+    <policy name="Preferences" class="Both" displayName="$(string.Preferences)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Preferences_Explain)"  presentation="$(presentation.JSON)">">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF81"/>
+      <elements>
+        <multiText id="JSON" valueName="Preferences"  maxLength="2048"/>
+      </elements>
+    </policy>
   </policies>
 </policyDefinitions>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 0526f6d..0137bfe 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -50,7 +50,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Page d'accueil</string>
       <string id="Search_group">Recherche</string>
-      <string id="Preferences_group">Préférences</string>
+      <string id="Preferences_group">Préférences (Deprecated)</string>
       <string id="UserMessaging_group">User Messaging</string>
       <string id="DisabledCiphers_group">Disabled Ciphers</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
@@ -803,6 +803,12 @@ If this policy is not configured, users can choose to create a primary password.
 If this policy is disabled or not configured, Firefox defaults are used.
 
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="Preferences">Préférences</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
       <string id="Preferences_Boolean_Explain">Si cette stratégie est activée, la préférence est verrouillée sur true. Si cette stratégie est désactivée, la préférence est verrouillée sur false.
 
 Pour une description de la préférence, voir:
@@ -1107,6 +1113,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 6bd975b..89a1a64 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -50,7 +50,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">Pagina iniziale</string>
       <string id="Search_group">Ricerca</string>
-      <string id="Preferences_group">Preferenze</string>
+      <string id="Preferences_group">Preferenze (deprecata)</string>
       <string id="UserMessaging_group">Messaggi utente</string>
       <string id="DisabledCiphers_group">Cifrari disabilitati</string>
       <string id="EncryptedMediaExtensions_group">Encrypted Media Extensions</string>
@@ -804,6 +804,12 @@ Se questo criterio è non configurato, gli utenti possono scegliere di creare un
 Se questo criterio è disabilitato o non configurato, vengono utilizzati i criteri predefiniti di Firefox.
 
 Per informazioni dettagliate sulla creazione del criterio, si veda https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>
+      <string id="Preferences">Preferenze</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
       <string id="Preferences_Boolean_Explain">Se questo criterio è abilitato, la preferenza è impostata a Vero e resa non modificabile. Se questo criterio è disabilitato, la preferenza è impostata a Falso e resa non modificabile.
 
 Per una descrizione della preferenza, si veda:
@@ -1108,6 +1114,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index b884f61..14939ec 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -50,7 +50,7 @@
       <string id="Flash_group">Flash</string>
       <string id="Homepage_group">首頁</string>
       <string id="Search_group">搜尋</string>
-      <string id="Preferences_group">偏好設定</string>
+      <string id="Preferences_group">偏好設定（已棄用）</string>
       <string id="UserMessaging_group">顯示給使用者的訊息</string>
       <string id="DisabledCiphers_group">停用加密演算法</string>
       <string id="EncryptedMediaExtensions_group">加密媒體擴充功能</string>
@@ -802,6 +802,12 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可
 若停用或不設定此原則，則使用 Firefox 預設設定。
 
 若需要建立原則的詳細資訊，請參考 https://github.com/mozilla/policy-templates/blob/master/README.md#handlers。</string>
+      <string id="Preferences">偏好設定</string>
+      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.
+
+If this policy is disabled or not configured, preferences are not modified.
+
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</string>
       <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
 
 若需要偏好設定的詳細說明，請參考：
@@ -1106,6 +1112,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
       <presentation id="Autoplay_Default">
         <dropdownList refId="Autoplay_Default"/>
       </presentation>
+      <presentation id="JSON">
+        <multiTextBox refId="JSON"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
\ No newline at end of file