X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=ca6ae633e3ca1dbf5cd0ccfc4a244f588700731b;hb=c38d37887ae51d63942ac4321f6769308188ed6b;hp=a1d32e6b325ca3c583ae0b950fe98a7436594e8e;hpb=d2a848ea9556b61de0fc1b3dbb80fdda4dae0f05;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index a1d32e6..ca6ae63 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -268,11 +268,11 @@ label.autoadd_secstr = Add secondary structure annotation to alignment
 label.autoadd_temp = Add Temperature Factor annotation to alignment
 label.structure_viewer = Default structure viewer
 label.double_click_to_browse = Double-click to browse for file
-label.chimera_path = Path to Chimera program
-label.chimera_path_tip = Jalview will first try any path entered here, else standard installation locations.<br>Double-click to browse for file.
-label.invalid_chimera_path = Chimera path not found or not executable
-label.chimera_missing = Chimera structure viewer not found.<br/>Please enter the path to Chimera (if installed),<br/>or download and install UCSF Chimera.
-label.chimera_failed = Error opening Chimera - is it installed?\nCheck path in Preferences, Structure
+label.viewer_path = Path to {0} program
+label.viewer_path_tip = Jalview will first try any path entered here, else standard installation locations.<br>Double-click to browse for file.
+label.invalid_viewer_path = Path not found or not executable
+label.viewer_missing = Structure viewer not found.<br/>Please enter the path to the executable (if installed),<br/>or download and install the program.
+label.open_viewer_failed = Error opening {0} - is it installed?\nCheck path in Preferences, Structure
 label.min_colour = Minimum Colour
 label.max_colour = Maximum Colour
 label.no_colour = No Colour
@@ -363,7 +363,8 @@ label.open_saved_vamsas_session = Open a saved VAMSAS session
 label.groovy_console = Groovy Console...
 label.lineart = Lineart
 label.dont_ask_me_again = Don't ask me again
-label.select_eps_character_rendering_style = Select EPS character rendering style
+label.select_character_rendering_style = {0} character rendering style
+label.select_character_style_title = {0} Rendering options
 label.invert_selection = Invert Selection
 label.optimise_order = Optimise Order
 label.seq_sort_by_score = Sequence sort by Score
@@ -412,7 +413,7 @@ 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.
 label.vamsas_document_import_failed = Vamsas Document Import Failed
-label.couldnt_locate = Could not locate {0}
+label.couldnt_locate = Couldn''t locate {0}
 label.url_not_found = URL not found
 label.new_sequence_url_link = New sequence URL link
 label.cannot_edit_annotations_in_wrapped_view = Cannot edit annotations in wrapped view
@@ -501,10 +502,9 @@ label.insert_gaps = Insert {0} gaps
 label.delete_gap = Delete 1 gap
 label.delete_gaps = Delete {0} gaps
 label.sequence_details = Sequence Details
-label.jmol_help = Jmol Help
-label.chimera_help = Chimera Help
+label.viewer_help = {0} Help
 label.close_viewer = Close Viewer
-label.confirm_close_chimera = This will close Jalview''s connection to {0}.<br>Do you want to close the Chimera window as well?
+label.confirm_close_viewer = This will close Jalview''s connection to {0}.<br>Do you want to close the {1} window as well?
 label.all = All
 label.sort_by = Sort alignment by
 label.sort_by_score = Sort by Score
@@ -598,7 +598,7 @@ label.check_for_questionnaires = Check for questionnaires
 label.check_for_latest_version = Check for latest version
 label.url_linkfrom_sequence_id = URL link from Sequence ID
 label.use_proxy_server = Use a proxy server
-label.eps_rendering_style = EPS rendering style
+label.rendering_style = {0} rendering style
 label.append_start_end = Append /start-end (/15-380)
 label.full_sequence_id = Full Sequence Id
 label.smooth_font = Smooth Font
@@ -623,7 +623,6 @@ label.editing = Editing
 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
-label.let_chimera_manage_structure_colours = Let Chimera manage structure colours
 label.fetch_chimera_attributes = Fetch Chimera attributes
 label.fetch_chimera_attributes_tip = Copy Chimera attribute to Jalview feature
 label.marks_leaves_tree_not_associated_with_sequence = Marks leaves of tree not associated with a sequence
@@ -679,7 +678,7 @@ label.sequence_details_for = Sequence Details for {0}
 label.sequence_name = Sequence Name
 label.sequence_description = Sequence Description
 label.edit_sequence_name_description = Edit Sequence Name/Description
-label.spaces_converted_to_backslashes = Spaces have been converted to _
+label.spaces_converted_to_underscores = Spaces have been converted to _
 label.no_spaces_allowed_sequence_name = No spaces allowed in Sequence Name
 label.select_outline_colour = Select Outline Colour
 label.web_browser_not_found_unix = Unixers\: Couldn't find default web browser.\nAdd the full path to your browser in Preferences."
@@ -710,14 +709,13 @@ label.associate_nodes_with = Associate Nodes With
 label.link_name = Link Name
 label.pdb_file = PDB file
 label.colour_with_jmol = Colour with Jmol
-label.colour_with_chimera = Colour with Chimera
+label.let_viewer_manage_structure_colours = Let viewer manage structure colours
+label.colour_with_viewer = Colour in structure viewer
 label.superpose_structures = Superpose Structures
 error.superposition_failed = Superposition failed: {0}
 label.insufficient_residues = Not enough aligned residues ({0}) to perform superposition
