Bug 412387 - "Remove the ellipsis from "Bookmark This <type>���"" (update context menu) [p=reed r=Mano ui-r+a1.9=beltzner]

browser/base/content/browser-context.inc

@@ -54,8 +54,8 @@
                 oncommand="gContextMenu.openLinkInTab();"/>
       <menuseparator id="context-sep-open"/>
       <menuitem id="context-bookmarklink"
-                label="&bookmarkLinkCmd.label;"
-                accesskey="&bookmarkLinkCmd.accesskey;"
+                label="&bookmarkThisLinkCmd.label;"
+                accesskey="&bookmarkThisLinkCmd.accesskey;"
                 oncommand="gContextMenu.bookmarkLink();"/>
       <menuitem id="context-savelink"
                 label="&saveLinkCmd.label;"
@@ -126,8 +126,8 @@
                 command="Browser:Stop"/>
       <menuseparator id="context-sep-stop"/>
       <menuitem id="context-bookmarkpage"
-                label="&bookmarkPageCmd.label;"
-                accesskey="&bookmarkPageCmd.accesskey;"
+                label="&bookmarkPageCmd2.label;"
+                accesskey="&bookmarkPageCmd2.accesskey;"
                 oncommand="gContextMenu.bookmarkThisPage();"/>
       <menuitem id="context-savepage"
                 label="&savePageCmd.label;"
@@ -194,8 +194,8 @@
                     accesskey="&reloadFrameCmd.accesskey;"
                     oncommand="gContextMenu.reloadFrame();"/>
           <menuseparator/>
-          <menuitem label="&bookmarkFrameCmd.label;"
-                    accesskey="&bookmarkFrameCmd.accesskey;"
+          <menuitem label="&bookmarkThisFrameCmd.label;"
+                    accesskey="&bookmarkThisFrameCmd.accesskey;"
                     oncommand="gContextMenu.addBookmarkForFrame();"/>
           <menuitem label="&saveFrameCmd.label;"
                     accesskey="&saveFrameCmd.accesskey;"

browser/base/content/tabbrowser.xml

@@ -92,8 +92,8 @@
                           oncommand="var tabbrowser = this.parentNode.parentNode.parentNode.parentNode;
                                      tabbrowser.removeAllTabsBut(tabbrowser.mContextTab);"/>
             <xul:menuseparator/>
-            <xul:menuitem label="&bookmarkCurTab.label;"
-                          accesskey="&bookmarkCurTab.accesskey;"
+            <xul:menuitem label="&bookmarkThisTab.label;"
+                          accesskey="&bookmarkThisTab.accesskey;"
                           oncommand="BookmarkThisTab();"/>
             <xul:menuitem label="&bookmarkAllTabs.label;"
                           accesskey="&bookmarkAllTabs.accesskey;"

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

@@ -233,12 +233,12 @@
 <!ENTITY viewBGImageCmd.accesskey     "w">
 <!ENTITY setDesktopBackgroundCmd.label      "Set As Desktop Background…">
 <!ENTITY setDesktopBackgroundCmd.accesskey  "S">
-<!ENTITY bookmarkPageCmd.label        "Bookmark This Page…">
-<!ENTITY bookmarkPageCmd.accesskey    "m">
-<!ENTITY bookmarkLinkCmd.label        "Bookmark This Link…">
-<!ENTITY bookmarkLinkCmd.accesskey    "L">
-<!ENTITY bookmarkFrameCmd.label       "Bookmark This Frame…">
-<!ENTITY bookmarkFrameCmd.accesskey   "m">
+<!ENTITY bookmarkPageCmd2.label       "Bookmark This Page">
+<!ENTITY bookmarkPageCmd2.accesskey   "m">
+<!ENTITY bookmarkThisLinkCmd.label      "Bookmark This Link">
+<!ENTITY bookmarkThisLinkCmd.accesskey  "L">
+<!ENTITY bookmarkThisFrameCmd.label      "Bookmark This Frame">
+<!ENTITY bookmarkThisFrameCmd.accesskey  "m">
 <!ENTITY sendPageCmd.label            "Send Link…">
 <!ENTITY sendPageCmd.accesskey        "e">
 <!ENTITY savePageCmd.label            "Save Page As…">

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

@@ -12,7 +12,7 @@
 <!ENTITY  listAllTabs.label      "List all tabs">
 <!ENTITY  bookmarkAllTabs.label       "Bookmark All Tabs…">
 <!ENTITY  bookmarkAllTabs.accesskey   "T">
-<!ENTITY  bookmarkCurTab.label        "Bookmark This Tab…">
-<!ENTITY  bookmarkCurTab.accesskey    "B">
+<!ENTITY  bookmarkThisTab.label       "Bookmark This Tab">
+<!ENTITY  bookmarkThisTab.accesskey   "B">
 <!ENTITY  undoCloseTab.label          "Undo Close Tab">
 <!ENTITY  undoCloseTab.accesskey      "U">