Bug 341437: change entity name to indicate semantic string change, patch by Michael Wu <michael.wu@mozilla.com>, r=axel

browser/components/search/nsSearchService.js

@@ -1069,7 +1069,7 @@ Engine.prototype = {
       var brandBundle = sbs.createBundle(BRAND_BUNDLE);
       var brandName = brandBundle.GetStringFromName("brandShortName");
       var title = searchBundle.GetStringFromName("error_loading_engine_title");
-      var text = searchBundle.formatStringFromName("error_loading_engine_msg",
+      var text = searchBundle.formatStringFromName("error_loading_engine_msg2",
                                                    [brandName, aEngine._location],
                                                    2);
 

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

@@ -4,8 +4,10 @@ cmd_clearHistory=Clear Search History
 cmd_clearHistory_accesskey=C
 
 error_loading_engine_title=Download Error
-error_loading_engine_msg=%S could not download the search plugin from:\n%S
+# 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
 error_invalid_engine_title=Install Error
+# LOCALIZATION NOTE (error_invalid_engine_msg): %S = brandShortName
 error_invalid_engine_msg=This search engine isn't supported by %S and can't be installed.
 
 cmd_addFoundEngine=Add "%S"