From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 22 Aug 2018 10:31:04 +0000 (+0100)
Subject: JAL-3049 JAL-3032 tidy/i18n code, remove redundant tooltip registration
X-Git-Tag: Release_2_11_0~17^2~71
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cc52d6f3b8199cb3e9eab962feeab735c5bdc310;p=jalview.git

JAL-3049 JAL-3032 tidy/i18n code, remove redundant tooltip registration

Conflicts:
	resources/lang/Messages.properties
	resources/lang/Messages_es.properties
	src/jalview/gui/FeatureSettings.java
---

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index c430417..8436a07 100644
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1412,4 +1412,11 @@ label.confirm_deletion = Confirm deletion of ''{0}''?
 label.delete = Delete
 label.rename = Rename
 label.keep = Keep
-label.file_info = (modified {0}, size {1})
\ No newline at end of file
+label.file_info = (modified {0}, size {1})
+label.annotation_name = Annotation Name
+label.annotation_description = Annotation Description 
+label.edit_annotation_name_description = Edit Annotation Name/Description
+label.alignment = alignment
+label.pca = PCA
+label.create_image_of = Create {0} image of {1}
+label.click_to_edit = Click to edit, right-click for menu
diff --git a/resources/lang/Messages_es.properties b/resources/lang/Messages_es.properties
index e7b9694..ac74a32 100644
--- a/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@ -1413,4 +1413,11 @@ label.confirm_delete = Confirmar eliminar ''{0}''?
 label.delete = Borrar
 label.rename = Cambiar
 label.keep = Mantener
-label.file_info = (modificado {0}, tamaño {1})
\ No newline at end of file
+label.file_info = (modificado {0}, tamaño {1})
+label.annotation_name = Nombre de la anotación
+label.annotation_description = Descripción de la anotación 
+label.edit_annotation_name_description = Editar el nombre/descripción de la anotación
+label.alignment = alineamiento
+label.pca = ACP
+label.create_image_of = Crear imagen {0} de {1}
+label.click_to_edit = Haga clic para editar, clic en el botón derecho para ver el menú  
diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 390427a..a15a607 100644
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -130,7 +130,7 @@ public class FeatureSettings extends JPanel
 
   private static final int MIN_HEIGHT = 400;
 
-  private final static String BASE_TOOLTIP = "Click to edit, right-click for menu";
+  private final static String BASE_TOOLTIP = MessageManager.getString("label.click_to_edit");
 
   final FeatureRenderer fr;
 
@@ -201,8 +201,6 @@ public class FeatureSettings extends JPanel
 
     table = new JTable()
     {
-      static final String tt = "Click to edit, right-click for menu"; // todo i18n
-      
       @Override
       public String getToolTipText(MouseEvent e)
       {
@@ -232,6 +230,7 @@ public class FeatureSettings extends JPanel
         default:
           break;
         }
+        
         return tip;
       }
 
@@ -255,9 +254,6 @@ public class FeatureSettings extends JPanel
     tableHeader.setReorderingAllowed(false);
     table.setFont(new Font("Verdana", Font.PLAIN, 12));
 
-    // table.setDefaultRenderer(Color.class, new ColorRenderer());
-    // table.setDefaultEditor(Color.class, new ColorEditor(this));
-    //
     table.setDefaultEditor(FeatureColour.class, new ColorEditor(this));
     table.setDefaultRenderer(FeatureColour.class, new ColorRenderer());