From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 12 May 2017 14:09:45 +0000 (+0100)
Subject: Merge branch 'features/JAL-2388OverviewWindow' into develop
X-Git-Tag: Release_2_10_2~3^2~92
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e54e2eee927260cd650ffe17b1422b29b8b2f122;p=jalview.git

Merge branch 'features/JAL-2388OverviewWindow' into develop
---

e54e2eee927260cd650ffe17b1422b29b8b2f122
diff --cc help/helpTOC.xml
index 6e7f5ac,989d70b..f76da16
--- a/help/helpTOC.xml
+++ b/help/helpTOC.xml
@@@ -24,7 -24,7 +24,8 @@@
  	<tocitem text="Jalview Documentation" target="home" expand="true">
  			<tocitem text="What's new" target="new" expand="true">
  				<tocitem text="Latest Release Notes" target="release"/>
 +				<tocitem text="Groovy Features Counter example" target="groovy.featurescounter"/>
+ 				<tocitem text="Omit hidden regions in Overview" target="overview"/>
  		</tocitem>
  		
  		<tocitem text="Editing Alignments" target="edit" />
diff --cc resources/lang/Messages_es.properties
index 28c0eaa,5932698..563684b
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@@ -1300,9 -1301,4 +1300,10 @@@ 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.togglehidden = Show hidden regions
 +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