ExtensionSettings support

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 04626d29bb2e0b412549d8e16600c929650b6b42..2796bf6660cf635763bc5aeaf6593e1369c9ed93 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="1.6" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.6.1" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -213,6 +213,10 @@ Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werde
       <string id="ExtensionUpdate_Explain">Wenn Sie die Richtlinieneinstellung deaktivieren, werden Add-ons nicht automatisch aktualisiert.
 
 Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, werden Add-ons automatisch aktualisiert.</string>
       <string id="ExtensionUpdate_Explain">Wenn Sie die Richtlinieneinstellung deaktivieren, werden Add-ons nicht automatisch aktualisiert.
 
 Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, werden Add-ons automatisch aktualisiert.</string>

+      <string id="ExtensionSettings">Extension Management</string>
+      <string id="ExtensionSettings_Explain">If this policy is enabled, you can use JSON to describe the extension management policy. For detailed information, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
+
+If this policy is disabled or not configured, extensions will not be managed.</string>

       <string id="HardwareAcceleration">Hardware-Beschleunigung</string>
       <string id="HardwareAcceleration_Explain">Wenn Sie die Richtlinieneinstellung deaktivieren, wird die Hardware-Beschleunigung deaktiviert.
 
       <string id="HardwareAcceleration">Hardware-Beschleunigung</string>
       <string id="HardwareAcceleration_Explain">Wenn Sie die Richtlinieneinstellung deaktivieren, wird die Hardware-Beschleunigung deaktiviert.
 


@@ -770,6 +774,12 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <checkBox refId="FirefoxHome_Locked">Es ist nicht erlaubt, dass Einstellungen geändert werden.</checkBox>
       </presentation>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <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>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 27ba1db490553a8b37e9ec9b7e8cfd34dd65b02d..0dde6b6c9e06fd9c460c212cddc39071c79405fb 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="1.6" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.6.1" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -213,6 +213,14 @@ If this policy is disabled or not configured, no extensions are locked</string>
       <string id="ExtensionUpdate_Explain">If this policy is disabled, extensions will not be updated automatically.
 
 If this policy is enabled or not configured, extensions will be updated automatically.</string>
       <string id="ExtensionUpdate_Explain">If this policy is disabled, extensions will not be updated automatically.
 
 If this policy is enabled or not configured, extensions will be updated automatically.</string>

+      <string id="ExtensionSettings">Extension Management</string>
+      <string id="ExtensionSettings_Explain">If this policy is enabled, you can use JSON to describe the extension management policy.
+
+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>

       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 


@@ -770,6 +778,12 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>

+      <presentation id="ExtensionSettings">
+<!--        <multiTextBox refId="ExtensionSettings"/> -->
+        <textBox refId="ExtensionSettings">
+          <label/>
+        </textBox>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 19e67f99224358a781e13dfc87b82f0b159fd484..9a0bfcab7a7aef07c7755ced55bddf585946a98b 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="1.6" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.6.1" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -213,6 +213,10 @@ Si esta política está deshabilitada o no está configurada, no se bloquearán
       <string id="ExtensionUpdate_Explain">Si esta política está deshabilitada, las extensiones no se actualizarán automáticamente.
 
 Si esta política está habilitada o no está configurada, las extensiones se actualizarán automáticamente.</string>
       <string id="ExtensionUpdate_Explain">Si esta política está deshabilitada, las extensiones no se actualizarán automáticamente.
 
 Si esta política está habilitada o no está configurada, las extensiones se actualizarán automáticamente.</string>

+      <string id="ExtensionSettings">Extension Management</string>
+      <string id="ExtensionSettings_Explain">If this policy is enabled, you can use JSON to describe the extension management policy. For detailed information, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
+
+If this policy is disabled or not configured, extensions will not be managed.</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.
 
       <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.
 


@@ -770,6 +774,12 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Snippets">Fragmentos</checkBox>
         <checkBox refId="FirefoxHome_Locked">No permitir que se cambie la configuración</checkBox>
       </presentation>
         <checkBox refId="FirefoxHome_Snippets">Fragmentos</checkBox>
         <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>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index daa2ada6d87f2d529f741eb72e413dcfc3def8c8..c54a648adc722504b10f4cfa83e62481972619f4 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitions revision="1.6" schemaVersion="1.0">
+<policyDefinitions revision="1.6.1" schemaVersion="1.0">

   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>

-  <resources minRequiredRevision="1.6"/>
+  <resources minRequiredRevision="1.6.1"/>

   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINXPSP2)"/>
   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINXPSP2)"/>


@@ -16,6 +16,7 @@
       <definition name="SUPPORTED_FF66" displayName="$(string.SUPPORTED_FF66)"/>
       <definition name="SUPPORTED_FF67" displayName="$(string.SUPPORTED_FF67)"/>
       <definition name="SUPPORTED_FF68" displayName="$(string.SUPPORTED_FF68)"/>
       <definition name="SUPPORTED_FF66" displayName="$(string.SUPPORTED_FF66)"/>
       <definition name="SUPPORTED_FF67" displayName="$(string.SUPPORTED_FF67)"/>
       <definition name="SUPPORTED_FF68" displayName="$(string.SUPPORTED_FF68)"/>

