From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Tue, 21 Jul 2015 17:02:03 +0000 (+0100)
Subject: Merge
X-Git-Tag: Release_2_10_0~569
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ade5fbce086cd251d46bfabcaa997a837221e4a4;p=jalview.git

Merge
---

ade5fbce086cd251d46bfabcaa997a837221e4a4
diff --cc resources/lang/Messages.properties
index b4c2d04,f9fa0e2..822d574
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1245,7 -1246,3 +1246,7 @@@ info.enter_search_text_to_enable = Ente
  info.search_in_annotation_label = Search in {0} Label
  info.search_in_annotation_description = Search in {0} Description
  info.change_threshold_mode_to_enable = Change Threshold Mode to Enable
 +label.null_or_unidentifiable_data = Null or unidentifiable data content pasted!
 +label.unidentifiable_data = Unidentifiable Data
 +label.null_or_invalid_alignment = Null or invalid alignment data!
- label.unable_to_create_alignment = Unable to create alignment
++label.unable_to_create_alignment = Unable to create alignment