CreateMasterPassword -> DisableMasterPasswordCreation

diff --git a/README.md b/README.md
index f73e47824f8e8d6aed51c3e571d3e3f398f7bd7d..e530e8f3bc3aa00b40878998192ff6f434ca76cf 100644 (file)
--- a/README.md
+++ b/README.md
@@ -93,12 +93,12 @@ This policy controls various settings related to cookies.
   }
 }
 ```
   }
 }
 ```

-### CreateMasterPassword
-This policy removes the master password functionality.
+### DisableMasterPasswordCreation
+This policy removes the master password functionality if set to true.

 ```
 {
   "policies": {
 ```
 {
   "policies": {

-    "CreateMasterPassword": false
+    "DisableMasterPasswordCreation": [true|false]

   }
 }
 ```
   }
 }
 ```

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 6524d26b0694e6e9ad26dc7a818573202fa9f300..5575e1905dc3fb800d2a7ee1b11e9b24e7d5bca2 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -40,8 +40,10 @@ If this policy is disabled or not configured, users can set images as their desk
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
 If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store.</string>
       <string id="Certificates_ImportEnterpriseRoots_Explain">If this policy is enabled, Firefox will read certificates from the Windows certificate store.
 
 If this policy is disabled or not configured, Firefox will not read certificates from the Windows certificate store.</string>

-      <string id="CreateMasterPassword">Create Master Password</string>
-      <string id="CreateMasterPassword_Explain">If false, removes access to create a master password.</string>
+      <string id="DisableMasterPasswordCreation">Disable Master Password Creation</string>
+      <string id="DisableMasterPasswordCreation_Explain">If this policy is enabled, users cannot create a master password.
+
+If this policy is disabled or not configured, users can create a master password.</string>

       <string id="DisableAppUpdate">Disable Update</string>
       <string id="DisableAppUpdate_Explain">Prevent the browser from updating.</string>
       <string id="DisableBuiltinPDFViewer">Disable Builtin PDF Viewer</string>
       <string id="DisableAppUpdate">Disable Update</string>
       <string id="DisableAppUpdate_Explain">Prevent the browser from updating.</string>
       <string id="DisableBuiltinPDFViewer">Disable Builtin PDF Viewer</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index a18a28f0632fe3add600f2248fba95e4f4996164..64dab3a06a347ab61e21d44d5405724eb1b2c083 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -195,7 +195,7 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

-    <policy name="CreateMasterPassword" class="Both" displayName="$(string.CreateMasterPassword)" explainText="$(string.CreateMasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="CreateMasterPassword">
+    <policy name="DisableMasterPasswordCreation" class="Both" displayName="$(string.DisableMasterPasswordCreation)" explainText="$(string.DisableMasterPasswordCreation_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableMasterPasswordCreation">

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