Merge branch 'jims_marckhacks' into develop
[jalview.git] / src / jalview / gui / PopupMenu.java
index 7e8c573..7d953d4 100644 (file)
@@ -32,6 +32,7 @@ import jalview.io.*;
 import jalview.schemes.*;
 import jalview.util.GroupUrlLink;
 import jalview.util.GroupUrlLink.UrlStringTooLongException;
+import jalview.util.MessageManager;\r
 import jalview.util.UrlLink;
 
 /**
@@ -71,6 +72,7 @@ public class PopupMenu extends JPopupMenu
   protected JRadioButtonMenuItem BLOSUM62Colour = new JRadioButtonMenuItem();
 
   protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem();
+  protected JRadioButtonMenuItem RNAInteractionColour = new JRadioButtonMenuItem();
 
   // protected JRadioButtonMenuItem covariationColour = new
   // JRadioButtonMenuItem();
@@ -122,7 +124,11 @@ public class PopupMenu extends JPopupMenu
   JMenu pdbMenu = new JMenu();
 
   JMenuItem pdbFromFile = new JMenuItem();
-
+    // JBPNote: Commented these out - Should add these services via the web services menu system.
+    // JMenuItem ContraFold = new JMenuItem();
+  
+    // JMenuItem RNAFold = new JMenuItem();
+  
   JMenuItem enterPDB = new JMenuItem();
 
   JMenuItem discoverPDB = new JMenuItem();
@@ -193,6 +199,7 @@ public class PopupMenu extends JPopupMenu
     colours.add(PIDColour);
     colours.add(BLOSUM62Colour);
     colours.add(purinePyrimidineColour);
+    colours.add(RNAInteractionColour);
     // colours.add(covariationColour);
 
     for (int i = 0; i < jalview.io.FormatAdapter.WRITEABLE_FORMATS.length; i++)
@@ -279,13 +286,25 @@ public class PopupMenu extends JPopupMenu
             final String rnastruc = aa[i].getRNAStruc();
             final String structureLine = aa[i].label;
             menuItem = new JMenuItem();
-            menuItem.setText("2D RNA " + structureLine);
+            menuItem.setText(MessageManager.formatMessage("label.2d_rna_structure_line", new String[]{structureLine}));\r
             menuItem.addActionListener(new java.awt.event.ActionListener()
+            
             {
               public void actionPerformed(ActionEvent e)
               {
-                new AppVarna(structureLine, seq, seq.getSequenceAsString(),
-                        rnastruc, seq.getName(), ap);
+                       //System.out.println("1:"+structureLine);
+                       System.out.println("1:sname"+seq.getName());
+                       System.out.println("2:seq"+seq);
+                
+                       //System.out.println("3:"+seq.getSequenceAsString());
+                       System.out.println("3:strucseq"+rnastruc);
+                       //System.out.println("4:struc"+seq.getRNA());
+                       System.out.println("5:name"+seq.getName());
+                       System.out.println("6:ap"+ap);
+                       new AppVarna(structureLine, seq, seq.getSequenceAsString(), rnastruc, seq
+                            .getName(), ap);
+                       //new AppVarna(seq.getName(),seq,rnastruc,seq.getRNA(), seq.getName(), ap);
+                       System.out.println("end");
               }
             });
             viewStructureMenu.add(menuItem);
@@ -305,12 +324,13 @@ public class PopupMenu extends JPopupMenu
 
               // TODO: make rnastrucF a bit more nice
               menuItem = new JMenuItem();
-              menuItem.setText("2D RNA - " + seq.getName());
+              menuItem.setText(MessageManager.formatMessage("label.2d_rna_sequence_name", new String[]{seq.getName()}));\r
               menuItem.addActionListener(new java.awt.event.ActionListener()
               {
                 public void actionPerformed(ActionEvent e)
                 {
                   // TODO: VARNA does'nt print gaps in the sequence
+                
                   new AppVarna(seq.getName() + " structure", seq, seq
                           .getSequenceAsString(), rnastruc, seq.getName(),
                           ap);
@@ -323,7 +343,7 @@ public class PopupMenu extends JPopupMenu
 
       }
 
-      menuItem = new JMenuItem("Hide Sequences");
+      menuItem = new JMenuItem(MessageManager.getString("action.hide_sequences"));\r
       menuItem.addActionListener(new java.awt.event.ActionListener()
       {
         public void actionPerformed(ActionEvent e)
@@ -336,7 +356,7 @@ public class PopupMenu extends JPopupMenu
       if (ap.av.getSelectionGroup() != null
               && ap.av.getSelectionGroup().getSize() > 1)
       {
-        menuItem = new JMenuItem("Represent Group with " + seq.getName());
+        menuItem = new JMenuItem(MessageManager.formatMessage("label.represent_group_with", new String[]{seq.getName()}));\r
         menuItem.addActionListener(new java.awt.event.ActionListener()
         {
           public void actionPerformed(ActionEvent e)
@@ -354,7 +374,7 @@ public class PopupMenu extends JPopupMenu
         if (ap.av.adjustForHiddenSeqs(index)
                 - ap.av.adjustForHiddenSeqs(index - 1) > 1)
         {
-          menuItem = new JMenuItem("Reveal Sequences");
+          menuItem = new JMenuItem(MessageManager.getString("action.reveal_sequences"));\r
           menuItem.addActionListener(new ActionListener()
           {
             public void actionPerformed(ActionEvent e)
@@ -374,7 +394,7 @@ public class PopupMenu extends JPopupMenu
     if (ap.av.hasHiddenRows())
     {
       {
-        menuItem = new JMenuItem("Reveal All");
+        menuItem = new JMenuItem(MessageManager.getString("action.reveal_all"));\r
         menuItem.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent e)
@@ -397,8 +417,8 @@ public class PopupMenu extends JPopupMenu
 
     if (sg != null && sg.getSize() > 0)
     {      
-      groupName.setText("Name: " + sg.getName());
-      groupName.setText("Edit name and description of current group.");
+      groupName.setText(MessageManager.formatMessage("label.name_param", new String[]{sg.getName()}));\r
+      groupName.setText(MessageManager.getString("label.edit_name_and_description_current_group"));\r
 
       if (sg.cs instanceof ZappoColourScheme)
       {
@@ -448,6 +468,8 @@ public class PopupMenu extends JPopupMenu
       {
         purinePyrimidineColour.setSelected(true);
       }
+      
+   
       /*
        * else if (sg.cs instanceof CovariationColourScheme) {
        * covariationColour.setSelected(true); }
@@ -471,7 +493,7 @@ public class PopupMenu extends JPopupMenu
         buildGroupURLMenu(sg, groupLinks);
       }
       // Add a 'show all structures' for the current selection
-      Hashtable<String, PDBEntry> pdbe = new Hashtable<String, PDBEntry>();
+      Hashtable<String, PDBEntry> pdbe = new Hashtable<String, PDBEntry>(),reppdb=new Hashtable<String,PDBEntry>();
       SequenceI sqass = null;
       for (SequenceI sq : ap.av.getSequenceSelection())
       {
@@ -479,6 +501,7 @@ public class PopupMenu extends JPopupMenu
                 .getPDBId();
         if (pes != null)
         {
+          reppdb.put(pes.get(0).getId(),pes.get(0));
           for (PDBEntry pe : pes)
           {
             pdbe.put(pe.getId(), pe);
@@ -492,19 +515,18 @@ public class PopupMenu extends JPopupMenu
       if (pdbe.size() > 0)
       {
         final PDBEntry[] pe = pdbe.values().toArray(
-                new PDBEntry[pdbe.size()]);
-        final JMenuItem gpdbview;
+                new PDBEntry[pdbe.size()]),pr = reppdb.values().toArray(
+                        new PDBEntry[reppdb.size()]);
+        final JMenuItem gpdbview,rpdbview;
         if (pdbe.size() == 1)
         {
-          structureMenu.add(gpdbview = new JMenuItem("View structure for "
-                  + sqass.getDisplayId(false)));
+          structureMenu.add(gpdbview = new JMenuItem(MessageManager.formatMessage("label.view_structure_for", new String[]{sqass.getDisplayId(false)})));\r
         }
         else
         {
-          structureMenu.add(gpdbview = new JMenuItem("View all "
-                  + pdbe.size() + " structures."));
+          structureMenu.add(gpdbview = new JMenuItem(MessageManager.formatMessage("label.view_all_structures", new String[]{new Integer(pdbe.size()).toString()})));          \r
         }
-        gpdbview.setToolTipText("Open a new Jmol view with all structures associated with the current selection and superimpose them using the alignment.");
+        gpdbview.setToolTipText(MessageManager.getString("label.open_new_jmol_view_with_all_structures_associated_current_selection_superimpose_using_alignment"));\r
         gpdbview.addActionListener(new ActionListener()
         {
 
@@ -514,6 +536,20 @@ public class PopupMenu extends JPopupMenu
             new AppJmol(ap, pe, ap.av.collateForPDB(pe));
           }
         });
+        if (reppdb.size()>1 && reppdb.size()<pdbe.size())
+        {
+          structureMenu.add(rpdbview = new JMenuItem(MessageManager.formatMessage("label.view_all_representative_structures", new String[]{new Integer(reppdb.size()).toString()})));
+          rpdbview.setToolTipText(MessageManager.getString("label.open_new_jmol_view_with_all_representative_structures_associated_current_selection_superimpose_using_alignment"));
+          rpdbview.addActionListener(new ActionListener()
+          {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+              new AppJmol(ap, pr, ap.av.collateForPDB(pr));
+            }
+          });
+        }
       }
     }
     else
@@ -526,11 +562,11 @@ public class PopupMenu extends JPopupMenu
     {
       createGroupMenuItem.setVisible(true);
       unGroupMenuItem.setVisible(false);
-      jMenu1.setText("Edit New Group");
+      jMenu1.setText(MessageManager.getString("action.edit_new_group"));\r
     } else {
       createGroupMenuItem.setVisible(false);
       unGroupMenuItem.setVisible(true);
-      jMenu1.setText("Edit Group");
+      jMenu1.setText(MessageManager.getString("action.edit_group"));\r
     }
 
     if (seq == null)
@@ -542,7 +578,7 @@ public class PopupMenu extends JPopupMenu
     if (links != null && links.size() > 0)
     {
 
-      JMenu linkMenu = new JMenu("Link");
+      JMenu linkMenu = new JMenu(MessageManager.getString("action.link"));\r
       Vector linkset = new Vector();
       for (int i = 0; i < links.size(); i++)
       {
@@ -669,10 +705,10 @@ public class PopupMenu extends JPopupMenu
     // menu appears asap
     // sequence only URLs
     // ID/regex match URLs
-    groupLinksMenu = new JMenu("Group Link");
+    groupLinksMenu = new JMenu(MessageManager.getString("action.group_link"));\r
     JMenu[] linkMenus = new JMenu[]
-    { null, new JMenu("IDS"), new JMenu("Sequences"),
-        new JMenu("IDS and Sequences") }; // three types of url that might be
+    { null, new JMenu(MessageManager.getString("action.ids")), new JMenu(MessageManager.getString("action.sequences")),\r
+        new JMenu(MessageManager.getString("action.ids_sequences")) }; // three types of url that might be\r
                                           // created.
     SequenceI[] seqs = ap.av.getSelectionAsNewSequence();
     String[][] idandseqs = GroupUrlLink.formStrings(seqs);
@@ -795,7 +831,7 @@ public class PopupMenu extends JPopupMenu
     }
     if (addMenu)
     {
-      groupLinksMenu = new JMenu("Group Links");
+      groupLinksMenu = new JMenu(MessageManager.getString("action.group_link"));\r
       for (int m = 0; m < linkMenus.length; m++)
       {
         if (linkMenus[m] != null
@@ -821,7 +857,7 @@ public class PopupMenu extends JPopupMenu
   private void addshowLink(JMenu linkMenu, String label, final String url)
   {
     JMenuItem item = new JMenuItem(label);
-    item.setToolTipText("open URL: " + url);
+    item.setToolTipText(MessageManager.formatMessage("label.open_url_param", new String[]{url}));\r
     item.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -856,16 +892,8 @@ public class PopupMenu extends JPopupMenu
           final GroupUrlLink urlgenerator, final Object[] urlstub)
   {
     JMenuItem item = new JMenuItem(label);
-    item.setToolTipText("open URL (" + urlgenerator.getUrl_prefix()
-            + "..) (" + urlgenerator.getNumberInvolved(urlstub) + " seqs)"); // TODO:
-                                                                             // put
-                                                                             // in
-                                                                             // info
-                                                                             // about
-                                                                             // what
-                                                                             // is
-                                                                             // being
-                                                                             // sent.
+    item.setToolTipText(MessageManager.formatMessage("label.open_url_seqs_param", new Object[]{urlgenerator.getUrl_prefix(),urlgenerator.getNumberInvolved(urlstub)}));\r
+    // TODO: put in info about what is being sent.\r
     item.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -898,9 +926,9 @@ public class PopupMenu extends JPopupMenu
    */
   private void jbInit() throws Exception
   {
-    groupMenu.setText("Group");
-    groupMenu.setText("Selection");
-    groupName.setText("Name");
+    groupMenu.setText(MessageManager.getString("label.group"));\r
+    groupMenu.setText(MessageManager.getString("label.selection"));\r
+    groupName.setText(MessageManager.getString("label.name"));\r
     groupName.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -908,8 +936,8 @@ public class PopupMenu extends JPopupMenu
         groupName_actionPerformed();
       }
     });
