Merge commit
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 2 Feb 2015 15:49:53 +0000 (15:49 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 2 Feb 2015 15:49:53 +0000 (15:49 +0000)
1  2 
resources/lang/Messages.properties
src/jalview/analysis/Finder.java
src/jalview/appletgui/Finder.java
src/jalview/gui/Finder.java

@@@ -1178,16 -1176,4 +1178,17 @@@ label.show_logo = Show Log
  label.normalise_logo = Normalise Logo
  label.no_colour_selection_in_scheme = Please, make a colour selection before to apply colour scheme
  label.no_colour_selection_warn = Error saving colour scheme
 +label.select_by_annotation = Select By Annotation
 +action.select_by_annotation = Select by Annotation...
 +label.threshold_filter =  Threshold Filter
 +action.hide = Hide
 +action.select = Select
 +label.alpha_helix = Alpha Helix
 +label.beta_strand = Beta Strand
 +label.turn = Turn
 +label.select_all = Select All
 +label.structures_filter = Structures Filter
 +label.search_filter = Search Filter
 +label.display_name = Display Label
 +label.description = Description
+ label.include_description= Include Description
Simple merge
Simple merge
Simple merge