-label.jmol = Jmol
-label.chimera = Chimera
-label.create_chimera_attributes = Write Jalview features
-label.create_chimera_attributes_tip = Set Chimera residue attributes for visible features
+label.create_viewer_attributes = Write Jalview features
+label.create_viewer_attributes_tip = Set structure residue attributes for Jalview features
 label.attributes_set = {0} attribute values set on Chimera
 label.sort_alignment_by_tree = Sort Alignment By Tree
 label.mark_unlinked_leaves = Mark Unlinked Leaves
@@ -884,8 +882,6 @@ label.save_feature_colours = Save Feature Colour Scheme
 label.select_startup_file = Select startup file
 label.select_default_browser = Select default web browser
 label.save_tree_as_newick = Save tree as newick file
-label.create_eps_from_tree = Create EPS file from tree
-label.create_png_from_tree = Create PNG image from tree
 label.save_colour_scheme = Save colour scheme
 label.edit_params_for = Edit parameters for {0}
 label.choose_filename_for_param_file = Choose a filename for this parameter file
@@ -941,8 +937,6 @@ error.call_setprogressbar_before_registering_handler = call setProgressBar befor
 label.cancelled_params = Cancelled {0}
 error.implementation_error_cannot_show_view_alignment_frame = Implementation error: cannot show a view from another alignment in an AlignFrame.
 error.implementation_error_dont_know_about_threshold_setting = Implementation error: don't know about threshold setting for current AnnotationColourGradient.
-error.eps_generation_not_implemented = EPS Generation not yet implemented
-error.png_generation_not_implemented = PNG Generation not yet implemented
 error.try_join_vamsas_session_another = Trying to join a vamsas session when another is already connected
 error.invalid_vamsas_session_id = Invalid vamsas session id
 label.groovy_support_failed = Jalview Groovy Support Failed
@@ -1014,7 +1008,7 @@ label.pca_recalculating = Recalculating PCA
 label.pca_calculating = Calculating PCA
 label.select_foreground_colour = Choose foreground colour
 label.select_colour_for_text = Select Colour for Text
-label.adjunst_foreground_text_colour_threshold = Adjust Foreground Text Colour Threshold
+label.adjust_foreground_text_colour_threshold = Adjust Foreground Text Colour Threshold
 label.select_subtree_colour = Select Sub-Tree Colour
 label.create_new_sequence_features = Create New Sequence Feature(s)
 label.amend_delete_features = Amend/Delete Features for {0}
@@ -1086,7 +1080,6 @@ error.implementation_error_cannot_find_service_url_in_given_set_param_store = Im
 exception.jobsubmission_invalid_params_set = Invalid parameter set. Check Jalview implementation
 exception.notvaliddata_group_contains_less_than_min_seqs = Group contains less than {0} sequences.
 exception.outofmemory_loading_pdb_file = Out of memory loading PDB File
-exception.eps_coudnt_write_output_file = Could not write to the output file: {0}
 exception.eps_method_not_supported = Method not currently supported by EpsGraphics2D version {0}
 exception.eps_unable_to_get_inverse_matrix = Unable to get inverse of matrix: {0}
 warn.job_cannot_be_cancelled_close_window = This job cannot be cancelled.\nJust close the window.
@@ -1111,8 +1104,7 @@ status.searching_for_sequences_from = Searching for sequences from {0}
 status.finished_searching_for_sequences_from = Finished searching for sequences from {0}
 label.eps_file = EPS file
 label.png_image = PNG image
-status.saving_file = Saving {0}
-status.export_complete = {0} Export completed.
+status.export_complete = {0} Export completed
 status.fetching_pdb = Fetching PDB {0}
 status.refreshing_news = Refreshing news
 status.importing_vamsas_session_from = Importing VAMSAS session from {0}
@@ -1129,7 +1121,7 @@ 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
 status.opening_file_for = opening file for
-status.colouring_chimera = Colouring Chimera
+status.colouring_structures = Colouring structures
 label.font_doesnt_have_letters_defined = Font doesn't have letters defined\nso cannot be used\nwith alignment data
 label.font_too_small = Font size is too small
 label.error_loading_file_params = Error loading file {0}
@@ -1236,7 +1228,6 @@ exception.fts_server_unreachable = Jalview is unable to reach the {0} server. \n
 label.nw_mapping = Needleman & Wunsch Alignment
 label.sifts_mapping = SIFTs Mapping
 label.mapping_method = Sequence \u27f7 Structure mapping method
-status.waiting_for_user_to_select_output_file = Waiting for user to select {0} file
 status.cancelled_image_export_operation = Cancelled {0} export operation
 info.error_creating_file = Error creating {0} file
 exception.outofmemory_loading_mmcif_file = Out of memory loading mmCIF File
@@ -1319,7 +1310,7 @@ label.delete_condition = Delete this condition
 label.score = Score
 label.colour_by_label = Colour by label
 label.variable_colour = Variable colour...
-label.select_colour = Select colour
+label.select_colour_for = Select colour for {0}
 option.enable_disable_autosearch = When ticked, search is performed automatically
 option.autosearch = Autosearch
 label.retrieve_ids = Retrieve IDs
@@ -1340,6 +1331,13 @@ label.most_bound_molecules = Most Bound Molecules
 label.most_polymer_residues = Most Polymer Residues
 label.cached_structures = Cached Structures
 label.free_text_search = Free Text Search
+label.annotation_name = Annotation Name
+label.annotation_description = Annotation Description 
+label.edit_annotation_name_description = Edit Annotation Name/Description
+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.backupfiles_confirm_delete = Confirm delete
 label.backupfiles_confirm_delete_old_files = Delete the following older backup files? (see the Backups tab in Preferences for more options)
 label.backupfiles_confirm_save_file = Confirm save file
@@ -1407,7 +1405,8 @@ 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.show_linked_feature_settings = Open {0} settings
 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
\ No newline at end of file
+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