Merge branch 'develop' into bug/JAL-1608createGroups

diff --combined resources/lang/Messages.properties
index d567699,7db822c..f284ff9
--- 1/resources/lang/Messages.properties
--- 2/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -68,6 -68,7 +68,6 @@@ action.show_gaps = Show Gap
  action.show_hidden_markers = Show Hidden Markers
  action.find = Find
  action.undefine_groups = Undefine Groups
 -action.create_groups = Create Groups
  action.make_groups_selection = Make Groups For Selection
  action.copy = Copy
  action.cut = Cut
@@@ -668,8 -669,7 +668,7 @@@ label.2d_rna_sequence_name = 2D RNA - {
  label.edit_name_and_description_current_group = Edit name and description of current group
  label.from_file = From File
  label.enter_pdb_id = Enter PDB Id (or pdbid:chaincode)
- label.text_colour = Text Colour
- action.set_text_colour = Text Colour...
+ label.text_colour = Text Colour...
  label.structure = Structure
  label.show_pdbstruct_dialog = 3D Structure Data...
  label.view_rna_structure = VARNA 2D Structure

diff --combined resources/lang/Messages_es.properties
index b8cf4f9,2e405c8..a878ab7
--- 1/resources/lang/Messages_es.properties
--- 2/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@@ -66,6 -66,7 +66,6 @@@ action.show_gaps = Mostrar hueco
  action.show_hidden_markers = Mostrar marcadores ocultos
  action.find = Buscar
  action.undefine_groups = Grupos sin definir
 -action.create_groups = Crear grupos
  action.make_groups_selection = Hacer grupos para seleccionar
  action.copy = Copiar
  action.cut = Cortar
@@@ -620,7 -621,7 +620,7 @@@ label.2d_rna_sequence_name = 2D RNA - {
  label.edit_name_and_description_current_group = Editar el nombre y la descripción del grupo actual
  label.from_file = desde fichero
  label.enter_pdb_id = Introducir PDB Id
- label.text_colour = Color del texto
+ label.text_colour = Color de texto...
  label.structure = Estructura
  label.create_sequence_details_report_annotation_for = Anotación para {0}
  label.sequence_details_for = Detalles de la secuencia para {0}
@@@ -1157,7 -1158,6 +1157,6 @@@ label.invalid_search=Texto de búsqueda 
  action.export_annotations=Exportar Anotaciones
  action.set_as_reference=Marcar como Referencia
  action.unmark_as_reference=Desmarcar como Referencia
- action.set_text_colour=Color de Texto...
  label.chimera_failed=Error al abrir Chimera - está instalado?\nCompruebe ruta en Preferencias, Estructura
  label.find=Buscar
  label.select_pdb_file=Seleccionar Fichero PDB

diff --combined src/jalview/jbgui/GAlignFrame.java
index 7164f31,8d1eacd..b759d64
--- 1/src/jalview/jbgui/GAlignFrame.java
--- 2/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@@ -113,7 -113,7 +113,7 @@@ public class GAlignFrame extends JInter
  
    protected JMenu colourMenu = new JMenu();
  
-   protected JRadioButtonMenuItem textColour;
+   protected JMenuItem textColour;
  
    protected JCheckBoxMenuItem conservationMenuItem;
  
@@@ -975,7 -975,7 +975,7 @@@
      });
  
      JMenuItem createGroup = new JMenuItem(
 -            MessageManager.getString("action.create_groups"));
 +            MessageManager.getString("action.create_group"));
      keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit
              .getDefaultToolkit().getMenuShortcutKeyMask(), false);
      al = new ActionListener()
@@@ -1653,7 -1653,6 +1653,7 @@@
  
      formatMenu.setText(MessageManager.getString("action.format"));
      JMenu selectMenu = new JMenu(MessageManager.getString("action.select"));
 +
      idRightAlign.setText(MessageManager
              .getString("label.right_align_sequence_id"));
      idRightAlign.addActionListener(new ActionListener()
@@@ -1905,12 -1904,6 +1905,12 @@@
      // selectMenu.add(listenToViewSelections);
    }
  
 +  protected void configureSelectMenu()
 +  {
 +    // TODO Auto-generated method stub
 +
 +  }
 +
    /**
     * Constructs the entries on the Colour menu (but does not add them to the
     * menu).
@@@ -1928,8 -1921,8 +1928,8 @@@
        }
      });
  
-     textColour = new JRadioButtonMenuItem(
-             MessageManager.getString("action.set_text_colour"));
+     textColour = new JMenuItem(
+             MessageManager.getString("label.text_colour"));
      textColour.addActionListener(new ActionListener()
      {
        @Override