From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 25 Mar 2015 13:46:16 +0000 (+0000)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2476d30e443b80cddbc953dd5285968a964eb42a;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

2476d30e443b80cddbc953dd5285968a964eb42a
diff --cc resources/lang/Messages.properties
index e6b69d5,6054d98..0d3d491
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1207,5 -1207,21 +1206,22 @@@ label.search_filter = Search Filte
  label.display_name = Display Label
  label.description = Description
  label.include_description= Include Description
+ action.back = Back
+ label.hide_insertions = Hide Insertions
+ label.mark_as_representative = Mark as representative
+ label.open_jabaws_web_page = Open JABAWS web page
+ label.opens_the_jabaws_server_homepage = Opens the JABAWS server's homepage in web browser
+ label.pdb_sequence_getcher = PDB Sequence Fetcher
+ label.result = result
+ label.results = results
+ label.structure_chooser = Structure Chooser
+ label.select = Select : 
+ label.invert = Invert 
+ label.select_pdb_file = Select PDB File
+ info.select_filter_option = Select Filter Option/Manual Entry
+ info.associate_wit_sequence = Associate with Sequence
+ label.search_result = Search Result
+ label.found_structures_summary = Found Structures Summary
+ label.configure_displayed_columns = Configure Displayed Columns
  label.start_jalview = Start Jalview
 +label.biojs_html_export = BioJS