Merge branch 'feature/JAL-3468featureDescriptionEllipsis' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Mar 2020 14:01:25 +0000 (14:01 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 6 Mar 2020 14:01:25 +0000 (14:01 +0000)
1  2 
resources/lang/Messages.properties

@@@ -132,8 -132,6 +132,8 @@@ tooltip.select_highlighted_columns = Pr
  action.deselect_all = Deselect all
  action.invert_selection = Invert selection
  action.using_jmol = Using Jmol
 +action.undo_changes_to_feature_settings = Undo all unapplied changes to feature settings
 +action.undo_changes_to_feature_settings_and_close_the_dialog = Undo all pending changes and close the feature settings dialog
  action.link = Link
  action.group_link = Group Link
  action.show_chain = Show Chain
@@@ -230,7 -228,6 +230,7 @@@ label.nucleotide = Nucleotid
  label.protein = Protein
  label.nucleotides = Nucleotides
  label.proteins = Proteins
 +label.CDS = CDS
  label.to_new_alignment = To New Alignment
  label.to_this_alignment = Add To This Alignment
  label.apply_colour_to_all_groups = Apply Colour To All Groups
@@@ -768,9 -765,6 +768,9 @@@ label.generating_features_for_params = 
  label.generating_annotations_for_params = Generating annotations for - {0}
  label.varna_params = VARNA - {0}
  label.sequence_feature_settings = Sequence Feature Settings
 +label.sequence_feature_settings_for = Sequence Feature Settings for {0}
 +label.sequence_feature_settings_for_view = Sequence Feature Settings for view "{0}"
 +label.sequence_feature_settings_for_CDS_and_Protein = Sequence Feature Settings for CDS and Protein
  label.pairwise_aligned_sequences = Pairwise Aligned Sequences
  label.original_data_for_params = Original Data for {0}
  label.points_for_params = Points for {0}
@@@ -1407,7 -1401,7 +1407,8 @@@ label.create_image_of = Create {0} imag
  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
+ label.include_linked_tooltip = Include visible {0} features<br>converted to local sequence coordinates
+ label.features_not_shown = {0} feature(s) not shown