Merge branch 'develop' into bug/JAL-1841rnaSecStr

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

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

diff --cc src/jalview/appletgui/AnnotationPanel.java
index ee8c9ca,e5475f8..6012c1a
--- 1/src/jalview/appletgui/AnnotationPanel.java
--- 2/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@@ -25,9 -25,9 +25,10 @@@ import jalview.datamodel.Annotation
  import jalview.datamodel.SequenceI;
  import jalview.renderer.AnnotationRenderer;
  import jalview.renderer.AwtRenderPanelI;
+ import jalview.schemes.ResidueProperties;
  import jalview.util.Comparison;
  import jalview.util.MessageManager;
 +import jalview.util.Platform;
  
  import java.awt.Color;
  import java.awt.Dimension;

diff --cc src/jalview/gui/AnnotationPanel.java
index 61a3f8c,3c9a13e..6a621ff
--- 1/src/jalview/gui/AnnotationPanel.java
--- 2/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@@ -287,15 -290,17 +290,18 @@@ public class AnnotationPanel extends JP
        aa[activeRow].annotations = anot;
      }
  
 -    if (evt.getActionCommand().equals(REMOVE))
 +    String action = evt.getActionCommand();
 +    if (action.equals(REMOVE))
      {
-       for (int sel : av.getColumnSelection().getSelected())
+       for (int index : av.getColumnSelection().getSelected())
        {
-         anot[sel] = null;
+         if (av.getColumnSelection().isVisible(index))
+         {
+           anot[index] = null;
+         }
        }
      }
 -    else if (evt.getActionCommand().equals(LABEL))
 +    else if (action.equals(LABEL))
      {
        String exMesg = collectAnnotVals(anot, LABEL);
        String label = JOptionPane.showInputDialog(this,