From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 2 Feb 2015 15:49:53 +0000 (+0000)
Subject: Merge commit
X-Git-Tag: Jalview_2_9~100
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b28bddf12e2791a019fba9c233d46407deb65976;p=jalview.git

Merge commit
---

b28bddf12e2791a019fba9c233d46407deb65976
diff --cc resources/lang/Messages.properties
index cfec3c9,12de0df..2e37e06
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -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