supplimental fix for bug #386287: inconsistent use of title / name in bookmarks UI

r=mano

browser/components/places/content/places.js

@@ -1036,7 +1036,10 @@ var ViewMenu = {
       menuitem.setAttribute("column", column.id);
       var label = column.getAttribute("label");
       if (propertyPrefix) {
-        var menuitemPrefix = propertyPrefix + column.id;
+        var menuitemPrefix = propertyPrefix;
+        // for string properties, use "name" as the id, instead of "title"
+        // see bug #386287 for details
+        menuitemPrefix += (column.id == "title" ? "name" : column.id);
         label = PlacesUtils.getString(menuitemPrefix + ".label");
         var accesskey = PlacesUtils.getString(menuitemPrefix + ".accesskey");
         menuitem.setAttribute("accesskey", accesskey);

browser/components/places/content/places.xul

@@ -378,7 +378,7 @@
                 onclick="PlacesOrganizer.onTreeClick(event);"
                 onselect="PlacesOrganizer.updateStatusBarForView(this);">
             <treecols id="placeContentColumns">
-              <treecol label="&col.title.label;" id="title" flex="5" primary="true" 
+              <treecol label="&col.name.label;" id="title" flex="5" primary="true" 
                        persist="width hidden ordinal sortActive sortDirection"/>
               <splitter class="tree-splitter"/>
               <treecol label="&col.tags.label;" id="tags" flex="2"

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

@@ -195,7 +195,7 @@
 <!ENTITY cmd.personalToolbarFolder.menuAccesskey
          "b">
 
-<!ENTITY col.title.label
+<!ENTITY col.name.label
   "Name">
 <!ENTITY col.tags.label
   "Tags">

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

@@ -45,8 +45,8 @@ livemarkReloadOne=Reload %S
 
 sortByName=Sort '%S' by Name
 sortByNameGeneric=Sort by Name
-view.sortBy.title.label=Sort by Name
-view.sortBy.title.accesskey=T
+view.sortBy.name.label=Sort by Name
+view.sortBy.name.accesskey=N
 view.sortBy.url.label=Sort by Location
 view.sortBy.url.accesskey=L
 view.sortBy.date.label=Sort by Visit Date