merge from develop

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

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 822d574..a4f6497 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -772,7 +772,7 @@ label.transformed_points_for_params = Transformed points for {0}
 label.graduated_color_for_params = Graduated Feature Colour for {0}
 label.select_backgroud_colour = Select Background Colour
 label.invalid_font = Invalid Font
-label.separate_multiple_accession_ids = Enter one or more accession IDs
+label.separate_multiple_accession_ids = Enter one or more PDB accession IDs separated by a semi-colon ";"
 label.separate_multiple_query_values = Enter one or more {0}s separated by a semi-colon ";"
 label.search_all = Enter one or more search values separated by a semi-colon ";" (Note: This Searches the entire PDB database)
 label.replace_commas_semicolons = Replace commas with semi-colons
@@ -1166,6 +1166,8 @@ label.couldnt_create_sequence_fetcher = Couldn't create SequenceFetcher
 warn.couldnt_create_sequence_fetcher_client = Could not create the sequence fetcher client. Check error logs for details.
 warn.server_didnt_pass_validation = Service did not pass validation.\nCheck the Jalview Console for more details.
 warn.url_must_contain = Sequence URL must contain $SEQUENCE_ID$ or a regex $SEQUENCE_ID=/<regex>/=$
+warn.urls_not_contacted = URLs that could not be contacted
+warn.urls_no_jaba = URLs without any JABA Services
 info.validate_jabaws_server = Validate JabaWS Server ?\n(Look in console output for results)
 label.test_server = Test Server?
 info.you_want_jalview_to_find_uniprot_accessions = Do you want Jalview to find\nUniprot Accession ids for given sequence names?
@@ -1246,7 +1248,22 @@ info.enter_search_text_to_enable = Enter Search Text to Enable
 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.couldnt_read_data = Couldn't read data
+label.embbed_biojson = Embed BioJSON to HTML export
+action.export_groups = Export Groups
+action.export_annotations = Export Annotations
+action.export_hidden_columns = Export Hidden Columns
+action.export_hidden_sequences = Export Hidden Sequences
+action.export_features = Export Features
+label.export_settings = Export Settings
+label.save_as_biojs_html = Save as BioJs HTML
+label.pdb_web-service_error = PDB Web-service Error
+label.structure_chooser_manual_association = Structure Chooser - Manual association
+label.structure_chooser_filter_time = Structure Chooser - Filter time ({0})
+label.structure_chooser_no_of_structures = Structure Chooser - {0} Found ({1})
+info.no_pdb_entry_found_for = No PDB entry found for {0}
+exception.unable_to_detect_internet_connection = Jalview is unable to detect an internet connection
+exception.pdb_rest_service_no_longer_available = PDB rest services no longer available!
+exception.resource_not_be_found = The requested resource could not be found
+exception.pdb_server_error = There seems to be an error from the PDB server
+exception.pdb_server_unreachable = Jalview is unable to reach the PDBe Solr server. \nPlease ensure that you are connected to the internet and try again.