X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=a400afe88b7350df569714ea2f1d5842265fa581;hb=e0f2d3774e2392feed462fa1707d0fb10602a1e1;hp=8436a0739d6e9b6c331c2ab5f8facd87d383bef5;hpb=cc52d6f3b8199cb3e9eab962feeab735c5bdc310;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 8436a07..a400afe 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -119,10 +119,8 @@ action.select = Select
 action.new_view = New View
 action.close = Close
 action.add = Add
-action.save_as_default = Save as default
 action.save_as = Save as...
 action.save = Save
-action.cancel_fetch = Cancel Fetch
 action.change_font = Change Font
 action.change_font_tree_panel = Change Font (Tree Panel)
 action.colour = Colour
@@ -141,7 +139,6 @@ action.fetch_db_references = Fetch DB References
 action.view_flanking_regions = Show flanking regions
 label.view_flanking_regions = Show sequence data either side of the subsequences involved in this alignment
 label.structures_manager = Structures Manager
-label.nickname = Nickname:
 label.url = URL
 label.url\: = URL:
 label.input_file_url = Enter URL or Input File
@@ -163,7 +160,6 @@ label.current_parameter_set_name = Current parameter set name:
 label.service_action = Service Action:
 label.post_url = POST URL:
 label.url_suffix = URL Suffix
-label.sequence_source = Sequence Source
 label.per_seq = per Sequence
 label.result_vertically_separable = Results are vertically separable
 label.amend = Amend
@@ -188,21 +184,22 @@ label.out_to_textbox = Output to Textbox
 label.occupancy = Occupancy
 # delete Clustal - use FileFormat name instead
 label.clustal = Clustal
-# label.colourScheme_<schemeName> as in JalviewColourScheme
+# label.colourScheme_<schemeName> as in JalviewColourScheme, spaces removed
 label.colourScheme_clustal = Clustalx
 label.colourScheme_blosum62 = BLOSUM62 Score
-label.colourScheme_%_identity = Percentage Identity
+label.colourScheme_%identity = Percentage Identity
 label.colourScheme_zappo = Zappo
 label.colourScheme_taylor = Taylor
 label.colourScheme_hydrophobic = Hydrophobicity
-label.colourScheme_helix_propensity = Helix Propensity
-label.colourScheme_strand_propensity = Strand Propensity
-label.colourScheme_turn_propensity = Turn Propensity
-label.colourScheme_buried_index = Buried Index
+label.colourScheme_helixpropensity = Helix Propensity
+label.colourScheme_strandpropensity = Strand Propensity
+label.colourScheme_turnpropensity = Turn Propensity
+label.colourScheme_buriedindex = Buried Index
 label.colourScheme_purine/pyrimidine = Purine/Pyrimidine
 label.colourScheme_nucleotide = Nucleotide
-label.colourScheme_t-coffee_scores = T-Coffee Scores
-label.colourScheme_rna_helices = By RNA Helices
+label.colourScheme_t-coffeescores = T-Coffee Scores
+label.colourScheme_rnahelices = By RNA Helices
+label.colourScheme_sequenceid = Sequence ID Colour
 label.blc = BLC
 label.fasta = Fasta
 label.msf = MSF
@@ -353,7 +350,6 @@ label.status = Status
 label.channels = Channels
 label.channel_title_item_count = {0} ({1})
 label.blog_item_published_on_date = {0} {1} 
-label.select_das_service_from_table = Select a DAS service from the table to read a full description here.</font></html>
 label.session_update = Session Update
 label.new_vamsas_session = New Vamsas Session
 action.load_vamsas_session = Load Vamsas Session...
@@ -371,7 +367,6 @@ label.load_colours = Load Colours
 label.save_colours = Save Colours
 label.load_colours_tooltip = Load feature colours and filters from file
 label.save_colours_tooltip = Save feature colours and filters to file
-label.fetch_das_features = Fetch DAS Features
 label.selected_database_to_fetch_from = Selected {0} database {1} to fetch from {2} 
 label.database_param = Database: {0}
 label.example = Example
@@ -409,9 +404,6 @@ label.couldnt_find_pdb_id_in_file = Couldn't find a PDB id in the file supplied.
 label.no_pdb_id_in_file = No PDB Id in File
 label.couldnt_read_pasted_text = Couldn't read the pasted text {0}
 label.error_parsing_text = Error parsing text
-label.enter_local_das_source = Enter Nickname & URL of Local DAS Source
-label.you_can_only_edit_or_remove_local_das_sources = You can only edit or remove local DAS Sources!
-label.public_das_source = Public DAS source - not editable
 label.input_alignment_from_url = Input Alignment From URL
 label.input_alignment = Input Alignment
 label.couldnt_import_as_vamsas_session = Couldn't import {0} as a new vamsas session.