+      <definition name="SUPPORTED_FF6801" displayName="$(string.SUPPORTED_FF6801)"/>

     </definitions>
   </supportedOn>
   <categories>
     </definitions>
   </supportedOn>
   <categories>


@@ -663,6 +664,14 @@
         <list id="Extensions" key="Software\Policies\Mozilla\Firefox\Extensions\Locked" valuePrefix=""/>
       </elements>
     </policy>
         <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" /> -->
+        <text id="ExtensionSettings" valueName="ExtensionSettings" />
+      </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"/>
     <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 2feacbd97f697a1f8ae54a0e07bc0e4486f113d9..fb30c5d128bc4e160b9a0ca73a035e3f07398025 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <?xml version="1.0" encoding="utf-8"?>\r

-<policyDefinitionResources revision="1.6" schemaVersion="1.0" >\r
+<policyDefinitionResources revision="1.6.1" schemaVersion="1.0" >\r

   <displayName/>\r
   <description/>\r
   <resources >\r
   <displayName/>\r
   <description/>\r
   <resources >\r


@@ -213,6 +213,10 @@ Si cette stratégie est désactivée ou non configurée, aucune extension n'est
       <string id="ExtensionUpdate_Explain">Si cette stratégie est désactivée, les extensions ne seront pas mise à jour automatiquement.\r
 \r
 Si cette stratégie est activée ou non configurée, les extensions seront mise à jour automatiquement.</string>\r
       <string id="ExtensionUpdate_Explain">Si cette stratégie est désactivée, les extensions ne seront pas mise à jour automatiquement.\r
 \r
 Si cette stratégie est activée ou non configurée, les extensions seront mise à jour automatiquement.</string>\r

+      <string id="ExtensionSettings">Extension Management</string>\r
+      <string id="ExtensionSettings_Explain">If this policy is enabled, you can use JSON to describe the extension management policy. For detailed information, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings\r
+\r
+If this policy is disabled or not configured, extensions will not be managed.</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
       <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


@@ -770,6 +774,12 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>\r
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>\r
       </presentation>\r
         <checkBox refId="FirefoxHome_Snippets">Snippets</checkBox>\r
         <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
+      </presentation>\r

     </presentationTable>\r
   </resources>\r
 </policyDefinitionResources>\r
     </presentationTable>\r
   </resources>\r
 </policyDefinitionResources>\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 52a928a13cd80da143ff12e27981abd758e2fa13..fa96df474343db7670786a93183b96815e952489 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="1.6" schemaVersion="1.0" >
+<policyDefinitionResources revision="1.6.1" schemaVersion="1.0" >

   <displayName/>
   <description/>
   <resources >
   <displayName/>
   <description/>
   <resources >


@@ -213,6 +213,10 @@ Se questo criterio è disabilitato o non configurato, non sarà bloccata nessuna
       <string id="ExtensionUpdate_Explain">Se questo criterio è disabilitato, le estensioni non saranno aggiornate automaticamente.
 
 Se questo criterio è abilitato o non configurato, le estensioni saranno aggiornate automaticamente.</string>
       <string id="ExtensionUpdate_Explain">Se questo criterio è disabilitato, le estensioni non saranno aggiornate automaticamente.
 
 Se questo criterio è abilitato o non configurato, le estensioni saranno aggiornate automaticamente.</string>

+      <string id="ExtensionSettings">Extension Management</string>
+      <string id="ExtensionSettings_Explain">If this policy is enabled, you can use JSON to describe the extension management policy. For detailed information, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
+
+If this policy is disabled or not configured, extensions will not be managed.</string>

       <string id="HardwareAcceleration">Accelerazione hardware</string>
       <string id="HardwareAcceleration_Explain">Se questo criterio è disabilitato, l'accelerazione hardware non può essere abilitata.
 
       <string id="HardwareAcceleration">Accelerazione hardware</string>
       <string id="HardwareAcceleration_Explain">Se questo criterio è disabilitato, l'accelerazione hardware non può essere abilitata.
 


@@ -770,6 +774,12 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Snippets">Snippet</checkBox>
         <checkBox refId="FirefoxHome_Locked">Non consentire la modifica delle preferenze</checkBox>
       </presentation>
         <checkBox refId="FirefoxHome_Snippets">Snippet</checkBox>
         <checkBox refId="FirefoxHome_Locked">Non consentire la modifica delle preferenze</checkBox>
       </presentation>

+      <presentation id="ExtensionSettings">
+<!--        <multiTextBox refId="ExtensionSettings"/> -->
+        <textBox refId="ExtensionSettings">
+          <label/>
+        </textBox>
+      </presentation>

     </presentationTable>
   </resources>
 </policyDefinitionResources>
     </presentationTable>
   </resources>
 </policyDefinitionResources>