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

diff --cc resources/lang/Messages.properties
index 07a3ce8,e63752d..4819c29
--- 1/resources/lang/Messages.properties
--- 2/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1298,3 -1302,9 +1303,9 @@@ warn.name_cannot_be_duplicate = User-de
  label.invalid_name = Invalid Name !
  label.output_seq_details = Output Sequence Details to list all database references
  label.urllinks = Links
+ label.quality_descr = Alignment Quality based on Blosum62 scores
+ label.conservation_descr = Conservation of total alignment less than {0}% gaps
+ label.consensus_descr = PID
+ label.complement_consensus_descr = PID for cDNA
+ label.strucconsensus_descr = PID for base pairs
 -label.occupancy_descr = Number of aligned positions 
++label.occupancy_descr = Number of aligned positions 

diff --cc resources/lang/Messages_es.properties
index 9d7c2e4,6ddbb44..9df72b2
--- 1/resources/lang/Messages_es.properties
--- 2/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@@ -1180,8 -1187,14 +1189,13 @@@ label.hide_insertions=Ocultar Insercion
  info.change_threshold_mode_to_enable=Cambiar Modo de Umbral para Habilitar
  label.separate_multiple_query_values=Introducir uno o mas {0}s separados por punto y coma ";"
  label.let_chimera_manage_structure_colours=Deja que Chimera maneje colores de estructuras
+ label.fetch_chimera_attributes = Buscar atributos desde Chimera
+ label.fetch_chimera_attributes_tip = Copiar atributo de Chimera a característica de Jalview
  label.view_rna_structure=Estructura 2D VARNA
 -label.scale_protein_to_cdna_tip=Hacer a los residuos de proteínas de la misma anchura que los codones en ventanas divididas
  label.colour_with_chimera=Colorear con Chimera
+ label.superpose_structures = Superponer estructuras
+ error.superposition_failed = Superposición fallido: {0}
+ label.insufficient_residues = Residuos alineados ({0}) insuficentes para superponer
  label.show_pdbstruct_dialog=Datos de Estructura 3D...
  label.hide_all=Ocultar todos
  label.invert=Invertir

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

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

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

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

diff --cc src/jalview/jbgui/GAlignFrame.java
Simple merge

diff --cc src/jalview/viewmodel/AlignmentViewport.java
Simple merge