Merge pull request #231 from mozilla/fix_bookmarks

Add new bookmarks while preserving old

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 2475f62ba04f615bb37054110b89daea2f54708f..a8ed0a691c8e6851268012feca0ecddf61c13173 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -345,11 +345,26 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, gibt es keine Ausnahmen für den Webseiten-Filter.
 
 Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
-      <string id="Bookmark1">Lesezeichen 1</string>
-      <string id="Bookmark2">Lesezeichen 2</string>
-      <string id="Bookmark3">Lesezeichen 3</string>
-      <string id="Bookmark4">Lesezeichen 4</string>
-      <string id="Bookmark5">Lesezeichen 5</string>
+      <string id="Bookmark1">Lesezeichen 01</string>
+      <string id="Bookmark2">Lesezeichen 02</string>
+      <string id="Bookmark3">Lesezeichen 03</string>
+      <string id="Bookmark4">Lesezeichen 04</string>
+      <string id="Bookmark5">Lesezeichen 05</string>
+      <string id="Bookmark6">Lesezeichen 06</string>
+      <string id="Bookmark7">Lesezeichen 07</string>
+      <string id="Bookmark8">Lesezeichen 08</string>
+      <string id="Bookmark9">Lesezeichen 09</string>
+      <string id="Bookmark10">Lesezeichen 10</string>
+      <string id="Bookmark11">Lesezeichen 11</string>
+      <string id="Bookmark12">Lesezeichen 12</string>
+      <string id="Bookmark13">Lesezeichen 13</string>
+      <string id="Bookmark14">Lesezeichen 14</string>
+      <string id="Bookmark15">Lesezeichen 15</string>
+      <string id="Bookmark16">Lesezeichen 16</string>
+      <string id="Bookmark17">Lesezeichen 17</string>
+      <string id="Bookmark18">Lesezeichen 18</string>
+      <string id="Bookmark19">Lesezeichen 19</string>
+      <string id="Bookmark20">Lesezeichen 20</string>
       <string id="Bookmark_Explain">Wenn Sie die Richtlinieneinstellung aktivieren, können Sie ein Lesezeichen konfigurieren, können Sie ein Lesezeichen konfigurieren, das zu Firefox hinzugefügt wird. Aufgrund eines Fehlers müssen Sie den Speicherort auswählen. Beachten Sie, dass Sie die Lesezeichen in der Reihenfolge angeben müssen.
 
 Wenn Sie die Richtlinieneinstellung deaktivieren oder nicht konfigurieren, werden keine Lesezeichen zu Firefox hinzugefügt.</string>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 8ff464a1f228b7af200c8e6e5d61c9841fd1ffb2..eaeeb8757367575dcaff55f215c10f5dd57c24ae 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -345,11 +345,26 @@ 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 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="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="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 c206dc55114d43442ee756b37a7b6b1ac265e24d..2e78959ea4e8e3a03963f0b84f253c2f03710a64 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -878,6 +878,336 @@
         </enum>
       </elements>
     </policy>
+    <policy name="Bookmark_06" class="Both" displayName="$(string.Bookmark6)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_07" class="Both" displayName="$(string.Bookmark7)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_08" class="Both" displayName="$(string.Bookmark8)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_09" class="Both" displayName="$(string.Bookmark9)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_10" class="Both" displayName="$(string.Bookmark10)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_11" class="Both" displayName="$(string.Bookmark11)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_12" class="Both" displayName="$(string.Bookmark12)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_13" class="Both" displayName="$(string.Bookmark13)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_14" class="Both" displayName="$(string.Bookmark14)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_15" class="Both" displayName="$(string.Bookmark15)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_16" class="Both" displayName="$(string.Bookmark16)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_17" class="Both" displayName="$(string.Bookmark17)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_18" class="Both" displayName="$(string.Bookmark18)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_19" class="Both" displayName="$(string.Bookmark19)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Bookmark_20" class="Both" displayName="$(string.Bookmark20)" explainText="$(string.Bookmark_Explain)" key="Software\Policies\Mozilla\Firefox\Bookmarks\5" 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="Proxy" class="Both" displayName="$(string.Proxy)" explainText="$(string.Proxy_Explain)" key="Software\Policies\Mozilla\Firefox\Proxy" presentation="$(presentation.Proxy)" >
       <parentCategory ref="firefox" />
       <supportedOn ref="SUPPORTED_FF60" />

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index cef81c3f588f862dd092c8509a9b42ae6853184e..71a49ba1368ba5edbb2da576b903a1619c3175cc 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -345,11 +345,26 @@ Starting with Firefox 62, this policy will only work from Computer Configuration
 Se questo criterio è disabilitato o non configurato, non ci sono eccezioni al sito filtri Web.
 
 Starting with Firefox 62, this policy will only work from Computer Configuration.</string>
-      <string id="Bookmark1">Segnalibro 1</string>
-      <string id="Bookmark2">Segnalibro 2</string>
-      <string id="Bookmark3">Segnalibro 3</string>
-      <string id="Bookmark4">Segnalibro 4</string>
-      <string id="Bookmark5">Segnalibro 5</string>
+      <string id="Bookmark1">Segnalibro 01</string>
+      <string id="Bookmark2">Segnalibro 02</string>
+      <string id="Bookmark3">Segnalibro 03</string>
+      <string id="Bookmark4">Segnalibro 04</string>
+      <string id="Bookmark5">Segnalibro 05</string>
+      <string id="Bookmark6">Segnalibro 06</string>
+      <string id="Bookmark7">Segnalibro 07</string>
+      <string id="Bookmark8">Segnalibro 08</string>
+      <string id="Bookmark9">Segnalibro 09</string>
+      <string id="Bookmark10">Segnalibro 10</string>
+      <string id="Bookmark11">Segnalibro 11</string>
+      <string id="Bookmark12">Segnalibro 12</string>
+      <string id="Bookmark13">Segnalibro 13</string>
+      <string id="Bookmark14">Segnalibro 14</string>
+      <string id="Bookmark15">Segnalibro 15</string>
+      <string id="Bookmark16">Segnalibro 16</string>
+      <string id="Bookmark17">Segnalibro 17</string>
+      <string id="Bookmark18">Segnalibro 18</string>
+      <string id="Bookmark19">Segnalibro 19</string>
+      <string id="Bookmark20">Segnalibro 20</string>
       <string id="Bookmark_Explain">Se questo criterio è abilitato, è possibile configurare l'aggiunta di un segnalibro a Firefox. A causa di un bug, è necessario selezionare l'indirizzo. I segnalibri devono essere specificati in ordine.
 
 Se questo criterio è disabilitato o non configurato, non sarà aggiunto un nuovo segnalibro.</string>