Bug 332201: the same keys conflict in places' context menu, patch by changdong.cui@sun.com, r=ben

browser/components/places/content/commands.inc

@@ -85,7 +85,7 @@
              oncommand="PlacesController.openLinksInTabs();"/>
   </commandset>
   <commandset type="container">
-    <command id="placesCmd_sortby:name" label="&cmd.sortby_name.label;" accesskey="&cmd.sortby_name.accesskey;"/>
+    <command id="placesCmd_sortby:name" label="&cmd.sortby_name.label;"/>
     <command id="placesCmd_new:bookmark" 
              label="&cmd.new_bookmark.label;" accesskey="&cmd.new_bookmark.accesskey;"
              oncommand="PlacesController.newBookmark()"/>

browser/components/places/content/context.inc

@@ -75,6 +75,7 @@
   <menuitem id="placesContext_reload" command="placesCmd_reload"
             selection="livemark/feedURI|livemark/bookmarkFeedURI|allLivemarks"/>
   <menuitem id="placesContext_sortby:name" command="placesCmd_sortby:name"
+            accesskey="&cmd.context_sortby_name.accesskey;"
             selection="mutable"/>
   <menuseparator id="placesContext_sortSeparator"
             selection="mutable|livemark/feedURI|livemark/bookmarkFeedURI|allLivemarks"/>

browser/components/places/content/places.xul

@@ -169,7 +169,8 @@
           <menuitem id="editSelectAll" command="placesCmd_select:all"
                     key="placesKey_select:all"/>
           <menuseparator/>
-          <menuitem id="editSortByName" command="placesCmd_sortby:name"/>
+          <menuitem id="editSortByName" command="placesCmd_sortby:name"
+                    accesskey="&cmd.sortby_name.accesskey;"/>
           <menuseparator/>
           <menuitem id="editFind" command="placesCmd_find"
                     key="placesKey_find"/>

browser/locales/en-US/chrome/browser/places/places.dtd

@@ -137,6 +137,8 @@
   "Sort By Name">
 <!ENTITY cmd.sortby_name.accesskey
   "S">
+<!ENTITY cmd.context_sortby_name.accesskey
+  "r">
 <!ENTITY cmd.new_bookmark.label
   "New Bookmark...">
 <!ENTITY cmd.new_bookmark.accesskey