From efb8b52f16703005c589c400671f50c61644203b Mon Sep 17 00:00:00 2001
From: Jeffrey McClain <jeffreywmcclain@gmail.com>
Date: Tue, 11 Sep 2018 12:16:19 -0700
Subject: [PATCH] Fixed Bookmarks

I think you already added your own fix, but just in case it helps, I think I figured out a solution earlier.
I changed every tenth registry key to be a single digit (20 becomes 3, 30 becomes 4, etc). This prevents any individual policies from the initial release from leaving orphaned registry keys that could cause issues, while also maintaining the order in both the group policy editor and Windows registry (1, 12, 13, 14, ..., 19, 2, 21, 22, ..., 28, 29, 3, 31, etc) which ensures a folder with lots of bookmarks remains in the expected order.
---
 windows/en-US/firefox.adml | 70 +++++++++++++++++++++++++++-----------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 6038b7b..7689d52 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -345,26 +345,56 @@ 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>
-      <string id="Bookmark1">Bookmark 01</string>
-      <string id="Bookmark2">Bookmark 02</string>
-      <string id="Bookmark3">Bookmark 03</string>
-      <string id="Bookmark4">Bookmark 04</string>
-      <string id="Bookmark5">Bookmark 05</string>
-      <string id="Bookmark6">Bookmark 06</string>
-      <string id="Bookmark7">Bookmark 07</string>
-      <string id="Bookmark8">Bookmark 08</string>
-      <string id="Bookmark9">Bookmark 09</string>
-      <string id="Bookmark10">Bookmark 10</string>
-      <string id="Bookmark11">Bookmark 11</string>
-      <string id="Bookmark12">Bookmark 12</string>
-      <string id="Bookmark13">Bookmark 13</string>
-      <string id="Bookmark14">Bookmark 14</string>
-      <string id="Bookmark15">Bookmark 15</string>
-      <string id="Bookmark16">Bookmark 16</string>
-      <string id="Bookmark17">Bookmark 17</string>
-      <string id="Bookmark18">Bookmark 18</string>
-      <string id="Bookmark19">Bookmark 19</string>
-      <string id="Bookmark20">Bookmark 20</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="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>
-- 
2.34.1