Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java	(revision 15079)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java	(revision 15080)
@@ -53,6 +53,6 @@
 
     private final HistoryComboBox hcbSearchString = new HistoryComboBox();
-    private final JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
-
+
+    private JCheckBox addOnToolbar;
     private JCheckBox caseSensitive;
     private JCheckBox allElements;
@@ -76,5 +76,5 @@
         super(MainApplication.getMainFrame(),
                 initialValues instanceof Filter ? tr("Filter") : tr("Search"),
-                initialValues instanceof Filter ? tr("Submit filter") : tr("Start Search"),
+                initialValues instanceof Filter ? tr("Submit filter") : tr("Search"),
                 tr("Cancel"));
         this.searchSettings = new SearchSetting(initialValues);
@@ -99,5 +99,5 @@
         label.setLabelFor(hcbSearchString);
 
-        replace = new JRadioButton(tr("replace selection"), searchSettings.mode == SearchMode.replace);
+        replace = new JRadioButton(tr("select"), searchSettings.mode == SearchMode.replace);
         add = new JRadioButton(tr("add to selection"), searchSettings.mode == SearchMode.add);
         remove = new JRadioButton(tr("remove from selection"), searchSettings.mode == SearchMode.remove);
@@ -112,4 +112,6 @@
         allElements = new JCheckBox(tr("all objects"), searchSettings.allElements);
         allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
+        addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
+        addOnToolbar.setToolTipText(tr("Add a button with this search expression to the toolbar."));
 
         standardSearch = new JRadioButton(tr("standard"), !searchSettings.regexSearch && !searchSettings.mapCSSSearch);
@@ -122,5 +124,5 @@
 
         JPanel selectionSettings = new JPanel(new GridBagLayout());
-        selectionSettings.setBorder(BorderFactory.createTitledBorder(tr("Selection settings")));
+        selectionSettings.setBorder(BorderFactory.createTitledBorder(tr("Results")));
         selectionSettings.add(replace, GBC.eol().anchor(GBC.WEST).fill(GBC.HORIZONTAL));
         selectionSettings.add(add, GBC.eol());
@@ -129,5 +131,5 @@
 
         JPanel additionalSettings = new JPanel(new GridBagLayout());
-        additionalSettings.setBorder(BorderFactory.createTitledBorder(tr("Additional settings")));
+        additionalSettings.setBorder(BorderFactory.createTitledBorder(tr("Options")));
         additionalSettings.add(caseSensitive, GBC.eol().anchor(GBC.WEST).fill(GBC.HORIZONTAL));
 
@@ -267,5 +269,5 @@
     private static JPanel buildHintsSection(HistoryComboBox hcbSearchString, boolean expertMode) {
         JPanel hintPanel = new JPanel(new GridBagLayout());
-        hintPanel.setBorder(BorderFactory.createTitledBorder(tr("Search hints")));
+        hintPanel.setBorder(BorderFactory.createTitledBorder(tr("Hints")));
 
         hintPanel.add(new SearchKeywordRow(hcbSearchString)
@@ -274,5 +276,5 @@
                 .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key"))
                 .addKeyword("<i>key</i>:<i>valuefragment</i>", null,
-                        tr("''valuefragment'' anywhere in ''key''"), "name:str matches name=Bakerstreet")
+                        tr("''valuefragment'' anywhere in ''key''"), tr("name:str matches name=Bakerstreet"))
                 .addKeyword("-<i>key</i>:<i>valuefragment</i>", null, tr("''valuefragment'' nowhere in ''key''")),
                 GBC.eol());
@@ -287,9 +289,12 @@
                         tr("to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped " +
                                 "by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."),
+                        tr("name=\"Baker Street\""),
                         "\"addr:street\""),
                 GBC.eol().anchor(GBC.CENTER));
         hintPanel.add(new SearchKeywordRow(hcbSearchString)
                 .addTitle(tr("combinators"))
-                .addKeyword("<i>expr</i> <i>expr</i>", null, tr("logical and (both expressions have to be satisfied)"))
+                .addKeyword("<i>expr</i> <i>expr</i>", null,
+                        tr("logical and (both expressions have to be satisfied)"),
+                        tr("Baker Street"))
                 .addKeyword("<i>expr</i> | <i>expr</i>", "| ", tr("logical or (at least one expression has to be satisfied)"))
                 .addKeyword("<i>expr</i> OR <i>expr</i>", "OR ", tr("logical or (at least one expression has to be satisfied)"))
@@ -315,9 +320,9 @@
             hintPanel.add(new SearchKeywordRow(hcbSearchString)
                 .addTitle(tr("metadata"))
-                .addKeyword("user:", "user:", tr("objects changed by user", "user:anonymous"))
-                .addKeyword("id:", "id:", tr("objects with given ID"), "id:0 (new objects)")
-                .addKeyword("version:", "version:", tr("objects with given version"), "version:0 (objects without an assigned version)")
+                .addKeyword("user:", "user:", tr("objects changed by user"), tr("user:anonymous"))
+                .addKeyword("id:", "id:", tr("objects with given ID"), tr("id:0 (new objects)"))
+                .addKeyword("version:", "version:", tr("objects with given version"), tr("version:0 (objects without an assigned version)"))
                 .addKeyword("changeset:", "changeset:", tr("objects with given changeset ID"),
-                        "changeset:0 (objects without an assigned changeset)")
+                        tr("changeset:0 (objects without an assigned changeset)"))
                 .addKeyword("timestamp:", "timestamp:", tr("objects with last modification timestamp within range"), "timestamp:2012/",
                         "timestamp:2008/2011-02-04T12"),