-    sequenceMenu.setText("Sequence");
-    sequenceName.setText("Edit Name/Description");
+    sequenceMenu.setText(MessageManager.getString("label.sequence"));\r
+    sequenceName.setText(MessageManager.getString("label.edit_name_description"));\r
     sequenceName.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -917,7 +945,7 @@ public class PopupMenu extends JPopupMenu
         sequenceName_actionPerformed();
       }
     });
-    sequenceDetails.setText("Sequence Details ...");
+    sequenceDetails.setText(MessageManager.getString("label.sequence_details") + "...");\r
     sequenceDetails.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -925,7 +953,7 @@ public class PopupMenu extends JPopupMenu
         sequenceDetails_actionPerformed();
       }
     });
-    sequenceSelDetails.setText("Sequence Details ...");
+    sequenceSelDetails.setText(MessageManager.getString("label.sequence_details") + "...");\r
     sequenceSelDetails
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -935,7 +963,7 @@ public class PopupMenu extends JPopupMenu
               }
             });
     PIDColour.setFocusPainted(false);
-    unGroupMenuItem.setText("Remove Group");
+    unGroupMenuItem.setText(MessageManager.getString("action.remove_group"));\r
     unGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -943,7 +971,7 @@ public class PopupMenu extends JPopupMenu
         unGroupMenuItem_actionPerformed();
       }
     });
