Switch values to decimal, cleanup formatting

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 628b7d73fb84210b35073f66b3e68fedc9c4f5eb..1396c88adbfaad3b6675cafb364c7ae1d70eb0d2 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>

-<policyDefinitions revision="1.0" schemaVersion="1.0" >
-  <policyNamespaces >
-    <target prefix="firefox" namespace="Mozilla.Policies.Firefox" />
-    <using prefix="Mozilla" namespace="Mozilla.Policies" />
+<policyDefinitions revision="1.0" schemaVersion="1.0">
+  <policyNamespaces>
+    <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
+    <using prefix="Mozilla" namespace="Mozilla.Policies"/>

   </policyNamespaces>
   </policyNamespaces>

-  <resources minRequiredRevision="1.0" />
-  <supportedOn >
-    <definitions >
-      <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINXPSP2)" />
+  <resources minRequiredRevision="1.0"/>
+  <supportedOn>
+    <definitions>
+      <definition name="SUPPORTED_WINXPSP2" displayName="$(string.SUPPORTED_WINXPSP2)"/>

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


@@ -18,168 +18,168 @@
     <category displayName="$(string.Permissions_group)" name="Permissions">
       <parentCategory ref="firefox"/>
     </category>
     <category displayName="$(string.Permissions_group)" name="Permissions">
       <parentCategory ref="firefox"/>
     </category>

-    <category displayName="$(string.Popups_group)" name="Popups" >
-      <parentCategory ref="Permissions" />
+    <category displayName="$(string.Popups_group)" name="Popups">
+      <parentCategory ref="Permissions"/>

     </category>
     </category>

-    <category displayName="$(string.Cookies_group)" name="Cookies" >
-      <parentCategory ref="Permissions" />
+    <category displayName="$(string.Cookies_group)" name="Cookies">
+      <parentCategory ref="Permissions"/>

     </category>
     </category>

-    <category displayName="$(string.Addons_group)" name="Addons" >
-      <parentCategory ref="Permissions" />
+    <category displayName="$(string.Addons_group)" name="Addons">
+      <parentCategory ref="Permissions"/>

     </category>
     </category>

-    <category displayName="$(string.Flash_group)" name="Flash" >
-      <parentCategory ref="Permissions" />
+    <category displayName="$(string.Flash_group)" name="Flash">
+      <parentCategory ref="Permissions"/>

     </category>
   </categories>
     </category>
   </categories>

