From 5b40c3c9e15aa40da99add84f1613e35dbd16328 Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com" <mozilla.mano%sent.com>
Date: Sun, 6 Feb 2005 20:50:48 +0000
Subject: [PATCH] Bug 258229 - Change 'New Folder' button's accesskey (in the
 add bookmark dialog)  to 'o' due to accesskeys conflict. patch by Gavin Sharp
 <gavin.sharp@gmail.com> r=vlad

---
 browser/components/bookmarks/content/addBookmark2.xul         | 2 +-
 .../locales/en-US/chrome/browser/bookmarks/addBookmark.dtd    | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/browser/components/bookmarks/content/addBookmark2.xul b/browser/components/bookmarks/content/addBookmark2.xul
index 411fb845076..d0addf393c6 100644
--- a/browser/components/bookmarks/content/addBookmark2.xul
+++ b/browser/components/bookmarks/content/addBookmark2.xul
@@ -56,7 +56,7 @@
         ondialogextra2="newFolder()"
         ondialogaccept="return onOK(event)"
         buttons="accept,cancel" 
-        buttonlabelextra2="&newFolder.label;" buttonaccesskeyextra2="&newFolder.accesskey;"
+        buttonlabelextra2="&button.newfolder.label;" buttonaccesskeyextra2="&button.newfolder.accesskey;"
 #ifdef XP_UNIX
         buttonlabelaccept="&acceptButton.label;"
 #endif
diff --git a/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd b/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd
index 3ecfdf5ab0d..eb8367989c8 100644
--- a/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd
+++ b/browser/locales/en-US/chrome/browser/bookmarks/addBookmark.dtd
@@ -14,7 +14,7 @@
 <!ENTITY moveto.label               "Move to:">
 <!ENTITY moveto.accesskey           "M">
 <!ENTITY button.newfolder.label     "New Folder...">
-<!ENTITY button.newfolder.accesskey "w">
+<!ENTITY button.newfolder.accesskey "o">
 <!ENTITY alwayscreateinfolder.label "Don't show this dialog again">
 <!ENTITY alwayscreateinfolder.accesskey "a">
 <!ENTITY dontshowmessage.tooltip    "When this option is selected, new Bookmarks will be added using the title provided by the page.">
@@ -26,6 +26,4 @@
 <!ENTITY expanderUp.tooltip      "Hide">
 <!ENTITY addGroup.label          "Bookmark all tabs in a folder">
 <!ENTITY addGroup.accesskey      "B">
-<!ENTITY newFolder.label         "New Folder...">
-<!ENTITY newFolder.accesskey     "N">
 <!ENTITY acceptButton.label      "Add">