Merge branch 'develop' into bug/JAL-2510amendFeatures

Conflicts:
	resources/lang/Messages.properties
	resources/lang/Messages_es.properties

diff --cc resources/lang/Messages.properties
index 198430e,f6eeb26..ab18a2e
--- 1/resources/lang/Messages.properties
--- 2/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1307,5 -1307,4 +1307,5 @@@ label.conservation_descr = Conservatio
  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
- label.warning_hidden = Warning: {0} {1} is currently hidden
++label.warning_hidden = Warning: {0} {1} is currently hidden

diff --cc resources/lang/Messages_es.properties
index 96a775d,ad4d2c4..cee099d
--- 1/resources/lang/Messages_es.properties
--- 2/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@@ -1301,4 -1301,10 +1301,11 @@@ warn.name_cannot_be_duplicate = Los nom
  label.invalid_name = Nombre inválido !
  label.output_seq_details = Seleccionar Detalles de la secuencia para ver todas
  label.urllinks = Enlaces
- label.warning_hidden = Advertencia: {0} {1} está actualmente oculto
+ label.quality_descr = Calidad de alineamiento basándose en puntuación Blosum62
+ label.conservation_descr = Conservación del alineamiento total menos de {0}% huecos
+ label.consensus_descr = % Identidad
+ label.complement_consensus_descr = % Identidad para cDNA
+ label.strucconsensus_descr = % Identidad para pares de bases
+ label.occupancy_descr = Número de posiciones alineadas
+ label.togglehidden = Show hidden regions
++label.warning_hidden = Advertencia: {0} {1} está actualmente oculto