From 964f463cd63c8f71e95252a9cbea9190f3e5f247 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 4 Apr 2006 21:00:55 +0000
Subject: [PATCH] Kill shortcut for dangerous operation b=209355
 p=gautheri@noos.fr r+sr=me

git-svn-id: svn://10.0.0.236/trunk@193553 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../xpfe/components/bookmarks/resources/bookmarksManager.xul | 5 -----
 .../bookmarks/resources/locale/en-US/bookmarks.dtd           | 1 -
 2 files changed, 6 deletions(-)

diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul
index 50c4c1b693f..779ece1f46b 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.xul
@@ -134,10 +134,6 @@
          key="&edit.sortFolder.keybinding;"
          command="cmd_bm_sortfolder" modifiers="accel"/>
 
-    <key id="bm_key_sortFolderByName"
-         key="&edit.sortFolderByName.keybinding;"
-         command="cmd_bm_sortfolderbyname" modifiers="accel"/>
-
     <key id="bm_key_properties"
          key="&edit.properties.keybinding;"
          command="cmd_bm_properties" modifiers="accel"/>
@@ -198,7 +194,6 @@
                     command="cmd_bm_sortfolder"/>
           <menuitem label="&command.sortFolderByName.label;"
                     accesskey="&command.sortFolderByName.accesskey;"
-                    key="bm_key_sortFolderByName"
                     command="cmd_bm_sortfolderbyname"/>
           <menuseparator/>
           <menuitem label="&command.properties.label;"
diff --git a/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd b/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd
index 28336116e6a..32d185a2187 100644
--- a/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd
+++ b/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmarks.dtd
@@ -79,7 +79,6 @@
 <!ENTITY edit.sortFolder.keybinding    "S">
 <!ENTITY command.sortFolderByName.label "Sort Folder by Name">
 <!ENTITY command.sortFolderByName.accesskey "N">
-<!ENTITY edit.sortFolderByName.keybinding   "N">
 
 <!ENTITY menuitem.view.command.toolbar.label        "Toolbar">
 <!ENTITY menuitem.view.command.toolbar.accesskey    "t">