Merge pull request #30 from mozilla/bookmark_menu_not_working

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

diff --git a/windows/firefox.admx b/windows/firefox.admx
index c97352b1ef86e76ebe1b5cb65f3bdc4a016c83d1..67f4d3702ace2e0d0f1b0526e45d5a8920cb662d 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -188,6 +188,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <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"/>
     <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"/>


@@ -316,9 +326,9 @@
               <string>toolbar</string>
             </value>
           </item>
               <string>toolbar</string>
             </value>
           </item>

-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">

             <value>
             <value>

-              <string>folder</string>
+              <string>menu</string>

             </value>
           </item>
         </enum>
             </value>
           </item>
         </enum>


@@ -338,9 +348,9 @@
               <string>toolbar</string>
             </value>
           </item>
               <string>toolbar</string>
             </value>
           </item>

-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">

             <value>
             <value>

-              <string>folder</string>
+              <string>menu</string>

             </value>
           </item>
         </enum>
             </value>
           </item>
         </enum>


@@ -360,9 +370,9 @@
               <string>toolbar</string>
             </value>
           </item>
               <string>toolbar</string>
             </value>
           </item>

-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">

             <value>
             <value>

-              <string>folder</string>
+              <string>menu</string>

             </value>
           </item>
         </enum>
             </value>
           </item>
         </enum>


@@ -382,15 +392,15 @@
               <string>toolbar</string>
             </value>
           </item>
               <string>toolbar</string>
             </value>
           </item>

-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">

             <value>
             <value>

-              <string>folder</string>
+              <string>menu</string>

             </value>
           </item>
         </enum>
       </elements>
     </policy>
             </value>
           </item>
         </enum>
       </elements>
     </policy>

-    <policy class="Both" displayName="$(string.Bookmark5)" name="Bookmark5" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5s" presentation="$(presentation.Bookmark)" >
+    <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 >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />
       <elements >


@@ -404,9 +414,9 @@
               <string>toolbar</string>
             </value>
           </item>
               <string>toolbar</string>
             </value>
           </item>

-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">

             <value>
             <value>

-              <string>folder</string>
+              <string>menu</string>

             </value>
           </item>
         </enum>
             </value>
           </item>
         </enum>