From: Jim Procter <j.procter@dundee.ac.uk>
Date: Mon, 8 Aug 2022 15:46:04 +0000 (+0100)
Subject: Merge branch 'patch/JAL-4036_uniprot_fts_legacy_endpoint' into develop
X-Git-Tag: Release_2_11_2_6~32
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=4469e6d2c6a0c05c6278b10b0a157522aaa98091;hp=-c

Merge branch 'patch/JAL-4036_uniprot_fts_legacy_endpoint' into develop
---

4469e6d2c6a0c05c6278b10b0a157522aaa98091
diff --combined resources/lang/Messages.properties
index dda5624,b0b7b09..ed3e06b
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -514,11 -514,11 +514,11 @@@ label.retrieve_parse_sequence_database_
  label.standard_databases = Standard Databases
  label.fetch_embl_uniprot = Fetch from EMBL/EMBLCDS or Uniprot/PDB and any selected DAS sources
  label.fetch_uniprot_references = Fetch Uniprot references
 -label.search_3dbeacons = 3D-Beacons Search
 +label.search_3dbeacons = Search 3D-Beacons
  label.find_models_from_3dbeacons = Search 3D-Beacons for 3D structures and models
  label.3dbeacons = 3D-Beacons
  label.fetch_references_for = Fetch database references for {0} sequences ?
 -label.fetch_references_for_3dbeacons = 3D Beacons needs Uniprot References. Fetch database references for {0} sequences ?
 +label.fetch_references_for_3dbeacons = 3D Beacons needs to fetch Uniprot References for {0} sequences.  Do you want to continue ?
  label.reset_min_max_colours_to_defaults = Reset min and max colours to defaults from user preferences.
  label.align_structures_using_linked_alignment_views = Superpose structures using {0} selected alignment view(s)
  label.threshold_feature_display_by_score = Threshold the feature display by score.
@@@ -778,8 -778,10 +778,10 @@@ label.transformed_points_for_params = T
  label.variable_color_for = Variable Feature Colour for {0}
  label.select_background_colour = Select Background Colour
  label.invalid_font = Invalid Font
+ label.search_db_all = Search all of {0}
+ label.search_db_index = Search {0} index {1}
  label.separate_multiple_accession_ids = Enter one or more accession IDs separated by a semi-colon ";"
- label.separate_multiple_query_values = Enter one or more {0}s separated by a semi-colon ";"
+ label.separate_multiple_query_values = Enter one or more {0} separated by a semi-colon ";"
  label.search_all = Enter one or more search values separated by a semi-colon ";" (Note: This searches the entire database)
  label.replace_commas_semicolons = Replace commas with semi-colons
  label.parsing_failed_syntax_errors_shown_below_param = Parsing failed. Syntax errors shown below {0}