From 10c8bcc959eb688a2a0b05bb78902005ee2d868e Mon Sep 17 00:00:00 2001
From: "sspitzer%mozilla.org"
 <sspitzer%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 26 Sep 2006 21:40:16 +0000
Subject: [PATCH] fix for bug #354251: "Open in Tabs" string missing from
 menuitem under "History | Recently Closed Tabs" (when places disabled).

r=dietrich


git-svn-id: svn://10.0.0.236/trunk@212408 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser-places.js                | 2 +-
 mozilla/browser/base/content/browser.js                       | 2 +-
 .../browser/locales/en-US/chrome/browser/browser.properties   | 4 ++++
 .../locales/en-US/chrome/browser/places/places.properties     | 3 ---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mozilla/browser/base/content/browser-places.js b/mozilla/browser/base/content/browser-places.js
index 8b0f263a667..758f7deac18 100644
--- a/mozilla/browser/base/content/browser-places.js
+++ b/mozilla/browser/base/content/browser-places.js
@@ -417,7 +417,7 @@ var BookmarksEventHandler = {
           var openInTabs = document.createElement("menuitem");
           openInTabs.setAttribute("openInTabs", "true");
           openInTabs.setAttribute("label",
-                                  strings.getString("menuOpenInTabs.label"));
+                     gNavigatorBundle.getString("menuOpenInTabs.label"));
           target.appendChild(openInTabs);
         }
       }
diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index be74fbfea10..fce5635cdd4 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -6884,7 +6884,7 @@ HistoryMenu.populateUndoSubmenu = function PHM_populateUndoSubmenu() {
   }
 
   // "open in tabs"
-  var strings = document.getElementById("placeBundle");
+  var strings = gNavigatorBundle;
   undoPopup.appendChild(document.createElement("menuseparator"));
   m = undoPopup.appendChild(document.createElement("menuitem"));
   m.setAttribute("label", strings.getString("menuOpenInTabs.label"));
diff --git a/mozilla/browser/locales/en-US/chrome/browser/browser.properties b/mozilla/browser/locales/en-US/chrome/browser/browser.properties
index 0b721361219..f153f85ee4e 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/browser.properties
+++ b/mozilla/browser/locales/en-US/chrome/browser/browser.properties
@@ -128,3 +128,7 @@ feedHasFeedsNew=Subscribe to this page...
 # tab context menu additions
 tabContext.undoCloseTab=Undo Close Tab
 tabContext.undoCloseTabAccessKey=U
+
+# History menu
+menuOpenInTabs.label=Open in Tabs
+menuOpenInTabs.accesskey=o
diff --git a/mozilla/browser/locales/en-US/chrome/browser/places/places.properties b/mozilla/browser/locales/en-US/chrome/browser/places/places.properties
index eb6c359a9b1..dcf5dddce2b 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/places/places.properties
+++ b/mozilla/browser/locales/en-US/chrome/browser/places/places.properties
@@ -39,9 +39,6 @@ locationStatusBookmarked=Star (On)
 
 menuOpenLivemarkOrigin.label=Open "%S"
 
-menuOpenInTabs.label=Open in Tabs
-menuOpenInTabs.accesskey=o
-
 defaultGroupOnLabel=Group by Site
 defaultGroupOnAccesskey=S
 defaultGroupOffLabel=No Grouping