Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 1 Jun 2016 15:34:00 +0000 (16:34 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 1 Jun 2016 15:34:00 +0000 (16:34 +0100)
merge

1  2 
src/jalview/gui/AlignFrame.java

@@@ -1313,8 -1313,8 +1313,8 @@@ public class AlignFrame extends GAlignF
  
      if (viewport.hasHiddenColumns() && !settings.isExportHiddenColumns())
      {
 -      viewport.setExportHiddenSeqs(settings.isExportHiddenSequences());
 -      omitHidden = viewport.getViewAsString(false);
 +      omitHidden = viewport.getViewAsString(false,
 +              settings.isExportHiddenSequences());
      }
  
      int[] alignmentStartEnd = new int[2];
                .getString("label.error_when_translating_sequences_submit_bug_report");
        final String errorTitle = MessageManager
                .getString("label.implementation_error")
-               + MessageManager.getString("translation_failed");
+               + MessageManager.getString("label.translation_failed");
        JOptionPane.showMessageDialog(Desktop.desktop, msg, errorTitle,
                JOptionPane.ERROR_MESSAGE);
        return;