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

diff --combined src/jalview/gui/StructureChooser.java
index 3d80f79,9464f66..fd2de8e
--- 1/src/jalview/gui/StructureChooser.java
--- 2/src/jalview/gui/StructureChooser.java
+++ b/src/jalview/gui/StructureChooser.java
@@@ -338,7 -338,7 +338,7 @@@ public class StructureChooser extends G
     * @param seqName
     * @return
     */
-   private static String sanitizeSeqName(String seqName)
+   static String sanitizeSeqName(String seqName)
    {
      Objects.requireNonNull(seqName);
      return seqName.replaceAll("\\[\\d*\\]", "")
@@@ -533,6 -533,8 +533,6 @@@
      {
        cmb_filterOption.addItem(new FilterOption("Best Quality",
                "overall_quality", VIEWS_FILTER));
 -      cmb_filterOption.addItem(new FilterOption("Most UniProt Coverage",
 -              "uniprot_coverage", VIEWS_FILTER));
        cmb_filterOption.addItem(new FilterOption("Best Resolution",
                "resolution", VIEWS_FILTER));
        cmb_filterOption.addItem(new FilterOption("Most Protein Chain",
@@@ -857,8 -859,7 +857,8 @@@
            final PDBEntry[] pdbEntriesToView,
            final AlignmentPanel alignPanel, SequenceI[] sequences)
    {
 -    ssm.setProgressBar("Launching PDB structure viewer..");
 +    ssm.setProgressBar(MessageManager
 +            .getString("status.launching_3d_structure_viewer"));
      final StructureViewer sViewer = new StructureViewer(ssm);
  
      if (SiftsSettings.isMapWithSifts())
@@@ -876,9 -877,9 +876,9 @@@
        {
          int y = seqsWithoutSourceDBRef.size();
          ssm.setProgressBar(null);
 -        ssm.setProgressBar("Fetching db refs for " + y
 -                + " sequence" + (y > 1 ? "s" : "")
 -                + " without valid db ref required for SIFTS mapping");
 +        ssm.setProgressBar(MessageManager.formatMessage(
 +                "status.fetching_dbrefs_for_sequences_without_valid_refs",
 +                y));
          SequenceI[] seqWithoutSrcDBRef = new SequenceI[y];
          int x = 0;
          for (SequenceI fSeq : seqsWithoutSourceDBRef)
@@@ -897,16 -898,14 +897,16 @@@
        }
        SequenceI[][] collatedSeqs = seqsMap.toArray(new SequenceI[0][0]);
        ssm.setProgressBar(null);
 -      ssm.setProgressBar("Fetching PDB Structures for selected entries..");
 +      ssm.setProgressBar(MessageManager
 +              .getString("status.fetching_3d_structures_for_selected_entries"));
        sViewer.viewStructures(pdbEntriesToView, collatedSeqs, alignPanel);
      }
      else
      {
        ssm.setProgressBar(null);
 -      ssm.setProgressBar("Fetching PDB Structure for "
 -              + pdbEntriesToView[0].getId());
 +      ssm.setProgressBar(MessageManager.formatMessage(
 +              "status.fetching_3d_structures_for",
 +              pdbEntriesToView[0].getId()));
        sViewer.viewStructures(pdbEntriesToView[0], sequences, alignPanel);
      }
    }