-    createGroupMenuItem.setText("Create Group");
+    createGroupMenuItem.setText(MessageManager.getString("action.create_group"));\r
     createGroupMenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -952,7 +980,7 @@ public class PopupMenu extends JPopupMenu
       }
     });
 
-    outline.setText("Border colour");
+    outline.setText(MessageManager.getString("action.border_colour"));\r
     outline.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -960,7 +988,7 @@ public class PopupMenu extends JPopupMenu
         outline_actionPerformed();
       }
     });
-    nucleotideMenuItem.setText("Nucleotide");
+    nucleotideMenuItem.setText(MessageManager.getString("label.nucleotide"));\r
     nucleotideMenuItem.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -968,8 +996,8 @@ public class PopupMenu extends JPopupMenu
         nucleotideMenuItem_actionPerformed();
       }
     });
-    colourMenu.setText("Group Colour");
-    showBoxes.setText("Boxes");
+    colourMenu.setText(MessageManager.getString("label.group_colour"));\r
+    showBoxes.setText(MessageManager.getString("action.boxes"));\r
     showBoxes.setState(true);
     showBoxes.addActionListener(new ActionListener()
     {
@@ -978,7 +1006,7 @@ public class PopupMenu extends JPopupMenu
         showBoxes_actionPerformed();
       }
     });
