Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 20 Jun 2016 11:07:33 +0000 (12:07 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 20 Jun 2016 11:07:33 +0000 (12:07 +0100)
1  2 
resources/lang/Messages.properties

@@@ -675,7 -675,7 +675,7 @@@ label.view_all_representative_structure
  label.open_new_jmol_view_with_all_representative_structures_associated_current_selection_superimpose_using_alignment = Opens a new structure viewer with all representative structures\nassociated with the current selection\nsuperimposed with the current alignment.
  label.associate_structure_with_sequence = Associate Structure with Sequence
  label.from_file = From File
 -label.enter_pdb_id = Enter PDB Id (Note: Specific chains can be retrieved by appending the chain code to the PDB Id delimited with a colon i.e. 1abc:X)
 +label.enter_pdb_id = Enter PDB Id (or pdbid:chaincode)
  label.discover_pdb_ids = Discover PDB IDs
  label.text_colour = Text Colour
  action.set_text_colour = Text Colour...
@@@ -972,7 -972,6 +972,6 @@@ error.eps_generation_not_implemented = 
  error.png_generation_not_implemented = PNG Generation not yet implemented
  error.try_join_vamsas_session_another = Trying to join a vamsas session when another is already connected
  error.invalid_vamsas_session_id = Invalid vamsas session id
- error.implementation_error_cannot_create_groovyshell = Implementation Error. Cannot create groovyShell without Groovy on the classpath!
  label.groovy_support_failed = Jalview Groovy Support Failed
  label.couldnt_create_groovy_shell = Couldn't create the groovy Shell. Check the error log for the details of what went wrong.
  error.unsupported_version_calcIdparam = Unsupported Version for calcIdparam {0}