MasterPassword should be in 79.

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index e0043edf3f3ff3be063db08cb5cbf4f728c4ceed..7bc00f5cc99236b72adb64cf01c718efbcc4ce8f 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -374,8 +374,6 @@
                <string>http://example.org</string>
                <string>http://example.edu</string>
        </array>
                <string>http://example.org</string>
                <string>http://example.edu</string>
        </array>

-       <key>MasterPassword</key>
-       <true/>

        <key>NetworkPrediction</key>
        <false/>
        <key>NewTabPage</key>
        <key>NetworkPrediction</key>
        <false/>
        <key>NewTabPage</key>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 637cbf4e7f114c929d1bc2724e6dd9937f42b374..888b52bd587e9b6f2d8afa02e958536cb293c297 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="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >

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

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 599e8ef358e1c318978ef16e73635db0f4a77e38..d14e1304b558224aa090b9ad5cb5c3e484859081 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="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >

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

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 765368ce84fdef3847edb17655a9058454d772fd..08d2f54cab279489949416d94e1d08c8155c6f5d 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="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >

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

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 86964abfa34e010687944009e9e397a6ce69be05..5a3785b841a2e44ebf41a5c2c528baedf3c01848 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="2.0" schemaVersion="1.0">
+<policyDefinitions revision="2.01" 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="2.0"/>
+  <resources minRequiredRevision="2.01"/>

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


@@ -3617,7 +3617,7 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

-    <policy name="MasterPassword" class="Both" displayName="$(string.MasterPassword)" explainText="$(string.MasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="MasterPassword">
+<!--    <policy name="MasterPassword" class="Both" displayName="$(string.MasterPassword)" explainText="$(string.MasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="MasterPassword">

       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
       <enabledValue>
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
       <enabledValue>


@@ -3626,7 +3626,7 @@
       <disabledValue>
         <decimal value="0"/>
       </disabledValue>
       <disabledValue>
         <decimal value="0"/>
       </disabledValue>

-    </policy>
+    </policy> -->

     <policy name="Handlers" class="Both" displayName="$(string.Handlers)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)"  presentation="$(presentation.Handlers)">">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
     <policy name="Handlers" class="Both" displayName="$(string.Handlers)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)"  presentation="$(presentation.Handlers)">">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 26c8c26d14f938f37f18b799e91d904b68a21e0e..3e0876629d605d15eaf4911d56ae7e7e701a7cd9 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="2.0" schemaVersion="1.0" >\r
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >\r

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

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index 25dedc10e76a56dcb3b01c3f9ae44b83dce9fdd4..0249ee0e787fba73726a4435084e6add1b906019 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="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >

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

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 107e86ef7cd2d59ffd1555fc69b18a75cb42c921..d1250ea3e43d4ebe5e88249dfefbcccebeae5b05 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitionResources revision="2.0" schemaVersion="1.0" >
+<policyDefinitionResources revision="2.01" schemaVersion="1.0" >

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