-  <policies >
-    <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+  <policies>
+    <policy name="BlockAboutAddons" class="Both" displayName="$(string.BlockAboutAddons)" explainText="$(string.BlockAboutAddons_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutAddons">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="BlockAboutConfig" class="Both" displayName="$(string.BlockAboutConfig)" explainText="$(string.BlockAboutConfig_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutConfig" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="BlockAboutConfig" class="Both" displayName="$(string.BlockAboutConfig)" explainText="$(string.BlockAboutConfig_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutConfig">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="BlockAboutSupport" class="Both" displayName="$(string.BlockAboutSupport)" explainText="$(string.BlockAboutSupport_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutSupport" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="BlockAboutSupport" class="Both" displayName="$(string.BlockAboutSupport)" explainText="$(string.BlockAboutSupport_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockAboutSupport">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="BlockSetDesktopBackground" class="Both" displayName="$(string.BlockSetDesktopBackground)" explainText="$(string.BlockSetDesktopBackground_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockSetDesktopBackground" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="BlockSetDesktopBackground" class="Both" displayName="$(string.BlockSetDesktopBackground)" explainText="$(string.BlockSetDesktopBackground_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="BlockSetDesktopBackground">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="CreateMasterPassword" class="Both" displayName="$(string.CreateMasterPassword)" explainText="$(string.CreateMasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="CreateMasterPassword" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="CreateMasterPassword" class="Both" displayName="$(string.CreateMasterPassword)" explainText="$(string.CreateMasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="CreateMasterPassword">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisableAppUpdate" class="Both" displayName="$(string.DisableAppUpdate)" explainText="$(string.DisableAppUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableAppUpdate" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisableAppUpdate" class="Both" displayName="$(string.DisableAppUpdate)" explainText="$(string.DisableAppUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableAppUpdate">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisableDeveloperTools" class="Both" displayName="$(string.DisableDeveloperTools)" explainText="$(string.DisableDeveloperTools_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableDeveloperTools" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisableDeveloperTools" class="Both" displayName="$(string.DisableDeveloperTools)" explainText="$(string.DisableDeveloperTools_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableDeveloperTools">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisableFirefoxScreenshots" class="Both" displayName="$(string.DisableFirefoxScreenshots)" explainText="$(string.DisableFirefoxScreenshots_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxScreenshots" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisableFirefoxScreenshots" class="Both" displayName="$(string.DisableFirefoxScreenshots)" explainText="$(string.DisableFirefoxScreenshots_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxScreenshots">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisableFirefoxStudies" class="Both" displayName="$(string.DisableFirefoxStudies)" explainText="$(string.DisableFirefoxStudies_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxStudies" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisableFirefoxStudies" class="Both" displayName="$(string.DisableFirefoxStudies)" explainText="$(string.DisableFirefoxStudies_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxStudies">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisableFormHistory" class="Both" displayName="$(string.DisableFormHistory)" explainText="$(string.DisableFormHistory_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFormHistory" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisableFormHistory" class="Both" displayName="$(string.DisableFormHistory)" explainText="$(string.DisableFormHistory_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFormHistory">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisablePocket" class="Both" displayName="$(string.DisablePocket)" explainText="$(string.DisablePocket_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisablePocket" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisablePocket" class="Both" displayName="$(string.DisablePocket)" explainText="$(string.DisablePocket_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisablePocket">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisplayBookmarksToolbar" class="Both" displayName="$(string.DisplayBookmarksToolbar)" explainText="$(string.DisplayBookmarksToolbar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayBookmarksToolbar" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisplayBookmarksToolbar" class="Both" displayName="$(string.DisplayBookmarksToolbar)" explainText="$(string.DisplayBookmarksToolbar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayBookmarksToolbar">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DisplayMenuBar" class="Both" displayName="$(string.DisplayMenuBar)" explainText="$(string.DisplayMenuBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayMenuBar" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DisplayMenuBar" class="Both" displayName="$(string.DisplayMenuBar)" explainText="$(string.DisplayMenuBar_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisplayMenuBar">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="DontCheckDefaultBrowser" class="Both" displayName="$(string.DontCheckDefaultBrowser)" explainText="$(string.DontCheckDefaultBrowser_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DontCheckDefaultBrowser" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="DontCheckDefaultBrowser" class="Both" displayName="$(string.DontCheckDefaultBrowser)" explainText="$(string.DontCheckDefaultBrowser_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DontCheckDefaultBrowser">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
       </disabledValue>
     </policy>

-    <policy name="RememberPasswords" class="Both" displayName="$(string.RememberPasswords)" explainText="$(string.RememberPasswords_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="RememberPasswords" >
-      <parentCategory ref="firefox" />
-      <supportedOn ref="SUPPORTED_WINXPSP2" />
-      <enabledValue >
-        <string >1</string>
+    <policy name="RememberPasswords" class="Both" displayName="$(string.RememberPasswords)" explainText="$(string.RememberPasswords_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="RememberPasswords">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>

       </disabledValue>
     </policy>
     <policy class="Both" displayName="$(string.Allow)" explainText="$(string.PopupsAllow_Explain)" key="Software\Policies\Mozilla\Firefox" name="PopupsAllow" presentation="$(presentation.PopupsAllow)">
       </disabledValue>
     </policy>
     <policy class="Both" displayName="$(string.Allow)" explainText="$(string.PopupsAllow_Explain)" key="Software\Policies\Mozilla\Firefox" name="PopupsAllow" presentation="$(presentation.PopupsAllow)">