From: kiramt Date: Fri, 5 May 2017 11:05:50 +0000 (+0100) Subject: Merge remote-tracking branch X-Git-Tag: Release_2_10_2~3^2~92^2~3 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4d890895e6aabfc36d45d3b53781ee2cf5cfafdc;p=jalview.git Merge remote-tracking branch 'origin/features/JAL-2388hiddencolumnschanges' into features/JAL-2388OverviewWindow Conflicts: resources/lang/Messages.properties --- 4d890895e6aabfc36d45d3b53781ee2cf5cfafdc diff --cc resources/lang/Messages.properties index 6b6577f,e63752d..91295e8 --- a/resources/lang/Messages.properties +++ b/resources/lang/Messages.properties @@@ -1297,4 -1302,9 +1302,10 @@@ 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.togglehidden = Toggle hidden regions on/off ++label.togglehidden = Toggle hidden regions on/off + 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