Merge branch 'kjvdh/features/PhylogenyViewer_tabbedsupport' into merge/2_11_2/kjvdh...

[jalview.git] / resources / lang / Messages.properties

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 9ce5a63..291052a 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -302,7 +302,7 @@ label.show_distances = Show distances
 label.mark_unassociated_leaves = Mark Unassociated Leaves
 label.fit_to_window = Fit To Window
 label.newick_format = Newick Format
-label.select_newick_like_tree_file = Select a newick-like tree file
+label.select_tree_file = Select a tree file
 label.colours = Colours
 label.view_mapping = View Mapping
 label.wireframe = Wireframe
@@ -387,6 +387,9 @@ label.selected_region_to_tree_may_only_contain_residues_or_gaps =  The selected
 label.sequences_selection_not_aligned = Sequences in selection are not aligned
 label.problem_reading_tree_file =  Problem reading tree file
 label.possible_problem_with_tree_file = Possible problem with tree file
+label.tree_url_example = Please enter a complete URL, for example \"http://www.jalview.org/examples/ferredoxin.nw\"
+label.from_database = From Database...
+label.load_tree_url = Tree from URL
 label.select_at_least_three_bases_in_at_least_one_sequence_to_cDNA_translation = Please select at least three bases in at least one sequence in order to perform a cDNA translation.
 label.translation_failed = Translation Failed
 label.error_when_translating_sequences_submit_bug_report = Unfortunately, something went wrong when translating your sequences.\nPlease take a look in the Jalview java console\nand submit a bug report including the stacktrace.
@@ -557,7 +560,7 @@ label.select_copy_raw_html = Select this if you want to copy raw html
 label.from_url = from URL
 label.any_trees_calculated_or_loaded_alignment_automatically_sort = When selected, any trees calculated or loaded onto the alignment will automatically sort the alignment
 label.sort_with_new_tree = Sort With New Tree
-label.from_textbox = from Textbox
+label.from_textbox = From Textbox
 label.window = Window
 label.preferences = Preferences
 label.tools = Tools
@@ -1047,6 +1050,7 @@ exception.couldnt_parse_sequence_line = Could not parse sequence line: {0}
 exception.unknown_annotation_detected = Unknown annotation detected: {0} {1}
 exception.couldnt_store_sequence_mappings = Couldn''t store sequence mappings for {0}
 exception.matrix_too_many_iteration = Too many iterations in {0} (max is {1})
+exception.invalid_matrix_identifier = Sequence identifier {0} not found in distance matrix.
 exception.browser_not_found = Exception in finding browser: {0}
 exception.browser_unable_to_launch = Unable to launch browser: {0}
 exception.browser_unable_to_locate = Unable to locate browser: {0}