From: tcofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 25 Apr 2016 15:14:17 +0000 (+0100)
Subject: develop merge
X-Git-Tag: Release_2_10_0~256
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=99d5f1d805e530f23a53dad4484d44ecd0fbfdf3;p=jalview.git

develop merge
---

99d5f1d805e530f23a53dad4484d44ecd0fbfdf3
diff --cc resources/lang/Messages.properties
index d1bd66a,bc6def9..3c79b58
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1292,4 -1292,6 +1292,7 @@@ status.cancelled_image_export_operatio
  info.error_creating_file = Error creating {0} file.
  exception.outofmemory_loading_mmcif_file = Out of memory loading mmCIF File
  info.error_creating_file = Error creating {0} file.
+ label.run_groovy = Run Groovy console script
+ label.run_groovy_tip = Run the script in the Groovy console over this alignment
+ label.couldnt_run_groovy_script = Failed to run Groovy script
 +label.uniprot_sequence_fetcher = UniProt Sequence Fetcher