-    showText.setText("Text");
+    showText.setText(MessageManager.getString("action.text"));\r
     showText.setState(true);
     showText.addActionListener(new ActionListener()
     {
@@ -987,7 +1015,7 @@ public class PopupMenu extends JPopupMenu
         showText_actionPerformed();
       }
     });
-    showColourText.setText("Colour Text");
+    showColourText.setText(MessageManager.getString("label.colour_text"));\r
     showColourText.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -995,7 +1023,7 @@ public class PopupMenu extends JPopupMenu
         showColourText_actionPerformed();
       }
     });
-    displayNonconserved.setText("Show Nonconserved");
+    displayNonconserved.setText(MessageManager.getString("label.show_non_conversed"));\r
     displayNonconserved.setState(true);
     displayNonconserved.addActionListener(new ActionListener()
     {
@@ -1004,8 +1032,8 @@ public class PopupMenu extends JPopupMenu
         showNonconserved_actionPerformed();
       }
     });
-    editMenu.setText("Edit");
-    cut.setText("Cut");
+    editMenu.setText(MessageManager.getString("action.edit"));\r
+    cut.setText(MessageManager.getString("action.cut"));\r
     cut.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1013,7 +1041,7 @@ public class PopupMenu extends JPopupMenu
         cut_actionPerformed();
       }
     });
-    upperCase.setText("To Upper Case");
+    upperCase.setText(MessageManager.getString("label.to_upper_case"));\r
     upperCase.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1021,7 +1049,7 @@ public class PopupMenu extends JPopupMenu
         changeCase(e);
       }
     });
-    copy.setText("Copy");
+    copy.setText(MessageManager.getString("action.copy"));\r
     copy.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1029,7 +1057,7 @@ public class PopupMenu extends JPopupMenu
         copy_actionPerformed();
       }
     });
-    lowerCase.setText("To Lower Case");
+    lowerCase.setText(MessageManager.getString("label.to_lower_case"));\r
     lowerCase.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1037,7 +1065,7 @@ public class PopupMenu extends JPopupMenu
         changeCase(e);
       }
     });
