Using wrong name for bookmarks menu - menu not folder

diff --git a/README.md b/README.md
index b6d3bc6db6e1d11da85fe7aca609ed7bf02edbd0..a742542d034bf592aba49b5006648ae2ba0b58e0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -271,8 +271,8 @@ same folder name are grouped together.
     {"Title": "Example",
      "URL": "http://example.org",
      "Favicon": "http://example.com/favicon.ico",
-     "Placement": "toolbar",
-     "Folder": "Bookmarks"
+     "Placement": ["toolbar", "menu"],
+     "Folder": "FolderName"
      }
     ]
   }

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 06beb4b42e885854def8814b8ed1418a0f90d454..e1fab39632c75e8b3c1ea2c91436d72b4cc9dab4 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -72,7 +72,7 @@
       <string id="Bookmark5">Bookmark 5</string>
       <string id="Bookmark_Explain">Bookmark Explanation</string>
       <string id="BookmarkPlacementToolbar">Toolbar</string>
-      <string id="BookmarkPlacementFolder">Folder</string>
+      <string id="BookmarkPlacementMenu">Menu</string>
       <string id="HomepageURL">URL for Home page</string>
       <string id="HomepageURL_Explain">Homepage Settings</string>
       <string id="HomepageAdditional">Additional Homepages</string>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 198dc65f05cb05fbd04a498e450ede16f2d7f830..67f4d3702ace2e0d0f1b0526e45d5a8920cb662d 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -326,9 +326,9 @@
               <string>toolbar</string>
             </value>
           </item>
-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">
             <value>
-              <string>folder</string>
+              <string>menu</string>
             </value>
           </item>
         </enum>
@@ -348,9 +348,9 @@
               <string>toolbar</string>
             </value>
           </item>
-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">
             <value>
-              <string>folder</string>
+              <string>menu</string>
             </value>
           </item>
         </enum>
@@ -370,9 +370,9 @@
               <string>toolbar</string>
             </value>
           </item>
-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">
             <value>
-              <string>folder</string>
+              <string>menu</string>
             </value>
           </item>
         </enum>
@@ -392,9 +392,9 @@
               <string>toolbar</string>
             </value>
           </item>
-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">
             <value>
-              <string>folder</string>
+              <string>menu</string>
             </value>
           </item>
         </enum>
@@ -414,9 +414,9 @@
               <string>toolbar</string>
             </value>
           </item>
-          <item displayName="$(string.BookmarkPlacementFolder)">
+          <item displayName="$(string.BookmarkPlacementMenu)">
             <value>
-              <string>folder</string>
+              <string>menu</string>
             </value>
           </item>
         </enum>