Merge branch 'develop' into features/JAL-2435splitScreenFont

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

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

diff --cc src/jalview/api/AlignViewportI.java
index 2401593,8b07340..0239762
--- 1/src/jalview/api/AlignViewportI.java
--- 2/src/jalview/api/AlignViewportI.java
+++ b/src/jalview/api/AlignViewportI.java
@@@ -33,9 -33,9 +33,10 @@@ import jalview.datamodel.SequenceGroup
  import jalview.datamodel.SequenceI;
  import jalview.renderer.ResidueShaderI;
  import jalview.schemes.ColourSchemeI;
+ import jalview.viewmodel.ViewportRanges;
  
  import java.awt.Color;
 +import java.awt.Font;
  import java.util.Hashtable;
  import java.util.List;
  import java.util.Map;

diff --cc src/jalview/appletgui/AlignViewport.java
index b7dc5c4,065c503..cb0b197
--- 1/src/jalview/appletgui/AlignViewport.java
--- 2/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@@ -40,12 -39,12 +39,13 @@@ import jalview.structure.SelectionSourc
  import jalview.structure.StructureSelectionManager;
  import jalview.structure.VamsasSource;
  import jalview.viewmodel.AlignmentViewport;
+ import jalview.viewmodel.ViewportRanges;
  
  import java.awt.Font;
 +import java.awt.FontMetrics;
  
  public class AlignViewport extends AlignmentViewport implements
-         SelectionSource, VamsasSource, CommandListener
+         SelectionSource
  {
    boolean cursorMode = false;
  

diff --cc src/jalview/appletgui/SeqPanel.java
Simple merge

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