-    toggle.setText("Toggle Case");
+    toggle.setText(MessageManager.getString("label.toggle_case"));\r
     toggle.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1045,8 +1073,8 @@ public class PopupMenu extends JPopupMenu
         changeCase(e);
       }
     });
-    pdbMenu.setText("Associate Structure with Sequence");
-    pdbFromFile.setText("From File");
+    pdbMenu.setText(MessageManager.getString("label.associate_structure_with_sequence"));\r
+    pdbFromFile.setText(MessageManager.getString("label.from_file"));\r
     pdbFromFile.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1054,7 +1082,33 @@ public class PopupMenu extends JPopupMenu
         pdbFromFile_actionPerformed();
       }
     });
-    enterPDB.setText("Enter PDB Id");
+//    RNAFold.setText("From RNA Fold with predict2D");
+//    RNAFold.addActionListener(new ActionListener()
+//    {
+//      public void actionPerformed(ActionEvent e)
+//      {
+//       try {
+//                     RNAFold_actionPerformed();
+//             } catch (Exception e1) {
+//                     // TODO Auto-generated catch block
+//                     e1.printStackTrace();
+//             }
+//      }   
+//    });
+//    ContraFold.setText("From Contra Fold with predict2D");
+//    ContraFold.addActionListener(new ActionListener()
+//    {
+//      public void actionPerformed(ActionEvent e)
+//      {
+//       try {
+//                     ContraFold_actionPerformed();
+//             } catch (Exception e1) {
+//                     // TODO Auto-generated catch block
+//                     e1.printStackTrace();
+//             }
+//      }   
+//    });
+    enterPDB.setText(MessageManager.getString("label.enter_pdb_id"));\r
     enterPDB.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1062,7 +1116,7 @@ public class PopupMenu extends JPopupMenu
         enterPDB_actionPerformed();
       }
     });
-    discoverPDB.setText("Discover PDB ids");
+    discoverPDB.setText(MessageManager.getString("label.discover_pdb_ids"));\r
     discoverPDB.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1070,8 +1124,8 @@ public class PopupMenu extends JPopupMenu
         discoverPDB_actionPerformed();
       }
     });
-    outputMenu.setText("Output to Textbox...");
-    sequenceFeature.setText("Create Sequence Feature");
+    outputMenu.setText(MessageManager.getString("label.out_to_textbox") + "...");\r
+    sequenceFeature.setText(MessageManager.getString("label.create_sequence_feature"));\r
     sequenceFeature.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1079,7 +1133,7 @@ public class PopupMenu extends JPopupMenu
         sequenceFeature_actionPerformed();
       }
     });
-    textColour.setText("Text Colour");
+    textColour.setText(MessageManager.getString("label.text_colour"));\r
     textColour.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1087,11 +1141,11 @@ public class PopupMenu extends JPopupMenu
         textColour_actionPerformed();
       }
     });
-    jMenu1.setText("Group");
-    structureMenu.setText("Structure");
-    viewStructureMenu.setText("View Structure");
+    jMenu1.setText(MessageManager.getString("label.group"));\r
+    structureMenu.setText(MessageManager.getString("label.structure"));\r
+    viewStructureMenu.setText(MessageManager.getString("label.view_structure"));\r
     // colStructureMenu.setText("Colour By Structure");
-    editSequence.setText("Edit Sequence...");
+    editSequence.setText(MessageManager.getString("label.edit_sequence") + "...");\r
     editSequence.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent actionEvent)
@@ -1131,9 +1185,10 @@ public class PopupMenu extends JPopupMenu
     colourMenu.add(turnColour);
     colourMenu.add(buriedColour);
     colourMenu.add(nucleotideMenuItem);
-    if (ap.getAlignment().isNucleotide())
-    {
-      colourMenu.add(purinePyrimidineColour);
+    if (ap.getAlignment().isNucleotide()) {
+       // JBPNote - commented since the colourscheme isn't functional
+       //  colourMenu.add(RNAInteractionColour);
+       colourMenu.add(purinePyrimidineColour);
     }
     // colourMenu.add(covariationColour);
     colourMenu.add(userDefinedColour);
@@ -1168,6 +1223,9 @@ public class PopupMenu extends JPopupMenu
     editMenu.add(lowerCase);
     editMenu.add(toggle);
     pdbMenu.add(pdbFromFile);
+    // JBPNote: These shouldn't be added here - should appear in a generic 'apply web service to this sequence menu'
+    //    pdbMenu.add(RNAFold);
+    //    pdbMenu.add(ContraFold);
     pdbMenu.add(enterPDB);
     pdbMenu.add(discoverPDB);
     jMenu1.add(groupName);
@@ -1180,7 +1238,7 @@ public class PopupMenu extends JPopupMenu
     structureMenu.add(pdbMenu);
     structureMenu.add(viewStructureMenu);
     // structureMenu.add(colStructureMenu);
-    noColourmenuItem.setText("None");
+    noColourmenuItem.setText(MessageManager.getString("label.none"));\r
     noColourmenuItem.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1189,7 +1247,7 @@ public class PopupMenu extends JPopupMenu
       }
     });
 
