From: Jim Procter <j.procter@dundee.ac.uk>
Date: Tue, 8 Mar 2022 17:41:04 +0000 (+0000)
Subject: Merge branch 'bug/JAL-3103_browser_launcher_problems_macos_and_linux' into develop
X-Git-Tag: Release_2_11_2_1~25
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=b06bbffef5e94fc208cf440590fb0333c40fe71e

Merge branch 'bug/JAL-3103_browser_launcher_problems_macos_and_linux' into develop
---

b06bbffef5e94fc208cf440590fb0333c40fe71e
diff --cc resources/lang/Messages.properties
index 023f591,6c0ae79..9ce5a63
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1045,10 -1045,12 +1045,12 @@@ exception.pfam_no_sequences_found = No 
  exception.stockholm_invalid_format = This file is not in valid STOCKHOLM format: First line does not contain '# STOCKHOLM'
  exception.couldnt_parse_sequence_line = Could not parse sequence line: {0}
  exception.unknown_annotation_detected = Unknown annotation detected: {0} {1}
 -exception.couldnt_store_sequence_mappings = Couldn't store sequence mappings for {0}
 +exception.couldnt_store_sequence_mappings = Couldn''t store sequence mappings for {0}
  exception.matrix_too_many_iteration = Too many iterations in {0} (max is {1})
  exception.browser_not_found = Exception in finding browser: {0}
+ exception.browser_unable_to_launch = Unable to launch browser: {0}
  exception.browser_unable_to_locate = Unable to locate browser: {0}
+ exception.browser_os_not_supported = Launching browser on this operating system not supported.  Use URL\n{0}
  exception.invocation_target_exception_creating_aedesc = InvocationTargetException while creating AEDesc: {0}
  exception.illegal_access_building_apple_evt= IllegalAccessException while building AppleEvent: {0}
  exception.unable_to_launch_url = Unable to launch URL: {0}