From 0ac41e776e6746167b3bc8bb2108c7e310734e5a Mon Sep 17 00:00:00 2001 From: "rflint%ryanflint.com" Date: Wed, 27 Jun 2007 22:58:47 +0000 Subject: [PATCH] Bug 386103 - l10n issues with search engine aliases. r=gavin git-svn-id: svn://10.0.0.236/trunk@228902 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/components/search/content/engineManager.js | 9 ++++----- .../en-US/chrome/browser/engineManager.properties | 7 ++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/mozilla/browser/components/search/content/engineManager.js b/mozilla/browser/components/search/content/engineManager.js index 0b62f64274f..86c58b38dac 100644 --- a/mozilla/browser/components/search/content/engineManager.js +++ b/mozilla/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); diff --git a/mozilla/browser/locales/en-US/chrome/browser/engineManager.properties b/mozilla/browser/locales/en-US/chrome/browser/engineManager.properties index d498fd38bb9..ee2ebbb6638 100644 --- a/mozilla/browser/locales/en-US/chrome/browser/engineManager.properties +++ b/mozilla/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.