Revert "Additional Bookmark Policies"

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 541156a0a5594f0025b368cae24ce1412338454e..8ff464a1f228b7af200c8e6e5d61c9841fd1ffb2 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -345,56 +345,11 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 If this policy is disabled or not configured, there are no exceptions to the website filter.
 
 Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
 If this policy is disabled or not configured, there are no exceptions to the website filter.
 
 Starting with Firefox 62, this policy will only work from Computer Configuration.</string>

-      <string id="Bookmark01">Bookmark One</string>
-      <string id="Bookmark02">Bookmark Two</string>
-      <string id="Bookmark03">Bookmark Three</string>
-      <string id="Bookmark04">Bookmark Four</string>
-      <string id="Bookmark05">Bookmark Five</string>
-      <string id="Bookmark06">Bookmark Six</string>
-      <string id="Bookmark07">Bookmark Seven</string>
-      <string id="Bookmark08">Bookmark Eight</string>
-      <string id="Bookmark09">Bookmark Nine</string>
-      <string id="Bookmark10">Bookmark Ten</string>
-      <string id="Bookmark11">Bookmark Eleven</string>
-      <string id="Bookmark12">Bookmark Twelve</string>
-      <string id="Bookmark13">Bookmark Thirteen</string>
-      <string id="Bookmark14">Bookmark Fourteen</string>
-      <string id="Bookmark15">Bookmark Fifteen</string>
-      <string id="Bookmark16">Bookmark Sixteen</string>
-      <string id="Bookmark17">Bookmark Seventeen</string>
-      <string id="Bookmark18">Bookmark Eighteen</string>
-      <string id="Bookmark19">Bookmark Nineteen</string>
-      <string id="Bookmark20">Bookmark Twenty</string>
-      <string id="Bookmark21">Bookmark Twenty-one</string>
-      <string id="Bookmark22">Bookmark Twenty-two</string>
-      <string id="Bookmark23">Bookmark Twenty-three</string>
-      <string id="Bookmark24">Bookmark Twenty-four</string>
-      <string id="Bookmark25">Bookmark Twenty-five</string>
-      <string id="Bookmark26">Bookmark Twenty-six</string>
-      <string id="Bookmark27">Bookmark Twenty-seven</string>
-      <string id="Bookmark28">Bookmark Twenty-eight</string>
-      <string id="Bookmark29">Bookmark Twenty-nine</string>
-      <string id="Bookmark30">Bookmark Thirty</string>
-      <string id="Bookmark31">Bookmark Thirty-one</string>
-      <string id="Bookmark32">Bookmark Thirty-two</string>
-      <string id="Bookmark33">Bookmark Thirty-three</string>
-      <string id="Bookmark34">Bookmark Thirty-four</string>
-      <string id="Bookmark35">Bookmark Thirty-five</string>
-      <string id="Bookmark36">Bookmark Thirty-six</string>
-      <string id="Bookmark37">Bookmark Thirty-seven</string>
-      <string id="Bookmark38">Bookmark Thirty-eight</string>
-      <string id="Bookmark39">Bookmark Thirty-nine</string>
-      <string id="Bookmark40">Bookmark Forty</string>
-      <string id="Bookmark41">Bookmark Forty-one</string>
-      <string id="Bookmark42">Bookmark Forty-two</string>
-      <string id="Bookmark43">Bookmark Forty-three</string>
-      <string id="Bookmark44">Bookmark Forty-four</string>
-      <string id="Bookmark45">Bookmark Forty-five</string>
-      <string id="Bookmark46">Bookmark Forty-six</string>
-      <string id="Bookmark47">Bookmark Forty-seven</string>
-      <string id="Bookmark48">Bookmark Forty-eight</string>
-      <string id="Bookmark49">Bookmark Forty-nine</string>
-      <string id="Bookmark50">Bookmark Fifty</string>
+      <string id="Bookmark1">Bookmark One</string>
+      <string id="Bookmark2">Bookmark Two</string>
+      <string id="Bookmark3">Bookmark Three</string>
+      <string id="Bookmark4">Bookmark Four</string>
+      <string id="Bookmark5">Bookmark Five</string>

       <string id="Bookmark_Explain">If this policy is enabled, you can configure a bookmark be added to Firefox.  Due to a bug, you must select the location. Note that you must specify the bookmarks in order.
 
 If this policy is disabled or not configured, a new bookmark is not added.</string>
       <string id="Bookmark_Explain">If this policy is enabled, you can configure a bookmark be added to Firefox.  Due to a bug, you must select the location. Note that you must specify the bookmarks in order.
 
 If this policy is disabled or not configured, a new bookmark is not added.</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1effd4480a7314191c1993892aae1a06bb991cea..c206dc55114d43442ee756b37a7b6b1ac265e24d 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -768,7 +768,7 @@
         <list id="HomepageAdditional" key="Software\Policies\Mozilla\Firefox\Homepage\Additional" valuePrefix=""/>
       </elements>
     </policy>
         <list id="HomepageAdditional" key="Software\Policies\Mozilla\Firefox\Homepage\Additional" valuePrefix=""/>
       </elements>
     </policy>

-    <policy name="Bookmark01" class="Both" displayName="$(string.Bookmark01)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\1" presentation="$(presentation.Bookmark)" >
+    <policy name="Bookmark1" class="Both" displayName="$(string.Bookmark1)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\1" presentation="$(presentation.Bookmark)" >

       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >


