From 21c167e7a28521abdc1b5a704061b1ffbcd70f3e Mon Sep 17 00:00:00 2001
From: "ben%netscape.com"
 <ben%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 9 May 2001 11:18:45 +0000
Subject: [PATCH] hit me baby one more time... (all fixed now. fingers
 crossed).

git-svn-id: svn://10.0.0.236/trunk@94363 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../bookmarks/resources/bookmarks.xul         | 27 ++++++++++++++-----
 .../bookmarks/resources/bookmarksOverlay.js   | 10 -------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index 1275880beb6..71e440dbe59 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -34,7 +34,12 @@
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+<!DOCTYPE window [
+<!ENTITY % utilDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd" >
+%utilDTD;
+<!ENTITY % bmDTD SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+%bmDTD;
+]>
 
 <window id="bookmark-window" windowtype="bookmarks:manager"
         title="&bookmarksWindowTitle.label;" 
@@ -147,12 +152,22 @@
         <menupopup>
           <menuitem id="menu_undo" disabled="true"/>
           <menuseparator/>
-          <menuitem id="menu_cut" command="cmd_bm_cut"/>
-          <menuitem id="menu_copy" command="cmd_bm_copy"/>
-          <menuitem id="menu_paste" command="cmd_bm_paste"/>
-          <menuitem id="menu_delete" command="cmd_bm_delete"/>
+          <menuitem id="menu_bm_cut"    
+                    label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" 
+					key="key_cut" command="cmd_bm_cut"/>
+          <menuitem id="menu_bm_copy"
+                    label="&copyCmd.label;" accesskey="&copyCmd.accesskey;"
+                    key="key_copy" command="cmd_bm_copy"/>
+          <menuitem id="menu_bm_paste"	
+                    label="&pasteCmd.label;" accesskey="&pasteCmd.accesskey;"		  
+                    key="key_paste" command="cmd_bm_paste"/>
+          <menuitem id="menu_bm_delete"	
+                    label="&deleteCmd.label;" accesskey="&deleteCmd.label;"		  
+                    key="key_bm_delete" command="cmd_bm_delete"/>
           <menuseparator/>
-          <menuitem id="menu_selectAll"/>
+          <menuitem id="menu_bm_selectAll" 
+		            label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
+                    key="key_selectAll" command="cmd_bm_selectAll"/>
           <menuseparator/>
           <menuitem label="&command.fileBookmark.label;"
                     accesskey="&command.fileBookmark.accesskey;"
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js b/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js
index 26db621c90f..7f23cf6cf10 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.js
@@ -829,16 +829,6 @@ var BookmarksUtils = {
       title = url;
     }
 
-    const kPrefContractID = "@mozilla.org/preferences;1";
-    const kPrefIID = Components.interfaces.nsIPref;
-    const kPrefSvc = Components.classes[kPrefContractID].getService(kPrefIID);
-    try {
-      var temp = kPrefSvc.GetBoolPref("browser.bookmarks.add_without_dialog");
-      aShowDialog = !temp;
-    }
-    catch (e) {
-    }
-
     this.addBookmark(url, title, docCharset, aShowDialog);
   },