Policy for Proxy settings. Fixes #19.

[policy-templates.git] / windows / firefox.admx

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 628b7d73fb84210b35073f66b3e68fedc9c4f5eb..827c0633b4012a9ddf45daf9a14f269413fe5860 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,237 @@
     <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>
+    <category displayName="$(string.Bookmarks_group)" name="Bookmarks">
+      <parentCategory ref="firefox"/>
+    </category>
+    <category displayName="$(string.Homepage_group)" name="Homepage">
+      <parentCategory ref="firefox"/>
+    </category>
+    <category displayName="$(string.Proxy_group)" name="Proxy">
+      <parentCategory ref="firefox"/>

     </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="DisableBuiltinPDFViewer" class="Both" displayName="$(string.DisableBuiltinPDFViewer)" explainText="$(string.DisableBuiltinPDFViewer_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableBuiltinPDFViewer">
+      <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="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="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="DisableFeedbackCommands" class="Both" displayName="$(string.DisableFeedbackCommands)" explainText="$(string.DisableFeedbackCommands_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFeedbackCommands">
+      <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="DisableFirefoxAccounts" class="Both" displayName="$(string.DisableFirefoxAccounts)" explainText="$(string.DisableFirefoxScreenshots_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableFirefoxAccounts">
+      <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="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="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="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="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="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="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="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="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="DisablePrivateBrowsing" class="Both" displayName="$(string.DisablePrivateBrowsing)" explainText="$(string.DisablePrivateBrowsing_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisablePrivateBrowsing">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>

       </enabledValue>
       </enabledValue>

-      <disabledValue >
-        <string >0</string>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisableSafeMode" class="Both" displayName="$(string.DisableSafeMode)" explainText="$(string.DisableSafeMode_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableSafeMode">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisableSysAddonUpdate" class="Both" displayName="$(string.DisableSysAddonUpdate)" explainText="$(string.DisableSysAddonUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="DisableSysAddonUpdate">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </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>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </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>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </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>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </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>
+        <decimal value="1"/>
+      </enabledValue>
+      <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)">


@@ -193,7 +262,7 @@
       <parentCategory ref="Addons"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>
       <parentCategory ref="Addons"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>

-        <list id="AddonsAllowDesc" key="Software\Policies\Mozilla\Firefox\Addons\Allow" valuePrefix=""/>
+        <list id="AddonsAllowDesc" key="Software\Policies\Mozilla\Firefox\InstallAddons\Allow" valuePrefix=""/>

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


@@ -214,14 +283,265 @@
       <parentCategory ref="Flash"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>
       <parentCategory ref="Flash"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>

-        <list id="FlashAllowDesc" key="Software\Policies\Mozilla\Firefox\Flash\Allow" valuePrefix=""/>
+        <list id="FlashAllowDesc" key="Software\Policies\Mozilla\Firefox\FlashPlugin\Allow" valuePrefix=""/>

       </elements>
     </policy>
     <policy class="Both" displayName="$(string.Block)" explainText="$(string.FlashBlock_Explain)" key="Software\Policies\Mozilla\Firefox" name="FlashBlock" presentation="$(presentation.FlashBlock)">
       <parentCategory ref="Flash"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>
       </elements>
     </policy>
     <policy class="Both" displayName="$(string.Block)" explainText="$(string.FlashBlock_Explain)" key="Software\Policies\Mozilla\Firefox" name="FlashBlock" presentation="$(presentation.FlashBlock)">
       <parentCategory ref="Flash"/>
       <supportedOn ref="SUPPORTED_WINXPSP2"/>
       <elements>

