From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 17 May 2017 15:10:15 +0000 (+0100)
Subject: Merge branch 'bug/JAL-2510amendFeatures' into develop
X-Git-Tag: Release_2_10_2~3^2~79^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2d6ef1a754ac1c0d95778fccb9c319fcdb1f9dd9;p=jalview.git

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

2d6ef1a754ac1c0d95778fccb9c319fcdb1f9dd9
diff --cc resources/lang/Messages.properties
index b12891f,ab18a2e..a24e768
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1307,6 -1307,5 +1307,7 @@@ 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.show_experimental = Enable experimental features
 +label.show_experimental_tip = Enable any new and currently 'experimental' features (see Latest Release Notes for details)
+ label.warning_hidden = Warning: {0} {1} is currently hidden