X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=1c8cc2a6e29d520d0034e3310eb33abbd09ec90e;hb=0a37e3b824b46b026916e124b42400590242d145;hp=664dc4c41bee9bc0aa5f4c923c30ae11c29014b7;hpb=b74e75812b411ed8838f2c57d84fa1b328bbefe5;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 664dc4c..1c8cc2a 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -132,6 +132,8 @@ tooltip.select_highlighted_columns = Press B to mark highlighted columns, Ctrl-(
 action.deselect_all = Deselect all
 action.invert_selection = Invert selection
 action.using_jmol = Using Jmol
+action.undo_changes_to_feature_settings = Undo all unapplied changes to feature settings
+action.undo_changes_to_feature_settings_and_close_the_dialog = Undo all pending changes and close the feature settings dialog
 action.link = Link
 action.group_link = Group Link
 action.show_chain = Show Chain
@@ -228,6 +230,7 @@ label.nucleotide = Nucleotide
 label.protein = Protein
 label.nucleotides = Nucleotides
 label.proteins = Proteins
+label.CDS = CDS
 label.to_new_alignment = To New Alignment
 label.to_this_alignment = Add To This Alignment
 label.apply_colour_to_all_groups = Apply Colour To All Groups
@@ -765,6 +768,9 @@ label.generating_features_for_params = Generating features for - {0}
 label.generating_annotations_for_params = Generating annotations for - {0}
 label.varna_params = VARNA - {0}
 label.sequence_feature_settings = Sequence Feature Settings
+label.sequence_feature_settings_for = Sequence Feature Settings for {0}
+label.sequence_feature_settings_for_view = Sequence Feature Settings for view "{0}"
+label.sequence_feature_settings_for_CDS_and_Protein = Sequence Feature Settings for CDS and Protein
 label.pairwise_aligned_sequences = Pairwise Aligned Sequences
 label.original_data_for_params = Original Data for {0}
 label.points_for_params = Points for {0}
@@ -998,7 +1004,8 @@ label.toggled = Toggled
 label.marked = Marked
 label.containing = containing
 label.not_containing = not containing
-label.no_feature_of_type_found = No features of type {0} found.
+label.no_feature_of_type_found = No features of type {0} found
+label.no_feature_found_selection = No features of type {0} found in selection
 label.submission_params = Submission {0}
 label.empty_alignment_job = Empty Alignment Job
 label.add_new_sbrs_service = Add a new Simple Bioinformatics Rest Service
@@ -1064,7 +1071,6 @@ exception.unable_to_create_internet_config = Unable to create an Internet Config
 exception.invocation_target_calling_url = InvocationTargetException while calling openURL: {0}
 exception.illegal_access_calling_url = IllegalAccessException while calling openURL: {0}
 exception.interrupted_launching_browser = InterruptedException while launching browser: {0}
-exception.ebiembl_retrieval_failed_on = EBI EMBL XML retrieval failed on {0}:{1}
 exception.no_pdb_records_for_chain = No PDB Records for {0} chain {1}
 exception.unexpected_handling_rnaml_translation_for_pdb = Unexpected exception when handling RNAML translation of PDB data
 exception.couldnt_recover_sequence_properties_for_alignment = Couldn't recover sequence properties for alignment
@@ -1225,9 +1231,6 @@ 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.fts_rest_service_no_longer_available = {0} rest services no longer available!
-exception.resource_not_be_found = The requested resource could not be found
-exception.fts_server_error = There seems to be an error from the {0} server
 exception.fts_server_unreachable = Jalview is unable to reach the {0} server. \nPlease ensure that you are connected to the internet and try again.
 label.nw_mapping = Needleman & Wunsch Alignment
 label.sifts_mapping = SIFTs Mapping
@@ -1244,8 +1247,6 @@ action.next_page= >>
 action.prev_page= << 
 label.next_page_tooltip=Next Page
 label.prev_page_tooltip=Previous Page
-exception.bad_request=Bad request. There is a problem with your input.
-exception.service_not_available=Service not available. The server is being updated, try again later.
 status.launching_3d_structure_viewer = Launching 3D Structure viewer...
 status.fetching_3d_structures_for_selected_entries = Fetching 3D Structures for selected entries...
 status.fetching_dbrefs_for_sequences_without_valid_refs = Fetching db refs for {0} sequence(s) without valid db ref required for SIFTS mapping
@@ -1313,6 +1314,7 @@ label.numeric_required = The value should be numeric
 label.filter = Filter
 label.filters = Filters
 label.join_conditions = Join conditions with
+label.delete_condition = Delete this condition
 label.score = Score
 label.colour_by_label = Colour by label
 label.variable_colour = Variable colour...
@@ -1352,12 +1354,13 @@ label.append_to_filename = Append to filename (%n is replaced by the backup numb
 label.append_to_filename_tooltip = %n in the text will be replaced by the backup number. The text will appear after the filename. See the summary box above.
 label.index_digits = Number of digits to use for the backup number (%n)
 label.summary_of_backups_scheme = Summary of backup scheme
+label.scheme_examples = Scheme examples
 label.increment_index = Increase appended text numbers - newest file has largest number.
 label.reverse_roll = "Roll" appended text numbers - newest backup file is always number 1.
 label.keep_files = Deleting old backup files
 label.keep_all_backup_files = Do not delete old backup files
 label.keep_only_this_number_of_backup_files = Keep only this number of most recent backup files
-label.autodelete_old_backup_files = Autodelete old backup files:
+label.autodelete_old_backup_files = Auto-delete old backup files:
 label.always_ask = Always ask
 label.auto_delete = Automatically delete
 label.filename = filename
@@ -1367,10 +1370,18 @@ label.configuration = Configuration
 label.configure_feature_tooltip = Click to configure variable colour or filters
 label.schemes = Schemes
 label.customise = Customise
+label.custom = Custom
 label.default = Default
 label.single_file = Single backup
 label.keep_all_versions = Keep all versions
 label.rolled_backups = Rolled backup files
+label.customise_description = Select Customise, make changes, and click on OK to save your own custom scheme
+label.custom_description = Your own saved scheme
+label.default_description = Keep the last three versions of the file
+label.single_file_description = Keep the last version of the file
+label.keep_all_versions_description = Keep all previous versions of the file
+label.rolled_backups_description = Keep the last nine versions of the file from _bak.1 (newest) to _bak.9 (oldest)
+label.cancel_changes_description = Cancel changes made to your last saved Custom scheme
 label.previously_saved_scheme = Previously saved scheme
 label.no_backup_files = NO BACKUP FILES
 label.include_backup_files = Include backup files
@@ -1394,3 +1405,9 @@ label.pca = PCA
 label.create_image_of = Create {0} image of {1}
 label.click_to_edit = Click to edit, right-click for menu
 label.by_annotation_tooltip = Annotation Colour is configured from the main Colour menu
+label.show_linked_features = Show {0} features
+label.on_top = on top
+label.include_linked_features = Include {0} features
+label.include_linked_tooltip = Include visible {0} features<br>converted to local sequence coordinates
+label.features_not_shown = {0} feature(s) not shown
+label.no_features_to_sort_by = No features to sort by