Merge branch 'feature/JAL-1244stretchStatusMsg' into merge/JAL-1244

Conflicts:
	src/jalview/commands/EditCommand.java

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

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

diff --cc src/jalview/commands/EditCommand.java
index f80bd4a,81076e5..b9d32f7
--- 1/src/jalview/commands/EditCommand.java
--- 2/src/jalview/commands/EditCommand.java
+++ b/src/jalview/commands/EditCommand.java
@@@ -1476,14 -1333,18 +1476,20 @@@ public class EditCommand implements Com
  
      SequenceI[] seqs;
  
 -    int[] alIndex;
 +    private int[] alIndex;
  
 -    int position, number;
 +    private int position;
  
 -    char gapChar;
 +    private int number;
 +
 +    private char gapChar;
  
+     /*
+      * flag that identifies edits inserted to balance 
+      * user edits in a 'locked editing' region
+      */
+     private boolean systemGenerated;
+ 
      public Edit(Action cmd, SequenceI[] sqs, int pos, int count,
              char gap)
      {

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