-        <list id="FlashBlockDesc" key="Software\Policies\Mozilla\Firefox\Flash\Block" valuePrefix=""/>
+        <list id="FlashBlockDesc" key="Software\Policies\Mozilla\Firefox\FlashPlugin\Block" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.HomepageURL)" name="HomepageURL" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
+      <parentCategory ref="Homepage" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="HomepageURL" valueName="URL" required="true" />
+        <boolean id="HomepageLocked" key="Software\Policies\Mozilla\Firefox\Homepage" valueName="Locked">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.HomepageAdditional)" name="HomepageAdditional" explainText="$(string.HomepageAdditional_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageAdditional)" >
+      <parentCategory ref="Homepage" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <list id="HomepageAdditional" key="Software\Policies\Mozilla\Firefox\Homepage\Additional" valuePrefix=""/>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark1)" name="Bookmark1" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\1" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark2)" name="Bookmark2" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\2" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark3)" name="Bookmark3" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\3" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark4)" name="Bookmark4" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\4" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Bookmark5)" name="Bookmark5" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" presentation="$(presentation.Bookmark)" >
+      <parentCategory ref="Bookmarks" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="BookmarkTitle" valueName="Title" required="true" />
+        <text id="BookmarkURL" valueName="URL" required="true" />
+        <text id="BookmarkFolder" valueName="Folder" />
+        <text id="BookmarkFavicon" valueName="Favicon" />
+        <enum id="BookmarkPlacement" valueName="Placement">
+          <item displayName="$(string.BookmarkPlacementToolbar)">
+            <value>
+              <string>toolbar</string>
+            </value>
+          </item>
+          <item displayName="$(string.BookmarkPlacementFolder)">
+            <value>
+              <string>folder</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.ProxyMode)" name="ProxyMode" explainText="$(string.ProxyMode_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.ProxyMode)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <enum id="ProxyMode" valueName="Mode">
+          <item displayName="$(string.NoProxy)">
+            <value>
+              <string>none</string>
+            </value>
+          </item>
+          <item displayName="$(string.SystemProxy)">
+            <value>
+              <string>system</string>
+            </value>
+          </item>
+          <item displayName="$(string.ManualProxy)">
+            <value>
+              <string>manual</string>
+            </value>
+          </item>
+          <item displayName="$(string.AutoDetectProxy)">
+            <value>
+              <string>autoDetect</string>
+            </value>
+          </item>
+          <item displayName="$(string.AutoConfigProxy)">
+            <value>
+              <string>autoConfig</string>
+            </value>
+          </item>
+        </enum>
+        <boolean id="AutoLogin" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="AutoLogin">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="UseProxyForDNS" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseProxyForDNS">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+        <boolean id="ProxyLocked" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="Locked">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.HTTPProxy)" name="HTTPProxy" explainText="$(string.HTTPProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.HTTPProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="HTTPProxy" valueName="HTTPProxy" required="true" />
+        <boolean id="UseHTTPProxyForAllProtocols" key="Software\Policies\Mozilla\Firefox\Proxy" valueName="UseHTTPProxyForAllProtocols">
+          <trueValue>
+            <decimal value="1"/>
+          </trueValue>
+          <falseValue>
+            <decimal value="0"/>
+          </falseValue>
+        </boolean>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.SSLProxy)" name="SSLProxy" explainText="$(string.SSLProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.SSLProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="SSLProxy" valueName="SSLProxy" required="true" />
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.FTPProxy)" name="FTPProxy" explainText="$(string.FTPProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.FTPProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="FTPProxy" valueName="FTPProxy" required="true" />
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.SOCKSProxy)" name="SOCKSProxy" explainText="$(string.SOCKSProxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.SOCKSProxy)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="SOCKSProxy" valueName="SOCKSProxy" required="true" />
+        <enum id="SOCKSVersion" valueName="SOCKSVersion">
+          <item displayName="$(string.SOCKSVersion4)">
+            <value>
+              <string>4</string>
+            </value>
+          </item>
+          <item displayName="$(string.SOCKSVersion5)">
+            <value>
+              <string>5</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.AutoConfigURL)" name="AutoConfigURL" explainText="$(string.AutoConfigURL_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.AutoConfigURL)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="AutoConfigURL" valueName="AutoConfigURL" required="true" />
+      </elements>
+    </policy>
+    <policy class="Both" displayName="$(string.Passthrough)" name="Passthrough" explainText="$(string.Passthrough_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Passthrough)" >
+      <parentCategory ref="Proxy" />
+      <supportedOn ref="SUPPORTED_WINXPSP2" />
+      <elements >
+        <text id="Passthrough" valueName="Passthrough" required="true" />

       </elements>
     </policy>
   </policies>
       </elements>
     </policy>
   </policies>