Revert "Added even more bookmarks"

[policy-templates.git] / windows / en-US / firefox.adml

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 462ed6e5ab3898149d61f76cb71128e64f6d9d97..b46307034eaba4b6bde4c6d6b11b059826476b00 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -257,37 +257,95 @@ If this policy is disabled or not configured, there are no exceptions to the web
       <string id="Bookmark03">Bookmark Three</string>
       <string id="Bookmark04">Bookmark Four</string>
       <string id="Bookmark05">Bookmark Five</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="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="Bookmark36">Bookmark Thirty-six</string>

+<<<<<<< HEAD
+<<<<<<< HEAD
+      <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="Bookmark51">Bookmark Fifty-one</string>
+      <string id="Bookmark52">Bookmark Fifty-two</string>
+      <string id="Bookmark53">Bookmark Fifty-three</string>
+      <string id="Bookmark54">Bookmark Fifty-four</string>
+      <string id="Bookmark55">Bookmark Fifty-five</string>
+      <string id="Bookmark56">Bookmark Fifty-six</string>
+      <string id="Bookmark57">Bookmark Fifty-seven</string>
+      <string id="Bookmark58">Bookmark Fifty-eight</string>
+      <string id="Bookmark59">Bookmark Fifty-nine</string>
+      <string id="Bookmark60">Bookmark Sixty</string>
+      <string id="Bookmark61">Bookmark Sixty-one</string>
+      <string id="Bookmark62">Bookmark Sixty-two</string>
+      <string id="Bookmark63">Bookmark Sixty-three</string>
+      <string id="Bookmark64">Bookmark Sixty-four</string>
+      <string id="Bookmark65">Bookmark Sixty-five</string>
+      <string id="Bookmark66">Bookmark Sixty-six</string>
+      <string id="Bookmark67">Bookmark Sixty-seven</string>
+      <string id="Bookmark68">Bookmark Sixty-eight</string>
+      <string id="Bookmark69">Bookmark Sixty-nine</string>
+      <string id="Bookmark70">Bookmark Seventy</string>
+      <string id="Bookmark71">Bookmark Seventy-one</string>
+      <string id="Bookmark72">Bookmark Seventy-two</string>
+      <string id="Bookmark73">Bookmark Seventy-three</string>
+      <string id="Bookmark74">Bookmark Seventy-four</string>
+      <string id="Bookmark75">Bookmark Seventy-five</string>
+      <string id="Bookmark76">Bookmark Seventy-six</string>
+      <string id="Bookmark77">Bookmark Seventy-seven</string>
+      <string id="Bookmark78">Bookmark Seventy-eight</string>
+      <string id="Bookmark79">Bookmark Seventy-nine</string>
+      <string id="Bookmark80">Bookmark Eighty</string>
+      <string id="Bookmark81">Bookmark Eighty-one</string>
+      <string id="Bookmark82">Bookmark Eighty-two</string>
+      <string id="Bookmark83">Bookmark Eighty-three</string>
+      <string id="Bookmark84">Bookmark Eighty-four</string>
+      <string id="Bookmark85">Bookmark Eighty-five</string>
+      <string id="Bookmark86">Bookmark Eighty-six</string>
+      <string id="Bookmark87">Bookmark Eighty-seven</string>
+      <string id="Bookmark88">Bookmark Eighty-eight</string>
+      <string id="Bookmark89">Bookmark Eighty-nine</string>
+=======
+=======
+>>>>>>> parent of 8c70d63... Added even more bookmarks

        <string id="Bookmark37">Bookmark Thirty-seven</string>
        <string id="Bookmark38">Bookmark Thirty-eight</string>
        <string id="Bookmark39">Bookmark Thirty-nine</string>
        <string id="Bookmark37">Bookmark Thirty-seven</string>
        <string id="Bookmark38">Bookmark Thirty-eight</string>
        <string id="Bookmark39">Bookmark Thirty-nine</string>


@@ -295,13 +353,17 @@ If this policy is disabled or not configured, there are no exceptions to the web
        <string id="Bookmark41">Bookmark Forty-one</string>
        <string id="Bookmark42">Bookmark Forty-two</string>
        <string id="Bookmark43">Bookmark Forty-three</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 Fourty-four</string>
-       <string id="Bookmark45">Bookmark Fourty-five</string>
-       <string id="Bookmark46">Bookmark Fourty-six</string>
-       <string id="Bookmark47">Bookmark Fourty-seven</string>
-       <string id="Bookmark48">Bookmark Fourty-eight</string>
-       <string id="Bookmark49">Bookmark Fourty-nine</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="Bookmark50">Bookmark Fifty</string>

+<<<<<<< HEAD
+>>>>>>> parent of 8c70d63... Added even more bookmarks
+=======
+>>>>>>> parent of 8c70d63... Added even more bookmarks

       <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 not configured or disabled, 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 not configured or disabled, a new bookmark is not added.</string>