Add warning about Preferences coexisting

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 5c724bfaac40c0e6f989d6310513f1d8352db275..0b91030e0c8b0131c9390c8ae5f1c7faccb9c2d6 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -809,7 +809,9 @@ 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>
 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.
+      <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
+
+If this policy is enabled, you can use JSON to configure preferences.

 
 If this policy is disabled or not configured, preferences are not modified.
 
 
 If this policy is disabled or not configured, preferences are not modified.
 

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 759d576adbe35e9816f890717044c61ddfb80231..a8891e7ef70381d3f211986715ad76e6cc8641ca 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -810,7 +810,9 @@ 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>
 
 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.
+      <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
+
+If this policy is enabled, you can use JSON to configure preferences.

 
 If this policy is disabled or not configured, preferences are not modified.
 
 
 If this policy is disabled or not configured, preferences are not modified.
 

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index c9a67394a0fb67cd79f996cd16138813957edad1..56ef4d4d5dd5296e6977124aceb2e04fc470cf74 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -810,7 +810,9 @@ 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>
 
 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.
+      <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
+
+If this policy is enabled, you can use JSON to configure preferences.

 
 If this policy is disabled or not configured, preferences are not modified.
 
 
 If this policy is disabled or not configured, preferences are not modified.
 

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 177b7e57ac14737598d1dde273bd561ad4931ae2..564d43c364dee675bdb2a75bd7ed007859d4230f 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -809,7 +809,9 @@ If this policy is disabled or not configured, Firefox defaults are used.
 \r
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>\r
       <string id="Preferences">Préférences</string>\r
 \r
 For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers.</string>\r
       <string id="Preferences">Préférences</string>\r

-      <string id="Preferences_Explain">If this policy is enabled, you can use JSON to configure preferences.\r
+      <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.\r
+\r
+If this policy is enabled, you can use JSON to configure preferences.\r

 \r
 If this policy is disabled or not configured, preferences are not modified.\r
 \r
 \r
 If this policy is disabled or not configured, preferences are not modified.\r
 \r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index cc2799dbe5a70c5aaebc094a500f0ab64af5b26b..267faa53bb4ae3b6236aaf930ccb378d938b8b06 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -810,7 +810,9 @@ Se questo criterio è disabilitato o non configurato, vengono utilizzati i crite
 
 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>
 
 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.
+      <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
+
+If this policy is enabled, you can use JSON to configure preferences.

 
 If this policy is disabled or not configured, preferences are not modified.
 
 
 If this policy is disabled or not configured, preferences are not modified.
 

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 914feac069027ebd97d1166428c270fe4b3c308b..5cc0c26af2ee6b02f9e4e6e485cb0c4d8babe4b1 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -808,7 +808,9 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可
 
 若需要建立原則的詳細資訊，請參考 https://github.com/mozilla/policy-templates/blob/master/README.md#handlers。</string>
       <string id="Preferences">偏好設定</string>
 
 若需要建立原則的詳細資訊，請參考 https://github.com/mozilla/policy-templates/blob/master/README.md#handlers。</string>
       <string id="Preferences">偏好設定</string>

-      <string id="Preferences_Explain">若啟用此原則，您可以使用 JSON 檔案來預先指定偏好設定。
+      <string id="Preferences_Explain">Note: In order to use this policy, you must clear all settings in the old Preferences (Deprecated) section.
+
+若啟用此原則，您可以使用 JSON 檔案來預先指定偏好設定。

 
 若停用或不設定此原則，則不修改偏好設定。
 
 
 若停用或不設定此原則，則不修改偏好設定。