SearchAction.java
=================
--- SearchAction.java	Mon Mar 18 02:00:10 2019
+++ patchedSearchAction.java	Tue Mar 26 09:32:38 2019
@@ -304,6 +304,7 @@
         JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
         allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
         JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
+        addOnToolbar.setToolTipText(tr("Add a button with this search expression to the toolbar."));
 
         JRadioButton standardSearch = new JRadioButton(tr("standard"), !initialValues.regexSearch && !initialValues.mapCSSSearch);
         JRadioButton regexSearch = new JRadioButton(tr("regular expression"), initialValues.regexSearch);
@@ -321,7 +322,7 @@
         selectionSettings.add(inSelection, GBC.eop());
 
         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));
 
         JPanel left = new JPanel(new GridBagLayout());
@@ -471,14 +472,14 @@
 
     private static JPanel buildHintsSection(HistoryComboBox hcbSearchString) {
         JPanel hintPanel = new JPanel(new GridBagLayout());
-        hintPanel.setBorder(BorderFactory.createTitledBorder(tr("Search hints")));
+        hintPanel.setBorder(BorderFactory.createTitledBorder(tr("Hints")));
 
         hintPanel.add(new SearchKeywordRow(hcbSearchString)
                 .addTitle(tr("basics"))
                 .addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key"))
                 .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());
         hintPanel.add(new SearchKeywordRow(hcbSearchString)
@@ -491,11 +492,13 @@
                 .addKeyword("\"key\"=\"value\"", "\"\"=\"\"",
                         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("\"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)"))
                 .addKeyword("-<i>expr</i>", null, tr("logical not"))
@@ -519,11 +522,11 @@
                     GBC.eol().anchor(GBC.CENTER));
             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"),
                 GBC.eol());