Index: TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/jfreechart/JFCAHCChartCreator.java
===================================================================
--- TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/jfreechart/JFCAHCChartCreator.java	(revision 3399)
+++ TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/jfreechart/JFCAHCChartCreator.java	(revision 3400)
@@ -19,7 +19,7 @@
 	@Override
 	public JFreeChart createChart(AHC result) {
 		
-		System.err.println("JFCAHCChartCreator.createChart(): not yet implemented.");
+		System.err.println("JFCAHCChartCreator.createChart() is not yet implemented."); //$NON-NLS-1$
 		
 		return null;
 		
Index: TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/r/RAHCChartCreator.java
===================================================================
--- TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/r/RAHCChartCreator.java	(revision 3399)
+++ TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/r/RAHCChartCreator.java	(revision 3400)
@@ -22,7 +22,7 @@
 		String cmd = null;
 		// 2D
 		if (ahc.isRendering2D()) {
-			cmd = "plot.HCPC(" + ahc.getRSymbol() + ", new.plot=FALSE, choice=\"tree\")";
+			cmd = "plot.HCPC(" + ahc.getRSymbol() + ", new.plot=FALSE, choice=\"tree\")"; //$NON-NLS-1$ //$NON-NLS-2$
 			
 			// FIXME: SJ: for tests without drawing the inertia barplot. Without it, the max available clusters can exceed 16
 			// cmd = "plot.HCPC(" + cah.getSymbol() + ", new.plot=FALSE, choice=\"tree\", tree.barplot=FALSE)"; //$NON-NLS-1$ //$NON-NLS-2$
@@ -33,7 +33,7 @@
 		}
 		// 3D
 		else {
-			cmd = "plot.HCPC(" + ahc.getRSymbol() + ", new.plot=FALSE)";
+			cmd = "plot.HCPC(" + ahc.getRSymbol() + ", new.plot=FALSE)"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 		
 		return this.getChartsEngine().plot(file, cmd);
Index: TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java
===================================================================
--- TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java	(revision 3399)
+++ TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java	(revision 3400)
@@ -14,6 +14,8 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.ahc.core.messages.messages"; //$NON-NLS-1$
 	
+	public static String AHC_computedWithTheP0MethodAndTheP1Metric;
+
 	public static String P0classesOfP1;
 	
 	public static String columns;
@@ -22,9 +24,15 @@
 	
 	public static String RESULT_TYPE;
 	
+	public static String error_error2;
+
 	public static String error_errorWhileExportingCAHToTXT;
 	
+	public static String common_ok;
+
 	public static String computingAHC;
+
+	public static String Error;
 	
 	public static String info_ahcOfTheP0PartitionCommaP1Property;
 	
@@ -34,7 +42,11 @@
 	
 	public static String error_canNotComputeAHCOnLexicalTableWithLessThan4Columns;
 	
+	public static String error_canNotComputeAHCWith;
+
 	public static String error_canNotComputeAHCWithLessThan4RowsInTheTable;
+
+	public static String failToBuildTheAHCForSelectionP1DbldotP1;
 	
 	
 	
Index: TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages.properties
===================================================================
--- TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages.properties	(revision 3399)
+++ TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages.properties	(revision 3400)
@@ -2,17 +2,23 @@
 #TXM messages generated by the PluginMessagesManager class
 #Tue Dec 18 10:24:08 CET 2018
 
+AHC_computedWithTheP0MethodAndTheP1Metric=\ computed with the {0} method and the {1} metric.
 P0classesOfP1 = {0} clusters of {1}.
 
 RESULT_TYPE = HCA
 
 columns = columns
 
+common_ok=
 computingAHC = Computing AHC...
+Error=Error
 
 error_canNotComputeAHCOnLexicalTableWithLessThan4Columns = ** Can not compute AHC on lexical table with less than 4 columns in the table
+error_canNotComputeAHCWith=
 error_canNotComputeAHCWithLessThan4RowsInTheTable        = ** Can not compute AHC with less than 4 rows in the table
+error_error2=
 error_errorWhileExportingCAHToTXT                        = ** Error while exporting HCA result.
+failToBuildTheAHCForSelectionP1DbldotP1=Failed to build the AHC for selection 
 
 info_ahcOfTheP0LexcialTable             = AHC of the {0} lexical table...
 info_ahcOfTheP0PartitionCommaP1Property = AHC of {0} partition, {1} property...
Index: TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java
===================================================================
--- TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java	(revision 3399)
+++ TXM/trunk/org.txm.ahc.core/src/org/txm/ahc/core/functions/AHC.java	(revision 3400)
@@ -288,7 +288,7 @@
 	@Override
 	public boolean setParameters(TXMParameters parameters) {
 		// TODO Auto-generated method stub
-		System.err.println("AHC.setParameters(): not yet implemented.");
+		System.err.println("AHC.setParameters() is not yet implemented."); //$NON-NLS-1$
 		return true;
 	}
 	
@@ -397,7 +397,7 @@
 				// FIXME: check this code for the CAH 3D chart implementation
 				RWorkspace rw = RWorkspace.getRWorkspaceInstance();
 				for (int i = 0; i < 2; i++) { // 2 dimensions
-					REXP sv = rw.extractItemFromListByName(symbol, "data.clust[," + (i + 1) + "]"); //$NON-NLS-1$
+					REXP sv = rw.extractItemFromListByName(symbol, "data.clust[," + (i + 1) + "]"); //$NON-NLS-1$ //$NON-NLS-2$
 					double[] coords = RWorkspace.toDouble(sv);
 					for (int j = 0; j < coords.length; j++) {
 						if (this.clusterCoords == null) {
@@ -479,7 +479,7 @@
 		if (this.clusterOrderedRowNames == null) {
 			try {
 				RWorkspace rw = RWorkspace.getRWorkspaceInstance();
-				REXP sv = rw.extractItemFromListByName(symbol, "call$t$tree$labels[c(" + symbol + "$call$t$tree$order)]"); //$NON-NLS-1$
+				REXP sv = rw.extractItemFromListByName(symbol, "call$t$tree$labels[c(" + symbol + "$call$t$tree$order)]"); //$NON-NLS-1$ //$NON-NLS-2$
 				this.clusterOrderedRowNames = sv.asStrings();
 			}
 			catch (Exception e) {
@@ -671,7 +671,7 @@
 	
 	@Override
 	public String[] getExportTXTExtensions() {
-		return new String[] { "*.txt" };
+		return new String[] { "*.txt" }; //$NON-NLS-1$
 	}
 	
 	
@@ -712,7 +712,7 @@
 	
 	@Override
 	public String getDetails() {
-		return NLS.bind(this.getName() + "\ncomputed with the {0} method and the {1} metric.", method, metric);
+		return NLS.bind(this.getName() + AHCCoreMessages.AHC_computedWithTheP0MethodAndTheP1Metric, method, metric);
 	}
 	
 	@Override
@@ -737,7 +737,7 @@
 			// FIXME: SJ: this special case is possible when creating Specificities then calling the command on the invisible Lexical Table
 			// need to if we need a special log message here
 			else {
-				return "";
+				return ""; //$NON-NLS-1$
 			}
 		}
 		
Index: TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java	(revision 3399)
+++ TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java	(revision 3400)
@@ -19,7 +19,7 @@
 	
 	
 	public static final ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(AHCAdapterFactory.class).getSymbolicName(),
-			"platform:/plugin/" + FrameworkUtil.getBundle(AHCAdapterFactory.class).getSymbolicName() + "/icons/cah.png"); //$NON-NLS-1$
+			"platform:/plugin/" + FrameworkUtil.getBundle(AHCAdapterFactory.class).getSymbolicName() + "/icons/cah.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	
 	/**
 	 * Gets the adapter.
Index: TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java
===================================================================
--- TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java	(revision 3399)
+++ TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java	(revision 3400)
@@ -99,12 +99,12 @@
 				
 				// FIXME: SJ: problem here because we need the LT to be computed to make this check
 				if (lexicalTable.hasBeenComputedOnce() && lexicalTable.getNColumns() < 4) {
-					MessageDialog.openError(window.getShell(), "Error", AHCCoreMessages.error_canNotComputeAHCOnLexicalTableWithLessThan4Columns);
+					MessageDialog.openError(window.getShell(), AHCCoreMessages.Error, AHCCoreMessages.error_canNotComputeAHCOnLexicalTableWithLessThan4Columns);
 					return null;
 				}
 				// FIXME: SJ: problem here because we need the LT has been computed to make this check
 				if (lexicalTable.hasBeenComputedOnce() && lexicalTable.getNRows() < 4) {
-					MessageDialog.openError(window.getShell(), "Error", AHCCoreMessages.error_canNotComputeAHCWithLessThan4RowsInTheTable);
+					MessageDialog.openError(window.getShell(), AHCCoreMessages.Error, AHCCoreMessages.error_canNotComputeAHCWithLessThan4RowsInTheTable);
 					return null;
 				}
 				
@@ -137,7 +137,7 @@
 			ChartEditor.openEditor(ahc);
 		}
 		catch (Exception e) {
-			Log.severe("Failed to build the AHC for selection " + selection + ": " + e);
+			Log.severe(AHCCoreMessages.failToBuildTheAHCForSelectionP1DbldotP1 + selection + ": " + e); //$NON-NLS-2$
 			Log.printStackTrace(e);
 			return null;
 		}