-    clustalColour.setText("Clustalx colours");
+    clustalColour.setText(MessageManager.getString("label.clustalx_colours"));\r
     clustalColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1197,7 +1255,7 @@ public class PopupMenu extends JPopupMenu
         clustalColour_actionPerformed();
       }
     });
-    zappoColour.setText("Zappo");
+    zappoColour.setText(MessageManager.getString("label.zappo"));\r
     zappoColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1205,7 +1263,7 @@ public class PopupMenu extends JPopupMenu
         zappoColour_actionPerformed();
       }
     });
-    taylorColour.setText("Taylor");
+    taylorColour.setText(MessageManager.getString("label.taylor"));\r
     taylorColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1213,7 +1271,7 @@ public class PopupMenu extends JPopupMenu
         taylorColour_actionPerformed();
       }
     });
-    hydrophobicityColour.setText("Hydrophobicity");
+    hydrophobicityColour.setText(MessageManager.getString("label.hydrophobicity"));\r
     hydrophobicityColour
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -1222,7 +1280,7 @@ public class PopupMenu extends JPopupMenu
                 hydrophobicityColour_actionPerformed();
               }
             });
-    helixColour.setText("Helix propensity");
+    helixColour.setText(MessageManager.getString("label.helix_propensity"));\r
     helixColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1230,7 +1288,7 @@ public class PopupMenu extends JPopupMenu
         helixColour_actionPerformed();
       }
     });
-    strandColour.setText("Strand propensity");
+    strandColour.setText(MessageManager.getString("label.strand_propensity"));\r
     strandColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1238,7 +1296,7 @@ public class PopupMenu extends JPopupMenu
         strandColour_actionPerformed();
       }
     });
-    turnColour.setText("Turn propensity");
+    turnColour.setText(MessageManager.getString("label.turn_propensity"));\r
     turnColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1246,7 +1304,7 @@ public class PopupMenu extends JPopupMenu
         turnColour_actionPerformed();
       }
     });
-    buriedColour.setText("Buried Index");
+    buriedColour.setText(MessageManager.getString("label.buried_index"));\r
     buriedColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1254,7 +1312,7 @@ public class PopupMenu extends JPopupMenu
         buriedColour_actionPerformed();
       }
     });
-    abovePIDColour.setText("Above % Identity");
+    abovePIDColour.setText(MessageManager.getString("label.above_identity_percentage"));\r
     abovePIDColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1262,7 +1320,7 @@ public class PopupMenu extends JPopupMenu
         abovePIDColour_actionPerformed();
       }
     });
-    userDefinedColour.setText("User Defined...");
+    userDefinedColour.setText(MessageManager.getString("action.user_defined"));\r
     userDefinedColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1270,7 +1328,7 @@ public class PopupMenu extends JPopupMenu
         userDefinedColour_actionPerformed(e);
       }
     });
-    PIDColour.setText("Percentage Identity");
+    PIDColour.setText(MessageManager.getString("label.percentage_identity"));\r
     PIDColour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1278,7 +1336,7 @@ public class PopupMenu extends JPopupMenu
         PIDColour_actionPerformed();
       }
     });
-    BLOSUM62Colour.setText("BLOSUM62");
+    BLOSUM62Colour.setText(MessageManager.getString("label.blosum62"));\r
     BLOSUM62Colour.addActionListener(new java.awt.event.ActionListener()
     {
       public void actionPerformed(ActionEvent e)
@@ -1286,7 +1344,7 @@ public class PopupMenu extends JPopupMenu
         BLOSUM62Colour_actionPerformed();
       }
     });
-    purinePyrimidineColour.setText("Purine/Pyrimidine");
+    purinePyrimidineColour.setText(MessageManager.getString("label.purine_pyrimidine"));\r
     purinePyrimidineColour
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -1295,13 +1353,15 @@ public class PopupMenu extends JPopupMenu
                 purinePyrimidineColour_actionPerformed();
               }
             });
