Resolve properties file merge conflict with develop

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

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index d567699..7bf0474 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -3,6 +3,9 @@ action.reset_services = Reset Services
 action.merge_results = Merge Results
 action.load_scheme = Load scheme
 action.save_scheme = Save scheme
+label.scheme_changed = Changes to scheme ''{0}'' have not been saved.<br><br>Save changes, or continue without saving to make a new colour scheme.
+label.save_changes = Save Changes
+label.dont_save_changes = Don't Save
 action.save_image = Save Image
 action.paste = Paste
 action.show_html_source = Show HTML Source
@@ -65,6 +68,7 @@ action.user_defined = User Defined...
 action.by_conservation = By Conservation
 action.wrap = Wrap
 action.show_gaps = Show Gaps
+action.show_occupancy = Show Occupancy
 action.show_hidden_markers = Show Hidden Markers
 action.find = Find
 action.undefine_groups = Undefine Groups
@@ -178,6 +182,7 @@ label.score_model_conservation = Physicochemical property conservation
 label.score_model_enhconservation = Physicochemical property conservation
 label.status_bar = Status bar
 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
@@ -668,8 +673,7 @@ label.2d_rna_sequence_name = 2D RNA - {0}
 label.edit_name_and_description_current_group = Edit name and description of current group
 label.from_file = From File
 label.enter_pdb_id = Enter PDB Id (or pdbid:chaincode)
-label.text_colour = Text Colour
-action.set_text_colour = Text Colour...
+label.text_colour = Text Colour...
 label.structure = Structure
 label.show_pdbstruct_dialog = 3D Structure Data...
 label.view_rna_structure = VARNA 2D Structure
@@ -906,6 +910,7 @@ label.webservice_job_title_on = {0} using {1} on {2}
 label.updating_vamsas_session = Updating vamsas session
 label.loading_file = Loading File: {0}
 label.edit_params = Edit {0}
+label.as_percentage = As Percentage
 error.not_implemented = Not implemented
 error.no_such_method_as_clone1_for = No such method as clone1 for {0}
 error.null_from_clone1 = Null from clone1!
@@ -1294,4 +1299,7 @@ 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.invalid_name = Invalid Name !
 label.output_seq_details = Output Sequence Details to list all database references
+label.phyre2_model_prediction = 3D Protein Model prediction with Phyre2
+label.run_phyre2_prediction = Run Phyre2 Prediction
+status.obtaining_mapping_with_phyre2_template_alignment = Obtaining mapping with Phyre2 Template alignment 
 label.urllinks = Links