X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=7bf0474b895a836c86c181a526f8749626eef992;hb=6b560f7df25c0f8157531243fb461eb7ead76ab6;hp=04bfb30602ec3a0f059e75e7a92f08428ce16e43;hpb=c0b7a760fe1ced5fe25ee3c3fd272e03f7526fa2;p=jalview.git
diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 04bfb30..7bf0474 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -3,7 +3,7 @@ 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.
Save changes, or continue without saving to make a new colour scheme.
+label.scheme_changed = Changes to scheme ''{0}'' have not been saved.
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
@@ -68,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
@@ -181,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_ as in JalviewColourScheme
@@ -908,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!
@@ -1296,10 +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
-<<<<<<< HEAD
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
->>>>>>> develop