+    
+   
     /*
      * covariationColour.addActionListener(new java.awt.event.ActionListener() {
      * public void actionPerformed(ActionEvent e) {
      * covariationColour_actionPerformed(); } });
      */
 
-    conservationMenuItem.setText("Conservation");
+    conservationMenuItem.setText(MessageManager.getString("label.conservation"));\r
     conservationMenuItem
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -1329,7 +1389,7 @@ public class PopupMenu extends JPopupMenu
     StringBuffer contents = new StringBuffer();
     for (SequenceI seq : sequences)
     {
-      contents.append("<p><h2>Annotation for " + seq.getDisplayId(true)
+      contents.append("<p><h2>" + MessageManager.formatMessage("label.create_sequence_details_report_annotation_for", new String[]{seq.getDisplayId(true)})\r
               + "</h2></p><p>");
       new SequenceAnnotationReport(null)
               .createSequenceAnnotationReport(
@@ -1344,9 +1404,8 @@ public class PopupMenu extends JPopupMenu
     }
     cap.setText("<html>" + contents.toString() + "</html>");
 
-    Desktop.instance.addInternalFrame(cap, "Sequence Details for "
-            + (sequences.length == 1 ? sequences[0].getDisplayId(true)
-                    : "Selection"), 500, 400);
+    Desktop.instance.addInternalFrame(cap, MessageManager.formatMessage("label.sequece_details_for", (sequences.length == 1 ? new String[]{sequences[0].getDisplayId(true)}: new String[]{MessageManager.getString("label.selection")}))\r
+               ,500, 400);\r
 
   }
 
@@ -1482,6 +1541,7 @@ public class PopupMenu extends JPopupMenu
     refresh();
   }
 
