232272-v2v3
Produced: 26/04/2006 4:31:27 PM
   
Mode:  Differences with Context  
   
Left file: I:\manager2.diff     Right file: I:\manager3.diff  
36      var searchBar = document.getElementById("searchbar"); = 36      var searchBar = document.getElementById("searchbar");
37      if (searchBar && !searchBar.parentNode.parentNode.collapsed &&   37      if (searchBar && !searchBar.parentNode.parentNode.collapsed &&
38 -        !(window.getComputedStyle(searchBar.parentNode, null).display == "none"))   38 -        !(window.getComputedStyle(searchBar.parentNode, null).display == "none"))
39 +        window.getComputedStyle(searchBar.parentNode, null).display != "none")   39 +        window.getComputedStyle(searchBar.parentNode, null).display != "none")
40        return searchBar;   40        return searchBar;
41      return null;   41      return null;
    -+ 42 +  },
      43 +
      44 +  loadAddEngines: function BrowserSearch_loadAddEngines() {
      45 +    var newWindowPref = gPrefService.getIntPref("browser.link.open_newwindow");
      46 +    var where = newWindowPref == 3 ? "tab" : "window";
      47 +    var regionBundle = document.getElementById("bundle_browser_region");
      48 +    var searchEnginesURL = regionBundle.getString("searchEnginesURL");
      49 +    openUILinkIn(searchEnginesURL, where);
42    } = 50    }
43 }   51 }
44   52
45 function FillHistoryMenu(aParent, aMenu, aInsertBefore)   53 function FillHistoryMenu(aParent, aMenu, aInsertBefore)
46    {   54    {
47      // Remove old entries if any   55      // Remove old entries if any
    -+ 56      deleteHistoryItems(aParent);
      57
48 Index: browser/components/search/jar.mn = 58 Index: browser/components/search/jar.mn
49 ===================================================================   59 ===================================================================
50 RCS file: /cvsroot/mozilla/browser/components/search/jar.mn,v   60 RCS file: /cvsroot/mozilla/browser/components/search/jar.mn,v
51 retrieving revision 1.1   61 retrieving revision 1.1
52 diff -u -p -8 -r1.1 jar.mn   62 diff -u -p -8 -r1.1 jar.mn
53 --- browser/components/search/jar.mn  17 Mar 2006 07:15:42 -0000  1.1   63 --- browser/components/search/jar.mn  17 Mar 2006 07:15:42 -0000  1.1
 
82     * The POST data associated with a search submission, wrapped in a MIME = 92     * The POST data associated with a search submission, wrapped in a MIME
83     * input stream. May be null.   93     * input stream. May be null.
84     */   94     */
85    readonly attribute nsIInputStream postData;   95    readonly attribute nsIInputStream postData;
86   96
      97 @@ -129,17 +129,17 @@ interface nsISearchEngine : nsISupports
    -+ 98
      99    /**
      100     * A URL string pointing to the engine's search form.
      101     */
      102    readonly attribute AString searchForm;
      103
      104 };
      105
      106 -[scriptable, uuid(eaa8c60f-a0d7-4afe-b629-ab5ac9434298)]
      107 +[scriptable, uuid(5bcbc35a-8514-4583-9ef1-5bf5d10327f4)]
      108 interface nsIBrowserSearchService : nsISupports
      109 {
      110    /**
      111     * Adds a new search engine from the file at the supplied URI.
      112     *
      113     * @param engineURL
      114     *        The URL to the search engine's description file.
      115     *
87 @@ -222,32 +222,46 @@ interface nsIBrowserSearchService : nsIS = 116 @@ -208,48 +208,62 @@ interface nsIBrowserSearchService : nsIS
    -+ 117    nsISearchEngine getEngineByName(in AString aEngineName);
      118
      119    /**
      120     * Returns an array of all installed search engines.
88     * = 121     *
89     * @returns an array of nsISearchEngine objects.   122     * @returns an array of nsISearchEngine objects.
90     */   123     */
    -+ 124    void getEngines(
      125 -            out unsigned long engineCount,
      126 +            out unsigned long engineCount,
      127              [retval, array, size_is(engineCount)] out nsISearchEngine engines);
      128
      129    /**
      130     * Returns an array of all installed search engines whose hidden attribute is
      131     * false.
      132     *
      133     * @returns an array of nsISearchEngine objects.
      134     */
91    void getVisibleEngines( = 135    void getVisibleEngines(
92             out unsigned long engineCount, <> 136 -            out unsigned long engineCount,
      137 +            out unsigned long engineCount,
93              [retval, array, size_is(engineCount)] out nsISearchEngine engines); = 138              [retval, array, size_is(engineCount)] out nsISearchEngine engines);
94   139
95    /**   140    /**
96 +   * Moves a search engine.   141 +   * Moves a search engine.
97 +   *   142 +   *
98 +   * @param  engine   143 +   * @param  engine
 
123 = 168
124    /**   169    /**
125 -   * The currently active search engine.   170 -   * The currently active search engine.
126 +   * The currently active search engine. May be null if there are no visible   171 +   * The currently active search engine. May be null if there are no visible
127 +   * search engines installed.   172 +   * search engines installed.
128     */   173     */
129   attribute nsISearchEngine currentEngine;  <> 174 -  attribute nsISearchEngine currentEngine; 
      175 +  attribute nsISearchEngine currentEngine;
130 = 176
131 };   177 };
132   178
133 %{ C++   179 %{ C++
134 /**   180 /**
135   * The observer topic to listen to for actions performed on installed   181   * The observer topic to listen to for actions performed on installed
    -+ 182   * search engines.
      183   */
136 Index: browser/components/search/nsSearchService.js = 184 Index: browser/components/search/nsSearchService.js
137 ===================================================================   185 ===================================================================
138 RCS file: /cvsroot/mozilla/browser/components/search/nsSearchService.js,v   186 RCS file: /cvsroot/mozilla/browser/components/search/nsSearchService.js,v
139 retrieving revision 1.15   187 retrieving revision 1.17
140 diff -u -p -8 -r1.15 nsSearchService.js   188 diff -u -p -8 -r1.17 nsSearchService.js
141 --- browser/components/search/nsSearchService.js  19 Apr 2006 21:16:45 -0000  1.15   189 --- browser/components/search/nsSearchService.js  26 Apr 2006 05:13:07 -0000  1.17
 
733 +const Ci = Components.interfaces; = 781 +const Ci = Components.interfaces;
734 +const Cc = Components.classes;   782 +const Cc = Components.classes;
735 +   783 +
736 +var gEngineView = null;   784 +var gEngineView = null;
737 +   785 +
738 +var gEngineManagerDialog = {   786 +var gEngineManagerDialog = {
739 +  _strings: null, +-    
740 +      
741 +  init: function engineManager_init() { = 787 +  init: function engineManager_init() {
742 +    gEngineView = new EngineView(new EngineStore());   788 +    gEngineView = new EngineView(new EngineStore());
743 +   789 +
744 +    var tree = document.getElementById("engineList");   790 +    var tree = document.getElementById("engineList");
745 +    tree.view = gEngineView;   791 +    tree.view = gEngineView;
746 +   792 +
747 +    this._strings = document.getElementById("engineManagerBundle"); +-    
748 +      
749 +    var os = Cc["@mozilla.org/observer-service;1"]. = 793 +    var os = Cc["@mozilla.org/observer-service;1"].
750 +             getService(Ci.nsIObserverService);   794 +             getService(Ci.nsIObserverService);
751 +    os.addObserver(this, "browser-search-engine-modified", false);   795 +    os.addObserver(this, "browser-search-engine-modified", false);
752 + +-    
753 +    // Set the "Add Engines" link's href      
754 +    var regionBundle = document.getElementById("regionBundle");      
755 +    var searchEnginesURL = regionBundle.getString("searchEnginesURL");      
756 +    var addEngines = document.getElementById("addEngines");      
757 +    addEngines.setAttribute("href", searchEnginesURL);      
758 +  }, = 796 +  },
759 +   797 +
760 +  observe: function engineManager_observe(aEngine, aTopic, aVerb) {   798 +  observe: function engineManager_observe(aEngine, aTopic, aVerb) {
761 +    if (aTopic == "browser-search-engine-modified") {   799 +    if (aTopic == "browser-search-engine-modified") {
762 +      aEngine.QueryInterface(Ci.nsISearchEngine)   800 +      aEngine.QueryInterface(Ci.nsISearchEngine)
763 +      switch (aVerb) {   801 +      switch (aVerb) {
 
784 +    os.removeObserver(this, "browser-search-engine-modified"); = 822 +    os.removeObserver(this, "browser-search-engine-modified");
785 +   823 +
786 +    // Commit the changes   824 +    // Commit the changes
787 +    gEngineView._engineStore.commit();   825 +    gEngineView._engineStore.commit();
788 +  },   826 +  },
789 +   827 +
    -+ 828 +  loadAddEngines: function engineManager_loadAddEngines() {
      829 +    this.onOK();
      830 +    window.opener.BrowserSearch.loadAddEngines();
      831 +    window.close();
      832 +  },
      833 +
790 +  remove: function engineManager_remove() { = 834 +  remove: function engineManager_remove() {
791 +    gEngineView._engineStore.removeEngine(gEngineView.selectedEngine);   835 +    gEngineView._engineStore.removeEngine(gEngineView.selectedEngine);
792 +    var index = gEngineView.selectedIndex;   836 +    var index = gEngineView.selectedIndex;
793 +    gEngineView.rowCountChanged(index, -1);   837 +    gEngineView.rowCountChanged(index, -1);
794 +    gEngineView.invalidate();   838 +    gEngineView.invalidate();
795 +    gEngineView.selection.select(Math.min(index, gEngineView.lastIndex));   839 +    gEngineView.selection.select(Math.min(index, gEngineView.lastIndex));
796 +  }, +-    
797 +      
798 +  editAlias: function engineManager_editAlias() {      
799 +    var selectedEngine = gEngineView.selectedEngine;      
800 +    var prompt = Cc["@mozilla.org/embedcomp/prompt-service;1"].      
801 +                 getService(Ci.nsIPromptService);      
802 +      
803 +    var alias = { value: selectedEngine.alias };      
804 +      
805 +    var title = this._strings.getString("edit_alias_title");      
806 +    var msg = this._strings.getString("edit_alias_msg");      
807 +      
808 +    if (prompt.prompt(window, title, msg, alias, null, { })) {      
809 +      gEngineView._engineStore.changeEngine(selectedEngine, "alias",      
810 +                                            alias.value);      
811 +      gEngineView.invalidate();      
812 +    }      
813 +  }, = 840 +  },
814 +   841 +
815 +  /**   842 +  /**
816 +   * Moves the selected engine either up or down in the engine list   843 +   * Moves the selected engine either up or down in the engine list
817 +   * @param aDir   844 +   * @param aDir
818 +   *        -1 to move the selected engine down, +1 to move it up.   845 +   *        -1 to move the selected engine down, +1 to move it up.
 
844 +    var noEngineSelected = (gEngineView.selectedIndex == -1); = 871 +    var noEngineSelected = (gEngineView.selectedIndex == -1);
845 +    var lastSelected = (gEngineView.selectedIndex == gEngineView.lastIndex);   872 +    var lastSelected = (gEngineView.selectedIndex == gEngineView.lastIndex);
846 +    var firstSelected = (gEngineView.selectedIndex == 0);   873 +    var firstSelected = (gEngineView.selectedIndex == 0);
847 +   874 +
848 +    document.getElementById("cmd_remove").setAttribute("disabled",   875 +    document.getElementById("cmd_remove").setAttribute("disabled",
849 +                                                       noEngineSelected);   876 +                                                       noEngineSelected);
850 +    document.getElementById("cmd_editalias").setAttribute("disabled", +-    
851 +                                                          noEngineSelected);      
852 + = 877 +
853 +    document.getElementById("cmd_moveup").setAttribute("disabled",   878 +    document.getElementById("cmd_moveup").setAttribute("disabled",
854 +                                            noEngineSelected || firstSelected);   879 +                                            noEngineSelected || firstSelected);
855 +   880 +
856 +    document.getElementById("cmd_movedown").setAttribute("disabled",   881 +    document.getElementById("cmd_movedown").setAttribute("disabled",
857 +                                             noEngineSelected || lastSelected);   882 +                                             noEngineSelected || lastSelected);
 
883 +EngineRemoveOp.prototype = { = 908 +EngineRemoveOp.prototype = {
884 +  _engine: null,   909 +  _engine: null,
885 +  commit: function ERO_commit() {   910 +  commit: function ERO_commit() {
886 +    var searchService = Cc["@mozilla.org/browser/search-service;1"].   911 +    var searchService = Cc["@mozilla.org/browser/search-service;1"].
887 +                        getService(Ci.nsIBrowserSearchService);   912 +                        getService(Ci.nsIBrowserSearchService);
888 +    searchService.removeEngine(this._engine);   913 +    searchService.removeEngine(this._engine);
889 +  } +-    
890 +}      
891 +      
892 +function EngineChangeOp(aEngineClone, aProp, aNewValue) {      
893 +  if (!aEngineClone || !aProp)      
894 +    throw new Error("bad args to new EngineChangeOp!");      
895 +      
896 +  this._engine = aEngineClone.originalEngine;      
897 +  this._prop = aProp;      
898 +  this._newValue = aNewValue;      
899 +}      
900 +EngineChangeOp.prototype = {      
901 +  _engine: null,      
902 +  _prop: null,      
903 +  _newValue: null,      
904 +  commit: function ERO_commit() {      
905 +    this._engine[this._prop] = this._newValue;      
906 +  } = 914 +  }
907 +}   915 +}
908 +   916 +
909 +function EngineStore() {   917 +function EngineStore() {
910 +  var searchService = Cc["@mozilla.org/browser/search-service;1"].   918 +  var searchService = Cc["@mozilla.org/browser/search-service;1"].
911 +                      getService(Ci.nsIBrowserSearchService);   919 +                      getService(Ci.nsIBrowserSearchService);
 
942 +  }, = 950 +  },
943 +   951 +
944 +  addEngine: function ES_addEngine(aEngine) {   952 +  addEngine: function ES_addEngine(aEngine) {
945 +    this._engines.push(this._cloneEngine(aEngine));   953 +    this._engines.push(this._cloneEngine(aEngine));
946 +  },   954 +  },
947 +   955 +
948 +  changeEngine: function ES_changeEngine(aEngine, aProp, aNewValue) { +-    
949 +    var index = this._getIndexForEngine(aEngine);      
950 +      
951 +    if (index == -1)      
952 +      throw new Error("invalid engine?");      
953 +      
954 +    this._engines[index][aProp] = aNewValue;      
955 +    this._ops.push(new EngineChangeOp(aEngine, aProp, aNewValue));      
956 +  },      
957 +      
958 +  moveEngine: function ES_moveEngine(aEngine, aNewIndex) { = 956 +  moveEngine: function ES_moveEngine(aEngine, aNewIndex) {
959 +    if (aNewIndex < 0 || aNewIndex > this._engines.length - 1)   957 +    if (aNewIndex < 0 || aNewIndex > this._engines.length - 1)
960 +      throw new Error("ES_moveEngine: invalid aNewIndex!");   958 +      throw new Error("ES_moveEngine: invalid aNewIndex!");
961 +    var index = this._getIndexForEngine(aEngine);   959 +    var index = this._getIndexForEngine(aEngine);
962 +    if (index == -1)   960 +    if (index == -1)
963 +      throw new Error("ES_moveEngine: invalid engine?");   961 +      throw new Error("ES_moveEngine: invalid engine?");
 
974 +    if (index == -1) = 972 +    if (index == -1)
975 +      throw new Error("invalid engine?");   973 +      throw new Error("invalid engine?");
976 +   974 +
977 +    this._engines.splice(index, 1);   975 +    this._engines.splice(index, 1);
978 +    this._ops.push(new EngineRemoveOp(aEngine));   976 +    this._ops.push(new EngineRemoveOp(aEngine));
979 +  },   977 +  },
980 +  <> 978 +
981 +  reloadIcons: function ES_reloadIcons() { = 979 +  reloadIcons: function ES_reloadIcons() {
982 +    this._engines.forEach(function (e) {   980 +    this._engines.forEach(function (e) {
983 +      e.uri = e.originalEngine.uri;   981 +      e.uri = e.originalEngine.uri;
984 +    });   982 +    });
985 +  }   983 +  }
986 +}   984 +}
 
1032 +    return ""; = 1030 +    return "";
1033 +  },   1031 +  },
1034 +   1032 +
1035 +  getCellText: function(index, column) {   1033 +  getCellText: function(index, column) {
1036 +    if (column.id == "engineName")   1034 +    if (column.id == "engineName")
1037 +      return this._engineStore.engines[index].name;   1035 +      return this._engineStore.engines[index].name;
1038 +    else if (column.id == "engineAlias") <> 1036 +    return "";
1039 +      return this._engineStore.engines[index].alias;      
1040 +  }, = 1037 +  },
1041 +   1038 +
1042 +  setTree: function(tree) {   1039 +  setTree: function(tree) {
1043 +    this.tree = tree;   1040 +    this.tree = tree;
1044 +  },   1041 +  },
1045 +   1042 +
 
1131 +        windowtype="Browser:SearchManager"> = 1128 +        windowtype="Browser:SearchManager">
1132 +   1129 +
1133 +  <script type="application/x-javascript"   1130 +  <script type="application/x-javascript"
1134 +          src="chrome://browser/content/search/engineManager.js"/>   1131 +          src="chrome://browser/content/search/engineManager.js"/>
1135 +  <stringbundle id="engineManagerBundle"   1132 +  <stringbundle id="engineManagerBundle"
1136 +                src="chrome://browser/locale/search.properties"/>   1133 +                src="chrome://browser/locale/search.properties"/>
1137 +  <stringbundle id="regionBundle" +-    
1138 +                src="chrome://browser-region/locale/region.properties"/>      
1139 + = 1134 +
1140 +  <commandset id="engineManagerCommandSet">   1135 +  <commandset id="engineManagerCommandSet">
1141 +    <command id="cmd_remove"   1136 +    <command id="cmd_remove"
1142 +             oncommand="gEngineManagerDialog.remove();"   1137 +             oncommand="gEngineManagerDialog.remove();"
1143 +             disabled="true"/>   1138 +             disabled="true"/>
1144 +    <command id="cmd_moveup"   1139 +    <command id="cmd_moveup"
 
1164 +    <tree id="engineList" flex="1" rows="10" hidecolumnpicker="true" = 1159 +    <tree id="engineList" flex="1" rows="10" hidecolumnpicker="true"
1165 +          seltype="single" onselect="gEngineManagerDialog.onSelect();">   1160 +          seltype="single" onselect="gEngineManagerDialog.onSelect();">
1166 +      <treechildren id="engineChildren" flex="1"/>   1161 +      <treechildren id="engineChildren" flex="1"/>
1167 +      <treecols>   1162 +      <treecols>
1168 +        <treecol id="engineName" class="sortDirectionIndicator" flex="3"   1163 +        <treecol id="engineName" class="sortDirectionIndicator" flex="3"
1169 +                 persist="width" label="&nameColumn.label;"/>   1164 +                 persist="width" label="&nameColumn.label;"/>
1170 +        <splitter class="tree-splitter"/> +-    
1171 +        <treecol id="engineAlias" class="sortDirectionIndicator" flex="2"      
1172 +                 persist="width" label="&aliasColumn.label;"/>      
1173 +      </treecols> = 1165 +      </treecols>
1174 +    </tree>   1166 +    </tree>
1175 +    <vbox>   1167 +    <vbox>
1176 +      <spacer flex="1"/>   1168 +      <spacer flex="1"/>
1177 +      <button id="up"   1169 +      <button id="up"
1178 +              label="&up.label;"   1170 +              label="&up.label;"
 
1180 +              command="cmd_moveup"/> = 1172 +              command="cmd_moveup"/>
1181 +      <button id="dn"   1173 +      <button id="dn"
1182 +              label="&dn.label;"   1174 +              label="&dn.label;"
1183 +              accesskey="&dn.accesskey;"   1175 +              accesskey="&dn.accesskey;"
1184 +              command="cmd_movedown"/>   1176 +              command="cmd_movedown"/>
1185 +      <spacer flex="1"/>   1177 +      <spacer flex="1"/>
1186 +      <button id="alias" +-    
1187 +              label="&editAlias.label;"      
1188 +              accesskey="&editAlias.accesskey;"      
1189 +              command="cmd_editalias"/>      
1190 +      <button id="remove" = 1178 +      <button id="remove"
1191 +              label="&delete.label;" <> 1179 +              label="&remove.label;"
1192 +              accesskey="&delete.accesskey;"   1180 +              accesskey="&remove.accesskey;"
1193 +              command="cmd_remove"/> = 1181 +              command="cmd_remove"/>
1194 +    </vbox>   1182 +    </vbox>
1195 +  </hbox>   1183 +  </hbox>
1196 +  <hbox>   1184 +  <hbox>
1197 +    <label id="addEngines" class="text-link" value="&addEngine.label;"/> <> 1185 +    <label id="addEngines" class="text-link" value="&addEngine.label;"
      1186 +           onclick="gEngineManagerDialog.loadAddEngines();"/>
1198 +    <spacer flex="1"/> = 1187 +    <spacer flex="1"/>
1199 +  </hbox>   1188 +  </hbox>
1200 +</dialog>   1189 +</dialog>
1201 Index: browser/components/search/content/search.xml   1190 Index: browser/components/search/content/search.xml
1202 ===================================================================   1191 ===================================================================
1203 RCS file: /cvsroot/mozilla/browser/components/search/content/search.xml,v   1192 RCS file: /cvsroot/mozilla/browser/components/search/content/search.xml,v
 
1410 +          var window = wm.getMostRecentWindow("Browser:SearchManager"); = 1399 +          var window = wm.getMostRecentWindow("Browser:SearchManager");
1411 +          if (window)   1400 +          if (window)
1412 +            window.focus()   1401 +            window.focus()
1413 +          else {   1402 +          else {
1414 +            setTimeout(function () {   1403 +            setTimeout(function () {
1415 +              openDialog("chrome://browser/content/search/engineManager.xul",   1404 +              openDialog("chrome://browser/content/search/engineManager.xul",
1416 +                         "_blank", "chrome,dialog,modal"); <> 1405 +                         "_blank", "chrome,dialog,modal,centerscreen");
1417 +            }, 0); = 1406 +            }, 0);
1418 +          }   1407 +          }
1419          ]]></body>   1408          ]]></body>
1420        </method>   1409        </method>
1421   1410
1422        <method name="onEnginePopupCommand">   1411        <method name="onEnginePopupCommand">
 
1514 RCS file: browser/locales/en-US/chrome/browser/engineManager.dtd = 1503 RCS file: browser/locales/en-US/chrome/browser/engineManager.dtd
1515 diff -N browser/locales/en-US/chrome/browser/engineManager.dtd   1504 diff -N browser/locales/en-US/chrome/browser/engineManager.dtd
1516 --- /dev/null 1 Jan 1970 00:00:00 -0000   1505 --- /dev/null 1 Jan 1970 00:00:00 -0000
1517 +++ browser/locales/en-US/chrome/browser/engineManager.dtd  22 Apr 2006 23:39:47 -0000   1506 +++ browser/locales/en-US/chrome/browser/engineManager.dtd  26 Apr 2006 20:28:29 -0000
1518 @@ -0,0 +1,18 @@   1507 @@ -0,0 +1,16 @@
1519 +<!ENTITY  engineManager.title       "Manage Search Engine List">   1508 +<!ENTITY  engineManager.title       "Manage Search Engine List">
1520 +<!ENTITY  engineManager.style       "min-width: 40em;"> <> 1509 +<!ENTITY  engineManager.style       "min-width: 35em;">
1521 +<!ENTITY  engineManager.intro       "The following Search Engines are available:">   1510 +<!ENTITY  engineManager.intro       "You have the following search engines installed:">
1522 + = 1511 +
    -+ 1512 +<!-- Buttons -->
1523 +<!ENTITY  up.label                  "Move Up"> = 1513 +<!ENTITY  up.label                  "Move Up">
1524 +<!ENTITY  up.accesskey              "U">   1514 +<!ENTITY  up.accesskey              "U">
1525 +<!ENTITY  dn.label                  "Move Down">   1515 +<!ENTITY  dn.label                  "Move Down">
1526 +<!ENTITY  dn.accesskey              "D">   1516 +<!ENTITY  dn.accesskey              "D">
1527 +<!ENTITY  delete.label              "Remove"> <> 1517 +<!ENTITY  remove.label              "Remove">
1528 +<!ENTITY  delete.accesskey          "R">   1518 +<!ENTITY  remove.accesskey          "R">
1529 +<!ENTITY  nameColumn.label          "Name">      
1530 +<!ENTITY  aliasColumn.label         "Alias">      
1531 + = 1519 +
1532 +<!ENTITY  editAlias.label           "Edit Alias..."> <> 1520 +<!ENTITY  nameColumn.label          "Name">
1533 +<!ENTITY  editAlias.accesskey       "A">      
1534 + = 1521 +
1535 +<!ENTITY  addEngine.label           "Add Search Engines..."> <> 1522 +<!ENTITY  addEngine.label           "Get more search engines...">
1536 +<!ENTITY  addEngine.accesskey       "A"> = 1523 +<!ENTITY  addEngine.accesskey       "A">
1537 Index: browser/locales/en-US/chrome/browser/search.properties   1524 Index: browser/locales/en-US/chrome/browser/search.properties
1538 ===================================================================   1525 ===================================================================
1539 RCS file: /cvsroot/mozilla/browser/locales/en-US/chrome/browser/search.properties,v   1526 RCS file: /cvsroot/mozilla/browser/locales/en-US/chrome/browser/search.properties,v
1540 retrieving revision 1.1   1527 retrieving revision 1.1
1541 diff -u -p -8 -r1.1 search.properties   1528 diff -u -p -8 -r1.1 search.properties
 
1550 cmd_clearHistory_accesskey=C = 1537 cmd_clearHistory_accesskey=C
1551 -cmd_editList=Edit this list...   1538 -cmd_editList=Edit this list...
1552 -cmd_editListAccesskey=E   1539 -cmd_editListAccesskey=E
1553 +   1540 +
1554 error_loading_engine_title=Download Error   1541 error_loading_engine_title=Download Error
1555 error_loading_engine_msg=%S could not download the search plugin from:\n%S\n\nPlease try again or contact the author.   1542 error_loading_engine_msg=%S could not download the search plugin from:\n%S\n\nPlease try again or contact the author.
1556 + <>    
1557 remove_engine_title=Remove Engine?   1543 -remove_engine_title=Remove Engine?
1558 remove_engine_msg=If you remove '%S' you will not be able to search using it from the Search Box any more. Are you sure you want to remove it?   1544 -remove_engine_msg=If you remove '%S' you will not be able to search using it from the Search Box any more. Are you sure you want to remove it?
1559 -edit_name_title=Edit Name = 1545 -edit_name_title=Edit Name
1560 -edit_name_msg=Enter a new Name:   1546 -edit_name_msg=Enter a new Name:
1561 + <>    
1562 edit_alias_title=Edit Alias   1547 -edit_alias_title=Edit Alias
1563 -edit_alias_msg=Enter a new Alias: = 1548 -edit_alias_msg=Enter a new Alias:
1564 +edit_alias_msg=Enter a new alias: +-    
1565 Index: browser/locales/en-US/chrome/browser/searchbar.dtd = 1549 Index: browser/locales/en-US/chrome/browser/searchbar.dtd
1566 ===================================================================   1550 ===================================================================
1567 RCS file: browser/locales/en-US/chrome/browser/searchbar.dtd   1551 RCS file: browser/locales/en-US/chrome/browser/searchbar.dtd
1568 diff -N browser/locales/en-US/chrome/browser/searchbar.dtd   1552 diff -N browser/locales/en-US/chrome/browser/searchbar.dtd
1569 --- /dev/null 1 Jan 1970 00:00:00 -0000   1553 --- /dev/null 1 Jan 1970 00:00:00 -0000
1570 +++ browser/locales/en-US/chrome/browser/searchbar.dtd  22 Apr 2006 23:39:47 -0000   1554 +++ browser/locales/en-US/chrome/browser/searchbar.dtd  26 Apr 2006 20:28:29 -0000
1571 @@ -0,0 +1,2 @@   1555 @@ -0,0 +1,2 @@
1572 +<!ENTITY cmd_engineManager.label        "Manage Search Engines...">   1556 +<!ENTITY cmd_engineManager.label        "Manage Search Engines...">
1573 +<!ENTITY cmd_engineManager.accesskey    "M">   1557 +<!ENTITY cmd_engineManager.accesskey    "M">