X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=resources%2Flang%2FMessages.properties;h=9fe56156a6c9c136868c2e2adbab40f3d58fc4ac;hb=1beac3545a78d4c5c3274dbb53296708d693efe0;hp=33395d2a15f2f6346321d73abcb638dd045fb561;hpb=a82f1e47eef845557e95e61116e6b34bdd3242f3;p=jalview.git

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index 33395d2..9fe5615 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1130,7 +1130,7 @@ status.opening_file_for = opening file for
 status.colouring_chimera = Colouring Chimera
 status.running_hmmbuild = Building Hidden Markov Model
 status.running_hmmalign = Creating alignment with Hidden Markov Model
-status.running_hmmsearch = Searching for matching sequences
+status.running_search = Searching for matching sequences
 label.font_doesnt_have_letters_defined = Font doesn't have letters defined\nso cannot be used\nwith alignment data
 label.font_too_small = Font size is too small
 label.error_loading_file_params = Error loading file {0}
@@ -1348,8 +1348,10 @@ label.cached_structures = Cached Structures
 label.free_text_search = Free Text Search
 label.hmmalign = hmmalign
 label.use_hmm = HMM profile to use
+label.use_sequence = Sequence to use
 label.hmmbuild = hmmbuild
 label.hmmsearch = hmmsearch
+label.jackhmmer = jackhmmer
 label.installation = Installation
 label.hmmer_location = HMMER Binaries Installation Location
 label.cygwin_location = Cygwin Binaries Installation Location (Windows)
@@ -1367,6 +1369,7 @@ label.freq_alignment = Use alignment background frequencies
 label.freq_uniprot = Use Uniprot background frequencies
 label.hmmalign_options = hmmalign options
 label.hmmsearch_options = hmmsearch options
+label.jackhmmer_options = jackhmmer options
 label.executable_not_found = The ''{0}'' executable file was not found
 warn.command_failed = {0} failed
 label.invalid_folder = Invalid Folder
@@ -1401,8 +1404,6 @@ label.groups = All groups
 label.selected_group = Selected group
 label.use_info_for_height = Use Information Content as Letter Height
 action.search = Search
-||||||| merged common ancestors
-=======
 label.backupfiles_confirm_delete = Confirm delete
 label.backupfiles_confirm_delete_old_files = Delete the following older backup files? (see the Backups tab in Preferences for more options)
 label.backupfiles_confirm_save_file = Confirm save file