+
   /*
    * protected void covariationColour_actionPerformed() { getGroup().cs = new
    * CovariationColourScheme(sequence.getAnnotation()[0]); refresh(); }
@@ -1532,7 +1592,7 @@ public class PopupMenu extends JPopupMenu
   {
     SequenceGroup sg = getGroup();
 
-    if (e.getActionCommand().equals("User Defined..."))
+    if (e.getSource().equals(userDefinedColour))\r
     {
       new UserDefinedColours(ap, sg);
     }
@@ -1609,6 +1669,7 @@ public class PopupMenu extends JPopupMenu
 
     if (conservationMenuItem.isSelected())
     {
+    // JBPNote: Conservation name shouldn't be i18n translated
       Conservation c = new Conservation("Group",
               ResidueProperties.propHash, 3, sg.getSequences(ap.av
                       .getHiddenRepSequences()), sg.getStartRes(),
@@ -1660,8 +1721,8 @@ public class PopupMenu extends JPopupMenu
 
     SequenceGroup sg = getGroup();
     EditNameDialog dialog = new EditNameDialog(sg.getName(),
-            sg.getDescription(), "       Group Name ",
-            "Group Description ", "Edit Group Name/Description",
+            sg.getDescription(), "       " + MessageManager.getString("label.group_name") + " ",\r
+            MessageManager.getString("label.group_description") + " ", MessageManager.getString("label.edit_group_name_description"),\r
             ap.alignFrame);
 
     if (!dialog.accept)
@@ -1700,8 +1761,8 @@ public class PopupMenu extends JPopupMenu
   void sequenceName_actionPerformed()
   {
     EditNameDialog dialog = new EditNameDialog(sequence.getName(),
-            sequence.getDescription(), "       Sequence Name ",
-            "Sequence Description ", "Edit Sequence Name/Description",
+            sequence.getDescription(), "       " + MessageManager.getString("label.sequence_name") + " ",\r
+            MessageManager.getString("label.sequence_description") + " ", MessageManager.getString("label.edit_sequence_name_description"),\r
             ap.alignFrame);
 
     if (!dialog.accept)
@@ -1714,8 +1775,8 @@ public class PopupMenu extends JPopupMenu
       if (dialog.getName().indexOf(" ") > -1)
       {
         JOptionPane.showMessageDialog(ap,
-                "Spaces have been converted to \"_\"",
-                "No spaces allowed in Sequence Name",
+                MessageManager.getString("label.spaces_converted_to_backslashes"),\r
+                MessageManager.getString("label.no_spaces_allowed_sequence_name"),\r
                 JOptionPane.WARNING_MESSAGE);
       }
 
@@ -1758,7 +1819,7 @@ public class PopupMenu extends JPopupMenu
   protected void outline_actionPerformed()
   {
     SequenceGroup sg = getGroup();
-    Color col = JColorChooser.showDialog(this, "Select Outline Colour",
+    Color col = JColorChooser.showDialog(this, MessageManager.getString("label.select_outline_colour"),\r
             Color.BLUE);
 
     if (col != null)
@@ -1815,9 +1876,8 @@ public class PopupMenu extends JPopupMenu
       JOptionPane
               .showInternalMessageDialog(
                       Desktop.desktop,
-                      "Unixers: Couldn't find default web browser."
-                              + "\nAdd the full path to your browser in Preferences.",
-                      "Web browser not found", JOptionPane.WARNING_MESSAGE);
+                      MessageManager.getString("label.web_browser_not_found_unix"),\r
+                      MessageManager.getString("label.web_browser_not_found"), JOptionPane.WARNING_MESSAGE);\r
 
       ex.printStackTrace();
     }
@@ -1883,17 +1943,17 @@ public class PopupMenu extends JPopupMenu
 
       if (source == toggle)
       {
-        description = "Toggle Case";
+        description = MessageManager.getString("label.toggle_case");\r
         caseChange = ChangeCaseCommand.TOGGLE_CASE;
       }
       else if (source == upperCase)
       {
-        description = "To Upper Case";
+        description = MessageManager.getString("label.to_upper_case");\r
         caseChange = ChangeCaseCommand.TO_UPPER;
       }
       else
       {
-        description = "To Lower Case";
+        description = MessageManager.getString("label.to_lower_case");\r
         caseChange = ChangeCaseCommand.TO_LOWER;
       }
 
@@ -1914,7 +1974,7 @@ public class PopupMenu extends JPopupMenu
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
     cap.setForInput(null);
     Desktop.addInternalFrame(cap,
-            "Alignment output - " + e.getActionCommand(), 600, 500);
+            MessageManager.formatMessage("label.alignment_output_command", new String[]{e.getActionCommand()}), 600, 500);\r
 
     String[] omitHidden = null;
 
@@ -1945,10 +2005,8 @@ public class PopupMenu extends JPopupMenu
     jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(
             jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
     chooser.setFileView(new jalview.io.JalviewFileView());
-    chooser.setDialogTitle("Select a PDB file for "
-            + sequence.getDisplayId(false));
-    chooser.setToolTipText("Load a PDB file and associate it with sequence '"
-            + sequence.getDisplayId(false) + "'");
+    chooser.setDialogTitle(MessageManager.formatMessage("label.select_pdb_file_for", new String[]{sequence.getDisplayId(false)}));\r
+    chooser.setToolTipText(MessageManager.formatMessage("label.load_pdb_file_associate_with_sequence", new String[]{new Integer(sequence.getDisplayId(false)).toString()}));\r
 
     int value = chooser.showOpenDialog(null);
 
@@ -1961,11 +2019,22 @@ public class PopupMenu extends JPopupMenu
     }
 
   }
-
+    // JBNote: commented out - these won't be instantiated here...!  
+//  public void RNAFold_actionPerformed() throws Exception
+//  {
+//       Predict2D P2D = new Predict2D();
+//       P2D.getStructure2DFromRNAFold("toto");
+//  }
+//  
+//  public void ContraFold_actionPerformed() throws Exception
+//  {
+//       Predict2D P2D = new Predict2D();
+//       P2D.getStructure2DFromContraFold("toto");
+//  }
   public void enterPDB_actionPerformed()
   {
     String id = JOptionPane.showInternalInputDialog(Desktop.desktop,
-            "Enter PDB Id", "Enter PDB Id", JOptionPane.QUESTION_MESSAGE);
+            MessageManager.getString("label.enter_pdb_id"), MessageManager.getString("label.enter_pdb_id"), JOptionPane.QUESTION_MESSAGE);\r
 
     if (id != null && id.length() > 0)
     {
@@ -2071,12 +2140,12 @@ public class PopupMenu extends JPopupMenu
 
       EditNameDialog dialog = new EditNameDialog(
               sequence.getSequenceAsString(sg.getStartRes(),
-                      sg.getEndRes() + 1), null, "Edit Sequence ", null,
-              "Edit Sequence", ap.alignFrame);
+                      sg.getEndRes() + 1), null, MessageManager.getString("label.edit_sequence"), null,\r
+                      MessageManager.getString("label.edit_sequence"), ap.alignFrame);\r
 
       if (dialog.accept)
       {
-        EditCommand editCommand = new EditCommand("Edit Sequences",
+        EditCommand editCommand = new EditCommand(MessageManager.getString("label.edit_sequences"),\r
                 EditCommand.REPLACE, dialog.getName().replace(' ',
                         ap.av.getGapCharacter()),
                 sg.getSequencesAsArray(ap.av.getHiddenRepSequences()),