X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=96ca479a84a9becc8acb49bc03d31457edac5d37;hb=207b06de28859536277608ad94897eaa526b1279;hp=2e927170b50a7e1d71d4a8914d75e593c6f08c29;hpb=7e82c1426d70a5072fa6fc0eb869e22a11775cd7;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 2e92717..96ca479 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<br>Save changes, or continue without saving to make a new colour 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
@@ -1296,4 +1296,10 @@ 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