From d2322fe3e0ec07fa9038c682556c4579b8db1e40 Mon Sep 17 00:00:00 2001
From: "rjc%netscape.com"
 <rjc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 22 Mar 2000 08:18:02 +0000
Subject: [PATCH] Fix bug # 17333: use a string bundle. Code from
 aaronr@us.ibm.com: Review: me

git-svn-id: svn://10.0.0.236/trunk@63728 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/components/bookmarks/resources/bm-panel.xul  | 1 +
 mozilla/xpfe/components/bookmarks/resources/bookmarks.js  | 8 +++++---
 mozilla/xpfe/components/bookmarks/resources/bookmarks.xul | 1 +
 .../bookmarks/resources/locale/en-US/bookmark.properties  | 6 ++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
index c6371ff3a78..40873615156 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -35,6 +35,7 @@
   <html:script src="chrome://bookmarks/content/bm-panel.js" />
   <html:script src="chrome://bookmarks/content/bookmarks.js" />
   <html:script src="chrome://bookmarks/content/bookmarksDD.js"/>
+  <html:script src="chrome://global/content/strres.js"/>
 
   <html:div style="width:100px;height:100px" flex="1">
 
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
index 95566a4a819..ac271007277 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
@@ -260,7 +260,9 @@ function doDelete(promptFlag)
 
 	if (promptFlag == true)
 	{
-		var ok = confirm("Delete the selected item(s)?");	// XXX localize
+		var bundle = srGetStrBundle("chrome://bookmarks/locale/bookmark.properties");
+		var deleteStr = bundle.GetStringFromName("DeleteItems");
+		var ok = confirm(deleteStr);
 		if (!ok)	return(false);
 	}
 
@@ -621,8 +623,8 @@ function fillContextMenu(name)
 			}
 
 			// and then add a "Properties" menu items
-			var propMenuName = "Properties...";			// XXX localize
-			
+			var bundle = srGetStrBundle("chrome://bookmarks/locale/bookmark.properties");
+			var propMenuName = bundle.GetStringFromName("BookmarkProperties");
 			var menuItem = document.createElement("menuitem");
 			menuItem.setAttribute("value", propMenuName);
 			popupNode.appendChild(menuItem);
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index cf39fce656e..10b7f106cb8 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -39,6 +39,7 @@
   <html:script src="chrome://bookmarks/content/bookmarks.js"/>
   <html:script src="chrome://bookmarks/content/bookmarksDD.js"/>
   <html:script src="chrome://global/content/treePopups.js"/>
+  <html:script src="chrome://global/content/strres.js"/>
 
   <menubar>
     <menu value="&menu.file.label;">
diff --git a/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmark.properties b/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmark.properties
index 0dbb8a8205f..eb99c648a8c 100755
--- a/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmark.properties
+++ b/mozilla/xpfe/components/bookmarks/resources/locale/en-US/bookmark.properties
@@ -27,11 +27,15 @@ DeleteFolder = Delete Folder
 NewSeparator = New Separator
 DeleteSeparator = Delete Separator
 
+BookmarkProperties = Properties...
+
 ImportedIEFavorites = Imported IE Favorites
 ImportedNetPositiveBookmarks = Imported NetPositive Bookmarks
 
 DefaultPersonalToolbarFolder = Personal Toolbar Folder
 
+DeleteItems = Delete the selected item(s)?
+
 WebPageUpdated = The following web page has been updated:
 WebPageTitle = Title:
 WebPageURL = URL:
@@ -39,5 +43,3 @@ WebPageAskDisplay = Would you like to display it?
 WebPageAskStopOption = Stop checking for updates on this web page
 
 pleaseEnterALocation = Please enter a location
-
-