Bug 386103 - l10n issues with search engine aliases. r=gavin

browser/components/search/content/engineManager.js

@@ -202,12 +202,11 @@ var gEngineManagerDialog = {
       // Notify the user if they have chosen an existing engine/bookmark keyword
       if (eduplicate || bduplicate) {
         var dtitle = strings.getString("duplicateTitle");
-        var bookmark = strings.getString("duplicateBookmark");
-        var dmsg = strings.getFormattedString("duplicateMsg",
-                                         [(bduplicate) ? bookmark : '"' +
-                                          engine.name + '"']);
+        var bmsg = strings.getString("duplicateBookmarkMsg");
+        var emsg = strings.getFormattedString("duplicateEngineMsg",
+                                              [engine.name]);
 
-        prompt.alert(window, dtitle, dmsg);
+        prompt.alert(window, dtitle, (eduplicate) ? emsg : bmsg);
       } else {
         gEngineView._engineStore.changeEngine(selectedEngine, "alias",
                                               alias.value);

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

@@ -1,8 +1,5 @@
 editTitle=Edit Keyword
 editMsg=Enter a new keyword for "%S":
 duplicateTitle=Duplicate Keyword
-# Localization Note: The substitution in duplicateMsg will either be a search
-# plugin name (e.g. ...in use by "Google".) or the duplicateBookmark string
-# below (e.g. ...in use by a bookmark.).
-duplicateMsg=You have chosen a keyword that is currently in use by %S. Please select another.
-duplicateBookmark=a bookmark
+duplicateEngineMsg=You have chosen a keyword that is currently in use by "%S". Please select another.
+duplicateBookmarkMsg=You have chosen a keyword that is currently in use by a bookmark. Please select another.