Merge branch 'task/JAL-3991_check_actual_JAVA_VERSION_against_build_properties_in_app...

diff --cc build.gradle
Simple merge

diff --cc resources/lang/Messages.properties
Simple merge

diff --cc resources/lang/Messages_es.properties
Simple merge

diff --cc src/jalview/bin/Cache.java
Simple merge

diff --cc src/jalview/bin/Jalview.java
index fd1783a,9574e7e..d1056bf
--- 1/src/jalview/bin/Jalview.java
--- 2/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@@ -45,7 -44,7 +45,8 @@@ import java.util.logging.ConsoleHandler
  import java.util.logging.Level;
  import java.util.logging.Logger;
  
+ import javax.swing.JOptionPane;
 +import javax.swing.SwingUtilities;
  import javax.swing.UIManager;
  import javax.swing.UIManager.LookAndFeelInfo;
  

diff --cc src/jalview/gui/Desktop.java
Simple merge