bug 401417 - Add an option for a search box in SeaMonkey toolbar, including additon of an engine manager for OpenSearch, r+ui-r=Neil
authorRobert Kaiser <kairo@kairo.at>
Thu, 10 Mar 2011 22:42:00 +0100
changeset 7528 d5f24ee81802b00e459237da99968cbe3d1b77bf
parent 7527 79a9363645c4a0c5254357270bf83ef9b9c97704
child 7529 625976f68a762a65d4215eeb599e1ab3080340d4
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
bugs401417
bug 401417 - Add an option for a search box in SeaMonkey toolbar, including additon of an engine manager for OpenSearch, r+ui-r=Neil X-Channel-Repo: comm-central X-Channel-Converted-Revision: 6609dcc741a7c1b64ddb375a1155db718723ac75
suite/chrome/browser/navigator.dtd
suite/chrome/common/pref/pref-search.dtd
suite/chrome/common/search/engineManager.dtd
suite/chrome/common/search/engineManager.properties
suite/chrome/common/search/search-panel.dtd
suite/chrome/common/search/search.properties
suite/chrome/common/search/searchbar.dtd
suite/searchplugins/google.xml
--- a/suite/chrome/browser/navigator.dtd
+++ b/suite/chrome/browser/navigator.dtd
@@ -147,24 +147,24 @@
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
 
 <!ENTITY throbber.tooltip             "Go to the &vendorShortName; home page">
 
 <!ENTITY locationBar.tooltip          "Enter search term, keyword, or web address">
 <!ENTITY locationBar.accesskey        "d">
 <!ENTITY locationBar.title            "Location">
-
 <!ENTITY proxyIcon.tooltip            "Drag and drop this icon to create a link to this page">
 
-<!-- Toolbar items --> 
-<!ENTITY  bookmarksButton.label       "Bookmarks">
-<!ENTITY  bookmarksButton.tooltip     "Bookmarks list">
-<!ENTITY  homeButton.label            "Home">
-<!ENTITY  bookmarksToolbarItem.label  "Bookmarks Toolbar Items">
+<!ENTITY searchItem.title             "Search">
+
+<!ENTITY bookmarksButton.label        "Bookmarks">
+<!ENTITY bookmarksButton.tooltip      "Bookmarks list">
+<!ENTITY homeButton.label             "Home">
+<!ENTITY bookmarksToolbarItem.label   "Bookmarks Toolbar Items">
 <!ENTITY bookmarksToolbarChevron.tooltip "Show more bookmarks">
 
 <!-- Statusbar -->
 <!ENTITY  statusText.label            "Done">
 
 <!ENTITY historyCmd.label           "History">  
 <!ENTITY historyCmd.accesskey       "i">
 <!ENTITY history.commandKey         "h">
--- a/suite/chrome/common/pref/pref-search.dtd
+++ b/suite/chrome/common/pref/pref-search.dtd
@@ -2,14 +2,17 @@
 
 <!-- LOCALIZATION NOTE : FILE The Search prefs dialog -->
 
 <!ENTITY pref.search.title                "Internet Search">
 <!ENTITY legendHeader                     "Default Search Engine">
 <!ENTITY defaultSearchEngine.label        "Search using:">
 <!ENTITY defaultSearchEngine.accesskey    "S">
 
+<!-- Will be used by bug 595246 -->
+<!ENTITY engineManager.label              "Manage Search Engines…">
+
 <!ENTITY searchResults.label              "Search Results">
 
 <!ENTITY openInTab.label                  "Open new tabs for sidebar search results">
 <!ENTITY openInTab.accesskey              "n">
 <!ENTITY openSidebarSearchPanel.label     "Open the Search tab in the sidebar when a search is invoked">
 <!ENTITY openSidebarSearchPanel.accesskey "O">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/search/engineManager.dtd
@@ -0,0 +1,25 @@
+<!ENTITY  engineManager.title       "Manage Search Engine List">
+<!ENTITY  engineManager.style       "min-width: 35em;">
+<!ENTITY  engineManager.intro       "You have the following search engines installed:">
+
+<!ENTITY  columnLabel.name          "Name">
+<!ENTITY  columnLabel.keyword       "Keyword">
+
+<!-- Buttons -->
+<!ENTITY  up.label                  "Move Up">
+<!ENTITY  up.accesskey              "U">
+<!ENTITY  dn.label                  "Move Down">
+<!ENTITY  dn.accesskey              "D">
+<!ENTITY  remove.label              "Remove">
+<!ENTITY  remove.accesskey          "R">
+<!ENTITY  edit.label                "Edit Keyword…">
+<!ENTITY  edit.accesskey            "t">
+
+<!ENTITY  addEngine.label           "Get more search engines…">
+<!ENTITY  addEngine.accesskey       "A">
+
+<!ENTITY  enableSuggest.label       "Show search suggestions">
+<!ENTITY  enableSuggest.accesskey   "S">
+
+<!ENTITY  restoreDefaults.label     "Restore Defaults">
+<!ENTITY  restoreDefaults.accesskey "e">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/search/engineManager.properties
@@ -0,0 +1,5 @@
+editTitle=Edit Keyword
+editMsg=Enter a new keyword for "%S":
+duplicateTitle=Duplicate Keyword
+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.
--- a/suite/chrome/common/search/search-panel.dtd
+++ b/suite/chrome/common/search/search-panel.dtd
@@ -33,8 +33,10 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!ENTITY search.button.label      "Search">
 <!ENTITY search.placeholder       "Enter search text">
 
+<!-- Will be used by bug 595246 -->
+<!ENTITY search.engineManager.label "Manage Search Engines…">
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/search/search.properties
@@ -0,0 +1,14 @@
+searchtip=Search using %S
+
+# LOCALIZATION NOTE (cmd_pasteAndSearch): "Search" is a verb, this is the
+# search bar equivalent to the url bar's "Paste & Go"
+cmd_pasteAndSearch=Paste & Search
+
+cmd_clearHistory=Clear Search History
+cmd_clearHistory_accesskey=H
+
+cmd_showSuggestions=Show Suggestions
+cmd_showSuggestions_accesskey=S
+
+cmd_addFoundEngine=Add "%S"
+
new file mode 100644
--- /dev/null
+++ b/suite/chrome/common/search/searchbar.dtd
@@ -0,0 +1,2 @@
+<!ENTITY cmd_engineManager.label        "Manage Search Engines…">
+<!ENTITY searchEndCap.label             "Search">
--- a/suite/searchplugins/google.xml
+++ b/suite/searchplugins/google.xml
@@ -1,14 +1,14 @@
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA</Image>
-<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=seamonkey&amp;hl={moz:locale}&amp;q={searchTerms}"/>
+<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl={moz:locale}&amp;q={searchTerms}"/>
 <Url type="text/html" method="GET" template="http://www.google.com/search">
   <Param name="q" value="{searchTerms}"/>
   <Param name="ie" value="utf-8"/>
   <Param name="oe" value="utf-8"/>
   <Param name="aq" value="t"/>
   <!-- Dynamic parameters -->
   <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
   <MozParam name="client" condition="defaultEngine" trueValue="seamonkey-a" falseValue="seamonkey"/>