@@ -428,8 +420,6 @@ label.invalid_url = Invalid URL !
 label.error_loading_file = Error loading file
 label.problems_opening_file = Encountered problems opening {0}!!
 label.file_open_error = File open error
-label.no_das_sources_selected_warn = No das sources were selected.\nPlease select some sources and\ntry again.
-label.no_das_sources_selected_title = No DAS Sources Selected
 label.colour_scheme_exists_overwrite = Colour scheme {0} exists.\nContinue saving colour scheme as {1}?"
 label.duplicate_scheme_name = Duplicate scheme name
 label.jalview_new_questionnaire = There is a new Questionnaire available. Would you like to complete it now ?\n
@@ -626,7 +616,6 @@ label.visual = Visual
 label.connections = Connections
 label.output = Output
 label.editing = Editing
-label.das_settings = DAS Settings
 label.web_services = Web Services
 label.right_click_to_edit_currently_selected_parameter = Right click to edit currently selected parameter.
 label.let_jmol_manage_structure_colours = Let Jmol manage structure colours
@@ -642,10 +631,6 @@ label.delete_service_url = Delete Service URL
 label.details = Details
 label.options = Options
 label.parameters = Parameters
-label.available_das_sources = Available DAS Sources
-label.full_details = Full Details
-label.authority = Authority
-label.type = Type
 label.proxy_server = Proxy Server
 label.file_output = File Output
 label.select_input_type = Select input type
@@ -714,9 +699,6 @@ label.sort_alignment_new_tree = Sort Alignment With New Tree
 label.add_sequences = Add Sequences
 label.new_window = New Window
 label.split_window = Split Window
-label.refresh_available_sources = Refresh Available Sources
-label.use_registry = Use Registry
-label.add_local_source = Add Local Source
 label.set_as_default = Set as Default
 label.show_labels = Show labels
 action.background_colour = Background Colour...
@@ -775,7 +757,7 @@ label.run_with_preset_params = Run {0} with preset
 label.view_and_change_parameters_before_running_calculation = View and change parameters before running calculation
 label.view_documentation = View documentation
 label.select_return_type = Select return type
-label.translation_of_params = Translation of {0}
+label.translation_of_params = Translation of {0} (Table {1})
 label.features_for_params = Features for - {0}
 label.annotations_for_params = Annotations for - {0}
 label.generating_features_for_params = Generating features for - {0}
@@ -857,7 +839,6 @@ label.multiharmony = Multi-Harmony
 label.unable_start_web_service_analysis = Unable to start web service analysis
 label.job_couldnt_be_started_check_input = The Job couldn't be started. Please check your input, and the Jalview console for any warning messages.
 label.prompt_each_time = Prompt each time
-label.use_source = Use Source
 label.couldnt_save_project = Couldn't save project
 label.error_whilst_saving_current_state_to = Error whilst saving current state to {0}
 label.error_whilst_loading_project_from = Error whilst loading project from {0}
@@ -1082,8 +1063,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.das_source_doesnt_support_sequence_command = Source {0} does not support the sequence command.
-exception.invalid_das_source = Invalid das source: {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
@@ -1138,10 +1117,6 @@ status.parsing_results = Parsing results.
 status.processing = Processing...
 status.refreshing_web_service_menus = Refreshing Web Service Menus
 status.collecting_job_results = Collecting job results.
-status.fetching_das_sequence_features = Fetching DAS Sequence Features
-status.no_das_sources_active = No DAS Sources Active
-status.das_feature_fetching_cancelled = DAS Feature Fetching Cancelled
-status.das_feature_fetching_complete = DAS Feature Fetching Complete
 status.fetching_db_refs = Fetching db refs
 status.loading_cached_pdb_entries = Loading Cached PDB Entries
 status.searching_for_pdb_structures = Searching for PDB Structures
@@ -1164,8 +1139,6 @@ 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?
-label.find_uniprot_accession_ids = Find Uniprot Accession Ids
 label.new_sequence_fetcher = New Sequence Fetcher
 label.additional_sequence_fetcher = Additional Sequence Fetcher
 label.select_database_retrieval_source = Select Database Retrieval Source
@@ -1301,7 +1274,6 @@ label.edit_sequence_url_link = Edit sequence URL link
 warn.name_cannot_be_duplicate = User-defined URL names must be unique and cannot be MIRIAM ids
 label.output_seq_details = Output Sequence Details to list all database references
 label.urllinks = Links
-label.default_cache_size = Default Cache Size
 action.clear_cached_items = Clear Cached Items
 label.togglehidden = Show hidden regions
 label.quality_descr = Alignment Quality based on Blosum62 scores
@@ -1385,7 +1357,7 @@ 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.confirm_delete = Always ask
+label.always_ask = Always ask
 label.auto_delete = Automatically delete
 label.filename = filename
 label.braced_oldest = (oldest)
@@ -1420,3 +1392,4 @@ label.alignment = alignment
 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