Index: src/org/openstreetmap/josm/gui/dialogs/SearchDialog.java
=================
--- C:/Users/hb/Desktop/SearchDialog.java	
+++ C:/Users/hb/Desktop/17526SearchDialog-ver3-part-labels.java	
@@ -75,7 +75,7 @@
     public SearchDialog(SearchSetting initialValues, List<String> searchExpressionHistory, boolean expertMode) {
         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);
         setButtonIcons("dialogs/search", "cancel");
@@ -98,7 +98,7 @@
         hcbSearchString.setPreferredSize(new Dimension(40, hcbSearchString.getPreferredSize().height));
         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);
         inSelection = new JRadioButton(tr("find in selection"), searchSettings.mode == SearchMode.in_selection);
@@ -121,14 +121,14 @@
         bg2.add(mapCSSSearch);
 
         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());
         selectionSettings.add(remove, GBC.eol());
         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());
@@ -266,7 +266,7 @@
 
     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)
                 .addTitle(tr("basics"))