Bug 344437: String cleanup for search engine confirmation dialog. r=beng

browser/components/search/nsSearchService.js

@@ -94,7 +94,6 @@ const MAX_ICON_SIZE   = 10000;
 const DEFAULT_QUERY_CHARSET = "ISO-8859-1";
 
 const SEARCH_BUNDLE = "chrome://browser/locale/search.properties";
-const SIDEBAR_BUNDLE = "chrome://browser/locale/sidebar/sidebar.properties";
 const BRAND_BUNDLE = "chrome://branding/locale/brand.properties";
 
 const OPENSEARCH_NS_10  = "http://a9.com/-/spec/opensearch/1.0/";
@@ -1061,12 +1060,12 @@ Engine.prototype = {
   _confirmAddEngine: function SRCH_SVC_confirmAddEngine() {
     var sbs = Cc["@mozilla.org/intl/stringbundle;1"].
               getService(Ci.nsIStringBundleService);
-    var stringBundle = sbs.createBundle(SIDEBAR_BUNDLE);
+    var stringBundle = sbs.createBundle(SEARCH_BUNDLE);
     var titleMessage = stringBundle.GetStringFromName("addEngineConfirmTitle");
 
     // Display only the hostname portion of the URL.
     var dialogMessage =
-        stringBundle.formatStringFromName("addEngineConfirmText",
+        stringBundle.formatStringFromName("addEngineConfirmation",
                                           [this._name, this._uri.host], 2);
     var checkboxMessage = stringBundle.GetStringFromName("addEngineUseNowText");
     var addButtonLabel =

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

@@ -3,6 +3,11 @@ searchtip=Search using %S
 cmd_clearHistory=Clear Search History
 cmd_clearHistory_accesskey=C
 
+addEngineConfirmTitle=Add Search Engine
+addEngineConfirmation=Add "%S" to the list of engines available in the search bar?\n\nFrom: %S
+addEngineUseNowText=Start &using it right away
+addEngineAddButtonLabel=Add
+
 error_loading_engine_title=Download Error
 # LOCALIZATION NOTE (error_loading_engine_msg2): %1$S = brandShortName, %2$S = location
 error_loading_engine_msg2=%S could not download the search plugin from:\n%S

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

@@ -1,9 +1,2 @@
-addEngineConfirmTitle=Add Search Engine
-addEngineConfirmText= Add %S to the list of engines available in the search bar?\n\nFrom: %S
-addEngineQuotedEngineName="%S"
-addEngineDefaultEngineName=a new search engine
-addEngineUseNowText=Start &using it right away
-addEngineAddButtonLabel=Add
-
 addMicsumGenConfirmTitle=Add Microsummary Generator
 addMicsumGenConfirmText=Add the following microsummary generator?\n\nSource: %S