fix Replace & Find typo (#3247)

app/src/processing/app/FindReplace.java

@@ -108,11 +108,12 @@ public class FindReplace extends JFrame {
     layout.setAutoCreateGaps(true);
     layout.setAutoCreateContainerGaps(true);
 
-    Group buttonsHorizontalGroup = layout.createSequentialGroup(); // To hold the buttons in the specified order depending on the OS
+    // To hold the buttons in the specified order depending on the OS
+    Group buttonsHorizontalGroup = layout.createSequentialGroup();
 
     replaceAllButton = new JButton(Language.text("find.btn.replace_all"));
     replaceButton = new JButton(Language.text("find.btn.replace"));
-    replaceAndFindButton = new JButton(Language.text("find.btn.find_and_replace"));
+    replaceAndFindButton = new JButton(Language.text("find.btn.replace_and_find"));
     previousButton = new JButton(Language.text("find.btn.previous"));
     findButton = new JButton(Language.text("find.btn.find"));
 
@@ -144,7 +145,7 @@ public class FindReplace extends JFrame {
         .createSequentialGroup()
         .addGap(BORDER)
         .addGroup(layout.createParallelGroup()
-            .addGroup(GroupLayout.Alignment.TRAILING, // TRAILING makes everything right alinged 
+            .addGroup(GroupLayout.Alignment.TRAILING, // TRAILING makes everything right alinged
                 layout.createSequentialGroup()
                     .addGap(replaceLabel.getPreferredSize().width
                         - findLabel.getPreferredSize().width)
@@ -166,7 +167,7 @@ public class FindReplace extends JFrame {
     );
 
 //    layout.linkSize(SwingConstants.HORIZONTAL, findButton, replaceButton, replaceAllButton, replaceAndFindButton, previousButton);
-    
+
     layout.setVerticalGroup(layout.createSequentialGroup()
       .addGap(BORDER)
       .addGroup(layout.createParallelGroup(GroupLayout.Alignment.CENTER)
@@ -180,7 +181,7 @@ public class FindReplace extends JFrame {
           .addComponent(allTabsBox)
           .addComponent(wrapAroundBox))
           .addGroup(buttonsVerticalGroup)
-      .addGap(BORDER) 
+      .addGap(BORDER)
       );
 
     setLocationRelativeTo(null); // center

build/shared/lib/languages/PDE.properties

@@ -222,7 +222,7 @@ find.all_tabs = All Tabs
 find.wrap_around = Wrap Around
 find.btn.replace_all = Replace All
 find.btn.replace = Replace
-find.btn.find_and_replace = Find & Replace
+find.btn.replace_and_find = Replace & Find
 find.btn.previous = Previous
 find.btn.find = Find
 

todo.txt

@@ -4,6 +4,11 @@ X   https://github.com/processing/processing/issues/3224
 X   also update the Windows and Linux versions
 X replace ColorSelector with JComponent version
 X   https://github.com/processing/processing/issues/3209
+X sketchbook window is completely empty w/ no sketches
+X   requires restart of p5 before it updates
+X   https://github.com/processing/processing/issues/3214
+X Replace & Find was reading "Find & Replace" 
+X   https://github.com/processing/processing/issues/3247
 
 debugger/pdex
 X Change "method" to "function" in a few error messages
@@ -174,9 +179,6 @@ _   makes saving *really* slow with a lot of libraries
 _ need to handle the 2.x to 3.x sketchbook transition
 _   prefs are the same file, but sketchbook location pref is different
 _ New/Rename/Save As is reloading the whole sketchbook, argh
-_ sketchbook window is completely empty w/ no sketches
-_   requires restart of p5 before it updates
-_   https://github.com/processing/processing/issues/3214
 _ sketchbook window doesn't update when sketches are added, renamed, etc
 _   https://github.com/processing/processing/issues/2944
 _ possible PR for updating sketchbook stuff