@@ -790,7 +790,7 @@
         </enum>
       </elements>
     </policy>
         </enum>
       </elements>
     </policy>

-    <policy name="Bookmark02" class="Both" displayName="$(string.Bookmark02)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\12" presentation="$(presentation.Bookmark)" >
+    <policy name="Bookmark2" class="Both" displayName="$(string.Bookmark2)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\2" presentation="$(presentation.Bookmark)" >

       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >


@@ -812,7 +812,7 @@
         </enum>
       </elements>
     </policy>
         </enum>
       </elements>
     </policy>

-    <policy name="Bookmark03" class="Both" displayName="$(string.Bookmark03)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\13" presentation="$(presentation.Bookmark)" >
+    <policy name="Bookmark3" class="Both" displayName="$(string.Bookmark3)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\3" presentation="$(presentation.Bookmark)" >

       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >


@@ -834,7 +834,7 @@
         </enum>
       </elements>
     </policy>
         </enum>
       </elements>
     </policy>

-    <policy name="Bookmark04" class="Both" displayName="$(string.Bookmark04)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\14" presentation="$(presentation.Bookmark)" >
+    <policy name="Bookmark4" class="Both" displayName="$(string.Bookmark4)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\4" presentation="$(presentation.Bookmark)" >

       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >


@@ -856,997 +856,7 @@
         </enum>
       </elements>
     </policy>
         </enum>
       </elements>
     </policy>

-    <policy name="Bookmark05" class="Both" displayName="$(string.Bookmark05)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\15" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark06" class="Both" displayName="$(string.Bookmark06)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\16" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark07" class="Both" displayName="$(string.Bookmark07)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\17" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark08" class="Both" displayName="$(string.Bookmark08)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\18" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark09" class="Both" displayName="$(string.Bookmark09)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\19" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark10" class="Both" displayName="$(string.Bookmark10)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\20" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark11" class="Both" displayName="$(string.Bookmark11)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\21" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark12" class="Both" displayName="$(string.Bookmark12)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\22" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark13" class="Both" displayName="$(string.Bookmark13)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\23" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark14" class="Both" displayName="$(string.Bookmark14)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\24" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark15" class="Both" displayName="$(string.Bookmark15)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\25" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark16" class="Both" displayName="$(string.Bookmark16)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\26" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark17" class="Both" displayName="$(string.Bookmark17)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\27" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark18" class="Both" displayName="$(string.Bookmark18)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\28" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark19" class="Both" displayName="$(string.Bookmark19)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\29" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark20" class="Both" displayName="$(string.Bookmark20)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\30" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark21" class="Both" displayName="$(string.Bookmark21)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\31" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark22" class="Both" displayName="$(string.Bookmark22)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\32" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark23" class="Both" displayName="$(string.Bookmark23)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\33" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark24" class="Both" displayName="$(string.Bookmark24)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\34" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark25" class="Both" displayName="$(string.Bookmark25)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\35" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark26" class="Both" displayName="$(string.Bookmark26)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\36" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark27" class="Both" displayName="$(string.Bookmark27)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\37" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark28" class="Both" displayName="$(string.Bookmark28)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\38" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark29" class="Both" displayName="$(string.Bookmark29)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\39" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark30" class="Both" displayName="$(string.Bookmark30)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\40" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark31" class="Both" displayName="$(string.Bookmark31)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\41" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark32" class="Both" displayName="$(string.Bookmark32)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\42" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark33" class="Both" displayName="$(string.Bookmark33)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\43" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark34" class="Both" displayName="$(string.Bookmark34)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\44" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark35" class="Both" displayName="$(string.Bookmark35)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\45" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark36" class="Both" displayName="$(string.Bookmark36)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\46" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark37" class="Both" displayName="$(string.Bookmark37)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\47" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark38" class="Both" displayName="$(string.Bookmark38)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\48" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark39" class="Both" displayName="$(string.Bookmark39)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\49" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark40" class="Both" displayName="$(string.Bookmark40)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\50" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark41" class="Both" displayName="$(string.Bookmark41)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\51" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark42" class="Both" displayName="$(string.Bookmark42)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\52" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark43" class="Both" displayName="$(string.Bookmark43)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\53" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark44" class="Both" displayName="$(string.Bookmark44)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\54" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark45" class="Both" displayName="$(string.Bookmark45)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\55" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark46" class="Both" displayName="$(string.Bookmark46)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\56" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark47" class="Both" displayName="$(string.Bookmark47)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\57" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark48" class="Both" displayName="$(string.Bookmark48)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\58" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark49" class="Both" displayName="$(string.Bookmark49)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\59" presentation="$(presentation.Bookmark)" >
-      <parentCategory ref="Bookmarks" />
-      <supportedOn ref="SUPPORTED_FF60" />
-      <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.BookmarkPlacementMenu)">
-            <value>
-              <string>menu</string>
-            </value>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-       <policy name="Bookmark50" class="Both" displayName="$(string.Bookmark50)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\60" presentation="$(presentation.Bookmark)" >
+    <policy name="Bookmark5" class="Both" displayName="$(string.Bookmark5)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" presentation="$(presentation.Bookmark)" >

       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >
       <parentCategory ref="Bookmarks" />
       <supportedOn ref="SUPPORTED_FF60" />
       <elements >