Reenable ExtensionSettings in admx using multiText.

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 6ed1b27c06e1dc3177794c9fc651e81a24992958..9a413495809fa560fcba2970a20cdb29538f80ce 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -218,9 +218,7 @@ Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, werden
 
 If this policy is disabled or not configured, extensions will not be managed.
 
-For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-You must remove all new lines when inserting the JSON. We will be fixing this in a future release.</string>
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Hardware-Beschleunigung</string>
       <string id="HardwareAcceleration_Explain">Wenn Sie die Richtlinieneinstellung deaktivieren, wird die Hardware-Beschleunigung deaktiviert.
 
@@ -779,10 +777,7 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Locked">Es ist nicht erlaubt, dass Einstellungen geändert werden.</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index fef1dae17ea540e19579161b16c119cea21ce08a..20c6dd4abdf16a6f940a309f1d9b1391d4c1bd41 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -218,9 +218,7 @@ If this policy is enabled or not configured, extensions will be updated automati
 
 If this policy is disabled or not configured, extensions will not be managed.
 
-For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-You must remove all new lines when inserting the JSON. We will be fixing this in a future release.</string>
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
@@ -779,10 +777,7 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 79e568d0ccf7235384ab1cfb00241787dae58306..a64e822cfcf11aae6c41d75d1068a67df5c67c86 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -218,9 +218,7 @@ Si esta política está habilitada o no está configurada, las extensiones se ac
 
 Si esta política está deshabilitada o no está configurada, las extensiones no se gestionarán.
 
-Para obtener información detallada sobre la creación de la política, visite https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-Debe eliminar todas las líneas nuevas al insertar el JSON. Arreglaremos esto en un futuro lanzamiento.</string>
+Para obtener información detallada sobre la creación de la política, visite https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Aceleración por hardware</string>
       <string id="HardwareAcceleration_Explain">Si esta política está deshabilitada, la aceleración por hardware no se puede habilitar.
 
@@ -779,10 +777,7 @@ Si esta política está deshabilitada o no está configurada, no se añadirá ni
         <checkBox refId="FirefoxHome_Locked">No permitir que se cambie la configuración</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index de4c005a2f425b437ee19de7762acb1538442b88..3ee413b8b7f57948a5423b0b34f504bee0c58592 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -664,15 +664,13 @@
         <list id="Extensions" key="Software\Policies\Mozilla\Firefox\Extensions\Locked" valuePrefix=""/>
       </elements>
     </policy>
-    <!--
     <policy name="ExtensionSettings" class="Both" displayName="$(string.ExtensionSettings)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExtensionSettings_Explain)"  presentation="$(presentation.ExtensionSettings)">">
       <parentCategory ref="Extensions"/>
       <supportedOn ref="SUPPORTED_FF6801"/>
       <elements>
-        <multiText id="ExtensionSettings" valueName="ExtensionSettings" />
+        <multiText id="ExtensionSettings" valueName="ExtensionSettings"  maxLength="2048"/>
       </elements>
     </policy>
-    -->
     <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 3d291839e89e912ec968de9f7fcf502606b74e3d..be194c7467c6ac91c4b6074fd8489bcfcf52a424 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -218,9 +218,7 @@ Si cette stratégie est activée ou non configurée, les extensions seront mise
 \r
 If this policy is disabled or not configured, extensions will not be managed.\r
 \r
-For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings\r
-\r
-You must remove all new lines when inserting the JSON. We will be fixing this in a future release.</string>\r
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>\r
       <string id="HardwareAcceleration">Accélération matérielle</string>\r
       <string id="HardwareAcceleration_Explain">Si cette stratégie est désactivée, l'accélération matérielle ne peut pas être activée.\r
 \r
@@ -779,10 +777,7 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>\r
       </presentation>\r
       <presentation id="ExtensionSettings">\r
-<!--        <multiTextBox refId="ExtensionSettings"/> -->\r
-        <textBox refId="ExtensionSettings">\r
-          <label/>\r
-        </textBox>\r
+        <multiTextBox refId="ExtensionSettings"/>\r
       </presentation>\r
     </presentationTable>\r
   </resources>\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index e7cc6d529982348012a98efceb723baed1fc4861..f2faf6ae452b503e1447f4110fadebcef3363244 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -218,9 +218,7 @@ Se questo criterio è abilitato o non configurato, le estensioni saranno aggiorn
 
 Se questo criterio è disabilitato o non configurato, le estensioni non saranno gestite.
 
-Per informazioni dettagliate sulla creazione della policy, si veda https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-È necessario rimuovere tutti i caratteri di ritorno a capo durante l'inserimento del JSON. Correggeremo questo bug in un rilascio successivo.</string>
+Per informazioni dettagliate sulla creazione della policy, si veda https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Accelerazione hardware</string>
       <string id="HardwareAcceleration_Explain">Se questo criterio è disabilitato, l'accelerazione hardware non può essere abilitata.
 
@@ -779,10 +777,7 @@ Se questo criterio è disabilitato o non configurato, non sarà aggiunta nessuna
         <checkBox refId="FirefoxHome_Locked">Non consentire la modifica delle preferenze</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>