X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=2647c431e1325685e63a97a65211c3707326b3c3;hb=6398c0217546a4d6943f63f670c2684c7c7274be;hp=ac9ff7a2bbe77225de2d47531a0c7e53e1ac97af;hpb=07ef1ecf0c1469c5461ed18a1093a95e88a3f59e;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index ac9ff7a..2647c43 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1485,4 +1485,7 @@ 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
->>>>>>> develop
+label.show_linked_features = Show {0} features
+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