Index: tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java
===================================================================
--- tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java	(revision 1334)
+++ tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java	(revision 1335)
@@ -99,7 +99,7 @@
 					JobsTimer.start();
 
 					if (!(element instanceof QueryIndex)) {
-						System.out.println(TXMUIMessages.ComputeCooccurrences_1+ element);
+						System.out.println(TXMUIMessages.cannotComputeCooccurrencesWithTheSelection+ element);
 						return Status.CANCEL_STATUS;
 					}
 					QueryIndex qi = ((QueryIndex)element);
@@ -121,7 +121,7 @@
 
 					if (cooc == null) return null;
 					
-					System.out.println(TXMUIMessages.ComputeCoocMatrix_0+cooc.getSymbol());
+					System.out.println(TXMUIMessages.coocMatrixDDot+cooc.getSymbol());
 
 					syncExec(new Runnable() {
 						@Override
@@ -136,7 +136,7 @@
 					return Status.CANCEL_STATUS;
 				} catch (Exception e) {
 					Log.printStackTrace(e);
-					try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+					try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 					} catch (Exception e1) { e1.printStackTrace(); }
 				} finally {
 					monitor.done();
@@ -166,7 +166,7 @@
 		}
 
 		System.out.println(TXMCoreMessages.common_queries+queries);
-		System.out.println(TXMUIMessages.MergeCols_5+names);
+		System.out.println(TXMUIMessages.namesDDot+names);
 
 		QueryAutoCooccurrence cooc = null;
 		try {
@@ -176,18 +176,18 @@
 			System.out.println("Estimated time: "+(nqueries*reqtime/1000)+" secs");
 			cooc = new QueryAutoCooccurrence(corpus);
 			cooc.setParameters(queries, names, dist, min, struct, oriented, new ConsoleProgressBar(nqueries));
-			System.out.println(TXMUIMessages.ComputeCoocMatrix_1+cooc.getNNodes());
-			System.out.println(TXMUIMessages.ComputeCoocMatrix_2+cooc.getNEdges());
-			System.out.println(TXMUIMessages.ComputeCoocMatrix_3+dist);
+			System.out.println(TXMUIMessages.numberOfNodesDDot+cooc.getNNodes());
+			System.out.println(TXMUIMessages.numberOfEdgesDDot+cooc.getNEdges());
+			System.out.println(TXMUIMessages.distance_2+dist);
 
 			if (outfile != null) {
 				cooc.toGraphml(outfile);
-				System.out.println(TXMUIMessages.ComputeCoocMatrix_4+outfile);
+				System.out.println(TXMUIMessages.writingCoocMatrixInGRAPHMLFileDDot+outfile);
 			}
 
 		} catch (Exception e) {
 			Log.printStackTrace(e);
-			try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+			try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 			} catch (Exception e1) { e1.printStackTrace(); }
 		}
 		return cooc;
@@ -227,7 +227,7 @@
 		@Override
 		protected void configureShell(Shell newShell) {
 			super.configureShell(newShell);
-			newShell.setText(TXMUIMessages.ComputeCoocMatrix_7);
+			newShell.setText(TXMUIMessages.coocMatrixParameters);
 		}
 
 		/* (non-Javadoc)
@@ -265,7 +265,7 @@
 			}
 
 			Label distLabel = new Label(composite, SWT.NONE);
-			distLabel.setText(TXMUIMessages.ComputeCoocMatrix_10);
+			distLabel.setText(TXMUIMessages.distance);
 			distLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 					false, false));
 			distSpinner = new Spinner(composite, SWT.BORDER);
@@ -274,7 +274,7 @@
 			distSpinner.setSelection(10);
 
 			Label minLabel = new Label(composite, SWT.NONE);
-			minLabel.setText(TXMUIMessages.ComputeCoocMatrix_11);
+			minLabel.setText(TXMUIMessages.minimalCoFrequence);
 			minLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 					false, false));
 			minSpinner = new Spinner(composite, SWT.BORDER);
@@ -290,12 +290,12 @@
 			orientedButton.setSelection(false);
 
 			outfileLabel = new Label(composite, SWT.NONE);
-			outfileLabel.setText(TXMUIMessages.ComputeCoocMatrix_12);
+			outfileLabel.setText(TXMUIMessages.outfileDDotNone);
 			outfileLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 					false, false));
 
 			Button outfileButton = new Button(composite, SWT.PUSH);
-			outfileButton.setText(TXMUIMessages.ComputeCoocMatrix_13);
+			outfileButton.setText(TXMUIMessages.chooseOutfile);
 			outfileButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -354,4 +354,4 @@
 			super.okPressed();
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java
===================================================================
--- tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java	(revision 1334)
+++ tmp/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java	(revision 1335)
@@ -101,7 +101,7 @@
 					JobsTimer.start();
 
 					if (!(element instanceof CQPCorpus)) {
-						System.out.println(TXMUIMessages.ComputeCooccurrences_1+ element);
+						System.out.println(TXMUIMessages.cannotComputeCooccurrencesWithTheSelection+ element);
 						return Status.CANCEL_STATUS;
 					}
 					CQPCorpus corpus = ((CQPCorpus)element);
@@ -122,7 +122,7 @@
 
 					if (cooc == null) return null;
 
-					System.out.println(TXMUIMessages.ComputeCoocMatrix_0+cooc.getSymbol());
+					System.out.println(TXMUIMessages.coocMatrixDDot+cooc.getSymbol());
 
 					syncExec(new Runnable() {
 						@Override
@@ -137,7 +137,7 @@
 					return Status.CANCEL_STATUS;
 				} catch (Exception e) {
 					Log.printStackTrace(e);
-					try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+					try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 					} catch (Exception e1) { e1.printStackTrace(); }
 				} finally {
 					monitor.done();
@@ -164,7 +164,7 @@
 		getQueriesAndNames(dialog.getQueryFile2(), queries2, names2);
 
 		System.out.println(TXMCoreMessages.common_queries + queries1);
-		System.out.println(TXMUIMessages.MergeCols_5+names1);
+		System.out.println(TXMUIMessages.namesDDot+names1);
 
 		QueryCooccurrence cooc = null;
 		try {
@@ -174,13 +174,13 @@
 			cooc = new QueryCooccurrence(corpus);
 			cooc.setParameters(queries1, names1, queries2, names2, dist, min, struct);
 			cooc.compute();
-			System.out.println(TXMUIMessages.ComputeCoocMatrix_1+cooc.getNNodes());
-			System.out.println(TXMUIMessages.ComputeCoocMatrix_2+cooc.getNEdges());
-			System.out.println(TXMUIMessages.ComputeCoocMatrix_3+dist);
+			System.out.println(TXMUIMessages.numberOfNodesDDot+cooc.getNNodes());
+			System.out.println(TXMUIMessages.numberOfEdgesDDot+cooc.getNEdges());
+			System.out.println(TXMUIMessages.distance_2+dist);
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			Log.printStackTrace(e);
-			try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+			try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 			} catch (Exception e1) { e1.printStackTrace(); }
 		}
 		return cooc;
@@ -242,7 +242,7 @@
 		@Override
 		protected void configureShell(Shell newShell) {
 			super.configureShell(newShell);
-			newShell.setText(TXMUIMessages.ComputeCoocMatrix_7);
+			newShell.setText(TXMUIMessages.coocMatrixParameters);
 		}
 
 		/* (non-Javadoc)
@@ -280,7 +280,7 @@
 			}
 
 			Label distLabel = new Label(composite, SWT.NONE);
-			distLabel.setText(TXMUIMessages.ComputeCoocMatrix_10);
+			distLabel.setText(TXMUIMessages.distance);
 			distLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 					false, false));
 			distSpinner = new Spinner(composite, SWT.BORDER);
@@ -289,7 +289,7 @@
 			distSpinner.setSelection(10);
 
 			Label minLabel = new Label(composite, SWT.NONE);
-			minLabel.setText(TXMUIMessages.ComputeCoocMatrix_11);
+			minLabel.setText(TXMUIMessages.minimalCoFrequence);
 			minLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 					false, false));
 			minSpinner = new Spinner(composite, SWT.BORDER);
@@ -394,4 +394,4 @@
 			super.okPressed();
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/preferences/TreeTaggerPreferencePage.java
===================================================================
--- tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/preferences/TreeTaggerPreferencePage.java	(revision 1334)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/preferences/TreeTaggerPreferencePage.java	(revision 1335)
@@ -55,8 +55,8 @@
 	@Override
 	public void createFieldEditors() {
 
-		this.addField(new DirectoryFieldEditor(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerUIMessages.TreeTaggerPreferencePage_1, this.getFieldEditorParent()));
-		this.addField(new DirectoryFieldEditor(TreeTaggerPreferences.MODELS_PATH, TreeTaggerUIMessages.TreeTaggerPreferencePage_2, this.getFieldEditorParent()));
+		this.addField(new DirectoryFieldEditor(TreeTaggerPreferences.INSTALL_PATH, TreeTaggerUIMessages.pathToInstallDirectory, this.getFieldEditorParent()));
+		this.addField(new DirectoryFieldEditor(TreeTaggerPreferences.MODELS_PATH, TreeTaggerUIMessages.pathToModelsDirectory, this.getFieldEditorParent()));
 
 		Label l = new Label(this.getFieldEditorParent(), SWT.SEPARATOR|SWT.HORIZONTAL);
 		l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false, 3,1));
@@ -101,4 +101,4 @@
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(TreeTaggerPreferences.getInstance().getPreferencesNodeQualifier()));
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,3 +1,4 @@
-
-TreeTaggerPreferencePage_1 = Путь к установочной папке TreeTagger
-TreeTaggerPreferencePage_2 = Путь к папке с языковыми моделами для TreeTagger
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+pathToInstallDirectory=Путь к установочной папке TreeTagger
+pathToModelsDirectory=Путь к папке с языковыми моделами для TreeTagger
Index: tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,3 +1,4 @@
-
-TreeTaggerPreferencePage_1 = Chemin du dossier d'installation
-TreeTaggerPreferencePage_2 = Chemin du dossier de modèles linguistiques
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+pathToInstallDirectory=Chemin du dossier d'installation
+pathToModelsDirectory=Chemin du dossier de modèles linguistiques
Index: tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/TreeTaggerUIMessages.java
===================================================================
--- tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/TreeTaggerUIMessages.java	(revision 1334)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/TreeTaggerUIMessages.java	(revision 1335)
@@ -1,29 +1,29 @@
-package org.txm.treetagger.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * TreeTagger UI Messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class TreeTaggerUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.treetagger.rcp.messages.messages"; //$NON-NLS-1$
-	
-	public static String TreeTaggerPreferencePage_1;
-	public static String TreeTaggerPreferencePage_2;
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, TreeTaggerUIMessages.class);
-	}
-
-	private TreeTaggerUIMessages() {
-	}
-	
-}
+package org.txm.treetagger.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * TreeTagger UI Messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class TreeTaggerUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.treetagger.rcp.messages.messages"; //$NON-NLS-1$
+	
+	public static String pathToInstallDirectory; 
+	public static String pathToModelsDirectory; 
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, TreeTaggerUIMessages.class);
+	}
+
+	private TreeTaggerUIMessages() {
+	}
+	
+}
Index: tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages.properties	(revision 1335)
@@ -1,3 +1,4 @@
-
-TreeTaggerPreferencePage_1 = Path to install directory
-TreeTaggerPreferencePage_2 = Path to models directory
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+pathToInstallDirectory=Path to install directory
+pathToModelsDirectory=Path to models directory
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java	(revision 1334)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java	(revision 1335)
@@ -107,7 +107,7 @@
 				return null;
 			}
 			try {
-				String title = AHCUIMessages.bind(AHCUIMessages.ComputeCAH_0, partition.getName());
+				String title = AHCUIMessages.bind(AHCUIMessages.computingClassificationWithP0, partition.getName());
 				int vMax = CAPreferences.getInstance().getInt(TXMPreferences.V_MAX);
 				int fMin =  CAPreferences.getInstance().getInt(TXMPreferences.F_MIN);
 				Shell shell = Display.getCurrent().getActiveShell();
@@ -141,4 +141,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/preferences/AHCPreferencePage.java
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/preferences/AHCPreferencePage.java	(revision 1334)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/preferences/AHCPreferencePage.java	(revision 1335)
@@ -54,7 +54,7 @@
 	@Override
 	public void createFieldEditors() {
 
-		IntegerFieldEditor nClusters = new IntegerFieldEditor(AHCPreferences.N_CLUSTERS, AHCUIMessages.CAHPreferencePage_2, getFieldEditorParent());
+		IntegerFieldEditor nClusters = new IntegerFieldEditor(AHCPreferences.N_CLUSTERS, AHCUIMessages.numberOfClusters, getFieldEditorParent());
 		addField(nClusters);
 
 		String list[] = AHC.getMethods(); 
@@ -62,7 +62,7 @@
 		for(int i = 0 ; i < list.length ; i++)
 			methods[i][0] = methods[i][1] = list[i];
 				
-		ComboFieldEditor method = new ComboFieldEditor(AHCPreferences.METHOD, AHCUIMessages.CAHPreferencePage_3, methods, getFieldEditorParent());
+		ComboFieldEditor method = new ComboFieldEditor(AHCPreferences.METHOD, AHCUIMessages.method, methods, getFieldEditorParent());
 		addField(method);
 
 		list = AHC.getMetrics(); 
@@ -78,7 +78,7 @@
 		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(getFieldEditorParent());
 
 		String[][] labelAndValues = {{"2D", "true"}, {"3D", "false"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		RadioGroupFieldEditor default2D3Ddisplay = new RadioGroupFieldEditor(AHCPreferences.RENDERING_2D, AHCUIMessages.preferences_displayChartIn2D, 2, labelAndValues, chartsTab);
+		RadioGroupFieldEditor default2D3Ddisplay = new RadioGroupFieldEditor(AHCPreferences.RENDERING_2D, AHCUIMessages.displayChartsIn2D, 2, labelAndValues, chartsTab);
 		addField(default2D3Ddisplay);
 		
 		
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,14 +1,10 @@
-
-CAHPreferencePage_2 = Число кластеров
-CAHPreferencePage_3 = Метод
-
-ComputeCAH_0 = Расчет Классификации {0}
-
-common_metric = Метрика
-
-error_canNotComputeAHCWith = 
-
-preferences_displayChartIn2D = Показывать графики в 2D
-
-tooltips_computeColumns = Колонки
-tooltips_computeRows    = Строчки
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+common_metric=Метрика
+computeColumns=Колонки
+computeRows=Строчки
+computingClassificationWithP0=Расчет Классификации {0}
+displayChartsIn2D=Показывать графики в 2D
+error_canNotComputeAHCWith=
+method=Метод
+numberOfClusters=Число кластеров
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,16 +1,11 @@
-
-CAHPreferencePage_2 = Nombre de clusters
-CAHPreferencePage_3 = Méthode
-
-ComputeCAH_0 = Calcul de la classification avec {0}.
-
-common_metric = Métrique
-
-error_canNotComputeAHCWith = Impossible de calculer la classification avec seulement {0} parties (minimum = 4).
-
-preferences_displayChartIn2D = Afficher les graphiques en 2D
-
-toolbars_numberOfClusters = Nombre de clusters :
-
-tooltips_computeColumns = Classer les colonnes
-tooltips_computeRows    = Classer les lignes
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+common_metric=Métrique
+computeColumns=Classer les colonnes
+computeRows=Classer les lignes
+computingClassificationWithP0=Calcul de la classification avec {0}.
+displayChartsIn2D=Afficher les graphiques en 2D
+error_canNotComputeAHCWith=Impossible de calculer la classification avec seulement {0} parties (minimum \= 4).
+method=Méthode
+numberOfClusters=Nombre de clusters
+numberOfClustersDDot=Nombre de clusters \:
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java	(revision 1334)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/AHCUIMessages.java	(revision 1335)
@@ -15,17 +15,17 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.ahc.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String preferences_displayChartIn2D;
-	public static String CAHPreferencePage_2;
-	public static String CAHPreferencePage_3;
+	public static String displayChartsIn2D; 
+	public static String numberOfClusters; 
+	public static String method; 
 	public static String common_metric;
 	
-	public static String ComputeCAH_0;
+	public static String computingClassificationWithP0; 
 	
-	public static String tooltips_computeColumns;
-	public static String tooltips_computeRows;
+	public static String computeColumns; 
+	public static String computeRows; 
 	
-	public static String toolbars_numberOfClusters;
+	public static String numberOfClustersDDot; 
 	
 	public static String error_canNotComputeAHCWith;
 	
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/messages/messages.properties	(revision 1335)
@@ -1,16 +1,11 @@
-
-CAHPreferencePage_2 = Number of clusters
-CAHPreferencePage_3 = Method
-
-ComputeCAH_0 = Computing classification with {0}.
-
-common_metric = Metric
-
-error_canNotComputeAHCWith = Can not compute classification with only {0} parts (the minimum is 4 parts).
-
-preferences_displayChartIn2D = Display charts in 2D
-
-toolbars_numberOfClusters = Number of clusters:
-
-tooltips_computeColumns = Compute columns
-tooltips_computeRows    = Compute rows
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+common_metric=Metric
+computeColumns=Compute columns
+computeRows=Compute rows
+computingClassificationWithP0=Computing classification with {0}.
+displayChartsIn2D=Display charts in 2D
+error_canNotComputeAHCWith=Can not compute classification with only {0} parts (the minimum is 4 parts).
+method=Method
+numberOfClusters=Number of clusters
+numberOfClustersDDot=Number of clusters\:
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java	(revision 1334)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java	(revision 1335)
@@ -77,7 +77,7 @@
 		
 		// Number of clusters
 	    CLabel clustersLabel = new CLabel(this.chartToolBar, SWT.CENTER);
-		clustersLabel.setText(AHCUIMessages.toolbars_numberOfClusters);
+		clustersLabel.setText(AHCUIMessages.numberOfClustersDDot);
 		this.chartToolBar.addControl(clustersLabel);
 
 	    this.numberOfClusters = new Spinner(this.chartToolBar, SWT.BORDER);
@@ -90,13 +90,13 @@
 
 		// Columns
 		this.columnsComputing = new ToolItem(this.chartToolBar, SWT.RADIO);
-		this.columnsComputing.setToolTipText(AHCUIMessages.tooltips_computeColumns);
+		this.columnsComputing.setToolTipText(AHCUIMessages.computeColumns);
 		this.columnsComputing.setImage(IImageKeys.getImage(AHCChartEditor.class, "icons/compute_columns.png")); //$NON-NLS-1$
 		this.columnsComputing.addSelectionListener(computeSelectionListener);
 
 		// Rows
 		this.rowsComputing = new ToolItem(this.chartToolBar, SWT.RADIO);
-		this.rowsComputing.setToolTipText(AHCUIMessages.tooltips_computeRows);
+		this.rowsComputing.setToolTipText(AHCUIMessages.computeRows);
 		this.rowsComputing.setImage(IImageKeys.getImage(AHCChartEditor.class, "icons/compute_rows.png")); //$NON-NLS-1$
 
 		
@@ -122,4 +122,4 @@
 		this.rowsComputing.setSelection(!ahc.isColumnsComputing());
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages_fr.properties	(revision 1335)
@@ -1,16 +1,14 @@
-
-DROP_QUERYRESULT = Suppression du résultat de requête {0}...
-DROP_SUBCORPUS   = Suppression du sous-corpus {0}...
-
-END_SUBCORPUS_SIZE = Taille du sous-corpus {0} ({1}) calculée en {2} ms.
-
-SUBCORPUS_CREATED = Sous-corpus {0} créé en {1} ms.
-
-info_creatingNewPartition                       = Création d''une nouvelle partition du corpus {0} : {1}...
-info_creatingSubcorpusXFromCorpusYWithTheQueryZ = Création du sous-corpus {0} à partir du corpus {1} et de la requête {2}...
-info_deletingPartition                          = Suppression de la partition {0}...
-info_partCreatedInXMs                           = Partie {0} créée en {1} ms.
-info_partXCreatedWithQueryZ                     = Partie {0} créée à partir de la requête {1}.
-info_partitionCreatedInXMs                      = Partition {0} créée en {1} ms.
-info_searchEngineStopped                        = Moteur de recherche arrêté.
-info_stoppingSearchEngine                       = Arrêt du moteur de recherche...
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+deletingQueryResultP0=Suppression du résultat de requête {0}...
+deletingSubcorpusP0=Suppression du sous-corpus {0}...
+info_creatingNewPartition=Création d''une nouvelle partition du corpus {0} \: {1}...
+info_creatingSubcorpusXFromCorpusYWithTheQueryZ=Création du sous-corpus {0} à partir du corpus {1} et de la requête {2}...
+info_deletingPartition=Suppression de la partition {0}...
+info_partCreatedInXMs=Partie {0} créée en {1} ms.
+info_partitionCreatedInXMs=Partition {0} créée en {1} ms.
+info_partXCreatedWithQueryZ=Partie {0} créée à partir de la requête {1}.
+info_searchEngineStopped=Moteur de recherche arrêté.
+info_stoppingSearchEngine=Arrêt du moteur de recherche...
+sizeOfSubcorpusP0P1ComputedInP2Ms=Taille du sous-corpus {0} ({1}) calculée en {2} ms.
+subcorpusP0CreatedInP1Ms=Sous-corpus {0} créé en {1} ms.
Index: tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/SearchEngineCoreMessages.java
===================================================================
--- tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/SearchEngineCoreMessages.java	(revision 1334)
+++ tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/SearchEngineCoreMessages.java	(revision 1335)
@@ -1,42 +1,42 @@
-package org.txm.searchengine.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * Search engine core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class SearchEngineCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.searchengine.core.messages.messages"; //$NON-NLS-1$
-
-	public static String info_creatingNewPartition;
-	public static String info_deletingPartition;
-	public static String info_partCreatedInXMs;
-	public static String info_partitionCreatedInXMs;
-	public static String DROP_QUERYRESULT;
-	public static String info_partXCreatedWithQueryZ;
-	public static String info_creatingSubcorpusXFromCorpusYWithTheQueryZ;
-	public static String DROP_SUBCORPUS;
-	public static String END_SUBCORPUS_SIZE;
-	public static String info_searchEngineStopped;
-	public static String info_stoppingSearchEngine;
-
-	public static String SUBCORPUS_CREATED;
-
-	
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, SearchEngineCoreMessages.class);
-	}
-
-	private SearchEngineCoreMessages() {
-	}
-	
-}
+package org.txm.searchengine.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Search engine core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class SearchEngineCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.searchengine.core.messages.messages"; //$NON-NLS-1$
+
+	public static String info_creatingNewPartition;
+	public static String info_deletingPartition;
+	public static String info_partCreatedInXMs;
+	public static String info_partitionCreatedInXMs;
+	public static String deletingQueryResultP0; 
+	public static String info_partXCreatedWithQueryZ;
+	public static String info_creatingSubcorpusXFromCorpusYWithTheQueryZ;
+	public static String deletingSubcorpusP0; 
+	public static String sizeOfSubcorpusP0P1ComputedInP2Ms; 
+	public static String info_searchEngineStopped;
+	public static String info_stoppingSearchEngine;
+
+	public static String subcorpusP0CreatedInP1Ms; 
+
+	
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, SearchEngineCoreMessages.class);
+	}
+
+	private SearchEngineCoreMessages() {
+	}
+	
+}
Index: tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages.properties
===================================================================
--- tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages.properties	(revision 1335)
@@ -1,16 +1,14 @@
-
-DROP_QUERYRESULT = Deleting query result {0}...
-DROP_SUBCORPUS   = Deleting subcorpus {0}...
-
-END_SUBCORPUS_SIZE = Size of subcorpus {0} ({1}) computed in {2} ms.
-
-SUBCORPUS_CREATED = Subcorpus {0} created in {1} ms.
-
-info_creatingNewPartition                       = Creating new partion of corpus {0}: {1}...
-info_creatingSubcorpusXFromCorpusYWithTheQueryZ = Creating subcorpus {0} from corpus {1} with the query {2}...
-info_deletingPartition                          = Deleting partition {0}...
-info_partCreatedInXMs                           = Part {0} created in {1} ms.
-info_partXCreatedWithQueryZ                     = Part {0} created with query {1}.
-info_partitionCreatedInXMs                      = Partition {0} created in {1} ms.
-info_searchEngineStopped                        = Search Engine stopped.
-info_stoppingSearchEngine                       = Stopping the Search Engine...
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+deletingQueryResultP0=Deleting query result {0}...
+deletingSubcorpusP0=Deleting subcorpus {0}...
+info_creatingNewPartition=Creating new partion of corpus {0}\: {1}...
+info_creatingSubcorpusXFromCorpusYWithTheQueryZ=Creating subcorpus {0} from corpus {1} with the query {2}...
+info_deletingPartition=Deleting partition {0}...
+info_partCreatedInXMs=Part {0} created in {1} ms.
+info_partitionCreatedInXMs=Partition {0} created in {1} ms.
+info_partXCreatedWithQueryZ=Part {0} created with query {1}.
+info_searchEngineStopped=Search Engine stopped.
+info_stoppingSearchEngine=Stopping the Search Engine...
+sizeOfSubcorpusP0P1ComputedInP2Ms=Size of subcorpus {0} ({1}) computed in {2} ms.
+subcorpusP0CreatedInP1Ms=Subcorpus {0} created in {1} ms.
Index: tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-RESULT_TYPE = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+RESULT_TYPE=
Index: tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages_fr.properties	(revision 1335)
@@ -1,22 +1,21 @@
-
-Properties_0  = <h3>Propriétés des structures\n
-Properties_1  = ** Echec d'accès au corpus
-Properties_11 = \ structures
-Properties_14 = Propriétés des unités lexicales (max {0} valeurs)
-Properties_16 = Nombre d'unités de structure 
-Properties_2  = ** Erreur
-Properties_22 = Propriétés des structures (max {0} valeurs)
-Properties_26 = Pas de propriété
-Properties_3  = Détails du corpus  
-Properties_4  = \ propriétés
-Properties_40 = * Statistiques Générales\n
-Properties_41 = - T
-Properties_43 = - Propriétés de mot 
-Properties_49 = - S
-Properties_5  = Statistiques Générales
-Properties_6  = ** Echec d'accès au corpus
-Properties_7  = Nombre de mots 
-Properties_8  = \ lexique
-Properties_9  = Nombre de propriétés de mot 
-
-RESULT_TYPE = Propriétés
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+descriptionOf=Détails du corpus  
+error=** Erreur
+failedToAccessCorpus=** Echec d'accès au corpus
+generalStatistics=* Statistiques Générales\n
+generalStatistics_2=Statistiques Générales
+lexicalUnitsPropertiesMaxP0Values=Propriétés des unités lexicales (max {0} valeurs)
+lexicon=\ lexique
+noProperty=Pas de propriété
+numberOfStructuralUnits=Nombre d'unités de structure 
+numberOfWordProperties=Nombre de propriétés de mot 
+numberOfWords=Nombre de mots 
+properties=\ propriétés
+RESULT_TYPE=Propriétés
+s=- S
+structuralUnitsProperties=<h3>Propriétés des structures\n
+structuralUnitsPropertiesMaxP0Values=Propriétés des structures (max {0} valeurs)
+structures=\ structures
+t=- T
+wordProperties=- Propriétés de mot 
Index: tmp/org.txm.properties.core/src/org/txm/properties/core/messages/PropertiesCoreMessages.java
===================================================================
--- tmp/org.txm.properties.core/src/org/txm/properties/core/messages/PropertiesCoreMessages.java	(revision 1334)
+++ tmp/org.txm.properties.core/src/org/txm/properties/core/messages/PropertiesCoreMessages.java	(revision 1335)
@@ -1,51 +1,50 @@
-package org.txm.properties.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * Properties core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class PropertiesCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.properties.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String RESULT_TYPE;
-
-	
-	public static String Properties_0;
-	public static String Properties_1;
-	public static String Properties_11;
-	public static String Properties_14;
-	public static String Properties_16;
-	public static String Properties_2;
-	public static String Properties_22;
-	public static String Properties_26;
-	public static String Properties_3;
-	public static String Properties_4;
-	public static String Properties_40;
-	public static String Properties_41;
-	public static String Properties_43;
-	public static String Properties_49;
-	public static String Properties_5;
-	public static String Properties_6;
-	public static String Properties_7;
-	public static String Properties_8;
-	public static String Properties_9;
-
-	
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, PropertiesCoreMessages.class);
-	}
-
-	private PropertiesCoreMessages() {
-	}
-	
-}
+package org.txm.properties.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Properties core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class PropertiesCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.properties.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String RESULT_TYPE;
+
+	
+	public static String structuralUnitsProperties; 
+	public static String failedToAccessCorpus; 
+	public static String structures; 
+	public static String lexicalUnitsPropertiesMaxP0Values; 
+	public static String numberOfStructuralUnits; 
+	public static String error; 
+	public static String structuralUnitsPropertiesMaxP0Values; 
+	public static String noProperty; 
+	public static String descriptionOf; 
+	public static String properties; 
+	public static String generalStatistics; 
+	public static String t; 
+	public static String wordProperties; 
+	public static String s; 
+	public static String generalStatistics_2; 
+	public static String numberOfWords; 
+	public static String lexicon; 
+	public static String numberOfWordProperties; 
+
+	
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, PropertiesCoreMessages.class);
+	}
+
+	private PropertiesCoreMessages() {
+	}
+	
+}
Index: tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages.properties
===================================================================
--- tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.properties.core/src/org/txm/properties/core/messages/messages.properties	(revision 1335)
@@ -1,22 +1,21 @@
-
-Properties_0  = * Structural Units properties\n
-Properties_1  = ** Failed to access corpus 
-Properties_11 = \ structures
-Properties_14 = Lexical Units properties (max {0} values)
-Properties_16 = Number of structural units 
-Properties_2  = ** Error
-Properties_22 = Structural Units properties (max {0} values)
-Properties_26 = No property
-Properties_3  = Description of 
-Properties_4  = \ properties
-Properties_40 = * General Statistics\n
-Properties_41 = - T 
-Properties_43 = - Word properties 
-Properties_49 = - S 
-Properties_5  = General Statistics
-Properties_6  = ** Failed to access corpus 
-Properties_7  = Number of words 
-Properties_8  = \ lexicon
-Properties_9  = Number of word properties 
-
-RESULT_TYPE = Properties
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+descriptionOf=Description of 
+error=** Error
+failedToAccessCorpus=** Failed to access corpus 
+generalStatistics=* General Statistics\n
+generalStatistics_2=General Statistics
+lexicalUnitsPropertiesMaxP0Values=Lexical Units properties (max {0} values)
+lexicon=\ lexicon
+noProperty=No property
+numberOfStructuralUnits=Number of structural units 
+numberOfWordProperties=Number of word properties 
+numberOfWords=Number of words 
+properties=\ properties
+RESULT_TYPE=Properties
+s=- S 
+structuralUnitsProperties=* Structural Units properties\n
+structuralUnitsPropertiesMaxP0Values=Structural Units properties (max {0} values)
+structures=\ structures
+t=- T 
+wordProperties=- Word properties 
Index: tmp/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java
===================================================================
--- tmp/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java	(revision 1334)
+++ tmp/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java	(revision 1335)
@@ -166,7 +166,7 @@
 			properties = corpus.getProperties();
 			NProperties = properties.size();
 		} catch (CqiClientException e) {
-			Log.severe(PropertiesCoreMessages.Properties_1 + corpus.getName() + PropertiesCoreMessages.Properties_4);
+			Log.severe(PropertiesCoreMessages.failedToAccessCorpus + corpus.getName() + PropertiesCoreMessages.properties);
 			Log.printStackTrace(e);
 			return;
 		}
@@ -174,7 +174,7 @@
 		try {
 			numberOfWords = corpus.getSize();// corpus.getLexicon(corpus.getProperty("id")).nbrOfToken();
 		} catch (CqiClientException e) {
-			Log.severe(PropertiesCoreMessages.Properties_6 + corpus.getName() + PropertiesCoreMessages.Properties_8);
+			Log.severe(PropertiesCoreMessages.failedToAccessCorpus + corpus.getName() + PropertiesCoreMessages.lexicon);
 			Log.printStackTrace(e);
 			return;
 		}
@@ -217,7 +217,7 @@
 		try {
 			structures = corpus.getOrderedStructuralUnits();
 		} catch (CqiClientException e) {
-			Log.severe(PropertiesCoreMessages.Properties_1 + corpus.getName() + PropertiesCoreMessages.Properties_11);
+			Log.severe(PropertiesCoreMessages.failedToAccessCorpus + corpus.getName() + PropertiesCoreMessages.structures);
 			Log.printStackTrace(e);
 			return;
 		}
@@ -237,7 +237,7 @@
 						internalArchitecturePropertiesCounts.get(su.getName()).put(sup.getName(), allvalues.size());
 					} catch (Exception e) {
 						ArrayList<String> list = new ArrayList<String>(1);
-						list.add(PropertiesCoreMessages.Properties_2);
+						list.add(PropertiesCoreMessages.error);
 						internalArchitectureProperties.get(su.getName()).put(sup.getName(), list);
 						internalArchitecturePropertiesCounts.get(su.getName()).put(sup.getName(), -1);
 					}
@@ -284,23 +284,23 @@
 				"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>" + //$NON-NLS-1$
 				"</head>" + //$NON-NLS-1$
 				"<body>\n"); //$NON-NLS-1$
-		buff.append("<h2 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.Properties_3 + this.corpus.getName() + " (id=" + this.corpus.getID() + ")</h2>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		buff.append("<h2 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.descriptionOf + this.corpus.getName() + " (id=" + this.corpus.getID() + ")</h2>\n"); //$NON-NLS-2$ //$NON-NLS-1$
 
 		if (corpus.getDescription() != null && corpus.getDescription().length() > 0) {
 			buff.append("<p>" + corpus.getDescription() + "</p>"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
-		buff.append("<h3 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.Properties_5 + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		buff.append("<h3 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.generalStatistics_2 + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
 
 		// counts
 		buff.append("<ul>\n"); //$NON-NLS-1$
-		buff.append("<li>" + PropertiesCoreMessages.Properties_7 + numberOfWords + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		buff.append("<li>" + PropertiesCoreMessages.Properties_9 + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
-		buff.append("<li>" + PropertiesCoreMessages.Properties_16 + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		buff.append("<li>" + PropertiesCoreMessages.numberOfWords + numberOfWords + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		buff.append("<li>" + PropertiesCoreMessages.numberOfWordProperties + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+		buff.append("<li>" + PropertiesCoreMessages.numberOfStructuralUnits + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
 		buff.append("</ul>\n"); //$NON-NLS-1$
 
 		// Propriétés d'occurrences
-		buff.append("<h3 style'font-family:\"Arial\";'>" + NLS.bind(PropertiesCoreMessages.Properties_14, pMaxPropertiesToDisplay) + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		buff.append("<h3 style'font-family:\"Arial\";'>" + NLS.bind(PropertiesCoreMessages.lexicalUnitsPropertiesMaxP0Values, pMaxPropertiesToDisplay) + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
 		ArrayList<String> properties = new ArrayList<String>(propertiesValues.keySet());
 		Collections.sort(properties);
 		buff.append("<ul>\n"); //$NON-NLS-1$
@@ -318,7 +318,7 @@
 		buff.append("</ul>\n"); //$NON-NLS-1$
 
 		// Propriété de structures
-		buff.append("<h3 style'font-family:\"Arial\";'>" + NLS.bind(PropertiesCoreMessages.Properties_22, pMaxPropertiesToDisplay) + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+		buff.append("<h3 style'font-family:\"Arial\";'>" + NLS.bind(PropertiesCoreMessages.structuralUnitsPropertiesMaxP0Values, pMaxPropertiesToDisplay) + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
 		buff.append("<ul>\n"); //$NON-NLS-1$
 		for (String s : internalArchitecture) {
 			StringBuffer subbuffer = new StringBuffer();
@@ -329,7 +329,7 @@
 
 			subbuffer.append("<li> " + s + "\n<ul>\n"); //$NON-NLS-1$ //$NON-NLS-2$
 			if (internalArchitectureProperties.get(s).keySet().size() == 0)
-				subbuffer.append("<li>" + PropertiesCoreMessages.Properties_26 + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+				subbuffer.append("<li>" + PropertiesCoreMessages.noProperty + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
 
 			// System.out.println("struct: "+s+" >> "+properties);
 			Collections.sort(properties);
@@ -387,15 +387,15 @@
 	public String dump(int maxvalue) {
 		StringBuffer buff = new StringBuffer();
 
-		buff.append(PropertiesCoreMessages.Properties_40);
-		buff.append(PropertiesCoreMessages.Properties_41 + String.format(Locale.FRANCE, "%,d", numberOfWords) + "\n"); //$NON-NLS-1$
-		buff.append(PropertiesCoreMessages.Properties_43 + String.format("%,d", NProperties) + "\n"); //$NON-NLS-1$
+		buff.append(PropertiesCoreMessages.generalStatistics);
+		buff.append(PropertiesCoreMessages.t + String.format(Locale.FRANCE, "%,d", numberOfWords) + "\n"); //$NON-NLS-1$
+		buff.append(PropertiesCoreMessages.wordProperties + String.format("%,d", NProperties) + "\n"); //$NON-NLS-1$
 		/*
 		 * for (String s : propertiesCounts.keySet()) if (!s.equals("id")) //$NON-NLS-1$
 		 * buff.append(" - " + s + " " + propertiesCounts.get(s) + "\n"); //$NON-NLS-1$
 		 * //$NON-NLS-2$ //$NON-NLS-3$
 		 */
-		buff.append(PropertiesCoreMessages.Properties_49 + String.format("%,d", NStructures) + "\n"); //$NON-NLS-1$
+		buff.append(PropertiesCoreMessages.s + String.format("%,d", NStructures) + "\n"); //$NON-NLS-1$
 		for (String s : structuresCounts.keySet())
 			buff.append(" - " + s + "\n");// +structuresCounts.get(s)+"\n"); //$NON-NLS-1$ //$NON-NLS-2$
 
@@ -403,7 +403,7 @@
 		 * buff.append("* Structural Units counts\n"); for(String s :
 		 * internalArchitecture) buff.append(" - "+s+" "+hierarchieCounts.get(s)+"\n");
 		 */
-		buff.append(PropertiesCoreMessages.Properties_0);
+		buff.append(PropertiesCoreMessages.structuralUnitsProperties);
 		for (String s : internalArchitecture) {
 			buff.append(" - " + s + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 			for (String ps : internalArchitectureProperties.get(s).keySet()) {
@@ -656,4 +656,4 @@
 	public String getResultype() {
 		return PropertiesCoreMessages.RESULT_TYPE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 1334)
+++ tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 1335)
@@ -74,7 +74,7 @@
 			displayFormats[i][1] = formats[i];
 		}
 
-		addField(new ComboFieldEditor(RChartsEnginePreferences.OUTPUT_FORMAT, SWTComponentsProviderMessages.ChartsEnginePreferencePage_COMBO_FIELD_SELECT_DISPLAY_FORMAT_LABEL, displayFormats, getFieldEditorParent()));
+		addField(new ComboFieldEditor(RChartsEnginePreferences.OUTPUT_FORMAT, SWTComponentsProviderMessages.displayFormat, displayFormats, getFieldEditorParent()));
 		
 	}
 	
@@ -111,8 +111,8 @@
 			
 			
 		} catch (Exception e) {
-			System.err.println(org.txm.rcp.messages.TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(org.txm.rcp.messages.TXMUIMessages.failedToSavePreferencesDDot + e);
 		}
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/ParaBrowserUIMessages.java
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/ParaBrowserUIMessages.java	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/ParaBrowserUIMessages.java	(revision 1335)
@@ -1,37 +1,37 @@
-package org.txm.para.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * Parallel browser UI messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class ParaBrowserUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.para.rcp.messages.messages"; //$NON-NLS-1$
-	
-	public static String ParaBrowserEditor_11;
-	public static String ParaBrowserEditor_18;
-	public static String ParaBrowserEditor_19;
-	public static String ParaBrowserEditor_21;
-	public static String ParaBrowserEditor_22;
-	public static String ParaBrowserEditor_3;
-	public static String ParaBrowserEditor_4;
-	public static String ParaBrowserEditor_9;
-
-	public static String OpenParaBrowser_0;
-
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ParaBrowserUIMessages.class);
-	}
-
-	private ParaBrowserUIMessages() {
-	}
-}
+package org.txm.para.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Parallel browser UI messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class ParaBrowserUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.para.rcp.messages.messages"; //$NON-NLS-1$
+	
+	public static String paraBrowserDDotGetNextP0StructP1ParaidP2ValueP3; 
+	public static String mOVETo; 
+	public static String dontMOVENEXTIs; 
+	public static String ParaBrowserEditor_21;
+	public static String openParabrowser; 
+	public static String refDDot; 
+	public static String references; 
+	public static String refDDotP0DDotP1; 
+
+	public static String openingTheParabrowser; 
+
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, ParaBrowserUIMessages.class);
+	}
+
+	private ParaBrowserUIMessages() {
+	}
+}
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages.properties	(revision 1335)
@@ -1,11 +1,11 @@
-
-OpenParaBrowser_0 = Opening the parabrowser
-
-ParaBrowserEditor_11 = ParaBrowser: get next({0}) struct {1} paraid {2} value {3}
-ParaBrowserEditor_18 = -MOVE to
-ParaBrowserEditor_19 = -Don't MOVE !!!!! NEXT is
-ParaBrowserEditor_21 = _
-ParaBrowserEditor_22 = Open Parabrowser
-ParaBrowserEditor_3  = Ref:
-ParaBrowserEditor_4  = References
-ParaBrowserEditor_9  = Ref: {0}: {1}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+dontMOVENEXTIs=-Don't MOVE \!\!\!\!\! NEXT is
+mOVETo=-MOVE to
+openingTheParabrowser=Opening the parabrowser
+openParabrowser=Open Parabrowser
+paraBrowserDDotGetNextP0StructP1ParaidP2ValueP3=ParaBrowser\: get next({0}) struct {1} paraid {2} value {3}
+ParaBrowserEditor_21=_
+refDDot=Ref\:
+refDDotP0DDotP1=Ref\: {0}\: {1}
+references=References
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,11 +1,11 @@
-
-OpenParaBrowser_0 = Открытие Парабраузер//
-
-ParaBrowserEditor_11 = ParaBrowser : get next({0}) struct {1} paraid {2} value {3}
-ParaBrowserEditor_18 = -Перейти к 
-ParaBrowserEditor_19 = -Оставаться на месте!!!!! NEXT - 
-ParaBrowserEditor_21 = _
-ParaBrowserEditor_22 = Открыть встроенный браузер
-ParaBrowserEditor_3  = Ссылка : 
-ParaBrowserEditor_4  = Ссылки
-ParaBrowserEditor_9  = Ссылки: {0} : {1}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+dontMOVENEXTIs=-Оставаться на месте\!\!\!\!\! NEXT - 
+mOVETo=-Перейти к 
+openingTheParabrowser=Открытие Парабраузер//
+openParabrowser=Открыть встроенный браузер
+paraBrowserDDotGetNextP0StructP1ParaidP2ValueP3=ParaBrowser \: get next({0}) struct {1} paraid {2} value {3}
+ParaBrowserEditor_21=_
+refDDot=Ссылка \: 
+refDDotP0DDotP1=Ссылки\: {0} \: {1}
+references=Ссылки
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,11 +1,11 @@
-
-OpenParaBrowser_0 = Ouverture du Navigateur//
-
-ParaBrowserEditor_11 = ParaBrowser : get next({0}) struct {1} paraid {2} value {3}
-ParaBrowserEditor_18 = -Aller à 
-ParaBrowserEditor_19 = -Rester sur place !!!!! NEXT est 
-ParaBrowserEditor_21 = _
-ParaBrowserEditor_22 = Ouvrir le Navigateur interne
-ParaBrowserEditor_3  = Réf : 
-ParaBrowserEditor_4  = Références
-ParaBrowserEditor_9  = Réf : {0} : {1}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+dontMOVENEXTIs=-Rester sur place \!\!\!\!\! NEXT est 
+mOVETo=-Aller à 
+openingTheParabrowser=Ouverture du Navigateur//
+openParabrowser=Ouvrir le Navigateur interne
+paraBrowserDDotGetNextP0StructP1ParaidP2ValueP3=ParaBrowser \: get next({0}) struct {1} paraid {2} value {3}
+ParaBrowserEditor_21=_
+refDDot=Réf \: 
+refDDotP0DDotP1=Réf \: {0} \: {1}
+references=Références
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/ParaBrowserEditor.java
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/ParaBrowserEditor.java	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/ParaBrowserEditor.java	(revision 1335)
@@ -327,7 +327,7 @@
 				selectedReference += property.getName() + "/"; //$NON-NLS-1$
 			}
 		}
-		referenceLabel.setText(ParaBrowserUIMessages.ParaBrowserEditor_3 + selectedReference);
+		referenceLabel.setText(ParaBrowserUIMessages.refDDot + selectedReference);
 		corpusRefAreas.put(displayedCorpus, referenceLabel);
 	}
 
@@ -405,7 +405,7 @@
 
 		// [<]
 		prev = new Button(navigationArea, SWT.PUSH);
-		prev.setText(ConcordanceUIMessages.ConcordancesEditor_12);
+		prev.setText(ConcordanceUIMessages.inf);
 		prev.addListener(SWT.Selection, new Listener() {
 			@Override
 			public void handleEvent(Event event) {
@@ -416,7 +416,7 @@
 
 		// [>]
 		next = new Button(navigationArea, SWT.PUSH);
-		next.setText(ConcordanceUIMessages.ConcordancesEditor_13);
+		next.setText(ConcordanceUIMessages.sup);
 		next.addListener(SWT.Selection, new Listener() {
 			@Override
 			public void handleEvent(Event event) {
@@ -436,7 +436,7 @@
 		// StructuralUnit
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		Button refButton = new Button(controlArea, SWT.PUSH);
-		refButton.setText(ParaBrowserUIMessages.ParaBrowserEditor_4);
+		refButton.setText(ParaBrowserUIMessages.references);
 		refButton
 				.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, true));
 		refButton.addSelectionListener(new SelectionListener() {
@@ -681,7 +681,7 @@
 			 */
 
 			Label refArea = corpusRefAreas.get(corpus);
-			refArea.setText(NLS.bind(ParaBrowserUIMessages.ParaBrowserEditor_9, corpus.getName(), selectedReference));
+			refArea.setText(NLS.bind(ParaBrowserUIMessages.refDDotP0DDotP1, corpus.getName(), selectedReference));
 		}
 
 	}
@@ -693,7 +693,7 @@
 	 */
 	public void nextorpreviousText(boolean findNext) {
 		// get Property
-		System.out.println(NLS.bind(ParaBrowserUIMessages.ParaBrowserEditor_11, 
+		System.out.println(NLS.bind(ParaBrowserUIMessages.paraBrowserDDotGetNextP0StructP1ParaidP2ValueP3, 
 			new Object[]{findNext, selectedStructuralUnit, selectedStructuralUnitParaId, selectedValue}));
 		if (selectedStructuralUnit != null) {
 			// Multiple Query, as many as there are corpuses displayed
@@ -710,14 +710,14 @@
 				// }
 			}
 			if (!newValue.equals("")) { //$NON-NLS-1$
-				System.out.println(ParaBrowserUIMessages.ParaBrowserEditor_18 + newValue);
+				System.out.println(ParaBrowserUIMessages.mOVETo + newValue);
 				int index = paraIdCombo.indexOf(newValue);
 				if (index != -1) {
 					selectedValue = newValue;
 					paraIdCombo.select(index);
 				}
 			} else {
-				System.out.println(ParaBrowserUIMessages.ParaBrowserEditor_19 + newValue);
+				System.out.println(ParaBrowserUIMessages.dontMOVENEXTIs + newValue);
 			}
 			reloadTexts();
 			reloadReferences();
@@ -749,7 +749,7 @@
 	 */
 	@Override
 	public void setFocus() {
-		StatusLine.setMessage(ParaBrowserUIMessages.ParaBrowserEditor_22);
+		StatusLine.setMessage(ParaBrowserUIMessages.openParabrowser);
 	}
 
 	/**
@@ -806,4 +806,4 @@
 	public List<Property> getSelectedReferences() {
 		return referencePattern.getProperties();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaSortReferencePattern.java
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaSortReferencePattern.java	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaSortReferencePattern.java	(revision 1335)
@@ -83,8 +83,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.DefineReferencePattern_3);
-		setToolTipText(TXMUIMessages.DefineReferencePattern_4);
+		setText(TXMUIMessages.referencesAmpsortOptions);
+		setToolTipText(TXMUIMessages.referencesSortOptions);
 	}
 
 	/**
@@ -98,8 +98,8 @@
 		this.window = window;
 		this.paraBrowserEditor = paraBrowserEditor;
 		setId(ID);
-		setText(TXMUIMessages.DefineReferencePattern_3);
-		setToolTipText(TXMUIMessages.DefineReferencePattern_4);
+		setText(TXMUIMessages.referencesAmpsortOptions);
+		setToolTipText(TXMUIMessages.referencesSortOptions);
 	}
 
 	
@@ -218,7 +218,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(TXMUIMessages.DefineReferencePattern_5);
+		      shell.setText(TXMUIMessages.referencesSortOptions);
 		      
 		      shell.setSize(400, 500);
 		      shell.setLocation(shell.getParent().getLocation());
@@ -379,4 +379,4 @@
 			return mainArea;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaViewReferencePattern.java
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaViewReferencePattern.java	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaViewReferencePattern.java	(revision 1335)
@@ -83,8 +83,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.DefineReferencePattern_1);
-		setToolTipText(TXMUIMessages.DefineReferencePattern_2);
+		setText(TXMUIMessages.referencesAmpdisplayOptions);
+		setToolTipText(TXMUIMessages.referencesDisplayOptions);
 	}
 
 	/**
@@ -98,8 +98,8 @@
 		this.window = window;
 		this.paraBrowserEditor = paraBrowserEditor;
 		setId(ID);
-		setText(TXMUIMessages.DefineReferencePattern_1);
-		setToolTipText(TXMUIMessages.DefineReferencePattern_2);
+		setText(TXMUIMessages.referencesAmpdisplayOptions);
+		setToolTipText(TXMUIMessages.referencesDisplayOptions);
 	}
 
 	
@@ -218,7 +218,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(TXMUIMessages.DefineReferencePattern_0);
+		      shell.setText(TXMUIMessages.referencesDisplayOptions);
 		      
 		      shell.setSize(400, 500);
 		      shell.setLocation(shell.getParent().getLocation());
@@ -379,4 +379,4 @@
 			return mainArea;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.para.rcp/src/org/txm/para/rcp/handlers/OpenParaBrowser.java
===================================================================
--- tmp/org.txm.para.rcp/src/org/txm/para/rcp/handlers/OpenParaBrowser.java	(revision 1334)
+++ tmp/org.txm.para.rcp/src/org/txm/para/rcp/handlers/OpenParaBrowser.java	(revision 1335)
@@ -87,7 +87,7 @@
 		IWorkbenchPage page = window.getActivePage();
 		try {
 			StatusLine
-					.setMessage(ParaBrowserUIMessages.OpenParaBrowser_0);
+					.setMessage(ParaBrowserUIMessages.openingTheParabrowser);
 			page
 					.openEditor(editorInput,
 							"org.txm.rcp.editors.parabrowser.ParaBrowserEditor"); //$NON-NLS-1$
@@ -98,4 +98,4 @@
 		return null;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java	(revision 1335)
@@ -74,7 +74,7 @@
 			displayFormats[i][1] = formats[i];
 		}
 
-		this.addField(new ComboFieldEditor(JFCChartsEnginePreferences.OUTPUT_FORMAT, SWTComponentsProviderMessages.ChartsEnginePreferencePage_COMBO_FIELD_SELECT_DISPLAY_FORMAT_LABEL, displayFormats, this.getFieldEditorParent()));
+		this.addField(new ComboFieldEditor(JFCChartsEnginePreferences.OUTPUT_FORMAT, SWTComponentsProviderMessages.displayFormat, displayFormats, this.getFieldEditorParent()));
 		
 	}
 	
@@ -109,8 +109,8 @@
 			
 			
 		} catch (Exception e) {
-			System.err.println(org.txm.rcp.messages.TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(org.txm.rcp.messages.TXMUIMessages.failedToSavePreferencesDDot + e);
 		}
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_ru.properties	(revision 1335)
@@ -0,0 +1,2 @@
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages_fr.properties	(revision 1335)
@@ -0,0 +1,2 @@
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 1334)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/AnnotationUIMessages.java	(revision 1335)
@@ -1,25 +1,25 @@
-package org.txm.annotation.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * Annotation UI messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class AnnotationUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.annotation.rcp.messages.messages"; //$NON-NLS-1$
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, AnnotationUIMessages.class);
-	}
-
-	private AnnotationUIMessages() {
-	}
-}
+package org.txm.annotation.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Annotation UI messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class AnnotationUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.annotation.rcp.messages.messages"; //$NON-NLS-1$
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, AnnotationUIMessages.class);
+	}
+
+	private AnnotationUIMessages() {
+	}
+}
Index: tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.annotation.rcp/src/org/txm/annotation/rcp/messages/messages.properties	(revision 1335)
@@ -0,0 +1,2 @@
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages.properties	(revision 1335)
@@ -1,26 +1,23 @@
-
-ChartsEnginePreferencePage_COMBO_FIELD_SELECT_DISPLAY_FORMAT_LABEL = Display format
-ChartsEnginePreferencePage_COMBO_FIELD_SELECT_ENGINE_LABEL         = Current Engine
-ChartsEnginePreferencePage_COMBO_FIELD_SELECT_EXPORT_FORMAT_LABEL  = Default export format
-ChartsEnginePreferencePage_LOG_RECREATING_CHARTS_ENGINE            = Recreating Charts Engine and SWT chart components provider
-ChartsEnginePreferencePage_PreferencesWillBeAppliedToNewChart      = These preferences will apply to new charts, previously created charts will not be affected.
-ChartsEnginePreferencePage_RenderingColorsMode                     = Rendering colors mode
-ChartsEnginePreferencePage_RenderingModeBlackAndWhite              = Black and white
-ChartsEnginePreferencePage_RenderingModeColors                     = Colors
-ChartsEnginePreferencePage_RenderingModeGrayscale                  = Grayscale
-ChartsEnginePreferencePage_RenderingModeMonochrome                 = Monochrome
-ChartsEnginePreferencePage_RenderingMonochromeColor                = Monochrome rendering color
-
-ChartsEngineSharedPreferencePage_CHARTS_RENDERING_DEFAULT_PREFERENCES = Charts rendering
-
-SWTChartsComponentProvider_SHOW_GRID        = Show grid
-SWTChartsComponentProvider_SHOW_HIDE_GRID   = Show/hide grid
-SWTChartsComponentProvider_SHOW_HIDE_LEGEND = Show/hide legend
-SWTChartsComponentProvider_SHOW_HIDE_TITLE  = Show/hide title
-SWTChartsComponentProvider_SHOW_LEGEND      = Show legend
-SWTChartsComponentProvider_SHOW_TITLE       = Show title
-
-preferences_multipleLineStrokeStyles = Multiple line stroke styles
-
-toolbar_rendering                   = Rendering
-toolbar_showHideRenderingParameters = Show/Hide rendering parameters
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+blackAndWhite=Black and white
+chartsRendering=Charts rendering
+colors=Colors
+currentEngine=Current Engine
+defaultExportFormat=Default export format
+displayFormat=Display format
+grayscale=Grayscale
+monochrome=Monochrome
+monochromeRenderingColor=Monochrome rendering color
+multipleLineStrokeStyles=Multiple line stroke styles
+recreatingChartsEngineAndSWTChartComponentsProvider=Recreating Charts Engine and SWT chart components provider
+rendering=Rendering
+renderingColorsMode=Rendering colors mode
+showGrid=Show grid
+showhideGrid=Show/hide grid
+showhideLegend=Show/hide legend
+showHideRenderingParameters=Show/Hide rendering parameters
+showhideTitle=Show/hide title
+showLegend=Show legend
+showTitle=Show title
+thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected=These preferences will apply to new charts, previously created charts will not be affected.
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/SWTComponentsProviderMessages.java	(revision 1335)
@@ -1,49 +1,49 @@
-package org.txm.chartsengine.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-public class SWTComponentsProviderMessages extends NLS {
-	
-	private static final String BUNDLE_NAME = "org.txm.chartsengine.rcp.messages.messages"; //$NON-NLS-1$
-	
-	public static String ChartsEnginePreferencePage_COMBO_FIELD_SELECT_DISPLAY_FORMAT_LABEL;
-	public static String ChartsEnginePreferencePage_COMBO_FIELD_SELECT_EXPORT_FORMAT_LABEL;
-	
-	public static String ChartsEnginePreferencePage_COMBO_FIELD_SELECT_ENGINE_LABEL;
-	public static String ChartsEnginePreferencePage_LOG_RECREATING_CHARTS_ENGINE;
-
-	public static String ChartsEnginePreferencePage_PreferencesWillBeAppliedToNewChart;
-	public static String ChartsEnginePreferencePage_RenderingColorsMode;
-	public static String ChartsEnginePreferencePage_RenderingModeBlackAndWhite;
-	public static String ChartsEnginePreferencePage_RenderingModeColors;
-	public static String ChartsEnginePreferencePage_RenderingModeGrayscale;
-	public static String ChartsEnginePreferencePage_RenderingModeMonochrome;
-	public static String ChartsEnginePreferencePage_RenderingMonochromeColor;
-
-	public static String ChartsEngineSharedPreferencePage_CHARTS_RENDERING_DEFAULT_PREFERENCES;
-	
-	public static String SWTChartsComponentProvider_SHOW_TITLE;
-	public static String SWTChartsComponentProvider_SHOW_LEGEND;
-	public static String SWTChartsComponentProvider_SHOW_GRID;
-
-	public static String SWTChartsComponentProvider_SHOW_HIDE_TITLE;
-	public static String SWTChartsComponentProvider_SHOW_HIDE_LEGEND;
-	public static String SWTChartsComponentProvider_SHOW_HIDE_GRID;
-
-	public static String toolbar_rendering;
-
-	public static String toolbar_showHideRenderingParameters;
-
-	public static String preferences_multipleLineStrokeStyles;
-	
-	
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, SWTComponentsProviderMessages.class);
-	}
-
-	private SWTComponentsProviderMessages() {
-	}
-}
+package org.txm.chartsengine.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+public class SWTComponentsProviderMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.chartsengine.rcp.messages.messages"; //$NON-NLS-1$
+	
+	public static String displayFormat; 
+	public static String defaultExportFormat; 
+	
+	public static String currentEngine; 
+	public static String recreatingChartsEngineAndSWTChartComponentsProvider; 
+
+	public static String thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected; 
+	public static String renderingColorsMode; 
+	public static String blackAndWhite; 
+	public static String colors; 
+	public static String grayscale; 
+	public static String monochrome; 
+	public static String monochromeRenderingColor; 
+
+	public static String chartsRendering; 
+	
+	public static String showTitle; 
+	public static String showLegend; 
+	public static String showGrid; 
+
+	public static String showhideTitle; 
+	public static String showhideLegend; 
+	public static String showhideGrid; 
+
+	public static String rendering; 
+
+	public static String showHideRenderingParameters; 
+
+	public static String multipleLineStrokeStyles; 
+	
+	
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, SWTComponentsProviderMessages.class);
+	}
+
+	private SWTComponentsProviderMessages() {
+	}
+}
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,4 +1,4 @@
-
-ChartsEnginePreferencePage_RenderingModeGrayscale = Ч/Б линии
-
-preferences_multipleLineStrokeStyles = Различные стили строк
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+grayscale=Ч/Б линии
+multipleLineStrokeStyles=Различные стили строк
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,25 +1,22 @@
-
-ChartsEnginePreferencePage_COMBO_FIELD_SELECT_DISPLAY_FORMAT_LABEL = Format d'affichage
-ChartsEnginePreferencePage_COMBO_FIELD_SELECT_ENGINE_LABEL         = Moteur de graphiques courant
-ChartsEnginePreferencePage_COMBO_FIELD_SELECT_EXPORT_FORMAT_LABEL  = Format d'export par défaut
-ChartsEnginePreferencePage_LOG_RECREATING_CHARTS_ENGINE            = Réinitialisation du moteur de production de graphiques et du fournisseur de composants SWT
-ChartsEnginePreferencePage_PreferencesWillBeAppliedToNewChart      = Ces préférences seront appliquées aux nouveaux graphiques. Les graphiques précédemment créés ne seront pas affectés.
-ChartsEnginePreferencePage_RenderingColorsMode                     = Mode de rendu des couleurs
-ChartsEnginePreferencePage_RenderingModeBlackAndWhite              = Noir et blanc
-ChartsEnginePreferencePage_RenderingModeColors                     = Couleurs
-ChartsEnginePreferencePage_RenderingModeGrayscale                  = Niveaux de gris
-ChartsEnginePreferencePage_RenderingModeMonochrome                 = Monochrome
-ChartsEnginePreferencePage_RenderingMonochromeColor                = Couleur du rendu monochrome
-
-ChartsEngineSharedPreferencePage_CHARTS_RENDERING_DEFAULT_PREFERENCES = Rendu des graphiques
-
-SWTChartsComponentProvider_SHOW_GRID        = Afficher la grille
-SWTChartsComponentProvider_SHOW_HIDE_GRID   = Afficher/masquer la grille
-SWTChartsComponentProvider_SHOW_HIDE_LEGEND = Afficher/masquer la légende
-SWTChartsComponentProvider_SHOW_LEGEND      = Afficher la légende
-SWTChartsComponentProvider_SHOW_TITLE       = Afficher le titre
-
-preferences_multipleLineStrokeStyles = Styles de ligne multiples
-
-toolbar_rendering                   = Rendu
-toolbar_showHideRenderingParameters = Afficher/Masquer les paramètres de rendu
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+blackAndWhite=Noir et blanc
+chartsRendering=Rendu des graphiques
+colors=Couleurs
+currentEngine=Moteur de graphiques courant
+defaultExportFormat=Format d'export par défaut
+displayFormat=Format d'affichage
+grayscale=Niveaux de gris
+monochrome=Monochrome
+monochromeRenderingColor=Couleur du rendu monochrome
+multipleLineStrokeStyles=Styles de ligne multiples
+recreatingChartsEngineAndSWTChartComponentsProvider=Réinitialisation du moteur de production de graphiques et du fournisseur de composants SWT
+rendering=Rendu
+renderingColorsMode=Mode de rendu des couleurs
+showGrid=Afficher la grille
+showhideGrid=Afficher/masquer la grille
+showhideLegend=Afficher/masquer la légende
+showHideRenderingParameters=Afficher/Masquer les paramètres de rendu
+showLegend=Afficher la légende
+showTitle=Afficher le titre
+thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected=Ces préférences seront appliquées aux nouveaux graphiques. Les graphiques précédemment créés ne seront pas affectés.
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 1335)
@@ -1,655 +1,655 @@
-package org.txm.chartsengine.rcp.editors;
-
-
-import java.io.File;
-
-import javax.swing.JComponent;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.contexts.IContextActivation;
-import org.eclipse.ui.contexts.IContextService;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.txm.chartsengine.core.ChartsEngine;
-import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
-import org.txm.chartsengine.core.results.ChartResult;
-import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
-import org.txm.chartsengine.rcp.events.EventCallBack;
-import org.txm.chartsengine.rcp.events.EventCallBackHandler;
-import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
-import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar;
-import org.txm.chartsengine.rcp.swt.ChartComposite;
-import org.txm.chartsengine.rcp.swt.ChartEditorToolBar;
-import org.txm.rcp.editors.TXMEditor;
-import org.txm.utils.logger.Log;
-
-/**
- * Base class of all charts SWT <code>EditorPart</code> subclasses.
- * @author sjacquot
- *
- */
-public abstract class ChartEditor<T extends ChartResult> extends TXMEditor<ChartResult>{
-
-	
-	public final static String CONTEXT_ID_CHART_EDITOR = "org.txm.chartsengine.rcp.editors.ChartEditor"; //$NON-NLS-1$
-	
-	/**
-	 * The tool bar.
-	 */
-	protected ChartEditorToolBar chartToolBar;
-
-	
-	/**
-	 * The advanced tool bar.
-	 */
-	protected AdvancedChartEditorToolBar advancedChartToolBar;
-	
-	/**
-	 * The advanced rendering parameters composite.
-	 */
-	protected Composite advancedToolBarComposite;
-	
-	/**
-	 * The advanced rendering parameters group.
-	 */
-	protected Group advancedToolBarGroup;
-
-	/**
-	 * The chart drawing area composite.
-	 */
-	protected ChartComposite chartComposite;
-
-	/**
-	 * To check whether this editor was already opened when calling SWTChartsComponentsProvider.openEditor().
-	 */
-	protected boolean wasAlreadyOpened;
-	
-	/**
-	 * The multi pages editor which contains this editor if exists.
-	 */
-	protected MultiPageEditorPart parentMultiPagesEditor = null;
-
-	/**
-	 * Token used to deactivate the context after it has been activated.
-	 */
-	protected IContextActivation contextActivationToken;
-	
-
-	/**
-	 *
-	 */
-	public ChartEditor()	{
-		super();
-	}
-
-
-	/**
-	 * 
-	 * @param swtComponentsProvider
-	 * @param chartEditorInput
-	 */
-	protected ChartEditor(ChartEditorInput chartEditorInput) {
-		this.setInput(chartEditorInput);
-		this.setPartName(chartEditorInput.getName());
-		
-		this.wasAlreadyOpened = false;
-	}
-
-	
-	/**
-	 * Subclasses manual creation.
-	 */
-	public abstract void __createPartControl();
-	
-	
-	@Override
-	public final void _createPartControl() {
-		
-		// Toolbar
-		this.chartToolBar = new ChartEditorToolBar(this, this.getFirstLineComposite(), null, SWT.FLAT | SWT.RIGHT);
-		this.getFirstLineComposite().getLayout().numColumns += 1;
-		//this.chartToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
-
-		// Advanced tool bar
-		//this.advancedToolBarComposite = new Composite(parent, SWT.NONE);
-		Group group = this.topToolBar.installGroup(SWTComponentsProviderMessages.toolbar_rendering, SWTComponentsProviderMessages.toolbar_showHideRenderingParameters, 
-				"platform:/plugin/org.txm.chartsengine.rcp/icons/show_rendering_parameters.png",  //$NON-NLS-1$
-				"platform:/plugin/org.txm.chartsengine.rcp/icons/hide_rendering_parameters.png", //$NON-NLS-1$
-				false);
-		this.advancedChartToolBar = new AdvancedChartEditorToolBar(this, group, this.getParametersGroupsComposite(), SWT.FLAT);
-		//this.advancedChartToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-//		this.advancedToolBarComposite.pack(true);
-
-		// Remove parent composites
-		//TODO MD: hack ?
-		//this.resultArea.dispose();
-		
-		// Chart composite
-		this.chartComposite = SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()).createComposite(this, getResultArea());
-		
-		GridData gd = new GridData(GridData.FILL_BOTH);
-//		gd.grabExcessVerticalSpace = true;
-//		gd.grabExcessHorizontalSpace = true;
-		//gd.horizontalSpan = 2; // 2 for match the command parameters toolbar AND the chart toolbar
-		this.chartComposite.setLayoutData(gd);
-		
-		
-		// Re-add the bottom toolbar
-		//TODO MD: hack ?
-		//this.bottomToolBar = new TXMEditorToolBar(this, SWT.FLAT, "bottom");
-		
-		// FIXME: open dialog box message if the composite doesn't contain any chart (typically when the charts engine doesn't contain chart creator for the specified result data type)
-//		if(composite.getChart() == null)	{
-//			MessageDialog.openWarning(parent.getShell(), "Warning", "Current charts engine can not create chart for " + this.getResultData().getClass().getSimpleName() + " result type. You can set another charts engine in the preferences.");
-//		}
-		
-		// FIXME: background color tests
-		//this.composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-		//parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
-
-		//this.refresh(false);
-//
-//		}
-		
-		 // subclasses manual creation
-		this.__createPartControl();
-		
-	}
-
-
-	/**
-	 * Initializes the default context menus.
-	 */
-	public void initDefaultContextMenus()	{
-		SWTChartsComponentsProvider.initDefaultContextMenus(this.chartComposite);
-	}
-	
-
-	/**
-	 * Opens an editor where id is the specified result class name, computes the result then refreshes the editor components.
-	 * @param result
-	 */
-	public static ChartEditor openEditor(ChartResult result) {
-		return openEditor(result, false);
-	}
-
-	public static ChartEditor openEditor(ChartResult result, boolean alwaysRecreateEditor)	{
-		return openEditor(result, result.getClass().getName(), alwaysRecreateEditor);
-	}
-	
-	public static ChartEditor openEditor(ChartResult result, String editorPartId)	{
-		return openEditor(result, editorPartId, false);
-	}
-	
-	
-	/**
-	 * Opens an editor specified by its id, computes the specified result then refreshes the editor components.
-	 * @param result
-	 * @param editorPartId
-	 * @return
-	 */
-	public static ChartEditor openEditor(ChartResult result, String editorPartId, boolean alwaysRecreateEditor)	{
-		
-		ChartEditorInput<ChartResult> editorInput = new ChartEditorInput<ChartResult>(result);
-		editorInput.setAlwaysRecreateEditor(alwaysRecreateEditor);
-		
-		return (ChartEditor) openEditor(editorInput, editorPartId);
-	}
-
-
-
-	@Override
-	public void updateResultFromEditor() {
-		// does nothing by default
-	}
-	
-	/**
-	 * Synchronizes the editor with the chart result. 
-	 * Dedicated to dynamically change the editor components values from the stored result data.
-	 */
-	public abstract void updateEditorFromChart(boolean update);
-	
-	
-	@Override
-	public final void updateEditorFromResult(boolean update) {
-		
-		this.updateEditorFromChart(update);
-		
-		// check that the charts engine used for the result matches the SWT components provider otherwise find a suitable components provider
-		if(this.getResult().getChartsEngine() != this.getSWTChartsComponentsProvider().getChartsEngine())	{
-			
-			Log.finest("ChartEditor.__updateEditorFromResult(): result charts engine  = " + this.getResult().getChartsEngine().getName() + " / Editor charts engine = " + this.getSWTChartsComponentsProvider().getChartsEngine().getName() + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			
-			this.getEditorInput().setSWTChartsComponentsProvider(SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()));
-			this.getSWTChartsComponentsProvider().setChartsEngine(this.getResult().getChartsEngine());
-			
-			Log.finest("ChartEditor.__updateEditorFromResult(): charts engine used to create the chart does not match the editor one. The SWT components provider has been changed to match it: " + this.getSWTChartsComponentsProvider() + "."); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			// recreating the chart composite
-			Composite parent = this.chartComposite.getParent();
-			this.chartComposite.dispose();
-			this.chartComposite = this.getSWTChartsComponentsProvider().createComposite(this, parent);
-			
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			this.chartComposite.setLayoutData(gd);
-			parent.layout();
-		}
-
-		
-		
-		boolean needInit = (this.chartComposite.getChartComponent() == null) && (this.getResult().getChart() != null);
-		
-		// loading chart
-		this.getResult().subTask("Loading chart."); //$NON-NLS-1$
-		this.loadChart();
-		
-		
-		// FIXME: this code should be moved in ChartComposit.loadChart()?
-		// if editor wasn't exist:
-		// hiding command parameters, updating tool bar buttons states, registering context menus and event user callbacks 
-		if(needInit
-				
-				//!update
-//				&& !this.getResult().isChartDirty()
-				)	{
-//			getSite().getShell().getDisplay().syncExec(new Runnable() {
-//				@Override
-//				public void run() {
-					// FIXME: decide if we automatically hide or not the parameter area
-					//editor2.getTopToolbar().setComputingParametersVisible(false);
-					
-					// FIXME: tests to disable command if the chart is null and reenable it when the chart is computed 
-					//editor2.getChartToolBar().synchronize();
-					
-					// initialize the default shared context menus as Export, etc.
-					initDefaultContextMenus();
-			
-					// registers user entries event call back extensions
-					registerEventCallBackExtensions();
-					
-					//FIXME: test to contribute to menu only in some context and also for key binding
-					// create chart editor part context
-//					this.activateContext();
-//					IContextService contextService = (IContextService)getSite().getService(IContextService.class);
-//					this.contextActivationToken = contextService.activateContext(CONTEXT_ID_CHART_EDITOR);
-	//				// create chart composite context
-	//				contextService.activateContext(this.chartComposite.getClass().getName());
-					
-					//FIXME: description test
-					//editor2..setContentDescription("details");
-					//editor2..setContentDescription(this.getResultData().getDetails());
-	
-					initializeAWTDelegationListeners();
-					
-//				}
-//			});
-		}
-		
-		
-		if(this.parentMultiPagesEditor == null)	{
-			this.forceFocus();			
-		}
-	}
-
-	/**
-	 * Activates the chart editor context.
-	 */
-	public void activateContext()	{
-		IContextService contextService = (IContextService)getSite().getService(IContextService.class);
-		this.contextActivationToken = contextService.activateContext(CONTEXT_ID_CHART_EDITOR);
-	}
-	
-
-	/**
-	 * Deactivates the chart editor context.
-	 */
-	public void deactivateContext()	{
-		IContextService contextService = (IContextService)getSite().getService(IContextService.class);
-		contextService.deactivateContext(this.contextActivationToken);
-	}
-	
-	/**
-	 * Registers user entries event call back extensions.
-	 */
-	public void registerEventCallBackExtensions()	{
-		String extensionPointId = "org.txm.chartsengine.eventcallback"; //$NON-NLS-1$
-		IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointId);
-		
-		for(int i = 0; i < contributions.length; i++) {
-			if(
-				(
-						contributions[i].getAttribute("chartsEngineName") == null || //$NON-NLS-1$ // for callback that can be used for all charts engine implementations 
-						contributions[i].getAttribute("chartsEngineName").equals(this.getChartsEngine().getName()) //$NON-NLS-1$
-				)
-				&&
-				contributions[i].getAttribute("resultDataClass") != null //$NON-NLS-1$
-				&& contributions[i].getAttribute("resultDataClass").equals(this.getResult().getClass().getName()) //$NON-NLS-1$
-				
-				&& ((contributions[i].getAttribute("chartType") == null && this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) //$NON-NLS-1$
-					||
-					contributions[i].getAttribute("chartType") != null && !this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) && contributions[i].getAttribute("chartType").equals(this.getChartType()) //$NON-NLS-1$ //$NON-NLS-2$
-					)  //$NON-NLS-1$
-				)
-				
-			)	{
-				try {
-					EventCallBack eventCallBack = (EventCallBack)contributions[i].createExecutableExtension("class");  //$NON-NLS-1$
-					
-					eventCallBack.setChartEditor(this);
-					
-					EventCallBackHandler mouseHandler = this.chartComposite.getMouseCallBackHandler();
-					if(mouseHandler != null && mouseHandler.getEventCallBack(eventCallBack.getClass()) == null)	 {
-
-						Log.info("ChartEditor.registerEventCallBackExtensions(): call back of type " + eventCallBack.getClass()  //$NON-NLS-1$
-								+ " registered in mouse handler (chart editor = " + this.getClass()  //$NON-NLS-1$
-								+ ", result data class = " + this.getResult().getClass()  //$NON-NLS-1$
-								+ ", chart type = " + this.getChartType()  //$NON-NLS-1$
-								+ ").");  //$NON-NLS-1$
-						
-						mouseHandler.registerEventCallBack(eventCallBack);
-					}
-					EventCallBackHandler keyboardHandler = this.chartComposite.getKeyCallBackHandler();
-					if(keyboardHandler != null && keyboardHandler.getEventCallBack(eventCallBack.getClass()) == null)	 {
-						
-						Log.info("ChartEditor.registerEventCallBackExtensions(): call back of type " + eventCallBack.getClass()  //$NON-NLS-1$
-								+ " registered in key handler (chart editor = " + this.getClass()  //$NON-NLS-1$
-								+ ", result data class = " + this.getResult().getClass()  //$NON-NLS-1$
-								+ ", chart type = " + this.getChartType()  //$NON-NLS-1$
-								+ ").");  //$NON-NLS-1$
-						
-						keyboardHandler.registerEventCallBack(eventCallBack);
-					}
-				}
-				catch(CoreException e) {
-					e.printStackTrace();
-				}
-				break;
-			}
-		}
-		
-	}
-	
-	/**
-	 * Activate the editor in the UI.
-	 */
-	//FIXME: this method doesn't work for Multi pages editor, eg. can not activating CAFactorialMapEditor stored in the CAEditor
-	public void activate()	{
-		// Activate the parent multi pages editor instead of this editor if it exists
-		if(this.parentMultiPagesEditor != null)	{
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate(this.parentMultiPagesEditor);
-		}
-		else	{
-			// TODO: for focus and activation debug
-//			System.out.println("ChartEditor.activate(): current active editor = " + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart());
-//			System.out.println("ChartEditor.activate(): activating: " + this);
-//	//		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop(this);
-			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate(this);
-//			System.out.println("ChartEditor.activate(): new active editor = " + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart());
-		}
-	}
-
-	/**
-	 * Forces the Composite to get the focus.
-	 */
-	public void forceFocus()	{
-		// FIXME: debug
-		//System.err.println("ChartEditor.forceFocus()");
-
-		//this.chartComposite.setFocus();
-		this.chartComposite.notifyListeners(SWT.FocusIn, null); // Needed to force the composite listener to handle the focus event
-	}
-
-
-	@Override
-	public void setFocus() {
-
-		// FIXME: debug
-		//System.err.println("ChartEditor.setFocus()");
-
-		this.chartComposite.setFocus();
-
-	}
-
-	
-	
-	
-	
-	
-	/**
-	 * Initialize Swing/AWT events delegation.
-	 * @param swingComponent
-	 */
-	protected void initializeAWTDelegationListeners()	{
-		this.getChartComposite().getChartComponent().setChartEditor(this);
-		SWTChartsComponentsProvider.initializeAWTDelegationListeners(this, (JComponent) this.getEditorInput().getChartContainer());
-	}
-
-	/**
-	 * Convenience method the get the casted linked editor input.
-	 * @return the editorInput
-	 */
-	public ChartEditorInput<T> getEditorInput() {
-		return (ChartEditorInput) super.getEditorInput();
-	}
-
-
-
-	/**
-	 * Gets the chart drawing area composite.
-	 * @return the composite
-	 */
-	public ChartComposite getComposite() {
-		return this.chartComposite;
-	}
-
-
-	/**
-	 * Resets the chart view (zoom, pan, rotation).
-	 */
-	public void resetView() {
-		this.chartComposite.resetView();
-	}
-
-	/**
-	 *  Clears the selected items in chart.
-	 */
-	public void clearChartItemsSelection()	{
-		this.chartComposite.clearChartItemsSelection();
-	}
-	
-	/**
-	 * Zooms the chart view at x and y coordinates.
-	 * @param x
-	 * @param y
-	 * @param zoomIn
-	 */
-	public void zoom(double x, double y, boolean zoomIn)	{
-		this.chartComposite.zoom(x, y, zoomIn);
-	}
-
-	/**
-	 * Pans the chart view.
-	 * @param chartComponent
-	 * @param srcX
-	 * @param srcY
-	 * @param dstX
-	 * @param dstY
-	 * @param panFactor
-	 */
-	public void pan(double srcX, double srcY, double dstX, double dstY, double panFactor)	{
-		this.chartComposite.pan(srcX, srcY, dstX, dstY, panFactor);
-	}
-	
-	
-	/**
-	 * Copy the current chart view to clipboard.
-	 */
-	public void copyChartViewToClipboard()	{
-		this.chartComposite.copyChartViewToClipboard();
-	}
-
-	/**
-	 * Loads the chart from the chart object stored into the composite.
-	 * @param resetView
-	 * @param clearChartItemsSelection
-	 */
-	public void loadChart()	{
-		getSite().getShell().getDisplay().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				chartComposite.loadChart(
-						getResult().needsToResetView(), 
-						getResult().needsToClearItemsSelection());
-			}
-		});
-	}
-	
-	/**
-	 * Creates the chart container component from the chart object stored into the composite.
-	 */
-	// FIXME: became useless?
-//	public void createChartContainer()	{
-//		this.getSWTChartsComponentsProvider().createChartContainer(this.getEditorInput());
-//	}
-	
-	/**
-	 * Disposes the editor.
-	 * Implementations using a Composite to embed AWT/Swing components should manually call this.composite.dispose() in the redefined method.
-	 */
-	public void dispose()	{
-		if (chartComposite != null && !chartComposite.isDisposed()) {
-			this.chartComposite.dispose();
-		}
-		super.dispose();
-	}
-
-	/**
-	 * Returns the tool bar of this editor.
-	 * @return the toolBar
-	 */
-	public ChartEditorToolBar getToolBar() {
-		return chartToolBar;
-	}
-
-	/**
-	 * Returns the advanced tool bar of this editor.
-	 * @return
-	 */
-	public AdvancedChartEditorToolBar getAdvancedToolBar()	{
-		return this.advancedChartToolBar;
-	}
-	
-
-	/**
-	 * Gets the chart type. A same result can be drawn as multiple chart types (eg. pie, bar, etc.).
-	 * @return
-	 */
-	public String getChartType()	{
-		return this.getResult().getChartType();
-	}
-	
-	/**
-	 * Returns the chart associated with the editor.
-	 * @return
-	 */
-	public Object getChart()	{
-		return this.getResult().getChart();
-	}
-	
-	/**
-	 * Returns the chart components provider associated with the editor (through its <code>ChartEditorInput</code>).
-	 * @return
-	 */
-	public SWTChartsComponentsProvider getSWTChartsComponentsProvider()	{
-		return this.getEditorInput().getSWTChartsComponentsProvider();
-	}
-
-	/**
-	 * Gets the charts engine associated with the editor (through its <code>ChartEditorInput</code>).
-	 * @return
-	 */
-	public ChartsEngine getChartsEngine()	{
-		return this.getResult().getChartsEngine();
-	}
-
-	/**
-	 * Exports the current view of the chart editor in the specified file.
-	 * @param file
-	 * @param fileFormat
-	 * @return
-	 */
-	public File exportView(File file, String fileFormat)	{
-		return this.getSWTChartsComponentsProvider().exportView(this, file, fileFormat);
-	}
-
-	/**
-	 * Gets the parent multipages editor part if exists.
-	 * @return the parentMultiPagesEditor
-	 */
-	public MultiPageEditorPart getParentMultiPagesEditor() {
-		return parentMultiPagesEditor;
-	}
-
-	/**
-	 * Sets the specified multipages editor part as parent of this one.
-	 * @param parentMultiPagesEditor the parentMultiPagesEditor to set
-	 */
-	public void setParentMultiPagesEditor(MultiPageEditorPart parentMultiPagesEditor) {
-		this.parentMultiPagesEditor = parentMultiPagesEditor;
-	}
-
-	/**
-	 * To check whether this editor was already opened when calling SWTChartsComponentsProvider.openEditor().
-	 * @return the wasAlreadyOpened
-	 */
-	public boolean wasAlreadyOpened() {
-		return wasAlreadyOpened;
-	}
-
-	/**
-	 * To check whether this editor was already opened when calling SWTChartsComponentsProvider.openEditor().
-	 * @param wasAlreadyOpened the wasAlreadyOpened to set
-	 */
-	public void setWasAlreadyOpened(boolean wasAlreadyOpened) {
-		this.wasAlreadyOpened = wasAlreadyOpened;
-	}
-
-	/**
-	 * Checks whatever the chart composite has the focus or not.
-	 * @return <code>true</code> if the chart composite has the focus otherwise <code>false</code>
-	 */
-	public boolean hasFocus()	{
-		return this.chartComposite.hasFocus();
-	}
-
-	/**
-	 * Gets the chart composite.
-	 * @return the chartComposite
-	 */
-	public ChartComposite getChartComposite() {
-		return chartComposite;
-	}
-
-	/**
-	 * Gets the chart toolbar.
-	 * @return the chartToolBar
-	 */
-	public ChartEditorToolBar getChartToolBar() {
-		return chartToolBar;
-	}
-
-	
-	
-	@Override
-	public T getResult()	{
-		return (T) this.getEditorInput().getResult();
-	}
-	
-
-}
+package org.txm.chartsengine.rcp.editors;
+
+
+import java.io.File;
+
+import javax.swing.JComponent;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.contexts.IContextActivation;
+import org.eclipse.ui.contexts.IContextService;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.txm.chartsengine.core.ChartsEngine;
+import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
+import org.txm.chartsengine.core.results.ChartResult;
+import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
+import org.txm.chartsengine.rcp.events.EventCallBack;
+import org.txm.chartsengine.rcp.events.EventCallBackHandler;
+import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
+import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar;
+import org.txm.chartsengine.rcp.swt.ChartComposite;
+import org.txm.chartsengine.rcp.swt.ChartEditorToolBar;
+import org.txm.rcp.editors.TXMEditor;
+import org.txm.utils.logger.Log;
+
+/**
+ * Base class of all charts SWT <code>EditorPart</code> subclasses.
+ * @author sjacquot
+ *
+ */
+public abstract class ChartEditor<T extends ChartResult> extends TXMEditor<ChartResult>{
+
+	
+	public final static String CONTEXT_ID_CHART_EDITOR = "org.txm.chartsengine.rcp.editors.ChartEditor"; //$NON-NLS-1$
+	
+	/**
+	 * The tool bar.
+	 */
+	protected ChartEditorToolBar chartToolBar;
+
+	
+	/**
+	 * The advanced tool bar.
+	 */
+	protected AdvancedChartEditorToolBar advancedChartToolBar;
+	
+	/**
+	 * The advanced rendering parameters composite.
+	 */
+	protected Composite advancedToolBarComposite;
+	
+	/**
+	 * The advanced rendering parameters group.
+	 */
+	protected Group advancedToolBarGroup;
+
+	/**
+	 * The chart drawing area composite.
+	 */
+	protected ChartComposite chartComposite;
+
+	/**
+	 * To check whether this editor was already opened when calling SWTChartsComponentsProvider.openEditor().
+	 */
+	protected boolean wasAlreadyOpened;
+	
+	/**
+	 * The multi pages editor which contains this editor if exists.
+	 */
+	protected MultiPageEditorPart parentMultiPagesEditor = null;
+
+	/**
+	 * Token used to deactivate the context after it has been activated.
+	 */
+	protected IContextActivation contextActivationToken;
+	
+
+	/**
+	 *
+	 */
+	public ChartEditor()	{
+		super();
+	}
+
+
+	/**
+	 * 
+	 * @param swtComponentsProvider
+	 * @param chartEditorInput
+	 */
+	protected ChartEditor(ChartEditorInput chartEditorInput) {
+		this.setInput(chartEditorInput);
+		this.setPartName(chartEditorInput.getName());
+		
+		this.wasAlreadyOpened = false;
+	}
+
+	
+	/**
+	 * Subclasses manual creation.
+	 */
+	public abstract void __createPartControl();
+	
+	
+	@Override
+	public final void _createPartControl() {
+		
+		// Toolbar
+		this.chartToolBar = new ChartEditorToolBar(this, this.getFirstLineComposite(), null, SWT.FLAT | SWT.RIGHT);
+		this.getFirstLineComposite().getLayout().numColumns += 1;
+		//this.chartToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_RED));
+
+		// Advanced tool bar
+		//this.advancedToolBarComposite = new Composite(parent, SWT.NONE);
+		Group group = this.topToolBar.installGroup(SWTComponentsProviderMessages.rendering, SWTComponentsProviderMessages.showHideRenderingParameters, 
+				"platform:/plugin/org.txm.chartsengine.rcp/icons/show_rendering_parameters.png",  //$NON-NLS-1$
+				"platform:/plugin/org.txm.chartsengine.rcp/icons/hide_rendering_parameters.png", //$NON-NLS-1$
+				false);
+		this.advancedChartToolBar = new AdvancedChartEditorToolBar(this, group, this.getParametersGroupsComposite(), SWT.FLAT);
+		//this.advancedChartToolBar.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+//		this.advancedToolBarComposite.pack(true);
+
+		// Remove parent composites
+		//TODO MD: hack ?
+		//this.resultArea.dispose();
+		
+		// Chart composite
+		this.chartComposite = SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()).createComposite(this, getResultArea());
+		
+		GridData gd = new GridData(GridData.FILL_BOTH);
+//		gd.grabExcessVerticalSpace = true;
+//		gd.grabExcessHorizontalSpace = true;
+		//gd.horizontalSpan = 2; // 2 for match the command parameters toolbar AND the chart toolbar
+		this.chartComposite.setLayoutData(gd);
+		
+		
+		// Re-add the bottom toolbar
+		//TODO MD: hack ?
+		//this.bottomToolBar = new TXMEditorToolBar(this, SWT.FLAT, "bottom");
+		
+		// FIXME: open dialog box message if the composite doesn't contain any chart (typically when the charts engine doesn't contain chart creator for the specified result data type)
+//		if(composite.getChart() == null)	{
+//			MessageDialog.openWarning(parent.getShell(), "Warning", "Current charts engine can not create chart for " + this.getResultData().getClass().getSimpleName() + " result type. You can set another charts engine in the preferences.");
+//		}
+		
+		// FIXME: background color tests
+		//this.composite.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+		//parent.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
+
+		//this.refresh(false);
+//
+//		}
+		
+		 // subclasses manual creation
+		this.__createPartControl();
+		
+	}
+
+
+	/**
+	 * Initializes the default context menus.
+	 */
+	public void initDefaultContextMenus()	{
+		SWTChartsComponentsProvider.initDefaultContextMenus(this.chartComposite);
+	}
+	
+
+	/**
+	 * Opens an editor where id is the specified result class name, computes the result then refreshes the editor components.
+	 * @param result
+	 */
+	public static ChartEditor openEditor(ChartResult result) {
+		return openEditor(result, false);
+	}
+
+	public static ChartEditor openEditor(ChartResult result, boolean alwaysRecreateEditor)	{
+		return openEditor(result, result.getClass().getName(), alwaysRecreateEditor);
+	}
+	
+	public static ChartEditor openEditor(ChartResult result, String editorPartId)	{
+		return openEditor(result, editorPartId, false);
+	}
+	
+	
+	/**
+	 * Opens an editor specified by its id, computes the specified result then refreshes the editor components.
+	 * @param result
+	 * @param editorPartId
+	 * @return
+	 */
+	public static ChartEditor openEditor(ChartResult result, String editorPartId, boolean alwaysRecreateEditor)	{
+		
+		ChartEditorInput<ChartResult> editorInput = new ChartEditorInput<ChartResult>(result);
+		editorInput.setAlwaysRecreateEditor(alwaysRecreateEditor);
+		
+		return (ChartEditor) openEditor(editorInput, editorPartId);
+	}
+
+
+
+	@Override
+	public void updateResultFromEditor() {
+		// does nothing by default
+	}
+	
+	/**
+	 * Synchronizes the editor with the chart result. 
+	 * Dedicated to dynamically change the editor components values from the stored result data.
+	 */
+	public abstract void updateEditorFromChart(boolean update);
+	
+	
+	@Override
+	public final void updateEditorFromResult(boolean update) {
+		
+		this.updateEditorFromChart(update);
+		
+		// check that the charts engine used for the result matches the SWT components provider otherwise find a suitable components provider
+		if(this.getResult().getChartsEngine() != this.getSWTChartsComponentsProvider().getChartsEngine())	{
+			
+			Log.finest("ChartEditor.__updateEditorFromResult(): result charts engine  = " + this.getResult().getChartsEngine().getName() + " / Editor charts engine = " + this.getSWTChartsComponentsProvider().getChartsEngine().getName() + "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			
+			this.getEditorInput().setSWTChartsComponentsProvider(SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()));
+			this.getSWTChartsComponentsProvider().setChartsEngine(this.getResult().getChartsEngine());
+			
+			Log.finest("ChartEditor.__updateEditorFromResult(): charts engine used to create the chart does not match the editor one. The SWT components provider has been changed to match it: " + this.getSWTChartsComponentsProvider() + "."); //$NON-NLS-1$ //$NON-NLS-2$
+			
+			// recreating the chart composite
+			Composite parent = this.chartComposite.getParent();
+			this.chartComposite.dispose();
+			this.chartComposite = this.getSWTChartsComponentsProvider().createComposite(this, parent);
+			
+			GridData gd = new GridData(GridData.FILL_BOTH);
+			this.chartComposite.setLayoutData(gd);
+			parent.layout();
+		}
+
+		
+		
+		boolean needInit = (this.chartComposite.getChartComponent() == null) && (this.getResult().getChart() != null);
+		
+		// loading chart
+		this.getResult().subTask("Loading chart."); //$NON-NLS-1$
+		this.loadChart();
+		
+		
+		// FIXME: this code should be moved in ChartComposit.loadChart()?
+		// if editor wasn't exist:
+		// hiding command parameters, updating tool bar buttons states, registering context menus and event user callbacks 
+		if(needInit
+				
+				//!update
+//				&& !this.getResult().isChartDirty()
+				)	{
+//			getSite().getShell().getDisplay().syncExec(new Runnable() {
+//				@Override
+//				public void run() {
+					// FIXME: decide if we automatically hide or not the parameter area
+					//editor2.getTopToolbar().setComputingParametersVisible(false);
+					
+					// FIXME: tests to disable command if the chart is null and reenable it when the chart is computed 
+					//editor2.getChartToolBar().synchronize();
+					
+					// initialize the default shared context menus as Export, etc.
+					initDefaultContextMenus();
+			
+					// registers user entries event call back extensions
+					registerEventCallBackExtensions();
+					
+					//FIXME: test to contribute to menu only in some context and also for key binding
+					// create chart editor part context
+//					this.activateContext();
+//					IContextService contextService = (IContextService)getSite().getService(IContextService.class);
+//					this.contextActivationToken = contextService.activateContext(CONTEXT_ID_CHART_EDITOR);
+	//				// create chart composite context
+	//				contextService.activateContext(this.chartComposite.getClass().getName());
+					
+					//FIXME: description test
+					//editor2..setContentDescription("details");
+					//editor2..setContentDescription(this.getResultData().getDetails());
+	
+					initializeAWTDelegationListeners();
+					
+//				}
+//			});
+		}
+		
+		
+		if(this.parentMultiPagesEditor == null)	{
+			this.forceFocus();			
+		}
+	}
+
+	/**
+	 * Activates the chart editor context.
+	 */
+	public void activateContext()	{
+		IContextService contextService = (IContextService)getSite().getService(IContextService.class);
+		this.contextActivationToken = contextService.activateContext(CONTEXT_ID_CHART_EDITOR);
+	}
+	
+
+	/**
+	 * Deactivates the chart editor context.
+	 */
+	public void deactivateContext()	{
+		IContextService contextService = (IContextService)getSite().getService(IContextService.class);
+		contextService.deactivateContext(this.contextActivationToken);
+	}
+	
+	/**
+	 * Registers user entries event call back extensions.
+	 */
+	public void registerEventCallBackExtensions()	{
+		String extensionPointId = "org.txm.chartsengine.eventcallback"; //$NON-NLS-1$
+		IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointId);
+		
+		for(int i = 0; i < contributions.length; i++) {
+			if(
+				(
+						contributions[i].getAttribute("chartsEngineName") == null || //$NON-NLS-1$ // for callback that can be used for all charts engine implementations 
+						contributions[i].getAttribute("chartsEngineName").equals(this.getChartsEngine().getName()) //$NON-NLS-1$
+				)
+				&&
+				contributions[i].getAttribute("resultDataClass") != null //$NON-NLS-1$
+				&& contributions[i].getAttribute("resultDataClass").equals(this.getResult().getClass().getName()) //$NON-NLS-1$
+				
+				&& ((contributions[i].getAttribute("chartType") == null && this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) //$NON-NLS-1$
+					||
+					contributions[i].getAttribute("chartType") != null && !this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) && contributions[i].getAttribute("chartType").equals(this.getChartType()) //$NON-NLS-1$ //$NON-NLS-2$
+					)  //$NON-NLS-1$
+				)
+				
+			)	{
+				try {
+					EventCallBack eventCallBack = (EventCallBack)contributions[i].createExecutableExtension("class");  //$NON-NLS-1$
+					
+					eventCallBack.setChartEditor(this);
+					
+					EventCallBackHandler mouseHandler = this.chartComposite.getMouseCallBackHandler();
+					if(mouseHandler != null && mouseHandler.getEventCallBack(eventCallBack.getClass()) == null)	 {
+
+						Log.info("ChartEditor.registerEventCallBackExtensions(): call back of type " + eventCallBack.getClass()  //$NON-NLS-1$
+								+ " registered in mouse handler (chart editor = " + this.getClass()  //$NON-NLS-1$
+								+ ", result data class = " + this.getResult().getClass()  //$NON-NLS-1$
+								+ ", chart type = " + this.getChartType()  //$NON-NLS-1$
+								+ ").");  //$NON-NLS-1$
+						
+						mouseHandler.registerEventCallBack(eventCallBack);
+					}
+					EventCallBackHandler keyboardHandler = this.chartComposite.getKeyCallBackHandler();
+					if(keyboardHandler != null && keyboardHandler.getEventCallBack(eventCallBack.getClass()) == null)	 {
+						
+						Log.info("ChartEditor.registerEventCallBackExtensions(): call back of type " + eventCallBack.getClass()  //$NON-NLS-1$
+								+ " registered in key handler (chart editor = " + this.getClass()  //$NON-NLS-1$
+								+ ", result data class = " + this.getResult().getClass()  //$NON-NLS-1$
+								+ ", chart type = " + this.getChartType()  //$NON-NLS-1$
+								+ ").");  //$NON-NLS-1$
+						
+						keyboardHandler.registerEventCallBack(eventCallBack);
+					}
+				}
+				catch(CoreException e) {
+					e.printStackTrace();
+				}
+				break;
+			}
+		}
+		
+	}
+	
+	/**
+	 * Activate the editor in the UI.
+	 */
+	//FIXME: this method doesn't work for Multi pages editor, eg. can not activating CAFactorialMapEditor stored in the CAEditor
+	public void activate()	{
+		// Activate the parent multi pages editor instead of this editor if it exists
+		if(this.parentMultiPagesEditor != null)	{
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate(this.parentMultiPagesEditor);
+		}
+		else	{
+			// TODO: for focus and activation debug
+//			System.out.println("ChartEditor.activate(): current active editor = " + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart());
+//			System.out.println("ChartEditor.activate(): activating: " + this);
+//	//		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().bringToTop(this);
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate(this);
+//			System.out.println("ChartEditor.activate(): new active editor = " + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart());
+		}
+	}
+
+	/**
+	 * Forces the Composite to get the focus.
+	 */
+	public void forceFocus()	{
+		// FIXME: debug
+		//System.err.println("ChartEditor.forceFocus()");
+
+		//this.chartComposite.setFocus();
+		this.chartComposite.notifyListeners(SWT.FocusIn, null); // Needed to force the composite listener to handle the focus event
+	}
+
+
+	@Override
+	public void setFocus() {
+
+		// FIXME: debug
+		//System.err.println("ChartEditor.setFocus()");
+
+		this.chartComposite.setFocus();
+
+	}
+
+	
+	
+	
+	
+	
+	/**
+	 * Initialize Swing/AWT events delegation.
+	 * @param swingComponent
+	 */
+	protected void initializeAWTDelegationListeners()	{
+		this.getChartComposite().getChartComponent().setChartEditor(this);
+		SWTChartsComponentsProvider.initializeAWTDelegationListeners(this, (JComponent) this.getEditorInput().getChartContainer());
+	}
+
+	/**
+	 * Convenience method the get the casted linked editor input.
+	 * @return the editorInput
+	 */
+	public ChartEditorInput<T> getEditorInput() {
+		return (ChartEditorInput) super.getEditorInput();
+	}
+
+
+
+	/**
+	 * Gets the chart drawing area composite.
+	 * @return the composite
+	 */
+	public ChartComposite getComposite() {
+		return this.chartComposite;
+	}
+
+
+	/**
+	 * Resets the chart view (zoom, pan, rotation).
+	 */
+	public void resetView() {
+		this.chartComposite.resetView();
+	}
+
+	/**
+	 *  Clears the selected items in chart.
+	 */
+	public void clearChartItemsSelection()	{
+		this.chartComposite.clearChartItemsSelection();
+	}
+	
+	/**
+	 * Zooms the chart view at x and y coordinates.
+	 * @param x
+	 * @param y
+	 * @param zoomIn
+	 */
+	public void zoom(double x, double y, boolean zoomIn)	{
+		this.chartComposite.zoom(x, y, zoomIn);
+	}
+
+	/**
+	 * Pans the chart view.
+	 * @param chartComponent
+	 * @param srcX
+	 * @param srcY
+	 * @param dstX
+	 * @param dstY
+	 * @param panFactor
+	 */
+	public void pan(double srcX, double srcY, double dstX, double dstY, double panFactor)	{
+		this.chartComposite.pan(srcX, srcY, dstX, dstY, panFactor);
+	}
+	
+	
+	/**
+	 * Copy the current chart view to clipboard.
+	 */
+	public void copyChartViewToClipboard()	{
+		this.chartComposite.copyChartViewToClipboard();
+	}
+
+	/**
+	 * Loads the chart from the chart object stored into the composite.
+	 * @param resetView
+	 * @param clearChartItemsSelection
+	 */
+	public void loadChart()	{
+		getSite().getShell().getDisplay().syncExec(new Runnable() {
+			@Override
+			public void run() {
+				chartComposite.loadChart(
+						getResult().needsToResetView(), 
+						getResult().needsToClearItemsSelection());
+			}
+		});
+	}
+	
+	/**
+	 * Creates the chart container component from the chart object stored into the composite.
+	 */
+	// FIXME: became useless?
+//	public void createChartContainer()	{
+//		this.getSWTChartsComponentsProvider().createChartContainer(this.getEditorInput());
+//	}
+	
+	/**
+	 * Disposes the editor.
+	 * Implementations using a Composite to embed AWT/Swing components should manually call this.composite.dispose() in the redefined method.
+	 */
+	public void dispose()	{
+		if (chartComposite != null && !chartComposite.isDisposed()) {
+			this.chartComposite.dispose();
+		}
+		super.dispose();
+	}
+
+	/**
+	 * Returns the tool bar of this editor.
+	 * @return the toolBar
+	 */
+	public ChartEditorToolBar getToolBar() {
+		return chartToolBar;
+	}
+
+	/**
+	 * Returns the advanced tool bar of this editor.
+	 * @return
+	 */
+	public AdvancedChartEditorToolBar getAdvancedToolBar()	{
+		return this.advancedChartToolBar;
+	}
+	
+
+	/**
+	 * Gets the chart type. A same result can be drawn as multiple chart types (eg. pie, bar, etc.).
+	 * @return
+	 */
+	public String getChartType()	{
+		return this.getResult().getChartType();
+	}
+	
+	/**
+	 * Returns the chart associated with the editor.
+	 * @return
+	 */
+	public Object getChart()	{
+		return this.getResult().getChart();
+	}
+	
+	/**
+	 * Returns the chart components provider associated with the editor (through its <code>ChartEditorInput</code>).
+	 * @return
+	 */
+	public SWTChartsComponentsProvider getSWTChartsComponentsProvider()	{
+		return this.getEditorInput().getSWTChartsComponentsProvider();
+	}
+
+	/**
+	 * Gets the charts engine associated with the editor (through its <code>ChartEditorInput</code>).
+	 * @return
+	 */
+	public ChartsEngine getChartsEngine()	{
+		return this.getResult().getChartsEngine();
+	}
+
+	/**
+	 * Exports the current view of the chart editor in the specified file.
+	 * @param file
+	 * @param fileFormat
+	 * @return
+	 */
+	public File exportView(File file, String fileFormat)	{
+		return this.getSWTChartsComponentsProvider().exportView(this, file, fileFormat);
+	}
+
+	/**
+	 * Gets the parent multipages editor part if exists.
+	 * @return the parentMultiPagesEditor
+	 */
+	public MultiPageEditorPart getParentMultiPagesEditor() {
+		return parentMultiPagesEditor;
+	}
+
+	/**
+	 * Sets the specified multipages editor part as parent of this one.
+	 * @param parentMultiPagesEditor the parentMultiPagesEditor to set
+	 */
+	public void setParentMultiPagesEditor(MultiPageEditorPart parentMultiPagesEditor) {
+		this.parentMultiPagesEditor = parentMultiPagesEditor;
+	}
+
+	/**
+	 * To check whether this editor was already opened when calling SWTChartsComponentsProvider.openEditor().
+	 * @return the wasAlreadyOpened
+	 */
+	public boolean wasAlreadyOpened() {
+		return wasAlreadyOpened;
+	}
+
+	/**
+	 * To check whether this editor was already opened when calling SWTChartsComponentsProvider.openEditor().
+	 * @param wasAlreadyOpened the wasAlreadyOpened to set
+	 */
+	public void setWasAlreadyOpened(boolean wasAlreadyOpened) {
+		this.wasAlreadyOpened = wasAlreadyOpened;
+	}
+
+	/**
+	 * Checks whatever the chart composite has the focus or not.
+	 * @return <code>true</code> if the chart composite has the focus otherwise <code>false</code>
+	 */
+	public boolean hasFocus()	{
+		return this.chartComposite.hasFocus();
+	}
+
+	/**
+	 * Gets the chart composite.
+	 * @return the chartComposite
+	 */
+	public ChartComposite getChartComposite() {
+		return chartComposite;
+	}
+
+	/**
+	 * Gets the chart toolbar.
+	 * @return the chartToolBar
+	 */
+	public ChartEditorToolBar getChartToolBar() {
+		return chartToolBar;
+	}
+
+	
+	
+	@Override
+	public T getResult()	{
+		return (T) this.getEditorInput().getResult();
+	}
+	
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartEditorToolBar.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartEditorToolBar.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/ChartEditorToolBar.java	(revision 1335)
@@ -1,214 +1,214 @@
-package org.txm.chartsengine.rcp.swt;
-
-import org.eclipse.swt.widgets.Composite;
-import org.txm.chartsengine.core.results.ChartResult;
-import org.txm.chartsengine.rcp.editors.ChartEditor;
-import org.txm.rcp.editors.TXMEditorToolBar;
-import org.txm.rcp.swt.GLComposite;
-
-/**
- * The default chart editor tool bar shared by every <code>ChartEditor</code>.
- * The tool bar is accessible and usable in plugin.xml with the URI toolbar:ChartEditorToolBar.
- * 
- * @author sjacquot
- *
- */
-// FIXME: became useless, can directly use TXMEditorToolBar
-public class ChartEditorToolBar extends TXMEditorToolBar {
-
-
-	public final static String ID = "ChartEditorToolBar" ;
-	
-	
-	/**
-	 * 
-	 * @param parent
-	 * @param style
-	 * @param toolBarId
-	 * @param chartEditor
-	 */
-	public ChartEditorToolBar(ChartEditor<? extends ChartResult> chartEditor, Composite parent, GLComposite subWidgetsComposite, int style) {
-		this(chartEditor, parent, subWidgetsComposite, style, ChartEditorToolBar.ID);
-	}
-	
-
-	/**
-	 * 
-	 * @param parent
-	 * @param style
-	 * @param chartEditorPart
-	 */
-	public ChartEditorToolBar(ChartEditor<? extends ChartResult> chartEditor, Composite parent, GLComposite subWidgetsComposite, int style, String toolbarId) {
-		super(chartEditor, parent, subWidgetsComposite, style, toolbarId);
-
-		
-		//FIXME: tests
-//		new ToolItem(this, SWT.SEPARATOR);
-//		
-//		final ToolItem showTitle = new ToolItem(this, SWT.CHECK);
-//		//showTitle.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_TITLE);
-//		showTitle.setImage(IImageKeys.getImage(this, "icons/show_title.png"));
-//		showTitle.setDisabledImage(IImageKeys.getImage(this, "icons/show_title_disabled.png"));
-//		showTitle.setToolTipText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_TITLE);
-//
-//		if(!TXMPreferences.isEmpty(chartEditorPart.getPreferencesNodeQualifier(), ChartsEnginePreferences.SHOW_TITLE))	{
-//			showTitle.setSelection(TXMPreferences.getBoolean(chartEditorPart.getPreferencesNodeQualifier(), chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_TITLE));
-//		}
-//		// disable if not managed
-//		else	{
-//			showTitle.setEnabled(false);
-//		}
-//		
-//
-//		final ToolItem showLegend = new ToolItem(this, SWT.CHECK);
-//		//showLegend.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_LEGEND);
-//		showLegend.setImage(IImageKeys.getImage(this, "icons/show_legend.png"));
-//		showLegend.setDisabledImage(IImageKeys.getImage(this, "icons/show_legend_disabled.png"));
-//		showLegend.setToolTipText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_LEGEND);
-//
-//		if(!TXMPreferences.isEmpty(chartEditorPart.getPreferencesNodeQualifier(), ChartsEnginePreferences.SHOW_LEGEND))	{
-//			showLegend.setSelection(TXMPreferences.getBoolean(chartEditorPart.getPreferencesNodeQualifier(), chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_LEGEND));
-//		}
-//		// disable if not managed
-//		else	{
-//			showLegend.setEnabled(false);
-//		}
-//
-//		
-//		final ToolItem showGrid = new ToolItem(this, SWT.CHECK);
-//		//showGrid.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_GRID);
-//		showGrid.setImage(IImageKeys.getImage(this, "icons/show_grid.png"));
-//		showGrid.setDisabledImage(IImageKeys.getImage(this, "icons/show_grid_disabled.png"));
-//		showGrid.setToolTipText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_GRID);
-//		
-//		if(!TXMPreferences.isEmpty(chartEditorPart.getPreferencesNodeQualifier(), ChartsEnginePreferences.SHOW_GRID))	{
-//			showGrid.setSelection(TXMPreferences.getBoolean(chartEditorPart.getPreferencesNodeQualifier(), chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_GRID));
-//		}
-//		// disable if not managed
-//		else	{
-//			showGrid.setEnabled(false);
-//		}
-//
-//		
-//		
-//		SelectionListener listener = new SelectionListener() {
-//			
-//			@Override
-//			public void widgetSelected(final SelectionEvent e) {
-//				
-//				// Accessing the source must be done outside the Job
-//				if(e.getSource() == showTitle)	{
-//					TXMPreferences.putLocalBoolean(chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_TITLE,showTitle.getSelection());
-//				}
-//				if(e.getSource() == showLegend)	{
-//					TXMPreferences.putLocalBoolean(chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_LEGEND, showLegend.getSelection());
-//				}
-//				if(e.getSource() == showGrid)	{
-//					TXMPreferences.putLocalBoolean(chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_GRID, showGrid.getSelection());
-//				}
-//				
-//				
-//				// updates existing chart 
-//				Job job = new Job("Update chart") {
-//
-//				    @Override
-//				    protected IStatus run(final IProgressMonitor monitor) {
-//
-//								
-//								
-//							  	// updating and reloading
-//								monitor.beginTask("Updating", IProgressMonitor.UNKNOWN);
-//								chartEditorPart.updateChart();
-//
-//								
-//								
-//								// cancel
-//								if(monitor.isCanceled())	{
-//									return Status.CANCEL_STATUS;
-//								}
-//								
-//								// refreshes
-//					    		chartEditorPart.getSite().getShell().getDisplay().asyncExec(new Runnable() {
-//									@Override
-//									public void run() {
-//										CorporaView.refresh();
-//									}
-//								});
-//								
-//								
-//								// loading
-//								monitor.setTaskName("Loading");
-//								chartEditorPart.loadChart();
-//								
-//								
-//								
-//								// FIXME: persistence test, saving local preferences/parameters to file
-//								//TXMPreferences.flush(chartEditorPart.getResultData());
-//								
-//								
-//								// done
-//								monitor.done(); 
-//
-//							
-////							}
-////						});
-//				  
-//			    		
-//				        return Status.OK_STATUS;
-//				    }
-//
-//				};
-//				//job.setUser(true); // show progress bar, without that the progress is located to bottom right
-//				job.schedule();
-//				
-//				
-//				
-//				
-//			}
-//			
-//			@Override
-//			public void widgetDefaultSelected(SelectionEvent e) {
-//				// TODO Auto-generated method stub
-//				
-//			}
-//		};
-//		showTitle.addSelectionListener(listener);
-//		showLegend.addSelectionListener(listener);
-//		showGrid.addSelectionListener(listener);
-	}
-
-	
-	/**
-	 * Synchronizes the tool bar with the chart result states.
-	 * Enables/disables button according to the chart result states.
-	 * 
-	 */
-	// FIXME: tests to disable command if the chart is null and reenable it when the chart is computed 
-//	public void synchronize()	{
-//		boolean enable = (this.getEditorPart().getResultData().getChart() != null);
-////		HandledContributionItem t = (HandledContributionItem) this.getItem(0).getData();
-//		System.out.println("ChartEditorToolBar.synchronize()");
-//		
-//		IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
-//        ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
-//        if (handlerService != null && commandService != null) {
-//                try {
-//                        Command command = commandService.getCommand(ExportChartEditorView.ID);
-//                        command.setEnabled(null);
-//                        //command.setEnabled(new Boolean(enable));
-//                } catch (Exception e) {
-//                	e.printStackTrace();
-//                }
-//        }
-//        else	{
-//        	System.err.println("ChartEditorToolBar.synchronize() can't get handler service");
-//        }
-//	}
-
-
-	@Override
-	public ChartEditor getEditorPart() {
-		return (ChartEditor) editorPart;
-	}
-
-}
+package org.txm.chartsengine.rcp.swt;
+
+import org.eclipse.swt.widgets.Composite;
+import org.txm.chartsengine.core.results.ChartResult;
+import org.txm.chartsengine.rcp.editors.ChartEditor;
+import org.txm.rcp.editors.TXMEditorToolBar;
+import org.txm.rcp.swt.GLComposite;
+
+/**
+ * The default chart editor tool bar shared by every <code>ChartEditor</code>.
+ * The tool bar is accessible and usable in plugin.xml with the URI toolbar:ChartEditorToolBar.
+ * 
+ * @author sjacquot
+ *
+ */
+// FIXME: became useless, can directly use TXMEditorToolBar
+public class ChartEditorToolBar extends TXMEditorToolBar {
+
+
+	public final static String ID = "ChartEditorToolBar" ;
+	
+	
+	/**
+	 * 
+	 * @param parent
+	 * @param style
+	 * @param toolBarId
+	 * @param chartEditor
+	 */
+	public ChartEditorToolBar(ChartEditor<? extends ChartResult> chartEditor, Composite parent, GLComposite subWidgetsComposite, int style) {
+		this(chartEditor, parent, subWidgetsComposite, style, ChartEditorToolBar.ID);
+	}
+	
+
+	/**
+	 * 
+	 * @param parent
+	 * @param style
+	 * @param chartEditorPart
+	 */
+	public ChartEditorToolBar(ChartEditor<? extends ChartResult> chartEditor, Composite parent, GLComposite subWidgetsComposite, int style, String toolbarId) {
+		super(chartEditor, parent, subWidgetsComposite, style, toolbarId);
+
+		
+		//FIXME: tests
+//		new ToolItem(this, SWT.SEPARATOR);
+//		
+//		final ToolItem showTitle = new ToolItem(this, SWT.CHECK);
+//		//showTitle.setText(SWTComponentsProviderMessages.showhideTitle);
+//		showTitle.setImage(IImageKeys.getImage(this, "icons/show_title.png"));
+//		showTitle.setDisabledImage(IImageKeys.getImage(this, "icons/show_title_disabled.png"));
+//		showTitle.setToolTipText(SWTComponentsProviderMessages.showhideTitle);
+//
+//		if(!TXMPreferences.isEmpty(chartEditorPart.getPreferencesNodeQualifier(), ChartsEnginePreferences.SHOW_TITLE))	{
+//			showTitle.setSelection(TXMPreferences.getBoolean(chartEditorPart.getPreferencesNodeQualifier(), chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_TITLE));
+//		}
+//		// disable if not managed
+//		else	{
+//			showTitle.setEnabled(false);
+//		}
+//		
+//
+//		final ToolItem showLegend = new ToolItem(this, SWT.CHECK);
+//		//showLegend.setText(SWTComponentsProviderMessages.showhideLegend);
+//		showLegend.setImage(IImageKeys.getImage(this, "icons/show_legend.png"));
+//		showLegend.setDisabledImage(IImageKeys.getImage(this, "icons/show_legend_disabled.png"));
+//		showLegend.setToolTipText(SWTComponentsProviderMessages.showhideLegend);
+//
+//		if(!TXMPreferences.isEmpty(chartEditorPart.getPreferencesNodeQualifier(), ChartsEnginePreferences.SHOW_LEGEND))	{
+//			showLegend.setSelection(TXMPreferences.getBoolean(chartEditorPart.getPreferencesNodeQualifier(), chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_LEGEND));
+//		}
+//		// disable if not managed
+//		else	{
+//			showLegend.setEnabled(false);
+//		}
+//
+//		
+//		final ToolItem showGrid = new ToolItem(this, SWT.CHECK);
+//		//showGrid.setText(SWTComponentsProviderMessages.showhideGrid);
+//		showGrid.setImage(IImageKeys.getImage(this, "icons/show_grid.png"));
+//		showGrid.setDisabledImage(IImageKeys.getImage(this, "icons/show_grid_disabled.png"));
+//		showGrid.setToolTipText(SWTComponentsProviderMessages.showhideGrid);
+//		
+//		if(!TXMPreferences.isEmpty(chartEditorPart.getPreferencesNodeQualifier(), ChartsEnginePreferences.SHOW_GRID))	{
+//			showGrid.setSelection(TXMPreferences.getBoolean(chartEditorPart.getPreferencesNodeQualifier(), chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_GRID));
+//		}
+//		// disable if not managed
+//		else	{
+//			showGrid.setEnabled(false);
+//		}
+//
+//		
+//		
+//		SelectionListener listener = new SelectionListener() {
+//			
+//			@Override
+//			public void widgetSelected(final SelectionEvent e) {
+//				
+//				// Accessing the source must be done outside the Job
+//				if(e.getSource() == showTitle)	{
+//					TXMPreferences.putLocalBoolean(chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_TITLE,showTitle.getSelection());
+//				}
+//				if(e.getSource() == showLegend)	{
+//					TXMPreferences.putLocalBoolean(chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_LEGEND, showLegend.getSelection());
+//				}
+//				if(e.getSource() == showGrid)	{
+//					TXMPreferences.putLocalBoolean(chartEditorPart.getResultData(), ChartsEnginePreferences.SHOW_GRID, showGrid.getSelection());
+//				}
+//				
+//				
+//				// updates existing chart 
+//				Job job = new Job("Update chart") {
+//
+//				    @Override
+//				    protected IStatus run(final IProgressMonitor monitor) {
+//
+//								
+//								
+//							  	// updating and reloading
+//								monitor.beginTask("Updating", IProgressMonitor.UNKNOWN);
+//								chartEditorPart.updateChart();
+//
+//								
+//								
+//								// cancel
+//								if(monitor.isCanceled())	{
+//									return Status.CANCEL_STATUS;
+//								}
+//								
+//								// refreshes
+//					    		chartEditorPart.getSite().getShell().getDisplay().asyncExec(new Runnable() {
+//									@Override
+//									public void run() {
+//										CorporaView.refresh();
+//									}
+//								});
+//								
+//								
+//								// loading
+//								monitor.setTaskName("Loading");
+//								chartEditorPart.loadChart();
+//								
+//								
+//								
+//								// FIXME: persistence test, saving local preferences/parameters to file
+//								//TXMPreferences.flush(chartEditorPart.getResultData());
+//								
+//								
+//								// done
+//								monitor.done(); 
+//
+//							
+////							}
+////						});
+//				  
+//			    		
+//				        return Status.OK_STATUS;
+//				    }
+//
+//				};
+//				//job.setUser(true); // show progress bar, without that the progress is located to bottom right
+//				job.schedule();
+//				
+//				
+//				
+//				
+//			}
+//			
+//			@Override
+//			public void widgetDefaultSelected(SelectionEvent e) {
+//				// TODO Auto-generated method stub
+//				
+//			}
+//		};
+//		showTitle.addSelectionListener(listener);
+//		showLegend.addSelectionListener(listener);
+//		showGrid.addSelectionListener(listener);
+	}
+
+	
+	/**
+	 * Synchronizes the tool bar with the chart result states.
+	 * Enables/disables button according to the chart result states.
+	 * 
+	 */
+	// FIXME: tests to disable command if the chart is null and reenable it when the chart is computed 
+//	public void synchronize()	{
+//		boolean enable = (this.getEditorPart().getResultData().getChart() != null);
+////		HandledContributionItem t = (HandledContributionItem) this.getItem(0).getData();
+//		System.out.println("ChartEditorToolBar.synchronize()");
+//		
+//		IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(IHandlerService.class);
+//        ICommandService commandService = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
+//        if (handlerService != null && commandService != null) {
+//                try {
+//                        Command command = commandService.getCommand(ExportChartEditorView.ID);
+//                        command.setEnabled(null);
+//                        //command.setEnabled(new Boolean(enable));
+//                } catch (Exception e) {
+//                	e.printStackTrace();
+//                }
+//        }
+//        else	{
+//        	System.err.println("ChartEditorToolBar.synchronize() can't get handler service");
+//        }
+//	}
+
+
+	@Override
+	public ChartEditor getEditorPart() {
+		return (ChartEditor) editorPart;
+	}
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java	(revision 1335)
@@ -1,267 +1,267 @@
-package org.txm.chartsengine.rcp.swt;
-
-import java.awt.Font;
-import java.awt.GraphicsEnvironment;
-import java.util.ArrayList;
-
-import org.apache.commons.lang.StringUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolItem;
-import org.txm.Toolbox;
-import org.txm.chartsengine.core.ChartCreator;
-import org.txm.chartsengine.core.ChartsEngine;
-import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
-import org.txm.chartsengine.core.results.ChartResult;
-import org.txm.chartsengine.rcp.editors.ChartEditor;
-import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
-import org.txm.core.engines.EngineType;
-import org.txm.rcp.IImageKeys;
-import org.txm.rcp.swt.GLComposite;
-
-/**
- * The default advanced chart editor tool bar shared by every <code>ChartEditor</code>.
- * The tool bar is accessible and usable in plugin.xml with the URI toolbar:AdvancedChartEditorToolBar.
- * 
- * @author sjacquot
- *
- */
-public class AdvancedChartEditorToolBar extends ChartEditorToolBar {
-
-	public final static String ID = "AdvancedChartEditorToolBar" ;
-	
-	/**
-	 *
-	 * @param parent
-	 * @param style
-	 */
-	public AdvancedChartEditorToolBar(ChartEditor<? extends ChartResult> chartEditor, Composite parent, GLComposite subWidgetsComposite, int style) {
-		super(chartEditor, parent, subWidgetsComposite, style, AdvancedChartEditorToolBar.ID);
-		
-		
-		final ToolItem showTitle = new ToolItem(this, SWT.CHECK);
-		//showTitle.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_TITLE);
-		showTitle.setImage(IImageKeys.getImage(getClass(), "icons/show_title.png"));
-		showTitle.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_title_disabled.png"));
-		showTitle.setToolTipText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_TITLE);
-
-		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_TITLE))	{
-			showTitle.setSelection(chartEditor.getResult().isTitleVisible());
-		}
-		// disable if not managed by the command
-		else	{
-			showTitle.setEnabled(false);
-		}
-		
-
-		final ToolItem showLegend = new ToolItem(this, SWT.CHECK);
-		//showLegend.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_LEGEND);
-		showLegend.setImage(IImageKeys.getImage(getClass(), "icons/show_legend.png"));
-		showLegend.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_legend_disabled.png"));
-		showLegend.setToolTipText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_LEGEND);
-
-		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_LEGEND))	{
-			showLegend.setSelection(chartEditor.getResult().isLegendVisible());
-		}
-		// disable if not managed by the command
-		else	{
-			showLegend.setEnabled(false);
-		}
-
-		
-		final ToolItem showGrid = new ToolItem(this, SWT.CHECK);
-		//showGrid.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_GRID);
-		showGrid.setImage(IImageKeys.getImage(getClass(), "icons/show_grid.png"));
-		showGrid.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_grid_disabled.png"));
-		showGrid.setToolTipText(SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_HIDE_GRID);
-		
-		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_GRID))	{
-			showGrid.setSelection(chartEditor.getResult().isGridVisible());
-		}
-		// disable if not managed by the command
-		else	{
-			showGrid.setEnabled(false);
-		}
-
-		
-		
-		// Rendering colors mode selection
-		new ToolItem(this, SWT.SEPARATOR);
-		final Combo renderingModeCombo = new Combo(this, SWT.READ_ONLY);
-		String colorsModes[] = new String[]{SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeColors,
-			SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeGrayscale,
-			SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeBlackAndWhite,
-			SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeMonochrome
-			};
-		renderingModeCombo.setItems(colorsModes);
-		
-		ToolItem renderingComboItem = new ToolItem(this, SWT.SEPARATOR);
-		renderingComboItem.setControl(renderingModeCombo);
-		renderingModeCombo.pack();
-		renderingComboItem.setWidth(renderingModeCombo.getBounds().width);
-		
-		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.RENDERING_COLORS_MODE))	{
-			renderingModeCombo.select(chartEditor.getResult().getRenderingColorsMode());
-		}
-		// disable if not managed
-		else	{
-			renderingModeCombo.setEnabled(false);
-		}
-		
-		
-		// Font selection
-		final Font currentFont = ChartsEngine.createFont(chartEditor.getResult().getFont());
-		
-		final Combo fontCombo = new Combo(this, SWT.READ_ONLY);
-		String fonts[] = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
-		fontCombo.setItems(fonts);
-
-		ToolItem fontsComboItem = new ToolItem(this, SWT.SEPARATOR);
-		fontsComboItem.setControl(fontCombo);
-		fontCombo.pack();
-		fontsComboItem.setWidth(fontCombo.getBounds().width);
-		
-		int currentFontIndex = 0;
-		for(int i = 0; i < fonts.length; i++) {
-			if(fonts[i].equals(currentFont.getName()))	{
-				currentFontIndex = i;
-				break;
-			}
-		}
-		fontCombo.select(currentFontIndex);
-		
-
-		// Font size
-		final Combo fontSizeCombo = new Combo(this, SWT.READ_ONLY);
-		String fontSizes[] = new String[30];
-		int currentFontSizeIndex = 0;
-		for(int i = 0; i < fontSizes.length; i++) {
-			fontSizes[i] = String.valueOf(i + 1);
-			if(currentFont.getSize() == (i + 1))	{
-				currentFontSizeIndex = i;
-			}
-			
-		}
-		fontSizeCombo.setItems(fontSizes);
-		
-		ToolItem fontSizeComboItem = new ToolItem(this, SWT.SEPARATOR);
-		fontSizeComboItem.setControl(fontSizeCombo);
-		fontSizeCombo.pack();
-		fontSizeComboItem.setWidth(fontSizeCombo.getBounds().width);
-		
-		fontSizeCombo.select(currentFontSizeIndex);
-
-		
-		// Chart types from installed chart creators in all installed charts engines
-		final Combo chartTypeCombo = new Combo(this, SWT.READ_ONLY);
-		ArrayList<String> chartsEngineNames = new ArrayList<String>();
-		ArrayList<ChartCreator> allChartCreators = new ArrayList<ChartCreator>();
-		
-		for (int i = 0; i < ChartsEngine.getChartsEngines().size(); i++) {
-			ArrayList<ChartCreator> chartCreators = ChartsEngine.getChartsEngines().get(i).getChartCreators(this.getEditorPart().getResult());
-			for (int j = 0; j < chartCreators.size(); j++) {
-				chartsEngineNames.add(ChartsEngine.getChartsEngines().get(i).getName());
-				allChartCreators.add(chartCreators.get(j));
-			}
-		}
-		
-		
-		String chartTypes[] = new String[allChartCreators.size()];
-		int currentChartCreatorIndex = 0;
-		
-		for(int i = 0; i < allChartCreators.size(); i++) {
-			
-			chartTypes[i] = allChartCreators.get(i).getChartType();
-			if(chartTypes[i] == null)	{
-				chartTypes[i] = ChartsEnginePreferences.DEFAULT_CHART_TYPE;
-			}
-			
-			// preselected combo index
-			if(this.getEditorPart().getChartType() != null && this.getEditorPart().getChartType().equals(chartTypes[i])
-					&& this.getEditorPart().getResult().getChartsEngine().getName().equals(chartsEngineNames.get(i))) {
-				currentChartCreatorIndex = i;
-			}
-			
-			chartTypes[i] = chartsEngineNames.get(i) + " / " + chartTypes[i]; //$NON-NLS-1$
-			
-		}
-		chartTypeCombo.setItems(chartTypes);
-		
-		ToolItem chartTypeComboItem = new ToolItem(this, SWT.SEPARATOR);
-		chartTypeComboItem.setControl(chartTypeCombo);
-		chartTypeCombo.pack();
-		chartTypeComboItem.setWidth(chartTypeCombo.getBounds().width);
-		
-		chartTypeCombo.select(currentChartCreatorIndex);
-		
-		
-		if(allChartCreators.size() < 2)	{
-			chartTypeCombo.setVisible(false);
-		}
-		
-		
-		// Listeners
-		SelectionListener listener = new SelectionListener() {
-			
-			@Override
-			public void widgetSelected(final SelectionEvent e) {
-				
-				boolean update = true;
-				
-				if(e.getSource() == showTitle)	{
-					getEditorPart().getResult().setTitleVisible(showTitle.getSelection());
-				}
-				else if(e.getSource() == showLegend)	{
-					getEditorPart().getResult().setLegendVisible(showLegend.getSelection());
-				}
-				else if(e.getSource() == showGrid)	{
-					getEditorPart().getResult().setGridVisible(showGrid.getSelection());
-				}
-				else if(e.getSource() == renderingModeCombo)	{
-					getEditorPart().getResult().setRenderingColorsMode(renderingModeCombo.getSelectionIndex());
-				}
-				else if(e.getSource() == fontCombo || e.getSource() == fontSizeCombo)	{
-					getEditorPart().getResult().setFont("1|" + fontCombo.getItem(fontCombo.getSelectionIndex()) + "|" + fontSizeCombo.getItem(fontSizeCombo.getSelectionIndex()) + "|0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				}
-				else if(e.getSource() == chartTypeCombo)	{
-					
-					String[] data = StringUtils.split(chartTypeCombo.getItem(chartTypeCombo.getSelectionIndex()), '/');
-					data[0] = StringUtils.trim(data[0]);
-					data[1] = StringUtils.trim(data[1]);
-					getEditorPart().getResult().setChartType(data[1]);
-					getEditorPart().getResult().setChartsEngine((ChartsEngine) Toolbox.getEngineManager(EngineType.CHARTS).getEngine(data[0]));
-					update = false;
-				}
-
-				getEditorPart().getResult().setChartDirty();
-				
-				// updates or creates chart
-				getEditorPart().compute(update);
-				getEditorPart().setFocus();
-			}
-			
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// TODO Auto-generated method stub
-				
-			}
-		};
-		showTitle.addSelectionListener(listener);
-		showLegend.addSelectionListener(listener);
-		showGrid.addSelectionListener(listener);
-		renderingModeCombo.addSelectionListener(listener);
-		fontCombo.addSelectionListener(listener);
-		fontSizeCombo.addSelectionListener(listener);
-		chartTypeCombo.addSelectionListener(listener);
-	}
-
-
-	
-	@Override
-	protected void checkSubclass() { } // if this method is not defined then the ToolBar cannot be subclassed
-	
-
-}
+package org.txm.chartsengine.rcp.swt;
+
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.util.ArrayList;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.ToolItem;
+import org.txm.Toolbox;
+import org.txm.chartsengine.core.ChartCreator;
+import org.txm.chartsengine.core.ChartsEngine;
+import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
+import org.txm.chartsengine.core.results.ChartResult;
+import org.txm.chartsengine.rcp.editors.ChartEditor;
+import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
+import org.txm.core.engines.EngineType;
+import org.txm.rcp.IImageKeys;
+import org.txm.rcp.swt.GLComposite;
+
+/**
+ * The default advanced chart editor tool bar shared by every <code>ChartEditor</code>.
+ * The tool bar is accessible and usable in plugin.xml with the URI toolbar:AdvancedChartEditorToolBar.
+ * 
+ * @author sjacquot
+ *
+ */
+public class AdvancedChartEditorToolBar extends ChartEditorToolBar {
+
+	public final static String ID = "AdvancedChartEditorToolBar" ;
+	
+	/**
+	 *
+	 * @param parent
+	 * @param style
+	 */
+	public AdvancedChartEditorToolBar(ChartEditor<? extends ChartResult> chartEditor, Composite parent, GLComposite subWidgetsComposite, int style) {
+		super(chartEditor, parent, subWidgetsComposite, style, AdvancedChartEditorToolBar.ID);
+		
+		
+		final ToolItem showTitle = new ToolItem(this, SWT.CHECK);
+		//showTitle.setText(SWTComponentsProviderMessages.showhideTitle);
+		showTitle.setImage(IImageKeys.getImage(getClass(), "icons/show_title.png"));
+		showTitle.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_title_disabled.png"));
+		showTitle.setToolTipText(SWTComponentsProviderMessages.showhideTitle);
+
+		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_TITLE))	{
+			showTitle.setSelection(chartEditor.getResult().isTitleVisible());
+		}
+		// disable if not managed by the command
+		else	{
+			showTitle.setEnabled(false);
+		}
+		
+
+		final ToolItem showLegend = new ToolItem(this, SWT.CHECK);
+		//showLegend.setText(SWTComponentsProviderMessages.showhideLegend);
+		showLegend.setImage(IImageKeys.getImage(getClass(), "icons/show_legend.png"));
+		showLegend.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_legend_disabled.png"));
+		showLegend.setToolTipText(SWTComponentsProviderMessages.showhideLegend);
+
+		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_LEGEND))	{
+			showLegend.setSelection(chartEditor.getResult().isLegendVisible());
+		}
+		// disable if not managed by the command
+		else	{
+			showLegend.setEnabled(false);
+		}
+
+		
+		final ToolItem showGrid = new ToolItem(this, SWT.CHECK);
+		//showGrid.setText(SWTComponentsProviderMessages.showhideGrid);
+		showGrid.setImage(IImageKeys.getImage(getClass(), "icons/show_grid.png"));
+		showGrid.setDisabledImage(IImageKeys.getImage(getClass(), "icons/show_grid_disabled.png"));
+		showGrid.setToolTipText(SWTComponentsProviderMessages.showhideGrid);
+		
+		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.SHOW_GRID))	{
+			showGrid.setSelection(chartEditor.getResult().isGridVisible());
+		}
+		// disable if not managed by the command
+		else	{
+			showGrid.setEnabled(false);
+		}
+
+		
+		
+		// Rendering colors mode selection
+		new ToolItem(this, SWT.SEPARATOR);
+		final Combo renderingModeCombo = new Combo(this, SWT.READ_ONLY);
+		String colorsModes[] = new String[]{SWTComponentsProviderMessages.colors,
+			SWTComponentsProviderMessages.grayscale,
+			SWTComponentsProviderMessages.blackAndWhite,
+			SWTComponentsProviderMessages.monochrome
+			};
+		renderingModeCombo.setItems(colorsModes);
+		
+		ToolItem renderingComboItem = new ToolItem(this, SWT.SEPARATOR);
+		renderingComboItem.setControl(renderingModeCombo);
+		renderingModeCombo.pack();
+		renderingComboItem.setWidth(renderingModeCombo.getBounds().width);
+		
+		if(!chartEditor.getResult().isEmptyPreference(ChartsEnginePreferences.RENDERING_COLORS_MODE))	{
+			renderingModeCombo.select(chartEditor.getResult().getRenderingColorsMode());
+		}
+		// disable if not managed
+		else	{
+			renderingModeCombo.setEnabled(false);
+		}
+		
+		
+		// Font selection
+		final Font currentFont = ChartsEngine.createFont(chartEditor.getResult().getFont());
+		
+		final Combo fontCombo = new Combo(this, SWT.READ_ONLY);
+		String fonts[] = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+		fontCombo.setItems(fonts);
+
+		ToolItem fontsComboItem = new ToolItem(this, SWT.SEPARATOR);
+		fontsComboItem.setControl(fontCombo);
+		fontCombo.pack();
+		fontsComboItem.setWidth(fontCombo.getBounds().width);
+		
+		int currentFontIndex = 0;
+		for(int i = 0; i < fonts.length; i++) {
+			if(fonts[i].equals(currentFont.getName()))	{
+				currentFontIndex = i;
+				break;
+			}
+		}
+		fontCombo.select(currentFontIndex);
+		
+
+		// Font size
+		final Combo fontSizeCombo = new Combo(this, SWT.READ_ONLY);
+		String fontSizes[] = new String[30];
+		int currentFontSizeIndex = 0;
+		for(int i = 0; i < fontSizes.length; i++) {
+			fontSizes[i] = String.valueOf(i + 1);
+			if(currentFont.getSize() == (i + 1))	{
+				currentFontSizeIndex = i;
+			}
+			
+		}
+		fontSizeCombo.setItems(fontSizes);
+		
+		ToolItem fontSizeComboItem = new ToolItem(this, SWT.SEPARATOR);
+		fontSizeComboItem.setControl(fontSizeCombo);
+		fontSizeCombo.pack();
+		fontSizeComboItem.setWidth(fontSizeCombo.getBounds().width);
+		
+		fontSizeCombo.select(currentFontSizeIndex);
+
+		
+		// Chart types from installed chart creators in all installed charts engines
+		final Combo chartTypeCombo = new Combo(this, SWT.READ_ONLY);
+		ArrayList<String> chartsEngineNames = new ArrayList<String>();
+		ArrayList<ChartCreator> allChartCreators = new ArrayList<ChartCreator>();
+		
+		for (int i = 0; i < ChartsEngine.getChartsEngines().size(); i++) {
+			ArrayList<ChartCreator> chartCreators = ChartsEngine.getChartsEngines().get(i).getChartCreators(this.getEditorPart().getResult());
+			for (int j = 0; j < chartCreators.size(); j++) {
+				chartsEngineNames.add(ChartsEngine.getChartsEngines().get(i).getName());
+				allChartCreators.add(chartCreators.get(j));
+			}
+		}
+		
+		
+		String chartTypes[] = new String[allChartCreators.size()];
+		int currentChartCreatorIndex = 0;
+		
+		for(int i = 0; i < allChartCreators.size(); i++) {
+			
+			chartTypes[i] = allChartCreators.get(i).getChartType();
+			if(chartTypes[i] == null)	{
+				chartTypes[i] = ChartsEnginePreferences.DEFAULT_CHART_TYPE;
+			}
+			
+			// preselected combo index
+			if(this.getEditorPart().getChartType() != null && this.getEditorPart().getChartType().equals(chartTypes[i])
+					&& this.getEditorPart().getResult().getChartsEngine().getName().equals(chartsEngineNames.get(i))) {
+				currentChartCreatorIndex = i;
+			}
+			
+			chartTypes[i] = chartsEngineNames.get(i) + " / " + chartTypes[i]; //$NON-NLS-1$
+			
+		}
+		chartTypeCombo.setItems(chartTypes);
+		
+		ToolItem chartTypeComboItem = new ToolItem(this, SWT.SEPARATOR);
+		chartTypeComboItem.setControl(chartTypeCombo);
+		chartTypeCombo.pack();
+		chartTypeComboItem.setWidth(chartTypeCombo.getBounds().width);
+		
+		chartTypeCombo.select(currentChartCreatorIndex);
+		
+		
+		if(allChartCreators.size() < 2)	{
+			chartTypeCombo.setVisible(false);
+		}
+		
+		
+		// Listeners
+		SelectionListener listener = new SelectionListener() {
+			
+			@Override
+			public void widgetSelected(final SelectionEvent e) {
+				
+				boolean update = true;
+				
+				if(e.getSource() == showTitle)	{
+					getEditorPart().getResult().setTitleVisible(showTitle.getSelection());
+				}
+				else if(e.getSource() == showLegend)	{
+					getEditorPart().getResult().setLegendVisible(showLegend.getSelection());
+				}
+				else if(e.getSource() == showGrid)	{
+					getEditorPart().getResult().setGridVisible(showGrid.getSelection());
+				}
+				else if(e.getSource() == renderingModeCombo)	{
+					getEditorPart().getResult().setRenderingColorsMode(renderingModeCombo.getSelectionIndex());
+				}
+				else if(e.getSource() == fontCombo || e.getSource() == fontSizeCombo)	{
+					getEditorPart().getResult().setFont("1|" + fontCombo.getItem(fontCombo.getSelectionIndex()) + "|" + fontSizeCombo.getItem(fontSizeCombo.getSelectionIndex()) + "|0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				}
+				else if(e.getSource() == chartTypeCombo)	{
+					
+					String[] data = StringUtils.split(chartTypeCombo.getItem(chartTypeCombo.getSelectionIndex()), '/');
+					data[0] = StringUtils.trim(data[0]);
+					data[1] = StringUtils.trim(data[1]);
+					getEditorPart().getResult().setChartType(data[1]);
+					getEditorPart().getResult().setChartsEngine((ChartsEngine) Toolbox.getEngineManager(EngineType.CHARTS).getEngine(data[0]));
+					update = false;
+				}
+
+				getEditorPart().getResult().setChartDirty();
+				
+				// updates or creates chart
+				getEditorPart().compute(update);
+				getEditorPart().setFocus();
+			}
+			
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {
+				// TODO Auto-generated method stub
+				
+			}
+		};
+		showTitle.addSelectionListener(listener);
+		showLegend.addSelectionListener(listener);
+		showGrid.addSelectionListener(listener);
+		renderingModeCombo.addSelectionListener(listener);
+		fontCombo.addSelectionListener(listener);
+		fontSizeCombo.addSelectionListener(listener);
+		chartTypeCombo.addSelectionListener(listener);
+	}
+
+
+	
+	@Override
+	protected void checkSubclass() { } // if this method is not defined then the ToolBar cannot be subclassed
+	
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java	(revision 1335)
@@ -118,28 +118,28 @@
 			try {
 				file.createNewFile();
 			} catch (IOException e1) {
-				Log.severe(NLS.bind(TXMUIMessages.ExportResult_3, file, e1));
+				Log.severe(NLS.bind(TXMUIMessages.exportDDotCantCreateFileP0DDotP1, file, e1));
 			}
 			if (!file.canWrite()) {
-				Log.severe(NLS.bind(TXMUIMessages.ExportResult_5, file));
+				Log.severe(NLS.bind(TXMUIMessages.impossibleToReadP0, file));
 			}
 			if (!file.isFile()) {
 				Log.severe("Error: " + file + " is not a file"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 
-			JobHandler jobhandler = new JobHandler(TXMUIMessages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(TXMUIMessages.exportingResults) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(TXMUIMessages.ExportResult_1, 100);
+						monitor.beginTask(TXMUIMessages.exporting, 100);
 
 						String outputFormat = SWTChartsComponentsProvider.getCurrent().getChartsEngineSupportedExportFileFormats().get(dialog.getFilterIndex());
 						ChartsEngine.getCurrent().createChartFile(chartResult, file, outputFormat);
 
 						if (file.exists()) {
 
-							Log.info(NLS.bind(TXMUIMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
+							Log.info(NLS.bind(TXMUIMessages.p1ExportSavedInFileDDotP0, file.getAbsolutePath(), outputFormat.toUpperCase()));
 
 							// Open internal editor in the UI thread
 							if (TBXPreferences.getInstance().getBoolean(TBXPreferences.EXPORT_SHOW))	{
@@ -151,7 +151,7 @@
 								});
 							}
 						} else {
-							System.out.println(NLS.bind(TXMUIMessages.ExportResult_4, file.getAbsolutePath(), outputFormat));
+							System.out.println(NLS.bind(TXMUIMessages.failedToExportInFileP0WithFormatP1, file.getAbsolutePath(), outputFormat));
 						}
 					} catch (ThreadDeath td) {
 						return Status.CANCEL_STATUS;
@@ -170,4 +170,4 @@
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java	(revision 1335)
@@ -126,28 +126,28 @@
 				file.createNewFile();
 			}
 			catch(IOException e1) {
-				System.err.println(NLS.bind(TXMUIMessages.ExportResult_3, file, e1));
+				System.err.println(NLS.bind(TXMUIMessages.exportDDotCantCreateFileP0DDotP1, file, e1));
 			}
 			if(!file.canWrite()) {
-				System.err.println(NLS.bind(TXMUIMessages.ExportResult_5, file));
+				System.err.println(NLS.bind(TXMUIMessages.impossibleToReadP0, file));
 			}
 			if(!file.isFile()) {
 				System.err.println("Error: " + file + " is not a file"); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 
-			JobHandler jobhandler = new JobHandler(TXMUIMessages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(TXMUIMessages.exportingResults) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(TXMUIMessages.ExportResult_1, 100);
+						monitor.beginTask(TXMUIMessages.exporting, 100);
 
 						String outputFormat = chartEditor.getSWTChartsComponentsProvider().getEditorSupportedExportFileFormats().get(dialog.getFilterIndex());
 						chartEditor.exportView(file, outputFormat);
 
 						if(file.exists()) {
 
-							System.out.println(NLS.bind(TXMUIMessages.ExportResult_2, file.getAbsolutePath(), outputFormat.toUpperCase()));
+							System.out.println(NLS.bind(TXMUIMessages.p1ExportSavedInFileDDotP0, file.getAbsolutePath(), outputFormat.toUpperCase()));
 
 							// Open internal editor in the UI thread
 							if(TBXPreferences.getInstance().getBoolean(TBXPreferences.EXPORT_SHOW))	{
@@ -160,7 +160,7 @@
 							}
 						}
 						else {
-							System.out.println(NLS.bind(TXMUIMessages.ExportResult_4, file.getAbsolutePath(), outputFormat));
+							System.out.println(NLS.bind(TXMUIMessages.failedToExportInFileP0WithFormatP1, file.getAbsolutePath(), outputFormat));
 						}
 					}
 					catch(ThreadDeath td) {
@@ -183,4 +183,4 @@
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java	(revision 1335)
@@ -70,7 +70,7 @@
 			chartsEngines[i][1] = contributions[i].getAttribute("name"); //$NON-NLS-1$
 		}
 		
-		this.chartsEngineComboField = new ComboFieldEditor(ChartsEnginePreferences.CURRENT_NAME, SWTComponentsProviderMessages.ChartsEnginePreferencePage_COMBO_FIELD_SELECT_ENGINE_LABEL, chartsEngines, this.getFieldEditorParent());
+		this.chartsEngineComboField = new ComboFieldEditor(ChartsEnginePreferences.CURRENT_NAME, SWTComponentsProviderMessages.currentEngine, chartsEngines, this.getFieldEditorParent());
 		this.addField(this.chartsEngineComboField);
 
 		
@@ -88,14 +88,14 @@
 			exportFormats[i][1] = formats[i];
 		}
 
-		this.addField(new ComboFieldEditor(ChartsEnginePreferences.DEFAULT_EXPORT_FORMAT, SWTComponentsProviderMessages.ChartsEnginePreferencePage_COMBO_FIELD_SELECT_EXPORT_FORMAT_LABEL, exportFormats, this.getFieldEditorParent()));
+		this.addField(new ComboFieldEditor(ChartsEnginePreferences.DEFAULT_EXPORT_FORMAT, SWTComponentsProviderMessages.defaultExportFormat, exportFormats, this.getFieldEditorParent()));
 
 
 		// other shared preferences
 		SWTChartsComponentsProvider.createChartsRenderingPreferencesFields(this, this.getFieldEditorParent());
 		
 		// Monochrome color
-		this.addField(new ColorFieldEditor(ChartsEnginePreferences.MONOCHROME_COLOR, SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingMonochromeColor, this.getFieldEditorParent()));
+		this.addField(new ColorFieldEditor(ChartsEnginePreferences.MONOCHROME_COLOR, SWTComponentsProviderMessages.monochromeRenderingColor, this.getFieldEditorParent()));
 		
 		FontFieldEditor font = new FontFieldEditor(ChartsEnginePreferences.FONT, "Font", "Specificities / Spécificités / Специфичность", this.getFieldEditorParent());
 		this.addField(font);
@@ -121,7 +121,7 @@
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(ChartsEnginePreferences.getInstance().getPreferencesNodeQualifier()));
-		this.setDescription(SWTComponentsProviderMessages.ChartsEnginePreferencePage_PreferencesWillBeAppliedToNewChart);
+		this.setDescription(SWTComponentsProviderMessages.thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected);
 	}
 
 	@Override
@@ -132,7 +132,7 @@
 			// Do nothing if the property has not been changed
 			if(this.hasChanged) {
 				
-				Log.info(SWTComponentsProviderMessages.ChartsEnginePreferencePage_LOG_RECREATING_CHARTS_ENGINE);
+				Log.info(SWTComponentsProviderMessages.recreatingChartsEngineAndSWTChartComponentsProvider);
 
 				Toolbox.getEngineManager(EngineType.CHARTS).setCurrentEngine(this.getPreferenceStore().getString(ChartsEnginePreferences.CURRENT_NAME));
 				
@@ -164,4 +164,4 @@
 			
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 1334)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 1335)
@@ -1,1028 +1,1027 @@
-package org.txm.chartsengine.rcp;
-
-
-import java.awt.Color;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
-import javax.swing.JComponent;
-import javax.swing.border.LineBorder;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.ComboFieldEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.contexts.IContextService;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.txm.chartsengine.core.ChartsEngine;
-import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
-import org.txm.chartsengine.core.results.ChartResult;
-import org.txm.chartsengine.rcp.editors.ChartEditor;
-import org.txm.chartsengine.rcp.editors.ChartEditorInput;
-import org.txm.chartsengine.rcp.events.EventCallBack;
-import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
-import org.txm.chartsengine.rcp.preferences.___KeyboardBindingProperties;
-import org.txm.chartsengine.rcp.preferences.___MouseBindingProperties;
-import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar;
-import org.txm.chartsengine.rcp.swt.ChartComposite;
-import org.txm.chartsengine.rcp.swt.ChartEditorToolBar;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.editors.SplitedGenericMultiPageEditor;
-import org.txm.rcp.preferences.TXMPreferencePage;
-import org.txm.rcp.preferences.TXMPreferenceStore;
-import org.txm.utils.logger.Log;
-
-/**
- * A class providing EditorPart and EditorInput according to the current charts engine.
- * @author sjacquot
- * 
- */
-public abstract class SWTChartsComponentsProvider {
-
-	
-	
-	
-	
-	// FIXME: should be done in an activator?
-	static	{
-		// Initializes the SWT Charts Components provider according to the current charts engine and its output format
-		SWTChartsComponentsProvider.createSWTChartsComponentsProviders();
-		SWTChartsComponentsProvider.setCurrrentComponentsProvider(ChartsEngine.getCurrent());
-	}
-	
-	
-	
-	
-	
-	/**
-	 * The charts engine.
-	 */
-	protected ChartsEngine chartsEngine;
-
-
-	/**
-	 * The name of the provider.
-	 */
-	protected String name;
-	
-	/**
-	 * The supported editor input formats.
-	 */
-	protected List<String> supportedInputFormats;
-	
-	
-	/**
-	 * Mouse control properties which will be shared by all implementations and chart editors.
-	 */
-	protected Properties mouseBindingProperties;
-
-
-	/**
-	 * Keyboard control properties which will be shared by all implementations and chart editors.
-	 */
-	protected Properties keyboardBindingProperties;
-
-	
-	/**
-	 * Installed SWT charts components providers.
-	 */
-	protected static ArrayList<SWTChartsComponentsProvider> chartsComponentsProviders;
-	
-	/**
-	 * Current SWT charts components provider index in the providers list.
-	 */
-	protected static int currentChartsComponentsProviderIndex;
-	
-	
-	
-	public SWTChartsComponentsProvider(ChartsEngine chartsEngine, Properties mouseBindingProperties, Properties keyboardBindingProperties) {
-		this.chartsEngine = chartsEngine;
-
-		this.mouseBindingProperties = mouseBindingProperties;
-		this.keyboardBindingProperties = keyboardBindingProperties;
-
-		// FIXME : see if we need to define the L&F as system for AWT/Swing components
-		// If yes, we need to find a way to manage the GTK L&F/Linux bug, see ticket #761
-        // System Look and feel
-//        try {
-//			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-//		}
-//		catch(ClassNotFoundException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		catch(InstantiationException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		catch(IllegalAccessException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		catch(UnsupportedLookAndFeelException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-	}
-
-	/**
-	 * 
-	 * @param chartsEngine
-	 */
-	public SWTChartsComponentsProvider(ChartsEngine chartsEngine) {
-		this(chartsEngine, new ___MouseBindingProperties(), new ___KeyboardBindingProperties());
-	}
-
-	
-	/**
-	 * 
-	 */
-	public SWTChartsComponentsProvider() {
-		this(null);
-	}
-
-	
-	/**
-	 * Creates a <code>ChartEditorInput</code> for the specified chart result.
-	 * @param result
-	 * @return a <code>ChartEditorInput</code>
-	 */
-	public ChartEditorInput createChartEditorInput(ChartResult result) {
-		return new ChartEditorInput(this, result);
-	}
-	
-	/**
-	 * Creates a new chart container for the specified <code>ChartResult</code> save it in the specified <code>ChartEditorInput</code>.
-	 * 
-	 * @param chartsEngine
-	 * @param chartEditorInput
-	 * @param result
-	 * @param preferencesNode
-	 * @param chartType
-	 * @return
-	 */
-	protected abstract boolean createChartContainer(ChartsEngine chartsEngine, ChartEditorInput chartEditorInput);
-	
-	/**
-	 * Creates a new chart container for the specified <code>ChartResult</code> save it in the specified <code>ChartEditorInput</code>.
-	 * 
-	 * @param chartEditorInput
-	 * @param result
-	 * @param preferencesNode
-	 * @param chartType
-	 * @return
-	 */
-	public boolean createChartContainer(ChartEditorInput chartEditorInput)	{
-		Log.finest(this.getClass().getName() + ": creating a chart container...");
-		return this.createChartContainer(this.getChartsEngine(), chartEditorInput);
-	}
-	
-	
-	/**
-	 * Creates and stores SWT charts components providers from installed extension contributions and define the current one according to the specified charts engine output format and provider supported input format.
-	 */
-	public static void createSWTChartsComponentsProviders()	{
-		
-		
-		SWTChartsComponentsProvider.chartsComponentsProviders = new ArrayList<SWTChartsComponentsProvider>();
-		
-		String extensionPointId = "org.txm.rcp.swtchartscomponentsprovider"; //$NON-NLS-1$
-		IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointId);
-		
-		for(int i = 0; i < contributions.length; i++) {
-			
-			// FIXME: to manage more than one input format, Store them in the class rather than in the extension schema?
-			String formatsStr = contributions[i].getAttribute("inputFormat").replace(" ", "").trim();
-			String[] formats = formatsStr.split(",");
-			
-			try {
-				SWTChartsComponentsProvider swtChartsComponentsProvider = (SWTChartsComponentsProvider)contributions[i].createExecutableExtension("class");  //$NON-NLS-1$
-				swtChartsComponentsProvider.setName(contributions[i].getAttribute("name")); //$NON-NLS-1$
-				swtChartsComponentsProvider.setEditorSupportedInputFormat(Arrays.asList(formats));
-				
-				// Add the first charts engine that supports the input format
-				ChartsEngine chartsEngine = null;
-				for(int j = 0; j < formats.length; j++) {
-					chartsEngine = ChartsEngine.getChartsEngine(formats[j]);
-					if(chartsEngine != null)	{
-						break;
-					}
-				}
-				swtChartsComponentsProvider.setChartsEngine(chartsEngine);					
-				
-				SWTChartsComponentsProvider.chartsComponentsProviders.add(swtChartsComponentsProvider);
-				Log.warning("Starting SWT charts components provider: " + swtChartsComponentsProvider + ".");
-				
-				
-			}
-			catch(CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	
-	/**
-	 * Gets the current charts component provider.
-	 * @return the current charts engine
-	 */
-	public static SWTChartsComponentsProvider getCurrent()	{
-		return SWTChartsComponentsProvider.chartsComponentsProviders.get(SWTChartsComponentsProvider.currentChartsComponentsProviderIndex);
-	}
-	
-	/**
-	 * Sets the current charts component provider according to the specified charts engine output format and provider supported input format. 
-	 * @param name the name of the charts engine to set as current
-	 */
-	public static void setCurrrentComponentsProvider(ChartsEngine chartsEngine)	{
-		for(int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
-			if(SWTChartsComponentsProvider.chartsComponentsProviders.get(i).getEditorSupportedInputFormats().contains(chartsEngine.getOutputFormat()))	{
-				// Set new charts engine
-				SWTChartsComponentsProvider.chartsComponentsProviders.get(i).setChartsEngine(chartsEngine);
-				
-				SWTChartsComponentsProvider.currentChartsComponentsProviderIndex = i;
-				Log.finest("Setting current SWT charts components provider to: " + SWTChartsComponentsProvider.getCurrent() + ".");
-				break;
-			}
-		}
-	}
-	
-	
-	/**
-	 * Gets an SWT charts component provider according to the specified charts engine output format and provider supported input format. 
-	 * @param chartsEngine
-	 * @return
-	 */
-	public static SWTChartsComponentsProvider getComponentsProvider(ChartsEngine chartsEngine)	{
-		
-		SWTChartsComponentsProvider chartsComponentsProvider = null;
-		
-		for(int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
-			if(SWTChartsComponentsProvider.chartsComponentsProviders.get(i).getEditorSupportedInputFormats().contains(chartsEngine.getOutputFormat()))	{
-
-				chartsComponentsProvider = SWTChartsComponentsProvider.chartsComponentsProviders.get(i);
-				break;
-			}
-		}
-		
-		return chartsComponentsProvider;
-	}
-	
-	
-	/**
-	 * Gets an installed charts components provider according to its class type.
-	 * @param type
-	 * @return the installed charts components provider according to its class type if it exists otherwise null;
-	 */
-	public static SWTChartsComponentsProvider getComponentsProvider(Class type)	{
-		SWTChartsComponentsProvider provider = null;
-		for(int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
-			if(SWTChartsComponentsProvider.chartsComponentsProviders.get(i).getClass().equals(type))	{
-				provider = SWTChartsComponentsProvider.chartsComponentsProviders.get(i);
-				break;
-			}
-		}
-		return provider;
-	}
-
-	/**
-	 * Set the current charts engine.
-	 * @param chartsEngine the chartsEngine to set
-	 */
-	public void setChartsEngine(ChartsEngine chartsEngine) {
-		this.chartsEngine = chartsEngine;
-	}
-
-
-	/**
-	 * Gets the charts engine.
-	 * @return the chartsEngine
-	 */
-	public ChartsEngine getChartsEngine() {
-		return chartsEngine;
-	}
-
-
-	 /**
-	  * Creates the chart drawing area composite.
-	  * @param parent
-	  * @param style
-	  * @return the composite
-	  */
-	 public abstract ChartComposite createComposite(ChartEditor chartEditor, Composite parent);
-
-
-	/**
-	 * Returns the export formats supported by the implementation of the <code>EditorPart</code> for the view.
-	 * @return
-	 */
-	public abstract ArrayList<String> getEditorSupportedExportFileFormats();
-	
-	/**
-	 * Returns the input formats supported by the implementation of the <code>EditorPart</code> for viewing.
-	 * @return
-	 */
-	public List<String> getEditorSupportedInputFormats()	{
-		return this.supportedInputFormats;
-	}
-	
-
-	/**
-	 * Sets the input formats supported by the implementation of the <code>EditorPart</code> for viewing.
-	 * @param supportedInputFormats
-	 */
-	public void setEditorSupportedInputFormat(List<String> supportedInputFormats)	{
-		this.supportedInputFormats = supportedInputFormats;
-	}
-	
-	/**
-	 * Returns the export formats supported by the implementation of the <code>ChartsEngine</code> for the total chart.
-	 * @return
-	 */
-	public abstract ArrayList<String> getChartsEngineSupportedExportFileFormats();
-
-
-	/**
-	 * Creates a SWT group for the charts engine default preferences area in preference pages.
-	 * @return
-	 */
-	public static Group createChartsRenderingPreferencesGroup(Composite parent)	{
-
-		Group chartsGroup = new Group(parent, SWT.NONE);
-
-		chartsGroup.setText(SWTComponentsProviderMessages.ChartsEngineSharedPreferencePage_CHARTS_RENDERING_DEFAULT_PREFERENCES);
-
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.horizontalSpan = 2;
-		gridData.verticalIndent = 10;
-		chartsGroup.setLayoutData(gridData);
-
-		return chartsGroup;
-	}
-	
-	
-	/**
-	 * 
-	 * @param parent
-	 * @return
-	 */
-	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent)	{
-		return createChartsRenderingPreferencesTabFolderComposite(parent, SWTComponentsProviderMessages.ChartsEngineSharedPreferencePage_CHARTS_RENDERING_DEFAULT_PREFERENCES);
-	}
-	
-	/**
-	 * Creates a tab folder with a tab item for rendering preferences.
-	 * @param parent
-	 * @return
-	 */
-	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent, String tabTitle)	{
-
-		
-		TabFolder tabFolder = new TabFolder(parent, SWT.TOP);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalSpan = 2;
-		tabFolder.setLayoutData(gridData);
-
-		TabItem tabItem = new TabItem(tabFolder, SWT.NULL);
-		tabItem.setText(tabTitle);
-		Composite composite = new Composite(tabFolder, SWT.NULL);
-		tabItem.setControl(composite);
-		
-
-		return composite;
-	}
-	
-	/**
-	 * 
-	 * @param page
-	 * @param composite
-	 */
-	public static void createChartsRenderingPreferencesFields(TXMPreferencePage page, Composite composite)	{
-		
-		Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
-		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		separator.setLayoutData(gridData);
-
-		String commandNodeQualifier = ((TXMPreferenceStore)page.getPreferenceStore()).getNodeQualifier(); 
-
-		// Show title
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_TITLE))	{
-			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_TITLE, SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_TITLE, composite));
-		}
-		// Show legend
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_LEGEND))	{
-			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_LEGEND, SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_LEGEND, composite));
-		}
-		// Show grid
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_GRID))	{
-			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_GRID, SWTComponentsProviderMessages.SWTChartsComponentProvider_SHOW_GRID, composite));
-		}
-
-		// Rendering colors mode selection
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.RENDERING_COLORS_MODE))	{
-			String colorsModes[][] = new String[4][2];
-			colorsModes[0][0] = SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeColors;
-			colorsModes[0][1] = "0"; //$NON-NLS-1$
-			colorsModes[1][0] = SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeGrayscale;
-			colorsModes[1][1] = "1"; //$NON-NLS-1$
-			colorsModes[2][0] = SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeBlackAndWhite;
-			colorsModes[2][1] = "2"; //$NON-NLS-1$
-			colorsModes[3][0] = SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingModeMonochrome;
-			colorsModes[3][1] = "3"; //$NON-NLS-1$
-			ComboFieldEditor renderingModeComboField = new ComboFieldEditor(ChartsEnginePreferences.RENDERING_COLORS_MODE, SWTComponentsProviderMessages.ChartsEnginePreferencePage_RenderingColorsMode, colorsModes, composite);
-			page.addField(renderingModeComboField);
-		}
-
-		// Same lines stroke
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.MULTIPLE_LINE_STROKES))	{
-			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.MULTIPLE_LINE_STROKES, SWTComponentsProviderMessages.preferences_multipleLineStrokeStyles, composite));
-		}
-
-		
-	}
-	
-
-	
-	/**
-	 * Export the current view of chart editor in the specified file.
-	 * @param chartEditor
-	 * @param file
-	 * @param fileFormat
-	 * @return
-	 */
-	public abstract File exportView(ChartEditor chartEditor, File file, String fileFormat);
-
-	
-	/**
-	 * Opens the specified <code>ChartEditor</code> in the active page and registers the event listeners and context menus according to the type of the chart editor part.
-	 * The ID of the editor and the chart type are the editor input result data class name.
-	 * @param chartEditorInput
-	 * @return
-	 */
-	public ChartEditor openEditor(ChartEditorInput chartEditorInput)	{
-		return this.openEditor(chartEditorInput, chartEditorInput.getResult().getClass().getName());
-	}
-
-	
-	/**
-	 * Opens the <code>ChartEditor</code> specified by its id and ChartEditorInput in the active page and registers the event listeners and context menus according to the <code>EventCallBack</code> installed extensions. 
-	 * @param chartEditorInput
-	 * @param editorPartId
-	 * @param chartType
-	 * @return
-	 */
-	// FIXME: this method have some trouble when calling through a progress dialog
-	// FIXME: this method is not in use anymore since the editor opening is now down in TXMEditor so the code for ChartEngine downgrading is not 
-	// active anymore. Try to use again this code
-	public ChartEditor openEditor(ChartEditorInput chartEditorInput, String editorPartId)	{
-
-		ChartEditor openedChartEditorPart = null;
-
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		IWorkbenchPage page = window.getActivePage();
-
-//		IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
-//		IWorkbenchPage page = window.getActivePage();
-		
-		boolean isAlreadyOpened = page.findEditors(chartEditorInput, editorPartId, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID).length > 0;
-		
-		Log.info("SWTChartsComponentsProvider.openEditor(): opening editor with id " + editorPartId);
-		
-		// if the editor is already open or the charts engine can create the specified chart type
-		if(isAlreadyOpened || this.chartsEngine.canCreateChart(chartEditorInput.getResult()))	{
-			
-			//Log.info(this.name + " - Opening editor for result data type " + chartEditorInput.getResultData().getClass() + " and editor id " + editorPartId);
-
-			
-			try {
-				
-				openedChartEditorPart = (ChartEditor) page.openEditor(chartEditorInput, editorPartId, true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
-				openedChartEditorPart.setWasAlreadyOpened(isAlreadyOpened);
-				
-				
-				// directly returns if the editor was already opened
-				if(isAlreadyOpened)	{
-					return openedChartEditorPart;
-				}
-				
-				// compute the chart
-				//openedChartEditorPart.computeChart(false);
-
-				
-				// FIXME: directly close the editor if it contains no chart
-//				if(openedChartEditorPart.getChart() == null)	{
-//					page.closeEditor(openedChartEditorPart, false);
-//					return openedChartEditorPart;
-//				}
-				
-				// FIXME: tests with reuseEditor()
-				//openedChartEditorPart  = (ChartEditor) page.reuseEditor(editorPart, editorPart.getEditorInput());
-				
-				
-				//openedChartEditorPart.refreshCorporaView();
-				
-				openedChartEditorPart.forceFocus();
-				
-			}
-			catch(PartInitException e) {
-				e.printStackTrace();
-			}
-			
-		}
-		// get the first installed charts engine that can create chart and use the SWT provider matching it
-		else	{
-			Log.warning("Rendering failed with current charts engine, trying to rendering chart with other installed SWT components provider and other charts engine:");
-	
-			boolean canCreate = false;
-			for(int i = 0; i < ChartsEngine.getChartsEngines().size() && !canCreate; i++) {
-				if(ChartsEngine.getChartsEngines().get(i) != this.chartsEngine)	{
-					ChartsEngine chartsEngine = ChartsEngine.getChartsEngines().get(i);
-					canCreate = chartsEngine.canCreateChart(chartEditorInput.getResult());
-					// get a provider that can manage the charts engine
-					if(canCreate)	{
-						SWTChartsComponentsProvider provider = SWTChartsComponentsProvider.getComponentsProvider(chartsEngine);
-						if(provider != null)	{
-							provider.setChartsEngine(chartsEngine);
-							chartEditorInput.setSWTChartsComponentsProvider(provider);
-							Log.warning(provider.toString());
-							return provider.openEditor(chartEditorInput, editorPartId);
-						}
-					}
-				}
-			}
-		}
-		
-		return openedChartEditorPart;
-	}
-	
-	/**
-	 * 
-	 * @param titleImage
-	 * @param editorInputName
-	 * @param result
-	 * @param chartType
-	 * @param params
-	 * @return
-	 */
-	public ChartEditor openEditor(ChartResult result)	{
-		return this.openEditor(this.createChartEditorInput(result), result.getClass().getName());
-	}
-	
-	
-	/**
-	 * Initializes the default context menus.
-	 * @param composite
-	 */
-	public static void initDefaultContextMenus(ChartComposite composite)	{
-		if(composite != null)	{
-			composite.initItemAreaContextMenu();
-			composite.initEmptyAreaContextMenu();
-			composite.setCurrentContextMenu(EventCallBack.AREA_EMPTY);
-		}
-	}
-
-	
-	/**
-	 * Gets the current active chart editor managing the multi pages editor.
-	 * @param event
-	 * @return
-	 */
-	public static ChartEditor getActiveChartEditor(ExecutionEvent event)	{
-		ChartEditor chartEditor = null;
-
-		Event eevent = (Event)event.getTrigger();
-		Widget widget = eevent.widget;
-		// Toolbars
-		if(event != null && widget instanceof ToolItem)	{
-			ToolItem to = (ToolItem) widget;
-			ToolBar parent = to.getParent();
-			if(to.getParent() instanceof ChartEditorToolBar)	{
-				chartEditor = ((ChartEditorToolBar)((ToolItem)((Event)event.getTrigger()).widget).getParent()).getEditorPart();	
-			}
-			if(to.getParent() instanceof AdvancedChartEditorToolBar)	{
-				chartEditor = ((AdvancedChartEditorToolBar)((ToolItem)((Event)event.getTrigger()).widget).getParent()).getEditorPart();
-			}
-		}
-		// Context menu, multi pages editor
-		else if(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart() instanceof SplitedGenericMultiPageEditor)	{
-			// Main editor
-			if(((SplitedGenericMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()).getMainEditorPart() instanceof ChartEditor
-					&& ((ChartEditor)((SplitedGenericMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()).getMainEditorPart()).hasFocus())	{
-				chartEditor = (ChartEditor)((SplitedGenericMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()).getMainEditorPart();
-			}
-			else if(((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage() instanceof ChartEditor
-					&& ((ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage()).hasFocus() )	{
-				chartEditor = (ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage();
-			}
-		}
-		// Context menu, Normal editor
-		else if(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart() instanceof ChartEditor)	{
-			chartEditor = (ChartEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();	
-		}
-		return chartEditor;
-	}
-	
-	/**
-	 * Initializes AWT default events to delegate AWT events to SWT.
-	 * @param chartEditor
-	 * @param swingComponent
-	 */
-	public static void initializeAWTDelegationListeners(final ChartEditor chartEditor, final JComponent swingComponent)	{
-
-		// AWT to  SWT
-		swingComponent.addMouseMotionListener(new MouseMotionListener() {
-
-			@Override
-			public void mouseMoved(final MouseEvent e) {
-				chartEditor.getComposite().getDisplay().asyncExec(new Runnable () {
-					public void run() {
-						if(!chartEditor.getComposite().isDisposed())	{
-							chartEditor.getComposite().notifyListeners(SWT.MouseMove, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MouseMove));
-						}
-					}
-				});
-			}
-
-			@Override
-			public void mouseDragged(MouseEvent e) {
-				// TODO Auto-generated method stub
-
-			}
-		});
-
-		swingComponent.addMouseListener(new MouseListener() {
-
-			@Override
-			public void mouseReleased(final MouseEvent e) {
-				chartEditor.getComposite().getDisplay().asyncExec(new Runnable () {
-					public void run() {
-						
-						// FIXME: context menu
-						if(e.isPopupTrigger())	{
-
-							//System.err.println("SWTChartsComponentsProvider.initializeAWTDelegationListeners(...).new MouseListener() {...}.mouseReleased(...).new Runnable() {...}.run(): AWT popup trigger detected");
-							
-
-							
-							// update the mouse over item selection according to the mouse event
-							chartEditor.getComposite().getChartComponent().updateMouseOverItem(e);
-							
-							// manually pop up the menu
-							if(chartEditor.getComposite().getMenu() != null)	{
-								chartEditor.getComposite().getMenu().setLocation(new Point(e.getXOnScreen(), e.getYOnScreen()));
-								chartEditor.getComposite().getMenu().setVisible(true);
-							}
-
-							// FIXME: the SWT.MenuDetect event delegation doesn't work, it would be better than manually pop up the menu (but other problem is the dynamic menu on chart entity item)
-							//chartEditor.getComposite().notifyListeners(SWT.MenuDetect, SWTChartsComponentProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MenuDetect));
-							// FIXME: try to delegate the Menu detect event, DOES NOT SEEM TO WORK
-							//chartEditor.getComposite().notifyListeners(SWT.MenuDetect, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MenuDetect));
-							//chartEditor.getComposite().notifyListeners(SWT.Show, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.Show));
-							
-						}
-						chartEditor.getComposite().notifyListeners(SWT.MouseUp, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MouseUp));
-						//chartEditor.activate();
-					}
-				});
-			}
-
-			@Override
-			public void mousePressed(final MouseEvent e) {
-
-				// SWT thread
-				chartEditor.getComposite().getDisplay().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-
-						chartEditor.getComposite().notifyListeners(SWT.MouseDown, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MouseDown));
-						
-						// FIXME: Debug
-//						System.out.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new MouseListener() {...}.mousePressed(...).new Runnable() {...}.run()");
-						// Activate the editor part on AWT mouse pressed event
-						chartEditor.activate();
-//						chartEditor.forceFocus();
-					}
-				});
-
-			}
-
-			@Override
-			public void mouseExited(java.awt.event.MouseEvent e) {
-				// TODO Auto-generated method stub
-
-			}
-
-			@Override
-			public void mouseEntered(java.awt.event.MouseEvent e) {
-
-				// TODO: DEbug
-				//System.err.println("SWTChartsComponentProvider.initializeSwingDelegationListeners(...) AWT mouse entered");
-
-				// Force the focus in the component on mouse enter
-				/*if(!swingComponent.isFocusOwner())	{
-
-					// SWT thread
-					if(!chartEditor.getComposite().isDisposed())	{
-						chartEditor.getComposite().getDisplay().asyncExec(new Runnable() {
-							public void run() {
-	
-	
-								// FIXME: this code works on Windows and Linux but activate() the chart editor when mouse enters
-								//chartEditor.activate();
-	
-								EventQueue.invokeLater(new Runnable () {
-									public void run () {
-								
-										// TODO: this code forces to give the focus to the embedded AWT Frame under Windows (#1127 related)
-										// For unknown reason Frame.requestFocusInWindow() doesn't work and always return false here
-										// This code is not sufficient for Linux
-										System.out.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...) trying to give focus to root embedded frame");
-										try {
-											Frame frame = (Frame) swingComponent.getFocusCycleRootAncestor();
-											//frame.synthesizeWindowActivation(true);
-											Class clazz = frame.getClass();
-											Method method = clazz.getMethod("synthesizeWindowActivation", new Class[]{boolean.class});
-											if(method != null)	{
-												method.invoke(frame, new Object[]{new Boolean(true)});
-												System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners(...).new MouseListener() {...}.mouseEntered(...).new Runnable() {...}.run(): " + frame);
-			
-											}
-			
-											//frame.requestFocusInWindow();
-			
-			                            }
-										catch (Throwable e) {
-											Log.printStackTrace(e);
-										}
-									}
-								});
-								
-								
-								//System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners) AWT give focus to frame = " + ((JFCComposite)chartEditor.getComposite()).frame.requestFocusInWindow());
-	
-	
-	//							chartEditor.setFocus();
-	//							System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners() SWT got focus = " + chartEditor.getComposite().setFocus());
-	
-	//							EventQueue.invokeLater(new Runnable () {
-	//								public void run () {
-										//swingComponent.requestFocusInWindow();
-	
-	//									System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners() AWT got focus = " + swingComponent.requestFocusInWindow());
-	//								}
-	//							});
-	
-	
-	
-							}
-						});
-					}
-				}*/
-			}
-
-			@Override
-			public void mouseClicked(java.awt.event.MouseEvent e) {
-				// TODO Auto-generated method stub
-
-			}
-		});
-
-
-
-
-		// SWT
-
-		// SWT Tooltips tests
-
-
-//		toolTip = new DefaultToolTip(this, org.eclipse.jface.window.ToolTip.RECREATE, true);
-//		toolTip.setPopupDelay(500);
-
-
-
-		// FIXME: test HTML
-//		toolTip = new ___CustomHTMLToolTip(this, org.eclipse.jface.window.ToolTip.NO_RECREATE, true);
-//		toolTip.setShift(new Point(10, 50));
-
-
-
-
-		// Define AWT events, needed to properly give the focus to the Swing component and manage the mouse events
-		Listener listener;
-
-		//FIXME: useless ?
-		// Run event queue dispose event
-//		listener = new Listener () {
-//			 public void handleEvent (Event e) {
-//			   switch (e.type) {
-//					case SWT.Dispose:
-//						chartPanel.getParent().setVisible(false);
-//						EventQueue.invokeLater(new Runnable () {
-//						public void run() {
-//							((Frame) chartPanel.getParent().getParent()).dispose();
-//						}
-//					});
-//				   break;
-//			   }
-//		   }
-//		};
-//		this.addListener(SWT.Dispose, listener);
-
-
-		// Handle the AWT/Swing events delegation
-		listener = new Listener () {
-			public void handleEvent (Event e) {
-				switch (e.type) {
-					case SWT.FocusIn:
-						// FIXME: DEbug
-//						System.out.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT composite gained focus");
-						chartEditor.getComposite().requestFocusInComposite();
-						break;
-					case SWT.MouseMove:
-						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse move: " + e.x + " : " + e.y);
-
-//						// FIXME: SWT tool tips test
-//						ToolTip tip = new ToolTip(getShell(), SWT.BALLOON | SWT.ID_HIDE);
-//						tip.setMessage("test tool tip SWT");
-//						tip.setLocation(getDisplay().map(self, null, new Point(e.x, e.y)));
-//						tip.setVisible(true);
-
-//						// FIXME: JFace tool tips test
-//						//DefaultToolTip tip2 = new DefaultToolTip( self, SWT.NONE, true );
-//						//toolTip.setShift(new Point(e.x, e.y));
-//						//toolTip.setText("<html><body><p>rtrt <font style=\"color: red\">yuyuyu</font></p></body></html>");
-//						toolTip.setText(e.text);
-//						if(e.text != null)	{
-//							toolTip.show(new Point(e.x, e.y));
-//						}
-//						else	{
-//							toolTip.hide();
-//						}
-
-						// FIXME: JFace tool tips test 2
-//						toolTip.setText(e.text);
-//						if(e.text != null)	{
-//							toolTip.show(new Point(e.x, e.y));
-//						}
-//						else	{
-//							toolTip.hide();
-//						}
-
-
-
-						break;
-					case SWT.MouseDown:
-						// FIXME: to test in Linux and Mac, it should fix the focus bugs in CA chart between table focus and chart composite/panel focus + Linux singular values bar plot focus bug
-						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse down : set focus in composite and request focus in chart panel");
-						chartEditor.getComposite().setFocus();
-						chartEditor.getComposite().requestFocusInComposite();
-						break;
-					case SWT.MouseUp:
-						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse up");
-						break;
-
-					case SWT.MouseEnter:
-						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse enter");
-						break;
-
-
-					case SWT.Activate:
-						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT activate");
-						chartEditor.getComposite().requestFocusInComposite();
-						break;
-				}
-		   }
-		};
-		chartEditor.getComposite().addListener(SWT.FocusIn, listener);
-		chartEditor.getComposite().addListener(SWT.MouseDown, listener); // needed to manage the focus delegation between SWT and AWT/Swing
-
-//		chartEditor.getComposite().addListener(SWT.MouseEnter, listener); // TODO : test AWT delegation
-	//	chartEditor.getComposite().addListener(SWT.Activate, listener); // TODO : test AWT delegation
-
-
-		// FIXME: For Swing focus debug
-		swingComponent.addFocusListener(new FocusListener() {
-			
-			@Override
-			public void focusLost(FocusEvent e) {
-				// TODO Auto-generated method stub
-				swingComponent.setBorder(javax.swing.BorderFactory.createEmptyBorder());
-				Display.getDefault().asyncExec(new Runnable() {
-					
-					@Override
-					public void run() {
-						// TODO Auto-generated method stub
-						chartEditor.deactivateContext();						
-					}
-				});
-			}
-			
-			@Override
-			public void focusGained(FocusEvent e) {
-				// TODO Auto-generated method stub
-				swingComponent.setBorder(new LineBorder(Color.red, 1));
-				
-				Display.getDefault().asyncExec(new Runnable() {
-					
-					@Override
-					public void run() {
-						// TODO Auto-generated method stub
-						chartEditor.activateContext();						
-					}
-				});
-			}
-		});
-		
-
-		// FIXME: SWT tool tips test rather than using Swing
-		//chartEditor.getComposite().addListener(SWT.MouseMove, listener);
-	//	chartEditor.getComposite().addListener(SWT.MouseUp, listener);
-
-
-
-	}
-
-	/**
-	 * Converts an AWT event to SWT event. Also stores the Swing tool tip source text of the specified Swing component in the SWT event to give it to the SWT composite listener in <code>ChartComposite</code>.
-	 * @param swtComposite
-	 * @param swingComponent
-	 * @param e
-	 * @param eventType
-	 * @return
-	 */
-	// TODO : this method is incomplete
-	public static org.eclipse.swt.widgets.Event swingEventToSWT(Composite swtComposite, JComponent swingComponent, MouseEvent e, int eventType)	{
-
-		Event event = new Event();
-		event.button = e.getButton();
-		if(!swtComposite.isDisposed())	{
-			event.display = swtComposite.getDisplay();
-		}
-		event.widget = swtComposite;
-		event.type = eventType;
-
-		try {
-			// Store the Swing tool tip source text in the SWT event to give it to the SWT composite listener in ChartComposite
-			// NOTE: this method call sometimes throws a java.lang.IndexOutOfBoundsException
-			event.text = swingComponent.getToolTipText(e);
-		}
-		catch(Exception e1) {
-			//e1.printStackTrace();
-		}
-		event.x = e.getX();
-		event.y = e.getY();
-		return event;
-	}
-
-	
-
-	@Override
-	public String toString() {
-		String str = this.name + " ("; //$NON-NLS-1$
-		str += "supported input formats: " + this.supportedInputFormats.toString().replaceAll("\\[|\\]", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		str += ", Charts Engine: " + this.chartsEngine + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-		return str;
-	}
-
-
-	/**
-	 * @param name the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-
-
-}
-
+package org.txm.chartsengine.rcp;
+
+
+import java.awt.Color;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+
+import javax.swing.JComponent;
+import javax.swing.border.LineBorder;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.ComboFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.contexts.IContextService;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.txm.chartsengine.core.ChartsEngine;
+import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
+import org.txm.chartsengine.core.results.ChartResult;
+import org.txm.chartsengine.rcp.editors.ChartEditor;
+import org.txm.chartsengine.rcp.editors.ChartEditorInput;
+import org.txm.chartsengine.rcp.events.EventCallBack;
+import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
+import org.txm.chartsengine.rcp.preferences.___KeyboardBindingProperties;
+import org.txm.chartsengine.rcp.preferences.___MouseBindingProperties;
+import org.txm.chartsengine.rcp.swt.AdvancedChartEditorToolBar;
+import org.txm.chartsengine.rcp.swt.ChartComposite;
+import org.txm.chartsengine.rcp.swt.ChartEditorToolBar;
+import org.txm.core.preferences.TXMPreferences;
+import org.txm.rcp.editors.SplitedGenericMultiPageEditor;
+import org.txm.rcp.preferences.TXMPreferencePage;
+import org.txm.rcp.preferences.TXMPreferenceStore;
+import org.txm.utils.logger.Log;
+
+/**
+ * A class providing EditorPart and EditorInput according to the current charts engine.
+ * @author sjacquot
+ * 
+ */
+public abstract class SWTChartsComponentsProvider {
+
+	
+	
+	
+	
+	// FIXME: should be done in an activator?
+	static	{
+		// Initializes the SWT Charts Components provider according to the current charts engine and its output format
+		SWTChartsComponentsProvider.createSWTChartsComponentsProviders();
+		SWTChartsComponentsProvider.setCurrrentComponentsProvider(ChartsEngine.getCurrent());
+	}
+	
+	
+	
+	
+	
+	/**
+	 * The charts engine.
+	 */
+	protected ChartsEngine chartsEngine;
+
+
+	/**
+	 * The name of the provider.
+	 */
+	protected String name;
+	
+	/**
+	 * The supported editor input formats.
+	 */
+	protected List<String> supportedInputFormats;
+	
+	
+	/**
+	 * Mouse control properties which will be shared by all implementations and chart editors.
+	 */
+	protected Properties mouseBindingProperties;
+
+
+	/**
+	 * Keyboard control properties which will be shared by all implementations and chart editors.
+	 */
+	protected Properties keyboardBindingProperties;
+
+	
+	/**
+	 * Installed SWT charts components providers.
+	 */
+	protected static ArrayList<SWTChartsComponentsProvider> chartsComponentsProviders;
+	
+	/**
+	 * Current SWT charts components provider index in the providers list.
+	 */
+	protected static int currentChartsComponentsProviderIndex;
+	
+	
+	
+	public SWTChartsComponentsProvider(ChartsEngine chartsEngine, Properties mouseBindingProperties, Properties keyboardBindingProperties) {
+		this.chartsEngine = chartsEngine;
+
+		this.mouseBindingProperties = mouseBindingProperties;
+		this.keyboardBindingProperties = keyboardBindingProperties;
+
+		// FIXME : see if we need to define the L&F as system for AWT/Swing components
+		// If yes, we need to find a way to manage the GTK L&F/Linux bug, see ticket #761
+        // System Look and feel
+//        try {
+//			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+//		}
+//		catch(ClassNotFoundException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		catch(InstantiationException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		catch(IllegalAccessException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		catch(UnsupportedLookAndFeelException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+	}
+
+	/**
+	 * 
+	 * @param chartsEngine
+	 */
+	public SWTChartsComponentsProvider(ChartsEngine chartsEngine) {
+		this(chartsEngine, new ___MouseBindingProperties(), new ___KeyboardBindingProperties());
+	}
+
+	
+	/**
+	 * 
+	 */
+	public SWTChartsComponentsProvider() {
+		this(null);
+	}
+
+	
+	/**
+	 * Creates a <code>ChartEditorInput</code> for the specified chart result.
+	 * @param result
+	 * @return a <code>ChartEditorInput</code>
+	 */
+	public ChartEditorInput createChartEditorInput(ChartResult result) {
+		return new ChartEditorInput(this, result);
+	}
+	
+	/**
+	 * Creates a new chart container for the specified <code>ChartResult</code> save it in the specified <code>ChartEditorInput</code>.
+	 * 
+	 * @param chartsEngine
+	 * @param chartEditorInput
+	 * @param result
+	 * @param preferencesNode
+	 * @param chartType
+	 * @return
+	 */
+	protected abstract boolean createChartContainer(ChartsEngine chartsEngine, ChartEditorInput chartEditorInput);
+	
+	/**
+	 * Creates a new chart container for the specified <code>ChartResult</code> save it in the specified <code>ChartEditorInput</code>.
+	 * 
+	 * @param chartEditorInput
+	 * @param result
+	 * @param preferencesNode
+	 * @param chartType
+	 * @return
+	 */
+	public boolean createChartContainer(ChartEditorInput chartEditorInput)	{
+		Log.finest(this.getClass().getName() + ": creating a chart container...");
+		return this.createChartContainer(this.getChartsEngine(), chartEditorInput);
+	}
+	
+	
+	/**
+	 * Creates and stores SWT charts components providers from installed extension contributions and define the current one according to the specified charts engine output format and provider supported input format.
+	 */
+	public static void createSWTChartsComponentsProviders()	{
+		
+		
+		SWTChartsComponentsProvider.chartsComponentsProviders = new ArrayList<SWTChartsComponentsProvider>();
+		
+		String extensionPointId = "org.txm.rcp.swtchartscomponentsprovider"; //$NON-NLS-1$
+		IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointId);
+		
+		for(int i = 0; i < contributions.length; i++) {
+			
+			// FIXME: to manage more than one input format, Store them in the class rather than in the extension schema?
+			String formatsStr = contributions[i].getAttribute("inputFormat").replace(" ", "").trim();
+			String[] formats = formatsStr.split(",");
+			
+			try {
+				SWTChartsComponentsProvider swtChartsComponentsProvider = (SWTChartsComponentsProvider)contributions[i].createExecutableExtension("class");  //$NON-NLS-1$
+				swtChartsComponentsProvider.setName(contributions[i].getAttribute("name")); //$NON-NLS-1$
+				swtChartsComponentsProvider.setEditorSupportedInputFormat(Arrays.asList(formats));
+				
+				// Add the first charts engine that supports the input format
+				ChartsEngine chartsEngine = null;
+				for(int j = 0; j < formats.length; j++) {
+					chartsEngine = ChartsEngine.getChartsEngine(formats[j]);
+					if(chartsEngine != null)	{
+						break;
+					}
+				}
+				swtChartsComponentsProvider.setChartsEngine(chartsEngine);					
+				
+				SWTChartsComponentsProvider.chartsComponentsProviders.add(swtChartsComponentsProvider);
+				Log.warning("Starting SWT charts components provider: " + swtChartsComponentsProvider + ".");
+				
+				
+			}
+			catch(CoreException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+	}
+	
+	
+	/**
+	 * Gets the current charts component provider.
+	 * @return the current charts engine
+	 */
+	public static SWTChartsComponentsProvider getCurrent()	{
+		return SWTChartsComponentsProvider.chartsComponentsProviders.get(SWTChartsComponentsProvider.currentChartsComponentsProviderIndex);
+	}
+	
+	/**
+	 * Sets the current charts component provider according to the specified charts engine output format and provider supported input format. 
+	 * @param name the name of the charts engine to set as current
+	 */
+	public static void setCurrrentComponentsProvider(ChartsEngine chartsEngine)	{
+		for(int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
+			if(SWTChartsComponentsProvider.chartsComponentsProviders.get(i).getEditorSupportedInputFormats().contains(chartsEngine.getOutputFormat()))	{
+				// Set new charts engine
+				SWTChartsComponentsProvider.chartsComponentsProviders.get(i).setChartsEngine(chartsEngine);
+				
+				SWTChartsComponentsProvider.currentChartsComponentsProviderIndex = i;
+				Log.finest("Setting current SWT charts components provider to: " + SWTChartsComponentsProvider.getCurrent() + ".");
+				break;
+			}
+		}
+	}
+	
+	
+	/**
+	 * Gets an SWT charts component provider according to the specified charts engine output format and provider supported input format. 
+	 * @param chartsEngine
+	 * @return
+	 */
+	public static SWTChartsComponentsProvider getComponentsProvider(ChartsEngine chartsEngine)	{
+		
+		SWTChartsComponentsProvider chartsComponentsProvider = null;
+		
+		for(int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
+			if(SWTChartsComponentsProvider.chartsComponentsProviders.get(i).getEditorSupportedInputFormats().contains(chartsEngine.getOutputFormat()))	{
+
+				chartsComponentsProvider = SWTChartsComponentsProvider.chartsComponentsProviders.get(i);
+				break;
+			}
+		}
+		
+		return chartsComponentsProvider;
+	}
+	
+	
+	/**
+	 * Gets an installed charts components provider according to its class type.
+	 * @param type
+	 * @return the installed charts components provider according to its class type if it exists otherwise null;
+	 */
+	public static SWTChartsComponentsProvider getComponentsProvider(Class type)	{
+		SWTChartsComponentsProvider provider = null;
+		for(int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
+			if(SWTChartsComponentsProvider.chartsComponentsProviders.get(i).getClass().equals(type))	{
+				provider = SWTChartsComponentsProvider.chartsComponentsProviders.get(i);
+				break;
+			}
+		}
+		return provider;
+	}
+
+	/**
+	 * Set the current charts engine.
+	 * @param chartsEngine the chartsEngine to set
+	 */
+	public void setChartsEngine(ChartsEngine chartsEngine) {
+		this.chartsEngine = chartsEngine;
+	}
+
+
+	/**
+	 * Gets the charts engine.
+	 * @return the chartsEngine
+	 */
+	public ChartsEngine getChartsEngine() {
+		return chartsEngine;
+	}
+
+
+	 /**
+	  * Creates the chart drawing area composite.
+	  * @param parent
+	  * @param style
+	  * @return the composite
+	  */
+	 public abstract ChartComposite createComposite(ChartEditor chartEditor, Composite parent);
+
+
+	/**
+	 * Returns the export formats supported by the implementation of the <code>EditorPart</code> for the view.
+	 * @return
+	 */
+	public abstract ArrayList<String> getEditorSupportedExportFileFormats();
+	
+	/**
+	 * Returns the input formats supported by the implementation of the <code>EditorPart</code> for viewing.
+	 * @return
+	 */
+	public List<String> getEditorSupportedInputFormats()	{
+		return this.supportedInputFormats;
+	}
+	
+
+	/**
+	 * Sets the input formats supported by the implementation of the <code>EditorPart</code> for viewing.
+	 * @param supportedInputFormats
+	 */
+	public void setEditorSupportedInputFormat(List<String> supportedInputFormats)	{
+		this.supportedInputFormats = supportedInputFormats;
+	}
+	
+	/**
+	 * Returns the export formats supported by the implementation of the <code>ChartsEngine</code> for the total chart.
+	 * @return
+	 */
+	public abstract ArrayList<String> getChartsEngineSupportedExportFileFormats();
+
+
+	/**
+	 * Creates a SWT group for the charts engine default preferences area in preference pages.
+	 * @return
+	 */
+	public static Group createChartsRenderingPreferencesGroup(Composite parent)	{
+
+		Group chartsGroup = new Group(parent, SWT.NONE);
+
+		chartsGroup.setText(SWTComponentsProviderMessages.chartsRendering);
+
+		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		gridData.horizontalSpan = 2;
+		gridData.verticalIndent = 10;
+		chartsGroup.setLayoutData(gridData);
+
+		return chartsGroup;
+	}
+	
+	
+	/**
+	 * 
+	 * @param parent
+	 * @return
+	 */
+	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent)	{
+		return createChartsRenderingPreferencesTabFolderComposite(parent, SWTComponentsProviderMessages.chartsRendering);
+	}
+	
+	/**
+	 * Creates a tab folder with a tab item for rendering preferences.
+	 * @param parent
+	 * @return
+	 */
+	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent, String tabTitle)	{
+
+		
+		TabFolder tabFolder = new TabFolder(parent, SWT.TOP);
+		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		gridData.horizontalSpan = 2;
+		tabFolder.setLayoutData(gridData);
+
+		TabItem tabItem = new TabItem(tabFolder, SWT.NULL);
+		tabItem.setText(tabTitle);
+		Composite composite = new Composite(tabFolder, SWT.NULL);
+		tabItem.setControl(composite);
+		
+
+		return composite;
+	}
+	
+	/**
+	 * 
+	 * @param page
+	 * @param composite
+	 */
+	public static void createChartsRenderingPreferencesFields(TXMPreferencePage page, Composite composite)	{
+		
+		Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		gridData.horizontalSpan = 2;
+		separator.setLayoutData(gridData);
+
+		String commandNodeQualifier = ((TXMPreferenceStore)page.getPreferenceStore()).getNodeQualifier(); 
+
+		// Show title
+		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_TITLE))	{
+			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_TITLE, SWTComponentsProviderMessages.showTitle, composite));
+		}
+		// Show legend
+		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_LEGEND))	{
+			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_LEGEND, SWTComponentsProviderMessages.showLegend, composite));
+		}
+		// Show grid
+		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_GRID))	{
+			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_GRID, SWTComponentsProviderMessages.showGrid, composite));
+		}
+
+		// Rendering colors mode selection
+		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.RENDERING_COLORS_MODE))	{
+			String colorsModes[][] = new String[4][2];
+			colorsModes[0][0] = SWTComponentsProviderMessages.colors;
+			colorsModes[0][1] = "0"; //$NON-NLS-1$
+			colorsModes[1][0] = SWTComponentsProviderMessages.grayscale;
+			colorsModes[1][1] = "1"; //$NON-NLS-1$
+			colorsModes[2][0] = SWTComponentsProviderMessages.blackAndWhite;
+			colorsModes[2][1] = "2"; //$NON-NLS-1$
+			colorsModes[3][0] = SWTComponentsProviderMessages.monochrome;
+			colorsModes[3][1] = "3"; //$NON-NLS-1$
+			ComboFieldEditor renderingModeComboField = new ComboFieldEditor(ChartsEnginePreferences.RENDERING_COLORS_MODE, SWTComponentsProviderMessages.renderingColorsMode, colorsModes, composite);
+			page.addField(renderingModeComboField);
+		}
+
+		// Same lines stroke
+		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.MULTIPLE_LINE_STROKES))	{
+			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.MULTIPLE_LINE_STROKES, SWTComponentsProviderMessages.multipleLineStrokeStyles, composite));
+		}
+
+		
+	}
+	
+
+	
+	/**
+	 * Export the current view of chart editor in the specified file.
+	 * @param chartEditor
+	 * @param file
+	 * @param fileFormat
+	 * @return
+	 */
+	public abstract File exportView(ChartEditor chartEditor, File file, String fileFormat);
+
+	
+	/**
+	 * Opens the specified <code>ChartEditor</code> in the active page and registers the event listeners and context menus according to the type of the chart editor part.
+	 * The ID of the editor and the chart type are the editor input result data class name.
+	 * @param chartEditorInput
+	 * @return
+	 */
+	public ChartEditor openEditor(ChartEditorInput chartEditorInput)	{
+		return this.openEditor(chartEditorInput, chartEditorInput.getResult().getClass().getName());
+	}
+
+	
+	/**
+	 * Opens the <code>ChartEditor</code> specified by its id and ChartEditorInput in the active page and registers the event listeners and context menus according to the <code>EventCallBack</code> installed extensions. 
+	 * @param chartEditorInput
+	 * @param editorPartId
+	 * @param chartType
+	 * @return
+	 */
+	// FIXME: this method have some trouble when calling through a progress dialog
+	// FIXME: this method is not in use anymore since the editor opening is now down in TXMEditor so the code for ChartEngine downgrading is not 
+	// active anymore. Try to use again this code
+	public ChartEditor openEditor(ChartEditorInput chartEditorInput, String editorPartId)	{
+
+		ChartEditor openedChartEditorPart = null;
+
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		IWorkbenchPage page = window.getActivePage();
+
+//		IWorkbenchWindow window = PlatformUI.getWorkbench().getWorkbenchWindows()[0];
+//		IWorkbenchPage page = window.getActivePage();
+		
+		boolean isAlreadyOpened = page.findEditors(chartEditorInput, editorPartId, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID).length > 0;
+		
+		Log.info("SWTChartsComponentsProvider.openEditor(): opening editor with id " + editorPartId);
+		
+		// if the editor is already open or the charts engine can create the specified chart type
+		if(isAlreadyOpened || this.chartsEngine.canCreateChart(chartEditorInput.getResult()))	{
+			
+			//Log.info(this.name + " - Opening editor for result data type " + chartEditorInput.getResultData().getClass() + " and editor id " + editorPartId);
+
+			
+			try {
+				
+				openedChartEditorPart = (ChartEditor) page.openEditor(chartEditorInput, editorPartId, true, IWorkbenchPage.MATCH_INPUT | IWorkbenchPage.MATCH_ID);
+				openedChartEditorPart.setWasAlreadyOpened(isAlreadyOpened);
+				
+				
+				// directly returns if the editor was already opened
+				if(isAlreadyOpened)	{
+					return openedChartEditorPart;
+				}
+				
+				// compute the chart
+				//openedChartEditorPart.computeChart(false);
+
+				
+				// FIXME: directly close the editor if it contains no chart
+//				if(openedChartEditorPart.getChart() == null)	{
+//					page.closeEditor(openedChartEditorPart, false);
+//					return openedChartEditorPart;
+//				}
+				
+				// FIXME: tests with reuseEditor()
+				//openedChartEditorPart  = (ChartEditor) page.reuseEditor(editorPart, editorPart.getEditorInput());
+				
+				
+				//openedChartEditorPart.refreshCorporaView();
+				
+				openedChartEditorPart.forceFocus();
+				
+			}
+			catch(PartInitException e) {
+				e.printStackTrace();
+			}
+			
+		}
+		// get the first installed charts engine that can create chart and use the SWT provider matching it
+		else	{
+			Log.warning("Rendering failed with current charts engine, trying to rendering chart with other installed SWT components provider and other charts engine:");
+	
+			boolean canCreate = false;
+			for(int i = 0; i < ChartsEngine.getChartsEngines().size() && !canCreate; i++) {
+				if(ChartsEngine.getChartsEngines().get(i) != this.chartsEngine)	{
+					ChartsEngine chartsEngine = ChartsEngine.getChartsEngines().get(i);
+					canCreate = chartsEngine.canCreateChart(chartEditorInput.getResult());
+					// get a provider that can manage the charts engine
+					if(canCreate)	{
+						SWTChartsComponentsProvider provider = SWTChartsComponentsProvider.getComponentsProvider(chartsEngine);
+						if(provider != null)	{
+							provider.setChartsEngine(chartsEngine);
+							chartEditorInput.setSWTChartsComponentsProvider(provider);
+							Log.warning(provider.toString());
+							return provider.openEditor(chartEditorInput, editorPartId);
+						}
+					}
+				}
+			}
+		}
+		
+		return openedChartEditorPart;
+	}
+	
+	/**
+	 * 
+	 * @param titleImage
+	 * @param editorInputName
+	 * @param result
+	 * @param chartType
+	 * @param params
+	 * @return
+	 */
+	public ChartEditor openEditor(ChartResult result)	{
+		return this.openEditor(this.createChartEditorInput(result), result.getClass().getName());
+	}
+	
+	
+	/**
+	 * Initializes the default context menus.
+	 * @param composite
+	 */
+	public static void initDefaultContextMenus(ChartComposite composite)	{
+		if(composite != null)	{
+			composite.initItemAreaContextMenu();
+			composite.initEmptyAreaContextMenu();
+			composite.setCurrentContextMenu(EventCallBack.AREA_EMPTY);
+		}
+	}
+
+	
+	/**
+	 * Gets the current active chart editor managing the multi pages editor.
+	 * @param event
+	 * @return
+	 */
+	public static ChartEditor getActiveChartEditor(ExecutionEvent event)	{
+		ChartEditor chartEditor = null;
+
+		Event eevent = (Event)event.getTrigger();
+		Widget widget = eevent.widget;
+		// Toolbars
+		if(event != null && widget instanceof ToolItem)	{
+			ToolItem to = (ToolItem) widget;
+			ToolBar parent = to.getParent();
+			if(to.getParent() instanceof ChartEditorToolBar)	{
+				chartEditor = ((ChartEditorToolBar)((ToolItem)((Event)event.getTrigger()).widget).getParent()).getEditorPart();	
+			}
+			if(to.getParent() instanceof AdvancedChartEditorToolBar)	{
+				chartEditor = ((AdvancedChartEditorToolBar)((ToolItem)((Event)event.getTrigger()).widget).getParent()).getEditorPart();
+			}
+		}
+		// Context menu, multi pages editor
+		else if(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart() instanceof SplitedGenericMultiPageEditor)	{
+			// Main editor
+			if(((SplitedGenericMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()).getMainEditorPart() instanceof ChartEditor
+					&& ((ChartEditor)((SplitedGenericMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()).getMainEditorPart()).hasFocus())	{
+				chartEditor = (ChartEditor)((SplitedGenericMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart()).getMainEditorPart();
+			}
+			else if(((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage() instanceof ChartEditor
+					&& ((ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage()).hasFocus() )	{
+				chartEditor = (ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage();
+			}
+		}
+		// Context menu, Normal editor
+		else if(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart() instanceof ChartEditor)	{
+			chartEditor = (ChartEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();	
+		}
+		return chartEditor;
+	}
+	
+	/**
+	 * Initializes AWT default events to delegate AWT events to SWT.
+	 * @param chartEditor
+	 * @param swingComponent
+	 */
+	public static void initializeAWTDelegationListeners(final ChartEditor chartEditor, final JComponent swingComponent)	{
+
+		// AWT to  SWT
+		swingComponent.addMouseMotionListener(new MouseMotionListener() {
+
+			@Override
+			public void mouseMoved(final MouseEvent e) {
+				chartEditor.getComposite().getDisplay().asyncExec(new Runnable () {
+					public void run() {
+						if(!chartEditor.getComposite().isDisposed())	{
+							chartEditor.getComposite().notifyListeners(SWT.MouseMove, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MouseMove));
+						}
+					}
+				});
+			}
+
+			@Override
+			public void mouseDragged(MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+
+		swingComponent.addMouseListener(new MouseListener() {
+
+			@Override
+			public void mouseReleased(final MouseEvent e) {
+				chartEditor.getComposite().getDisplay().asyncExec(new Runnable () {
+					public void run() {
+						
+						// FIXME: context menu
+						if(e.isPopupTrigger())	{
+
+							//System.err.println("SWTChartsComponentsProvider.initializeAWTDelegationListeners(...).new MouseListener() {...}.mouseReleased(...).new Runnable() {...}.run(): AWT popup trigger detected");
+							
+
+							
+							// update the mouse over item selection according to the mouse event
+							chartEditor.getComposite().getChartComponent().updateMouseOverItem(e);
+							
+							// manually pop up the menu
+							if(chartEditor.getComposite().getMenu() != null)	{
+								chartEditor.getComposite().getMenu().setLocation(new Point(e.getXOnScreen(), e.getYOnScreen()));
+								chartEditor.getComposite().getMenu().setVisible(true);
+							}
+
+							// FIXME: the SWT.MenuDetect event delegation doesn't work, it would be better than manually pop up the menu (but other problem is the dynamic menu on chart entity item)
+							//chartEditor.getComposite().notifyListeners(SWT.MenuDetect, SWTChartsComponentProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MenuDetect));
+							// FIXME: try to delegate the Menu detect event, DOES NOT SEEM TO WORK
+							//chartEditor.getComposite().notifyListeners(SWT.MenuDetect, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MenuDetect));
+							//chartEditor.getComposite().notifyListeners(SWT.Show, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.Show));
+							
+						}
+						chartEditor.getComposite().notifyListeners(SWT.MouseUp, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MouseUp));
+						//chartEditor.activate();
+					}
+				});
+			}
+
+			@Override
+			public void mousePressed(final MouseEvent e) {
+
+				// SWT thread
+				chartEditor.getComposite().getDisplay().asyncExec(new Runnable() {
+					@Override
+					public void run() {
+
+						chartEditor.getComposite().notifyListeners(SWT.MouseDown, SWTChartsComponentsProvider.swingEventToSWT(chartEditor.getComposite(), swingComponent, e, SWT.MouseDown));
+						
+						// FIXME: Debug
+//						System.out.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new MouseListener() {...}.mousePressed(...).new Runnable() {...}.run()");
+						// Activate the editor part on AWT mouse pressed event
+						chartEditor.activate();
+//						chartEditor.forceFocus();
+					}
+				});
+
+			}
+
+			@Override
+			public void mouseExited(java.awt.event.MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+
+			@Override
+			public void mouseEntered(java.awt.event.MouseEvent e) {
+
+				// TODO: DEbug
+				//System.err.println("SWTChartsComponentProvider.initializeSwingDelegationListeners(...) AWT mouse entered");
+
+				// Force the focus in the component on mouse enter
+				/*if(!swingComponent.isFocusOwner())	{
+
+					// SWT thread
+					if(!chartEditor.getComposite().isDisposed())	{
+						chartEditor.getComposite().getDisplay().asyncExec(new Runnable() {
+							public void run() {
+	
+	
+								// FIXME: this code works on Windows and Linux but activate() the chart editor when mouse enters
+								//chartEditor.activate();
+	
+								EventQueue.invokeLater(new Runnable () {
+									public void run () {
+								
+										// TODO: this code forces to give the focus to the embedded AWT Frame under Windows (#1127 related)
+										// For unknown reason Frame.requestFocusInWindow() doesn't work and always return false here
+										// This code is not sufficient for Linux
+										System.out.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...) trying to give focus to root embedded frame");
+										try {
+											Frame frame = (Frame) swingComponent.getFocusCycleRootAncestor();
+											//frame.synthesizeWindowActivation(true);
+											Class clazz = frame.getClass();
+											Method method = clazz.getMethod("synthesizeWindowActivation", new Class[]{boolean.class});
+											if(method != null)	{
+												method.invoke(frame, new Object[]{new Boolean(true)});
+												System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners(...).new MouseListener() {...}.mouseEntered(...).new Runnable() {...}.run(): " + frame);
+			
+											}
+			
+											//frame.requestFocusInWindow();
+			
+			                            }
+										catch (Throwable e) {
+											Log.printStackTrace(e);
+										}
+									}
+								});
+								
+								
+								//System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners) AWT give focus to frame = " + ((JFCComposite)chartEditor.getComposite()).frame.requestFocusInWindow());
+	
+	
+	//							chartEditor.setFocus();
+	//							System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners() SWT got focus = " + chartEditor.getComposite().setFocus());
+	
+	//							EventQueue.invokeLater(new Runnable () {
+	//								public void run () {
+										//swingComponent.requestFocusInWindow();
+	
+	//									System.out.println("SWTChartsComponentProvider.initializeSwingDelegationListeners() AWT got focus = " + swingComponent.requestFocusInWindow());
+	//								}
+	//							});
+	
+	
+	
+							}
+						});
+					}
+				}*/
+			}
+
+			@Override
+			public void mouseClicked(java.awt.event.MouseEvent e) {
+				// TODO Auto-generated method stub
+
+			}
+		});
+
+
+
+
+		// SWT
+
+		// SWT Tooltips tests
+
+
+//		toolTip = new DefaultToolTip(this, org.eclipse.jface.window.ToolTip.RECREATE, true);
+//		toolTip.setPopupDelay(500);
+
+
+
+		// FIXME: test HTML
+//		toolTip = new ___CustomHTMLToolTip(this, org.eclipse.jface.window.ToolTip.NO_RECREATE, true);
+//		toolTip.setShift(new Point(10, 50));
+
+
+
+
+		// Define AWT events, needed to properly give the focus to the Swing component and manage the mouse events
+		Listener listener;
+
+		//FIXME: useless ?
+		// Run event queue dispose event
+//		listener = new Listener () {
+//			 public void handleEvent (Event e) {
+//			   switch (e.type) {
+//					case SWT.Dispose:
+//						chartPanel.getParent().setVisible(false);
+//						EventQueue.invokeLater(new Runnable () {
+//						public void run() {
+//							((Frame) chartPanel.getParent().getParent()).dispose();
+//						}
+//					});
+//				   break;
+//			   }
+//		   }
+//		};
+//		this.addListener(SWT.Dispose, listener);
+
+
+		// Handle the AWT/Swing events delegation
+		listener = new Listener () {
+			public void handleEvent (Event e) {
+				switch (e.type) {
+					case SWT.FocusIn:
+						// FIXME: DEbug
+//						System.out.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT composite gained focus");
+						chartEditor.getComposite().requestFocusInComposite();
+						break;
+					case SWT.MouseMove:
+						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse move: " + e.x + " : " + e.y);
+
+//						// FIXME: SWT tool tips test
+//						ToolTip tip = new ToolTip(getShell(), SWT.BALLOON | SWT.ID_HIDE);
+//						tip.setMessage("test tool tip SWT");
+//						tip.setLocation(getDisplay().map(self, null, new Point(e.x, e.y)));
+//						tip.setVisible(true);
+
+//						// FIXME: JFace tool tips test
+//						//DefaultToolTip tip2 = new DefaultToolTip( self, SWT.NONE, true );
+//						//toolTip.setShift(new Point(e.x, e.y));
+//						//toolTip.setText("<html><body><p>rtrt <font style=\"color: red\">yuyuyu</font></p></body></html>");
+//						toolTip.setText(e.text);
+//						if(e.text != null)	{
+//							toolTip.show(new Point(e.x, e.y));
+//						}
+//						else	{
+//							toolTip.hide();
+//						}
+
+						// FIXME: JFace tool tips test 2
+//						toolTip.setText(e.text);
+//						if(e.text != null)	{
+//							toolTip.show(new Point(e.x, e.y));
+//						}
+//						else	{
+//							toolTip.hide();
+//						}
+
+
+
+						break;
+					case SWT.MouseDown:
+						// FIXME: to test in Linux and Mac, it should fix the focus bugs in CA chart between table focus and chart composite/panel focus + Linux singular values bar plot focus bug
+						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse down : set focus in composite and request focus in chart panel");
+						chartEditor.getComposite().setFocus();
+						chartEditor.getComposite().requestFocusInComposite();
+						break;
+					case SWT.MouseUp:
+						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse up");
+						break;
+
+					case SWT.MouseEnter:
+						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT mouse enter");
+						break;
+
+
+					case SWT.Activate:
+						//System.err.println("SWTChartsComponentProvider.initializeAWTDelegationListeners(...).new Listener() {...}.handleEvent(): SWT activate");
+						chartEditor.getComposite().requestFocusInComposite();
+						break;
+				}
+		   }
+		};
+		chartEditor.getComposite().addListener(SWT.FocusIn, listener);
+		chartEditor.getComposite().addListener(SWT.MouseDown, listener); // needed to manage the focus delegation between SWT and AWT/Swing
+
+//		chartEditor.getComposite().addListener(SWT.MouseEnter, listener); // TODO : test AWT delegation
+	//	chartEditor.getComposite().addListener(SWT.Activate, listener); // TODO : test AWT delegation
+
+
+		// FIXME: For Swing focus debug
+		swingComponent.addFocusListener(new FocusListener() {
+			
+			@Override
+			public void focusLost(FocusEvent e) {
+				// TODO Auto-generated method stub
+				swingComponent.setBorder(javax.swing.BorderFactory.createEmptyBorder());
+				Display.getDefault().asyncExec(new Runnable() {
+					
+					@Override
+					public void run() {
+						// TODO Auto-generated method stub
+						chartEditor.deactivateContext();						
+					}
+				});
+			}
+			
+			@Override
+			public void focusGained(FocusEvent e) {
+				// TODO Auto-generated method stub
+				swingComponent.setBorder(new LineBorder(Color.red, 1));
+				
+				Display.getDefault().asyncExec(new Runnable() {
+					
+					@Override
+					public void run() {
+						// TODO Auto-generated method stub
+						chartEditor.activateContext();						
+					}
+				});
+			}
+		});
+		
+
+		// FIXME: SWT tool tips test rather than using Swing
+		//chartEditor.getComposite().addListener(SWT.MouseMove, listener);
+	//	chartEditor.getComposite().addListener(SWT.MouseUp, listener);
+
+
+
+	}
+
+	/**
+	 * Converts an AWT event to SWT event. Also stores the Swing tool tip source text of the specified Swing component in the SWT event to give it to the SWT composite listener in <code>ChartComposite</code>.
+	 * @param swtComposite
+	 * @param swingComponent
+	 * @param e
+	 * @param eventType
+	 * @return
+	 */
+	// TODO : this method is incomplete
+	public static org.eclipse.swt.widgets.Event swingEventToSWT(Composite swtComposite, JComponent swingComponent, MouseEvent e, int eventType)	{
+
+		Event event = new Event();
+		event.button = e.getButton();
+		if(!swtComposite.isDisposed())	{
+			event.display = swtComposite.getDisplay();
+		}
+		event.widget = swtComposite;
+		event.type = eventType;
+
+		try {
+			// Store the Swing tool tip source text in the SWT event to give it to the SWT composite listener in ChartComposite
+			// NOTE: this method call sometimes throws a java.lang.IndexOutOfBoundsException
+			event.text = swingComponent.getToolTipText(e);
+		}
+		catch(Exception e1) {
+			//e1.printStackTrace();
+		}
+		event.x = e.getX();
+		event.y = e.getY();
+		return event;
+	}
+
+	
+
+	@Override
+	public String toString() {
+		String str = this.name + " ("; //$NON-NLS-1$
+		str += "supported input formats: " + this.supportedInputFormats.toString().replaceAll("\\[|\\]", ""); //$NON-NLS-1$ //$NON-NLS-2$
+		str += ", Charts Engine: " + this.chartsEngine + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+		return str;
+	}
+
+
+	/**
+	 * @param name the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/InternalViewCoreMessages.java
===================================================================
--- tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/InternalViewCoreMessages.java	(revision 1334)
+++ tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/InternalViewCoreMessages.java	(revision 1335)
@@ -17,9 +17,9 @@
 	public static String RESULT_TYPE;
 
 	
-	public static String InternalView_3;
-	public static String InternalView_6;
-	public static String InternalView_7;
+	public static String structureInformationsDDot; 
+	public static String internalViewDDotFailedToRetrieveStructPropertiesValuesDDot; 
+	public static String noStructureInformations; 
 	
 	static {
 		Utf8NLS.initializeMessages(BUNDLE_NAME, InternalViewCoreMessages.class);
Index: tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-RESULT_TYPE = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+RESULT_TYPE=
Index: tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages_fr.properties	(revision 1335)
@@ -1,6 +1,6 @@
-
-InternalView_3 = \  Information des structures :
-InternalView_6 = Erreur lors de la récupération des valeurs des propriétés de structure :
-InternalView_7 = \  n° d'informations sur les structures
-
-RESULT_TYPE = Vue interne
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+internalViewDDotFailedToRetrieveStructPropertiesValuesDDot=Erreur lors de la récupération des valeurs des propriétés de structure \:
+noStructureInformations=\  n° d'informations sur les structures
+RESULT_TYPE=Vue interne
+structureInformationsDDot=\  Information des structures \:
Index: tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages.properties
===================================================================
--- tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.internalview.core/src/org/txm/internalview/core/messages/messages.properties	(revision 1335)
@@ -1,6 +1,6 @@
-
-InternalView_3 = \  Structure informations: 
-InternalView_6 = InternalView: failed to retrieve struct properties values: 
-InternalView_7 = \  No structure informations
-
-RESULT_TYPE = Internal View
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+internalViewDDotFailedToRetrieveStructPropertiesValuesDDot=InternalView\: failed to retrieve struct properties values\: 
+noStructureInformations=\  No structure informations
+RESULT_TYPE=Internal View
+structureInformationsDDot=\  Structure informations\: 
Index: tmp/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java
===================================================================
--- tmp/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java	(revision 1334)
+++ tmp/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java	(revision 1335)
@@ -1,407 +1,407 @@
-package org.txm.internalview.core.functions;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.core.results.Parameter;
-import org.txm.core.results.TXMParameters;
-import org.txm.core.results.TXMResult;
-import org.txm.internalview.core.messages.InternalViewCoreMessages;
-import org.txm.internalview.core.preferences.InternalViewPreferences;
-import org.txm.searchengine.cqp.CQPSearchEngine;
-import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
-import org.txm.searchengine.cqp.corpus.CQPCorpus;
-import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.QueryResult;
-import org.txm.searchengine.cqp.corpus.StructuralUnit;
-import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
-import org.txm.searchengine.cqp.corpus.WordProperty;
-import org.txm.searchengine.cqp.corpus.query.Match;
-import org.txm.searchengine.cqp.corpus.query.CQLQuery;
-import org.txm.utils.io.IOUtils;
-import org.txm.utils.logger.Log;
-
-/**
- * Internal view. 
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class InternalView extends TXMResult  {
-
-	protected List<Match> matches = new ArrayList<Match>();
-	protected int nmatches = 0;
-
-	/**
-	 * Current page.
-	 */
-	@Parameter(key=InternalViewPreferences.CURRENT_PAGE)
-	protected int pCurrentPage;
-
-	/**
-	 * Structural unit to explore.
-	 */
-	@Parameter(key=TXMPreferences.STRUCTURAL_UNIT)
-	protected StructuralUnit pStructuralUnit;
-
-	/**
-	 * Word properties to display.
-	 */
-	@Parameter(key=TXMPreferences.UNIT_PROPERTIES)
-	protected List<WordProperty> pWordProperties;
-
-	/**
-	 * Structural units to display.
-	 */
-	@Parameter(key=TXMPreferences.STRUCTURAL_UNIT_PROPERTIES)
-	protected List<StructuralUnitProperty> pStructuralUnitsProperties;
-
-
-	/**
-	 * 
-	 * @param parent
-	 */
-	public InternalView(CQPCorpus parent) {
-		super(parent);
-	}
-
-	/**
-	 * 
-	 * @param parametersNodePath
-	 */
-	public InternalView(String parametersNodePath) {
-		super(parametersNodePath);
-	}
-
-
-
-	@Override
-	public boolean loadParameters() throws Exception {
-		try {
-			String str = this.getStringParameterValue(TXMPreferences.STRUCTURAL_UNIT);
-			this.pStructuralUnit = this.getCorpus().getStructuralUnit(str);
-		} catch (Exception e) {
-			Log.printStackTrace(e);
-		}
-		try {
-			String str = this.getStringParameterValue(TXMPreferences.UNIT_PROPERTIES);
-			this.pWordProperties = (List<WordProperty>) WordProperty.stringToProperties(this.getCorpus(), str);
-		} catch (Exception e2) {
-			Log.printStackTrace(e2);
-		}
-		try {
-			String str = this.getStringParameterValue(TXMPreferences.STRUCTURAL_UNIT_PROPERTIES);
-			this.pStructuralUnitsProperties = StructuralUnitProperty.stringToProperties(this.getCorpus(), str);
-		} catch (Exception e3) {
-			Log.printStackTrace(e3);
-		}
-		return true;
-	}
-
-
-	@Override
-	protected boolean _compute() throws Exception {
-
-		//if(this.hasParameterChanged(InternalViewPreferences.STRUCTURAL_UNIT))	{
-		this.pCurrentPage = 0;
-		//find struct start-end
-		CQLQuery query = new CQLQuery("<" + pStructuralUnit.getName() + "> [] expand to " + pStructuralUnit); //$NON-NLS-1$ //$NON-NLS-2$
-		//System.out.println(query);
-		QueryResult result = getCorpus().query(query, "test", false); //$NON-NLS-1$
-		nmatches = result.getNMatch();
-		if (nmatches > 0) {
-			matches = result.getMatches();
-		}
-		result.drop();
-		//System.out.println(matches);
-		dirty = false;
-		return (nmatches > 0);
-		//}
-
-	}
-
-
-
-
-	@Override
-	public boolean canCompute() {
-		return getCorpus() != null && 
-				pStructuralUnit != null && 
-				pWordProperties != null && 
-				pWordProperties.size() > 0 && 
-				pStructuralUnitsProperties != null && 
-				pStructuralUnitsProperties.size() > 0;
-	}
-
-	/**
-	 * get the ith page and set the current page number to i
-	 * 
-	 * @param i
-	 * @return
-	 * @throws CqiClientException
-	 */
-	protected LinkedHashMap<Property, List<String>> getPageContent(int i) throws CqiClientException {
-		LinkedHashMap<Property, List<String>> rez = new LinkedHashMap<Property, List<String>>();
-
-		if (i >= 0 && i < nmatches) {
-			Match m = matches.get(i);
-			Collection<? extends Integer> positions = m.getRange();
-			int[] p = new int[positions.size()];
-			int c = 0;
-			for(int v : positions) {
-				p[c++] = v;
-			}
-			for (Property prop : pWordProperties) {
-				rez.put(prop, Match.getValuesForProperty(prop, p));
-			}
-			pCurrentPage = i;
-		}
-		return rez;
-	}
-
-
-	/**
-	 * 
-	 * @return the current page content map
-	 * @throws CqiClientException
-	 */
-	public HashMap<Property, List<String>> getCurrentPageContent() throws CqiClientException {
-		HashMap<Property, List<String>> current = this.getPageContent(pCurrentPage);
-		return current;
-	}
-
-
-
-
-	/**
-	 * Gets the current page number.
-	 * @return the current page number
-	 */
-	public int getCurrentPage() {
-		return pCurrentPage;
-	}
-
-	@Override
-	public boolean saveParameters() {
-		if (pStructuralUnit != null) {
-			this.saveParameter(InternalViewPreferences.STRUCTURAL_UNIT, pStructuralUnit.getName());
-		}
-		if (pStructuralUnitsProperties != null) {
-			String str = StructuralUnitProperty.propertiesToString(pStructuralUnitsProperties);
-			this.saveParameter(InternalViewPreferences.STRUCTURAL_UNIT_PROPERTIES, str);
-		}
-		if (pWordProperties != null) {
-			this.saveParameter(InternalViewPreferences.UNIT_PROPERTIES, WordProperty.propertiesToString(pWordProperties));
-		}
-
-		return true;
-	}
-
-	@Override
-	public void clean() {
-		// nothing to do
-	}
-
-
-	/**
-	 * Gets the linked corpus.
-	 * @return
-	 */
-	public CQPCorpus getCorpus() {
-		return (CQPCorpus)getParent();
-	}
-
-
-	@Override
-	public String getDetails() {
-		return getCorpus().getName()+" "+pStructuralUnit.getName()+" "+(pCurrentPage+1); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-
-	@Override
-	public String getSimpleName() {
-		return getName();
-	}
-
-
-	@Override
-	public String getName() {
-		if (pStructuralUnit != null) {
-			return pStructuralUnit.getName( ) + " (" + (this.pCurrentPage + 1) + " / " + this.nmatches + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		return getCorpus().getName();
-	}
-
-
-	/**
-	 * Gets the number of matched segments.
-	 * @return
-	 */
-	public int getSegmentsCount() {
-		return nmatches;
-	}
-
-
-	/**
-	 * Gets lexical properties to display.
-	 * @return
-	 */
-	public List<WordProperty> getProperties() {
-		return pWordProperties;
-	}
-
-	/**
-	 * 
-	 * @return
-	 */
-	public int getSegmentLength() {
-		if (matches.size() == 0) {
-			return 0;
-		}
-		if (matches.size() < pCurrentPage) {
-			return 0;
-		}
-
-		Match m = matches.get(pCurrentPage);
-		return m.size();
-	}
-
-	/**
-	 * 
-	 * @return
-	 */
-	public String getStructInfos() {
-
-		try {
-			if (pStructuralUnitsProperties.size() > 0) {
-				String str = InternalViewCoreMessages.InternalView_3;
-				for (Property sup : pStructuralUnitsProperties) {
-					int[] array = {getCurrentPage()};
-					str += " "+sup.getName()+"="+CQPSearchEngine.getCqiClient().struc2Str(sup.getQualifiedName(), array)[0]; //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				return str;
-			}
-		} catch (Exception e) {
-			System.out.println(InternalViewCoreMessages.InternalView_6+e.getMessage());
-			org.txm.utils.logger.Log.printStackTrace(e);
-		}
-		return InternalViewCoreMessages.InternalView_7;
-	}
-
-	/**
-	 * Gets the structural unit to explore.
-	 * @return
-	 */
-	public StructuralUnit getStructuralUnit() {
-		return pStructuralUnit;
-	}
-
-
-	/**
-	 * Dumps the specified segment in the console.
-	 * @param seg
-	 */
-	public void printSeg(HashMap<Property, List<String>> seg) {
-		Collection<List<String>> values = seg.values();
-		if(values.size() == 0) {
-			return;
-		}
-
-		for(List<String> list : values) {
-			for(String value : list) {
-				System.out.print("\t"+value); //$NON-NLS-1$
-			}
-			System.out.println();
-		}
-		System.out.println();
-	}
-
-
-	public void setParameters(List<WordProperty> properties, StructuralUnit struct, List<StructuralUnitProperty> structProperties, Integer currentStructure) {
-		if (properties != null) this.pWordProperties = properties;
-		if (struct != null) this.pStructuralUnit = struct;
-		if (structProperties != null) this.pStructuralUnitsProperties = structProperties;
-		if (currentStructure != null) this.pCurrentPage = currentStructure;
-
-		dirty = true;
-	}
-
-
-
-
-	@Override
-	public boolean setParameters(TXMParameters parameters) {
-		// FIXME: Debug
-		System.err.println("InternalView.setParameters(): not yet implemented.");
-		return false;
-	}
-
-
-	@Override
-	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
-		PrintWriter writer = IOUtils.getWriter(outfile, encoding);
-		for (int ipage = 0 ; ipage < nmatches ; ipage++) { // run through all pages
-			LinkedHashMap<Property, List<String>> page = getPageContent(ipage);
-			for (Property p : pWordProperties) {
-				writer.println(StringUtils.join(page.get(p), colseparator));
-			}
-			writer.println("\n\n");
-		}
-		writer.close();
-		return false;
-	}
-
-
-	/**
-	 * Sets the structural unit to explore.
-	 * @param structuralUnit
-	 */
-	public void setStructuralUnit(StructuralUnit structuralUnit) {
-		this.pStructuralUnit = structuralUnit;
-	}
-
-
-	/**
-	 * Sets the word properties to display.
-	 * @param properties
-	 */
-	public void setWordProperties(List<WordProperty> properties)	{
-		this.pWordProperties = properties;
-	}
-
-	/**
-	 * Sets the structural unit properties to display.
-	 * @param structuralUnitProperties
-	 */
-	public void setStructuralUnitProperties(List<StructuralUnitProperty> structuralUnitProperties) {
-		this.pStructuralUnitsProperties = structuralUnitProperties;
-	}
-
-
-	/**
-	 * Sets the current page number.
-	 * @param currentPage the currentPage to set
-	 */
-	public void setCurrentPage(int currentPage) {
-		this.pCurrentPage = currentPage;
-
-		if(this.pCurrentPage < 0 || this.pCurrentPage > (this.nmatches - 1))	 {
-			System.err.println("InternalView.canCompute(): current page (" + this.pCurrentPage + ") is outside matches range (" + this.nmatches + ").");
-			this.pCurrentPage = 0;
-		}
-	}
-
-	@Override
-	public String getResultype() {
-		return InternalViewCoreMessages.RESULT_TYPE;
-	}
-
-}
+package org.txm.internalview.core.functions;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.Parameter;
+import org.txm.core.results.TXMParameters;
+import org.txm.core.results.TXMResult;
+import org.txm.internalview.core.messages.InternalViewCoreMessages;
+import org.txm.internalview.core.preferences.InternalViewPreferences;
+import org.txm.searchengine.cqp.CQPSearchEngine;
+import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
+import org.txm.searchengine.cqp.corpus.CQPCorpus;
+import org.txm.searchengine.cqp.corpus.Property;
+import org.txm.searchengine.cqp.corpus.QueryResult;
+import org.txm.searchengine.cqp.corpus.StructuralUnit;
+import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
+import org.txm.searchengine.cqp.corpus.WordProperty;
+import org.txm.searchengine.cqp.corpus.query.Match;
+import org.txm.searchengine.cqp.corpus.query.CQLQuery;
+import org.txm.utils.io.IOUtils;
+import org.txm.utils.logger.Log;
+
+/**
+ * Internal view. 
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class InternalView extends TXMResult  {
+
+	protected List<Match> matches = new ArrayList<Match>();
+	protected int nmatches = 0;
+
+	/**
+	 * Current page.
+	 */
+	@Parameter(key=InternalViewPreferences.CURRENT_PAGE)
+	protected int pCurrentPage;
+
+	/**
+	 * Structural unit to explore.
+	 */
+	@Parameter(key=TXMPreferences.STRUCTURAL_UNIT)
+	protected StructuralUnit pStructuralUnit;
+
+	/**
+	 * Word properties to display.
+	 */
+	@Parameter(key=TXMPreferences.UNIT_PROPERTIES)
+	protected List<WordProperty> pWordProperties;
+
+	/**
+	 * Structural units to display.
+	 */
+	@Parameter(key=TXMPreferences.STRUCTURAL_UNIT_PROPERTIES)
+	protected List<StructuralUnitProperty> pStructuralUnitsProperties;
+
+
+	/**
+	 * 
+	 * @param parent
+	 */
+	public InternalView(CQPCorpus parent) {
+		super(parent);
+	}
+
+	/**
+	 * 
+	 * @param parametersNodePath
+	 */
+	public InternalView(String parametersNodePath) {
+		super(parametersNodePath);
+	}
+
+
+
+	@Override
+	public boolean loadParameters() throws Exception {
+		try {
+			String str = this.getStringParameterValue(TXMPreferences.STRUCTURAL_UNIT);
+			this.pStructuralUnit = this.getCorpus().getStructuralUnit(str);
+		} catch (Exception e) {
+			Log.printStackTrace(e);
+		}
+		try {
+			String str = this.getStringParameterValue(TXMPreferences.UNIT_PROPERTIES);
+			this.pWordProperties = (List<WordProperty>) WordProperty.stringToProperties(this.getCorpus(), str);
+		} catch (Exception e2) {
+			Log.printStackTrace(e2);
+		}
+		try {
+			String str = this.getStringParameterValue(TXMPreferences.STRUCTURAL_UNIT_PROPERTIES);
+			this.pStructuralUnitsProperties = StructuralUnitProperty.stringToProperties(this.getCorpus(), str);
+		} catch (Exception e3) {
+			Log.printStackTrace(e3);
+		}
+		return true;
+	}
+
+
+	@Override
+	protected boolean _compute() throws Exception {
+
+		//if(this.hasParameterChanged(InternalViewPreferences.STRUCTURAL_UNIT))	{
+		this.pCurrentPage = 0;
+		//find struct start-end
+		CQLQuery query = new CQLQuery("<" + pStructuralUnit.getName() + "> [] expand to " + pStructuralUnit); //$NON-NLS-1$ //$NON-NLS-2$
+		//System.out.println(query);
+		QueryResult result = getCorpus().query(query, "test", false); //$NON-NLS-1$
+		nmatches = result.getNMatch();
+		if (nmatches > 0) {
+			matches = result.getMatches();
+		}
+		result.drop();
+		//System.out.println(matches);
+		dirty = false;
+		return (nmatches > 0);
+		//}
+
+	}
+
+
+
+
+	@Override
+	public boolean canCompute() {
+		return getCorpus() != null && 
+				pStructuralUnit != null && 
+				pWordProperties != null && 
+				pWordProperties.size() > 0 && 
+				pStructuralUnitsProperties != null && 
+				pStructuralUnitsProperties.size() > 0;
+	}
+
+	/**
+	 * get the ith page and set the current page number to i
+	 * 
+	 * @param i
+	 * @return
+	 * @throws CqiClientException
+	 */
+	protected LinkedHashMap<Property, List<String>> getPageContent(int i) throws CqiClientException {
+		LinkedHashMap<Property, List<String>> rez = new LinkedHashMap<Property, List<String>>();
+
+		if (i >= 0 && i < nmatches) {
+			Match m = matches.get(i);
+			Collection<? extends Integer> positions = m.getRange();
+			int[] p = new int[positions.size()];
+			int c = 0;
+			for(int v : positions) {
+				p[c++] = v;
+			}
+			for (Property prop : pWordProperties) {
+				rez.put(prop, Match.getValuesForProperty(prop, p));
+			}
+			pCurrentPage = i;
+		}
+		return rez;
+	}
+
+
+	/**
+	 * 
+	 * @return the current page content map
+	 * @throws CqiClientException
+	 */
+	public HashMap<Property, List<String>> getCurrentPageContent() throws CqiClientException {
+		HashMap<Property, List<String>> current = this.getPageContent(pCurrentPage);
+		return current;
+	}
+
+
+
+
+	/**
+	 * Gets the current page number.
+	 * @return the current page number
+	 */
+	public int getCurrentPage() {
+		return pCurrentPage;
+	}
+
+	@Override
+	public boolean saveParameters() {
+		if (pStructuralUnit != null) {
+			this.saveParameter(InternalViewPreferences.STRUCTURAL_UNIT, pStructuralUnit.getName());
+		}
+		if (pStructuralUnitsProperties != null) {
+			String str = StructuralUnitProperty.propertiesToString(pStructuralUnitsProperties);
+			this.saveParameter(InternalViewPreferences.STRUCTURAL_UNIT_PROPERTIES, str);
+		}
+		if (pWordProperties != null) {
+			this.saveParameter(InternalViewPreferences.UNIT_PROPERTIES, WordProperty.propertiesToString(pWordProperties));
+		}
+
+		return true;
+	}
+
+	@Override
+	public void clean() {
+		// nothing to do
+	}
+
+
+	/**
+	 * Gets the linked corpus.
+	 * @return
+	 */
+	public CQPCorpus getCorpus() {
+		return (CQPCorpus)getParent();
+	}
+
+
+	@Override
+	public String getDetails() {
+		return getCorpus().getName()+" "+pStructuralUnit.getName()+" "+(pCurrentPage+1); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+
+	@Override
+	public String getSimpleName() {
+		return getName();
+	}
+
+
+	@Override
+	public String getName() {
+		if (pStructuralUnit != null) {
+			return pStructuralUnit.getName( ) + " (" + (this.pCurrentPage + 1) + " / " + this.nmatches + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
+		return getCorpus().getName();
+	}
+
+
+	/**
+	 * Gets the number of matched segments.
+	 * @return
+	 */
+	public int getSegmentsCount() {
+		return nmatches;
+	}
+
+
+	/**
+	 * Gets lexical properties to display.
+	 * @return
+	 */
+	public List<WordProperty> getProperties() {
+		return pWordProperties;
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	public int getSegmentLength() {
+		if (matches.size() == 0) {
+			return 0;
+		}
+		if (matches.size() < pCurrentPage) {
+			return 0;
+		}
+
+		Match m = matches.get(pCurrentPage);
+		return m.size();
+	}
+
+	/**
+	 * 
+	 * @return
+	 */
+	public String getStructInfos() {
+
+		try {
+			if (pStructuralUnitsProperties.size() > 0) {
+				String str = InternalViewCoreMessages.structureInformationsDDot;
+				for (Property sup : pStructuralUnitsProperties) {
+					int[] array = {getCurrentPage()};
+					str += " "+sup.getName()+"="+CQPSearchEngine.getCqiClient().struc2Str(sup.getQualifiedName(), array)[0]; //$NON-NLS-1$ //$NON-NLS-2$
+				}
+				return str;
+			}
+		} catch (Exception e) {
+			System.out.println(InternalViewCoreMessages.internalViewDDotFailedToRetrieveStructPropertiesValuesDDot+e.getMessage());
+			org.txm.utils.logger.Log.printStackTrace(e);
+		}
+		return InternalViewCoreMessages.noStructureInformations;
+	}
+
+	/**
+	 * Gets the structural unit to explore.
+	 * @return
+	 */
+	public StructuralUnit getStructuralUnit() {
+		return pStructuralUnit;
+	}
+
+
+	/**
+	 * Dumps the specified segment in the console.
+	 * @param seg
+	 */
+	public void printSeg(HashMap<Property, List<String>> seg) {
+		Collection<List<String>> values = seg.values();
+		if(values.size() == 0) {
+			return;
+		}
+
+		for(List<String> list : values) {
+			for(String value : list) {
+				System.out.print("\t"+value); //$NON-NLS-1$
+			}
+			System.out.println();
+		}
+		System.out.println();
+	}
+
+
+	public void setParameters(List<WordProperty> properties, StructuralUnit struct, List<StructuralUnitProperty> structProperties, Integer currentStructure) {
+		if (properties != null) this.pWordProperties = properties;
+		if (struct != null) this.pStructuralUnit = struct;
+		if (structProperties != null) this.pStructuralUnitsProperties = structProperties;
+		if (currentStructure != null) this.pCurrentPage = currentStructure;
+
+		dirty = true;
+	}
+
+
+
+
+	@Override
+	public boolean setParameters(TXMParameters parameters) {
+		// FIXME: Debug
+		System.err.println("InternalView.setParameters(): not yet implemented.");
+		return false;
+	}
+
+
+	@Override
+	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
+		PrintWriter writer = IOUtils.getWriter(outfile, encoding);
+		for (int ipage = 0 ; ipage < nmatches ; ipage++) { // run through all pages
+			LinkedHashMap<Property, List<String>> page = getPageContent(ipage);
+			for (Property p : pWordProperties) {
+				writer.println(StringUtils.join(page.get(p), colseparator));
+			}
+			writer.println("\n\n");
+		}
+		writer.close();
+		return false;
+	}
+
+
+	/**
+	 * Sets the structural unit to explore.
+	 * @param structuralUnit
+	 */
+	public void setStructuralUnit(StructuralUnit structuralUnit) {
+		this.pStructuralUnit = structuralUnit;
+	}
+
+
+	/**
+	 * Sets the word properties to display.
+	 * @param properties
+	 */
+	public void setWordProperties(List<WordProperty> properties)	{
+		this.pWordProperties = properties;
+	}
+
+	/**
+	 * Sets the structural unit properties to display.
+	 * @param structuralUnitProperties
+	 */
+	public void setStructuralUnitProperties(List<StructuralUnitProperty> structuralUnitProperties) {
+		this.pStructuralUnitsProperties = structuralUnitProperties;
+	}
+
+
+	/**
+	 * Sets the current page number.
+	 * @param currentPage the currentPage to set
+	 */
+	public void setCurrentPage(int currentPage) {
+		this.pCurrentPage = currentPage;
+
+		if(this.pCurrentPage < 0 || this.pCurrentPage > (this.nmatches - 1))	 {
+			System.err.println("InternalView.canCompute(): current page (" + this.pCurrentPage + ") is outside matches range (" + this.nmatches + ").");
+			this.pCurrentPage = 0;
+		}
+	}
+
+	@Override
+	public String getResultype() {
+		return InternalViewCoreMessages.RESULT_TYPE;
+	}
+
+}
\ No newline at end of file
Index: tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java	(revision 1334)
+++ tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java	(revision 1335)
@@ -74,7 +74,7 @@
 			String queries = this.createQueries(event, selection);
 			
 			if(query.isEmpty() && queries.isEmpty()) {
-				Log.severe(Messages.link_error_no_query);
+				Log.severe(Messages.noQueryWasSetCommandCanceled);
 				return null;
 			}
 			
@@ -92,4 +92,4 @@
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java	(revision 1334)
+++ tmp/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java	(revision 1335)
@@ -66,7 +66,7 @@
 			List<Match> matches = this.createMatches(event, selection);
 			
 			if(matches.isEmpty()) {
-				Log.severe(Messages.link_error_no_match);
+				Log.severe(Messages.noMatchesWasSetCommandCanceled);
 				return null;
 			}
 			
@@ -83,4 +83,4 @@
 		return null;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.links.rcp/src/org/txm/links/rcp/messages/Messages.java
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/links/rcp/messages/Messages.java	(revision 1334)
+++ tmp/org.txm.links.rcp/src/org/txm/links/rcp/messages/Messages.java	(revision 1335)
@@ -7,8 +7,8 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.links.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String link_error_no_match;
-	public static String link_error_no_query;
+	public static String noMatchesWasSetCommandCanceled; 
+	public static String noQueryWasSetCommandCanceled; 
 	
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.links.rcp/src/org/txm/links/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.links.rcp/src/org/txm/links/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.links.rcp/src/org/txm/links/rcp/messages/messages.properties	(revision 1335)
@@ -1,2 +1,4 @@
-link_error_no_match=No matches was set, command canceled.
-link_error_no_query=No query was set, command canceled.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+noMatchesWasSetCommandCanceled=No matches was set, command canceled.
+noQueryWasSetCommandCanceled=No query was set, command canceled.
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/ConcordanceCoreMessages.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/ConcordanceCoreMessages.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/ConcordanceCoreMessages.java	(revision 1335)
@@ -17,25 +17,23 @@
 	public static String RESULT_TYPE;
 
 	
-	public static String Concordance_1;
-	public static String Concordance_12;
-	public static String Concordance_13;
-	public static String Concordance_14;
-	public static String Concordance_15;
-	public static String Concordance_16;
-	public static String Concordance_17;
-	public static String Concordance_19;
-	public static String Concordance_2;
-	public static String Concordance_3;
-	public static String Concordance_6;
-	public static String Concordance_7;
-	public static String Concordance_8;
-	public static String CompositeComparator_0;
-	public static String PropertiesReferenceComparator_0;
-	public static String LexicographicLeftContextComparator_0;
-	public static String LexicographicKeywordComparator_0;
-	public static String LexicographicRightContextComparator_0;
-	public static String NullComparator_0;
+	public static String failedToRetrieveTextidPropertyFromLines; 
+	public static String failedToExportConcordanceDDot; 
+	public static String reference; 
+	public static String leftContext; 
+	public static String keyword; 
+	public static String rightContext; 
+	public static String context; 
+	public static String undefined; 
+	public static String resultsRetrievedIn; 
+	public static String retrieving; 
+	public static String results; 
+	public static String failedToGetTextsLimitsDDot; 
+	public static String compositeDDot; 
+	public static String references; 
+	public static String leftContext_2; 
+	public static String rightContext_2; 
+	public static String none; 
 	
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages.properties
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages.properties	(revision 1335)
@@ -1,31 +1,20 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-#created/updated with GetStringsFromPropertiesFile.groovy
-#Mon Jul 03 14:53:55 CEST 2017
-
-CompositeComparator_0 = Composite: 
-
-Concordance_1  = ** Failed to retrieve text_id property from lines
-Concordance_12 = ** Failed to export Concordance: 
-Concordance_13 = Reference
-Concordance_14 = LeftContext
-Concordance_15 = Keyword
-Concordance_16 = RightContext
-Concordance_17 = Reference
-Concordance_19 = Context
-Concordance_2  = undefined
-Concordance_3  = \ results retrieved in 
-Concordance_6  = Retrieving 
-Concordance_7  = \ results
-Concordance_8  = Failed to get texts limits: 
-
-LexicographicKeywordComparator_0 = Keyword
-
-LexicographicLeftContextComparator_0 = Left context
-
-LexicographicRightContextComparator_0 = Right context
-
-NullComparator_0 = None
-
-PropertiesReferenceComparator_0 = References
-
-RESULT_TYPE = Concordance
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+compositeDDot=Composite\: 
+context=Context
+failedToExportConcordanceDDot=** Failed to export Concordance\: 
+failedToGetTextsLimitsDDot=Failed to get texts limits\: 
+failedToRetrieveTextidPropertyFromLines=** Failed to retrieve text_id property from lines
+keyword=Keyword
+leftContext=LeftContext
+leftContext_2=Left context
+none=None
+reference=Reference
+references=References
+RESULT_TYPE=Concordance
+results=\ results
+resultsRetrievedIn=\ results retrieved in 
+retrieving=Retrieving 
+rightContext=RightContext
+rightContext_2=Right context
+undefined=undefined
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_ru.properties	(revision 1335)
@@ -1,31 +1,20 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-#created/updated with GetStringsFromPropertiesFile.groovy
-#Mon Jul 03 14:53:55 CEST 2017
-
-CompositeComparator_0 = MISSING
-
-Concordance_1  = MISSING
-Concordance_12 = MISSING
-Concordance_13 = MISSING
-Concordance_14 = MISSING
-Concordance_15 = MISSING
-Concordance_16 = MISSING
-Concordance_17 = MISSING
-Concordance_19 = MISSING
-Concordance_2  = MISSING
-Concordance_3  = MISSING
-Concordance_6  = MISSING
-Concordance_7  = MISSING
-Concordance_8  = MISSING
-
-LexicographicKeywordComparator_0 = MISSING
-
-LexicographicLeftContextComparator_0 = MISSING
-
-LexicographicRightContextComparator_0 = MISSING
-
-NullComparator_0 = MISSING
-
-PropertiesReferenceComparator_0 = MISSING
-
-RESULT_TYPE = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+compositeDDot=MISSING
+context=MISSING
+failedToExportConcordanceDDot=MISSING
+failedToGetTextsLimitsDDot=MISSING
+failedToRetrieveTextidPropertyFromLines=MISSING
+keyword=MISSING
+leftContext=MISSING
+leftContext_2=MISSING
+none=MISSING
+reference=MISSING
+references=MISSING
+RESULT_TYPE=
+results=MISSING
+resultsRetrievedIn=MISSING
+retrieving=MISSING
+rightContext=MISSING
+rightContext_2=MISSING
+undefined=MISSING
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/messages/messages_fr.properties	(revision 1335)
@@ -1,31 +1,20 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-#created/updated with GetStringsFromPropertiesFile.groovy
-#Mon Jul 03 14:53:55 CEST 2017
-
-CompositeComparator_0 = Composé : 
-
-Concordance_1  = ** Echec de récupération de la propriété 'text_id' des lignes 
-Concordance_12 = ** Echec de l'exportation de la concordance : 
-Concordance_13 = Référence
-Concordance_14 = ContexteGauche
-Concordance_15 = Pivot
-Concordance_16 = ContexteDroit
-Concordance_17 = Référence
-Concordance_19 = Contexte
-Concordance_2  = indéfini
-Concordance_3  = \ résultats obtenus en 
-Concordance_6  = Récupération 
-Concordance_7  = \ résultats
-Concordance_8  = Echec de la récupération des limites de texte : 
-
-LexicographicKeywordComparator_0 = Pivot
-
-LexicographicLeftContextComparator_0 = Contexte gauche
-
-LexicographicRightContextComparator_0 = Contexte droit
-
-NullComparator_0 = Aucun
-
-PropertiesReferenceComparator_0 = Références
-
-RESULT_TYPE = Concordance
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+compositeDDot=Composé \: 
+context=Contexte
+failedToExportConcordanceDDot=** Echec de l'exportation de la concordance \: 
+failedToGetTextsLimitsDDot=Echec de la récupération des limites de texte \: 
+failedToRetrieveTextidPropertyFromLines=** Echec de récupération de la propriété 'text_id' des lignes 
+keyword=Pivot
+leftContext=ContexteGauche
+leftContext_2=Contexte gauche
+none=Aucun
+reference=Référence
+references=Références
+RESULT_TYPE=Concordance
+results=\ résultats
+resultsRetrievedIn=\ résultats obtenus en 
+retrieving=Récupération 
+rightContext=ContexteDroit
+rightContext_2=Contexte droit
+undefined=indéfini
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java	(revision 1335)
@@ -548,7 +548,7 @@
 			return new ArrayList<Line>();
 		}
 		
-		Log.info(ConcordanceCoreMessages.Concordance_6 + (to - from + 1) + ConcordanceCoreMessages.Concordance_7);
+		Log.info(ConcordanceCoreMessages.retrieving + (to - from + 1) + ConcordanceCoreMessages.results);
 
 		AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
 
@@ -575,7 +575,7 @@
 				}
 			} catch (Exception e) {
 				org.txm.utils.logger.Log.printStackTrace(e);
-				Log.severe(ConcordanceCoreMessages.Concordance_8+e);
+				Log.severe(ConcordanceCoreMessages.failedToGetTextsLimitsDDot+e);
 			}
 		}
 
@@ -736,7 +736,7 @@
 				} else {
 					keywordsTextValues = null;
 					keywordsIdValues = null;
-					Log.warning(ConcordanceCoreMessages.Concordance_1);
+					Log.warning(ConcordanceCoreMessages.failedToRetrieveTextidPropertyFromLines);
 				}
 
 				// Since we get the value only for the first word of the
@@ -795,7 +795,7 @@
 						TextId = keywordsTextValues.get(k).get(0);
 						wordids = keywordsIdValues.get(k);
 					} else {
-						TextId = ConcordanceCoreMessages.Concordance_2;
+						TextId = ConcordanceCoreMessages.undefined;
 						wordids = new ArrayList<String>();
 					}
 
@@ -820,7 +820,7 @@
 		}
 		List<Line> res = lines.subList(from, to + 1);// our to is inclusive,
 		// sublist's is exlusive
-		Log.info((to - from + 1) + ConcordanceCoreMessages.Concordance_3
+		Log.info((to - from + 1) + ConcordanceCoreMessages.resultsRetrievedIn
 				+ (System.currentTimeMillis() - start) + "ms"); //$NON-NLS-1$ 
 		return res;
 	}
@@ -1494,7 +1494,7 @@
 			toTxt(writer, 0, nLines - 1, format, "\t",""); //$NON-NLS-1$ //$NON-NLS-2$
 			writer.close();
 		} catch (Exception e) {
-			System.err.println(ConcordanceCoreMessages.Concordance_12 + e);
+			System.err.println(ConcordanceCoreMessages.failedToExportConcordanceDDot + e);
 			Log.printStackTrace(e);
 			return false;
 		}
@@ -1527,7 +1527,7 @@
 			// if ("UTF-8".equals(encoding)) writer.write('\ufeff'); // UTF-8 BOM
 			toTxt(writer, 0, nLines - 1, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(ConcordanceCoreMessages.Concordance_12 + e.getLocalizedMessage());
+			System.err.println(ConcordanceCoreMessages.failedToExportConcordanceDDot + e.getLocalizedMessage());
 			Log.printStackTrace(e);
 			return false;
 		} finally {
@@ -1593,15 +1593,15 @@
 		if (format == Format.CONTEXT) {
 			keyColSeparator = "";
 			writer.write(
-					txtseparator+ConcordanceCoreMessages.Concordance_17+txtseparator
-					+ colseparator+txtseparator+ConcordanceCoreMessages.Concordance_19+txtseparator
+					txtseparator+ConcordanceCoreMessages.reference+txtseparator
+					+ colseparator+txtseparator+ConcordanceCoreMessages.context+txtseparator
 					+ "\n"); //$NON-NLS-1$
 		} else {
 			writer.write(
-					addTxtSep(ConcordanceCoreMessages.Concordance_13, txtseparator)+colseparator
-					+ addTxtSep(ConcordanceCoreMessages.Concordance_14, txtseparator)+colseparator
-					+ addTxtSep(ConcordanceCoreMessages.Concordance_15, txtseparator)+colseparator
-					+ addTxtSep(ConcordanceCoreMessages.Concordance_16, txtseparator)
+					addTxtSep(ConcordanceCoreMessages.reference, txtseparator)+colseparator
+					+ addTxtSep(ConcordanceCoreMessages.leftContext, txtseparator)+colseparator
+					+ addTxtSep(ConcordanceCoreMessages.keyword, txtseparator)+colseparator
+					+ addTxtSep(ConcordanceCoreMessages.rightContext, txtseparator)
 					+ "\n"); //$NON-NLS-1$
 		}
 
@@ -1779,4 +1779,4 @@
 	public String getResultype() {
 		return ConcordanceCoreMessages.RESULT_TYPE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/NullComparator.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/NullComparator.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/NullComparator.java	(revision 1335)
@@ -39,7 +39,7 @@
 public class NullComparator extends LocalizedLineComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = ConcordanceCoreMessages.NullComparator_0;
+	private static final String NAME = ConcordanceCoreMessages.none;
 
 	/**
 	 * Instantiates a new null comparator.
@@ -55,4 +55,4 @@
 	public int compare(Line l1, Line l2) {
 		return l1.getKeywordPosition() - l2.getKeywordPosition();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/PropertiesReferenceComparator.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/PropertiesReferenceComparator.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/PropertiesReferenceComparator.java	(revision 1335)
@@ -39,7 +39,7 @@
 public class PropertiesReferenceComparator extends LocalizedLineComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = ConcordanceCoreMessages.PropertiesReferenceComparator_0;
+	private static final String NAME = ConcordanceCoreMessages.references;
 
 	//protected Collator collator = Collator.getInstance(new Locale(System.getProperty("user.language"))); //$NON-NLS-1$
 
@@ -78,4 +78,4 @@
 		}
 		return 0;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicLeftContextComparator.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicLeftContextComparator.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicLeftContextComparator.java	(revision 1335)
@@ -44,7 +44,7 @@
 		StringListBasedComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = ConcordanceCoreMessages.LexicographicLeftContextComparator_0;
+	private static final String NAME = ConcordanceCoreMessages.leftContext_2;
 	private Concordance conc;
 	private List<WordProperty> props;
 
@@ -99,4 +99,4 @@
 		}
 		return rez;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/CompositeComparator.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/CompositeComparator.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/CompositeComparator.java	(revision 1335)
@@ -102,8 +102,8 @@
 	 */
 	public void setComparators(List<LineComparator> comp) {
 		this.comparators = comp;
-		this.name = ConcordanceCoreMessages.CompositeComparator_0;
+		this.name = ConcordanceCoreMessages.compositeDDot;
 		for(LineComparator c: comp)
 			this.name += c.getName()+" "; //$NON-NLS-1$
 		}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicRightContextComparator.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicRightContextComparator.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicRightContextComparator.java	(revision 1335)
@@ -44,7 +44,7 @@
 		StringListBasedComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = ConcordanceCoreMessages.LexicographicRightContextComparator_0;
+	private static final String NAME = ConcordanceCoreMessages.rightContext_2;
 	private Concordance conc;
 	private List<WordProperty> props;
 
@@ -104,4 +104,4 @@
 		}
 		return rez;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicKeywordComparator.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicKeywordComparator.java	(revision 1334)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicKeywordComparator.java	(revision 1335)
@@ -44,7 +44,7 @@
 public class LexicographicKeywordComparator extends LocalizedLineComparator {
 
 	/** The Constant NAME. */
-	private static final String NAME = ConcordanceCoreMessages.LexicographicKeywordComparator_0;
+	private static final String NAME = ConcordanceCoreMessages.keyword;
 	private Concordance conc;
 	private List<WordProperty> props;
 
@@ -85,4 +85,4 @@
 
 		return rez;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java	(revision 1335)
@@ -1,62 +1,61 @@
-package org.txm.statsengine.r.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * R statistics engine and tools core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class RCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.statsengine.r.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String error_cantFindRServeInPath;
-	public static String error_connectionFailed;
-	public static String error_errorDuringItemsListExtraction;
-	public static String error_errorWhileEvaluating;
-	public static String error_evaluationError;
-	public static String error_failedToConnectToTheRWorkspace;
-	public static String error_failedToInitializeFileTransfert;
-	public static String error_failedToLoadLibrary;
-	public static String error_failedToRunREG;
-	public static String error_failedToStartRServe;
-	public static String error_failedToStartRServeWithCommand;
-	public static String error_matrixIsEmpty;
-	public static String error_requestedObjectNotFoundInR;
-	public static String error_rserveIsAlreadyRunningOnPort;
-	public static String error_rservePathNotSet;
-	public static String error_youNeedRSoftware;
-	public static String info_connectingToRAt;
-	public static String info_connectingToRAtWithUser;
-	public static String info_lastSafeEvalExpression;
-	public static String info_rPathNotSetTryingToFindIt;
-	public static String info_savingChartToFile;
-	public static String info_startingRWithCommandLine;
-	public static String info_startingStatsEngine;
-	public static String info_statisticsEngineLaunched;
-	public static String info_tryingToStartRFrom;
-	public static String info_tryingToStartRWithRPath;
-	
-	public static String ExecuteRScript_1;
-	public static String ExecuteRScript_2;
-	public static String ExecuteRScript_3;
-	public static String ExecuteRText_0;
-	public static String ExecuteRText_1;
-	public static String ExecuteRText_2;
-	public static String ExecuteScriptR_0;
-	public static String ExecuteScriptR_1;	
-
-	public static String error_unexpectedErrorInRStatisticsEngine;
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, RCoreMessages.class);
-	}
-
-	private RCoreMessages() {
-	}
-}
+package org.txm.statsengine.r.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * R statistics engine and tools core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class RCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.statsengine.r.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String error_cantFindRServeInPath;
+	public static String error_connectionFailed;
+	public static String error_errorDuringItemsListExtraction;
+	public static String error_errorWhileEvaluating;
+	public static String error_evaluationError;
+	public static String error_failedToConnectToTheRWorkspace;
+	public static String error_failedToInitializeFileTransfert;
+	public static String error_failedToLoadLibrary;
+	public static String error_failedToRunREG;
+	public static String error_failedToStartRServe;
+	public static String error_failedToStartRServeWithCommand;
+	public static String error_matrixIsEmpty;
+	public static String error_requestedObjectNotFoundInR;
+	public static String error_rserveIsAlreadyRunningOnPort;
+	public static String error_rservePathNotSet;
+	public static String error_youNeedRSoftware;
+	public static String info_connectingToRAt;
+	public static String info_connectingToRAtWithUser;
+	public static String info_lastSafeEvalExpression;
+	public static String info_rPathNotSetTryingToFindIt;
+	public static String info_savingChartToFile;
+	public static String info_startingRWithCommandLine;
+	public static String info_startingStatsEngine;
+	public static String info_statisticsEngineLaunched;
+	public static String info_tryingToStartRFrom;
+	public static String info_tryingToStartRWithRPath;
+	
+	public static String runningP0; 
+	public static String doneDDot; 
+	public static String ms; 
+	public static String runningTextSelection; 
+	public static String errorWhileRunningRScriptP0DDotP1; 
+	public static String p0RScriptDoesntExist; 
+	public static String errorWhileRunningRScriptP0DDotP1_2; 
+
+	public static String error_unexpectedErrorInRStatisticsEngine;
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, RCoreMessages.class);
+	}
+
+	private RCoreMessages() {
+	}
+}
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties	(revision 1335)
@@ -1,40 +1,36 @@
-
-ExecuteRScript_1 = Running {0}
-ExecuteRScript_2 = Done:
-ExecuteRScript_3 = \ ms
-
-ExecuteRText_0 = Running text selection...
-ExecuteRText_1 = ** Error while running R script {0}: {1}
-ExecuteRText_2 = \ ms
-
-ExecuteScriptR_0 = ** {0} R script doesn''t exist
-ExecuteScriptR_1 = ** Error while Running R script {0}: {1}
-
-error_cantFindRServeInPath               = ** The Statistics Engine program path is set but we couldn't find it in: {0}.
-error_connectionFailed                   = ** Error while connecting to the stat engine.
-error_errorDuringItemsListExtraction     = ** Error during items list extraction: 
-error_errorWhileEvaluating               = ** R error: "{0}"\nwhile evaluating: {1} 
-error_evaluationError                    = ** Evaluation error: {0}\n{1}.
-error_failedToConnectToTheRWorkspace     = ** Failed to connect to the R Workspace.
-error_failedToInitializeFileTransfert    = ** Failed to initialize file transfert: {0}.
-error_failedToLoadLibrary                = Failed to load the {0} library: {1}.
-error_failedToRunREG                     = ** Failed to run REG to find the location of R program.
-error_failedToStartRServe                = Failed to start RServe.
-error_failedToStartRServeWithCommand     = ** Failed to start Rserve with command: 
-error_matrixIsEmpty                      = Matrix is empty.
-error_requestedObjectNotFoundInR         = The requested object ({0}) was not found in the R workspace.
-error_rserveIsAlreadyRunningOnPort       = Rserve is already running on port {0}.
-error_rservePathNotSet                   = ** The Statistics Engine program path is not set and we could not find it.
-error_unexpectedErrorInRStatisticsEngine = Unexpected error R statistics engine: {0}.
-error_youNeedRSoftware                   = You need the 'R' software and you need to configure in the 'Tools/Preferences' window the correct path to it.
-
-info_connectingToRAt           = Connecting to R at {0}:{1}.
-info_connectingToRAtWithUser   = Connecting to R at {0}:{1} with user {2}.
-info_lastSafeEvalExpression    = Last safeeval expression: {0}.
-info_rPathNotSetTryingToFindIt = R path is not set, trying to find it...
-info_savingChartToFile         = Saving chart to file: {0}.
-info_startingRWithCommandLine  = Starting R with command line: {0}.
-info_startingStatsEngine       = Starting Statistics Engine: user: {0}, remote: {1}, port: {2}, debug: {3}
-info_statisticsEngineLaunched  = Statistical Engine launched
-info_tryingToStartRFrom        = Try to start R from: {0}...
-info_tryingToStartRWithRPath   = Try to start R with path: 'R'.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+doneDDot=Done\:
+error_cantFindRServeInPath=** The Statistics Engine program path is set but we couldn't find it in\: {0}.
+error_connectionFailed=** Error while connecting to the stat engine.
+error_errorDuringItemsListExtraction=** Error during items list extraction\: 
+error_errorWhileEvaluating=** R error\: "{0}"\nwhile evaluating\: {1} 
+error_evaluationError=** Evaluation error\: {0}\n{1}.
+error_failedToConnectToTheRWorkspace=** Failed to connect to the R Workspace.
+error_failedToInitializeFileTransfert=** Failed to initialize file transfert\: {0}.
+error_failedToLoadLibrary=Failed to load the {0} library\: {1}.
+error_failedToRunREG=** Failed to run REG to find the location of R program.
+error_failedToStartRServe=Failed to start RServe.
+error_failedToStartRServeWithCommand=** Failed to start Rserve with command\: 
+error_matrixIsEmpty=Matrix is empty.
+error_requestedObjectNotFoundInR=The requested object ({0}) was not found in the R workspace.
+error_rserveIsAlreadyRunningOnPort=Rserve is already running on port {0}.
+error_rservePathNotSet=** The Statistics Engine program path is not set and we could not find it.
+error_unexpectedErrorInRStatisticsEngine=Unexpected error R statistics engine\: {0}.
+error_youNeedRSoftware=You need the 'R' software and you need to configure in the 'Tools/Preferences' window the correct path to it.
+errorWhileRunningRScriptP0DDotP1=** Error while running R script {0}\: {1}
+errorWhileRunningRScriptP0DDotP1_2=** Error while Running R script {0}\: {1}
+info_connectingToRAt=Connecting to R at {0}\:{1}.
+info_connectingToRAtWithUser=Connecting to R at {0}\:{1} with user {2}.
+info_lastSafeEvalExpression=Last safeeval expression\: {0}.
+info_rPathNotSetTryingToFindIt=R path is not set, trying to find it...
+info_savingChartToFile=Saving chart to file\: {0}.
+info_startingRWithCommandLine=Starting R with command line\: {0}.
+info_startingStatsEngine=Starting Statistics Engine\: user\: {0}, remote\: {1}, port\: {2}, debug\: {3}
+info_statisticsEngineLaunched=Statistical Engine launched
+info_tryingToStartRFrom=Try to start R from\: {0}...
+info_tryingToStartRWithRPath=Try to start R with path\: 'R'.
+ms=\ ms
+p0RScriptDoesntExist=** {0} R script doesn''t exist
+runningP0=Running {0}
+runningTextSelection=Running text selection...
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_ru.properties	(revision 1335)
@@ -1,15 +1,11 @@
-
-error_unexpectedErrorInRStatisticsEngine = Неожиданная ошибка в статистической машине R : {0}
-
-info_tryingToStartRWithRPath = 
-
-ExecuteRScript_1 = \u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 
-ExecuteRScript_2 = \u0413\u043E\u0442\u043E\u0432\u043E: 
-ExecuteRScript_3 = \ \u043C\u0441
-
-ExecuteRText_0 = \u0412\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u0438\u044F \u0442\u0435\u043A\u0441\u0442\u0430... 
-ExecuteRText_1 = ** \u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u043E \u0432\u0440\u0435\u043C\u044F \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u044F \u0441\u043A\u0440\u0438\u043F\u0442\u0430 R {0}: {1}
-ExecuteRText_2 = \ \u043C\u0441
-
-ExecuteScriptR_0 = ** \u0424\u0430\u0439\u043B \u0441\u043A\u0440\u0438\u043F\u0442\u0430 R {0} \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D
-ExecuteScriptR_1 = ** \u041E\u0448\u0438\u0431\u043A\u0430 \u043F\u0440\u0438 \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0438 \u0441\u043A\u0440\u0438\u043F\u0442\u0430 R {0}: {1}
\ No newline at end of file
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+doneDDot=Готово\: 
+error_unexpectedErrorInRStatisticsEngine=Неожиданная ошибка в статистической машине R \: {0}
+errorWhileRunningRScriptP0DDotP1=** Ошибка во время выполнения скрипта R {0}\: {1}
+errorWhileRunningRScriptP0DDotP1_2=** Ошибка при выполнении скрипта R {0}\: {1}
+info_tryingToStartRWithRPath=
+ms=\ мс
+p0RScriptDoesntExist=** Файл скрипта R {0} не найден
+runningP0=Выполнение 
+runningTextSelection=Выполнение выделения текста... 
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties	(revision 1335)
@@ -1,40 +1,36 @@
-
-ExecuteRScript_1 = Exécution de {0}
-ExecuteRScript_2 = Terminé : 
-ExecuteRScript_3 = \ ms
-
-ExecuteRText_0 = Exécution de la sélection de texte... 
-ExecuteRText_1 = ** Erreur lors de l''exécution du script R {0} : {1}
-ExecuteRText_2 = \ ms
-
-ExecuteScriptR_0 = ** Le fichier de script R {0} n''existe pas
-ExecuteScriptR_1 = ** Erreur lors de l''exécution du script R {0} : {1}
-
-error_cantFindRServeInPath               = ** Le chemin du programme du serveur statistique a été renseigné mais sa recherche a échoué dans : {0}.
-error_connectionFailed                   = ** La connexion au moteur statistique a échoué.
-error_errorDuringItemsListExtraction     = ** Erreur lors de l'extraction de la liste d'items : \	
-error_errorWhileEvaluating               = ** Erreur R : "{0}"\nlors de l'évaluation de : {1}
-error_evaluationError                    = ** Erreur d'évaluation : {0}\n{1}.
-error_failedToConnectToTheRWorkspace     = ** Echec de connexion à l'espace de travail R.
-error_failedToInitializeFileTransfert    = ** Echec de l'initialisation du transfert : {0}.
-error_failedToLoadLibrary                = La librairie {0} n'a pu être chargée : {1}.
-error_failedToRunREG                     = ** Echec du lancement de REG pour localiser le programme R.
-error_failedToStartRServe                = Impossible de démarrer RServe.
-error_failedToStartRServeWithCommand     = ** Echec du lancement de Rserve avec la commande : 
-error_matrixIsEmpty                      = La matrice est vide.
-error_requestedObjectNotFoundInR         = L'objet demandé ({0}) n'a pas été trouvé dans l'espace de travail R.
-error_rserveIsAlreadyRunningOnPort       = Rserve est déja démarré sur le port {0}.
-error_rservePathNotSet                   = ** Le chemin du programme du serveur statistique n'a pas été renseigné et sa recherche a échoué.
-error_unexpectedErrorInRStatisticsEngine = Erreur inattendue dans le moteur statistique R : {0}.
-error_youNeedRSoftware                   = Vous avez besoin du logiciel 'R' et de configurer ses chemins via la fenêtre de préférences 'Outils/Préférences'.
-
-info_connectingToRAt           = Connexion à R à {0}:{1}.
-info_connectingToRAtWithUser   = Connexion à R à {0}:{1} avec l'utilisateur {2}.
-info_lastSafeEvalExpression    = Dernier 'safeeval' : {0}.
-info_rPathNotSetTryingToFindIt = Chemin d'accès à R non fourni, tentative de résolution...
-info_savingChartToFile         = Sauvegarde du graphique dans le fichier : {0}.
-info_startingRWithCommandLine  = Démarrage de R avec la ligne de commande : {0}.
-info_startingStatsEngine       = Démarrage du moteur de statistiques : utilisateur : {0}, distant : {1}, port : {2}, debug : {3}
-info_statisticsEngineLaunched  = Moteur statistique lancé
-info_tryingToStartRFrom        = Tentative de démarrage de R depuis : {0}...
-info_tryingToStartRWithRPath   = Tentative de démarrage de R depuis le chemin : 'R'.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+doneDDot=Terminé \: 
+error_cantFindRServeInPath=** Le chemin du programme du serveur statistique a été renseigné mais sa recherche a échoué dans \: {0}.
+error_connectionFailed=** La connexion au moteur statistique a échoué.
+error_errorDuringItemsListExtraction=** Erreur lors de l'extraction de la liste d'items \: \t
+error_errorWhileEvaluating=** Erreur R \: "{0}"\nlors de l'évaluation de \: {1}
+error_evaluationError=** Erreur d'évaluation \: {0}\n{1}.
+error_failedToConnectToTheRWorkspace=** Echec de connexion à l'espace de travail R.
+error_failedToInitializeFileTransfert=** Echec de l'initialisation du transfert \: {0}.
+error_failedToLoadLibrary=La librairie {0} n'a pu être chargée \: {1}.
+error_failedToRunREG=** Echec du lancement de REG pour localiser le programme R.
+error_failedToStartRServe=Impossible de démarrer RServe.
+error_failedToStartRServeWithCommand=** Echec du lancement de Rserve avec la commande \: 
+error_matrixIsEmpty=La matrice est vide.
+error_requestedObjectNotFoundInR=L'objet demandé ({0}) n'a pas été trouvé dans l'espace de travail R.
+error_rserveIsAlreadyRunningOnPort=Rserve est déja démarré sur le port {0}.
+error_rservePathNotSet=** Le chemin du programme du serveur statistique n'a pas été renseigné et sa recherche a échoué.
+error_unexpectedErrorInRStatisticsEngine=Erreur inattendue dans le moteur statistique R \: {0}.
+error_youNeedRSoftware=Vous avez besoin du logiciel 'R' et de configurer ses chemins via la fenêtre de préférences 'Outils/Préférences'.
+errorWhileRunningRScriptP0DDotP1=** Erreur lors de l''exécution du script R {0} \: {1}
+errorWhileRunningRScriptP0DDotP1_2=** Erreur lors de l''exécution du script R {0} \: {1}
+info_connectingToRAt=Connexion à R à {0}\:{1}.
+info_connectingToRAtWithUser=Connexion à R à {0}\:{1} avec l'utilisateur {2}.
+info_lastSafeEvalExpression=Dernier 'safeeval' \: {0}.
+info_rPathNotSetTryingToFindIt=Chemin d'accès à R non fourni, tentative de résolution...
+info_savingChartToFile=Sauvegarde du graphique dans le fichier \: {0}.
+info_startingRWithCommandLine=Démarrage de R avec la ligne de commande \: {0}.
+info_startingStatsEngine=Démarrage du moteur de statistiques \: utilisateur \: {0}, distant \: {1}, port \: {2}, debug \: {3}
+info_statisticsEngineLaunched=Moteur statistique lancé
+info_tryingToStartRFrom=Tentative de démarrage de R depuis \: {0}...
+info_tryingToStartRWithRPath=Tentative de démarrage de R depuis le chemin \: 'R'.
+ms=\ ms
+p0RScriptDoesntExist=** Le fichier de script R {0} n''existe pas
+runningP0=Exécution de {0}
+runningTextSelection=Exécution de la sélection de texte... 
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/Factor.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/Factor.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/Factor.java	(revision 1335)
@@ -46,7 +46,7 @@
 	 * @throws RWorkspaceException the r workspace exception
 	 */
 	public Factor(String values) throws RWorkspaceException {
-		throw new UnsupportedOperationException(StatsEngineCoreMessages.Factor_0);
+		throw new UnsupportedOperationException(StatsEngineCoreMessages.notImplemented);
 	}
 
 	/**
@@ -56,6 +56,6 @@
 	 * @return the levels
 	 */
 	public String[] getLevels() {
-		throw new UnsupportedOperationException(StatsEngineCoreMessages.Factor_0);
+		throw new UnsupportedOperationException(StatsEngineCoreMessages.notImplemented);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java	(revision 1335)
@@ -137,7 +137,7 @@
 		this(matrix);
 
 		if (rowNames == null) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_4);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.rowNamesOfAContingencyTableCannotBeNull);
 		}
 		//		if (rowNames.length != nrow) {
 		//			throw new IllegalArgumentException(Messages.MatrixImpl_5);
@@ -146,7 +146,7 @@
 		rw.assignRowNamesToMatrix(symbol, new VectorImpl(rowNames).getSymbol());
 
 		if (columnNames == null) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_6);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.columnNamesOfAContingencyTableCannotBeNull);
 		}
 		//		if (columnNames.length != ncol) {
 		//			throw new IllegalArgumentException(Messages.MatrixImpl_7
@@ -202,7 +202,7 @@
 		this(matrix);
 
 		if (lineNames == null) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_4);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.rowNamesOfAContingencyTableCannotBeNull);
 		}
 		//		if (lineNames.length != nrow) {
 		//			throw new IllegalArgumentException(Messages.MatrixImpl_5);
@@ -211,7 +211,7 @@
 		rw.assignRowNamesToMatrix(symbol, new VectorImpl(lineNames).getSymbol());
 
 		if (partNames == null) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_6);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.columnNamesOfAContingencyTableCannotBeNull);
 		}
 		//		if (partNames.length != ncol) {
 		//			throw new IllegalArgumentException(Messages.MatrixImpl_7
@@ -415,15 +415,15 @@
 				throw new RWorkspaceException(e);
 			}
 		} else if (r.isNull()) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_19);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.rObjectEvaluatedToNull);
 		} else {
 			// System.out.println("row: " + row);
 			// System.out.println("col: " + col);
 			// System.out.println("nrow: " + nrow);
 			// System.out.println("ncol: " + ncol);
 			// System.out.println(rw.eval("print(" + getSymbol() + ");"));
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_20
-					+ r.getAttribute(StatsEngineCoreMessages.MatrixImpl_21));
+			throw new IllegalArgumentException(StatsEngineCoreMessages.unknownTypeDDot
+					+ r.getAttribute(StatsEngineCoreMessages.mode));
 		}
 	}
 
@@ -435,8 +435,8 @@
 		int ncol = this.getNColumns();
 
 		if (index < 0 || index >= ncol) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_28 + index
-					+ StatsEngineCoreMessages.MatrixImpl_29 + ncol + ")"); //$NON-NLS-1$ 
+			throw new IllegalArgumentException(StatsEngineCoreMessages.columnIndex + index
+					+ StatsEngineCoreMessages.tooBigMax + ncol + ")"); //$NON-NLS-1$ 
 		}
 		String colName = createSymbole(Vector.class);
 		rw.voidEval(colName + "<- " + symbol + "[ ," + (index + 1) + "];"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -487,7 +487,7 @@
 	@Override
 	public int getNColumns() {
 		try {
-			return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.MatrixImpl_2+symbol+")[2]").asInteger(); //$NON-NLS-2$
+			return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.dim+symbol+")[2]").asInteger(); //$NON-NLS-2$
 		} catch (Exception e) {
 			Log.severe("Matrix: failed to get nrow: "+e); //$NON-NLS-1$
 		}
@@ -500,9 +500,9 @@
 	@Override
 	public int getNRows() {
 		try {
-			return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.MatrixImpl_2+symbol+")[1]").asInteger(); //$NON-NLS-2$
+			return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.dim+symbol+")[1]").asInteger(); //$NON-NLS-2$
 		} catch (Exception e) {
-			Log.severe(StatsEngineCoreMessages.MatrixImpl_67 + e);
+			Log.severe(StatsEngineCoreMessages.matrixDDotFailedToGetNrowDDot + e);
 		}
 		return 0;
 	}
@@ -514,8 +514,8 @@
 	public Vector getRow(int index) throws RException, RWorkspaceException {
 		int nrow = getNRows();
 		if (index < 0 || index >= nrow) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_22 + index
-					+ StatsEngineCoreMessages.MatrixImpl_23 + nrow + ")"); //$NON-NLS-1$ 
+			throw new IllegalArgumentException(StatsEngineCoreMessages.rowIndex + index
+					+ StatsEngineCoreMessages.tooBigMax + nrow + ")"); //$NON-NLS-1$ 
 		}
 		String rowName = createSymbole(Vector.class);
 		rw.voidEval(rowName + "<- " + symbol + "[" + (index + 1) + ", ];"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -612,7 +612,7 @@
 		int linesize = rw.eval("dim(tmpmat)[1]").asInteger(); //$NON-NLS-1$
 		int ncol = this.getNColumns();
 		if (colsize != ncol) {
-			System.out.println(StatsEngineCoreMessages.MatrixImpl_73+ncol+" imported="+colsize); //$NON-NLS-2$
+			System.out.println(StatsEngineCoreMessages.matrixImplDDotErrorDDotColumnSizeDiffersDDotOriginal+ncol+" imported="+colsize); //$NON-NLS-2$
 			return false;
 		}
 
@@ -836,7 +836,7 @@
 				try {
 					rowNames = getRowNames().asStringsArray();
 				} catch (StatException e) {
-					System.out.println(StatsEngineCoreMessages.MatrixImpl_79);
+					System.out.println(StatsEngineCoreMessages.failedToGetRowNames);
 					org.txm.utils.logger.Log.printStackTrace(e);
 					return;
 				}
@@ -890,14 +890,14 @@
 			try {
 				rowNames = getRowNames().asStringsArray();
 			} catch (StatException e) {
-				System.out.println(StatsEngineCoreMessages.MatrixImpl_79);
+				System.out.println(StatsEngineCoreMessages.failedToGetRowNames);
 				org.txm.utils.logger.Log.printStackTrace(e);
 				return;
 			}
 			String lastRowName = rowNames[last];
 			System.out.println("table<-matrix(table[c(-"+idx+"),],nrow=1,dimnames = list(rownames="+lastRowName+",colnames(table)))"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		} else {
-			System.out.println(StatsEngineCoreMessages.MatrixImpl_88);
+			System.out.println(StatsEngineCoreMessages.cannotDeleteAllLines);
 		}
 	}
 
@@ -919,12 +919,12 @@
 		int nrow = this.getNRows();
 		int ncol = this.getNColumns();
 		if (row < 0 || row >= nrow) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_10 + row
-					+ StatsEngineCoreMessages.MatrixImpl_11 + nrow + ")"); //$NON-NLS-1$ 
+			throw new IllegalArgumentException(StatsEngineCoreMessages.rowIndex + row
+					+ StatsEngineCoreMessages.tooBigMax + nrow + ")"); //$NON-NLS-1$ 
 		}
 		if (col < 0 || col >= ncol) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_13 + col
-					+ StatsEngineCoreMessages.MatrixImpl_14 + ncol + ")"); //$NON-NLS-1$ 
+			throw new IllegalArgumentException(StatsEngineCoreMessages.colIndex + col
+					+ StatsEngineCoreMessages.tooBigMax + ncol + ")"); //$NON-NLS-1$ 
 		}
 		// appel à R
 		try {
@@ -1027,4 +1027,4 @@
 		}
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/QuantitativeDataStructureImpl.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/QuantitativeDataStructureImpl.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/QuantitativeDataStructureImpl.java	(revision 1335)
@@ -123,7 +123,7 @@
 	protected void removeFromRWorkspace() throws RWorkspaceException {
 		if (!rw.containsVariable(symbol)) {
 			throw new RObjectDoesNotExist(
-					StatsEngineCoreMessages.QuantitativeDataStructureImpl_2);
+					StatsEngineCoreMessages.cannotDeleteANonexistingObject);
 		}
 		rw.voidEval("rm(" + symbol + ")"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
@@ -202,4 +202,4 @@
 	public String getSymbol() {
 		return symbol;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java	(revision 1335)
@@ -58,7 +58,7 @@
 		rw.setLog(true);
 
 		try {
-			System.out.println(RCoreMessages.ExecuteRText_0);
+			System.out.println(RCoreMessages.runningTextSelection);
 			long time = System.currentTimeMillis();
 			//execute a file line per line
 
@@ -68,9 +68,9 @@
 //				RConsole.printServer(str);
 			RWorkspace.appendtoEvalLog(text);
 
-			System.out.println(RCoreMessages.ExecuteRScript_2+(System.currentTimeMillis()-time)+RCoreMessages.ExecuteRText_2); 
+			System.out.println(RCoreMessages.doneDDot+(System.currentTimeMillis()-time)+RCoreMessages.ms); 
 		} catch(Exception e) {
-			System.out.println(NLS.bind(RCoreMessages.ExecuteRText_1, text, Log.toString(e))); 
+			System.out.println(NLS.bind(RCoreMessages.errorWhileRunningRScriptP0DDotP1, text, Log.toString(e))); 
 //			StatusLine.error(NLS.bind(TXMUIMessages.ExecuteRText_1, text, Log.toString(e))); 
 			Log.printStackTrace(e);
 		}
@@ -87,7 +87,7 @@
 	 */
 	public IStatus executeScript(File rFile, HashMap<String, Object> env) {
 		if (!rFile.exists()) {
-			System.err.println(NLS.bind(RCoreMessages.ExecuteScriptR_0, rFile));
+			System.err.println(NLS.bind(RCoreMessages.p0RScriptDoesntExist, rFile));
 			return Status.CANCEL_STATUS;
 		}
 
@@ -101,7 +101,7 @@
 		boolean initState = rw.isLogging();
 		rw.setLog(true);
 		try {
-			System.out.println(NLS.bind(RCoreMessages.ExecuteRScript_1, rFile.getName()));
+			System.out.println(NLS.bind(RCoreMessages.runningP0, rFile.getName()));
 			long time = System.currentTimeMillis();
 			//execute a file line per line
 
@@ -130,10 +130,10 @@
 //				if (rw.isLogging() && str.length() > 0)
 //					RConsole.printServer(cmd);
 //			}
-			System.out.println(RCoreMessages.ExecuteRScript_2+(System.currentTimeMillis()-time)+RCoreMessages.ExecuteRScript_3);
+			System.out.println(RCoreMessages.doneDDot+(System.currentTimeMillis()-time)+RCoreMessages.ms);
 		} catch(Exception e) {
-			System.out.println(NLS.bind(RCoreMessages.ExecuteScriptR_1, rFile, e)); 
-			//StatusLine.error(NLS.bind(RCoreMessages.ExecuteScriptR_1, rFile, e)); 
+			System.out.println(NLS.bind(RCoreMessages.errorWhileRunningRScriptP0DDotP1_2, rFile, e)); 
+			//StatusLine.error(NLS.bind(RCoreMessages.errorWhileRunningRScriptP0DDotP1_2, rFile, e)); 
 			Log.printStackTrace(e);
 			return Status.CANCEL_STATUS;
 		} finally {
@@ -143,4 +143,4 @@
 		return Status.OK_STATUS;
 		
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java
===================================================================
--- tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java	(revision 1335)
@@ -1134,7 +1134,7 @@
 	public int[][] evalToInt2D(String exp) throws RWorkspaceException {
 		int[][] res = null;
 		try {
-			int[] dims = eval(StatsEngineCoreMessages.MatrixImpl_2+exp+")").asIntegers(); //$NON-NLS-2$
+			int[] dims = eval(StatsEngineCoreMessages.dim+exp+")").asIntegers(); //$NON-NLS-2$
 			int ncol = dims[1];
 			int nrow = dims[0];
 			int[] tmp = eval("c("+exp+")").asIntegers(); //$NON-NLS-1$ //$NON-NLS-2$
@@ -1575,4 +1575,4 @@
 	public void loadPackage(String p) throws RWorkspaceException {
 		this.eval("library(\""+p+"\")"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-RESULT_TYPE = Классификация
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+RESULT_TYPE=Классификация
Index: tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages_fr.properties	(revision 1335)
@@ -1,4 +1,4 @@
-
-RESULT_TYPE = CAH
-
-error_errorWhileExportingCAHToTXT = Erreur durant l'export du résultat CAH.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_errorWhileExportingCAHToTXT=Erreur durant l'export du résultat CAH.
+RESULT_TYPE=CAH
Index: tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java
===================================================================
--- tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java	(revision 1334)
+++ tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/AHCCoreMessages.java	(revision 1335)
@@ -1,27 +1,27 @@
-package org.txm.ahc.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * AHC core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class AHCCoreMessages extends NLS {
-	
-	private static final String BUNDLE_NAME = "org.txm.ahc.core.messages.messages"; //$NON-NLS-1$
-
-	public static String RESULT_TYPE;
-	
-	public static String error_errorWhileExportingCAHToTXT;
-	
-	
-	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, AHCCoreMessages.class);
-	}
-	
-
-}
+package org.txm.ahc.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * AHC core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class AHCCoreMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.ahc.core.messages.messages"; //$NON-NLS-1$
+
+	public static String RESULT_TYPE;
+	
+	public static String error_errorWhileExportingCAHToTXT;
+	
+	
+	static {
+		Utf8NLS.initializeMessages(BUNDLE_NAME, AHCCoreMessages.class);
+	}
+	
+
+}
Index: tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages.properties
===================================================================
--- tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.ahc.core/src/org/txm/ahc/core/messages/messages.properties	(revision 1335)
@@ -1,4 +1,4 @@
-
-RESULT_TYPE = AHC
-
-error_errorWhileExportingCAHToTXT = Error while exporting CAH result.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_errorWhileExportingCAHToTXT=Error while exporting CAH result.
+RESULT_TYPE=AHC
Index: tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSResult.java
===================================================================
--- tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSResult.java	(revision 1334)
+++ tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSResult.java	(revision 1335)
@@ -160,9 +160,9 @@
 	 * @return the current sentence no
 	 */
 	public int getCurrentSentenceNo() {
-		System.out.println(TXMCoreMessages.TSResult_0+this.getNumberOfMatch());
+		System.out.println(TXMCoreMessages.numberOfMatch+this.getNumberOfMatch());
 		System.out.println("current match "+this.getCurrentMatchNo()); //$NON-NLS-1$
-		System.out.println(TXMCoreMessages.TSResult_2+this.getCurrentMatch().getNumberOfSubGraph());
+		System.out.println(TXMCoreMessages.numberOfSubMatch+this.getCurrentMatch().getNumberOfSubGraph());
 		System.out.println("current sub graph "+this.getCurrentMatch().getCurrentSubMatchNo()); //$NON-NLS-1$
 		return result.getSentenceNumberAt(this.currentMatchNo); // + 1 ?
 	}
@@ -408,4 +408,4 @@
 			return false;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCmd.java
===================================================================
--- tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCmd.java	(revision 1334)
+++ tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCmd.java	(revision 1335)
@@ -89,8 +89,8 @@
 			TSCorpus corpus = manager.getCorpus(id);
 			TSResult result = corpus.query(query);
 			
-			System.out.println(TXMCoreMessages.TSCmd_30+ query);
-			System.out.println(String.valueOf(result.getNumberOfMatch())+ TXMCoreMessages.TSCmd_31);
+			System.out.println(TXMCoreMessages.queryWasDDot+ query);
+			System.out.println(String.valueOf(result.getNumberOfMatch())+ TXMCoreMessages.matchesFound);
 			
 			// write SVG of all matches
 			for (int i = 0 ; i < result.getNumberOfMatch() ; i++) {
@@ -103,4 +103,4 @@
 		return;
 
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpusManager.java
===================================================================
--- tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpusManager.java	(revision 1334)
+++ tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpusManager.java	(revision 1335)
@@ -65,11 +65,11 @@
 		initok = true;
 		
 		if (!(registrydir.exists() && registrydir.canRead())) {
-			System.out.println(TXMCoreMessages.TSCorpusManager_0+registrydir);
+			System.out.println(TXMCoreMessages.errorRegDirDDot+registrydir);
 			initok = false;
 		}
 		if (!(configdir.exists() && configdir.canRead())) {
-			System.out.println(TXMCoreMessages.TSCorpusManager_1+configdir);
+			System.out.println(TXMCoreMessages.errorConfigdirDirDDot+configdir);
 			initok = false;
 		}
 	}
@@ -120,4 +120,4 @@
 			
 		return corpora.get(id);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java
===================================================================
--- tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java	(revision 1334)
+++ tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java	(revision 1335)
@@ -23,8 +23,8 @@
 
 		String userdir = System.getProperty("user.home"); //$NON-NLS-1$
 		File master = new File(userdir, "TXM/corpora/roland/tiger/master_pos.xml"); //$NON-NLS-1$
-		if (!master.exists()) System.out.println(TXMCoreMessages.TigerXmlIndexing_2);
-		if (!master.canRead()) System.out.println(TXMCoreMessages.TigerXmlIndexing_3);
+		if (!master.exists()) System.out.println(TXMCoreMessages.eRRORDDotExists);
+		if (!master.canRead()) System.out.println(TXMCoreMessages.eRRORDDotRead);
 		
 		String uri = master.getAbsolutePath();
 		File outdir = new File(userdir, "TXM/corpora/roland/tiger/data"); //$NON-NLS-1$
@@ -39,7 +39,7 @@
 			XMLIndexing indexing = new XMLIndexing("TEST",uri, dest, handler,false); //$NON-NLS-1$
 			indexing.startIndexing();
 		}
-		catch (IOException e) { System.out.println(TXMCoreMessages.TigerXmlIndexing_6+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e); }
-		catch (SAXException e) { System.out.println(TXMCoreMessages.TigerXmlIndexing_7+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e);}
+		catch (IOException e) { System.out.println(TXMCoreMessages.iODDot+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e); }
+		catch (SAXException e) { System.out.println(TXMCoreMessages.sAXDDot+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e);}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpus.java
===================================================================
--- tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpus.java	(revision 1334)
+++ tmp/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpus.java	(revision 1335)
@@ -128,7 +128,7 @@
 			//manager.getC
 			return true;
 		}
-		catch (Exception e) { System.out.println(TXMCoreMessages.TSCorpus_0+e.getMessage());}
+		catch (Exception e) { System.out.println(TXMCoreMessages.couldntReadCorpusDDot+e.getMessage());}
 		return false;
 	}
 	
@@ -157,4 +157,4 @@
 	public boolean isOk() {	
 		return initok;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java
===================================================================
--- tmp/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java	(revision 1334)
+++ tmp/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java	(revision 1335)
@@ -285,14 +285,14 @@
 	 * Compute index.
 	 */
 	public void compute() {
-		StatusLine.setMessage(IndexUIMessages.IndexEditor_33);
+		StatusLine.setMessage(IndexUIMessages.computingIndex);
 		final CQLQuery query; // if the query is empty then we put "[]" instead
 		if (queryWidget.isDisposed()) { // lexicon editor
 			query = new CQLQuery("[]"); //$NON-NLS-1$
 		} else if (!queryWidget.getText().equals("\"\"")) { //$NON-NLS-1$
 			query = new CQLQuery(queryWidget.getText());
 		} else {
-			System.err.println(IndexUIMessages.IndexEditor_0);
+			System.err.println(IndexUIMessages.indexDDotQueryIsEmpty);
 			return;
 		}
 
@@ -301,10 +301,10 @@
 		final int Tmax = Integer.parseInt(this.TmaxSpinner.getText());
 		final List<WordProperty> properties = propsArea.getSelectedProperties();
 		try {
-			title = NLS.bind(IndexUIMessages.IndexEditor_2, new Object[]{
+			title = NLS.bind(IndexUIMessages.indexOfInfP0SupWithPropertyDDotP1InTheCorpusDDotP2, new Object[]{
 					query.getQueryString(), properties, corpus.getName()});
 			if (partition != null)
-				title = NLS.bind(IndexUIMessages.IndexEditor_20, new Object[]{
+				title = NLS.bind(IndexUIMessages.indexOfInfP0SupWithPropertyDDotP1InThePartitionDDotP2, new Object[]{
 						query.getQueryString(), properties, corpus.getName()});
 
 			JobHandler jobhandler = new JobHandler(title, go.getParent()) {
@@ -330,7 +330,7 @@
 							return Status.CANCEL_STATUS;
 
 						if (index == null) {
-							StatusLine.setMessage(IndexUIMessages.IndexEditor_1);
+							StatusLine.setMessage(IndexUIMessages.failedToComputeIndex);
 							return Status.CANCEL_STATUS;
 						}
 						Log.info("Filtering Fmin="+Fmin+" and Fmax="+Fmax);
@@ -357,9 +357,9 @@
 						if (index.getV() == 1)
 							message= ("one result");
 						else if (index.getV() > 0)
-							message= (IndexUIMessages.bind(TXMUIMessages.CreatePartition_5, index.getV(), index.getT()));
+							message= (IndexUIMessages.bind(TXMUIMessages.doneDDotP0Items, index.getV(), index.getT()));
 						else
-							message= (IndexUIMessages.IndexEditor_31);
+							message= (IndexUIMessages.IndexEditor_17);
 
 						if (monitor.isCanceled())
 							return Status.CANCEL_STATUS;
@@ -396,9 +396,9 @@
 					} catch (Exception e) {
 						System.out.println(e.getLocalizedMessage());
 						try {
-							System.out.println(TXMUIMessages.LastCQPError + CQPSearchEngine.getCqiClient().getLastCQPError());
+							System.out.println(TXMUIMessages.lastCQPErrorDDot + CQPSearchEngine.getCqiClient().getLastCQPError());
 						} catch (Exception e1) {
-							System.out.println(IndexUIMessages.IndexEditor_10+e1);
+							System.out.println(IndexUIMessages.cQPErrorDDot+e1);
 						}
 						Log.severe("Error while computing TIGERSearch Index: "+e.getLocalizedMessage());
 					} finally {
@@ -506,7 +506,7 @@
 		// | Query: [ (v)] [Search] |
 		// Query:
 		queryLabel = new Label(queryArea, SWT.NONE);
-		queryLabel.setText(IndexUIMessages.IndexEditor_3);
+		queryLabel.setText(IndexUIMessages.IndexEditor_17);
 		queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false,	true));
 
 		// [ (v)]
@@ -543,7 +543,7 @@
 
 		//propsArea
 		go = new Button(queryArea, SWT.BOLD);
-		go.setText(IndexUIMessages.IndexEditor_4);
+		go.setText(IndexUIMessages.IndexEditor_17);
 
 		Font f = go.getFont();
 		FontData defaultFont = f.getFontData()[0];
@@ -596,7 +596,7 @@
 		tmp.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		Label lFmin = new Label(filtercontrols, SWT.NONE);
-		lFmin.setText(IndexUIMessages.IndexEditor_5);
+		lFmin.setText(IndexUIMessages.IndexEditor_17);
 		lFmin.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		FminSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -608,7 +608,7 @@
 		FminSpinner.addKeyListener(listener);
 
 		Label lFmax = new Label(filtercontrols, SWT.NONE);
-		lFmax.setText(IndexUIMessages.IndexEditor_6);
+		lFmax.setText(IndexUIMessages.IndexEditor_17);
 		lFmax.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		FmaxSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -620,7 +620,7 @@
 		FmaxSpinner.addKeyListener(listener);
 
 		Label lVmax = new Label(filtercontrols, SWT.NONE);
-		lVmax.setText(IndexUIMessages.IndexEditor_7);
+		lVmax.setText(IndexUIMessages.IndexEditor_17);
 		lVmax.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		TmaxSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -633,7 +633,7 @@
 		TmaxSpinner.addKeyListener(listener);
 
 		Label lNLigneppage = new Label(filtercontrols, SWT.NONE);
-		lNLigneppage.setText(IndexUIMessages.IndexEditor_8);
+		lNLigneppage.setText(IndexUIMessages.pageSize);
 		lNLigneppage.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		NLignePPageSpinner = new Spinner(filtercontrols, SWT.BORDER);
@@ -844,7 +844,7 @@
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(IndexUIMessages.IndexEditor_36);
+				StatusLine.setMessage(IndexUIMessages.IndexEditor_17);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -859,7 +859,7 @@
 					}
 				}
 
-				StatusLine.setMessage(IndexUIMessages.IndexEditor_37);
+				StatusLine.setMessage(IndexUIMessages.IndexEditor_17);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
@@ -898,7 +898,7 @@
 						index.sortLines(SortMode.FREQUNIT, false);
 					}
 				}
-				StatusLine.setMessage(IndexUIMessages.IndexEditor_37);
+				StatusLine.setMessage(IndexUIMessages.IndexEditor_17);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
@@ -1067,7 +1067,7 @@
 				setPartName(corpus.getName());
 			queryWidget.setFocus();
 		} else {
-			System.err.println(IndexUIMessages.IndexEditor_22);
+			System.err.println(IndexUIMessages.couldntInitializeIndexTable);
 		}
 		initializing = false;
 		queryWidget.setText("[word=\"partir\"]");
@@ -1096,10 +1096,10 @@
 		navigationArea.setNextEnabled(to < index.getV());
 		navigationArea.setLastEnabled(to < index.getV());
 
-		lFminInfo.setText(IndexUIMessages.IndexEditor_25 + index.getFmin());
-		lFmaxInfo.setText(IndexUIMessages.IndexEditor_26 + index.getFmax());
-		lTInfo.setText(IndexUIMessages.IndexEditor_27 + index.getT());
-		lVInfo.setText(IndexUIMessages.IndexEditor_28 + index.getV());
+		lFminInfo.setText(IndexUIMessages.IndexEditor_17 + index.getFmin());
+		lFmaxInfo.setText(IndexUIMessages.IndexEditor_17 + index.getFmax());
+		lTInfo.setText(IndexUIMessages.IndexEditor_17 + index.getT());
+		lVInfo.setText(IndexUIMessages.IndexEditor_17 + index.getV());
 
 		lVInfo.getParent().layout();
 
@@ -1133,7 +1133,7 @@
 				str = NLS.bind(IndexUIMessages.IndexEditor_17,
 						new Object[]{partition.getName(), index.getQuery().getQueryString(), index.getProperties(), index.getFmin(), index.getFmax()});
 			else
-				str = NLS.bind(IndexUIMessages.IndexEditor_18,
+				str = NLS.bind(IndexUIMessages.IndexEditor_17,
 						new Object[]{corpus.getName(), index.getQuery().getQueryString(), index.getProperties(), index.getFmin(), index.getFmax()});
 
 			return str;
@@ -1150,7 +1150,7 @@
 	public void setFocus() {
 		if (!this.queryWidget.isDisposed())
 			this.queryWidget.setFocus();
-		StatusLine.setMessage(IndexUIMessages.IndexEditor_29);
+		StatusLine.setMessage(IndexUIMessages.openingTheIndexResults);
 	}
 
 	/**
@@ -1204,4 +1204,4 @@
 		// FIXME: not yet implemented
 		System.err.println("TSIndexEditor.updateEditorFromResult(): not yet implemented.");
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/messages_fr.properties	(revision 1335)
@@ -1,5 +1,5 @@
-
-charts_labelValueSeparator = \ 
-
-error_cantCreateTmpChartFile = Impossible de créer le fichier temporaire du graphique
-error_cantWriteInFile        = Impossible d'écrire dans le fichier
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+EMPTY=\ 
+error_cantCreateTmpChartFile=Impossible de créer le fichier temporaire du graphique
+error_cantWriteInFile=Impossible d'écrire dans le fichier
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/ChartsEngineCoreMessages.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/ChartsEngineCoreMessages.java	(revision 1334)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/ChartsEngineCoreMessages.java	(revision 1335)
@@ -1,27 +1,27 @@
-package org.txm.chartsengine.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Charts engine core messages.
- * 
- * @author sjacquot
- *
- */
-public class ChartsEngineCoreMessages extends NLS {
-	
-	private static final String BUNDLE_NAME = "org.txm.chartsengine.core.messages.messages"; //$NON-NLS-1$
-
-	
-	public static String error_cantCreateTmpChartFile;
-	public static String error_cantWriteInFile;
-
-	public static String charts_labelValueSeparator;
-
-	
-	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ChartsEngineCoreMessages.class);
-	}
-	
-}
+package org.txm.chartsengine.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Charts engine core messages.
+ * 
+ * @author sjacquot
+ *
+ */
+public class ChartsEngineCoreMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.chartsengine.core.messages.messages"; //$NON-NLS-1$
+
+	
+	public static String error_cantCreateTmpChartFile;
+	public static String error_cantWriteInFile;
+
+	public static String EMPTY; 
+
+	
+	static {
+		Utf8NLS.initializeMessages(BUNDLE_NAME, ChartsEngineCoreMessages.class);
+	}
+	
+}
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/messages.properties
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/messages/messages.properties	(revision 1335)
@@ -1,5 +1,5 @@
-
-charts_labelValueSeparator = \ 
-
-error_cantCreateTmpChartFile = Can't create temporary chart file
-error_cantWriteInFile        = Can't write in file
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+EMPTY=\ 
+error_cantCreateTmpChartFile=Can't create temporary chart file
+error_cantWriteInFile=Can't write in file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromCQP.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromCQP.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromCQP.java	(revision 1335)
@@ -86,7 +86,7 @@
 	public boolean process(File cqpfile)
 			throws XMLStreamException, FactoryConfigurationError, IOException {
 		if (cqpfile == null || !cqpfile.exists()) {
-			System.out.println(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.BuildCwbEncodeArgs_0, cqpfile));
+			System.out.println(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.theFileP0CannotBeFound, cqpfile));
 			return false;
 		}
 
@@ -217,4 +217,4 @@
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/PatchCwbRegistry.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/PatchCwbRegistry.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/PatchCwbRegistry.java	(revision 1335)
@@ -123,8 +123,8 @@
 		}
 		corpusEncoding = corpusEncoding.toLowerCase();
 
-		Log.info(CQPSearchEngineCoreMessages.PatchCwbRegistry_2 + corpus
-				+ CQPSearchEngineCoreMessages.PatchCwbRegistry_23 + corpusEncoding);
+		Log.info(CQPSearchEngineCoreMessages.updating + corpus
+				+ CQPSearchEngineCoreMessages.encodingTo + corpusEncoding);
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("##:: charset") || line.startsWith("charset")) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -161,7 +161,7 @@
 
 		corpusLanguage = corpusLanguage.toLowerCase();
 		
-		Log.info(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.PatchCwbRegistry_34, corpus, corpusLanguage));
+		Log.info(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.updatingP0CorpusLanguageToP1, corpus, corpusLanguage));
 		
 		String line = reader.readLine();
 		while (line != null) {
@@ -191,11 +191,11 @@
 		String corpus = registryfile.getName();
 
 		if (!new File(registryfile.getParent(), targetcorpus).exists()) {
-			Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_3+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
+			Log.severe(CQPSearchEngineCoreMessages.theTargetCorpusDoesntExist+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
 			return false;
 		}
 		if (!registryfile.exists()) {
-			Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_13+registryfile.getAbsolutePath());
+			Log.severe(CQPSearchEngineCoreMessages.sourceRegistryDoesNotExistsDDot+registryfile.getAbsolutePath());
 			return false;
 		}
 		
@@ -208,7 +208,7 @@
 		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(registryfile), encoding));
 		OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(temp), encoding);
 
-		Log.info(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.PatchCwbRegistry_4, corpus, targetcorpus));
+		Log.info(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.addingAlignmentAttributeToCorpusP0RegistryDDotP1, corpus, targetcorpus));
 		
 		String line = reader.readLine();
 		while (line != null) {
@@ -249,7 +249,7 @@
 		String datapath = ""; //$NON-NLS-1$
 		
 		if (!registryfile.exists()) {
-			Log.warning(CQPSearchEngineCoreMessages.PatchCwbRegistry_16);
+			Log.warning(CQPSearchEngineCoreMessages.cantFindRegistryFile);
 			return false;
 		}
 
@@ -285,21 +285,21 @@
 						f.renameTo(new File(f.getParent(), f.getName().replace(oldname+".", newname+"."))); //$NON-NLS-1$ //$NON-NLS-2$
 			}
 			else {
-				System.out.println(CQPSearchEngineCoreMessages.PatchCwbRegistry_27+datadir +TXMCoreMessages.ValidateXml_2);
+				System.out.println(CQPSearchEngineCoreMessages.dataDirectory+datadir +TXMCoreMessages.doesNotExists_2);
 				writer.close();
 				reader.close();
 				return false;
 			}
 		}
 		else {
-			Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_28);
+			Log.severe(CQPSearchEngineCoreMessages.couldNotPatchTheRegistryFile);
 			
 			if(!found) {
-				Log.severe(oldname +CQPSearchEngineCoreMessages.PatchCwbRegistry_29+registryfile);
+				Log.severe(oldname +CQPSearchEngineCoreMessages.couldNotBeFoundInRegistryFile+registryfile);
 			}
 			
 			if(!(datapath.length() > 0)) {
-				Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_27+oldname +CQPSearchEngineCoreMessages.PatchCwbRegistry_29+registryfile);
+				Log.severe(CQPSearchEngineCoreMessages.dataDirectory+oldname +CQPSearchEngineCoreMessages.couldNotBeFoundInRegistryFile+registryfile);
 			}
 			writer.close();
 			reader.close();
@@ -343,4 +343,4 @@
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgs.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgs.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgs.java	(revision 1335)
@@ -86,7 +86,7 @@
 	public boolean process(File xmlfile, ArrayList<String> wordstag)
 			throws XMLStreamException, FactoryConfigurationError, IOException {
 		if (xmlfile == null || !xmlfile.exists()) {
-			System.out.println(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.BuildCwbEncodeArgs_0, xmlfile));
+			System.out.println(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.theFileP0CannotBeFound, xmlfile));
 			return false;
 		}
 		URL u = xmlfile.toURI().toURL();
@@ -239,4 +239,4 @@
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java	(revision 1335)
@@ -308,37 +308,37 @@
 		File registry = new File(directory, "registry"); //$NON-NLS-1$
 		File corpora = new File(directory, "corpora"); //$NON-NLS-1$
 		if (!directory.exists()) {
-			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_0 + directory);
+			System.err.println(CQPSearchEngineCoreMessages.theDirectoryDoesNotExistsDDot + directory);
 			return;
 		}
 		if (!bin.exists()) {
-			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_21 + bin);
+			System.err.println(CQPSearchEngineCoreMessages.theBinaryDirectoryDoesNotExistsDDot + bin);
 			return;
 		}
 		if (!registry.exists()) {
-			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_23 + registry);
+			System.err.println(CQPSearchEngineCoreMessages.theRegistryDirectoryDoesNotExistsDDot + registry);
 			return;
 		}
 		if (!corpora.exists()) {
-			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_25 + corpora);
+			System.err.println(CQPSearchEngineCoreMessages.theCorporaDirectoryDoesNotExistsDDot + corpora);
 			return;
 		}
 
 		for (File corpus : corpora.listFiles()) {
 			if (!corpus.isDirectory()) continue;
 			
-			System.out.println(CQPSearchEngineCoreMessages.CwbEncode_27 + corpus.getName());
+			System.out.println(CQPSearchEngineCoreMessages.processingCorpus + corpus.getName());
 			File data = new File(corpus, "data"); //$NON-NLS-1$
 
 			if (!data.exists()) {
-				System.err.println(CQPSearchEngineCoreMessages.CwbEncode_29 + data);
+				System.err.println(CQPSearchEngineCoreMessages.theDataDirectoryDoesNotExistsDDot + data);
 				return;
 			}
 
 			String datapath = data.getAbsolutePath();
 			String regpath = registry.getAbsolutePath() + "/" + corpus.getName(); //$NON-NLS-1$
 			if (datapath.startsWith("\\\\")) datapath = datapath.replace("\\\\", "//"); // fix UNC paths for mingw
-			System.out.println(NLS.bind(CQPSearchEngineCoreMessages.CwbEncode_32, regpath, datapath));
+			System.out.println(NLS.bind(CQPSearchEngineCoreMessages.fixingRegistryFileP0WithP1, regpath, datapath));
 			try {
 				PatchCwbRegistry.patch(new File(regpath), new File(datapath));
 			} catch (IOException e) {
@@ -398,4 +398,4 @@
 		CwbEncode.patchDir(new File(
 				"C:/Documents and Settings/H/Mes documents/TXM/cwb")); //$NON-NLS-1$
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbProcess.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbProcess.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbProcess.java	(revision 1335)
@@ -116,7 +116,7 @@
 	 */
 	protected boolean run(List<String> cmd, boolean monitorOutput, boolean waitFor) throws ServerNotFoundException, InterruptedException, IOException {
 		
-		Log.info(CQPSearchEngineCoreMessages.CwbProcess_1 + StringUtils.join(cmd, " ")); //$NON-NLS-1$ 
+		Log.info(CQPSearchEngineCoreMessages.startingProcessWithCommandDDot + StringUtils.join(cmd, " ")); //$NON-NLS-1$ 
 		
 		//System.out.println(StringUtils.join(cmd, " "));
 		for (String s : cmd) {
@@ -179,9 +179,9 @@
 	 * Stop the CWB process.
 	 */
 	public void stop() {
-		Log.finest(CQPSearchEngineCoreMessages.CwbProcess_3 + name.toUpperCase());
+		Log.finest(CQPSearchEngineCoreMessages.stoppingProcessDDot + name.toUpperCase());
 		this.process.destroy();
-		Log.finest(CQPSearchEngineCoreMessages.CwbProcess_4 + name.toUpperCase());
+		Log.finest(CQPSearchEngineCoreMessages.processStopedDDot + name.toUpperCase());
 	}
 
 	/**
@@ -266,10 +266,10 @@
 		String cwbLoc = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB)+File.separator;
 
 		if (!new File(cwbLoc).exists()) {
-			Log.severe(CQPSearchEngineCoreMessages.CwbProcess_5 + cwbLoc);
+			Log.severe(CQPSearchEngineCoreMessages.cantFindCQPLocationDDot + cwbLoc);
 			return null;
 		}
 
 		return cwbLoc;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/AbstractCqiClient.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/AbstractCqiClient.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/AbstractCqiClient.java	(revision 1335)
@@ -91,7 +91,7 @@
 		if(lastError != null && lastError.length() > 0) {
 			return lastError;
 		}
-		return CQPSearchEngineCoreMessages.AbstractCqiClient_2;
+		return CQPSearchEngineCoreMessages.noError;
 	}
 	
 	public List<String> getSingleData(Property prop) throws IOException, CqiServerError, CqiClientException {
@@ -781,4 +781,4 @@
 
 	@Override
 	public abstract boolean reconnect() ;
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java	(revision 1335)
@@ -149,7 +149,7 @@
 					try {
 						cqiClient = new MemCqiClient((MemCqiServer) cqiServer);
 					} catch(Exception e) {
-						Log.severe(TXMCoreMessages.Toolbox_28+e);
+						Log.severe(TXMCoreMessages.failedToStartMemCqiClientDDot+e);
 						cqiserverok = false;
 					}
 				} else {
@@ -159,10 +159,10 @@
 				}
 			}
 		} catch (NumberFormatException e1) {
-			Log.severe(TXMCoreMessages.Toolbox_wrong_port + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
 		} catch (ServerNotFoundException e1) {
-			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST)
-					+ TXMCoreMessages.Toolbox_27 + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST)
+					+ TXMCoreMessages.and + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT)); 
 		}
 
 		// try connecting to the CWB server
@@ -177,20 +177,20 @@
 		}
 
 		if (state == false) {
-			System.out.println(TXMCoreMessages.Toolbox_29); 
+			System.out.println(TXMCoreMessages.errorWhileConnectingToSearchEngine); 
 			if (cqiClient instanceof NetCqiClient) {
-				System.out.println(TXMCoreMessages.Toolbox_30 + 
+				System.out.println(TXMCoreMessages.wrongLoginOrPasswordOrPortDDot + 
 						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_LOGIN) + " " + //$NON-NLS-1$
 						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PASSWORD) + 
 						CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST) + " " + //$NON-NLS-1$
 						CQPLibPreferences.getInstance().getInt(CQPLibPreferences.CQI_SERVER_PORT));
 			}
 			if (cqiServer != null && cqiServer instanceof NetCqiServer) {
-				System.out.println(TXMCoreMessages.Toolbox_33 + cqiServer.getLastCmdLine());
+				System.out.println(TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot + cqiServer.getLastCmdLine());
 			}
 		} else {
 			if (cqiServer == null || cqiServer instanceof NetCqiServer)
-				System.out.println(TXMCoreMessages.Toolbox_connected_to_corpus_sever); 
+				System.out.println(TXMCoreMessages.connected); 
 		}
 
 		CorpusManager.setCqiClient(cqiClient);
@@ -205,13 +205,13 @@
 				CorpusManager.getCorpusManager().getCorpora();
 				scount++;
 				if (scount >= 10) {
-					Log.warning(TXMCoreMessages.Toolbox_17); 
+					Log.warning(TXMCoreMessages.endOfCQPWaitTest); 
 					break;
 				}
 			} while (CorpusManager.getCorpusManager().getCorpora().size() == 0);
 		} catch (Exception e) {
 			org.txm.utils.logger.Log.printStackTrace(e);
-			Log.severe(TXMCoreMessages.Toolbox_18 + e);
+			Log.severe(TXMCoreMessages.errorWhileWaitingForCQP + e);
 		} 
 
 		if (Toolbox.workspace == null) {
@@ -351,8 +351,8 @@
 					p = Runtime.getRuntime().exec("taskkill /IM cqpserver.exe /F"); //$NON-NLS-1$
 					p.waitFor();
 				} catch (IOException e) {
-					Log.severe(TXMCoreMessages.Toolbox_31+Log.toString(e));
-					System.out.println(TXMCoreMessages.Toolbox_31+Log.toString(e));
+					Log.severe(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
+					System.out.println(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
 					try {
 						Process p = Runtime.getRuntime().exec(
 								"tskill cqpserver.exe"); //$NON-NLS-1$
@@ -360,8 +360,8 @@
 						p = Runtime.getRuntime().exec("tskill cqpserver.exe"); //$NON-NLS-1$
 						p.waitFor();
 					} catch (IOException e2) {
-						Log.severe(TXMCoreMessages.Toolbox_34+Log.toString(e2));
-						System.out.println(TXMCoreMessages.Toolbox_34+Log.toString(e2));
+						Log.severe(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
+						System.out.println(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
 					} catch (InterruptedException e3) {
 						Log.severe(Log.toString(e3));
 						System.out.println(Log.toString(e3));
@@ -374,7 +374,7 @@
 			}
 		// Mac, Linux
 			else {
-				String cmd = TXMCoreMessages.Toolbox_37 + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT) + TXMCoreMessages.Toolbox_38;
+				String cmd = TXMCoreMessages.killPsAuxPipeGrepCqpserverPipeAwkP + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT) + TXMCoreMessages.print2;
 				try {
 					//Process p = Runtime.getRuntime().exec("killall -9 cqpserver"); //$NON-NLS-1$
 					// System.out.println("kill `ps aux | grep cqpserver | awk '/-P "
@@ -393,8 +393,8 @@
 					// + CQPPreferences.getInstance().getString(CQI_SERVER_PORT) + "/ {print $2}'`");
 
 				} catch (Exception e) {
-					Log.severe(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e));
-					System.out.println(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e));
+					Log.severe(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
+					System.out.println(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
 					org.txm.utils.logger.Log.printStackTrace(e);
 				}
 			}
@@ -467,4 +467,4 @@
 	public static CQPSearchEngine getEngine() {
 		return (CQPSearchEngine) Toolbox.getEngineManager(EngineType.SEARCH).getEngine("CQP");
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages_fr.properties	(revision 1335)
@@ -1,76 +1,63 @@
-
-AbstractCqiClient_2 = Pas d'erreur à notifier.
-
-BuildCwbEncodeArgs_0 = Le fichier ''{0}'' est introuvable.
-
-CONNECTING_CQI_CLIENT = Connexion au moteur de recherche avec les paramètres suivants : {0}:{1}@{2}{3}...
-
-CQI_CLIENT_CONNECTED = Connexion au moteur de recherche établie.
-
-CqiClient_0  = Récupération de la dernière erreur CQP.
-CqiClient_32 = Moteur de recherche lancé...
-CqiClient_33 = ** La connexion au moteur de recherche a échoué.
-
-CwbEncode_0  = Le dossier n'existe pas :
-CwbEncode_21 = Le dossier "bin" n'existe pas : 
-CwbEncode_23 = Le dossier "registry" n'existe pas : 
-CwbEncode_25 = Le dossier "corpora" n'existe pas :
-CwbEncode_27 = Traitement du corpus...
-CwbEncode_29 = Le dossier "data" n'existe pas :
-CwbEncode_32 = Patche du fichier registry {0} avec {1}.
-
-CwbProcess_1 = Démarrage du processus avec la ligne de commande : 
-CwbProcess_3 = Arrêt en cours du processus : 
-CwbProcess_4 = Processus arrêté : 
-CwbProcess_5 = ** Echec de localisation de CQP : 
-
-MemCqiClient_0  = Erreur interne CQI : 
-MemCqiClient_1  = Erreur CQ :
-MemCqiClient_10 = Codes CQP inconnus : b1 
-MemCqiClient_11 = Erreur de requête
-MemCqiClient_2  = Erreur CQP : 
-MemCqiClient_3  = Erreur CQP inconnue : b1 
-MemCqiClient_5  = Erreur CQP CQI inconnue : b1 
-MemCqiClient_7  = Code CQP inconnu : b1 
-MemCqiClient_9  = b2 
-
-NetCqiClient_1  = Dernière erreur CQi : 
-NetCqiClient_3  = Dernière erreur CQP : 
-NetCqiClient_5  = Echec de la reconnexion au serveur : 
-NetCqiClient_97 = client.dumpSubCorpus(subcorpus, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 2) : 
-
-NetCqiServer_0 = ** cqpserver stdout: 
-NetCqiServer_1 = ** cqpserver stderr: 
-
-PatchCwbRegistry_13 = Le fichier registry source n'existe pas
-PatchCwbRegistry_16 = Le fichier 'registry' est introuvable
-PatchCwbRegistry_2  = Mise à jour du corpus 
-PatchCwbRegistry_23 = pour l'encodage 
-PatchCwbRegistry_27 = dossier 'data'
-PatchCwbRegistry_28 = Erreur lors de la reécriture du fichier 'registry'.
-PatchCwbRegistry_29 = n'a pu être trouvé dans 
-PatchCwbRegistry_3  = ** Le corpus cible n'existe pas
-PatchCwbRegistry_34 = Mise à jour de la langue du corpus {0} vers {1}...
-PatchCwbRegistry_4  = Ajout au registre du corpus {0} de l'attribut d'alignement : {1}...
-
-READING_2D_INT_ARRAY_FROM_CQI_SERVER = Lecture d''un tableau d'entiers du serveur CQi...
-READING_BOOLEAN_FROM_CQI_SERVER      = Lecture d''un booléen du serveur CQi...
-READING_HEADER_FROM_CQI_SERVER       = Lecture d''une entête du serveur CQi...
-READING_INTEGER_FROM_CQI_SERVER      = Lecture d''un entier du serveur CQi...
-READING_INT_ARRAY_FROM_CQI_SERVER    = Lecture d''un tableau d'entiers du serveur CQi...
-READING_STRING_ARRAY_FROM_CQI_SERVER = Lecture d''un tableau de chaines du serveur CQi...
-READING_STRING_FROM_CQI_SERVER       = Lecture d''une chaine du serveur CQi...
-
-READ_2D_INT_ARRAY_FROM_CQI_SERVER    = Tableau d''entiers reçu du serveur CQi : {0}.
-READ_BOOLEAN_FROM_CQI_SERVER         = Booléen reçu du serveur CQi : {0}.
-READ_BYTE_FROM_CQI_SERVER            = Octet reçu du serveur CQi : {0}.
-READ_INTEGER_FROM_CQI_SERVER         = Entier reçu du serveur CQi : {0}.
-READ_INT_ARRAY_FROM_CQI_SERVER       = Tableau d''entiers reçu du serveur CQi : {0}.
-READ_STRING_ARRAY_FROM_CQI_SERVER    = Tableau de chaines reçu du serveur CQi : {0}.
-READ_STRING_FROM_CQI_SERVER          = Chaîne reçue du serveur CQi : {0}.
-
-Subcorpus_3 = {0} n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
-
-Summary_13 = Erreur : text {0} a pour valeur 'null'.
-Summary_15 = Erreur : edition a pour valeur 'null'
-Summary_16 = Erreur : textids {0} et wordids {1}.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+addingAlignmentAttributeToCorpusP0RegistryDDotP1=Ajout au registre du corpus {0} de l'attribut d'alignement \: {1}...
+b2=b2 
+cantFindCQPLocationDDot=** Echec de localisation de CQP \: 
+cantFindRegistryFile=Le fichier 'registry' est introuvable
+cLErrorDDot=Erreur CQ \:
+clientdumpSubCorpussubcorpusNetCqiClientCQICONSTFIELDMATCH12DDot=client.dumpSubCorpus(subcorpus, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 2) \: 
+connectedToTheSearchEngine=Connexion au moteur de recherche établie.
+connectingToTheSearchEngineWithTheFollowingParametersDDotP0DDotP1AtP2P3=Connexion au moteur de recherche avec les paramètres suivants \: {0}\:{1}@{2}{3}...
+couldNotBeFoundInRegistryFile=n'a pu être trouvé dans 
+couldNotPatchTheRegistryFile=Erreur lors de la reécriture du fichier 'registry'.
+couldNotReconnectToServerDDot=Echec de la reconnexion au serveur \: 
+cQPErrorDDot=Erreur CQP \: 
+cqpserverStderrDDot=** cqpserver stderr\: 
+cqpserverStdoutDDot=** cqpserver stdout\: 
+dataDirectory=dossier 'data'
+encodingTo=pour l'encodage 
+errorDDotEditionDefaultIsNull=Erreur \: edition a pour valeur 'null'
+errorDDotTextidsP0AndWordidsP1=Erreur \: textids {0} et wordids {1}.
+errorDDotTextP0IsNull=Erreur \: text {0} a pour valeur 'null'.
+failedToConnectToSearchEngine=** La connexion au moteur de recherche a échoué.
+fixingRegistryFileP0WithP1=Patche du fichier registry {0} avec {1}.
+gettingLastCQPError=Récupération de la dernière erreur CQP.
+internalCQIErrorDDot=Erreur interne CQI \: 
+lastCQiErrorDDot=Dernière erreur CQi \: 
+lastCQPErrorDDot=Dernière erreur CQP \: 
+noError=Pas d'erreur à notifier.
+p0IsNotAValidCQPIDForASubcorpusItMustBeAnUppercaseCharacterFollowedByLowercaseCharacters={0} n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
+processingCorpus=Traitement du corpus...
+processStopedDDot=Processus arrêté \: 
+queryError=Erreur de requête
+readBooleanFromTheCQiServerDDotP0=Booléen reçu du serveur CQi \: {0}.
+readByteFromTheCQiServerDDotP0=Octet reçu du serveur CQi \: {0}.
+readingAnIntegerTableFromTheCQiServer=Lecture d''un tableau d'entiers du serveur CQi...
+readingBooleanFromTheCQiServer=Lecture d''un booléen du serveur CQi...
+readingHeaderFromTheCQiServer=Lecture d''une entête du serveur CQi...
+readingIntegerArrayFromTheCQiServer=Lecture d''un tableau d'entiers du serveur CQi...
+readingIntegerFromTheCQiServer=Lecture d''un entier du serveur CQi...
+readingStringArrayFromTheCQiServer=Lecture d''un tableau de chaines du serveur CQi...
+readingStringFromTheCQiServer=Lecture d''une chaine du serveur CQi...
+readIntegerArrayFromTheCQiServerDDotP0=Tableau d''entiers reçu du serveur CQi \: {0}.
+readIntegerFromTheCQiServerDDotP0=Entier reçu du serveur CQi \: {0}.
+readString2DIntegerFromTheCQiServerDDotP0=Tableau d''entiers reçu du serveur CQi \: {0}.
+readStringArrayFromTheCQiServerDDotP0=Tableau de chaines reçu du serveur CQi \: {0}.
+readStringFromTheCQiServerDDotP0=Chaîne reçue du serveur CQi \: {0}.
+searchEngineLaunched=Moteur de recherche lancé...
+sourceRegistryDoesNotExistsDDot=Le fichier registry source n'existe pas
+startingProcessWithCommandDDot=Démarrage du processus avec la ligne de commande \: 
+stoppingProcessDDot=Arrêt en cours du processus \: 
+theBinaryDirectoryDoesNotExistsDDot=Le dossier "bin" n'existe pas \: 
+theCorporaDirectoryDoesNotExistsDDot=Le dossier "corpora" n'existe pas \:
+theDataDirectoryDoesNotExistsDDot=Le dossier "data" n'existe pas \:
+theDirectoryDoesNotExistsDDot=Le dossier n'existe pas \:
+theFileP0CannotBeFound=Le fichier ''{0}'' est introuvable.
+theRegistryDirectoryDoesNotExistsDDot=Le dossier "registry" n'existe pas \: 
+theTargetCorpusDoesntExist=** Le corpus cible n'existe pas
+unknownCQPCodeDDotB1=Code CQP inconnu \: b1 
+unknownCQPCodesDDotB1=Codes CQP inconnus \: b1 
+unknownCQPCQIErrorDDotB1=Erreur CQP CQI inconnue \: b1 
+unknownCQPErrorDDotB1=Erreur CQP inconnue \: b1 
+updating=Mise à jour du corpus 
+updatingP0CorpusLanguageToP1=Mise à jour de la langue du corpus {0} vers {1}...
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java	(revision 1335)
@@ -1,95 +1,95 @@
-package org.txm.searchengine.cqp.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * CQP Search engine core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class CQPSearchEngineCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.searchengine.cqp.core.messages.messages"; //$NON-NLS-1$
-
-	public static String Summary_13;
-	public static String Summary_15;
-	public static String Summary_16;
-	public static String Subcorpus_3;
-
-	public static String CONNECTING_CQI_CLIENT;
-	public static String CQI_CLIENT_CONNECTED;
-	public static String CqiClient_0;
-	public static String CqiClient_32;
-	public static String CqiClient_33;
-	public static String CwbEncode_0;
-	public static String CwbEncode_21;
-	public static String CwbEncode_23;
-	public static String CwbEncode_25;
-	public static String CwbEncode_27;
-	public static String CwbEncode_29;
-	public static String CwbEncode_32;
-	public static String CwbProcess_1;
-	public static String CwbProcess_3;
-	public static String CwbProcess_4;
-	public static String CwbProcess_5;
-
-	public static String MemCqiClient_0;
-	public static String MemCqiClient_10;
-	public static String MemCqiClient_11;
-	public static String MemCqiClient_1;
-	public static String MemCqiClient_2;
-	public static String MemCqiClient_3;
-	public static String MemCqiClient_5;
-	public static String MemCqiClient_7;
-	public static String MemCqiClient_9;
-	public static String NetCqiClient_1;
-	public static String NetCqiClient_3;
-	public static String NetCqiClient_5;
-	public static String NetCqiClient_97;
-	public static String NetCqiServer_0;
-	public static String NetCqiServer_1;
-	public static String AbstractCqiClient_2;	
-	public static String BuildCwbEncodeArgs_0;
-	
-	public static String PatchCwbRegistry_13;
-	public static String PatchCwbRegistry_16;
-	public static String PatchCwbRegistry_23;
-	public static String PatchCwbRegistry_27;
-	public static String PatchCwbRegistry_28;
-	public static String PatchCwbRegistry_29;
-	public static String PatchCwbRegistry_2;
-	public static String PatchCwbRegistry_34;
-
-	public static String PatchCwbRegistry_3;
-	public static String PatchCwbRegistry_4;
-	
-	public static String READ_2D_INT_ARRAY_FROM_CQI_SERVER;
-	public static String READ_BOOLEAN_FROM_CQI_SERVER;
-	public static String READ_BYTE_FROM_CQI_SERVER;
-	public static String READ_INT_ARRAY_FROM_CQI_SERVER;
-	public static String READ_INTEGER_FROM_CQI_SERVER;
-	public static String READ_STRING_ARRAY_FROM_CQI_SERVER;
-	public static String READ_STRING_FROM_CQI_SERVER;
-	public static String READING_2D_INT_ARRAY_FROM_CQI_SERVER;
-	public static String READING_BOOLEAN_FROM_CQI_SERVER;
-	public static String READING_HEADER_FROM_CQI_SERVER;
-	public static String READING_INT_ARRAY_FROM_CQI_SERVER;
-	public static String READING_INTEGER_FROM_CQI_SERVER;
-	public static String READING_STRING_ARRAY_FROM_CQI_SERVER;
-	public static String READING_STRING_FROM_CQI_SERVER;
-
-	
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CQPSearchEngineCoreMessages.class);
-	}
-
-	private CQPSearchEngineCoreMessages() {
-	}
-	
-}
+package org.txm.searchengine.cqp.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * CQP Search engine core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class CQPSearchEngineCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.searchengine.cqp.core.messages.messages"; //$NON-NLS-1$
+
+	public static String errorDDotTextP0IsNull; 
+	public static String errorDDotEditionDefaultIsNull; 
+	public static String errorDDotTextidsP0AndWordidsP1; 
+	public static String p0IsNotAValidCQPIDForASubcorpusItMustBeAnUppercaseCharacterFollowedByLowercaseCharacters; 
+
+	public static String connectingToTheSearchEngineWithTheFollowingParametersDDotP0DDotP1AtP2P3; 
+	public static String connectedToTheSearchEngine; 
+	public static String gettingLastCQPError; 
+	public static String searchEngineLaunched; 
+	public static String failedToConnectToSearchEngine; 
+	public static String theDirectoryDoesNotExistsDDot; 
+	public static String theBinaryDirectoryDoesNotExistsDDot; 
+	public static String theRegistryDirectoryDoesNotExistsDDot; 
+	public static String theCorporaDirectoryDoesNotExistsDDot; 
+	public static String processingCorpus; 
+	public static String theDataDirectoryDoesNotExistsDDot; 
+	public static String fixingRegistryFileP0WithP1; 
+	public static String startingProcessWithCommandDDot; 
+	public static String stoppingProcessDDot; 
+	public static String processStopedDDot; 
+	public static String cantFindCQPLocationDDot; 
+
+	public static String internalCQIErrorDDot; 
+	public static String unknownCQPCodesDDotB1; 
+	public static String queryError; 
+	public static String cLErrorDDot; 
+	public static String cQPErrorDDot; 
+	public static String unknownCQPErrorDDotB1; 
+	public static String unknownCQPCQIErrorDDotB1; 
+	public static String unknownCQPCodeDDotB1; 
+	public static String b2; 
+	public static String lastCQiErrorDDot; 
+	public static String lastCQPErrorDDot; 
+	public static String couldNotReconnectToServerDDot; 
+	public static String clientdumpSubCorpussubcorpusNetCqiClientCQICONSTFIELDMATCH12DDot; 
+	public static String cqpserverStdoutDDot; 
+	public static String cqpserverStderrDDot; 
+	public static String noError; 
+	public static String theFileP0CannotBeFound; 
+	
+	public static String sourceRegistryDoesNotExistsDDot; 
+	public static String cantFindRegistryFile; 
+	public static String encodingTo; 
+	public static String dataDirectory; 
+	public static String couldNotPatchTheRegistryFile; 
+	public static String couldNotBeFoundInRegistryFile; 
+	public static String updating; 
+	public static String updatingP0CorpusLanguageToP1; 
+
+	public static String theTargetCorpusDoesntExist; 
+	public static String addingAlignmentAttributeToCorpusP0RegistryDDotP1; 
+	
+	public static String readString2DIntegerFromTheCQiServerDDotP0; 
+	public static String readBooleanFromTheCQiServerDDotP0; 
+	public static String readByteFromTheCQiServerDDotP0; 
+	public static String readIntegerArrayFromTheCQiServerDDotP0; 
+	public static String readIntegerFromTheCQiServerDDotP0; 
+	public static String readStringArrayFromTheCQiServerDDotP0; 
+	public static String readStringFromTheCQiServerDDotP0; 
+	public static String readingAnIntegerTableFromTheCQiServer; 
+	public static String readingBooleanFromTheCQiServer; 
+	public static String readingHeaderFromTheCQiServer; 
+	public static String readingIntegerArrayFromTheCQiServer; 
+	public static String readingIntegerFromTheCQiServer; 
+	public static String readingStringArrayFromTheCQiServer; 
+	public static String readingStringFromTheCQiServer; 
+
+	
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, CQPSearchEngineCoreMessages.class);
+	}
+
+	private CQPSearchEngineCoreMessages() {
+	}
+	
+}
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages.properties	(revision 1335)
@@ -1,76 +1,63 @@
-
-AbstractCqiClient_2 = No error.
-
-BuildCwbEncodeArgs_0 = The file ''{0}'' cannot be found.
-
-CONNECTING_CQI_CLIENT = Connecting to the Search Engine with the following parameters: {0}:{1}@{2}{3}...
-
-CQI_CLIENT_CONNECTED = Connected to the Search Engine.
-
-CqiClient_0  = Getting Last CQP error.
-CqiClient_32 = Search Engine launched...
-CqiClient_33 = ** failed to connect to Search Engine.
-
-CwbEncode_0  = The directory does not exists: 
-CwbEncode_21 = The "binary" directory does not exists: 
-CwbEncode_23 = The "registry" directory does not exists:  
-CwbEncode_25 = The "corpora" directory does not exists: 
-CwbEncode_27 = Processing corpus...
-CwbEncode_29 = The "data" directory does not exists: 
-CwbEncode_32 = Fixing registry file {0} with {1}.
-
-CwbProcess_1 = Starting process with command: 
-CwbProcess_3 = Stopping process: 
-CwbProcess_4 = Process stoped: 
-CwbProcess_5 = ** Can't find CQP location : 
-
-MemCqiClient_0  = Internal CQI error: 
-MemCqiClient_1  = CL error: 
-MemCqiClient_10 = Unknown CQP codes: b1 
-MemCqiClient_11 = Query error
-MemCqiClient_2  = CQP error: 
-MemCqiClient_3  = Unknown CQP error: b1 
-MemCqiClient_5  = Unknown CQP CQI error: b1 
-MemCqiClient_7  = Unknown CQP code: b1 
-MemCqiClient_9  = b2 
-
-NetCqiClient_1  = Last CQi error: 
-NetCqiClient_3  = Last CQP error: 
-NetCqiClient_5  = Could not reconnect to server: 
-NetCqiClient_97 = client.dumpSubCorpus(subcorpus, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 2) : 
-
-NetCqiServer_0 = ** cqpserver stdout: 
-NetCqiServer_1 = ** cqpserver stderr: 
-
-PatchCwbRegistry_13 = Source registry does not exists: 
-PatchCwbRegistry_16 = Can't find registry file
-PatchCwbRegistry_2  = Updating 
-PatchCwbRegistry_23 = encoding to 
-PatchCwbRegistry_27 = data directory 
-PatchCwbRegistry_28 = Could not patch the 'registry' file.
-PatchCwbRegistry_29 = could not be found in registry file 
-PatchCwbRegistry_3  = ** The target corpus doesn't exist
-PatchCwbRegistry_34 = Updating {0} corpus language to {1}...
-PatchCwbRegistry_4  = Adding Alignment attribute to corpus {0} registry: {1}...
-
-READING_2D_INT_ARRAY_FROM_CQI_SERVER = Reading an integer table from the CQi server...
-READING_BOOLEAN_FROM_CQI_SERVER      = Reading boolean from the CQi server...
-READING_HEADER_FROM_CQI_SERVER       = Reading header from the CQi server...
-READING_INTEGER_FROM_CQI_SERVER      = Reading integer from the CQi server...
-READING_INT_ARRAY_FROM_CQI_SERVER    = Reading integer array from the CQi server...
-READING_STRING_ARRAY_FROM_CQI_SERVER = Reading string array from the CQi server...
-READING_STRING_FROM_CQI_SERVER       = Reading string from the CQi server...
-
-READ_2D_INT_ARRAY_FROM_CQI_SERVER    = Read string 2D integer from the CQi server: {0}.
-READ_BOOLEAN_FROM_CQI_SERVER         = Read boolean from the CQi server: {0}.
-READ_BYTE_FROM_CQI_SERVER            = Read byte from the CQi server: {0}.
-READ_INTEGER_FROM_CQI_SERVER         = Read integer from the CQi server: {0}.
-READ_INT_ARRAY_FROM_CQI_SERVER       = Read integer array from the CQi server: {0}.
-READ_STRING_ARRAY_FROM_CQI_SERVER    = Read string array from the CQi server: {0}.
-READ_STRING_FROM_CQI_SERVER          = Read string from the CQi server: {0}.
-
-Subcorpus_3 = {0} is not a valid CQP ID for a subcorpus. It must be an uppercase character followed by lowercase characters.
-
-Summary_13 = Error: text {0} is null.
-Summary_15 = Error : edition default is null
-Summary_16 = Error: textids {0} and wordids {1}.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+addingAlignmentAttributeToCorpusP0RegistryDDotP1=Adding Alignment attribute to corpus {0} registry\: {1}...
+b2=b2 
+cantFindCQPLocationDDot=** Can't find CQP location \: 
+cantFindRegistryFile=Can't find registry file
+cLErrorDDot=CL error\: 
+clientdumpSubCorpussubcorpusNetCqiClientCQICONSTFIELDMATCH12DDot=client.dumpSubCorpus(subcorpus, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 2) \: 
+connectedToTheSearchEngine=Connected to the Search Engine.
+connectingToTheSearchEngineWithTheFollowingParametersDDotP0DDotP1AtP2P3=Connecting to the Search Engine with the following parameters\: {0}\:{1}@{2}{3}...
+couldNotBeFoundInRegistryFile=could not be found in registry file 
+couldNotPatchTheRegistryFile=Could not patch the 'registry' file.
+couldNotReconnectToServerDDot=Could not reconnect to server\: 
+cQPErrorDDot=CQP error\: 
+cqpserverStderrDDot=** cqpserver stderr\: 
+cqpserverStdoutDDot=** cqpserver stdout\: 
+dataDirectory=data directory 
+encodingTo=encoding to 
+errorDDotEditionDefaultIsNull=Error \: edition default is null
+errorDDotTextidsP0AndWordidsP1=Error\: textids {0} and wordids {1}.
+errorDDotTextP0IsNull=Error\: text {0} is null.
+failedToConnectToSearchEngine=** failed to connect to Search Engine.
+fixingRegistryFileP0WithP1=Fixing registry file {0} with {1}.
+gettingLastCQPError=Getting Last CQP error.
+internalCQIErrorDDot=Internal CQI error\: 
+lastCQiErrorDDot=Last CQi error\: 
+lastCQPErrorDDot=Last CQP error\: 
+noError=No error.
+p0IsNotAValidCQPIDForASubcorpusItMustBeAnUppercaseCharacterFollowedByLowercaseCharacters={0} is not a valid CQP ID for a subcorpus. It must be an uppercase character followed by lowercase characters.
+processingCorpus=Processing corpus...
+processStopedDDot=Process stoped\: 
+queryError=Query error
+readBooleanFromTheCQiServerDDotP0=Read boolean from the CQi server\: {0}.
+readByteFromTheCQiServerDDotP0=Read byte from the CQi server\: {0}.
+readingAnIntegerTableFromTheCQiServer=Reading an integer table from the CQi server...
+readingBooleanFromTheCQiServer=Reading boolean from the CQi server...
+readingHeaderFromTheCQiServer=Reading header from the CQi server...
+readingIntegerArrayFromTheCQiServer=Reading integer array from the CQi server...
+readingIntegerFromTheCQiServer=Reading integer from the CQi server...
+readingStringArrayFromTheCQiServer=Reading string array from the CQi server...
+readingStringFromTheCQiServer=Reading string from the CQi server...
+readIntegerArrayFromTheCQiServerDDotP0=Read integer array from the CQi server\: {0}.
+readIntegerFromTheCQiServerDDotP0=Read integer from the CQi server\: {0}.
+readString2DIntegerFromTheCQiServerDDotP0=Read string 2D integer from the CQi server\: {0}.
+readStringArrayFromTheCQiServerDDotP0=Read string array from the CQi server\: {0}.
+readStringFromTheCQiServerDDotP0=Read string from the CQi server\: {0}.
+searchEngineLaunched=Search Engine launched...
+sourceRegistryDoesNotExistsDDot=Source registry does not exists\: 
+startingProcessWithCommandDDot=Starting process with command\: 
+stoppingProcessDDot=Stopping process\: 
+theBinaryDirectoryDoesNotExistsDDot=The "binary" directory does not exists\: 
+theCorporaDirectoryDoesNotExistsDDot=The "corpora" directory does not exists\: 
+theDataDirectoryDoesNotExistsDDot=The "data" directory does not exists\: 
+theDirectoryDoesNotExistsDDot=The directory does not exists\: 
+theFileP0CannotBeFound=The file ''{0}'' cannot be found.
+theRegistryDirectoryDoesNotExistsDDot=The "registry" directory does not exists\:  
+theTargetCorpusDoesntExist=** The target corpus doesn't exist
+unknownCQPCodeDDotB1=Unknown CQP code\: b1 
+unknownCQPCodesDDotB1=Unknown CQP codes\: b1 
+unknownCQPCQIErrorDDotB1=Unknown CQP CQI error\: b1 
+unknownCQPErrorDDotB1=Unknown CQP error\: b1 
+updating=Updating 
+updatingP0CorpusLanguageToP1=Updating {0} corpus language to {1}...
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/summary/Summary.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/summary/Summary.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/summary/Summary.java	(revision 1335)
@@ -174,7 +174,7 @@
 		if (wordids.length == 1 && textids.length == 1) {
 			Text text = corpus.getProject().getText(textids[0]);
 			if (text == null) {
-				Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.Summary_13, textids[0]));
+				Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.errorDDotTextP0IsNull, textids[0]));
 				return null;
 			}
 
@@ -190,14 +190,14 @@
 				}
 			}
 			if (edition == null) {
-				System.out.println(CQPSearchEngineCoreMessages.Summary_15);
+				System.out.println(CQPSearchEngineCoreMessages.errorDDotEditionDefaultIsNull);
 				return null;
 			}
 
 			node.wordid = wordids[0];
 			return edition.getPageForWordId(wordids[0]);
 		} else {
-			Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.Summary_16, Arrays.toString(textids), Arrays.toString(wordids)));
+			Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.errorDDotTextidsP0AndWordidsP1, Arrays.toString(textids), Arrays.toString(wordids)));
 			return null;
 		}
 	}
@@ -305,4 +305,4 @@
 	public String getResultype() {
 		return "Summary";
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java	(revision 1335)
@@ -116,7 +116,7 @@
 	private boolean init() {
 		try {
 			if (corpus.getProject() == null) {
-				System.out.println(TXMCoreMessages.Selection_6+corpus+TXMCoreMessages.Selection_7);
+				System.out.println(TXMCoreMessages.selectionErrorDDotTheCorpus+corpus+TXMCoreMessages.hasNoBase);
 				return false;
 			}
 			metadatas = corpus.getImportMetadata();
@@ -139,12 +139,12 @@
 					try {
 						StructuralUnitProperty sup = text_su.getProperty(m.id);
 						if (sup == null) {
-							Log.warning(TXMCoreMessages.Selection_8+m.id);
+							Log.warning(TXMCoreMessages.cantFindStructuralUnitForMetadataWithIdDDot+m.id);
 							continue;
 						}
 						allProperties.add(sup);
 					} catch(Exception e) {
-						Log.severe(TXMCoreMessages.Selection_9+e);
+						Log.severe(TXMCoreMessages.errorWhileGettingMetadatasFromBaseimportMetadatasDDot+e);
 					}
 				}
 			}
@@ -221,8 +221,8 @@
 	 * @throws CqiClientException the cqi client exception
 	 */
 	public void fullDump() throws CqiClientException {
-		System.out.println(TXMCoreMessages.Selection_5);
-		System.out.println(TXMCoreMessages.Corpus_2+corpus);
+		System.out.println(TXMCoreMessages.textMetadataDDot);
+		System.out.println(TXMCoreMessages.corpusDDot+corpus);
 		System.out.println("Text query: "+query); //$NON-NLS-1$
 		System.out.println("Texts ids: "+textids); //$NON-NLS-1$
 		System.out.println("Text positions: "+Arrays.toString(positions)); //$NON-NLS-1$
@@ -446,7 +446,7 @@
 				try {
 					valuesPerMetadata.put(sup.getName(), sup.getValues());
 				} catch (CqiClientException e) {
-					System.out.println(TXMCoreMessages.Selection_26+sup.getFullName());
+					System.out.println(TXMCoreMessages.failedToGetSupValuesOf+sup.getFullName());
 					org.txm.utils.logger.Log.printStackTrace(e);
 					return valuesPerMetadata;
 				}
@@ -530,4 +530,4 @@
 	public String getResultype() {
 		return "Selection";
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiClient.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiClient.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiClient.java	(revision 1335)
@@ -61,12 +61,12 @@
 		byte b2 = ret[3];
 		//System.out.println("bytes: "+ret[0]+" "+ret[1]+" "+ret[2]+" "+ret[3]);
 		//System.out.println("b1 "+b+ " b2 "+b2);
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 		switch (b) {
 		case 0x00:// cf cqi.h:29
 			return CQI_PADDING;
 		case 0x01:// cf cqi.h:37
-			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				return CQI_STATUS_OK;
@@ -77,12 +77,12 @@
 			case 0x04:// cf cqi.h:42
 				return CQI_STATUS_PING_OK;
 			default:
-				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2); //$NON-NLS-2$
 			}
 		case 0x02:// cf cqi.h:45
-			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 
-			lastError = CQPSearchEngineCoreMessages.MemCqiClient_0+" CQI_ERROR ("+b+")";
+			lastError = CQPSearchEngineCoreMessages.internalCQIErrorDDot+" CQI_ERROR ("+b+")";
 
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
@@ -94,10 +94,10 @@
 			case 0x04:// cf cqi.h:42
 				throw new CqiErrorSyntaxError();
 			default:
-				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_5+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPCQIErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
 			}
 		case 0x03:// cf cqi.h:53
-			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				return CQI_DATA_BYTE;
@@ -122,12 +122,12 @@
 			case 0x0B:// cf cqi.h:42
 				return CQI_DATA_INT_TABLE;
 			default:
-				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_7+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPCodeDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
 			}
 		case 0x04:// cf cqi.h:67
 
-			lastError = CQPSearchEngineCoreMessages.MemCqiClient_1+"CL_ERROR ("+b+")";
-			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = CQPSearchEngineCoreMessages.cLErrorDDot+"CL_ERROR ("+b+")";
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				lastError += ": NoSuchAttribute error";
@@ -152,13 +152,13 @@
 				throw new CqiClErrorInternal();
 			default:
 				lastError += ": Unknown error";
-				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
 			}
 
 		case 0x05:// cf cqi.h:94
 
-			lastError = CQPSearchEngineCoreMessages.MemCqiClient_2+"CQI_CQP_ERROR ("+b+")";
-			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = CQPSearchEngineCoreMessages.cQPErrorDDot+"CQI_CQP_ERROR ("+b+")";
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				lastError += ": General error";
@@ -176,10 +176,10 @@
 				lastError = getLastCQPError();
 				throw new CqiCqpErrorSyntax();
 			default:
-				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
 			}
 		default:
-			throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_10+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
+			throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPCodesDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
 		}
 		//return null;
 	}
@@ -350,7 +350,7 @@
 			throws IOException, UnexpectedAnswerException, CqiServerError {
 		Boolean ret = server.query(arg0);
 		if(ret == null || !ret) {
-			System.out.println(CQPSearchEngineCoreMessages.MemCqiClient_11);
+			System.out.println(CQPSearchEngineCoreMessages.queryError);
 			throwExceptionFromCqi(server.getErrorCode());
 		}
 	}
@@ -584,4 +584,4 @@
 		}
 		return rez;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiServer.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiServer.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiServer.java	(revision 1335)
@@ -282,7 +282,7 @@
 					try {
 						while ((line = br.readLine()) != null) {
 							if (debug)
-								System.out.println(CQPSearchEngineCoreMessages.NetCqiServer_0 + line);
+								System.out.println(CQPSearchEngineCoreMessages.cqpserverStdoutDDot + line);
 						}
 					} catch (IOException e) {
 						// TODO Auto-generated catch block
@@ -301,7 +301,7 @@
 					try {
 						while ((line = br.readLine()) != null) {
 							if (debug)
-								System.out.println(CQPSearchEngineCoreMessages.NetCqiServer_1 + line);
+								System.out.println(CQPSearchEngineCoreMessages.cqpserverStderrDDot + line);
 						}
 					} catch (IOException e) {
 						// TODO Auto-generated catch block
@@ -361,4 +361,4 @@
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiClient.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiClient.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiClient.java	(revision 1335)
@@ -172,7 +172,7 @@
 	 */
 	private synchronized String readString() throws UnexpectedAnswerException, CqiServerError, IOException {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_STRING_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingStringFromTheCQiServer);
 		
 		if (readHeaderFromServer() != CQI_DATA_STRING) {
 			throw new UnexpectedAnswerException();
@@ -182,7 +182,7 @@
 		this.streamFromServer.readFully(bytes);
 		String res = new String(bytes, "UTF-8"); //$NON-NLS-1$
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_STRING_FROM_CQI_SERVER, res));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readStringFromTheCQiServerDDotP0, res));
 		
 		return res;
 	}
@@ -202,7 +202,7 @@
 	private synchronized boolean readBoolean() throws UnexpectedAnswerException, CqiServerError, IOException {
 		byte b = 0;
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_BOOLEAN_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingBooleanFromTheCQiServer);
 		
 		if (readHeaderFromServer() != CQI_DATA_BOOL) {
 			throw new UnexpectedAnswerException();
@@ -210,7 +210,7 @@
 		b = this.streamFromServer.readByte();
 		boolean res = (b == 1);
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BOOLEAN_FROM_CQI_SERVER, res));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readBooleanFromTheCQiServerDDotP0, res));
 		
 		return res;
 	}
@@ -229,14 +229,14 @@
 	 */
 	private synchronized int readInt() throws UnexpectedAnswerException, CqiServerError, IOException {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_INTEGER_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingIntegerFromTheCQiServer);
 		
 		if (readHeaderFromServer() != CQI_DATA_INT) {
 			throw new UnexpectedAnswerException();
 		}
 		int res = this.streamFromServer.readInt();
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INTEGER_FROM_CQI_SERVER, res));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readIntegerFromTheCQiServerDDotP0, res));
 		
 		return res;
 	}
@@ -255,7 +255,7 @@
 	 */
 	private synchronized String[] readStringArray() throws UnexpectedAnswerException, CqiServerError, IOException {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_STRING_ARRAY_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingStringArrayFromTheCQiServer);
 		
 		byte[] header = readHeaderFromServer();
 		if (header != CQI_DATA_STRING_LIST) {
@@ -299,7 +299,7 @@
 		// System.out.println(nByteRead + " bytes read in " +(end-start)+ "ms ("
 		// + (nByteRead/(1+end-start)) + "kb/s)");
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_STRING_ARRAY_FROM_CQI_SERVER, Arrays.asList(strings)));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readStringArrayFromTheCQiServerDDotP0, Arrays.asList(strings)));
 		
 		return strings;
 	}
@@ -354,7 +354,7 @@
 	private synchronized int[] readIntList() throws UnexpectedAnswerException,
 	CqiServerError, IOException {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingIntegerArrayFromTheCQiServer);
 		
 		if ((readHeaderFromServer()) != CQI_DATA_INT_LIST) {
 			throw new UnexpectedAnswerException();
@@ -378,7 +378,7 @@
 		 * this.streamFromServer.readInt(); }
 		 */
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(ints)));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readIntegerArrayFromTheCQiServerDDotP0, Arrays.asList(ints)));
 		
 		return ints;
 	}
@@ -438,7 +438,7 @@
 	 */
 	private synchronized int[][] readIntTable() throws UnexpectedAnswerException, CqiServerError, IOException {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_2D_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingAnIntegerTableFromTheCQiServer);
 		
 		if ((readHeaderFromServer()) != CQI_DATA_INT_TABLE) {
 			throw new UnexpectedAnswerException();
@@ -450,7 +450,7 @@
 			for (int j = 0; j < nCol; j++)
 				ints[i][j] = this.streamFromServer.readInt();
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_2D_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(ints)));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readString2DIntegerFromTheCQiServerDDotP0, Arrays.asList(ints)));
 		
 		return ints;
 	}
@@ -465,7 +465,7 @@
 	 */
 	private synchronized int[] readIntInt() throws IOException,	UnexpectedAnswerException, CqiServerError {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingIntegerArrayFromTheCQiServer);
 		
 		if (readHeaderFromServer() != CQI_DATA_INT_INT) {
 			throw new UnexpectedAnswerException();
@@ -474,7 +474,7 @@
 		res[0] = this.streamFromServer.readInt();
 		res[1] = this.streamFromServer.readInt();
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(res)));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readIntegerArrayFromTheCQiServerDDotP0, Arrays.asList(res)));
 		
 		return res;
 	}
@@ -489,7 +489,7 @@
 	 */
 	private synchronized int[] readIntIntIntInt() throws IOException, UnexpectedAnswerException, CqiServerError {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingIntegerArrayFromTheCQiServer);
 		
 		if (readHeaderFromServer() != CQI_DATA_INT_INT_INT_INT) {
 			throw new UnexpectedAnswerException();
@@ -500,7 +500,7 @@
 		res[2] = this.streamFromServer.readInt();
 		res[3] = this.streamFromServer.readInt();
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(res)));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.readIntegerArrayFromTheCQiServerDDotP0, Arrays.asList(res)));
 		return res;
 	}
 
@@ -518,11 +518,11 @@
 	 */
 	private synchronized byte[] readHeaderFromServer() throws UnexpectedAnswerException, CqiServerError, IOException {
 		
-		Log.finest(CQPSearchEngineCoreMessages.READING_HEADER_FROM_CQI_SERVER);
+		Log.finest(CQPSearchEngineCoreMessages.readingHeaderFromTheCQiServer);
 		
 		byte b = this.streamFromServer.readByte();
 		
-		Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+		Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 		
 		switch (b) {
 		case 0x00:// cf cqi.h:29
@@ -530,7 +530,7 @@
 		case 0x01:// cf cqi.h:37
 			b = this.streamFromServer.readByte();
 			
-			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
@@ -545,9 +545,9 @@
 		case 0x02:// cf cqi.h:45
 			b = this.streamFromServer.readByte();
 			
-			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			
-			lastError = CQPSearchEngineCoreMessages.MemCqiClient_0+b;
+			lastError = CQPSearchEngineCoreMessages.internalCQIErrorDDot+b;
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				throw new CqiErrorGeneralError();
@@ -561,7 +561,7 @@
 		case 0x03:// cf cqi.h:53
 			b = this.streamFromServer.readByte();
 			
-			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
@@ -590,9 +590,9 @@
 		case 0x04:// cf cqi.h:67
 
 			b = this.streamFromServer.readByte();
-			lastError = CQPSearchEngineCoreMessages.MemCqiClient_1+b;
+			lastError = CQPSearchEngineCoreMessages.cLErrorDDot+b;
 			
-			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
@@ -614,9 +614,9 @@
 		case 0x05:// cf cqi.h:94
 
 			b = this.streamFromServer.readByte();
-			lastError = CQPSearchEngineCoreMessages.MemCqiClient_2+b;
+			lastError = CQPSearchEngineCoreMessages.cQPErrorDDot+b;
 			
-			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, b));
 			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
@@ -739,7 +739,7 @@
 				this.socket.connect(serverAddress);
 				this.streamToServer = new DataOutputStream(this.socket.getOutputStream());
 				this.streamFromServer = new DataInputStream(this.socket.getInputStream());
-				Log.info(CQPSearchEngineCoreMessages.CqiClient_32);
+				Log.info(CQPSearchEngineCoreMessages.searchEngineLaunched);
 				return;
 			} catch (IOException e) {
 				System.err.print("."); //$NON-NLS-1$
@@ -751,7 +751,7 @@
 
 			attempts--;
 		}
-		throw new ServerNotFoundException(CQPSearchEngineCoreMessages.CqiClient_33);
+		throw new ServerNotFoundException(CQPSearchEngineCoreMessages.failedToConnectToSearchEngine);
 	}
 
 	// CQI_ERROR_CONNECT_REFUSED
@@ -770,14 +770,14 @@
 		this.username = username;
 		this.password = password;
 		
-		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.CONNECTING_CQI_CLIENT, username, password, host, port));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.connectingToTheSearchEngineWithTheFollowingParametersDDotP0DDotP1AtP2P3, username, password, host, port));
 		
 		this.streamToServer.write(CQI_CTRL_CONNECT);
 		this.writeString(username);
 		this.writeString(password);
 		try {
 			readHeaderFromServer();
-			Log.finest(CQPSearchEngineCoreMessages.CQI_CLIENT_CONNECTED);
+			Log.finest(CQPSearchEngineCoreMessages.connectedToTheSearchEngine);
 			return true;
 		} catch (CqiErrorConnectRefused e) {
 			return false;
@@ -811,7 +811,7 @@
 		if(lastError != null && lastError.length() > 0) {
 			return lastError;
 		}
-		return CQPSearchEngineCoreMessages.AbstractCqiClient_2;
+		return CQPSearchEngineCoreMessages.noError;
 	}
 
 	// CQI_CTRL_LAST_GENERAL_ERROR
@@ -826,7 +826,7 @@
 	@Override
 	public synchronized String getLastCqiError() throws UnexpectedAnswerException, IOException, CqiServerError {
 		
-		Log.severe(CQPSearchEngineCoreMessages.CqiClient_0);
+		Log.severe(CQPSearchEngineCoreMessages.gettingLastCQPError);
 		
 		this.streamToServer.write(CQI_CTRL_LAST_GENERAL_ERROR);
 
@@ -834,7 +834,7 @@
 			String ret = readString();
 			return getLastCQPError()+"\t"+ret; //$NON-NLS-1$
 		} catch (CqiServerError e) {
-			Log.severe(CQPSearchEngineCoreMessages.NetCqiClient_1 + e);
+			Log.severe(CQPSearchEngineCoreMessages.lastCQiErrorDDot + e);
 			return "error"; //$NON-NLS-1$
 		}
 	}
@@ -855,7 +855,7 @@
 			String ret = readString();
 			return ret;
 		} catch (Exception e) {
-			Log.severe(CQPSearchEngineCoreMessages.NetCqiClient_3 + e);
+			Log.severe(CQPSearchEngineCoreMessages.lastCQPErrorDDot + e);
 			return "error"; //$NON-NLS-1$
 		}
 	}
@@ -1572,7 +1572,7 @@
 		try {
 			return connect(username, password);
 		} catch (Exception e) {
-			System.out.println(CQPSearchEngineCoreMessages.NetCqiClient_5+e);
+			System.out.println(CQPSearchEngineCoreMessages.couldNotReconnectToServerDDot+e);
 			return false;
 		}
 	}
@@ -1739,7 +1739,7 @@
 		} catch(Exception e) { System.out.println("Exception : "+e);} //$NON-NLS-1$
 
 		try {
-			System.out.println(CQPSearchEngineCoreMessages.NetCqiClient_97+Arrays.toString(client.dumpSubCorpus(subcorpusid, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 10)));
+			System.out.println(CQPSearchEngineCoreMessages.clientdumpSubCorpussubcorpusNetCqiClientCQICONSTFIELDMATCH12DDot+Arrays.toString(client.dumpSubCorpus(subcorpusid, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 10)));
 		} catch(Exception e) { System.out.println("Exception : "+e);} //$NON-NLS-1$
 
 		try {
@@ -1927,4 +1927,4 @@
 		server.stop();
 		
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/QueryResult.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/QueryResult.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/QueryResult.java	(revision 1335)
@@ -115,7 +115,7 @@
 	@Override
 	public boolean checkCqpId(String cqpId) throws InvalidCqpIdException {
 		if (!AbstractCqiClient.checkSubcorpusId(cqpId))
-			throw new InvalidCqpIdException(cqpId + TXMCoreMessages.QueryResult_0);
+			throw new InvalidCqpIdException(cqpId + TXMCoreMessages.isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters);
 		return true;
 	}
 
@@ -388,4 +388,4 @@
 	public boolean isTargetUsed() throws UnexpectedAnswerException, IOException, CqiServerError {
 		return CQPSearchEngine.getCqiClient().subCorpusHasField(this.getQualifiedCqpId(), ICqiClient.CQI_CONST_FIELD_TARGET);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java	(revision 1335)
@@ -91,7 +91,7 @@
 	 */
 	public static CorpusManager getCorpusManager() {
 		if (cqiClient == null)
-			throw new RuntimeException(TXMCoreMessages.CorpusManager_0);
+			throw new RuntimeException(TXMCoreMessages.cQiClientNotInitialized);
 		if (corpusManager == null)
 			corpusManager = new CorpusManager();
 		return corpusManager;
@@ -189,7 +189,7 @@
 				MainCorpus c = this.getCorpus(corporaName[i]);
 				if (c != null) corpora.add(c);
 			} catch (InvalidCqpIdException e) {
-				throw new CqiClientException(TXMCoreMessages.CorpusManager_1, e);
+				throw new CqiClientException(TXMCoreMessages.errorDDotThisExceptionShouldNotBeThrown, e);
 			}
 		}
 		
@@ -232,4 +232,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java	(revision 1335)
@@ -88,9 +88,9 @@
 
 		} catch (Exception e) {
 			try {
-				throw new CqiClientException(TXMCoreMessages.Partition_9 + this.getParent().getName() + "_" + this.getName() + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
+				throw new CqiClientException(TXMCoreMessages.failedToCreatePartDDot + this.getParent().getName() + "_" + this.getName() + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
 			} catch (Exception e1) {
-				Log.severe(TXMCoreMessages.Partition_18 + e1);
+				Log.severe(TXMCoreMessages.failedToGetLastCQPErrorDDot + e1);
 				org.txm.utils.logger.Log.printStackTrace(e1);
 				return false;
 			}
@@ -117,9 +117,9 @@
 //
 //		} catch (Exception e) {
 //			try {
-//				throw new CqiClientException(TXMCoreMessages.Partition_9 + partitionName + "_" + partName + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
+//				throw new CqiClientException(TXMCoreMessages.failedToCreatePartDDot + partitionName + "_" + partName + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
 //			} catch (Exception e1) {
-//				Log.severe(TXMCoreMessages.Partition_18 + e1);
+//				Log.severe(TXMCoreMessages.failedToGetLastCQPErrorDDot + e1);
 //				org.txm.utils.logger.Log.printStackTrace(e1);
 //				return null;
 //			}
@@ -161,4 +161,4 @@
 	public String getResultype() {
 		return "Part";
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java	(revision 1335)
@@ -353,9 +353,9 @@
 //
 //		} catch (Exception e) {
 //			try {
-//				throw new CqiClientException(TXMCoreMessages.Partition_9 + partitionName + "_" + partName + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
+//				throw new CqiClientException(TXMCoreMessages.failedToCreatePartDDot + partitionName + "_" + partName + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
 //			} catch (Exception e1) {
-//				Log.severe(TXMCoreMessages.Partition_18 + e1);
+//				Log.severe(TXMCoreMessages.failedToGetLastCQPErrorDDot + e1);
 //				org.txm.utils.logger.Log.printStackTrace(e1);
 //				return null;
 //			}
@@ -506,7 +506,7 @@
 	 *             the cqi client exception
 	 */
 	public List<QueryResult> query(CQLQuery query, String name) throws CqiClientException {
-		Log.finest(TXMCoreMessages.QUERYING_PARTITION + this.userName);
+		Log.finest(TXMCoreMessages.queryingPartitionP0 + this.userName);
 		List<Part> parts = getParts();
 		List<QueryResult> results = new ArrayList<QueryResult>(parts.size());
 		for (Subcorpus part : parts) {
@@ -745,4 +745,4 @@
 		return (CQPCorpus) parent;
 	}
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/StructuralUnitProperty.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/StructuralUnitProperty.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/StructuralUnitProperty.java	(revision 1335)
@@ -101,7 +101,7 @@
 			AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
 			return cqiClient.getData(this, subcorpus);
 		} catch (Exception e) {
-			Log.severe(TXMCoreMessages.StructuralUnitProperty_0
+			Log.severe(TXMCoreMessages.failedToAccessStructuralPropertyValues
 					+ this.getFullName()+" : "+e); //$NON-NLS-1$
 		}
 		return new ArrayList<String>();
@@ -132,7 +132,7 @@
 			AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
 			return cqiClient.getData(this, number);
 		} catch (Exception e) {
-			Log.severe(TXMCoreMessages.StructuralUnitProperty_0
+			Log.severe(TXMCoreMessages.failedToAccessStructuralPropertyValues
 					+ this.getFullName()+" : "+e); //$NON-NLS-1$
 		}
 		return new ArrayList<String>();
@@ -264,4 +264,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java	(revision 1335)
@@ -265,7 +265,7 @@
 		}
 		long end = System.currentTimeMillis();
 		
-		Log.info(TXMCoreMessages.bind(SearchEngineCoreMessages.SUBCORPUS_CREATED, subcorpusName, (end - start)));
+		Log.info(TXMCoreMessages.bind(SearchEngineCoreMessages.subcorpusP0CreatedInP1Ms, subcorpusName, (end - start)));
 
 //		if (!registered) subcorpus.registerToParent();
 		return subcorpus;
@@ -312,7 +312,7 @@
 			StructuralUnitProperty structuralUnitProperty, List<String> values,
 			String subcorpusName) throws CqiClientException {
 		if (values.size() == 0) {
-			Log.warning(TXMCoreMessages.Corpus_5);
+			Log.warning(TXMCoreMessages.noValuesGiven);
 			return null;
 		}
 		String value = ""; //$NON-NLS-1$
@@ -424,7 +424,7 @@
 	 *             the cqi client exception
 	 */
 	public void dropQueryResult(QueryResult queryResult) throws CqiClientException {
-		Log.info(SearchEngineCoreMessages.DROP_QUERYRESULT + queryResult.getName());
+		Log.info(SearchEngineCoreMessages.deletingQueryResultP0 + queryResult.getName());
 		try {
 			CorpusManager.getCorpusManager().getCqiClient().dropSubCorpus(queryResult.getQualifiedCqpId());
 		} catch (Exception e) {
@@ -442,7 +442,7 @@
 	 *             the cqi client exception
 	 */
 	public boolean dropSubcorpus(CQPCorpus subcorpus) throws CqiClientException {
-		Log.finest(NLS.bind(SearchEngineCoreMessages.DROP_SUBCORPUS, subcorpus.getName()));
+		Log.finest(NLS.bind(SearchEngineCoreMessages.deletingSubcorpusP0, subcorpus.getName()));
 		subcorpus.dropAllSubcorpora();
 //		subcorpus.dropAllPartitions();
 		try {
@@ -505,8 +505,8 @@
 	 * @return the infos
 	 */
 	public String getInfos() {
-		return TXMCoreMessages.Corpus_2 + this.pID + TXMCoreMessages.Corpus_3 + getCharset()
-				+ TXMCoreMessages.Corpus_4 + getLanguage();
+		return TXMCoreMessages.corpusDDot + this.pID + TXMCoreMessages.encodingDDot + getCharset()
+				+ TXMCoreMessages.languageDDot + getLanguage();
 	}
 
 	/**
@@ -540,7 +540,7 @@
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				//org.txm.utils.logger.Log.printStackTrace(e);
-				System.out.println(TXMCoreMessages.Corpus_13+e);
+				System.out.println(TXMCoreMessages.corpusDDotgetLocaleDDotCQPIsNotReadyToAnswerDDot+e);
 			}
 		}
 		if(lang != null)
@@ -798,7 +798,7 @@
 	protected boolean _load(Element e) {
 		//System.out.println("*** Load corpus: "+name);
 		if (e == null) {
-			System.out.println(TXMCoreMessages.Corpus_14+this+TXMCoreMessages.Corpus_15);
+			System.out.println(TXMCoreMessages.warningDDotCantLoadCorpus+this+TXMCoreMessages.informationsFromWorkspaceSelfElementNull);
 			return false;
 		}
 
@@ -823,7 +823,7 @@
 					subcorp._load(subcorpusElem);
 					//subcorp.compute();
 //				} catch (CqiClientException ex) {
-//					Log.warning(this.pID + TXMCoreMessages.Corpus_12 + pID
+//					Log.warning(this.pID + TXMCoreMessages.failedToRestoreSubcorpus + pID
 //							+ " : " + ex); //$NON-NLS-1$
 //				}
 			}
@@ -851,7 +851,7 @@
 //					partition.load();
 					//partition.compute();
 				} catch (Exception ex) {
-					Log.warning(this.pID + TXMCoreMessages.Corpus_19 + name
+					Log.warning(this.pID + TXMCoreMessages.failedToRestorePartition + name
 							+ " : " + ex); //$NON-NLS-1$
 					//c.getParentNode().removeChild(c);
 				}
@@ -890,7 +890,7 @@
 		QueryResult queryResult = null;
 		//String queryResultId = queryResultNamePrefix + UUID.randomUUID().toString();
 		String queryResultId = queryResultNamePrefix + getNextQueryCounter();
-		Log.finest(NLS.bind(TXMCoreMessages.QUERY, new String[]{this.getQualifiedCqpId(), queryResultId, query.getQueryString()})); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+		Log.finest(NLS.bind(TXMCoreMessages.queryOnP0DDotP1InfP2, new String[]{this.getQualifiedCqpId(), queryResultId, query.getQueryString()})); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
 		// long start = System.currentTimeMillis();
 		try {
 			CorpusManager.getCorpusManager().getCqiClient().cqpQuery(
@@ -1163,4 +1163,4 @@
 		}
 		return output;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java	(revision 1335)
@@ -147,7 +147,7 @@
 //		}
 //		long end = System.currentTimeMillis();
 //		Log.finest(TXMCoreMessages.SUBCORPUS_CREATED + subcorpusName
-//				+ TXMCoreMessages.Corpus_8 + (end - start));
+//				+ TXMCoreMessages.in + (end - start));
 //
 //		if (!registered) subcorpus.registerToParent();
 //		return subcorpus;
@@ -190,7 +190,7 @@
 //			StructuralUnitProperty structuralUnitProperty, List<String> values,
 //			String subcorpusName) throws CqiClientException {
 //		if (values.size() == 0) {
-//			Log.warning(TXMCoreMessages.Corpus_5);
+//			Log.warning(TXMCoreMessages.noValuesGiven);
 //			return null;
 //		}
 //		String value = ""; //$NON-NLS-1$
@@ -303,7 +303,7 @@
 //	 */
 //	public void dropQueryResult(QueryResult queryResult)
 //			throws CqiClientException {
-//		Log.finest(SearchEngineCoreMessages.DROP_QUERYRESULT + queryResult.getName());
+//		Log.finest(SearchEngineCoreMessages.deletingQueryResultP0 + queryResult.getName());
 //		try {
 //			CQPSearchEngine.getCqiClient().dropSubCorpus(queryResult.getQualifiedCqpId());
 //		} catch (Exception e) {
@@ -342,7 +342,7 @@
 //	protected boolean _loadCorpus() {
 //		//System.out.println("*** Load corpus: "+name);
 //		if (getSelfElement() == null) {
-//			System.out.println(TXMCoreMessages.Corpus_14+this+TXMCoreMessages.Corpus_15);
+//			System.out.println(TXMCoreMessages.warningDDotCantLoadCorpus+this+TXMCoreMessages.informationsFromWorkspaceSelfElementNull);
 //			return false;
 //		}
 //
@@ -366,7 +366,7 @@
 //					Subcorpus subcorp = this.createSubcorpus(subcorpusElem);
 //					subcorp.load(subcorpusElem);
 //				} catch (CqiClientException e) {
-//					Log.warning(this.name + TXMCoreMessages.Corpus_12 + name
+//					Log.warning(this.name + TXMCoreMessages.failedToRestoreSubcorpus + name
 //							+ " : " + e); //$NON-NLS-1$
 //				}
 //			}
@@ -390,7 +390,7 @@
 //					Partition partition = this.createPartition(name, queries, names, true);
 //					partition.load(partitionElem);
 //				} catch (Exception e) {
-//					Log.warning(this.name + TXMCoreMessages.Corpus_19 + name
+//					Log.warning(this.name + TXMCoreMessages.failedToRestorePartition + name
 //							+ " : " + e); //$NON-NLS-1$
 //					//c.getParentNode().removeChild(c);
 //				}
@@ -418,7 +418,7 @@
 //				Subcorpus subcorp = this.createSubcorpus(subcorpusElem);
 //				subcorp.load(subcorpusElem);
 //			} catch (CqiClientException e) {
-//				Log.warning(this.name + TXMCoreMessages.Corpus_12 + name
+//				Log.warning(this.name + TXMCoreMessages.failedToRestoreSubcorpus + name
 //						+ " : " + e); //$NON-NLS-1$
 //			}
 //		}
@@ -441,7 +441,7 @@
 //				Partition partition = this.createPartition(name, queries, names, true);
 //				partition.load(partitionElem);
 //			} catch (Exception e) {
-//				Log.warning(this.name + TXMCoreMessages.Corpus_19 + name
+//				Log.warning(this.name + TXMCoreMessages.failedToRestorePartition + name
 //						+ " : " + e); //$NON-NLS-1$
 //				//c.getParentNode().removeChild(c);
 //			}
@@ -530,9 +530,9 @@
 //
 //	} catch (Exception e) {
 //		try {
-//			throw new CqiClientException(TXMCoreMessages.Partition_9 + partitionName + "_" + partName + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
+//			throw new CqiClientException(TXMCoreMessages.failedToCreatePartDDot + partitionName + "_" + partName + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
 //		} catch (Exception e1) {
-//			System.out.println(TXMCoreMessages.Partition_18+e1);
+//			System.out.println(TXMCoreMessages.failedToGetLastCQPErrorDDot+e1);
 //			org.txm.utils.logger.Log.printStackTrace(e1);
 //			return null;
 //		}
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java	(revision 1335)
@@ -131,7 +131,7 @@
 	@Override
 	public boolean checkCqpId(String pID) throws InvalidCqpIdException {
 		if (!pID.equals(pID.toUpperCase()))
-			throw new InvalidCqpIdException(pID + TXMCoreMessages.MainCorpus_0);
+			throw new InvalidCqpIdException(pID + TXMCoreMessages.isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters);
 		return true;
 	}
 
@@ -631,4 +631,4 @@
 	public void setID(String id) {
 		this.pID = id;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java	(revision 1335)
@@ -187,7 +187,7 @@
 				throw new CqiClientException(e);
 			}
 			long end = System.currentTimeMillis();
-			Log.finest(NLS.bind(SearchEngineCoreMessages.END_SUBCORPUS_SIZE, new Object[]{this.pID, this.size, (end - start)}));
+			Log.finest(NLS.bind(SearchEngineCoreMessages.sizeOfSubcorpusP0P1ComputedInP2Ms, new Object[]{this.pID, this.size, (end - start)}));
 		}
 		return this.size;
 	}
@@ -258,7 +258,7 @@
 	@Override
 	public boolean checkCqpId(String pID) throws InvalidCqpIdException {
 		if (!AbstractCqiClient.checkSubcorpusId(pID))
-			throw new InvalidCqpIdException(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.Subcorpus_3, pID));
+			throw new InvalidCqpIdException(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.p0IsNotAValidCQPIDForASubcorpusItMustBeAnUppercaseCharacterFollowedByLowercaseCharacters, pID));
 		return true;
 	}
 
@@ -296,7 +296,7 @@
 					Subcorpus subcorp = new Subcorpus(this);
 					subcorp._load(subcorpusElem);
 				} catch (Exception ex) {
-					Log.warning(this.pID + TXMCoreMessages.Corpus_12 + subcorpusElem.getAttribute("name")
+					Log.warning(this.pID + TXMCoreMessages.failedToRestoreSubcorpus + subcorpusElem.getAttribute("name")
 					+ " : " + ex); //$NON-NLS-1$
 				}
 			}
@@ -321,7 +321,7 @@
 					//partition.setSelfElement(partitionElem);
 					partition._load(partitionElem);
 				} catch (Exception ex) {
-					Log.warning(this.pID + TXMCoreMessages.Corpus_19 + name
+					Log.warning(this.pID + TXMCoreMessages.failedToRestorePartition + name
 							+ " : " + ex); //$NON-NLS-1$
 					//c.getParentNode().removeChild(c);
 				}
@@ -567,4 +567,4 @@
 
 		this.dirty = false;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java	(revision 1335)
@@ -87,13 +87,13 @@
 		List<String> partNames = partition.getPartNames();
 		for (String mod : modality) {
 			if (mod == null || mod.equals("")) { //$NON-NLS-1$
-				Log.finest(TXMCoreMessages.PartitionFocus_1);
-				throw new IllegalArgumentException(TXMCoreMessages.PartitionFocus_2);
+				Log.finest(TXMCoreMessages.theFocusCannotBeNullOrEmpty);
+				throw new IllegalArgumentException(TXMCoreMessages.focusIsEmptyOrNull);
 			}
 			if (!partNames.contains(mod)) {
-				Log.finest(TXMCoreMessages.PartitionFocus_3 + mod
+				Log.finest(TXMCoreMessages.theP0PartFocusDoesntBelongToPartitionP1 + mod
 						+ " " + partNames); //$NON-NLS-1$
-				throw new IllegalArgumentException(TXMCoreMessages.PartitionFocus_4);
+				throw new IllegalArgumentException(TXMCoreMessages.unknownPartitionName);
 			}
 		}
 	}
@@ -171,4 +171,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/Focus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/Focus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/Focus.java	(revision 1335)
@@ -84,7 +84,7 @@
 	 */
 	private void checkModalityList() {
 		for (String mod : modality) {
-			if (mod == null || mod.equals(""))throw new IllegalArgumentException(TXMCoreMessages.Focus_1); //$NON-NLS-1$
+			if (mod == null || mod.equals(""))throw new IllegalArgumentException(TXMCoreMessages.theFocusIsEmptyOrNull); //$NON-NLS-1$
 		}
 	}
 
@@ -142,4 +142,4 @@
 		return getQueryString();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java	(revision 1335)
@@ -63,7 +63,7 @@
 	public void createFieldEditors() {
 
 		Group ltGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		ltGroup.setText(CAUIMessages.PreferencePage_2);
+		ltGroup.setText(CAUIMessages.lexicalTableCreatedWhenCalledFromAPartition);
 		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData.horizontalSpan = 2;
 		gridData.verticalIndent = 10;
@@ -71,19 +71,19 @@
 
 		this.addField(new IntegerFieldEditor(CAPreferences.F_MIN, TXMCoreMessages.common_lowestFrequency, ltGroup));
 		this.addField(new IntegerFieldEditor(CAPreferences.V_MAX, TXMCoreMessages.common_numberOfLines, ltGroup));
-		this.addField(new StringFieldEditor(CAPreferences.QUALITY_DISPLAY_FORMAT, CAUIMessages.PreferencePage_0, this.getFieldEditorParent()));
-		this.addField(new StringFieldEditor(CAPreferences.CONTRIB_DISPLAY_FORMAT, CAUIMessages.PreferencePage_1, this.getFieldEditorParent()));
-		this.addField(new StringFieldEditor(CAPreferences.MASS_DISPLAY_FORMAT, CAUIMessages.PreferencePage_5, this.getFieldEditorParent()));
-		this.addField(new StringFieldEditor(CAPreferences.DIST_DISPLAY_FORMAT, CAUIMessages.PreferencePage_6, this.getFieldEditorParent()));
-		this.addField(new StringFieldEditor(CAPreferences.COS2_DISPLAY_FORMAT, CAUIMessages.PreferencePage_7, this.getFieldEditorParent()));
-		this.addField(new StringFieldEditor(CAPreferences.COORD_DISPLAY_FORMAT, CAUIMessages.PreferencePage_8, this.getFieldEditorParent()));
+		this.addField(new StringFieldEditor(CAPreferences.QUALITY_DISPLAY_FORMAT, CAUIMessages.qualityColumnFormat, this.getFieldEditorParent()));
+		this.addField(new StringFieldEditor(CAPreferences.CONTRIB_DISPLAY_FORMAT, CAUIMessages.contributionColumnFormat, this.getFieldEditorParent()));
+		this.addField(new StringFieldEditor(CAPreferences.MASS_DISPLAY_FORMAT, CAUIMessages.massColumnFormat, this.getFieldEditorParent()));
+		this.addField(new StringFieldEditor(CAPreferences.DIST_DISPLAY_FORMAT, CAUIMessages.distanceColumnFormat, this.getFieldEditorParent()));
+		this.addField(new StringFieldEditor(CAPreferences.COS2_DISPLAY_FORMAT, CAUIMessages.cosColumnFormat, this.getFieldEditorParent()));
+		this.addField(new StringFieldEditor(CAPreferences.COORD_DISPLAY_FORMAT, CAUIMessages.coordColumnFormat, this.getFieldEditorParent()));
 
 		// Charts rendering
 		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent());
 
-		this.addField(new BooleanFieldEditor(CAPreferences.SHOW_INDIVIDUALS, CAUIMessages.PreferencePage_3, chartsTab));
-		this.addField(new BooleanFieldEditor(CAPreferences.SHOW_VARIABLES, CAUIMessages.PreferencePage_4, chartsTab));
-		this.addField(new BooleanFieldEditor(CAPreferences.SHOW_POINT_SHAPES, CAUIMessages.PreferencePage_CHART_SHOW_POINT_SHAPES, chartsTab));
+		this.addField(new BooleanFieldEditor(CAPreferences.SHOW_INDIVIDUALS, CAUIMessages.showTheColumns, chartsTab));
+		this.addField(new BooleanFieldEditor(CAPreferences.SHOW_VARIABLES, CAUIMessages.showTheRows, chartsTab));
+		this.addField(new BooleanFieldEditor(CAPreferences.SHOW_POINT_SHAPES, CAUIMessages.showPointShapes, chartsTab));
 		
 		// other shared preferences
 		SWTChartsComponentsProvider.createChartsRenderingPreferencesFields(this, chartsTab);
@@ -168,4 +168,4 @@
 	}
 
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages.properties	(revision 1335)
@@ -1,45 +1,39 @@
-
-CHART_TOOLBAR_AXES_SELECTION_COMBO_BOX_LABEL = Axes: 
-CHART_TOOLBAR_BUTTON_SHOW_COLUMS_TOOLTIP     = Show/hide the column points
-CHART_TOOLBAR_BUTTON_SHOW_HIDE_POINT_SHAPES  = Show/hide point shapes
-CHART_TOOLBAR_BUTTON_SHOW_ROWS_TOOLTIP       = Show/hide the row points
-
-CaEditor_0 = Error while opening CAEditor: 
-
-ColRowInfosLabelProvider_19 = Q
-ColRowInfosLabelProvider_9  = Chi²
-
-ColsRowsInfosEditor_0 = Wrong input
-ColsRowsInfosEditor_2 = Infos: {0}
-
-ComputeCorrespondanceAnalysis_0  = Computing Correspondence analysis on {0} with property {1}
-ComputeCorrespondanceAnalysis_1  = Can not compute CA with less than 4 rows in the table
-ComputeCorrespondanceAnalysis_13 = Can not compute CA on lexical table with less than 4 columns
-ComputeCorrespondanceAnalysis_14 = Opening the Correspondence Analysis results
-ComputeCorrespondanceAnalysis_15 = Creating CA
-ComputeCorrespondanceAnalysis_4  = Can not compute factorial analysis with only {0} parts (the minimum is 4 parts).
-ComputeCorrespondanceAnalysis_8  = Loading correspondence analysis results...
-
-CorrespondanceAnalysisEditorInput_0  = Eigenvalues
-CorrespondanceAnalysisEditorInput_1  = Fact. plan
-CorrespondanceAnalysisEditorInput_11 = ∑
-CorrespondanceAnalysisEditorInput_2  = Eigenvalues histogram
-CorrespondanceAnalysisEditorInput_4  = #
-CorrespondanceAnalysisEditorInput_5  = Eigenvalue
-CorrespondanceAnalysisEditorInput_8  = Rows infos
-CorrespondanceAnalysisEditorInput_9  = Cols infos
-
-PreferencePage_0                       = Quality column format
-PreferencePage_1                       = Contribution column format
-PreferencePage_2                       = Lexical table (created when called from a partition)
-PreferencePage_3                       = Show the columns
-PreferencePage_4                       = Show the rows
-PreferencePage_5                       = Mass column format
-PreferencePage_6                       = Distance column format
-PreferencePage_7                       = Cos² column format
-PreferencePage_8                       = Coord column format
-PreferencePage_CHART_SHOW_POINT_SHAPES = Show point shapes
-
-error_cannot_compute_with           = Error: cannot compute CA with {0}
-error_cannot_compute_with_selection = Error: cannot compute CA with current selection={0} 
-error_opening                       = Error: cannot open CAEditor with {0}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+axesDDot=Axes\: 
+canNotComputeCAOnLexicalTableWithLessThan4Columns=Can not compute CA on lexical table with less than 4 columns
+canNotComputeCAWithLessThan4RowsInTheTable=Can not compute CA with less than 4 rows in the table
+canNotComputeFactorialAnalysisWithOnlyP0PartsTheMinimumIs4Parts=Can not compute factorial analysis with only {0} parts (the minimum is 4 parts).
+chi=Chi²
+colsInfos=Cols infos
+computingCorrespondenceAnalysisOnP0WithPropertyP1=Computing Correspondence analysis on {0} with property {1}
+contributionColumnFormat=Contribution column format
+coordColumnFormat=Coord column format
+CorrespondanceAnalysisEditorInput_11=∑
+CorrespondanceAnalysisEditorInput_4=\#
+cosColumnFormat=Cos² column format
+creatingCA=Creating CA
+distanceColumnFormat=Distance column format
+eigenvalue=Eigenvalue
+eigenvalues=Eigenvalues
+eigenvaluesHistogram=Eigenvalues histogram
+error_cannot_compute_with=Error\: cannot compute CA with {0}
+error_cannot_compute_with_selection=Error\: cannot compute CA with current selection\={0} 
+error_opening=Error\: cannot open CAEditor with {0}
+errorWhileOpeningCAEditorDDot=Error while opening CAEditor\: 
+factPlan=Fact. plan
+infosDDotP0=Infos\: {0}
+lexicalTableCreatedWhenCalledFromAPartition=Lexical table (created when called from a partition)
+loadingCorrespondenceAnalysisResults=Loading correspondence analysis results...
+massColumnFormat=Mass column format
+openingTheCorrespondenceAnalysisResults=Opening the Correspondence Analysis results
+q=Q
+qualityColumnFormat=Quality column format
+rowsInfos=Rows infos
+showhidePointShapes=Show/hide point shapes
+showhideTheColumnPoints=Show/hide the column points
+showhideTheRowPoints=Show/hide the row points
+showPointShapes=Show point shapes
+showTheColumns=Show the columns
+showTheRows=Show the rows
+wrongInput=Wrong input
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,36 +1,29 @@
-
-ColRowInfosLabelProvider_19 = Qual
-ColRowInfosLabelProvider_9  = χ²
-
-ColsRowsInfosEditor_0 = Ошибочный ввод
-ColsRowsInfosEditor_2 = Информация: {0}
-
-ComputeCorrespondanceAnalysis_0  = Расчет факторного анализа соответствий
-ComputeCorrespondanceAnalysis_1  = ** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок в таблице
-ComputeCorrespondanceAnalysis_13 = ** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок
-ComputeCorrespondanceAnalysis_14 = Открытие результатов факторного анализа соответствий
-ComputeCorrespondanceAnalysis_15 = Создание окна ФАС
-ComputeCorrespondanceAnalysis_4  = ** Невозможно провести факторный анализ соответствий при наличии только 
-ComputeCorrespondanceAnalysis_8  = Загрузка результатов факторного анализа
-
-CorrespondanceAnalysisEditorInput_0  = Собственные значения
-CorrespondanceAnalysisEditorInput_1  = Факт. план
-CorrespondanceAnalysisEditorInput_11 = ∑
-CorrespondanceAnalysisEditorInput_2  = Гистограмма собственных значений
-CorrespondanceAnalysisEditorInput_26 = Масса
-CorrespondanceAnalysisEditorInput_27 = Дист
-CorrespondanceAnalysisEditorInput_29 = Конт
-CorrespondanceAnalysisEditorInput_30 = Cos²
-CorrespondanceAnalysisEditorInput_4  = Фактор
-CorrespondanceAnalysisEditorInput_5  = Собственные значения
-CorrespondanceAnalysisEditorInput_8  = Инф Строчки
-CorrespondanceAnalysisEditorInput_9  = Инф Колонки
-
-PreferencePage_0 = Формат колонки Качество
-PreferencePage_1 = Формат колонки Вклад
-PreferencePage_3 = Показать колонки в графике факторного плана
-PreferencePage_4 = Показать строчки в графике факторного плана
-PreferencePage_5 = Формат колонки Масса
-PreferencePage_6 = Формат колонки Дистанция
-PreferencePage_7 = Формат колонки Cos²
-PreferencePage_8 = Формат колонки Coord
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+canNotComputeCAOnLexicalTableWithLessThan4Columns=** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок
+canNotComputeCAWithLessThan4RowsInTheTable=** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок в таблице
+canNotComputeFactorialAnalysisWithOnlyP0PartsTheMinimumIs4Parts=** Невозможно провести факторный анализ соответствий при наличии только 
+chi=χ²
+colsInfos=Инф Колонки
+computingCorrespondenceAnalysisOnP0WithPropertyP1=Расчет факторного анализа соответствий
+contributionColumnFormat=Формат колонки Вклад
+coordColumnFormat=Формат колонки Coord
+CorrespondanceAnalysisEditorInput_11=∑
+CorrespondanceAnalysisEditorInput_4=Фактор
+cosColumnFormat=Формат колонки Cos²
+creatingCA=Создание окна ФАС
+distanceColumnFormat=Формат колонки Дистанция
+eigenvalue=Собственные значения
+eigenvalues=Собственные значения
+eigenvaluesHistogram=Гистограмма собственных значений
+factPlan=Факт. план
+infosDDotP0=Информация\: {0}
+loadingCorrespondenceAnalysisResults=Загрузка результатов факторного анализа
+massColumnFormat=Формат колонки Масса
+openingTheCorrespondenceAnalysisResults=Открытие результатов факторного анализа соответствий
+q=Qual
+qualityColumnFormat=Формат колонки Качество
+rowsInfos=Инф Строчки
+showTheColumns=Показать колонки в графике факторного плана
+showTheRows=Показать строчки в графике факторного плана
+wrongInput=Ошибочный ввод
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java	(revision 1335)
@@ -1,71 +1,71 @@
-package org.txm.ca.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * CA UI messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class CAUIMessages extends NLS {
-	
-	private static final String BUNDLE_NAME = "org.txm.ca.rcp.messages.messages"; //$NON-NLS-1$
-	
-	public static String PreferencePage_0;
-	public static String PreferencePage_1;
-	public static String PreferencePage_2;
-	public static String PreferencePage_3;
-	public static String PreferencePage_4;
-	public static String PreferencePage_5;
-	public static String PreferencePage_6;
-	public static String PreferencePage_7;
-	public static String PreferencePage_8;
-	
-	public static String CHART_TOOLBAR_AXES_SELECTION_COMBO_BOX_LABEL;
-	public static String CHART_TOOLBAR_BUTTON_SHOW_COLUMS_TOOLTIP;
-	public static String CHART_TOOLBAR_BUTTON_SHOW_HIDE_POINT_SHAPES;
-	public static String CHART_TOOLBAR_BUTTON_SHOW_ROWS_TOOLTIP;
-	
-	public static String ComputeCorrespondanceAnalysis_0;
-	public static String ComputeCorrespondanceAnalysis_13;
-	public static String ComputeCorrespondanceAnalysis_14;
-	public static String ComputeCorrespondanceAnalysis_15;
-	public static String ComputeCorrespondanceAnalysis_1;
-	public static String ComputeCorrespondanceAnalysis_4;
-	public static String ComputeCorrespondanceAnalysis_8;
-	
-	
-	public static String CorrespondanceAnalysisEditorInput_0;
-	public static String CorrespondanceAnalysisEditorInput_11;
-	public static String CorrespondanceAnalysisEditorInput_1;
-	public static String CorrespondanceAnalysisEditorInput_2;
-	public static String CorrespondanceAnalysisEditorInput_4;
-	public static String CorrespondanceAnalysisEditorInput_5;
-	public static String CorrespondanceAnalysisEditorInput_8;
-	public static String CorrespondanceAnalysisEditorInput_9;
-	
-	public static String PreferencePage_CHART_SHOW_POINT_SHAPES;
-	
-	public static String ColRowInfosLabelProvider_19;
-	public static String ColRowInfosLabelProvider_9;
-	public static String ColsRowsInfosEditor_0;
-	public static String ColsRowsInfosEditor_2;
-
-	public static String CaEditor_0;
-
-	
-	public static String error_cannot_compute_with;
-
-	public static String error_cannot_compute_with_selection;
-
-	public static String error_opening;
-
-
-	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CAUIMessages.class);
-	}
-
-}
+package org.txm.ca.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * CA UI messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class CAUIMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.ca.rcp.messages.messages"; //$NON-NLS-1$
+	
+	public static String qualityColumnFormat; 
+	public static String contributionColumnFormat; 
+	public static String lexicalTableCreatedWhenCalledFromAPartition; 
+	public static String showTheColumns; 
+	public static String showTheRows; 
+	public static String massColumnFormat; 
+	public static String distanceColumnFormat; 
+	public static String cosColumnFormat; 
+	public static String coordColumnFormat; 
+	
+	public static String axesDDot; 
+	public static String showhideTheColumnPoints; 
+	public static String showhidePointShapes; 
+	public static String showhideTheRowPoints; 
+	
+	public static String computingCorrespondenceAnalysisOnP0WithPropertyP1; 
+	public static String canNotComputeCAOnLexicalTableWithLessThan4Columns; 
+	public static String openingTheCorrespondenceAnalysisResults; 
+	public static String creatingCA; 
+	public static String canNotComputeCAWithLessThan4RowsInTheTable; 
+	public static String canNotComputeFactorialAnalysisWithOnlyP0PartsTheMinimumIs4Parts; 
+	public static String loadingCorrespondenceAnalysisResults; 
+	
+	
+	public static String eigenvalues; 
+	public static String CorrespondanceAnalysisEditorInput_11;
+	public static String factPlan; 
+	public static String eigenvaluesHistogram; 
+	public static String CorrespondanceAnalysisEditorInput_4;
+	public static String eigenvalue; 
+	public static String rowsInfos; 
+	public static String colsInfos; 
+	
+	public static String showPointShapes; 
+	
+	public static String q; 
+	public static String chi; 
+	public static String wrongInput; 
+	public static String infosDDotP0; 
+
+	public static String errorWhileOpeningCAEditorDDot; 
+
+	
+	public static String error_cannot_compute_with;
+
+	public static String error_cannot_compute_with_selection;
+
+	public static String error_opening;
+
+
+	static {
+		Utf8NLS.initializeMessages(BUNDLE_NAME, CAUIMessages.class);
+	}
+
+}
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,41 +1,36 @@
-
-CHART_TOOLBAR_AXES_SELECTION_COMBO_BOX_LABEL = Axes : 
-CHART_TOOLBAR_BUTTON_SHOW_COLUMS_TOOLTIP     = Afficher/masquer les points-colonnes
-CHART_TOOLBAR_BUTTON_SHOW_HIDE_POINT_SHAPES  = Afficher/masquer le tracé des points
-CHART_TOOLBAR_BUTTON_SHOW_ROWS_TOOLTIP       = Afficher/masquer les points-lignes
-
-ColRowInfosLabelProvider_19 = Qual
-ColRowInfosLabelProvider_9  = χ²
-
-ColsRowsInfosEditor_0 = Entrée erronée
-ColsRowsInfosEditor_2 = Infos : {0}
-
-ComputeCorrespondanceAnalysis_0  = Calcul de l'analyse factorielle des correspondances sur {0} avec la propriété {1}
-ComputeCorrespondanceAnalysis_1  = ** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes dans la table
-ComputeCorrespondanceAnalysis_13 = ** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes 
-ComputeCorrespondanceAnalysis_14 = Ouverture des résultats de l'analyse factorielle des correspondances
-ComputeCorrespondanceAnalysis_15 = Création de la fenêtre de l'AFC
-ComputeCorrespondanceAnalysis_4  = ** Impossible de calculer l'analyse factorielle avec seulement {0} parties (minimum = 4).
-ComputeCorrespondanceAnalysis_8  = Chargement des résultats de l'analyse factorielle
-
-CorrespondanceAnalysisEditorInput_0  = Valeurs propres
-CorrespondanceAnalysisEditorInput_1  = Plan fact.
-CorrespondanceAnalysisEditorInput_11 = ∑
-CorrespondanceAnalysisEditorInput_2  = Histogramme des valeurs propres
-CorrespondanceAnalysisEditorInput_4  = #
-CorrespondanceAnalysisEditorInput_5  = Valeur propre
-CorrespondanceAnalysisEditorInput_8  = Info lignes
-CorrespondanceAnalysisEditorInput_9  = Info colonnes
-
-PreferencePage_0                       = Format de la colonne Qualité
-PreferencePage_1                       = Format de la colonne Contribution
-PreferencePage_2                       = Table lexicale (si la commande est appelée depuis une partition)
-PreferencePage_3                       = Afficher les colonnes
-PreferencePage_4                       = Afficher les lignes
-PreferencePage_5                       = Format de la colonne Masse
-PreferencePage_6                       = Format de la colonne Distance
-PreferencePage_7                       = Format de la colonne Cos²
-PreferencePage_8                       = Format de la colonne Coord
-PreferencePage_CHART_SHOW_POINT_SHAPES = Afficher le tracé des points
-
-error_opening = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+axesDDot=Axes \: 
+canNotComputeCAOnLexicalTableWithLessThan4Columns=** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes 
+canNotComputeCAWithLessThan4RowsInTheTable=** Impossible de calculer l'analyse factorielle des correspondances avec moins de 4 colonnes dans la table
+canNotComputeFactorialAnalysisWithOnlyP0PartsTheMinimumIs4Parts=** Impossible de calculer l'analyse factorielle avec seulement {0} parties (minimum \= 4).
+chi=χ²
+colsInfos=Info colonnes
+computingCorrespondenceAnalysisOnP0WithPropertyP1=Calcul de l'analyse factorielle des correspondances sur {0} avec la propriété {1}
+contributionColumnFormat=Format de la colonne Contribution
+coordColumnFormat=Format de la colonne Coord
+CorrespondanceAnalysisEditorInput_11=∑
+CorrespondanceAnalysisEditorInput_4=\#
+cosColumnFormat=Format de la colonne Cos²
+creatingCA=Création de la fenêtre de l'AFC
+distanceColumnFormat=Format de la colonne Distance
+eigenvalue=Valeur propre
+eigenvalues=Valeurs propres
+eigenvaluesHistogram=Histogramme des valeurs propres
+error_opening=
+factPlan=Plan fact.
+infosDDotP0=Infos \: {0}
+lexicalTableCreatedWhenCalledFromAPartition=Table lexicale (si la commande est appelée depuis une partition)
+loadingCorrespondenceAnalysisResults=Chargement des résultats de l'analyse factorielle
+massColumnFormat=Format de la colonne Masse
+openingTheCorrespondenceAnalysisResults=Ouverture des résultats de l'analyse factorielle des correspondances
+q=Qual
+qualityColumnFormat=Format de la colonne Qualité
+rowsInfos=Info lignes
+showhidePointShapes=Afficher/masquer le tracé des points
+showhideTheColumnPoints=Afficher/masquer les points-colonnes
+showhideTheRowPoints=Afficher/masquer les points-lignes
+showPointShapes=Afficher le tracé des points
+showTheColumns=Afficher les colonnes
+showTheRows=Afficher les lignes
+wrongInput=Entrée erronée
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java	(revision 1335)
@@ -132,7 +132,7 @@
 		parent.setLayout(new FillLayout());
 
 		if (!(iEditorInput instanceof ITablableEditorInput)) {
-			throw new IllegalArgumentException(TXMUIMessages.SingularValuesEditor_0);
+			throw new IllegalArgumentException(TXMUIMessages.wrongInput);
 		}
 		tableInput = (ITablableEditorInput) iEditorInput;
 
@@ -168,7 +168,7 @@
 				@Override
 				public void widgetSelected(SelectionEvent e)
 				{
-					StatusLine.setMessage(TXMUIMessages.SORT_COLUMN);
+					StatusLine.setMessage(TXMUIMessages.sortingColumn);
 					tableSorter.setColumn(index);
 					int dir = viewer.getTable().getSortDirection();
 					if (viewer.getTable().getSortColumn() == column.getColumn()) {
@@ -179,7 +179,7 @@
 					viewer.getTable().setSortDirection(dir);
 					viewer.getTable().setSortColumn(column.getColumn());
 					viewer.refresh();
-					StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+					StatusLine.setMessage(TXMUIMessages.sortDone);
 				}
 			});
 		}
@@ -268,4 +268,4 @@
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAFactorialMapChartEditor.java	(revision 1335)
@@ -1,268 +1,268 @@
-package org.txm.ca.rcp.editors;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.ToolItem;
-import org.txm.ca.core.functions.CA;
-import org.txm.ca.core.preferences.CAPreferences;
-import org.txm.ca.rcp.messages.CAUIMessages;
-import org.txm.chartsengine.rcp.editors.ChartEditor;
-import org.txm.chartsengine.rcp.editors.ChartEditorInput;
-import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.core.results.Parameter;
-import org.txm.rcp.IImageKeys;
-import org.txm.rcp.editors.listeners.ComputeSelectionListener;
-import org.txm.rcp.swt.GLComposite;
-import org.txm.rcp.swt.widget.ThresholdsGroup;
-import org.txm.rcp.swt.widget.structures.PropertiesComboViewer;
-import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
-import org.txm.searchengine.cqp.corpus.CQPCorpus;
-
-/**
- * Correspondence analysis factorial map chart editor.
- * @author sjacquot
- *
- */
-public class CAFactorialMapChartEditor extends ChartEditor<CA> {
-
-
-	// FIXME: try to automate that
-	// a solution is to stop using to int in CA but a members int[] dimensions, then use a ComboViewer in this editor
-//	/**
-//	 * First dimension.
-//	 */
-//	@Parameter(key=CAPreferences.FIRST_DIMENSION)
-//	protected int firstDimension = 1;
-//
-//	/**
-//	 * Second dimension.
-//	 */
-//	@Parameter(key=CAPreferences.SECOND_DIMENSION)
-//	protected int secondDimension = 2;
-	
-
-	/**
-	 * To show/hide individuals.
-	 */
-	@Parameter(key=CAPreferences.SHOW_INDIVIDUALS)
-	protected ToolItem showIndividuals;
-
-	/**
-	 * To show/hide variables.
-	 */
-	@Parameter(key=CAPreferences.SHOW_VARIABLES)
-	protected ToolItem showVariables;
-
-	/**
-	 * To show/hide the point shapes or only the labels.
-	 */
-	@Parameter(key=CAPreferences.SHOW_POINT_SHAPES)
-	protected ToolItem showPointShapes;
-	
-	
-	/**
-	 * Unit property.
-	 */
-	@Parameter(key=TXMPreferences.UNIT_PROPERTY)
-	protected PropertiesComboViewer unitPropertyComboViewer;
-	
-
-	/**
-	 * Minimum frequency filtering spinner.
-	 */
-	@Parameter(key=TXMPreferences.F_MIN)
-	protected Spinner fMinSpinner;
-
-	/**
-	 * Maximum frequency filtering spinner.
-	 */
-	@Parameter(key=TXMPreferences.F_MAX)
-	protected Spinner fMaxSpinner;
-
-	/**
-	 * Maximum number of lines filtering.
-	 */
-	@Parameter(key=TXMPreferences.V_MAX)
-	protected Spinner vMaxSpinner;
-	
-	
-	/**
-	 *
-	 * @param chartEditorInput
-	 */
-	public CAFactorialMapChartEditor(ChartEditorInput chartEditorInput) {
-		super(chartEditorInput);
-	}
-
-
-	@Override
-	public void __createPartControl() {
-
-		// Main parameters
-		
-		try {
-			GLComposite mainParametersArea = this.getMainParametersComposite();
-			mainParametersArea.getLayout().numColumns = 2;
-			
-			// unit property
-			new Label(mainParametersArea, SWT.NONE).setText(TXMCoreMessages.common_property);
-			this.unitPropertyComboViewer = new PropertiesComboViewer(mainParametersArea, this, true,
-					CQPCorpus.getFirstParentCorpus(this.getResult()).getOrderedProperties(),
-					this.getResult().getUnitProperty(), false);
-
-		}
-		catch (CqiClientException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-			
-			// Extend the chart editor tool bar
-			new ToolItem(this.chartToolBar, SWT.SEPARATOR);
-
-			
-			// Show/hide columns
-			showIndividuals = new ToolItem(this.chartToolBar, SWT.CHECK);
-			// FIXME: keep this for offering an option "large icons" with text in buttons ?
-			//showColumns.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_CA_TOOLBAR_BUTTON_SHOW_COLUMS_LABEL);
-			showIndividuals.setToolTipText(CAUIMessages.CHART_TOOLBAR_BUTTON_SHOW_COLUMS_TOOLTIP);
-			showIndividuals.setImage(IImageKeys.getImage(CAFactorialMapChartEditor.class, "icons/show_columns.png")); //$NON-NLS-1$
-			showIndividuals.addSelectionListener(new ComputeSelectionListener(this));
-
-			// Show/hide rows
-			showVariables = new ToolItem(this.chartToolBar, SWT.CHECK);
-			// FIXME: keep this for offering an option "large icons" with text in buttons ?
-			//this.showRows.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_CA_TOOLBAR_BUTTON_SHOW_ROWS_LABEL);
-			showVariables.setToolTipText(CAUIMessages.CHART_TOOLBAR_BUTTON_SHOW_ROWS_TOOLTIP);
-			showVariables.setImage(IImageKeys.getImage(CAFactorialMapChartEditor.class, "icons/show_rows.png")); //$NON-NLS-1$
-			showVariables.addSelectionListener(new ComputeSelectionListener(this));
-
-			
-			// Show/hide point shapes
-			showPointShapes = new ToolItem(this.chartToolBar, SWT.CHECK);
-			// FIXME: keep this for offering an option "large icons" with text in buttons ?
-			//showPointShapes.setText(CAUIMessages.SHOW_HIDE_POINT_SHAPES);
-			showPointShapes.setToolTipText(CAUIMessages.CHART_TOOLBAR_BUTTON_SHOW_HIDE_POINT_SHAPES);
-			showPointShapes.setImage(IImageKeys.getImage(CAFactorialMapChartEditor.class, "icons/show_point_shapes.png")); //$NON-NLS-1$
-			showPointShapes.addSelectionListener(new ComputeSelectionListener(this));
-
-			
-			// Factors plane selection
-			CLabel factorsLabel = new CLabel(this.chartToolBar, SWT.CENTER);
-			factorsLabel.setText(CAUIMessages.CHART_TOOLBAR_AXES_SELECTION_COMBO_BOX_LABEL);
-			this.chartToolBar.addControl(factorsLabel);
-			
-			final Combo plansCombo = new Combo(this.chartToolBar, SWT.READ_ONLY);
-
-			// FIXME: commented because the infos panel is not ready to manage more axes
-//		ArrayList<String> planes = null;
-//		try {
-//			int nbsv = ((CA) editorPart.getResultData()).getSingularValues().length;
-//			planes = new ArrayList<String>();
-//			for(int i = 1 ; i < nbsv ; i ++)	{
-//				for(int j = i ; j < nbsv ; j++)	{
-//					if(i != j)	{
-//						planes.add("("+i+","+j+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-//					}
-//				}
-//			}
-//		}
-//		catch (StatException e1) {
-//			// TODO Auto-generated catch block
-//			org.txm.rcp.utils.Logger.printStackTrace(e1);
-//		}
-//		String [] items = planes.toArray(new String[planes.size()]);
-
-			String items[] = { "(1,2)", "(1,3)", "(2,3)" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-			// TODO : commented because the infos panel is not ready to manage more axes
-			//		if(couples != null && couples.size() > 3)	{
-			//			items = couples.toArray(new String[couples.size()]);
-			//}
-
-
-			plansCombo.setItems(items);
-
-			// Preselect the plan from the CA data
-			if(this.getIntParameterValue(CAPreferences.FIRST_DIMENSION) == 2)	{
-				plansCombo.select(2);
-			}
-			else if(this.getIntParameterValue(CAPreferences.SECOND_DIMENSION) == 3)	{
-				plansCombo.select(1);
-			}
-			else	{
-				plansCombo.select(0);
-			}
-
-			this.chartToolBar.addControl(plansCombo);
-			
-			// Listeners
-			SelectionListener listener = new SelectionListener() {
-				
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-
-					boolean resetView = false;
-					
-					// Change factors
-					if(e.getSource() == plansCombo)	{
-
-						Combo plans = (Combo) e.getSource();
-
-						int dimension1 = 1;
-						int dimension2 = 2;
-
-						String str = plans.getItem(plans.getSelectionIndex());
-						str = str.substring(1, str.length() -1); // remove ( and )
-						String[] split = str.split(","); // 2 items //$NON-NLS-1$
-						dimension1 = Integer.parseInt(split[0]);
-						dimension2 = Integer.parseInt(split[1]);
-
-						getResult().setFirstDimension(dimension1);
-						getResult().setSecondDimension(dimension2);
-
-						resetView = true;
-					}
-					getResult().setChartDirty();
-					getResult().setNeedsToResetView(resetView);
-					compute(true);
-					// synchronize the part names
-					((CAEditor)getParentMultiPagesEditor()).setName(getResult().getName());
-					forceFocus();
-				}
-				
-				@Override
-				public void widgetDefaultSelected(SelectionEvent e) {
-					// TODO Auto-generated method stub
-				}
-			};
-			plansCombo.addSelectionListener(listener);
-			
-			
-			
-			// advanced parameters
-			// thresholds
-			ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), SWT.NONE, this, true, false);
-			this.fMinSpinner = thresholdsGroup.getFMinSpinner();
-			this.fMaxSpinner = thresholdsGroup.getFMaxSpinner();
-			this.vMaxSpinner = thresholdsGroup.getVMaxSpinner();
-			this.vMaxSpinner.setMinimum(1);
-			
-	
-	}
-
-
-	@Override
-	public void updateEditorFromChart(boolean update) {
-		// nothing to do
-	}
-
-
-
-}
+package org.txm.ca.rcp.editors;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Spinner;
+import org.eclipse.swt.widgets.ToolItem;
+import org.txm.ca.core.functions.CA;
+import org.txm.ca.core.preferences.CAPreferences;
+import org.txm.ca.rcp.messages.CAUIMessages;
+import org.txm.chartsengine.rcp.editors.ChartEditor;
+import org.txm.chartsengine.rcp.editors.ChartEditorInput;
+import org.txm.core.messages.TXMCoreMessages;
+import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.Parameter;
+import org.txm.rcp.IImageKeys;
+import org.txm.rcp.editors.listeners.ComputeSelectionListener;
+import org.txm.rcp.swt.GLComposite;
+import org.txm.rcp.swt.widget.ThresholdsGroup;
+import org.txm.rcp.swt.widget.structures.PropertiesComboViewer;
+import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
+import org.txm.searchengine.cqp.corpus.CQPCorpus;
+
+/**
+ * Correspondence analysis factorial map chart editor.
+ * @author sjacquot
+ *
+ */
+public class CAFactorialMapChartEditor extends ChartEditor<CA> {
+
+
+	// FIXME: try to automate that
+	// a solution is to stop using to int in CA but a members int[] dimensions, then use a ComboViewer in this editor
+//	/**
+//	 * First dimension.
+//	 */
+//	@Parameter(key=CAPreferences.FIRST_DIMENSION)
+//	protected int firstDimension = 1;
+//
+//	/**
+//	 * Second dimension.
+//	 */
+//	@Parameter(key=CAPreferences.SECOND_DIMENSION)
+//	protected int secondDimension = 2;
+	
+
+	/**
+	 * To show/hide individuals.
+	 */
+	@Parameter(key=CAPreferences.SHOW_INDIVIDUALS)
+	protected ToolItem showIndividuals;
+
+	/**
+	 * To show/hide variables.
+	 */
+	@Parameter(key=CAPreferences.SHOW_VARIABLES)
+	protected ToolItem showVariables;
+
+	/**
+	 * To show/hide the point shapes or only the labels.
+	 */
+	@Parameter(key=CAPreferences.SHOW_POINT_SHAPES)
+	protected ToolItem showPointShapes;
+	
+	
+	/**
+	 * Unit property.
+	 */
+	@Parameter(key=TXMPreferences.UNIT_PROPERTY)
+	protected PropertiesComboViewer unitPropertyComboViewer;
+	
+
+	/**
+	 * Minimum frequency filtering spinner.
+	 */
+	@Parameter(key=TXMPreferences.F_MIN)
+	protected Spinner fMinSpinner;
+
+	/**
+	 * Maximum frequency filtering spinner.
+	 */
+	@Parameter(key=TXMPreferences.F_MAX)
+	protected Spinner fMaxSpinner;
+
+	/**
+	 * Maximum number of lines filtering.
+	 */
+	@Parameter(key=TXMPreferences.V_MAX)
+	protected Spinner vMaxSpinner;
+	
+	
+	/**
+	 *
+	 * @param chartEditorInput
+	 */
+	public CAFactorialMapChartEditor(ChartEditorInput chartEditorInput) {
+		super(chartEditorInput);
+	}
+
+
+	@Override
+	public void __createPartControl() {
+
+		// Main parameters
+		
+		try {
+			GLComposite mainParametersArea = this.getMainParametersComposite();
+			mainParametersArea.getLayout().numColumns = 2;
+			
+			// unit property
+			new Label(mainParametersArea, SWT.NONE).setText(TXMCoreMessages.common_property);
+			this.unitPropertyComboViewer = new PropertiesComboViewer(mainParametersArea, this, true,
+					CQPCorpus.getFirstParentCorpus(this.getResult()).getOrderedProperties(),
+					this.getResult().getUnitProperty(), false);
+
+		}
+		catch (CqiClientException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+			
+			// Extend the chart editor tool bar
+			new ToolItem(this.chartToolBar, SWT.SEPARATOR);
+
+			
+			// Show/hide columns
+			showIndividuals = new ToolItem(this.chartToolBar, SWT.CHECK);
+			// FIXME: keep this for offering an option "large icons" with text in buttons ?
+			//showColumns.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_CA_TOOLBAR_BUTTON_SHOW_COLUMS_LABEL);
+			showIndividuals.setToolTipText(CAUIMessages.showhideTheColumnPoints);
+			showIndividuals.setImage(IImageKeys.getImage(CAFactorialMapChartEditor.class, "icons/show_columns.png")); //$NON-NLS-1$
+			showIndividuals.addSelectionListener(new ComputeSelectionListener(this));
+
+			// Show/hide rows
+			showVariables = new ToolItem(this.chartToolBar, SWT.CHECK);
+			// FIXME: keep this for offering an option "large icons" with text in buttons ?
+			//this.showRows.setText(SWTComponentsProviderMessages.SWTChartsComponentProvider_CA_TOOLBAR_BUTTON_SHOW_ROWS_LABEL);
+			showVariables.setToolTipText(CAUIMessages.showhideTheRowPoints);
+			showVariables.setImage(IImageKeys.getImage(CAFactorialMapChartEditor.class, "icons/show_rows.png")); //$NON-NLS-1$
+			showVariables.addSelectionListener(new ComputeSelectionListener(this));
+
+			
+			// Show/hide point shapes
+			showPointShapes = new ToolItem(this.chartToolBar, SWT.CHECK);
+			// FIXME: keep this for offering an option "large icons" with text in buttons ?
+			//showPointShapes.setText(CAUIMessages.SHOW_HIDE_POINT_SHAPES);
+			showPointShapes.setToolTipText(CAUIMessages.showhidePointShapes);
+			showPointShapes.setImage(IImageKeys.getImage(CAFactorialMapChartEditor.class, "icons/show_point_shapes.png")); //$NON-NLS-1$
+			showPointShapes.addSelectionListener(new ComputeSelectionListener(this));
+
+			
+			// Factors plane selection
+			CLabel factorsLabel = new CLabel(this.chartToolBar, SWT.CENTER);
+			factorsLabel.setText(CAUIMessages.axesDDot);
+			this.chartToolBar.addControl(factorsLabel);
+			
+			final Combo plansCombo = new Combo(this.chartToolBar, SWT.READ_ONLY);
+
+			// FIXME: commented because the infos panel is not ready to manage more axes
+//		ArrayList<String> planes = null;
+//		try {
+//			int nbsv = ((CA) editorPart.getResultData()).getSingularValues().length;
+//			planes = new ArrayList<String>();
+//			for(int i = 1 ; i < nbsv ; i ++)	{
+//				for(int j = i ; j < nbsv ; j++)	{
+//					if(i != j)	{
+//						planes.add("("+i+","+j+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+//					}
+//				}
+//			}
+//		}
+//		catch (StatException e1) {
+//			// TODO Auto-generated catch block
+//			org.txm.rcp.utils.Logger.printStackTrace(e1);
+//		}
+//		String [] items = planes.toArray(new String[planes.size()]);
+
+			String items[] = { "(1,2)", "(1,3)", "(2,3)" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
+			// TODO : commented because the infos panel is not ready to manage more axes
+			//		if(couples != null && couples.size() > 3)	{
+			//			items = couples.toArray(new String[couples.size()]);
+			//}
+
+
+			plansCombo.setItems(items);
+
+			// Preselect the plan from the CA data
+			if(this.getIntParameterValue(CAPreferences.FIRST_DIMENSION) == 2)	{
+				plansCombo.select(2);
+			}
+			else if(this.getIntParameterValue(CAPreferences.SECOND_DIMENSION) == 3)	{
+				plansCombo.select(1);
+			}
+			else	{
+				plansCombo.select(0);
+			}
+
+			this.chartToolBar.addControl(plansCombo);
+			
+			// Listeners
+			SelectionListener listener = new SelectionListener() {
+				
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+
+					boolean resetView = false;
+					
+					// Change factors
+					if(e.getSource() == plansCombo)	{
+
+						Combo plans = (Combo) e.getSource();
+
+						int dimension1 = 1;
+						int dimension2 = 2;
+
+						String str = plans.getItem(plans.getSelectionIndex());
+						str = str.substring(1, str.length() -1); // remove ( and )
+						String[] split = str.split(","); // 2 items //$NON-NLS-1$
+						dimension1 = Integer.parseInt(split[0]);
+						dimension2 = Integer.parseInt(split[1]);
+
+						getResult().setFirstDimension(dimension1);
+						getResult().setSecondDimension(dimension2);
+
+						resetView = true;
+					}
+					getResult().setChartDirty();
+					getResult().setNeedsToResetView(resetView);
+					compute(true);
+					// synchronize the part names
+					((CAEditor)getParentMultiPagesEditor()).setName(getResult().getName());
+					forceFocus();
+				}
+				
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// TODO Auto-generated method stub
+				}
+			};
+			plansCombo.addSelectionListener(listener);
+			
+			
+			
+			// advanced parameters
+			// thresholds
+			ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), SWT.NONE, this, true, false);
+			this.fMinSpinner = thresholdsGroup.getFMinSpinner();
+			this.fMaxSpinner = thresholdsGroup.getFMaxSpinner();
+			this.vMaxSpinner = thresholdsGroup.getVMaxSpinner();
+			this.vMaxSpinner.setMinimum(1);
+			
+	
+	}
+
+
+	@Override
+	public void updateEditorFromChart(boolean update) {
+		// nothing to do
+	}
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColRowInfosLabelProvider.java	(revision 1335)
@@ -82,7 +82,7 @@
 				String pattern = CAPreferences.getInstance().getString(CAPreferences.MASS_DISPLAY_FORMAT);
 			if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					masspattern = new DecimalFormat(pattern);
-			} else if (names[i].startsWith(CAUIMessages.ColRowInfosLabelProvider_9)) {
+			} else if (names[i].startsWith(CAUIMessages.chi)) {
 				String pattern = CAPreferences.getInstance().getString(CAPreferences.CHI_DISPLAY_FORMAT);
 				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					chipattern = new DecimalFormat(pattern);
@@ -103,7 +103,7 @@
 				String pattern = CAPreferences.getInstance().getString(CAPreferences.CONTRIB_DISPLAY_FORMAT);
 				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					contribpattern = new DecimalFormat(pattern);
-			} else if (names[i].startsWith(CAUIMessages.ColRowInfosLabelProvider_19) && names[i].length() == 3) {
+			} else if (names[i].startsWith(CAUIMessages.q) && names[i].length() == 3) {
 				String pattern = CAPreferences.getInstance().getString(CAPreferences.QUALITY_DISPLAY_FORMAT);
 				if (pattern != null && !pattern.trim().equals("")) //$NON-NLS-1$
 					qualitypattern = new DecimalFormat(pattern);
@@ -135,7 +135,7 @@
 			f = new DecimalFormat("###.00"); //$NON-NLS-1$
 			if (name.startsWith(CACoreMessages.common_mass)) {
 				f = masspattern;
-			} else if (name.startsWith(CAUIMessages.ColRowInfosLabelProvider_9)) {
+			} else if (name.startsWith(CAUIMessages.chi)) {
 				f = chipattern;
 			} else if (name.startsWith(CACoreMessages.common_dist)) {
 				f = distpattern;
@@ -146,7 +146,7 @@
 				f = coordpattern;
 			} else if (name.startsWith(CACoreMessages.common_cont)) {
 				f = contribpattern;
-			} else if (name.startsWith(CAUIMessages.ColRowInfosLabelProvider_19)
+			} else if (name.startsWith(CAUIMessages.q)
 					&& name.length() == 3) {
 				f = qualitypattern;
 			}
@@ -154,4 +154,4 @@
 		} else
 			return o.toString();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java	(revision 1335)
@@ -127,7 +127,7 @@
 		parent.setLayout(new FillLayout());
 
 		if (!(iEditorInput instanceof ITablableEditorInput)) {
-			throw new IllegalArgumentException(CAUIMessages.ColsRowsInfosEditor_0);
+			throw new IllegalArgumentException(CAUIMessages.wrongInput);
 		}
 		tableInput = (ITablableEditorInput) iEditorInput;
 		viewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL
@@ -157,7 +157,7 @@
 			column.getColumn().addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(TXMUIMessages.SORT_COLUMN );
+					StatusLine.setMessage(TXMUIMessages.sortingColumn );
 					tableSorter.setColumn(index);
 					int dir = viewer.getTable().getSortDirection();
 					if (viewer.getTable().getSortColumn() == column.getColumn()) {
@@ -168,7 +168,7 @@
 					viewer.getTable().setSortDirection(dir);
 					viewer.getTable().setSortColumn(column.getColumn());
 					viewer.refresh();
-					StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+					StatusLine.setMessage(TXMUIMessages.sortDone);
 				}
 			});
 		}
@@ -181,7 +181,7 @@
 		tableSorter.setColumnTypes(tableInput.getColumnTypes());
 		viewer.setSorter(tableSorter);
 
-		this.setContentDescription(NLS.bind(CAUIMessages.ColsRowsInfosEditor_2, titles[0]));
+		this.setContentDescription(NLS.bind(CAUIMessages.infosDDotP0, titles[0]));
 		createContextMenu(viewer);
 		viewer.refresh();
 		for (TableColumn col : viewer.getTable().getColumns())
@@ -234,4 +234,4 @@
 	public TableViewer getViewer() {
 		return viewer;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAParametersDialog.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAParametersDialog.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAParametersDialog.java	(revision 1335)
@@ -180,7 +180,7 @@
 		anaPropCombo.select(iword);
 
 		maxlinesLabel = new Label(composite, SWT.NONE);
-		maxlinesLabel.setText(TXMUIMessages.NumberOfLines);
+		maxlinesLabel.setText(TXMUIMessages.numberOfLinesDDot);
 		maxlinesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
 		maxlinesSpinner = new Spinner(composite, SWT.BORDER);
 		maxlinesSpinner.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
@@ -209,8 +209,8 @@
 		int propIndex = anaPropCombo.getSelectionIndex();
 		if (propIndex == -1) {
 			MessageDialog.openError(getShell(),
-					TXMUIMessages.Invalid_analysis_property,
-					TXMUIMessages.Structure_field_not_empty);
+					TXMUIMessages.invalidProperty,
+					TXMUIMessages.structureFieldIsMandatory);
 			return;
 		}
 		property = properties.get(propIndex);
@@ -251,4 +251,4 @@
 		this.fmin = fmin;
 		this.vmax = vmax;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java	(revision 1335)
@@ -109,11 +109,11 @@
 
 	/** The names. */
 	private List<String> names = Arrays.asList(new String[] {
-			CAUIMessages.CorrespondanceAnalysisEditorInput_1,
-			CAUIMessages.CorrespondanceAnalysisEditorInput_0,
-			CAUIMessages.CorrespondanceAnalysisEditorInput_8,
-			CAUIMessages.CorrespondanceAnalysisEditorInput_9,
-			CAUIMessages.CorrespondanceAnalysisEditorInput_2 });
+			CAUIMessages.factPlan,
+			CAUIMessages.eigenvalues,
+			CAUIMessages.rowsInfos,
+			CAUIMessages.colsInfos,
+			CAUIMessages.eigenvaluesHistogram });
 
 
 	/* (non-Javadoc)
@@ -185,7 +185,7 @@
 
 
 		if (editors.size() != inputs.size()) {
-			throw new IllegalArgumentException(NLS.bind(TXMUIMessages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
+			throw new IllegalArgumentException(NLS.bind(TXMUIMessages.theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual, editors.size(), inputs.size()));
 		}
 
 		// put first editor in the left panel and set is as "main" editor
@@ -243,7 +243,7 @@
 		}
 		catch (Exception e1) {
 			org.txm.rcp.utils.Logger.printStackTrace(e1);
-			System.out.println(CAUIMessages.CaEditor_0 + e1);
+			System.out.println(CAUIMessages.errorWhileOpeningCAEditorDDot + e1);
 			return;
 		}
 
@@ -254,7 +254,7 @@
 				editorIndex = addPage(editors.get(i), inputs.get(i));
 			} catch (PartInitException e) {
 				org.txm.rcp.utils.Logger.printStackTrace(e);
-				System.out.println(CAUIMessages.CaEditor_0 + e);
+				System.out.println(CAUIMessages.errorWhileOpeningCAEditorDDot + e);
 				return;
 			}
 			setPageText(editorIndex, names.get(i));
@@ -371,14 +371,14 @@
 			public String[] getColumnTitles() {
 				return new String[] {
 						CAUIMessages.CorrespondanceAnalysisEditorInput_4,
-						CAUIMessages.CorrespondanceAnalysisEditorInput_5,
+						CAUIMessages.eigenvalue,
 						"%", CAUIMessages.CorrespondanceAnalysisEditorInput_11 + "%", "", ""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 			}
 
 			@Override
 			public String[] getColumnTypes() {
 				return new String[] {
-						TXMUIMessages.FrequencyListEditorInput_6,
+						TXMUIMessages.integer,
 						COL_TYPE,
 						COL_TYPE,
 						COL_TYPE,
@@ -443,7 +443,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				coltypes = new ArrayList<String>();
-				coltypes.add(TXMUIMessages.FrequencyListEditorInput_6);
+				coltypes.add(TXMUIMessages.integer);
 				coltypes.add(SEPARATOR);
 				coltypes.add(COL_TYPE);
 				coltypes.add(COL_TYPE);
@@ -527,7 +527,7 @@
 			@Override
 			public String[] getColumnTypes() {
 				coltypes = new ArrayList<String>();
-				coltypes.add(TXMUIMessages.FrequencyListEditorInput_6);
+				coltypes.add(TXMUIMessages.integer);
 				coltypes.add(SEPARATOR);
 				coltypes.add(COL_TYPE);
 				coltypes.add(COL_TYPE);
@@ -727,4 +727,4 @@
 	public void setName(String partName) {
 		this.setPartName(partName);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java	(revision 1334)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/handlers/ComputeCA.java	(revision 1335)
@@ -78,7 +78,7 @@
 		final Object selection = this.getCorporaViewSelectedObject(event);
 
 		try {
-			System.out.println(CAUIMessages.ComputeCorrespondanceAnalysis_15);
+			System.out.println(CAUIMessages.creatingCA);
 			CA ca = null;
 
 			// Creating from Partition
@@ -93,7 +93,7 @@
 						@Override
 						public void run() {
 							MessageDialog d = new MessageDialog(window.getShell(), TXMCoreMessages.error_error2, null,
-									NLS.bind(CAUIMessages.ComputeCorrespondanceAnalysis_4, partition.getPartsCount()), 0, new String[] { TXMCoreMessages.common_ok}, 0);
+									NLS.bind(CAUIMessages.canNotComputeFactorialAnalysisWithOnlyP0PartsTheMinimumIs4Parts, partition.getPartsCount()), 0, new String[] { TXMCoreMessages.common_ok}, 0);
 							d.open();
 						}
 					});
@@ -110,7 +110,7 @@
 //					int fMin = d.getFmin();
 //					int vMax = d.getMaxLines();
 //
-//					Log.info(NLS.bind(CAUIMessages.ComputeCorrespondanceAnalysis_0, partition, property));
+//					Log.info(NLS.bind(CAUIMessages.computingCorrespondenceAnalysisOnP0WithPropertyP1, partition, property));
 //
 //					LexicalTable lexicalTable = new LexicalTable(partition);
 //					lexicalTable.setParameters(property, fMin, vMax, null);
@@ -135,16 +135,16 @@
 				
 				if (index.getPartition().getPartsCount() < 4) {
 					// FIXME: remove this swing code that freeze the UI, need to use SWT in main thread
-					MessageBox.error(CAUIMessages.ComputeCorrespondanceAnalysis_13);
+					MessageBox.error(CAUIMessages.canNotComputeCAOnLexicalTableWithLessThan4Columns);
 					return null;
 				}
 				if (index.hasBeenComputedOnce() && index.getAllLines().size() < 4) {
 					// FIXME: remove this swing code that freeze the UI, need to use SWT in main thread
-					MessageBox.error(CAUIMessages.ComputeCorrespondanceAnalysis_1);
+					MessageBox.error(CAUIMessages.canNotComputeCAWithLessThan4RowsInTheTable);
 					return null;
 				}
 
-				Log.info(NLS.bind(CAUIMessages.ComputeCorrespondanceAnalysis_0, index, property));
+				Log.info(NLS.bind(CAUIMessages.computingCorrespondenceAnalysisOnP0WithPropertyP1, index, property));
 				ca = new CA(new LexicalTable(index));
 			}
 			// Creating from Lexical Table
@@ -152,16 +152,16 @@
 				LexicalTable lexicalTable = (LexicalTable) selection;
 				Property property = lexicalTable.getProperty();
 
-				Log.info(NLS.bind(CAUIMessages.ComputeCorrespondanceAnalysis_0, lexicalTable, property));
+				Log.info(NLS.bind(CAUIMessages.computingCorrespondenceAnalysisOnP0WithPropertyP1, lexicalTable, property));
 
 				if (lexicalTable.getNColumns() < 4) {
 					// FIXME: remove this swing code that freeze the UI, need to use SWT in main thread
-					MessageBox.error(CAUIMessages.ComputeCorrespondanceAnalysis_13);
+					MessageBox.error(CAUIMessages.canNotComputeCAOnLexicalTableWithLessThan4Columns);
 					return null;
 				}
 				if (lexicalTable.getNRows() < 4) {
 					// FIXME: remove this swing code that freeze the UI, need to use SWT in main thread
-					MessageBox.error(CAUIMessages.ComputeCorrespondanceAnalysis_1);
+					MessageBox.error(CAUIMessages.canNotComputeCAWithLessThan4RowsInTheTable);
 					return null;
 				}
 
@@ -180,11 +180,11 @@
 			ca.compute();
 
 			try {
-				Log.info(CAUIMessages.ComputeCorrespondanceAnalysis_8);
+				Log.info(CAUIMessages.loadingCorrespondenceAnalysisResults);
 
 				TXMResultEditorInput<CA> editorInput = new TXMResultEditorInput(ca);
 				IWorkbenchPage page = TXMWindows.getActivePage();
-				StatusLine.setMessage(CAUIMessages.ComputeCorrespondanceAnalysis_14);
+				StatusLine.setMessage(CAUIMessages.openingTheCorrespondenceAnalysisResults);
 				IEditorPart editor = page.openEditor(editorInput, CAEditor.class.getName());
 				
 			}
@@ -200,4 +200,4 @@
 		return null;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java	(revision 1334)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java	(revision 1335)
@@ -18,8 +18,7 @@
 	public static String RESULT_TYPE;
 
 	
-	public static String Referencer_1;
-	public static String Referencer_2;
+	public static String referencerExportFailedDDot; 
 	
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages.properties
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages.properties	(revision 1335)
@@ -1,5 +1,4 @@
-
-RESULT_TYPE = Referencer
-
-Referencer_1 = Referencer
-Referencer_2 = Referencer export failed: 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+referencerExportFailedDDot=Referencer export failed\: 
+RESULT_TYPE=Referencer
Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-RESULT_TYPE = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+RESULT_TYPE=
Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_fr.properties	(revision 1335)
@@ -1,5 +1,4 @@
-
-RESULT_TYPE = Références
-
-Referencer_1 = Références
-Referencer_2 = Références : l'export a échoué :  
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+referencerExportFailedDDot=Références \: l'export a échoué \:  
+RESULT_TYPE=Références
Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java	(revision 1334)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java	(revision 1335)
@@ -18,31 +18,31 @@
 // You should have received a copy of the GNU General
 // Public License along with the TXM platform. If not, see
 // http://www.gnu.org/licenses.
-
-//
-// This file is part of the TXM platform.
-//
-// The TXM platform is free software: you can redistribute it and/or modif y
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// The TXM platform is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with the TXM platform.  If not, see <http://www.gnu.org/licenses/>.
-// 
-// 
-// 
-// $LastChangedDate: 2016-11-29 16:47:07 +0100 (Tue, 29 Nov 2016) $
-// $LastChangedRevision: 3349 $
-// $LastChangedBy: mdecorde $ 
-//
-package org.txm.referencer.core.functions;
-
+
+//
+// This file is part of the TXM platform.
+//
+// The TXM platform is free software: you can redistribute it and/or modif y
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The TXM platform is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with the TXM platform.  If not, see <http://www.gnu.org/licenses/>.
+// 
+// 
+// 
+// $LastChangedDate: 2016-11-29 16:47:07 +0100 (Tue, 29 Nov 2016) $
+// $LastChangedRevision: 3349 $
+// $LastChangedBy: mdecorde $ 
+//
+package org.txm.referencer.core.functions;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -74,50 +74,50 @@
 import org.txm.statsengine.r.core.RWorkspace;
 import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
 import org.txm.utils.logger.Log;
-
-/**
+
+/**
  * The Class Referencer computes the references of a query
  * 
  * @author mdecorde
- * @author sjacquot
- */
-public class Referencer extends TXMResult  {
-
-	/** The noref. */
-	protected static int noref = 1;
-
-	/** The prefix r. */
-	protected static String prefixR = "Referencer"; //$NON-NLS-1$
-
-	/** The indexes. */
-	int[] indexes;
-
-	/** The lines. */
-	List<Line> lines;
-
-	/** The cache. */
-	//private Map<Property, CqpDataProxy> cache;
-
-	/** The matches. */
+ * @author sjacquot
+ */
+public class Referencer extends TXMResult  {
+
+	/** The noref. */
+	protected static int noref = 1;
+
+	/** The prefix r. */
+	protected static String prefixR = "Referencer"; //$NON-NLS-1$
+
+	/** The indexes. */
+	int[] indexes;
+
+	/** The lines. */
+	List<Line> lines;
+
+	/** The cache. */
+	//private Map<Property, CqpDataProxy> cache;
+
+	/** The matches. */
 	List<Match> matches;
 
 	/** The positions. */
 	int[] positions;
 
-	/** The nlines. */
-	int nlines;
-
-	/** The processed idx. */
-	HashMap<Integer, Line> processedIdx;
-
-	/** The result. */
-	QueryResult result;
-
-	/** The symbol. */
-	private String symbol;
-
+	/** The nlines. */
+	int nlines;
+
+	/** The processed idx. */
+	HashMap<Integer, Line> processedIdx;
+
+	/** The result. */
+	QueryResult result;
+
+	/** The symbol. */
+	private String symbol;
+
 	/** The writer. */
-	private BufferedWriter writer;
+	private BufferedWriter writer;
 
 	
 	
@@ -141,14 +141,14 @@
 	
 	
 	
-	
-	/**
-	 * Creates a not computed referencer.
-	 *
-	 * @param parent the parent corpus
-	 */
+	
+	/**
+	 * Creates a not computed referencer.
+	 *
+	 * @param parent the parent corpus
+	 */
 	public Referencer(CQPCorpus parent) {
-		super(parent);
+		super(parent);
 	}
 
 	
@@ -160,42 +160,42 @@
 		super(parametersNodePath);
 	}
 
-	
-	/**
-	 * As r matrix.
-	 *
-	 * @return the string
-	 * @throws RWorkspaceException the r workspace exception
-	 */
-	public String asRMatrix() throws RWorkspaceException {
-
-		String keywords[] = new String[lines.size()];
-		for(int i = 0 ; i < lines.size() ; i++)
-			keywords[i] = lines.get(i).getPropValue();
-		//System.out.println(Arrays.toString(keywords));
-
-		String symbol = prefixR+noref;
-
-		RWorkspace rw = RWorkspace.getRWorkspaceInstance();
-		rw.eval(symbol+" <- list()"); //$NON-NLS-1$
-		rw.addVectorToWorkspace("refkeywords", keywords); //$NON-NLS-1$
-		rw.eval(symbol+"$keywords <- refkeywords"); //$NON-NLS-1$
-		//rw.eval(symbol+"$query <- \""+this.query.getQueryString()+"\")");
-		rw.eval(symbol+"$refs <- list()"); //$NON-NLS-1$
-		int i = 1;
-		for (Line line : this.lines) {
-			String refs[] = line.getReferences().toArray(new String[line.getReferences().size()]);
-			//System.out.println(line.getPropValue()+": "+Arrays.toString(refs));
-			rw.addVectorToWorkspace("reflinerefs", refs); //$NON-NLS-1$
-			rw.eval(symbol+"$refs[["+i+"]] <- reflinerefs"); //$NON-NLS-1$ //$NON-NLS-2$
-			i++;
-		}
-
-		noref++;
-		this.symbol = symbol;
-		return symbol;
-	}
-
+	
+	/**
+	 * As r matrix.
+	 *
+	 * @return the string
+	 * @throws RWorkspaceException the r workspace exception
+	 */
+	public String asRMatrix() throws RWorkspaceException {
+
+		String keywords[] = new String[lines.size()];
+		for(int i = 0 ; i < lines.size() ; i++)
+			keywords[i] = lines.get(i).getPropValue();
+		//System.out.println(Arrays.toString(keywords));
+
+		String symbol = prefixR+noref;
+
+		RWorkspace rw = RWorkspace.getRWorkspaceInstance();
+		rw.eval(symbol+" <- list()"); //$NON-NLS-1$
+		rw.addVectorToWorkspace("refkeywords", keywords); //$NON-NLS-1$
+		rw.eval(symbol+"$keywords <- refkeywords"); //$NON-NLS-1$
+		//rw.eval(symbol+"$query <- \""+this.query.getQueryString()+"\")");
+		rw.eval(symbol+"$refs <- list()"); //$NON-NLS-1$
+		int i = 1;
+		for (Line line : this.lines) {
+			String refs[] = line.getReferences().toArray(new String[line.getReferences().size()]);
+			//System.out.println(line.getPropValue()+": "+Arrays.toString(refs));
+			rw.addVectorToWorkspace("reflinerefs", refs); //$NON-NLS-1$
+			rw.eval(symbol+"$refs[["+i+"]] <- reflinerefs"); //$NON-NLS-1$ //$NON-NLS-2$
+			i++;
+		}
+
+		noref++;
+		this.symbol = symbol;
+		return symbol;
+	}
+
 	@Override
 	public void clean() {
 		try {
@@ -207,143 +207,143 @@
 			// TODO Auto-generated catch block
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
-	}
-
-	/**
-	 * Clears all lines.
-	 */
-	public void clearAllLines()	{
-		for(Line line : lines) { // we need to recompute lines references
-			line.clear();
-		}
-	}
-
-	/**
-	 * Calls in order all stages to compute the referencer.
-	 *
-	 * @return true, if successful
+	}
+
+	/**
+	 * Clears all lines.
 	 */
-	@Override
-	protected boolean _compute() {
+	public void clearAllLines()	{
+		for(Line line : lines) { // we need to recompute lines references
+			line.clear();
+		}
+	}
+
+	/**
+	 * Calls in order all stages to compute the referencer.
+	 *
+	 * @return true, if successful
+	 */
+	@Override
+	protected boolean _compute() {
 		try {
-			if (!getQueryMatches()) {
+			if (!getQueryMatches()) {
 				return false;
-			}
-
-			if (!getQueryindexes()) {
+			}
+
+			if (!getQueryindexes()) {
 				return false;
-			}
-
-			if (!groupPositionsbyId()) {
+			}
+
+			if (!groupPositionsbyId()) {
 				return false;
 			}
 		}
 		catch(CqiClientException e) {
 			e.printStackTrace();
 			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Gets the parent corpus.
-	 *
-	 * @return the corpus
-	 */
-	public CQPCorpus getCorpus() {
-		return (CQPCorpus) this.parent;
-	}
-
+		}
+
+		return true;
+	}
+
+	/**
+	 * Gets the parent corpus.
+	 *
+	 * @return the corpus
+	 */
+	public CQPCorpus getCorpus() {
+		return (CQPCorpus) this.parent;
+	}
+
 	@Override
 	public String getDetails() {
 		return getCorpus().getName();
-	}
-
-	/**
-	 * Gets the lines.
-	 *
-	 * @return the lines
-	 * @throws CqiClientException the cqi client exception
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws CqiServerError the cqi server error
-	 */
-	public List<Line> getLines() throws CqiClientException, IOException, CqiServerError {
-		return getLines(0,lines.size());
-	}
-
-	/**
-	 * Gets the lines.
-	 *
-	 * @param from the from
-	 * @param to the to
-	 * @return the lines
-	 * @throws CqiClientException the cqi client exception
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws CqiServerError the cqi server error
-	 */
-	public List<Line> getLines(int from, int to) throws CqiClientException, IOException, CqiServerError {
-		if (from < 0) {
+	}
+
+	/**
+	 * Gets the lines.
+	 *
+	 * @return the lines
+	 * @throws CqiClientException the cqi client exception
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws CqiServerError the cqi server error
+	 */
+	public List<Line> getLines() throws CqiClientException, IOException, CqiServerError {
+		return getLines(0,lines.size());
+	}
+
+	/**
+	 * Gets the lines.
+	 *
+	 * @param from the from
+	 * @param to the to
+	 * @return the lines
+	 * @throws CqiClientException the cqi client exception
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 * @throws CqiServerError the cqi server error
+	 */
+	public List<Line> getLines(int from, int to) throws CqiClientException, IOException, CqiServerError {
+		if (from < 0) {
 			from = 0;
-		}
-		if (to > lines.size()) {
+		}
+		if (to > lines.size()) {
 			to = lines.size();
-		}
-
-		HashMap<Integer, Line> lineswithoutpropvalue = new HashMap<Integer, Line>();
-
-		AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
-		//build Missing lines
-		for(int i = from ; i < to ; i++) { // for each position group
-			Line l = lines.get(i);
-			if (l.notcomputed) {
-				lineswithoutpropvalue.put(l.id, l);
-
-				// get all reference values of all position of the line
-				Map<Property, List<List<String>>> refValues = new HashMap<Property, List<List<String>>>();
-				for (Property property : pPattern) {
-					refValues.put(property, cqiClient.getData(property,
-							l.positions, Collections.nCopies(l.positions.size(), 1)));
-				}
-				// build the Reference object
-				for (int j = 0 ; j < l.positions.size() ; j++) {
-					String propvalue = ""; //$NON-NLS-1$
-					for (Property property : pPattern) {
-						propvalue += refValues.get(property).get(j).get(0) + ", "; //$NON-NLS-1$
-					}
-
-					l.addReference(propvalue.substring(0, propvalue.length()-2));
-				}
-				if (pHierarchicSort) {
+		}
+
+		HashMap<Integer, Line> lineswithoutpropvalue = new HashMap<Integer, Line>();
+
+		AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
+		//build Missing lines
+		for(int i = from ; i < to ; i++) { // for each position group
+			Line l = lines.get(i);
+			if (l.notcomputed) {
+				lineswithoutpropvalue.put(l.id, l);
+
+				// get all reference values of all position of the line
+				Map<Property, List<List<String>>> refValues = new HashMap<Property, List<List<String>>>();
+				for (Property property : pPattern) {
+					refValues.put(property, cqiClient.getData(property,
+							l.positions, Collections.nCopies(l.positions.size(), 1)));
+				}
+				// build the Reference object
+				for (int j = 0 ; j < l.positions.size() ; j++) {
+					String propvalue = ""; //$NON-NLS-1$
+					for (Property property : pPattern) {
+						propvalue += refValues.get(property).get(j).get(0) + ", "; //$NON-NLS-1$
+					}
+
+					l.addReference(propvalue.substring(0, propvalue.length()-2));
+				}
+				if (pHierarchicSort) {
 					l.sortRef(true);
-				}
-				else {
+				}
+				else {
 					l.sortAlpha();
-				}
-				l.notcomputed = false;
-			}
-		}
-
-		// get idx String value
-		int[] idxwithoutvalues = new int[lineswithoutpropvalue.keySet().size()];
-		int count = 0;
-		for(int i : lineswithoutpropvalue.keySet()) {
-			idxwithoutvalues[count++] = i;
-		}
-
-		String[] values = CorpusManager.getCorpusManager().getCqiClient().id2Str(pProperty.getQualifiedName(), idxwithoutvalues);
-		for(int i = 0 ; i < values.length ; i++) {
-			int id = idxwithoutvalues[i];
-			lineswithoutpropvalue.get(id).linepropvalue = values[i];
-		}
-		return lines.subList(from, to);
-	}
-
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
+				}
+				l.notcomputed = false;
+			}
+		}
+
+		// get idx String value
+		int[] idxwithoutvalues = new int[lineswithoutpropvalue.keySet().size()];
+		int count = 0;
+		for(int i : lineswithoutpropvalue.keySet()) {
+			idxwithoutvalues[count++] = i;
+		}
+
+		String[] values = CorpusManager.getCorpusManager().getCqiClient().id2Str(pProperty.getQualifiedName(), idxwithoutvalues);
+		for(int i = 0 ; i < values.length ; i++) {
+			int id = idxwithoutvalues[i];
+			lineswithoutpropvalue.get(id).linepropvalue = values[i];
+		}
+		return lines.subList(from, to);
+	}
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
 	public String getName() {
 		try {
 			return getCorpus().getName() + ": " + pQuery; //$NON-NLS-1$
@@ -351,82 +351,82 @@
 		catch (Exception e) {
 			return this.getEmptyName();
 		}
-	}
-
-	/**
-	 * Gets the n lines.
-	 *
-	 * @return the n lines
-	 */
-	public int getNLines() {
-		return nlines;
-	}
-
-	/**
-	 * Gets the pattern.
-	 *
-	 * @return the pattern
-	 */
-	public List<StructuralUnitProperty> getPattern() {
-		return pPattern;
-	}
-
-	/**
-	 * Gets the property.
-	 *
-	 * @return the property
-	 */
-	public Property getProperty() {
-		return pProperty;
-	}
-
-	/**
-	 * Gets the query.
-	 *
-	 * @return the query
-	 */
-	public CQLQuery getQuery() {
-		return pQuery;
-	}
-
-	/**
-	 * 2nd step.
-	 *
-	 * @return the queryindexes
-	 */
-	public boolean getQueryindexes(){
-		try {
-			positions = new int[matches.size()];
-			int i = 0;
-			for (Match m : matches) {
-				positions[i++] = m.getStart();
-			}
-
-			indexes = CorpusManager.getCorpusManager().getCqiClient().cpos2Id(pProperty.getQualifiedName(),positions);
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			org.txm.utils.logger.Log.printStackTrace(e);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * 1st step.
-	 *
-	 * @return the query matches
-	 * @throws CqiClientException 
-	 */
-	public boolean getQueryMatches() throws CqiClientException{
-		result = this.getCorpus().query(pQuery, ReferencerCoreMessages.Referencer_1, false);
-		if (result.getNMatch() == 0) {
+	}
+
+	/**
+	 * Gets the n lines.
+	 *
+	 * @return the n lines
+	 */
+	public int getNLines() {
+		return nlines;
+	}
+
+	/**
+	 * Gets the pattern.
+	 *
+	 * @return the pattern
+	 */
+	public List<StructuralUnitProperty> getPattern() {
+		return pPattern;
+	}
+
+	/**
+	 * Gets the property.
+	 *
+	 * @return the property
+	 */
+	public Property getProperty() {
+		return pProperty;
+	}
+
+	/**
+	 * Gets the query.
+	 *
+	 * @return the query
+	 */
+	public CQLQuery getQuery() {
+		return pQuery;
+	}
+
+	/**
+	 * 2nd step.
+	 *
+	 * @return the queryindexes
+	 */
+	public boolean getQueryindexes(){
+		try {
+			positions = new int[matches.size()];
+			int i = 0;
+			for (Match m : matches) {
+				positions[i++] = m.getStart();
+			}
+
+			indexes = CorpusManager.getCorpusManager().getCqiClient().cpos2Id(pProperty.getQualifiedName(),positions);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			org.txm.utils.logger.Log.printStackTrace(e);
 			return false;
-		}
+		}
+		return true;
+	}
+
+	/**
+	 * 1st step.
+	 *
+	 * @return the query matches
+	 * @throws CqiClientException 
+	 */
+	public boolean getQueryMatches() throws CqiClientException{
+		result = this.getCorpus().query(pQuery, ReferencerCoreMessages.RESULT_TYPE, false);
+		if (result.getNMatch() == 0) {
+			return false;
+		}
 		matches = result.getMatches();
-		result.drop();
-		return true;
-	}
-
+		result.drop();
+		return true;
+	}
+
 	@Override
 	public String getSimpleName() {
 		try {
@@ -435,125 +435,125 @@
 		catch (Exception e) {
 			return this.getEmptyName();
 		}
-	}
-
-	/**
-	 * Gets the symbol.
-	 *
-	 * @return the symbol
-	 */
-	public String getSymbol() {
-		return symbol;
-	}
-
+	}
+
+	/**
+	 * Gets the symbol.
+	 *
+	 * @return the symbol
+	 */
+	public String getSymbol() {
+		return symbol;
+	}
+
 	public int getV() {
 		if (matches == null) {
 			return 0;
 		}
 		return matches.size();
-	}
-
-	/**
-	 * 3rd stage.
-	 *
-	 * @return true, if successful
-	 */
-	public boolean groupPositionsbyId() {
-		processedIdx = new HashMap<Integer, Line>();
-
-		lines = new ArrayList<Line>();
-		//System.out.println("indexes ");
-		for (int i = 0 ; i < indexes.length ; i++) {
-			int id = indexes[i];
-			//System.out.print(" "+id);
-			if (!processedIdx.containsKey(id)) {	
-				//System.out.println("add idx "+id);
-				Line l = new Line(id);
-				processedIdx.put(id, l);
-
-				lines.add(l);
-			}
-			processedIdx.get(id).addPosition(positions[i]);
-		}
-
-		nlines = processedIdx.keySet().size();
-		return true;
-	}
-
+	}
+
+	/**
+	 * 3rd stage.
+	 *
+	 * @return true, if successful
+	 */
+	public boolean groupPositionsbyId() {
+		processedIdx = new HashMap<Integer, Line>();
+
+		lines = new ArrayList<Line>();
+		//System.out.println("indexes ");
+		for (int i = 0 ; i < indexes.length ; i++) {
+			int id = indexes[i];
+			//System.out.print(" "+id);
+			if (!processedIdx.containsKey(id)) {	
+				//System.out.println("add idx "+id);
+				Line l = new Line(id);
+				processedIdx.put(id, l);
+
+				lines.add(l);
+			}
+			processedIdx.get(id).addPosition(positions[i]);
+		}
+
+		nlines = processedIdx.keySet().size();
+		return true;
+	}
+
 	public void setParameters(CQLQuery query, Property prop, List<StructuralUnitProperty> pattern, Boolean hierarchicSort) {
 		if (query != null) this.pQuery = query;
 		if (pattern != null) this.pPattern = pattern;
 		if (prop != null) this.pProperty = prop;
 		if (hierarchicSort != null) this.pHierarchicSort = hierarchicSort;
 		dirty = true;
-	}
-
+	}
+
 	@Override
 	public boolean setParameters(TXMParameters parameters) {
 		return false;
-	}
+	}
 
-	/**
-	 * Write all the lines in a file.
-	 *
-	 * @param outfile the outfile
-	 * @param encoding the encoding
-	 * @return true, if successful
-	 */
-	public boolean toTxt(File outfile, String encoding) {
-
-		return toTxt(outfile, encoding, "\t", ""); //$NON-NLS-1$ //$NON-NLS-2$
+	/**
+	 * Write all the lines in a file.
+	 *
+	 * @param outfile the outfile
+	 * @param encoding the encoding
+	 * @return true, if successful
+	 */
+	public boolean toTxt(File outfile, String encoding) {
+
+		return toTxt(outfile, encoding, "\t", ""); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
-	/**
-	 * Write all the lines in a file.
-	 *
-	 * @param outfile the outfile
-	 * @param encoding the encoding
-	 * @param colseparator the colseparator
-	 * @param txtseparator the txtseparator
-	 * @return true, if successful
-	 */
-	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) {
+	/**
+	 * Write all the lines in a file.
+	 *
+	 * @param outfile the outfile
+	 * @param encoding the encoding
+	 * @param colseparator the colseparator
+	 * @param txtseparator the txtseparator
+	 * @return true, if successful
+	 */
+	public boolean toTxt(File outfile, String encoding, String colseparator, String txtseparator) {
 		try {
-			// NK: writer declared as class attribute to perform a clean if the operation is interrupted
-			this.writer = new BufferedWriter(new OutputStreamWriter(
-					new FileOutputStream(outfile), encoding)); 
-			// if ("UTF-8".equals(encoding)) writer.write('\ufeff'); // UTF-8 BOM
-			toTxt(writer, 0, lines.size() - 1, colseparator, txtseparator);
-		} catch (Exception e) {
-			System.err.println(ReferencerCoreMessages.Referencer_2 + Log.toString(e));
-			return false;
-		}
-		return true;
+			// NK: writer declared as class attribute to perform a clean if the operation is interrupted
+			this.writer = new BufferedWriter(new OutputStreamWriter(
+					new FileOutputStream(outfile), encoding)); 
+			// if ("UTF-8".equals(encoding)) writer.write('\ufeff'); // UTF-8 BOM
+			toTxt(writer, 0, lines.size() - 1, colseparator, txtseparator);
+		} catch (Exception e) {
+			System.err.println(ReferencerCoreMessages.referencerExportFailedDDot + Log.toString(e));
+			return false;
+		}
+		return true;
 	}
 
-	/**
-	 * Write the lines between from and to in a writer.
-	 *
-	 * @param writer Where to write the lines
-	 * @param from The first line to be written
-	 * @param to The last line to be writen
-	 * @param colseparator the colseparator
-	 * @param txtseparator the txtseparator
-	 * @throws CqiClientException the cqi client exception
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	public void toTxt(Writer writer, int from, int to, String colseparator, String txtseparator)
-			throws CqiClientException, IOException {
-		try {
-			getLines(0, 9999999);
-			writer.write(pProperty.getName()+colseparator+this.pPattern+"\n"); //$NON-NLS-1$
-			for (Line line : lines) {
-				writer.write(txtseparator+line.getPropValue().replace(txtseparator, txtseparator+txtseparator)+txtseparator+ colseparator + txtseparator+ line.getReferences().toString().replace(txtseparator, txtseparator+txtseparator)+txtseparator+"\n"); //$NON-NLS-1$
-				writer.flush();
-			}
-
-			writer.close();
-		} catch (CqiServerError e) {
-			// TODO Auto-generated catch block
-			org.txm.utils.logger.Log.printStackTrace(e);
-		}
+	/**
+	 * Write the lines between from and to in a writer.
+	 *
+	 * @param writer Where to write the lines
+	 * @param from The first line to be written
+	 * @param to The last line to be writen
+	 * @param colseparator the colseparator
+	 * @param txtseparator the txtseparator
+	 * @throws CqiClientException the cqi client exception
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	public void toTxt(Writer writer, int from, int to, String colseparator, String txtseparator)
+			throws CqiClientException, IOException {
+		try {
+			getLines(0, 9999999);
+			writer.write(pProperty.getName()+colseparator+this.pPattern+"\n"); //$NON-NLS-1$
+			for (Line line : lines) {
+				writer.write(txtseparator+line.getPropValue().replace(txtseparator, txtseparator+txtseparator)+txtseparator+ colseparator + txtseparator+ line.getReferences().toString().replace(txtseparator, txtseparator+txtseparator)+txtseparator+"\n"); //$NON-NLS-1$
+				writer.flush();
+			}
+
+			writer.close();
+		} catch (CqiServerError e) {
+			// TODO Auto-generated catch block
+			org.txm.utils.logger.Log.printStackTrace(e);
+		}
 	}
 
 	@Override
@@ -604,135 +604,135 @@
 
 
 
-	/**
-	 * The Class Line.
-	 */
-	public class Line {
-
-		/** The id. */
-		int id;
-
-		/** The propvalue. */
-		String linepropvalue;
-
-		/** The notcomputed. */
-		boolean notcomputed=true;
-
-		/** The positions. */
-		ArrayList<Integer> positions;
-
-		/** The references. */
-		ArrayList<String> references;
-
-		/** The references counts. */
-		HashMap<String, Integer> referencesCounts = new HashMap<String, Integer>();
-
-		/**
-		 * Instantiates a new line.
-		 *
-		 * @param i the i
-		 */
-		public Line(int i) {
-			id = i;
-			positions = new ArrayList<Integer>();
-			references = new ArrayList<String>();
-		}
-
-		/**
-		 * Adds the position.
-		 *
-		 * @param i the i
-		 */
-		public void addPosition(int i) {
-			positions.add(i);
-		}
-
-		/**
-		 * Adds the reference.
-		 *
-		 * @param string the string
-		 */
-		public void addReference(String string) {
-			if (!referencesCounts.containsKey(string)) {
-				references.add(string);
-				referencesCounts.put(string, 1);
-			} else {
-				referencesCounts.put(string, referencesCounts.get(string)+1);
-			}
-		}
-
-		/**
-		 * Clear.
-		 */
-		public void clear() {
-			notcomputed = false;
-			references = new ArrayList<String>();
-		}
-
-		/**
-		 * Gets the count.
-		 *
-		 * @param ref the ref
-		 * @return the count
-		 */
-		public int getCount(String ref) {
-			return referencesCounts.get(ref);
-		}
-
-		public HashMap<String, Integer> getCounts() {
-			return referencesCounts;
-		}
-
-		/**
-		 * Gets the prop value.
-		 *
-		 * @return the prop value
-		 */
-		public String getPropValue() {
-			return linepropvalue;
-		}
-
-		/**
-		 * Gets the references.
-		 *
-		 * @return the references
-		 */
-		public List<String> getReferences() {
-			return references;
-		}
-
-		/**
-		 * Sort alpha.
-		 */
-		public void sortAlpha() {
-			Collections.sort(references);
-		}
-
-		/**
-		 * Sort ref.
-		 *
-		 * @param reverse the reverse
-		 */
-		public void sortRef(final boolean reverse) {
-			Collections.sort(references, new Comparator<String>() {
-
-				@Override
-				public int compare(String arg0, String arg1) {
-					if (reverse)
-						return getCount(arg1) - getCount(arg0);
-					else
-						return getCount(arg0) - getCount(arg1);
-				}
-			});
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		@Override
-		public String toString() {
-			return linepropvalue+" : <"+id+","+pProperty+"> : "+references.toString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
+	/**
+	 * The Class Line.
+	 */
+	public class Line {
+
+		/** The id. */
+		int id;
+
+		/** The propvalue. */
+		String linepropvalue;
+
+		/** The notcomputed. */
+		boolean notcomputed=true;
+
+		/** The positions. */
+		ArrayList<Integer> positions;
+
+		/** The references. */
+		ArrayList<String> references;
+
+		/** The references counts. */
+		HashMap<String, Integer> referencesCounts = new HashMap<String, Integer>();
+
+		/**
+		 * Instantiates a new line.
+		 *
+		 * @param i the i
+		 */
+		public Line(int i) {
+			id = i;
+			positions = new ArrayList<Integer>();
+			references = new ArrayList<String>();
+		}
+
+		/**
+		 * Adds the position.
+		 *
+		 * @param i the i
+		 */
+		public void addPosition(int i) {
+			positions.add(i);
+		}
+
+		/**
+		 * Adds the reference.
+		 *
+		 * @param string the string
+		 */
+		public void addReference(String string) {
+			if (!referencesCounts.containsKey(string)) {
+				references.add(string);
+				referencesCounts.put(string, 1);
+			} else {
+				referencesCounts.put(string, referencesCounts.get(string)+1);
+			}
+		}
+
+		/**
+		 * Clear.
+		 */
+		public void clear() {
+			notcomputed = false;
+			references = new ArrayList<String>();
+		}
+
+		/**
+		 * Gets the count.
+		 *
+		 * @param ref the ref
+		 * @return the count
+		 */
+		public int getCount(String ref) {
+			return referencesCounts.get(ref);
+		}
+
+		public HashMap<String, Integer> getCounts() {
+			return referencesCounts;
+		}
+
+		/**
+		 * Gets the prop value.
+		 *
+		 * @return the prop value
+		 */
+		public String getPropValue() {
+			return linepropvalue;
+		}
+
+		/**
+		 * Gets the references.
+		 *
+		 * @return the references
+		 */
+		public List<String> getReferences() {
+			return references;
+		}
+
+		/**
+		 * Sort alpha.
+		 */
+		public void sortAlpha() {
+			Collections.sort(references);
+		}
+
+		/**
+		 * Sort ref.
+		 *
+		 * @param reverse the reverse
+		 */
+		public void sortRef(final boolean reverse) {
+			Collections.sort(references, new Comparator<String>() {
+
+				@Override
+				public int compare(String arg0, String arg1) {
+					if (reverse)
+						return getCount(arg1) - getCount(arg0);
+					else
+						return getCount(arg0) - getCount(arg1);
+				}
+			});
+		}
+
+		/* (non-Javadoc)
+		 * @see java.lang.Object#toString()
+		 */
+		@Override
+		public String toString() {
+			return linepropvalue+" : <"+id+","+pProperty+"> : "+references.toString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		}
 	}
 
 	public void setQuery(CQLQuery query) {
@@ -783,5 +783,5 @@
 		return ReferencerCoreMessages.RESULT_TYPE;
 	}
 
-	
-}
+	
+}
\ No newline at end of file
Index: tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java
===================================================================
--- tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java	(revision 1334)
+++ tmp/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java	(revision 1335)
@@ -167,7 +167,7 @@
 		} catch (ThreadDeath td) {
 			return Status.CANCEL_STATUS;
 		} catch (Exception e) {
-			//System.out.println(NLS.bind(TXMUIMessages.RunGroovyScript_8, e));
+			//System.out.println(NLS.bind(TXMUIMessages.errorWhileRunningScriptDDotP0, e));
 			Log.printStackTrace(e);
 			return new Status(Status.ERROR, "org.txm.groovy.core", e.getMessage());
 		} finally {
@@ -179,4 +179,4 @@
 		System.gc();
 		return Status.OK_STATUS;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,28 +1,24 @@
-
-BackToText_0 = Ouverture avec la première édition (pas de défaut) : 
-BackToText_3 = Abandon : erreur pendant la récupération des identifiants de mot.
-BackToText_4 = Pas d'édition disponible.
-BackToText_5 = Ouverture de l'édition par défaut : 
-
-EditionSelectorDialog_0 = éditions
-EditionSelectorDialog_1 = Sélectionner une ou plusieurs éditions.
-
-OpenEdition_0  = Ouverture avec la première édition (pas de défaut) : 
-OpenEdition_1  = Pas d'édition disponible.
-OpenEdition_10 = Erreur lors de l'ouverture de l'éditeur : 
-OpenEdition_3  = Ouverture de l'édition par défaut : 
-OpenEdition_4  = Erreur lors de l''ouverture de l'édition : 
-OpenEdition_7  = \ dans le corpus
-OpenEdition_9  = Abandon : la sélection n'est pas un corpus
-
-SynopticEditionEditor_0  = Premier texte du corpus
-SynopticEditionEditor_1  = Texte précédent
-SynopticEditionEditor_10 = Texte suivant
-SynopticEditionEditor_11 = Dernier texte du corpus
-SynopticEditionEditor_3  = Première page du texte
-SynopticEditionEditor_4  = Page précédente
-SynopticEditionEditor_5  = Pas d'édition trouvée 
-SynopticEditionEditor_6  = Erreur lors de la récupération des éditions disponibles : 
-SynopticEditionEditor_7  = Page suivante
-SynopticEditionEditor_8  = Dernière page du texte
-SynopticEditionEditor_9  = Attention: échec de la récupération de l'édition  
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+abortingDDotSelectionIsNotACorpus=Abandon \: la sélection n'est pas un corpus
+editions=éditions
+errorDDotCouldNotRetrieveLineWordIdsAbortingBackToText=Abandon \: erreur pendant la récupération des identifiants de mot.
+errorWhileGettingAvailableEditionsDDot=Erreur lors de la récupération des éditions disponibles \: 
+errorWhileOpeningEditionDDotP0=Erreur lors de l''ouverture de l'édition \: 
+errorWhileOpeningEditorDDotP0=Erreur lors de l'ouverture de l'éditeur \: 
+firstPageOfTheText=Première page du texte
+firstTextOfTheCorpus=Premier texte du corpus
+inTheCorpus=\ dans le corpus
+lastPageOfTheText=Dernière page du texte
+lastTextOfTheCorpus=Dernier texte du corpus
+nextPage=Page suivante
+nextText=Texte suivant
+noEditionFound=Pas d'édition trouvée 
+noEditionToOpen=Pas d'édition disponible.
+openingDefaultEditionsDDotP0=Ouverture de l'édition par défaut \: 
+openingWithFirstEditionNoDefaultEditionSetDDot=Ouverture avec la première édition (pas de défaut) \: 
+openingWithFirstEditionNoDefaultEditionSetDDotP0=Ouverture avec la première édition (pas de défaut) \: 
+previousPage=Page précédente
+previousText=Texte précédent
+selectOneOrMoreEditions=Sélectionner une ou plusieurs éditions.
+warningDDotCouldNotFindEditionForNameEqualsP0=Attention\: échec de la récupération de l'édition  
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/EditionUIMessages.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/EditionUIMessages.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/EditionUIMessages.java	(revision 1335)
@@ -14,68 +14,65 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.edition.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String BackToText_0;
-	public static String BackToText_3;
-	public static String BackToText_4;
-	public static String BackToText_5;
-	public static String EditionSelectorDialog_0;
-	public static String EditionSelectorDialog_1;
-	public static String editor_controls;
+	public static String openingWithFirstEditionNoDefaultEditionSetDDotP0; 
+	public static String errorDDotCouldNotRetrieveLineWordIdsAbortingBackToText; 
+	public static String noEditionToOpen; 
+	public static String openingDefaultEditionsDDotP0; 
+	public static String editions; 
+	public static String selectOneOrMoreEditions; 
+	public static String controls; 
 
-	public static String editor_empty;
+	public static String CommandLink_empty; 
 
-	public static String editor_page_navigation_buttons;
+	public static String pageButtons; 
 
-	public static String editor_text_navigation_buttons;
+	public static String textButtons; 
 
-	public static String editor_warning_no_id_parameter;
+	public static String cannotCallTxmcommandWithoutIdParameterDDotP0; 
 
-	public static String editor_warning_unknowned_param_id;
+	public static String warningDDotUnknownedParameterIdEqualsP0; 
 
 	public static String error_while_reading;
 
-	public static String menu_back;
+	public static String back; 
 
-	public static String menu_copy_text_selection;
+	public static String copyTextSelection; 
 
-	public static String menu_forward;
+	public static String forward; 
 
-	public static String menu_reload;
+	public static String reload; 
 
-	public static String OpenEdition_0;
-	public static String OpenEdition_1;
-	public static String OpenEdition_10;
-	public static String OpenEdition_3;
-	public static String OpenEdition_4;
-	public static String OpenEdition_7;
-	public static String OpenEdition_9;
-	public static String SynopticEditionEditor_0;
-	public static String SynopticEditionEditor_1;
-	public static String SynopticEditionEditor_10;
-	public static String SynopticEditionEditor_11;
-	public static String SynopticEditionEditor_3;
-	public static String SynopticEditionEditor_4;
-	public static String SynopticEditionEditor_5;
-	public static String SynopticEditionEditor_6;
-	public static String SynopticEditionEditor_7;
-	public static String SynopticEditionEditor_8;
-	public static String SynopticEditionEditor_9;
+	public static String openingWithFirstEditionNoDefaultEditionSetDDot; 
+	public static String errorWhileOpeningEditorDDotP0; 
+	public static String errorWhileOpeningEditionDDotP0; 
+	public static String inTheCorpus; 
+	public static String abortingDDotSelectionIsNotACorpus; 
+	public static String firstTextOfTheCorpus; 
+	public static String previousText; 
+	public static String nextText; 
+	public static String lastTextOfTheCorpus; 
+	public static String firstPageOfTheText; 
+	public static String previousPage; 
+	public static String noEditionFound; 
+	public static String errorWhileGettingAvailableEditionsDDot; 
+	public static String nextPage; 
+	public static String lastPageOfTheText; 
+	public static String warningDDotCouldNotFindEditionForNameEqualsP0; 
 
-	public static String warning_no_edition_found;
+	public static String noEditionFoundForTextEqualsP0AndEditionEqualsP1; 
 
-	public static String warning_no_edition_with_name;
+	public static String noEditionWithNameEqualsP0AvailableForTextEqualsP1; 
 
-	public static String warning_no_first_page;
+	public static String failToRetrieveFirstPageOfEditionEqualsP0AndTextEqualsP1; 
 
-	public static String warning_page_not_found;
+	public static String pageNotFoundP0; 
 
-	public static String warning_script_returned;
+	public static String sCRIPTRETURNEDEqualsP0; 
 	
-	public static String preference_preference_fast_highlight;
-	public static String preference_title;
+	public static String enableFastWordHighlight; 
+	public static String edition; 
 	
-	public static String CommandLink_empty;
-	public static String EditionLink_error_no_arguments;
+	public static String errorDDotTxmeditioncorpusidEditionidTextidWordidCalledWithNoArguments; 
 	
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/messages/messages.properties	(revision 1335)
@@ -1,51 +1,43 @@
-
-BackToText_0 = Opening with first edition (no default edition set): {0}
-BackToText_3 = Error: could not retrieve line word ids. Aborting back to text.
-BackToText_4 = No edition to open.
-BackToText_5 = Opening default editions: {0}
-
-warning_no_edition_found=No edition found for text={0} and edition={1}
-warning_no_first_page=Fail to retrieve first page of edition={0} and text={1}
-error_while_reading=Error while reading {0}: {1}
-warning_script_returned=SCRIPT RETURNED={0}
-menu_copy_text_selection=Copy text selection
-menu_reload=Reload
-menu_back=Back
-menu_forward=Forward
-warning_page_not_found=Page not found ({0}).
-warning_no_edition_with_name=No edition with name={0} available for text={1}
-
-EditionSelectorDialog_0 = Editions
-EditionSelectorDialog_1 = Select one or more editions
-editor_controls=controls
-editor_empty=
-editor_page_navigation_buttons=page buttons
-editor_text_navigation_buttons=text buttons
-editor_warning_no_id_parameter=Cannot call txmcommand without 'id' parameter: {0}
-editor_warning_unknowned_param_id=warning: unknowned parameter id={0}
-
-OpenEdition_0  = Opening with first edition (no default edition set): 
-OpenEdition_1  = No edition to open.
-OpenEdition_10 = Error while opening editor: {0}
-OpenEdition_3  = Opening default editions: {0}
-OpenEdition_4  = Error while opening edition: {0}
-OpenEdition_7  = \ in the corpus
-OpenEdition_9  = Aborting: selection is not a corpus
-
-SynopticEditionEditor_0  = First text of the corpus
-SynopticEditionEditor_1  = Previous text
-SynopticEditionEditor_10 = Next text
-SynopticEditionEditor_11 = Last text of the corpus
-SynopticEditionEditor_3  = First page of the text
-SynopticEditionEditor_4  = Previous page
-SynopticEditionEditor_5  = No edition found
-SynopticEditionEditor_6  = Error while getting available editions: 
-SynopticEditionEditor_7  = Next page
-SynopticEditionEditor_8  = Last page of the text
-SynopticEditionEditor_9  = Warning: could not find edition for name={0}
-
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+abortingDDotSelectionIsNotACorpus=Aborting\: selection is not a corpus
+back=Back
+cannotCallTxmcommandWithoutIdParameterDDotP0=Cannot call txmcommand without 'id' parameter\: {0}
 CommandLink_empty=
-EditionLink_error_no_arguments=Error: txmedition(corpusid, editionid?, textid?, wordid?) called with no arguments
-
-preference_preference_fast_highlight=Enable fast word highlight
-preference_title=Edition
+controls=controls
+copyTextSelection=Copy text selection
+edition=Edition
+editions=Editions
+enableFastWordHighlight=Enable fast word highlight
+error_while_reading=Error while reading {0}\: {1}
+errorDDotCouldNotRetrieveLineWordIdsAbortingBackToText=Error\: could not retrieve line word ids. Aborting back to text.
+errorDDotTxmeditioncorpusidEditionidTextidWordidCalledWithNoArguments=Error\: txmedition(corpusid, editionid?, textid?, wordid?) called with no arguments
+errorWhileGettingAvailableEditionsDDot=Error while getting available editions\: 
+errorWhileOpeningEditionDDotP0=Error while opening edition\: {0}
+errorWhileOpeningEditorDDotP0=Error while opening editor\: {0}
+failToRetrieveFirstPageOfEditionEqualsP0AndTextEqualsP1=Fail to retrieve first page of edition\={0} and text\={1}
+firstPageOfTheText=First page of the text
+firstTextOfTheCorpus=First text of the corpus
+forward=Forward
+inTheCorpus=\ in the corpus
+lastPageOfTheText=Last page of the text
+lastTextOfTheCorpus=Last text of the corpus
+nextPage=Next page
+nextText=Next text
+noEditionFound=No edition found
+noEditionFoundForTextEqualsP0AndEditionEqualsP1=No edition found for text\={0} and edition\={1}
+noEditionToOpen=No edition to open.
+noEditionWithNameEqualsP0AvailableForTextEqualsP1=No edition with name\={0} available for text\={1}
+openingDefaultEditionsDDotP0=Opening default editions\: {0}
+openingWithFirstEditionNoDefaultEditionSetDDot=Opening with first edition (no default edition set)\: 
+openingWithFirstEditionNoDefaultEditionSetDDotP0=Opening with first edition (no default edition set)\: {0}
+pageButtons=page buttons
+pageNotFoundP0=Page not found ({0}).
+previousPage=Previous page
+previousText=Previous text
+reload=Reload
+sCRIPTRETURNEDEqualsP0=SCRIPT RETURNED\={0}
+selectOneOrMoreEditions=Select one or more editions
+textButtons=text buttons
+warningDDotCouldNotFindEditionForNameEqualsP0=Warning\: could not find edition for name\={0}
+warningDDotUnknownedParameterIdEqualsP0=warning\: unknowned parameter id\={0}
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionLink.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionLink.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionLink.java	(revision 1335)
@@ -45,7 +45,7 @@
 			params.put(id+".textid", null); //$NON-NLS-1$
 			params.put(id+".wordid", null); //$NON-NLS-1$
 		} else {
-			System.out.println(EditionUIMessages.EditionLink_error_no_arguments);
+			System.out.println(EditionUIMessages.errorDDotTxmeditioncorpusidEditionidTextidWordidCalledWithNoArguments);
 			return null;
 		}
 
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java	(revision 1335)
@@ -534,7 +534,7 @@
 		Edition edition = text.getEdition(name);
 
 		if (edition == null) {
-			String s = EditionUIMessages.bind(EditionUIMessages.warning_no_edition_found, text, name);
+			String s = EditionUIMessages.bind(EditionUIMessages.noEditionFoundForTextEqualsP0AndEditionEqualsP1, text, name);
 			System.out.println(s);
 			StatusLine.setMessage(s);
 			Log.severe(s);
@@ -562,7 +562,7 @@
 		currentPage = currentEdition.getFirstPage();
 		currentText = currentEdition.getText();
 		if (currentPage == null) {
-			System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_no_first_page, currentEdition.getName(), currentText.getName()));
+			System.out.println(EditionUIMessages.bind(EditionUIMessages.failToRetrieveFirstPageOfEditionEqualsP0AndTextEqualsP1, currentEdition.getName(), currentText.getName()));
 			return;
 		}
 
@@ -642,7 +642,7 @@
 			String editionName = currentEdition.getName();
 			Edition tmp = firstText.getEdition(editionName);
 			if (tmp == null) {
-				System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_no_edition_with_name, editionName, firstText.getName()));
+				System.out.println(EditionUIMessages.bind(EditionUIMessages.noEditionWithNameEqualsP0AvailableForTextEqualsP1, editionName, firstText.getName()));
 				return;
 			}
 			currentEdition = tmp;
@@ -668,7 +668,7 @@
 			String editionName = currentEdition.getName();
 			Edition tmp = lastText.getEdition(editionName);
 			if (tmp == null) {
-				System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_no_edition_with_name, editionName, lastText.getName()));
+				System.out.println(EditionUIMessages.bind(EditionUIMessages.noEditionWithNameEqualsP0AvailableForTextEqualsP1, editionName, lastText.getName()));
 				return;
 			}
 
@@ -701,7 +701,7 @@
 
 			Edition tmp = previousText.getEdition(editionName);
 			if (tmp == null) {
-				System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_no_edition_with_name, editionName, previousText.getName()));
+				System.out.println(EditionUIMessages.bind(EditionUIMessages.noEditionWithNameEqualsP0AvailableForTextEqualsP1, editionName, previousText.getName()));
 			}
 			currentEdition = tmp;
 			currentText = previousText;
@@ -732,7 +732,7 @@
 			String editionName = currentEdition.getName();
 			Edition tmp = nextText.getEdition(editionName);
 			if (tmp == null) {
-				System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_no_edition_with_name, editionName, nextText.getName()));
+				System.out.println(EditionUIMessages.bind(EditionUIMessages.noEditionWithNameEqualsP0AvailableForTextEqualsP1, editionName, nextText.getName()));
 				return;
 			}
 			currentEdition = tmp;
@@ -755,7 +755,7 @@
 		String editionName = currentEdition.getName();
 		Edition tmp = text.getEdition(editionName);
 		if (tmp == null) {
-			System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_no_edition_with_name, editionName, text.getName()));
+			System.out.println(EditionUIMessages.bind(EditionUIMessages.noEditionWithNameEqualsP0AvailableForTextEqualsP1, editionName, text.getName()));
 			return;
 		}
 
@@ -905,7 +905,7 @@
 				return sel;
 			}
 		} else { 
-			System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_script_returned, ret));
+			System.out.println(EditionUIMessages.bind(EditionUIMessages.sCRIPTRETURNEDEqualsP0, ret));
 			return null;
 		}
 	}
@@ -971,7 +971,7 @@
 				new MenuItem(menu, SWT.SEPARATOR);
 
 				MenuItem copyItem = new MenuItem(menu, SWT.NONE);
-				copyItem.setText(EditionUIMessages.menu_copy_text_selection);
+				copyItem.setText(EditionUIMessages.copyTextSelection);
 				copyItem.addSelectionListener(new SelectionListener() {
 
 					@Override
@@ -989,7 +989,7 @@
 				copyItem.setEnabled(text != null && text.length() > 0);
 
 				MenuItem reloadItem = new MenuItem(menu, SWT.NONE);
-				reloadItem.setText(EditionUIMessages.menu_reload);
+				reloadItem.setText(EditionUIMessages.reload);
 				reloadItem.addSelectionListener(new SelectionListener() {
 
 					@Override
@@ -1001,7 +1001,7 @@
 					public void widgetDefaultSelected(SelectionEvent e) { }
 				});
 				MenuItem backItem = new MenuItem(menu, SWT.NONE);
-				backItem.setText(EditionUIMessages.menu_back);
+				backItem.setText(EditionUIMessages.back);
 				backItem.addSelectionListener(new SelectionListener() {
 
 					@Override
@@ -1013,7 +1013,7 @@
 					public void widgetDefaultSelected(SelectionEvent e) { }
 				});
 				MenuItem forwardItem = new MenuItem(menu, SWT.NONE);
-				forwardItem.setText(EditionUIMessages.menu_forward);
+				forwardItem.setText(EditionUIMessages.forward);
 				forwardItem.addSelectionListener(new SelectionListener() {
 
 					@Override
@@ -1090,7 +1090,7 @@
 			currentPage = next;
 			this.setURL(currentPage.toURL());
 		} else {
-			System.out.println(EditionUIMessages.bind(EditionUIMessages.warning_page_not_found, name));
+			System.out.println(EditionUIMessages.bind(EditionUIMessages.pageNotFoundP0, name));
 		}
 	}
 
@@ -1167,4 +1167,4 @@
 			highlightedColorPerWordIDS.remove(key);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java	(revision 1335)
@@ -140,7 +140,7 @@
 							String s = panel.getTextSelection();
 							if (s.length() > 0) return s;
 						}
-						return EditionUIMessages.editor_empty;
+						return EditionUIMessages.CommandLink_empty;
 					}
 					@Override
 					public int getStartLine() {	return 0;}
@@ -319,7 +319,7 @@
 
 		editionsArea = getResultArea();
 
-		controlsArea = getBottomToolbar().installGLComposite(EditionUIMessages.editor_controls, 15, false);
+		controlsArea = getBottomToolbar().installGLComposite(EditionUIMessages.controls, 15, false);
 		controlsArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		//spacer
 		new Label(controlsArea, SWT.NONE).setText("  "); //$NON-NLS-1$
@@ -355,11 +355,11 @@
 							openEditions(corpus, text, editionNames);
 							firstPage();
 						} else {
-							System.out.println(EditionUIMessages.SynopticEditionEditor_5);
+							System.out.println(EditionUIMessages.noEditionFound);
 						}
 					} catch (Exception e2) {
 						org.txm.rcp.utils.Logger.printStackTrace(e2);
-						System.out.println(EditionUIMessages.SynopticEditionEditor_6+e2);
+						System.out.println(EditionUIMessages.errorWhileGettingAvailableEditionsDDot+e2);
 					}
 				}
 
@@ -371,7 +371,7 @@
 		}
 
 		// Navigation buttons
-		GLComposite pageNavigationComposite = new GLComposite(controlsArea, SWT.NONE, EditionUIMessages.editor_page_navigation_buttons);
+		GLComposite pageNavigationComposite = new GLComposite(controlsArea, SWT.NONE, EditionUIMessages.pageButtons);
 		pageNavigationComposite.getLayout().numColumns = 6;
 		Button first = new Button(pageNavigationComposite, SWT.FLAT|SWT.PUSH);
 		Button previous = new Button(pageNavigationComposite, SWT.FLAT|SWT.PUSH);
@@ -381,11 +381,11 @@
 		Button last = new Button(pageNavigationComposite, SWT.FLAT|SWT.PUSH);
 		pageNavigationComposite.setLayoutData(new GridData(GridData.CENTER, GridData.FILL, true, false));
 		
-		GLComposite textNavigationComposite = new GLComposite(controlsArea, SWT.NONE, EditionUIMessages.editor_text_navigation_buttons);
+		GLComposite textNavigationComposite = new GLComposite(controlsArea, SWT.NONE, EditionUIMessages.textButtons);
 		textNavigationComposite.getLayout().numColumns = 6;
 		Button firstText = new Button(textNavigationComposite, SWT.FLAT);
 		Button previousText = new Button(textNavigationComposite, SWT.FLAT);
-		new Label(textNavigationComposite, SWT.NONE).setText(EditionUIMessages.editor_empty);
+		new Label(textNavigationComposite, SWT.NONE).setText(EditionUIMessages.CommandLink_empty);
 		Button nextText = new Button(textNavigationComposite, SWT.FLAT|SWT.PUSH);
 		Button lastText = new Button(textNavigationComposite, SWT.FLAT|SWT.PUSH);
 		textNavigationComposite.setLayoutData(new GridData(GridData.CENTER, GridData.FILL, false, false));
@@ -431,21 +431,21 @@
 		// set labels
 		page_label.setText(""); //$NON-NLS-1$
 		firstText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWINDSTART));
-		firstText.setToolTipText(EditionUIMessages.SynopticEditionEditor_0); 
+		firstText.setToolTipText(EditionUIMessages.firstTextOfTheCorpus); 
 		previousText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWIND));
-		previousText.setToolTipText(EditionUIMessages.SynopticEditionEditor_1); 
+		previousText.setToolTipText(EditionUIMessages.previousText); 
 		first.setImage(IImageKeys.getImage(IImageKeys.CTRLSTART)); 
-		first.setToolTipText(EditionUIMessages.SynopticEditionEditor_3); 
+		first.setToolTipText(EditionUIMessages.firstPageOfTheText); 
 		previous.setImage(IImageKeys.getImage(IImageKeys.CTRLREVERSE));
-		previous.setToolTipText(EditionUIMessages.SynopticEditionEditor_4); 
+		previous.setToolTipText(EditionUIMessages.previousPage); 
 		next.setImage(IImageKeys.getImage(IImageKeys.CTRLPLAY));
-		next.setToolTipText(EditionUIMessages.SynopticEditionEditor_7); 
+		next.setToolTipText(EditionUIMessages.nextPage); 
 		last.setImage(IImageKeys.getImage(IImageKeys.CTRLEND));
-		last.setToolTipText(EditionUIMessages.SynopticEditionEditor_8);
+		last.setToolTipText(EditionUIMessages.lastPageOfTheText);
 		nextText.setImage(IImageKeys.getImage(IImageKeys.CTRLFASTFORWARD));
-		nextText.setToolTipText(EditionUIMessages.SynopticEditionEditor_10); 
+		nextText.setToolTipText(EditionUIMessages.nextText); 
 		lastText.setImage(IImageKeys.getImage(IImageKeys.CTRLFASTFORWARDEND));
-		lastText.setToolTipText(EditionUIMessages.SynopticEditionEditor_11); 
+		lastText.setToolTipText(EditionUIMessages.lastTextOfTheCorpus); 
 
 		page_text.addKeyListener(new KeyListener() {
 
@@ -635,7 +635,7 @@
 
 				editionPanels.put(editionName, panel);
 			} else {
-				System.out.println(EditionUIMessages.SynopticEditionEditor_9+editionName);
+				System.out.println(EditionUIMessages.warningDDotCouldNotFindEditionForNameEqualsP0+editionName);
 			}
 		}
 		editionsArea.layout();
@@ -717,7 +717,7 @@
 			sel = p.getTextSelection();
 			if (sel != null) return sel;
 		}
-		return EditionUIMessages.editor_empty;
+		return EditionUIMessages.CommandLink_empty;
 	}
 
 	@Override
@@ -836,7 +836,7 @@
 				Parameterization p = new Parameterization(iparam, params.get(k));
 				parameters.add(p);
 			} catch (NotDefinedException e) {
-				System.out.println(EditionUIMessages.editor_warning_unknowned_param_id+k);
+				System.out.println(EditionUIMessages.warningDDotUnknownedParameterIdEqualsP0+k);
 			}
 		}
 
@@ -875,7 +875,7 @@
 			//get the command from plugin.xml
 			callTXMCommand(id, params);
 		} else {
-			System.out.println(EditionUIMessages.editor_warning_no_id_parameter+params);
+			System.out.println(EditionUIMessages.cannotCallTxmcommandWithoutIdParameterDDotP0+params);
 		}
 		return arguments;
 	}
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionSelectorDialog.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionSelectorDialog.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionSelectorDialog.java	(revision 1335)
@@ -38,8 +38,8 @@
 			}
 		});
 
-		setTitle(EditionUIMessages.EditionSelectorDialog_0);
-		setMessage(EditionUIMessages.EditionSelectorDialog_1);
+		setTitle(EditionUIMessages.editions);
+		setMessage(EditionUIMessages.selectOneOrMoreEditions);
 		setMultipleSelection(true);
 		setElements(corpus.getProject().getEditionNames().toArray());
 		setFilter("*"); //$NON-NLS-1$
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java	(revision 1335)
@@ -258,14 +258,14 @@
 					if (editionNames.size() > 0) { // use the first edition declared
 						editionsToOpen = new String[1];
 						editionsToOpen[0] = editionNames.get(0);
-						Log.info(EditionUIMessages.BackToText_0+editionNames.get(0));
+						Log.info(EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDotP0+editionNames.get(0));
 					} else { // no edition in the corpus
-						Log.info(EditionUIMessages.BackToText_4);
+						Log.info(EditionUIMessages.noEditionToOpen);
 						editionsToOpen = new String[0];
 						return false;
 					}
 				} else {
-					Log.info(EditionUIMessages.BackToText_5+StringUtils.join(editionsToOpen));
+					Log.info(EditionUIMessages.openingDefaultEditionsDDotP0+StringUtils.join(editionsToOpen));
 				}
 
 				attachedBrowserEditor = OpenEdition.openEdition(corpus, editionsToOpen);
@@ -310,7 +310,7 @@
 
 			String line_wordid = lineids.get(0);
 			if (line_wordid == null) {
-				System.out.println(EditionUIMessages.BackToText_3);
+				System.out.println(EditionUIMessages.errorDDotCouldNotRetrieveLineWordIdsAbortingBackToText);
 				return false;				
 			}
 
@@ -347,4 +347,4 @@
 		}
 		return false;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java	(revision 1335)
@@ -95,14 +95,14 @@
 					if (editionNames.size() > 0) { // use the first edition declared
 						editionsToOpen = new String[1];
 						editionsToOpen[0] = editionNames.get(0);
-						Log.info(EditionUIMessages.OpenEdition_0+editionNames.get(0));
+						Log.info(EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDot+editionNames.get(0));
 					} else { // no edition in the corpus
-						Log.info(EditionUIMessages.OpenEdition_1);
+						Log.info(EditionUIMessages.noEditionToOpen);
 						editionsToOpen = new String[0];
 						return false;
 					}
 				} else {
-					Log.info(EditionUIMessages.OpenEdition_3+StringUtils.join(editionsToOpen));
+					Log.info(EditionUIMessages.openingDefaultEditionsDDotP0+StringUtils.join(editionsToOpen));
 				}
 
 				editor = openEdition(c, editionsToOpen);
@@ -110,11 +110,11 @@
 				//				if (editor != null)
 				//					editor.firstPage();
 			} catch (Exception e) {
-				System.out.println(EditionUIMessages.OpenEdition_4+e);
+				System.out.println(EditionUIMessages.errorWhileOpeningEditionDDotP0+e);
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 		} else {
-			System.out.println(EditionUIMessages.OpenEdition_9);
+			System.out.println(EditionUIMessages.abortingDDotSelectionIsNotACorpus);
 		}
 		return null;
 	}
@@ -163,7 +163,7 @@
 				text = maincorpus.getProject().getFirstText();
 
 				if (text == null) {
-					System.out.println("** Could not find first text of ID "+textid+EditionUIMessages.OpenEdition_7); //$NON-NLS-1$ //$NON-NLS-1$
+					System.out.println("** Could not find first text of ID "+textid+EditionUIMessages.inTheCorpus); //$NON-NLS-1$ //$NON-NLS-1$
 					return null;
 				}
 
@@ -182,8 +182,8 @@
 
 		} catch (Exception e) {
 			Log.printStackTrace(e);
-			System.out.println(EditionUIMessages.OpenEdition_10+e);
+			System.out.println(EditionUIMessages.errorWhileOpeningEditorDDotP0+e);
 			return null;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/preferences/SynopticEditionPreferencePage.java
===================================================================
--- tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/preferences/SynopticEditionPreferencePage.java	(revision 1334)
+++ tmp/org.txm.edition.rcp/src/org/txm/edition/rcp/preferences/SynopticEditionPreferencePage.java	(revision 1335)
@@ -27,7 +27,7 @@
 		super();
 		preferences = new ScopedPreferenceStore(org.eclipse.core.runtime.preferences.InstanceScope.INSTANCE, Application.PLUGIN_ID);
 		setPreferenceStore(preferences);
-		setTitle(EditionUIMessages.preference_title);
+		setTitle(EditionUIMessages.edition);
 	}
 	
 	@Override
@@ -35,7 +35,7 @@
 
 	@Override
 	protected void createFieldEditors() {
-		fast_highlight = new BooleanFieldEditor(SynopticEditionPreferences.FAST_HIGHLIGHT, EditionUIMessages.preference_preference_fast_highlight, getFieldEditorParent());
+		fast_highlight = new BooleanFieldEditor(SynopticEditionPreferences.FAST_HIGHLIGHT, EditionUIMessages.enableFastWordHighlight, getFieldEditorParent());
 		addField(fast_highlight);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,5 +1,6 @@
-
-InternalViewEditor_16 = Erreur
-InternalViewEditor_25 = requête générée : 
-InternalViewEditor_4  = Structure : 
-InternalViewEditor_5  = Propriété de structure : 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+errorDDot=Erreur
+qUERYDDot=requête générée \: 
+structuralProperties=Propriété de structure \: 
+structure=Structure \: 
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/InternalViewUIMessages.java
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/InternalViewUIMessages.java	(revision 1334)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/InternalViewUIMessages.java	(revision 1335)
@@ -13,16 +13,16 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.internalview.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String ComputeInternalView_1;
+	public static String errorDDotSelectionIsNotACorpus; 
 
-	public static String editor_composite_navigation;
+	public static String navigation; 
 
-	public static String editor_error_backto_match;
+	public static String errorWhileInternalViewGoBackTo; 
 	
-	public static String InternalViewEditor_16;
-	public static String InternalViewEditor_25;
-	public static String InternalViewEditor_4;
-	public static String InternalViewEditor_5;
+	public static String errorDDot; 
+	public static String qUERYDDot; 
+	public static String structure; 
+	public static String structuralProperties; 
 	
 	public static String error_backto_internalview;
 	
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages.properties	(revision 1335)
@@ -1,11 +1,10 @@
-
-ComputeInternalView_1 = Error: selection is not a Corpus
-editor_composite_navigation=navigation
-editor_error_backto_match=Error while internal view go back to 
-
-InternalViewEditor_16 = Error: 
-InternalViewEditor_25 = QUERY:
-InternalViewEditor_4  = Structure 
-InternalViewEditor_5  = Structural properties 
-
-error_backto_internalview=Error: could not open InternalView editor: {0}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_backto_internalview=Error\: could not open InternalView editor\: {0}
+errorDDot=Error\: 
+errorDDotSelectionIsNotACorpus=Error\: selection is not a Corpus
+errorWhileInternalViewGoBackTo=Error while internal view go back to 
+navigation=navigation
+qUERYDDot=QUERY\:
+structuralProperties=Structural properties 
+structure=Structure 
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,5 +1,6 @@
-
-InternalViewEditor_16 = Ошибка
-InternalViewEditor_25 = сформированный запрос: 
-InternalViewEditor_4  = Структура: 
-InternalViewEditor_5  = Свойство структуры: 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+errorDDot=Ошибка
+qUERYDDot=сформированный запрос\: 
+structuralProperties=Свойство структуры\: 
+structure=Структура\: 
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java	(revision 1334)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java	(revision 1335)
@@ -106,7 +106,7 @@
 		
 		// Structural unit selector
 		Label structComboLabel = new Label(parametersArea, SWT.NONE);
-		structComboLabel.setText(InternalViewUIMessages.InternalViewEditor_4);
+		structComboLabel.setText(InternalViewUIMessages.structure);
 		structComboLabel.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, true));
 		this.structuralUnitsComboViewer = new StructuralUnitsComboViewer(parametersArea, this, true);
 		// Listener
@@ -136,11 +136,11 @@
 		structuralUnitPropertiesSelector = new PropertiesSelector<StructuralUnitProperty>(parametersArea);
 		structuralUnitPropertiesSelector.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, true));
 		structuralUnitPropertiesSelector.setLayout(new GridLayout(3, false));
-		structuralUnitPropertiesSelector.setTitle(InternalViewUIMessages.InternalViewEditor_5);
+		structuralUnitPropertiesSelector.setTitle(InternalViewUIMessages.structuralProperties);
 		structuralUnitPropertiesSelector.addSelectionListener(computeSelectionListener);
 		
 		
-		navigationPanel = getBottomToolbar().installGLComposite(InternalViewUIMessages.editor_composite_navigation, 4 , false);
+		navigationPanel = getBottomToolbar().installGLComposite(InternalViewUIMessages.navigation, 4 , false);
 		navigationPanel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 
 		
@@ -257,7 +257,7 @@
 								Integer idx = columnsOrder.get(col);
 								return ""+((Object[])element)[idx]; //$NON-NLS-1$
 							}
-							return InternalViewUIMessages.InternalViewEditor_16;
+							return InternalViewUIMessages.errorDDot;
 						}
 					});
 					columns.put(prop, col);
@@ -304,7 +304,7 @@
 			query.append("\""); //$NON-NLS-1$
 		}
 		query.append("]"); //$NON-NLS-1$
-		System.out.println(InternalViewUIMessages.InternalViewEditor_25+query);
+		System.out.println(InternalViewUIMessages.qUERYDDot+query);
 		return query.toString();
 	}
 
@@ -322,7 +322,7 @@
 			n = CQPSearchEngine.getCqiClient().cpos2Struc(sup.getQualifiedName(), cpos);
 			return goToPage(n[0]);
 		} catch (Exception e) {
-			System.out.println(InternalViewUIMessages.editor_error_backto_match + m);
+			System.out.println(InternalViewUIMessages.errorWhileInternalViewGoBackTo + m);
 			Log.printStackTrace(e);
 		} 
 		return false;
@@ -359,4 +359,4 @@
 			e.printStackTrace();
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/handlers/ComputeInternalView.java
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/handlers/ComputeInternalView.java	(revision 1334)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/handlers/ComputeInternalView.java	(revision 1335)
@@ -39,7 +39,7 @@
 			internalView = (InternalView)selection;
 		}
 		else {
-			System.out.println(InternalViewUIMessages.ComputeInternalView_1);
+			System.out.println(InternalViewUIMessages.errorDDotSelectionIsNotACorpus);
 			return null;
 		}
 		
@@ -48,4 +48,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java	(revision 1334)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java	(revision 1335)
@@ -149,7 +149,7 @@
 		getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		
 		Label queryLabel = new Label(getMainParametersComposite(), SWT.NONE);
-		queryLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10);
+		queryLabel.setText(TXMUIMessages.ampQuery);
 		queryLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 		
 		querywidget = new QueryWidget(getMainParametersComposite(), SWT.None);
@@ -182,7 +182,7 @@
 		patternArea = new PropertiesSelector<StructuralUnitProperty>(paramArea, SWT.NONE);
 		patternArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false,3,1));
 		patternArea.setLayout(new GridLayout(3, false));
-		patternArea.setTitle(ReferencerUIMessages.ReferencerEditor_6);
+		patternArea.setTitle(ReferencerUIMessages.referencePattern);
 		patternArea.addSelectionListener(computeSelectionListener);
 		
 		
@@ -200,7 +200,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ReferencerUIMessages.ReferencerEditor_17);
+				StatusLine.setMessage(ReferencerUIMessages.showingFirstResultPage);
 				fillDisplayArea(0, lineperpage);
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
@@ -214,7 +214,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ReferencerUIMessages.ReferencerEditor_19);
+				StatusLine.setMessage(ReferencerUIMessages.showingLastResultPage);
 				fillDisplayArea(referencer.getNLines()
 						- lineperpage, referencer.getNLines());
 				viewer.getTable().select(0);
@@ -229,7 +229,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ReferencerUIMessages.ReferencerEditor_21);
+				StatusLine.setMessage(ReferencerUIMessages.showingNextResultPage);
 				fillDisplayArea(topLine + lineperpage,
 						bottomLine + lineperpage);
 				viewer.getTable().select(0);
@@ -244,7 +244,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ReferencerUIMessages.ReferencerEditor_23);
+				StatusLine.setMessage(ReferencerUIMessages.showingPreviousResultPage);
 				fillDisplayArea(topLine - lineperpage,
 						bottomLine - lineperpage);
 				viewer.getTable().select(0);
@@ -302,8 +302,8 @@
 		unitColumn.setWidth(200);
 
 		freqColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
-		freqColumn.setText(ReferencerUIMessages.ReferencerEditor_11);
-		freqColumn.setToolTipText(ReferencerUIMessages.ReferencerEditor_11);
+		freqColumn.setText(ReferencerUIMessages.references);
+		freqColumn.setToolTipText(ReferencerUIMessages.references);
 		freqColumn.setWidth(100);
 		
 		initializeFields();
@@ -324,7 +324,7 @@
 		fillDisplayArea(0, lineperpage);
 		
 		viewer.getTable().setFocus();
-		System.out.println(NLS.bind(TXMUIMessages.CreatePartition_5, referencer.getNLines(), referencer.getV()));
+		System.out.println(NLS.bind(TXMUIMessages.doneDDotP0Items, referencer.getNLines(), referencer.getV()));
 	}
 
 
@@ -474,4 +474,4 @@
 	public void updateResultFromEditor() {
 		// nothing to do
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/preferences/ReferencerPreferencePage.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/preferences/ReferencerPreferencePage.java	(revision 1334)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/preferences/ReferencerPreferencePage.java	(revision 1335)
@@ -48,15 +48,15 @@
 	
 	@Override
 	public void createFieldEditors() {
-		this.addField(new BooleanFieldEditor(ReferencerPreferences.SORT_BY_FREQUENCIES, ReferencerUIMessages.ReferencerPreferencePage_3, this.getFieldEditorParent()));
+		this.addField(new BooleanFieldEditor(ReferencerPreferences.SORT_BY_FREQUENCIES, ReferencerUIMessages.orderReferencesByFrequency, this.getFieldEditorParent()));
 	}
 
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(ReferencerPreferences.getInstance().getPreferencesNodeQualifier()));
-		this.setTitle(ReferencerUIMessages.ReferencerPreferencePage_2);
+		this.setTitle(ReferencerUIMessages.referencer);
 	}
 	
 	
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages.properties	(revision 1335)
@@ -1,10 +1,10 @@
-
-ReferencerEditor_11 = References
-ReferencerEditor_17 = Showing first result page
-ReferencerEditor_19 = Showing last result page
-ReferencerEditor_21 = Showing next result page
-ReferencerEditor_23 = Showing previous result page
-ReferencerEditor_6  = Reference pattern
-
-ReferencerPreferencePage_2 = Referencer
-ReferencerPreferencePage_3 = Order references by frequency
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+orderReferencesByFrequency=Order references by frequency
+referencePattern=Reference pattern
+referencer=Referencer
+references=References
+showingFirstResultPage=Showing first result page
+showingLastResultPage=Showing last result page
+showingNextResultPage=Showing next result page
+showingPreviousResultPage=Showing previous result page
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/ReferencerUIMessages.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/ReferencerUIMessages.java	(revision 1334)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/ReferencerUIMessages.java	(revision 1335)
@@ -14,14 +14,14 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.referencer.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String ReferencerEditor_11;
-	public static String ReferencerEditor_17;
-	public static String ReferencerEditor_19;
-	public static String ReferencerEditor_21;
-	public static String ReferencerEditor_23;
-	public static String ReferencerEditor_6;
-	public static String ReferencerPreferencePage_2;
-	public static String ReferencerPreferencePage_3;
+	public static String references; 
+	public static String showingFirstResultPage; 
+	public static String showingLastResultPage; 
+	public static String showingNextResultPage; 
+	public static String showingPreviousResultPage; 
+	public static String referencePattern; 
+	public static String referencer; 
+	public static String orderReferencesByFrequency; 
 
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,10 +1,10 @@
-
-ReferencerEditor_11 = Ссылки
-ReferencerEditor_17 = Показ первой страницы результатов 
-ReferencerEditor_19 = Показ последней страницы результатов 
-ReferencerEditor_21 = Показ следующей страницы результатов 
-ReferencerEditor_23 = Показ предыдущей страницы результатов 
-ReferencerEditor_6  = Шаблон ссылок 
-
-ReferencerPreferencePage_2 = Ссылки
-ReferencerPreferencePage_3 = Сортировать ссылки по частотности
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+orderReferencesByFrequency=Сортировать ссылки по частотности
+referencePattern=Шаблон ссылок 
+referencer=Ссылки
+references=Ссылки
+showingFirstResultPage=Показ первой страницы результатов 
+showingLastResultPage=Показ последней страницы результатов 
+showingNextResultPage=Показ следующей страницы результатов 
+showingPreviousResultPage=Показ предыдущей страницы результатов 
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,10 +1,10 @@
-﻿
-ReferencerEditor_11 = Références
-ReferencerEditor_17 = Affichage de la première page de résultats
-ReferencerEditor_19 = Affichage de la dernière page de résultats
-ReferencerEditor_21 = Affichage de la page de résultats suivante 
-ReferencerEditor_23 = Affichage de la page de résultats précédente 
-ReferencerEditor_6  = Patron des références 
-
-ReferencerPreferencePage_2 = Références
-ReferencerPreferencePage_3 = Ordonner les références par fréquence
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+orderReferencesByFrequency=Ordonner les références par fréquence
+referencePattern=Patron des références 
+referencer=Références
+references=Références
+showingFirstResultPage=Affichage de la première page de résultats
+showingLastResultPage=Affichage de la dernière page de résultats
+showingNextResultPage=Affichage de la page de résultats suivante 
+showingPreviousResultPage=Affichage de la page de résultats précédente 
Index: tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/link/QueryIndexToLexicalTable.java
===================================================================
--- tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/link/QueryIndexToLexicalTable.java	(revision 1334)
+++ tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/link/QueryIndexToLexicalTable.java	(revision 1335)
@@ -88,18 +88,18 @@
 
 		if (!qindex.isComputedWithPartition()) {
 			
-			System.out.println(TXMUIMessages.IndexToLexicalTable_0);
-			StatusLine.setMessage(TXMUIMessages.IndexToLexicalTable_0);
+			System.out.println(TXMUIMessages.cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded);
+			StatusLine.setMessage(TXMUIMessages.cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded);
 			return false;
 		}
 
-		Log.info(LexicalTableUIMessages.ComputeLexicalTable_3);
+		Log.info(LexicalTableUIMessages.openingMargeConfigurationDialog);
 		ArrayList<String> choices = new ArrayList<String>();
-		choices.add(LexicalTableUIMessages.ComputeLexicalTable_16);
-		choices.add(LexicalTableUIMessages.ComputeLexicalTable_12);
+		choices.add(LexicalTableUIMessages.useAllOccurrences);
+		choices.add(LexicalTableUIMessages.userIndexOccurrences);
 		ListSelectionDialog dialog = new ListSelectionDialog(shell, 
 				choices, new ArrayContentProvider(), new LabelProvider(), 
-				LexicalTableUIMessages.ComputeLexicalTable_13);
+				LexicalTableUIMessages.selectWhichMarginsYouWantToUse);
 		
 		int ret = dialog.open();
 		//System.out.println("ret= "+ret);
@@ -135,4 +135,4 @@
 		return false;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/function/ComputeQueryIndex.java
===================================================================
--- tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/function/ComputeQueryIndex.java	(revision 1334)
+++ tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/function/ComputeQueryIndex.java	(revision 1335)
@@ -83,7 +83,7 @@
 		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
 		TXMResultEditorInput<QueryIndex> editorInput = new TXMResultEditorInput<QueryIndex>(new QueryIndex(corpus));
 		try {
-			StatusLine.setMessage(IndexUIMessages.ComputeIndex_0);
+			StatusLine.setMessage(IndexUIMessages.openingIndexResults);
 			IEditorPart editor =  page.openEditor(editorInput,QueryIndexEditor.ID);
 			if (editor instanceof QueryIndexEditor) {
 				QueryIndexEditor voceditor = (QueryIndexEditor)editor;
@@ -98,7 +98,7 @@
 		IWorkbenchPage page = TXMWindows.getActiveWindow().getActivePage();
 		TXMResultEditorInput<QueryIndex> editorInput = new TXMResultEditorInput<QueryIndex>(new QueryIndex(partition));
 		try {
-			StatusLine.setMessage(IndexUIMessages.ComputeIndex_0);
+			StatusLine.setMessage(IndexUIMessages.openingIndexResults);
 			QueryIndexEditor voceditor = (QueryIndexEditor) page
 					.openEditor(editorInput, QueryIndexEditor.ID);
 			voceditor.initializeFields();
@@ -106,4 +106,4 @@
 			Log.printStackTrace(e);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java
===================================================================
--- tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java	(revision 1334)
+++ tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java	(revision 1335)
@@ -267,12 +267,12 @@
 
 		createQueryIndex();
 
-		StatusLine.setMessage(IndexUIMessages.IndexEditor_33);
+		StatusLine.setMessage(IndexUIMessages.computingIndex);
 		final CQLQuery query; // if the query is empty then we put "[]" instead
 		if (!queryWidget.getQueryString().equals("\"\"")) {//$NON-NLS-1$
 			query = new CQLQuery(queryWidget.getQueryString());
 		} else {
-			System.err.println(IndexUIMessages.IndexEditor_0);
+			System.err.println(IndexUIMessages.indexDDotQueryIsEmpty);
 			return;
 		}
 
@@ -364,10 +364,10 @@
 					} catch (Exception e) {
 						System.out.println(e.getLocalizedMessage());
 						try {
-							System.out.println(TXMUIMessages.LastCQPError
+							System.out.println(TXMUIMessages.lastCQPErrorDDot
 									+ CQPSearchEngine.getCqiClient().getLastCQPError());
 						} catch (Exception e1) {
-							System.out.println(IndexUIMessages.IndexEditor_10
+							System.out.println(IndexUIMessages.cQPErrorDDot
 									+ e1);
 							Log.printStackTrace(e1);
 						}
@@ -533,7 +533,7 @@
 		filtercontrols.setLayout(gridLayout);
 
 		Label lNLigneppage = new Label(filtercontrols, SWT.NONE);
-		lNLigneppage.setText(IndexUIMessages.IndexEditor_8);
+		lNLigneppage.setText(IndexUIMessages.pageSize);
 		lNLigneppage.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false,
 				false));
 
@@ -715,7 +715,7 @@
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(IndexUIMessages.IndexEditor_36);
+				StatusLine.setMessage(IndexUIMessages.IndexEditor_17);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -730,7 +730,7 @@
 					}
 				}
 
-				StatusLine.setMessage(IndexUIMessages.IndexEditor_37);
+				StatusLine.setMessage(IndexUIMessages.IndexEditor_17);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
@@ -769,7 +769,7 @@
 						queryindex.sortLines(SortMode.FREQUNIT, false);
 					}
 				}
-				StatusLine.setMessage(IndexUIMessages.IndexEditor_37);
+				StatusLine.setMessage(IndexUIMessages.IndexEditor_17);
 				fillDisplayArea(topLine, bottomLine);
 			}
 
@@ -915,7 +915,7 @@
 			}
 			queryWidget.setFocus();
 		} else {
-			System.err.println(IndexUIMessages.IndexEditor_22);
+			System.err.println(IndexUIMessages.couldntInitializeIndexTable);
 		}
 	}
 
@@ -944,10 +944,10 @@
 		navigationArea.setNextEnabled(to < queryindex.getV() - 1);
 		navigationArea.setLastEnabled(to < queryindex.getV() - 1);
 
-		lFminInfo.setText(IndexUIMessages.IndexEditor_25 + queryindex.getFmin());
-		lFmaxInfo.setText(IndexUIMessages.IndexEditor_26 + queryindex.getFmax());
-		lTInfo.setText(IndexUIMessages.IndexEditor_27 + queryindex.getT());
-		lVInfo.setText(IndexUIMessages.IndexEditor_28 + queryindex.getV());
+		lFminInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getFmin());
+		lFmaxInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getFmax());
+		lTInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getT());
+		lVInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getV());
 
 		lVInfo.getParent().layout();
 
@@ -986,7 +986,7 @@
 	@Override
 	public void setFocus() {
 		this.queryWidget.setFocus();
-		StatusLine.setMessage(IndexUIMessages.IndexEditor_29);
+		StatusLine.setMessage(IndexUIMessages.openingTheIndexResults);
 	}
 
 	/**
@@ -1037,4 +1037,4 @@
 		// TODO Auto-generated method stub
 		
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java
===================================================================
--- tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java	(revision 1334)
+++ tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java	(revision 1335)
@@ -202,10 +202,10 @@
 			String[] split = line.split("=", 2); //$NON-NLS-1$
 			if (split.length == 2) {
 				if (hasLine(split[0])) {
-					System.out.println(TXMCoreMessages.QueryIndex_2+line);
+					System.out.println(TXMCoreMessages.warningDDotDuplicateQueryEntryDDot+line);
 				} else {
 					if (addLine(split[0], new CQLQuery(split[1])) == null) {
-						System.out.println(TXMCoreMessages.QueryIndex_3+line);
+						System.out.println(TXMCoreMessages.warningDDotQueryFailedDDot+line);
 					}
 				}
 			}
@@ -227,7 +227,7 @@
 		try {
 			toTxt(outfile, 0, lines.size(), encoding, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+			System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 			return false;
 		}
 		return true;
@@ -462,4 +462,4 @@
 		return "Query index";
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages.properties	(revision 1335)
@@ -1,23 +1,23 @@
-
-CoocPreferencePage_0  = Score format (default 0.0000E00)
-CoocPreferencePage_1  = Minimum frequency threshold of the cooccurrent
-CoocPreferencePage_11 = Minimum right
-CoocPreferencePage_12 = Maximum right
-CoocPreferencePage_2  = Minimum cooccurrency count threshold
-CoocPreferencePage_3  = Minimum cooccurrency score threshold
-CoocPreferencePage_4  = Maximum left
-CoocPreferencePage_5  = Cooccurrences
-CoocPreferencePage_6  = Minimum left
-CoocPreferencePage_8  = Use partial lexical table
-
-CooccurrencesEditor_0  = Sort by: {0}
-CooccurrencesEditor_10 = Cofrequency
-CooccurrencesEditor_17 = Score
-CooccurrencesEditor_18 = The score threshold must be a real number (current value={0})
-CooccurrencesEditor_25 = ** Error while reading corpus size.
-CooccurrencesEditor_3  = Cooccurrents properties:
-CooccurrencesEditor_4  = Thresholds: Fmin ≥
-CooccurrencesEditor_5  = \ Cmin ≥
-CooccurrencesEditor_6  = \ Score ≥
-CooccurrencesEditor_8  = Cooccurrent
-CooccurrencesEditor_9  = Mean distance
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+cmin=\ Cmin ≥
+cofrequency=Cofrequency
+cooccurrences=Cooccurrences
+cooccurrent=Cooccurrent
+cooccurrentsPropertiesDDot=Cooccurrents properties\:
+errorWhileReadingCorpusSize=** Error while reading corpus size.
+maximumLeft=Maximum left
+maximumRight=Maximum right
+meanDistance=Mean distance
+minimumCooccurrencyCountThreshold=Minimum cooccurrency count threshold
+minimumCooccurrencyScoreThreshold=Minimum cooccurrency score threshold
+minimumFrequencyThresholdOfTheCooccurrent=Minimum frequency threshold of the cooccurrent
+minimumLeft=Minimum left
+minimumRight=Minimum right
+score=Score
+score_2=\ Score ≥
+scoreFormatDefault00000E00=Score format (default 0.0000E00)
+sortByDDotP0=Sort by\: {0}
+theScoreThresholdMustBeARealNumberCurrentValueEqualsP0=The score threshold must be a real number (current value\={0})
+thresholdsDDotFmin=Thresholds\: Fmin ≥
+usePartialLexicalTable=Use partial lexical table
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,22 +1,22 @@
-
-CoocPreferencePage_0  = Формат индекса (по умолчанию 0.0000E00)
-CoocPreferencePage_1  = Минимальный порог количества совместных употреблений
-CoocPreferencePage_11 = Минимум справа
-CoocPreferencePage_12 = Максимум справа
-CoocPreferencePage_2  = Минимальный порог частотности совместной встречаемости
-CoocPreferencePage_3  = Минимальный порог индекса совместной встречаемости
-CoocPreferencePage_4  = Максимум слева
-CoocPreferencePage_5  = Совместная встречаемость
-CoocPreferencePage_6  = Минимум слева
-CoocPreferencePage_8  = N/A_Use partial lexical table
-
-CooccurrencesEditor_0  = Сортировать по: {0}
-CooccurrencesEditor_10 = Совместная частотность
-CooccurrencesEditor_17 = Индекс
-CooccurrencesEditor_18 = Порог индекса должен быть действительным числом, отличным от {0}
-CooccurrencesEditor_3  = Свойства совместных употреблений: 
-CooccurrencesEditor_4  = Пороги: Част ≥
-CooccurrencesEditor_5  = Совм-част ≥ 
-CooccurrencesEditor_6  = Показатель ≥ 
-CooccurrencesEditor_8  = Кооккуррент
-CooccurrencesEditor_9  = Средняя дистанция
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+cmin=Совм-част ≥ 
+cofrequency=Совместная частотность
+cooccurrences=Совместная встречаемость
+cooccurrent=Кооккуррент
+cooccurrentsPropertiesDDot=Свойства совместных употреблений\: 
+maximumLeft=Максимум слева
+maximumRight=Максимум справа
+meanDistance=Средняя дистанция
+minimumCooccurrencyCountThreshold=Минимальный порог частотности совместной встречаемости
+minimumCooccurrencyScoreThreshold=Минимальный порог индекса совместной встречаемости
+minimumFrequencyThresholdOfTheCooccurrent=Минимальный порог количества совместных употреблений
+minimumLeft=Минимум слева
+minimumRight=Минимум справа
+score=Индекс
+score_2=Показатель ≥ 
+scoreFormatDefault00000E00=Формат индекса (по умолчанию 0.0000E00)
+sortByDDotP0=Сортировать по\: {0}
+theScoreThresholdMustBeARealNumberCurrentValueEqualsP0=Порог индекса должен быть действительным числом, отличным от {0}
+thresholdsDDotFmin=Пороги\: Част ≥
+usePartialLexicalTable=N/A_Use partial lexical table
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,23 +1,23 @@
-
-CoocPreferencePage_0  = Format de l'indice (par défault 0.0000E00)
-CoocPreferencePage_1  = Seuil minimum de fréquence du cooccurrent
-CoocPreferencePage_11 = Minimum à droite
-CoocPreferencePage_12 = Maximum à droite
-CoocPreferencePage_2  = Seuil minimum de fréquence de cooccurrences
-CoocPreferencePage_3  = Seuil minimum de l'indice de cooccurrences
-CoocPreferencePage_4  = Maximum à gauche
-CoocPreferencePage_5  = Cooccurrences
-CoocPreferencePage_6  = Minimum à gauche
-CoocPreferencePage_8  = Utiliser les seulements les fréquences des cooccurents plutôt que celles de tous les mots du corpus
-
-CooccurrencesEditor_0  = Trier par : {0}
-CooccurrencesEditor_10 = Cofréquence
-CooccurrencesEditor_17 = Indice
-CooccurrencesEditor_18 = Le seuil d''indice doit être un nombre réel (valeur actuelle={0})
-CooccurrencesEditor_25 = ** Une erreur est survenue lors du calcul de la taille du corpus.
-CooccurrencesEditor_3  = Propriétés des cooccurrents : 
-CooccurrencesEditor_4  = Seuils : Fmin ≥
-CooccurrencesEditor_5  = Cmin ≥ 
-CooccurrencesEditor_6  = Indice ≥ 
-CooccurrencesEditor_8  = Cooccurrent
-CooccurrencesEditor_9  = Distance moyenne
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+cmin=Cmin ≥ 
+cofrequency=Cofréquence
+cooccurrences=Cooccurrences
+cooccurrent=Cooccurrent
+cooccurrentsPropertiesDDot=Propriétés des cooccurrents \: 
+errorWhileReadingCorpusSize=** Une erreur est survenue lors du calcul de la taille du corpus.
+maximumLeft=Maximum à gauche
+maximumRight=Maximum à droite
+meanDistance=Distance moyenne
+minimumCooccurrencyCountThreshold=Seuil minimum de fréquence de cooccurrences
+minimumCooccurrencyScoreThreshold=Seuil minimum de l'indice de cooccurrences
+minimumFrequencyThresholdOfTheCooccurrent=Seuil minimum de fréquence du cooccurrent
+minimumLeft=Minimum à gauche
+minimumRight=Minimum à droite
+score=Indice
+score_2=Indice ≥ 
+scoreFormatDefault00000E00=Format de l'indice (par défault 0.0000E00)
+sortByDDotP0=Trier par \: {0}
+theScoreThresholdMustBeARealNumberCurrentValueEqualsP0=Le seuil d''indice doit être un nombre réel (valeur actuelle\={0})
+thresholdsDDotFmin=Seuils \: Fmin ≥
+usePartialLexicalTable=Utiliser les seulements les fréquences des cooccurents plutôt que celles de tous les mots du corpus
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/CooccurrenceUIMessages.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/CooccurrenceUIMessages.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/CooccurrenceUIMessages.java	(revision 1335)
@@ -1,48 +1,48 @@
-package org.txm.cooccurrence.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Cooccurrence UI messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class CooccurrenceUIMessages extends NLS {
-	
-	private static final String BUNDLE_NAME = "org.txm.cooccurrence.rcp.messages.messages"; //$NON-NLS-1$
-	
-	public static String CoocPreferencePage_0;
-	public static String CoocPreferencePage_1;
-	public static String CoocPreferencePage_11;
-	public static String CoocPreferencePage_12;
-	public static String CoocPreferencePage_2;
-	public static String CoocPreferencePage_3;
-	public static String CoocPreferencePage_4;
-	public static String CoocPreferencePage_5;
-	public static String CoocPreferencePage_6;
-	public static String CoocPreferencePage_8;
-	public static String CooccurrencesEditor_0;
-
-	public static String CooccurrencesEditor_10;
-	public static String CooccurrencesEditor_17;
-	public static String CooccurrencesEditor_18;
-
-	public static String CooccurrencesEditor_25;
-	public static String CooccurrencesEditor_3;
-	public static String CooccurrencesEditor_4;
-	public static String CooccurrencesEditor_5;
-	public static String CooccurrencesEditor_6;
-	public static String CooccurrencesEditor_8;
-	public static String CooccurrencesEditor_9;
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CooccurrenceUIMessages.class);
-	}
-
-	private CooccurrenceUIMessages() {
-	}
-}
+package org.txm.cooccurrence.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Cooccurrence UI messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class CooccurrenceUIMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.cooccurrence.rcp.messages.messages"; //$NON-NLS-1$
+	
+	public static String scoreFormatDefault00000E00; 
+	public static String minimumFrequencyThresholdOfTheCooccurrent; 
+	public static String minimumRight; 
+	public static String maximumRight; 
+	public static String minimumCooccurrencyCountThreshold; 
+	public static String minimumCooccurrencyScoreThreshold; 
+	public static String maximumLeft; 
+	public static String cooccurrences; 
+	public static String minimumLeft; 
+	public static String usePartialLexicalTable; 
+	public static String sortByDDotP0; 
+
+	public static String cofrequency; 
+	public static String score; 
+	public static String theScoreThresholdMustBeARealNumberCurrentValueEqualsP0; 
+
+	public static String errorWhileReadingCorpusSize; 
+	public static String cooccurrentsPropertiesDDot; 
+	public static String thresholdsDDotFmin; 
+	public static String cmin; 
+	public static String score_2; 
+	public static String cooccurrent; 
+	public static String meanDistance; 
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, CooccurrenceUIMessages.class);
+	}
+
+	private CooccurrenceUIMessages() {
+	}
+}
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 1335)
@@ -319,7 +319,7 @@
 		propertiesSelector = new PropertiesSelector<WordProperty>(filtercontrols, SWT.NONE);
 		propertiesSelector.setLayout(new GridLayout(4, false));
 		propertiesSelector.setCorpus(this.getCorpus());
-		propertiesSelector.setTitle(CooccurrenceUIMessages.CooccurrencesEditor_3);
+		propertiesSelector.setTitle(CooccurrenceUIMessages.cooccurrentsPropertiesDDot);
 		propertiesSelector.addSelectionListener(computeSelectionListener);
 
 		// FIXME: became useless?
@@ -337,7 +337,7 @@
 		 */
 
 		Label label = new Label(filtercontrols, SWT.NONE);
-		label.setText(CooccurrenceUIMessages.CooccurrencesEditor_4);
+		label.setText(CooccurrenceUIMessages.thresholdsDDotFmin);
 
 		fMin = new Spinner(filtercontrols, SWT.BORDER);
 		fMin.setMinimum(1);
@@ -348,7 +348,7 @@
 		fMin.addKeyListener(computeKeyListener);
 
 		label = new Label(filtercontrols, SWT.NONE);
-		label.setText(CooccurrenceUIMessages.CooccurrencesEditor_5);
+		label.setText(CooccurrenceUIMessages.cmin);
 		cMin = new Spinner(filtercontrols, SWT.BORDER);
 		cMin.setMinimum(1);
 		cMin.setMaximum(99999);
@@ -358,7 +358,7 @@
 		cMin.addKeyListener(computeKeyListener);
 
 		label = new Label(filtercontrols, SWT.NONE);
-		label.setText(CooccurrenceUIMessages.CooccurrencesEditor_6);
+		label.setText(CooccurrenceUIMessages.score_2);
 		minScore = new FloatSpinner(filtercontrols, SWT.BORDER);
 		minScore.addSelectionListener(computeSelectionListener);
 		minScore.addKeyListener(computeKeyListener);
@@ -410,8 +410,8 @@
 		nColumn.pack();
 
 		occColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
-		occColumn.setText(CooccurrenceUIMessages.CooccurrencesEditor_8);
-		occColumn.setToolTipText(CooccurrenceUIMessages.CooccurrencesEditor_8);
+		occColumn.setText(CooccurrenceUIMessages.cooccurrent);
+		occColumn.setToolTipText(CooccurrenceUIMessages.cooccurrent);
 		occColumn.setWidth(200);
 		occColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -440,8 +440,8 @@
 		});
 
 		nboccColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
-		nboccColumn.setText(CooccurrenceUIMessages.CooccurrencesEditor_10);
-		nboccColumn.setToolTipText(CooccurrenceUIMessages.CooccurrencesEditor_10);
+		nboccColumn.setText(CooccurrenceUIMessages.cofrequency);
+		nboccColumn.setToolTipText(CooccurrenceUIMessages.cofrequency);
 		nboccColumn.setWidth(130);
 		nboccColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -455,8 +455,8 @@
 		});
 
 		scoreColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
-		scoreColumn.setText(CooccurrenceUIMessages.CooccurrencesEditor_17);
-		scoreColumn.setToolTipText(CooccurrenceUIMessages.CooccurrencesEditor_17);
+		scoreColumn.setText(CooccurrenceUIMessages.score);
+		scoreColumn.setToolTipText(CooccurrenceUIMessages.score);
 		scoreColumn.setWidth(100);
 		scoreColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -470,8 +470,8 @@
 		});
 
 		distColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
-		distColumn.setText(CooccurrenceUIMessages.CooccurrencesEditor_9);
-		distColumn.setToolTipText(CooccurrenceUIMessages.CooccurrencesEditor_9);
+		distColumn.setText(CooccurrenceUIMessages.meanDistance);
+		distColumn.setToolTipText(CooccurrenceUIMessages.meanDistance);
 		distColumn.setWidth(130);
 		distColumn.addSelectionListener(new SelectionListener() {
 			@Override
@@ -598,7 +598,7 @@
 			Double d = Double.parseDouble(this.minScore.getText().replace(",", "."));
 			minScore = d;
 		} catch (Exception e) {
-			Log.severe(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_18, this.minScore.getText()));
+			Log.severe(NLS.bind(CooccurrenceUIMessages.theScoreThresholdMustBeARealNumberCurrentValueEqualsP0, this.minScore.getText()));
 		}
 
 		parameters.put(CooccurrencePreferences.MIN_SCORE, minScore);
@@ -633,7 +633,7 @@
 		if (cooc != null && !cooc.isDirty() && currentComparator != null) {
 
 			try {
-				Log.info(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_0, currentComparator.getName()));
+				Log.info(NLS.bind(CooccurrenceUIMessages.sortByDDotP0, currentComparator.getName()));
 
 				PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
 					@Override
@@ -685,7 +685,7 @@
 			txt += ", T " + cooc.getCorpus().getSize();  //$NON-NLS-1$
 		}
 		catch (Exception e) {
-			Log.severe(CooccurrenceUIMessages.CooccurrencesEditor_25);
+			Log.severe(CooccurrenceUIMessages.errorWhileReadingCorpusSize);
 		}
 		String tooltip = "- " + txt.replaceAll(", ", "\n- "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
@@ -710,4 +710,4 @@
 		TXMParameters parameters = getWidgetsParameters();
 		cooc.setParameters(parameters);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java	(revision 1335)
@@ -109,10 +109,10 @@
 		
 		
 		Label l = new Label(line1, SWT.NONE);
-		l.setText(TXMUIMessages.EmpantWidget_0);
+		l.setText(TXMUIMessages.contextDDot);
 
 		wordType = new Button(line1, SWT.RADIO);
-		wordType.setText(TXMUIMessages.EmpantWidget_1);
+		wordType.setText(TXMUIMessages.word);
 		wordType.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -127,7 +127,7 @@
 		wordType.setSelection(true);
 
 		structType = new Button(line1, SWT.RADIO);
-		structType.setText(TXMUIMessages.EmpantWidget_2);
+		structType.setText(TXMUIMessages.structure);
 		structType.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -147,7 +147,7 @@
 
 		checkLeft = new Button(line1, SWT.CHECK);
 		checkLeft.setSelection(true);
-		checkLeft.setText(TXMUIMessages.EmpantWidget_8);
+		checkLeft.setText(TXMUIMessages.useLeftWindow);
 		checkLeft.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -162,7 +162,7 @@
 		
 		checkRight = new Button(line1, SWT.CHECK);
 		checkRight.setSelection(true);
-		checkRight.setText(TXMUIMessages.EmpantWidget_9);
+		checkRight.setText(TXMUIMessages.useRightWindow);
 		checkRight.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -176,12 +176,12 @@
 		});
 		
 		checkXword = new Button(line1, SWT.CHECK);
-		checkXword.setText(TXMUIMessages.EmpantWidget_7);
+		checkXword.setText(TXMUIMessages.includeTheKeywordStructureInTheCount);
 
 		
 		// LINE 2
 		l = new Label(line2, SWT.NONE);
-		l.setText(TXMUIMessages.EmpantWidget_3);
+		l.setText(TXMUIMessages.from);
 
 		// | [ ] [ ] [ |v] [ ] [ ] |
 		maxLeft = new Spinner(line2, SWT.BORDER);
@@ -201,7 +201,7 @@
 		});
 
 		l = new Label(line2, SWT.NONE);
-		l.setText(TXMUIMessages.EmpantWidget_4);
+		l.setText(TXMUIMessages.to_2);
 
 		minLeft = new Spinner(line2, SWT.BORDER);
 		minLeft.setMinimum(0);
@@ -220,7 +220,7 @@
 		});
 				
 		l = new Label(line2, SWT.NONE);
-		l.setText(TXMUIMessages.EmpantWidget_5);
+		l.setText(TXMUIMessages.andFrom);
 
 		// [>]
 		minRight = new Spinner(line2, SWT.BORDER);
@@ -240,7 +240,7 @@
 		});
 
 		l = new Label(line2, SWT.NONE);
-		l.setText(TXMUIMessages.EmpantWidget_6);
+		l.setText(TXMUIMessages.to_3);
 
 		// [>|]
 		maxRight = new Spinner(line2, SWT.BORDER);
@@ -496,4 +496,4 @@
 		minLeft.addKeyListener(listener);
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java	(revision 1335)
@@ -129,10 +129,10 @@
 			}
 		}
 
-		StatusLine.setMessage(TXMUIMessages.ComputeCooccurrences_0);
+		StatusLine.setMessage(TXMUIMessages.openingCooccurrentsTable);
 
 		TXMEditor.openEditor(cooc, CooccurrencesEditor.ID);
 
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/preferences/CoocPreferencePage.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/preferences/CoocPreferencePage.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/preferences/CoocPreferencePage.java	(revision 1335)
@@ -53,34 +53,34 @@
 	public void createFieldEditors() {
 
 		/** The scoreformatfield. */
-		StringFieldEditor scoreformatfield = new StringFieldEditor(CooccurrencePreferences.SCORE_FORMAT, CooccurrenceUIMessages.CoocPreferencePage_0, getFieldEditorParent());
+		StringFieldEditor scoreformatfield = new StringFieldEditor(CooccurrencePreferences.SCORE_FORMAT, CooccurrenceUIMessages.scoreFormatDefault00000E00, getFieldEditorParent());
 		scoreformatfield.setTextLimit(15);
 
 		/** The minfreqfield. */
-		IntegerFieldEditor minfreqfield = new IntegerFieldEditor(TXMPreferences.F_MIN, CooccurrenceUIMessages.CoocPreferencePage_1, getFieldEditorParent());
+		IntegerFieldEditor minfreqfield = new IntegerFieldEditor(TXMPreferences.F_MIN, CooccurrenceUIMessages.minimumFrequencyThresholdOfTheCooccurrent, getFieldEditorParent());
 		minfreqfield.setValidRange(0, 9999999);
 
 		/** The mincountfield. */
-		IntegerFieldEditor mincountfield = new IntegerFieldEditor(CooccurrencePreferences.MIN_COUNT, CooccurrenceUIMessages.CoocPreferencePage_2, getFieldEditorParent());
+		IntegerFieldEditor mincountfield = new IntegerFieldEditor(CooccurrencePreferences.MIN_COUNT, CooccurrenceUIMessages.minimumCooccurrencyCountThreshold, getFieldEditorParent());
 		mincountfield.setValidRange(0, 9999999);
 
 		/** The minscorefield. */
-		DoubleFieldEditor minscorefield = new DoubleFieldEditor(CooccurrencePreferences.MIN_SCORE, CooccurrenceUIMessages.CoocPreferencePage_3, getFieldEditorParent());
+		DoubleFieldEditor minscorefield = new DoubleFieldEditor(CooccurrencePreferences.MIN_SCORE, CooccurrenceUIMessages.minimumCooccurrencyScoreThreshold, getFieldEditorParent());
 		minscorefield.setTextLimit(15);
 		
-		IntegerFieldEditor maxleftfield = new IntegerFieldEditor(CooccurrencePreferences.MAX_LEFT, CooccurrenceUIMessages.CoocPreferencePage_4, getFieldEditorParent());
+		IntegerFieldEditor maxleftfield = new IntegerFieldEditor(CooccurrencePreferences.MAX_LEFT, CooccurrenceUIMessages.maximumLeft, getFieldEditorParent());
 		maxleftfield.setValidRange(0, 99999);
 		
-		IntegerFieldEditor minleftfield = new IntegerFieldEditor(CooccurrencePreferences.MIN_LEFT, CooccurrenceUIMessages.CoocPreferencePage_6, getFieldEditorParent());
+		IntegerFieldEditor minleftfield = new IntegerFieldEditor(CooccurrencePreferences.MIN_LEFT, CooccurrenceUIMessages.minimumLeft, getFieldEditorParent());
 		minleftfield.setValidRange(0, 99999);
 		
-		IntegerFieldEditor minrightfield = new IntegerFieldEditor(CooccurrencePreferences.MIN_RIGHT, CooccurrenceUIMessages.CoocPreferencePage_11, getFieldEditorParent());
+		IntegerFieldEditor minrightfield = new IntegerFieldEditor(CooccurrencePreferences.MIN_RIGHT, CooccurrenceUIMessages.minimumRight, getFieldEditorParent());
 		minrightfield.setValidRange(0, 99999);
 		
-		IntegerFieldEditor maxrightfield = new IntegerFieldEditor(CooccurrencePreferences.MAX_RIGHT, CooccurrenceUIMessages.CoocPreferencePage_12, getFieldEditorParent());
+		IntegerFieldEditor maxrightfield = new IntegerFieldEditor(CooccurrencePreferences.MAX_RIGHT, CooccurrenceUIMessages.maximumRight, getFieldEditorParent());
 		maxrightfield.setValidRange(0, 99999);
 		
-		BooleanFieldEditor partiallexicaltablefield =  new BooleanFieldEditor(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE, CooccurrenceUIMessages.CoocPreferencePage_8, getFieldEditorParent());
+		BooleanFieldEditor partiallexicaltablefield =  new BooleanFieldEditor(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE, CooccurrenceUIMessages.usePartialLexicalTable, getFieldEditorParent());
 
 		addField(scoreformatfield);
 		addField(minfreqfield);
@@ -99,9 +99,9 @@
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(CooccurrencePreferences.getInstance().getPreferencesNodeQualifier()));
 		//setDescription("Cooccurrences");
-		this.setTitle(CooccurrenceUIMessages.CoocPreferencePage_5);
+		this.setTitle(CooccurrenceUIMessages.cooccurrences);
 		this.setImageDescriptor(CooccurrenceAdapterFactory.ICON);
 	}
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java	(revision 1335)
@@ -187,7 +187,7 @@
 			
 			
 			miniInfoLabel = new Label(getMainParametersComposite(), SWT.NONE);
-			miniInfoLabel.setText(ProgressionUIMessages.ProgressionEditor_no_query);
+			miniInfoLabel.setText(ProgressionUIMessages.noQuery);
 			miniInfoLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 			
 //			Label queryLabel = new Label(getMainParametersComposite(), SWT.NONE);
@@ -211,7 +211,7 @@
 			});
 			
 			Button addNewQueryButton = new Button(getMainParametersComposite(), SWT.PUSH);
-			addNewQueryButton.setText(ProgressionUIMessages.ProgressionEditor_add);
+			addNewQueryButton.setText(ProgressionUIMessages.add);
 			addNewQueryButton.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
 			addNewQueryButton.addSelectionListener(new SelectionListener() {
 				
@@ -243,11 +243,11 @@
 			// controls
 			// graph param
 			Label typeLabel = new Label(paramPanel, SWT.NONE);
-			typeLabel.setText(ProgressionUIMessages.ProgressionDialog_1);
+			typeLabel.setText(ProgressionUIMessages.chartTypeDDot);
 			typeLabel.setAlignment(SWT.CENTER);
 
 			cumulativeButton = new Button(paramPanel, SWT.RADIO);
-			cumulativeButton.setText(ProgressionUIMessages.ProgressionDialog_2);
+			cumulativeButton.setText(ProgressionUIMessages.cumulative);
 			// listeners
 			cumulativeButton.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
@@ -259,7 +259,7 @@
 			});
 
 			densityButton = new Button(paramPanel, SWT.RADIO);
-			densityButton.setText(ProgressionUIMessages.ProgressionDialog_3);
+			densityButton.setText(ProgressionUIMessages.density);
 			// listener
 			densityButton.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
@@ -272,7 +272,7 @@
 
 			// Bande size
 			typeLabel = new Label(paramPanel, SWT.NONE);
-			typeLabel.setText(ProgressionUIMessages.ProgressionDialog_11);
+			typeLabel.setText(ProgressionUIMessages.bandewidthMultiplierDDot);
 			typeLabel.setAlignment(SWT.CENTER);
 
 			bandeField = new Text(paramPanel, SWT.BORDER);
@@ -294,7 +294,7 @@
 
 			// property REGEX
 			Label regexLabel = new Label(structuration, SWT.NONE);
-			regexLabel.setText(ProgressionUIMessages.ProgressionDialog_7);
+			regexLabel.setText(ProgressionUIMessages.regexDDot);
 			regexLabel.setAlignment(SWT.CENTER);
 
 			propertyRegex = new Text(structuration, SWT.SINGLE | SWT.BORDER);
@@ -305,13 +305,13 @@
 
 			// Repeat same values in part markers
 			repeatSameValues = new Button(paramPanel, SWT.CHECK);
-			repeatSameValues.setText(ProgressionUIMessages.ProgressionDialog_15);
+			repeatSameValues.setText(ProgressionUIMessages.repeatSameValues);
 			repeatSameValues.addSelectionListener(computeSelectionListener);
 
 
 			// Lines styles
 			multipleLineStrokes = new Button(paramPanel, SWT.CHECK);
-			multipleLineStrokes.setText(SWTComponentsProviderMessages.preferences_multipleLineStrokeStyles);
+			multipleLineStrokes.setText(SWTComponentsProviderMessages.multipleLineStrokeStyles);
 			multipleLineStrokes.addSelectionListener(computeSelectionListener);
 
 
@@ -340,13 +340,13 @@
 			// add queries from file button
 			Button addQueriesFromFileButton = new Button(queriesFocusComposite, SWT.NONE);
 			addQueriesFromFileButton.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, false));
-			addQueriesFromFileButton.setText(ProgressionUIMessages.ProgressionEditor_add_queries_from_file);
+			addQueriesFromFileButton.setText(ProgressionUIMessages.addQueriesFromFile);
 
 			addQueriesFromFileButton.addListener(SWT.Selection, new Listener() {
 				@Override
 				public void handleEvent(Event event) {
 					FileDialog dialog = new FileDialog(event.display.getActiveShell(), SWT.OPEN);
-					dialog.setText(ProgressionUIMessages.ProgressionEditor_select_property_file);
+					dialog.setText(ProgressionUIMessages.selectAnUTF8PropertyFile);
 					String path = dialog.open();
 					if (path != null) {
 						Properties props = new Properties();
@@ -401,13 +401,13 @@
 	 */
 	public void updateMiniInfoLabelText() {
 		if (queryWidgets.size() == 0) {
-			miniInfoLabel.setText(ProgressionUIMessages.ProgressionEditor_no_query);
+			miniInfoLabel.setText(ProgressionUIMessages.noQuery);
 		}
 		else if (queryWidgets.size() == 1) {
-			miniInfoLabel.setText(queryWidgets.size() + ProgressionUIMessages.ProgressionEditor_query);
+			miniInfoLabel.setText(queryWidgets.size() + ProgressionUIMessages.query);
 		}
 		else {
-			miniInfoLabel.setText(queryWidgets.size() + ProgressionUIMessages.ProgressionEditor_queries);
+			miniInfoLabel.setText(queryWidgets.size() + ProgressionUIMessages.queries);
 		}
 	}
 
@@ -648,8 +648,8 @@
 				bandeMultiplier = Float.parseFloat(smultibande);
 			} catch(Exception e) {
 				bandeMultiplier = 1.0f;
-				Log.severe(ProgressionUIMessages.ProgressionDialog_17 + e);
-				StatusLine.error(ProgressionUIMessages.ProgressionDialog_17 + e);
+				Log.severe(ProgressionUIMessages.stripMultiplierErrorDDot + e);
+				StatusLine.error(ProgressionUIMessages.stripMultiplierErrorDDot + e);
 			}
 		}
 		else	{
@@ -657,4 +657,4 @@
 		}
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 1335)
@@ -1,451 +1,451 @@
-package org.txm.progression.rcp.chartsengine.events;
-
-import java.awt.AWTEvent;
-import java.awt.Color;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.EditorPart;
-import org.jfree.chart.ChartMouseEvent;
-import org.jfree.chart.entity.ChartEntity;
-import org.txm.chartsengine.rcp.events.EventCallBack;
-import org.txm.chartsengine.rcp.events.ZoomAndPanCallBack;
-import org.txm.concordance.core.functions.Concordance;
-import org.txm.concordance.core.functions.comparators.LineComparator;
-import org.txm.concordance.rcp.editors.ConcordanceEditor;
-import org.txm.edition.rcp.editors.RGBA;
-import org.txm.edition.rcp.editors.SynopticEditionEditor;
-import org.txm.edition.rcp.handlers.OpenEdition;
-import org.txm.objects.Edition;
-import org.txm.objects.Page;
-import org.txm.objects.Text;
-import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
-import org.txm.progression.core.functions.Progression;
-import org.txm.progression.rcp.messages.ProgressionUIMessages;
-import org.txm.rcp.editors.TXMResultEditorInput;
-import org.txm.rcp.utils.SWTEditorsUtils;
-import org.txm.searchengine.cqp.corpus.CQPCorpus;
-import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.StructuralUnit;
-import org.txm.searchengine.cqp.corpus.query.Match;
-import org.txm.utils.logger.Log;
-
-/**
- * Progression chart mixed mouse and key user entries call back.
- * 
- * @author sjacquot
- *
- */
-public class ProgressionEventCallBack extends EventCallBack {
-
-	/**
-	 * To keep track of the concordance lines and recomputing only if the selected item is out of this range.
-	 */
-	protected int lastConcordanceTopLine = -1;
-	
-	/**
-	 * To keep track of the concordance lines sort and recomputing only if the sorting order has changed.
-	 */
-	protected LineComparator lastSortingComparator = null;
-
-	@Override
-	public void processEvent(final AWTEvent event, final int eventArea, final Object o) {
-		
-		// Need to run this in the SWT UI thread because it's called from the AWT UI thread in TBX charts engine layer
-		chartEditor.getComposite().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-
-				// Mouse event
-				if(event instanceof MouseEvent)	{
-				
-					MouseEvent mouseEvent = (MouseEvent)event;
-					
-					//return if it's not the left mouse button
-					if(mouseEvent.getButton() != MouseEvent.BUTTON1)	{
-						return;
-					}
-					
-					ChartMouseEvent chartEvent = (ChartMouseEvent) o;
-					ChartEntity entity = chartEvent.getEntity();
-					final ArrayList<Integer> selectedPointPositions = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getSelectedPointPositions(chartEditor.getChart());
-	
-					if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 2 && eventArea == EventCallBack.AREA_ITEM && !selectedPointPositions.isEmpty()) {
-	
-						// Linked edition (CTRL/CMD + double click)
-						if((mouseEvent.getModifiers() & ZoomAndPanCallBack.keyboardZoomModifierKeyMask) != 0) {
-							// Updates the linked editor
-							updateLinkedEditionEditor((SynopticEditionEditor) chartEditor.getLinkedEditor(SynopticEditionEditor.class), selectedPointPositions);
-						}
-						// Linked concordance
-						else	{
-							// Updates the linked editor
-							updateLinkedConcordanceEditor(chartEditor.getLinkedEditors(ConcordanceEditor.class), selectedPointPositions);
-						}
-					}
-					else if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 1 && eventArea == EventCallBack.AREA_ITEM) {
-
-						// Get the linked concordance editors and update the one linked to the progression curve if it exists
-						ArrayList<EditorPart> linkedConcordancesEditors = chartEditor.getLinkedEditors(ConcordanceEditor.class);
-						if(!linkedConcordancesEditors.isEmpty())	{
-							updateLinkedConcordanceEditor(linkedConcordancesEditors, selectedPointPositions);
-						}
-						
-						
-						// Get the linked edition editor and update it if exists
-						SynopticEditionEditor linkedEditionEditor = (SynopticEditionEditor)chartEditor.getLinkedEditor(SynopticEditionEditor.class);
-						if(linkedEditionEditor != null)	{
-							updateLinkedEditionEditor(linkedEditionEditor, selectedPointPositions);
-						}
-						
-					}
-					else if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 2 && eventArea == EventCallBack.AREA_EMPTY) {
-						// FIXME: debug
-						//System.err.println("ProgressionMouseClickedCallBack.processEvent(...).new Runnable() {...}.run(): double click in empty area");
-					}
-					else if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 1 && eventArea == EventCallBack.AREA_EMPTY) {
-						// FIXME: debug
-						//System.err.println("ProgressionMouseClickedCallBack.processEvent(...).new Runnable() {...}.run(): single click in empty area");
-					}
-				}
-				// Key event
-				else if(event instanceof KeyEvent)	{
-					KeyEvent keyEvent = (KeyEvent)event;
-					
-					// return if zoom and pan modifier
-					if((keyEvent.getModifiers() & ZoomAndPanCallBack.keyboardZoomModifierKeyMask) != 0) {
-						return;
-					}
-					
-					// Arrow keys
-					if(keyEvent.getKeyCode() == KeyEvent.VK_LEFT || keyEvent.getKeyCode() == KeyEvent.VK_RIGHT)	{
-					
-						final ArrayList<Integer> selectedPointPositions = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getSelectedPointPositions(chartEditor.getChart());
-	
-						// Get the linked concordance editors and update the one linked to the progression curve if it exists
-						ArrayList<EditorPart> linkedConcordancesEditors = chartEditor.getLinkedEditors(ConcordanceEditor.class);
-						if(!linkedConcordancesEditors.isEmpty())	{
-							updateLinkedConcordanceEditor(linkedConcordancesEditors, selectedPointPositions);
-						}
-						
-						// Get the linked edition editor and update it if exists
-						SynopticEditionEditor linkedEditionEditor = (SynopticEditionEditor)chartEditor.getLinkedEditor(SynopticEditionEditor.class);
-						if(linkedEditionEditor != null)	{
-							updateLinkedEditionEditor(linkedEditionEditor, selectedPointPositions);
-						}
-					}
-				}
-			}
-		});
-
-	}
-	
-	
-	
-	/**
-	 * Updates the linked concordance editor.
-	 * If the editor doesn't exist it will be created.
-	 * 
-	 * @param linkedEditors
-	 * @param selectedPointPositions
-	 */
-	public void updateLinkedConcordanceEditor(ArrayList<EditorPart> linkedEditors, final ArrayList<Integer> selectedPointPositions)	{
-
-		// Debug
-		Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(): linked editors count: " + linkedEditors.size()); //$NON-NLS-1$
-		
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		IWorkbenchPage page = window.getActivePage();
-
-		// Get and format the progression query from the selected chart series
-		// FIXME: case 1, the query is the query of the selected chart series
-//		ArrayList<Integer> selectedSeries = chartEditor.getEditorInput().getSWTChartComponentsProvider().getChartsEngine().getProgressionChartSelectedSeries(chartEditor.getChart());
-//		String query = ((Progression) chartEditor.getResultData()).getQueries().get(selectedSeries.get(selectedSeries.size() - 1).intValue()).getQueryString();
-		
-		int lastSelectedSeries = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getLastSelectedSeries(chartEditor.getChart());
-		String query = ((Progression) chartEditor.getResult()).getQueries().get(lastSelectedSeries).getQueryString();
-
-		// Remove "[" and "]" only if it's a simple query as "[faire]" 
-		if(query.startsWith("[") && !query.contains("="))	{ //$NON-NLS-1$ //$NON-NLS-2$
-			int length = query.length();
-			if(query.endsWith("]"))	{ //$NON-NLS-1$
-				length--;
-			}
-			query = query.substring(1, length);
-		}
-
-		// FIXME: case 2, the query is the combination of all the queries of the progression
-//		String query = ((Progression) chartEditor.getResultData()).getQueriesString();
-		
-		
-		// gets the linked editor according to the query if it exists
-		ConcordanceEditor linkedEditor = null;
-		for(int i = 0; i < linkedEditors.size(); i++) {
-			if(query.equals(((ConcordanceEditor) linkedEditors.get(i)).getConcordance().getQuery().getQueryString()))	{
-				linkedEditor = ((ConcordanceEditor) linkedEditors.get(i));
-				break;
-			}
-		}
-		
-		
-		
-		final TXMResultEditorInput editorInput;
-		boolean newEditor = false;
-		// Create the linked editor input if needed
-		if (linkedEditor == null) {
-			Concordance concordance = new Concordance(((Progression) chartEditor.getResult()).getCorpus());
-			concordance.setQuery(query);
-			editorInput = new TXMResultEditorInput(concordance);
-			newEditor = true;
-		}
-		else {
-			editorInput = (TXMResultEditorInput) linkedEditor.getEditorInput();
-		}
-
-		try {
-			boolean wasOpenedEditor = SWTEditorsUtils.isOpenEditor(editorInput, ConcordanceEditor.ID);
-			
-			linkedEditor = (ConcordanceEditor) page.openEditor(editorInput, ConcordanceEditor.ID, false);
-			if(newEditor)	{
-				chartEditor.addLinkedEditor(linkedEditor);
-			}
-			
-			// Split the area and insert the new editor
-			if(!wasOpenedEditor)	{
-				
-				int position = EModelService.BELOW;
-				EditorPart parentEditor = chartEditor;
-				
-				// Split vertically if there is already a concordance or an edition editor otherwise split horizontally
-				if(linkedEditors != null && !linkedEditors.isEmpty())	 {
-					position = EModelService.RIGHT_OF;
-					parentEditor = linkedEditors.get(linkedEditors.size() - 1);
-					
-					System.err.println("ProgressionEventCallBack.updateLinkedConcordanceEditor(): parent editor for splitting: " + parentEditor); //$NON-NLS-1$
-				}
-				// Split and add linked editor
-				SWTEditorsUtils.addEditor(parentEditor, linkedEditor, position);
-			}
-			
-		}
-		catch (PartInitException e) {
-			System.err.println(ProgressionUIMessages.ProgressionEventCallBack_error+e.getLocalizedMessage());
-		}
-
-		// Compute the concordance if it has never been computed
-		if(newEditor)	{
-			Job job = linkedEditor.compute(false);
-
-			final ConcordanceEditor linkedEditor2 = linkedEditor;
-			
-			job.addJobChangeListener(new JobChangeAdapter() 	{
-				@Override
-				public void done(IJobChangeEvent event) {
-					super.done(event);
-					
-					// initialize range change tracking variables
-					lastConcordanceTopLine = -1;
-					//lastConcordanceBottomLine = linkedEditor.getLinePerPage();
-					lastSortingComparator = linkedEditor2.getCurrentComparator();
-
-					updateLinkedConcordanceEditor(linkedEditor2, selectedPointPositions, true);
-					
-				}
-			});
-			
-		}
-		else	{
-			updateLinkedConcordanceEditor(linkedEditor, selectedPointPositions, false);
-		}
-		
-		// give back the focus to chart editor
-		chartEditor.setFocus();
-	}
-
-
-	/**
-	 * 
-	 * @param linkedEditor
-	 * @param selectedPointPositions
-	 * @param loadLines
-	 */
-	public void updateLinkedConcordanceEditor(final ConcordanceEditor linkedEditor, final ArrayList<Integer> selectedPointPositions, boolean loadLines)	{
-		
-		final TableViewer tableViewer = linkedEditor.getLineTableViewer();
-		if(selectedPointPositions.size() > 0)	{
-
-			// Get the index of the last selected point in concordance according to the global token position and concordance sorting order
-			int lineIndex = linkedEditor.getConcordance().indexOf(selectedPointPositions.get(selectedPointPositions.size() - 1));
-			
-			int top = lineIndex - (lineIndex % linkedEditor.getLinePerPage());
-			
-			linkedEditor.getConcordance().setTopIndex(top);
-			
-			// Manage the lazy loading of new lines range in the concordance table
-			// page change
-			if(lastConcordanceTopLine != top)	{
-				loadLines = true;
-			}
-			// sort change
-			else if(lastSortingComparator != linkedEditor.getCurrentComparator())	{
-				loadLines = true;
-			}
-
-			
-			// Loads new lines, fill the display area and select the table row
-			if(loadLines)	{
-				Display.getDefault().syncExec(new Runnable() {
-					@Override
-					public void run() {
-						linkedEditor.fillDisplayArea();						
-					}
-				});
-
-			}
-
-			// update range change tracking variables
-			lastConcordanceTopLine = top;
-			//lastConcordanceBottomLine = bottom;
-			lastSortingComparator = linkedEditor.getCurrentComparator();
-			
-			
-			final int selectedPointInTableRange = lineIndex - top;						
-	
-			tableViewer.getControl().getDisplay().asyncExec(new Runnable() {
-				@Override
-				public void run() {
-					tableViewer.getTable().deselectAll();
-					
-					Object line = tableViewer.getElementAt(selectedPointInTableRange);
-					if(line != null)	{
-						tableViewer.setSelection(new StructuredSelection(line), true);
-						// FIXME: commented because the set top index makes the read of the table difficult
-						//tableViewer.getTable().setTopIndex(selectedPointInTableRange);
-						Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selecting progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") in the linked Concordance table."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-					else	{
-						Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selected progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") doesn't exist in the linked Concordance table."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-				}
-			});
-		}
-		else	{
-			tableViewer.getTable().deselectAll();
-		}
-	}
-	
-	//FIXME: version with new SynopticEditionEditor system edition
-	/**
-	 * Updates the linked edition editor.
-	 * If the editor doesn't exist it will be created.
-	 * @param editor
-	 */
-	public void updateLinkedEditionEditor(SynopticEditionEditor linkedEditor, ArrayList<Integer> selectedPointPositions)	{
-		
-		try {
-		
-			ArrayList<Color> seriesColors = chartEditor.getResult().getChartCreator().getSeriesShapesColors(chartEditor.getChart());
-			RGBA selectedWordColor = new RGBA(255, 10, 10);
-
-			// Unhighlight all tokens
-			if(linkedEditor != null)	{
-				linkedEditor.removeHighlightWords();
-				linkedEditor.updateWordStyles();
-			}
-			
-			CQPCorpus corpus = ((Progression) chartEditor.getResult()).getCorpus();
-			StructuralUnit textS = corpus.getStructuralUnit("text"); //$NON-NLS-1$
-			Property textP = textS.getProperty("id"); //$NON-NLS-1$
-			Match selectedWordMatch = new Match(selectedPointPositions.get(selectedPointPositions.size() - 1), selectedPointPositions.get(selectedPointPositions.size() - 1));
-			String textId = selectedWordMatch.getValueForProperty(textP);
-
-			Text text = corpus.getProject().getText(textId);
-			if(text == null) {
-				Log.severe(ProgressionUIMessages.bind(ProgressionUIMessages.ProgressionEventCallBack_error_missing_text, textId));
-				return;
-			}
-
-			Edition edition = text.getEdition(corpus.getProject().getDefaultEdition());
-
-			if(edition == null) {
-				Log.severe(ProgressionUIMessages.ProgressionEventCallBack_error_missing_default_edition);
-				return;
-			}
-
-			// Get the current selected word to highlight more
-			List<String> selectedWordIds = selectedWordMatch.getValuesForProperty(corpus.getProperty("id")); //$NON-NLS-1$;
-
-			// Get all words to highlight from the progression chart data set
-			ArrayList<ArrayList<Integer>> allPointPositionsBySeries = ((ProgressionChartCreator)chartEditor.getResult().getChartCreator()).getAllPointPositionsBySeries(chartEditor.getChart());
-			
-			ArrayList<ArrayList<String>> allWordIds = new ArrayList<ArrayList<String>>(allPointPositionsBySeries.size());
-			for(int i = 0; i < allPointPositionsBySeries.size(); i++) {
-				ArrayList<Integer> positions = allPointPositionsBySeries.get(i);
-				ArrayList<String> wordsIds = new ArrayList<String>(); 
-				for(int j = 0; j < positions.size(); j++) {
-					Match match = new Match(positions.get(j), positions.get(j));					
-					if(match.getValueForProperty(textP).equals(textId)) {
-						wordsIds.add(match.getValueForProperty(corpus.getProperty("id"))); //$NON-NLS-1$;
-					}
-				}
-				allWordIds.add(wordsIds);
-			}
-
-			Page openPage = edition.getPageForWordId(selectedWordIds.get(0));
-
-			if(openPage != null) {
-
-				// Create the linked editor if needed
-				if(linkedEditor == null || linkedEditor.isDisposed()) {
-					linkedEditor = OpenEdition.openEdition(corpus, OpenEdition.getDefaultEditions(corpus));
-					chartEditor.addLinkedEditor(linkedEditor);
-					
-					
-					int position = EModelService.BELOW;;
-					EditorPart parentEditor = chartEditor;
-					// Split vertically if there is already a concordance editor otherwise split horizontally
-					ConcordanceEditor linkedConcordanceEditor = (ConcordanceEditor)chartEditor.getLinkedEditor(ConcordanceEditor.class);
-					if(linkedConcordanceEditor != null)	{
-						position = EModelService.RIGHT_OF;
-						parentEditor = linkedConcordanceEditor;
-					}
-					
-					// Split and add linked editor
-					SWTEditorsUtils.addEditor(parentEditor, linkedEditor, position);
-				}
-
-				linkedEditor.setText(text, true);
-				linkedEditor.goToPage(openPage.getName());
-				
-				// Highlight tokens by series
-				for(int i = 0; i < allWordIds.size(); i++) {
-					linkedEditor.addHighlightWordsById(new RGBA(seriesColors.get(i).getRed(), seriesColors.get(i).getGreen(), seriesColors.get(i).getBlue()), allWordIds.get(i));
-				}
-				// Highlight selected curve token
-				linkedEditor.addHighlightWordsById(selectedWordColor, selectedWordIds);
-				linkedEditor.setFocusedWordID(selectedWordIds.get(0)); // to scroll to the selected word
-				
-				IWorkbenchPage attachedPage = linkedEditor.getEditorSite().getPage();
-				attachedPage.activate(linkedEditor);
-			}
-		}
-		catch(Exception e) {
-			Log.printStackTrace(e);
-		}
-	}
-
-	
-	    
-}
+package org.txm.progression.rcp.chartsengine.events;
+
+import java.awt.AWTEvent;
+import java.awt.Color;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.EditorPart;
+import org.jfree.chart.ChartMouseEvent;
+import org.jfree.chart.entity.ChartEntity;
+import org.txm.chartsengine.rcp.events.EventCallBack;
+import org.txm.chartsengine.rcp.events.ZoomAndPanCallBack;
+import org.txm.concordance.core.functions.Concordance;
+import org.txm.concordance.core.functions.comparators.LineComparator;
+import org.txm.concordance.rcp.editors.ConcordanceEditor;
+import org.txm.edition.rcp.editors.RGBA;
+import org.txm.edition.rcp.editors.SynopticEditionEditor;
+import org.txm.edition.rcp.handlers.OpenEdition;
+import org.txm.objects.Edition;
+import org.txm.objects.Page;
+import org.txm.objects.Text;
+import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
+import org.txm.progression.core.functions.Progression;
+import org.txm.progression.rcp.messages.ProgressionUIMessages;
+import org.txm.rcp.editors.TXMResultEditorInput;
+import org.txm.rcp.utils.SWTEditorsUtils;
+import org.txm.searchengine.cqp.corpus.CQPCorpus;
+import org.txm.searchengine.cqp.corpus.Property;
+import org.txm.searchengine.cqp.corpus.StructuralUnit;
+import org.txm.searchengine.cqp.corpus.query.Match;
+import org.txm.utils.logger.Log;
+
+/**
+ * Progression chart mixed mouse and key user entries call back.
+ * 
+ * @author sjacquot
+ *
+ */
+public class ProgressionEventCallBack extends EventCallBack {
+
+	/**
+	 * To keep track of the concordance lines and recomputing only if the selected item is out of this range.
+	 */
+	protected int lastConcordanceTopLine = -1;
+	
+	/**
+	 * To keep track of the concordance lines sort and recomputing only if the sorting order has changed.
+	 */
+	protected LineComparator lastSortingComparator = null;
+
+	@Override
+	public void processEvent(final AWTEvent event, final int eventArea, final Object o) {
+		
+		// Need to run this in the SWT UI thread because it's called from the AWT UI thread in TBX charts engine layer
+		chartEditor.getComposite().getDisplay().asyncExec(new Runnable() {
+			public void run() {
+
+				// Mouse event
+				if(event instanceof MouseEvent)	{
+				
+					MouseEvent mouseEvent = (MouseEvent)event;
+					
+					//return if it's not the left mouse button
+					if(mouseEvent.getButton() != MouseEvent.BUTTON1)	{
+						return;
+					}
+					
+					ChartMouseEvent chartEvent = (ChartMouseEvent) o;
+					ChartEntity entity = chartEvent.getEntity();
+					final ArrayList<Integer> selectedPointPositions = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getSelectedPointPositions(chartEditor.getChart());
+	
+					if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 2 && eventArea == EventCallBack.AREA_ITEM && !selectedPointPositions.isEmpty()) {
+	
+						// Linked edition (CTRL/CMD + double click)
+						if((mouseEvent.getModifiers() & ZoomAndPanCallBack.keyboardZoomModifierKeyMask) != 0) {
+							// Updates the linked editor
+							updateLinkedEditionEditor((SynopticEditionEditor) chartEditor.getLinkedEditor(SynopticEditionEditor.class), selectedPointPositions);
+						}
+						// Linked concordance
+						else	{
+							// Updates the linked editor
+							updateLinkedConcordanceEditor(chartEditor.getLinkedEditors(ConcordanceEditor.class), selectedPointPositions);
+						}
+					}
+					else if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 1 && eventArea == EventCallBack.AREA_ITEM) {
+
+						// Get the linked concordance editors and update the one linked to the progression curve if it exists
+						ArrayList<EditorPart> linkedConcordancesEditors = chartEditor.getLinkedEditors(ConcordanceEditor.class);
+						if(!linkedConcordancesEditors.isEmpty())	{
+							updateLinkedConcordanceEditor(linkedConcordancesEditors, selectedPointPositions);
+						}
+						
+						
+						// Get the linked edition editor and update it if exists
+						SynopticEditionEditor linkedEditionEditor = (SynopticEditionEditor)chartEditor.getLinkedEditor(SynopticEditionEditor.class);
+						if(linkedEditionEditor != null)	{
+							updateLinkedEditionEditor(linkedEditionEditor, selectedPointPositions);
+						}
+						
+					}
+					else if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 2 && eventArea == EventCallBack.AREA_EMPTY) {
+						// FIXME: debug
+						//System.err.println("ProgressionMouseClickedCallBack.processEvent(...).new Runnable() {...}.run(): double click in empty area");
+					}
+					else if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 1 && eventArea == EventCallBack.AREA_EMPTY) {
+						// FIXME: debug
+						//System.err.println("ProgressionMouseClickedCallBack.processEvent(...).new Runnable() {...}.run(): single click in empty area");
+					}
+				}
+				// Key event
+				else if(event instanceof KeyEvent)	{
+					KeyEvent keyEvent = (KeyEvent)event;
+					
+					// return if zoom and pan modifier
+					if((keyEvent.getModifiers() & ZoomAndPanCallBack.keyboardZoomModifierKeyMask) != 0) {
+						return;
+					}
+					
+					// Arrow keys
+					if(keyEvent.getKeyCode() == KeyEvent.VK_LEFT || keyEvent.getKeyCode() == KeyEvent.VK_RIGHT)	{
+					
+						final ArrayList<Integer> selectedPointPositions = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getSelectedPointPositions(chartEditor.getChart());
+	
+						// Get the linked concordance editors and update the one linked to the progression curve if it exists
+						ArrayList<EditorPart> linkedConcordancesEditors = chartEditor.getLinkedEditors(ConcordanceEditor.class);
+						if(!linkedConcordancesEditors.isEmpty())	{
+							updateLinkedConcordanceEditor(linkedConcordancesEditors, selectedPointPositions);
+						}
+						
+						// Get the linked edition editor and update it if exists
+						SynopticEditionEditor linkedEditionEditor = (SynopticEditionEditor)chartEditor.getLinkedEditor(SynopticEditionEditor.class);
+						if(linkedEditionEditor != null)	{
+							updateLinkedEditionEditor(linkedEditionEditor, selectedPointPositions);
+						}
+					}
+				}
+			}
+		});
+
+	}
+	
+	
+	
+	/**
+	 * Updates the linked concordance editor.
+	 * If the editor doesn't exist it will be created.
+	 * 
+	 * @param linkedEditors
+	 * @param selectedPointPositions
+	 */
+	public void updateLinkedConcordanceEditor(ArrayList<EditorPart> linkedEditors, final ArrayList<Integer> selectedPointPositions)	{
+
+		// Debug
+		Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(): linked editors count: " + linkedEditors.size()); //$NON-NLS-1$
+		
+		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		IWorkbenchPage page = window.getActivePage();
+
+		// Get and format the progression query from the selected chart series
+		// FIXME: case 1, the query is the query of the selected chart series
+//		ArrayList<Integer> selectedSeries = chartEditor.getEditorInput().getSWTChartComponentsProvider().getChartsEngine().getProgressionChartSelectedSeries(chartEditor.getChart());
+//		String query = ((Progression) chartEditor.getResultData()).getQueries().get(selectedSeries.get(selectedSeries.size() - 1).intValue()).getQueryString();
+		
+		int lastSelectedSeries = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getLastSelectedSeries(chartEditor.getChart());
+		String query = ((Progression) chartEditor.getResult()).getQueries().get(lastSelectedSeries).getQueryString();
+
+		// Remove "[" and "]" only if it's a simple query as "[faire]" 
+		if(query.startsWith("[") && !query.contains("="))	{ //$NON-NLS-1$ //$NON-NLS-2$
+			int length = query.length();
+			if(query.endsWith("]"))	{ //$NON-NLS-1$
+				length--;
+			}
+			query = query.substring(1, length);
+		}
+
+		// FIXME: case 2, the query is the combination of all the queries of the progression
+//		String query = ((Progression) chartEditor.getResultData()).getQueriesString();
+		
+		
+		// gets the linked editor according to the query if it exists
+		ConcordanceEditor linkedEditor = null;
+		for(int i = 0; i < linkedEditors.size(); i++) {
+			if(query.equals(((ConcordanceEditor) linkedEditors.get(i)).getConcordance().getQuery().getQueryString()))	{
+				linkedEditor = ((ConcordanceEditor) linkedEditors.get(i));
+				break;
+			}
+		}
+		
+		
+		
+		final TXMResultEditorInput editorInput;
+		boolean newEditor = false;
+		// Create the linked editor input if needed
+		if (linkedEditor == null) {
+			Concordance concordance = new Concordance(((Progression) chartEditor.getResult()).getCorpus());
+			concordance.setQuery(query);
+			editorInput = new TXMResultEditorInput(concordance);
+			newEditor = true;
+		}
+		else {
+			editorInput = (TXMResultEditorInput) linkedEditor.getEditorInput();
+		}
+
+		try {
+			boolean wasOpenedEditor = SWTEditorsUtils.isOpenEditor(editorInput, ConcordanceEditor.ID);
+			
+			linkedEditor = (ConcordanceEditor) page.openEditor(editorInput, ConcordanceEditor.ID, false);
+			if(newEditor)	{
+				chartEditor.addLinkedEditor(linkedEditor);
+			}
+			
+			// Split the area and insert the new editor
+			if(!wasOpenedEditor)	{
+				
+				int position = EModelService.BELOW;
+				EditorPart parentEditor = chartEditor;
+				
+				// Split vertically if there is already a concordance or an edition editor otherwise split horizontally
+				if(linkedEditors != null && !linkedEditors.isEmpty())	 {
+					position = EModelService.RIGHT_OF;
+					parentEditor = linkedEditors.get(linkedEditors.size() - 1);
+					
+					System.err.println("ProgressionEventCallBack.updateLinkedConcordanceEditor(): parent editor for splitting: " + parentEditor); //$NON-NLS-1$
+				}
+				// Split and add linked editor
+				SWTEditorsUtils.addEditor(parentEditor, linkedEditor, position);
+			}
+			
+		}
+		catch (PartInitException e) {
+			System.err.println(ProgressionUIMessages.errorDDot+e.getLocalizedMessage());
+		}
+
+		// Compute the concordance if it has never been computed
+		if(newEditor)	{
+			Job job = linkedEditor.compute(false);
+
+			final ConcordanceEditor linkedEditor2 = linkedEditor;
+			
+			job.addJobChangeListener(new JobChangeAdapter() 	{
+				@Override
+				public void done(IJobChangeEvent event) {
+					super.done(event);
+					
+					// initialize range change tracking variables
+					lastConcordanceTopLine = -1;
+					//lastConcordanceBottomLine = linkedEditor.getLinePerPage();
+					lastSortingComparator = linkedEditor2.getCurrentComparator();
+
+					updateLinkedConcordanceEditor(linkedEditor2, selectedPointPositions, true);
+					
+				}
+			});
+			
+		}
+		else	{
+			updateLinkedConcordanceEditor(linkedEditor, selectedPointPositions, false);
+		}
+		
+		// give back the focus to chart editor
+		chartEditor.setFocus();
+	}
+
+
+	/**
+	 * 
+	 * @param linkedEditor
+	 * @param selectedPointPositions
+	 * @param loadLines
+	 */
+	public void updateLinkedConcordanceEditor(final ConcordanceEditor linkedEditor, final ArrayList<Integer> selectedPointPositions, boolean loadLines)	{
+		
+		final TableViewer tableViewer = linkedEditor.getLineTableViewer();
+		if(selectedPointPositions.size() > 0)	{
+
+			// Get the index of the last selected point in concordance according to the global token position and concordance sorting order
+			int lineIndex = linkedEditor.getConcordance().indexOf(selectedPointPositions.get(selectedPointPositions.size() - 1));
+			
+			int top = lineIndex - (lineIndex % linkedEditor.getLinePerPage());
+			
+			linkedEditor.getConcordance().setTopIndex(top);
+			
+			// Manage the lazy loading of new lines range in the concordance table
+			// page change
+			if(lastConcordanceTopLine != top)	{
+				loadLines = true;
+			}
+			// sort change
+			else if(lastSortingComparator != linkedEditor.getCurrentComparator())	{
+				loadLines = true;
+			}
+
+			
+			// Loads new lines, fill the display area and select the table row
+			if(loadLines)	{
+				Display.getDefault().syncExec(new Runnable() {
+					@Override
+					public void run() {
+						linkedEditor.fillDisplayArea();						
+					}
+				});
+
+			}
+
+			// update range change tracking variables
+			lastConcordanceTopLine = top;
+			//lastConcordanceBottomLine = bottom;
+			lastSortingComparator = linkedEditor.getCurrentComparator();
+			
+			
+			final int selectedPointInTableRange = lineIndex - top;						
+	
+			tableViewer.getControl().getDisplay().asyncExec(new Runnable() {
+				@Override
+				public void run() {
+					tableViewer.getTable().deselectAll();
+					
+					Object line = tableViewer.getElementAt(selectedPointInTableRange);
+					if(line != null)	{
+						tableViewer.setSelection(new StructuredSelection(line), true);
+						// FIXME: commented because the set top index makes the read of the table difficult
+						//tableViewer.getTable().setTopIndex(selectedPointInTableRange);
+						Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selecting progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") in the linked Concordance table."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					}
+					else	{
+						Log.finest("ProgressionEventCallBack.updateLinkedConcordanceEditor(...).new Runnable() {...}.run(): Selected progression point (" + selectedPointInTableRange + " / " + tableViewer.getTable().getItemCount() + ") doesn't exist in the linked Concordance table."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+					}
+				}
+			});
+		}
+		else	{
+			tableViewer.getTable().deselectAll();
+		}
+	}
+	
+	//FIXME: version with new SynopticEditionEditor system edition
+	/**
+	 * Updates the linked edition editor.
+	 * If the editor doesn't exist it will be created.
+	 * @param editor
+	 */
+	public void updateLinkedEditionEditor(SynopticEditionEditor linkedEditor, ArrayList<Integer> selectedPointPositions)	{
+		
+		try {
+		
+			ArrayList<Color> seriesColors = chartEditor.getResult().getChartCreator().getSeriesShapesColors(chartEditor.getChart());
+			RGBA selectedWordColor = new RGBA(255, 10, 10);
+
+			// Unhighlight all tokens
+			if(linkedEditor != null)	{
+				linkedEditor.removeHighlightWords();
+				linkedEditor.updateWordStyles();
+			}
+			
+			CQPCorpus corpus = ((Progression) chartEditor.getResult()).getCorpus();
+			StructuralUnit textS = corpus.getStructuralUnit("text"); //$NON-NLS-1$
+			Property textP = textS.getProperty("id"); //$NON-NLS-1$
+			Match selectedWordMatch = new Match(selectedPointPositions.get(selectedPointPositions.size() - 1), selectedPointPositions.get(selectedPointPositions.size() - 1));
+			String textId = selectedWordMatch.getValueForProperty(textP);
+
+			Text text = corpus.getProject().getText(textId);
+			if(text == null) {
+				Log.severe(ProgressionUIMessages.bind(ProgressionUIMessages.textP0IsMissing, textId));
+				return;
+			}
+
+			Edition edition = text.getEdition(corpus.getProject().getDefaultEdition());
+
+			if(edition == null) {
+				Log.severe(ProgressionUIMessages.defaultEditionIsMissing);
+				return;
+			}
+
+			// Get the current selected word to highlight more
+			List<String> selectedWordIds = selectedWordMatch.getValuesForProperty(corpus.getProperty("id")); //$NON-NLS-1$;
+
+			// Get all words to highlight from the progression chart data set
+			ArrayList<ArrayList<Integer>> allPointPositionsBySeries = ((ProgressionChartCreator)chartEditor.getResult().getChartCreator()).getAllPointPositionsBySeries(chartEditor.getChart());
+			
+			ArrayList<ArrayList<String>> allWordIds = new ArrayList<ArrayList<String>>(allPointPositionsBySeries.size());
+			for(int i = 0; i < allPointPositionsBySeries.size(); i++) {
+				ArrayList<Integer> positions = allPointPositionsBySeries.get(i);
+				ArrayList<String> wordsIds = new ArrayList<String>(); 
+				for(int j = 0; j < positions.size(); j++) {
+					Match match = new Match(positions.get(j), positions.get(j));					
+					if(match.getValueForProperty(textP).equals(textId)) {
+						wordsIds.add(match.getValueForProperty(corpus.getProperty("id"))); //$NON-NLS-1$;
+					}
+				}
+				allWordIds.add(wordsIds);
+			}
+
+			Page openPage = edition.getPageForWordId(selectedWordIds.get(0));
+
+			if(openPage != null) {
+
+				// Create the linked editor if needed
+				if(linkedEditor == null || linkedEditor.isDisposed()) {
+					linkedEditor = OpenEdition.openEdition(corpus, OpenEdition.getDefaultEditions(corpus));
+					chartEditor.addLinkedEditor(linkedEditor);
+					
+					
+					int position = EModelService.BELOW;;
+					EditorPart parentEditor = chartEditor;
+					// Split vertically if there is already a concordance editor otherwise split horizontally
+					ConcordanceEditor linkedConcordanceEditor = (ConcordanceEditor)chartEditor.getLinkedEditor(ConcordanceEditor.class);
+					if(linkedConcordanceEditor != null)	{
+						position = EModelService.RIGHT_OF;
+						parentEditor = linkedConcordanceEditor;
+					}
+					
+					// Split and add linked editor
+					SWTEditorsUtils.addEditor(parentEditor, linkedEditor, position);
+				}
+
+				linkedEditor.setText(text, true);
+				linkedEditor.goToPage(openPage.getName());
+				
+				// Highlight tokens by series
+				for(int i = 0; i < allWordIds.size(); i++) {
+					linkedEditor.addHighlightWordsById(new RGBA(seriesColors.get(i).getRed(), seriesColors.get(i).getGreen(), seriesColors.get(i).getBlue()), allWordIds.get(i));
+				}
+				// Highlight selected curve token
+				linkedEditor.addHighlightWordsById(selectedWordColor, selectedWordIds);
+				linkedEditor.setFocusedWordID(selectedWordIds.get(0)); // to scroll to the selected word
+				
+				IWorkbenchPage attachedPage = linkedEditor.getEditorSite().getPage();
+				attachedPage.activate(linkedEditor);
+			}
+		}
+		catch(Exception e) {
+			Log.printStackTrace(e);
+		}
+	}
+
+	
+	    
+}
\ No newline at end of file
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 1335)
@@ -72,7 +72,7 @@
 				try {
 					corpus.compute();
 					if (!Progression.canRunProgression(corpus)) {
-						Log.severe(ProgressionCoreMessages.ComputeProgression_0);
+						Log.severe(ProgressionCoreMessages.theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora);
 						// La fonctionnalité Progression n'est pas encore disponible pour les sous-corpus discontinus.
 						return null;
 					}
@@ -97,4 +97,4 @@
 		return null;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/preferences/ProgressionPreferencePage.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/preferences/ProgressionPreferencePage.java	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/preferences/ProgressionPreferencePage.java	(revision 1335)
@@ -59,10 +59,10 @@
 		// Charts rendering
 		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent());
 		
-		this.addField(new BooleanFieldEditor(ProgressionPreferences.CHART_CUMULATIVE, ProgressionUIMessages.ProgressionPreferencePage_3, chartsTab));
-		this.addField(new BooleanFieldEditor(ProgressionPreferences.REPEAT_SAME_VALUES, ProgressionUIMessages.ProgressionPreferencePage_6, chartsTab));
+		this.addField(new BooleanFieldEditor(ProgressionPreferences.CHART_CUMULATIVE, ProgressionUIMessages.defaultChartTypeIsCumulative, chartsTab));
+		this.addField(new BooleanFieldEditor(ProgressionPreferences.REPEAT_SAME_VALUES, ProgressionUIMessages.repeatTheValuesOfTheStructureProperties, chartsTab));
 
-		DoubleFieldEditor bandemultiplierfield = new DoubleFieldEditor(ProgressionPreferences.BANDE_MULTIPLIER, ProgressionUIMessages.ProgressionPreferencePage_7, chartsTab);
+		DoubleFieldEditor bandemultiplierfield = new DoubleFieldEditor(ProgressionPreferences.BANDE_MULTIPLIER, ProgressionUIMessages.bandeSizeMultiplier, chartsTab);
 		this.addField(bandemultiplierfield);
 		// FIXME: valid range
 		//if (bandemultiplierfield.getIntValue() == 0)
@@ -85,4 +85,4 @@
 		this.setImageDescriptor(ProgressionAdapterFactory.ICON);
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,14 +1,13 @@
-
-ProgressionDialog_1  = Тип графа: 
-ProgressionDialog_11 = Масштаб полос
-ProgressionDialog_15 = Повторять идентичные значения
-ProgressionDialog_17 = Ошибка: мультипликатор полосы: 
-ProgressionDialog_2  = кумулятивный
-ProgressionDialog_3  = плотность
-ProgressionDialog_7  = Рег. Выр.: 
-
-ProgressionPreferencePage_3 = Кумулятивный граф прогрессии
-ProgressionPreferencePage_6 = Повторять значения с свойств структур
-ProgressionPreferencePage_7 = Масштаб границ структур
-
-error_theQueryIsAlreadyRepresentedByACurveInTheGraphic = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+bandeSizeMultiplier=Масштаб границ структур
+bandewidthMultiplierDDot=Масштаб полос
+chartTypeDDot=Тип графа\: 
+cumulative=кумулятивный
+defaultChartTypeIsCumulative=Кумулятивный граф прогрессии
+density=плотность
+error_theQueryIsAlreadyRepresentedByACurveInTheGraphic=
+regexDDot=Рег. Выр.\: 
+repeatSameValues=Повторять идентичные значения
+repeatTheValuesOfTheStructureProperties=Повторять значения с свойств структур
+stripMultiplierErrorDDot=Ошибка\: мультипликатор полосы\: 
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,14 +1,13 @@
-
-ProgressionDialog_1  = Type de graphique : 
-ProgressionDialog_11 = Échelle des bandeaux
-ProgressionDialog_15 = Répéter les valeurs identiques
-ProgressionDialog_17 = Erreur : multiplicateur de bande : 
-ProgressionDialog_2  = cumulatif
-ProgressionDialog_3  = densité
-ProgressionDialog_7  = Exp. Rég. : 
-
-ProgressionPreferencePage_3 = Graphique de progression cumulatif par défault
-ProgressionPreferencePage_6 = Répéter les valeurs de propriétés de structures
-ProgressionPreferencePage_7 = Échelle des limites de structures
-
-error_theQueryIsAlreadyRepresentedByACurveInTheGraphic = La requête {0} est déjà représentée dans le graphique par une courbe. Veuillez utiliser une autre requête.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+bandeSizeMultiplier=Échelle des limites de structures
+bandewidthMultiplierDDot=Échelle des bandeaux
+chartTypeDDot=Type de graphique \: 
+cumulative=cumulatif
+defaultChartTypeIsCumulative=Graphique de progression cumulatif par défault
+density=densité
+error_theQueryIsAlreadyRepresentedByACurveInTheGraphic=La requête {0} est déjà représentée dans le graphique par une courbe. Veuillez utiliser une autre requête.
+regexDDot=Exp. Rég. \: 
+repeatSameValues=Répéter les valeurs identiques
+repeatTheValuesOfTheStructureProperties=Répéter les valeurs de propriétés de structures
+stripMultiplierErrorDDot=Erreur \: multiplicateur de bande \: 
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java	(revision 1335)
@@ -14,34 +14,34 @@
 
 	private static final String BUNDLE_NAME = "org.txm.progression.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String ProgressionEventCallBack_error;
-	public static String ProgressionEventCallBack_error_missing_default_edition;
-	public static String ProgressionEventCallBack_error_missing_text;
+	public static String errorDDot; 
+	public static String defaultEditionIsMissing; 
+	public static String textP0IsMissing; 
 	
-	public static String ProgressionPreferencePage_3;
-	public static String ProgressionPreferencePage_6;
-	public static String ProgressionPreferencePage_7;
+	public static String defaultChartTypeIsCumulative; 
+	public static String repeatTheValuesOfTheStructureProperties; 
+	public static String bandeSizeMultiplier; 
 
-	public static String ProgressionDialog_1;
-	public static String ProgressionDialog_11;
-	public static String ProgressionDialog_15;
-	public static String ProgressionDialog_17;
-	public static String ProgressionDialog_2;
-	public static String ProgressionDialog_3;
-	public static String ProgressionDialog_7;
+	public static String chartTypeDDot; 
+	public static String bandewidthMultiplierDDot; 
+	public static String repeatSameValues; 
+	public static String stripMultiplierErrorDDot; 
+	public static String cumulative; 
+	public static String density; 
+	public static String regexDDot; 
 	
 	
-	public static String ProgressionEditor_add;
+	public static String add; 
 
-	public static String ProgressionEditor_add_queries_from_file;
+	public static String addQueriesFromFile; 
 
-	public static String ProgressionEditor_no_query;
+	public static String noQuery; 
 
-	public static String ProgressionEditor_queries;
+	public static String queries; 
 
-	public static String ProgressionEditor_query;
+	public static String query; 
 
-	public static String ProgressionEditor_select_property_file;
+	public static String selectAnUTF8PropertyFile; 
 
 	public static String error_theQueryIsAlreadyRepresentedByACurveInTheGraphic;
 
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages.properties	(revision 1335)
@@ -1,25 +1,22 @@
-
-ProgressionDialog_1  = Chart type:
-ProgressionDialog_11 = Bandewidth multiplier:
-ProgressionDialog_15 = Repeat same values
-ProgressionDialog_17 = Strip multiplier error:
-ProgressionDialog_2  = cumulative
-ProgressionDialog_3  = density
-ProgressionDialog_7  = Regex:
-
-ProgressionEditor_add                   = Add
-ProgressionEditor_add_queries_from_file = Add queries from file...
-ProgressionEditor_no_query              = No query - 
-ProgressionEditor_queries               = \ queries - 
-ProgressionEditor_query                 = \ query - 
-ProgressionEditor_select_property_file  = Select an UTF-8 property file
-
-ProgressionEventCallBack_error                         = Error: 
-ProgressionEventCallBack_error_missing_default_edition = Default edition is missing.
-ProgressionEventCallBack_error_missing_text            = Text {0} is missing.
-
-ProgressionPreferencePage_3 = Default chart type is cumulative
-ProgressionPreferencePage_6 = Repeat the values of the structure properties
-ProgressionPreferencePage_7 = Bande size multiplier
-
-error_theQueryIsAlreadyRepresentedByACurveInTheGraphic = The query {0} is already represented by a curve in the graphic. Please use another query.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+add=Add
+addQueriesFromFile=Add queries from file...
+bandeSizeMultiplier=Bande size multiplier
+bandewidthMultiplierDDot=Bandewidth multiplier\:
+chartTypeDDot=Chart type\:
+cumulative=cumulative
+defaultChartTypeIsCumulative=Default chart type is cumulative
+defaultEditionIsMissing=Default edition is missing.
+density=density
+error_theQueryIsAlreadyRepresentedByACurveInTheGraphic=The query {0} is already represented by a curve in the graphic. Please use another query.
+errorDDot=Error\: 
+noQuery=No query - 
+queries=\ queries - 
+query=\ query - 
+regexDDot=Regex\:
+repeatSameValues=Repeat same values
+repeatTheValuesOfTheStructureProperties=Repeat the values of the structure properties
+selectAnUTF8PropertyFile=Select an UTF-8 property file
+stripMultiplierErrorDDot=Strip multiplier error\:
+textP0IsMissing=Text {0} is missing.
Index: tmp/org.txm.index.core/src/org/txm/index/core/messages/messages.properties
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages.properties	(revision 1335)
@@ -1,16 +1,11 @@
-
-DetailsFromCorpus = Index:\n\	Corpus {0}\n\	query {1}\n\	properties {2}\n\	Fmin {3}\n\	Fmax {4}
-
-DetailsFromPartition = Index:\n\	Partition {0}\n\	query {1}\n\	properties {2}\n\	Fmin {3}\n\	Fmax {4}
-
-Index_1 = Console : 
-Index_7 = ** Failed to export Lexicon : 
-
-LEXICON_RESULT_TYPE = Lexicon
-
-Lexicon_0 = Forms and frequencies tables must have the same size.
-Lexicon_3 = Lexicon: 
-
-RESULT_TYPE = Index
-
-SUBCORPUS_LEXICON = Computing the lexicon of subcorpus {0}...
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+computingTheLexiconOfSubcorpusP0=Computing the lexicon of subcorpus {0}...
+consoleDDot=Console \: 
+failedToExportLexiconDDot=** Failed to export Lexicon \: 
+formsAndFrequenciesTablesMustHaveTheSameSize=Forms and frequencies tables must have the same size.
+indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4=Index\:\n\tCorpus {0}\n\tquery {1}\n\tproperties {2}\n\tFmin {3}\n\tFmax {4}
+indexDDotPartitionP0queryP1propertiesP2FminP3FmaxP4=Index\:\n\tPartition {0}\n\tquery {1}\n\tproperties {2}\n\tFmin {3}\n\tFmax {4}
+lexicon=Lexicon
+lexiconDDot=Lexicon\: 
+RESULT_TYPE=Index
Index: tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java	(revision 1335)
@@ -1,36 +1,36 @@
-package org.txm.index.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * 
- * @author sjacquot
- *
- */
-public class IndexCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.index.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String DetailsFromPartition;
-	public static String DetailsFromCorpus;
-	
-	public static String RESULT_TYPE;
-	public static String LEXICON_RESULT_TYPE;
-	
-	public static String Index_1;
-	public static String Index_7;
-
-
-	public static String Lexicon_0;
-	public static String Lexicon_3;
-	public static String SUBCORPUS_LEXICON;
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexCoreMessages.class);
-	}
-
-	private IndexCoreMessages() {
-	}
-}
+package org.txm.index.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * 
+ * @author sjacquot
+ *
+ */
+public class IndexCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.index.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String indexDDotPartitionP0queryP1propertiesP2FminP3FmaxP4; 
+	public static String indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4; 
+	
+	public static String RESULT_TYPE;
+	public static String lexicon; 
+	
+	public static String consoleDDot; 
+	public static String failedToExportLexiconDDot; 
+
+
+	public static String formsAndFrequenciesTablesMustHaveTheSameSize; 
+	public static String lexiconDDot; 
+	public static String computingTheLexiconOfSubcorpusP0; 
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexCoreMessages.class);
+	}
+
+	private IndexCoreMessages() {
+	}
+}
Index: tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_ru.properties	(revision 1335)
@@ -1,8 +1,6 @@
-
-DetailsFromCorpus = Индекс:\n\	Корпус {0}\n\	Запрос {1}\n\	свойства {2}\n\	Fmin {3}\n\	Fmax {4}
-
-DetailsFromPartition = Индекс:\n\	Распределение {0}\n\	Запрос {1}\n\	свойства {2}\n\	Fmin {3}\n\	Fmax {4}
-
-LEXICON_RESULT_TYPE = Словарь
-
-RESULT_TYPE = Индекс
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4=Индекс\:\n\tКорпус {0}\n\tЗапрос {1}\n\tсвойства {2}\n\tFmin {3}\n\tFmax {4}
+indexDDotPartitionP0queryP1propertiesP2FminP3FmaxP4=Индекс\:\n\tРаспределение {0}\n\tЗапрос {1}\n\tсвойства {2}\n\tFmin {3}\n\tFmax {4}
+lexicon=Словарь
+RESULT_TYPE=Индекс
Index: tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties	(revision 1335)
@@ -1,16 +1,11 @@
-
-DetailsFromCorpus = Index:\n\	Corpus {0}\n\	Requête {1}\n\	propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
-
-DetailsFromPartition = Index:\n\	Partition {0}\n\	Requête {1}\n\	propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
-
-Index_1 = console : 
-Index_7 = ** Echec de l'exportation du Lexique : 
-
-LEXICON_RESULT_TYPE = Lexique
-
-Lexicon_0 = Le tableau des formes et des fréquences doivent avoir la même longueur.
-Lexicon_3 = Lexique :
-
-RESULT_TYPE = Index
-
-SUBCORPUS_LEXICON = Calcul du lexique du sous-corpus {0}...
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+computingTheLexiconOfSubcorpusP0=Calcul du lexique du sous-corpus {0}...
+consoleDDot=console \: 
+failedToExportLexiconDDot=** Echec de l'exportation du Lexique \: 
+formsAndFrequenciesTablesMustHaveTheSameSize=Le tableau des formes et des fréquences doivent avoir la même longueur.
+indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4=Index\:\n\tCorpus {0}\n\tRequête {1}\n\tpropriétés {2}\n\tFmin {3}\n\tFmax {4}
+indexDDotPartitionP0queryP1propertiesP2FminP3FmaxP4=Index\:\n\tPartition {0}\n\tRequête {1}\n\tpropriétés {2}\n\tFmin {3}\n\tFmax {4}
+lexicon=Lexique
+lexiconDDot=Lexique \:
+RESULT_TYPE=Index
Index: tmp/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java	(revision 1335)
@@ -196,7 +196,7 @@
 		// System.out.println("in "+this.getCqpId()+" look for cached lexicon "+property);
 		// System.out.println("not found");
 		this.subTask("Computing lexicon size...");
-		Log.finest(IndexCoreMessages.LEXICON_RESULT_TYPE + corpus.getID());
+		Log.finest(IndexCoreMessages.lexicon + corpus.getID());
 		int lexiconSize;
 		try {
 			lexiconSize = CorpusManager.getCorpusManager().getCqiClient().lexiconSize(property.getQualifiedName());
@@ -238,7 +238,7 @@
 //		}
 		
 		//System.out.println("not found");
-		Log.finest(IndexCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
+		Log.finest(IndexCoreMessages.computingTheLexiconOfSubcorpusP0 + corpus.getName());
 		//long start = System.currentTimeMillis();
 		int[][] fdist = null;
 		Subcorpus tmp = null;
@@ -441,7 +441,7 @@
 	@Override
 	public String getName() {
 		try {
-			return IndexCoreMessages.LEXICON_RESULT_TYPE + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();	
+			return IndexCoreMessages.lexicon + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();	
 		}
 		catch(Exception e) {
 		}
@@ -514,7 +514,7 @@
 	 */
 	protected void init(TXMResult corpus, Property property, int[] freq, int[] ids) {
 		if (freq.length != ids.length) {
-			throw new IllegalArgumentException(IndexCoreMessages.Lexicon_0);
+			throw new IllegalArgumentException(IndexCoreMessages.formsAndFrequenciesTablesMustHaveTheSameSize);
 		}
 		this.freqs = freq;
 		this.ids = ids;
@@ -578,7 +578,7 @@
 
 	@Override
 	public String toString() {
-		return IndexCoreMessages.Lexicon_3 + this.getCurrentName();
+		return IndexCoreMessages.lexiconDDot + this.getCurrentName();
 	}
 
 	/**
@@ -690,8 +690,8 @@
 
 	@Override
 	public String getResultype() {
-		return IndexCoreMessages.LEXICON_RESULT_TYPE;
+		return IndexCoreMessages.lexicon;
 	}
 
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java	(revision 1335)
@@ -197,7 +197,7 @@
 		// System.out.println("in "+this.getCqpId()+" look for cached lexicon "+property);
 		// System.out.println("not found");
 		this.subTask("Computing lexicon size...");
-		Log.finest(IndexCoreMessages.LEXICON_RESULT_TYPE + corpus.getID());
+		Log.finest(IndexCoreMessages.lexicon + corpus.getID());
 		int lexiconSize;
 		try {
 			lexiconSize = CorpusManager.getCorpusManager().getCqiClient().lexiconSize(property.getQualifiedName());
@@ -235,7 +235,7 @@
 	protected boolean computewithSubCorpus(Subcorpus corpus, Property property, IProgressMonitor monitor) throws CqiClientException {
 
 		//System.out.println("not found");
-		Log.finest(IndexCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
+		Log.finest(IndexCoreMessages.computingTheLexiconOfSubcorpusP0 + corpus.getName());
 		//long start = System.currentTimeMillis();
 		int[][] fdist = null;
 		AbstractCqiClient cqi = CorpusManager.getCorpusManager().getCqiClient();
@@ -446,7 +446,7 @@
 	@Override
 	public String getName() {
 		try {
-			return IndexCoreMessages.LEXICON_RESULT_TYPE + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();	
+			return IndexCoreMessages.lexicon + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();	
 		}
 		catch(Exception e) {
 		}
@@ -519,7 +519,7 @@
 	 */
 	protected void init(TXMResult corpus, Property property, int[] freq, int[] ids) {
 		if (freq.length != ids.length) {
-			throw new IllegalArgumentException(IndexCoreMessages.Lexicon_0);
+			throw new IllegalArgumentException(IndexCoreMessages.formsAndFrequenciesTablesMustHaveTheSameSize);
 		}
 		this.freqs = freq;
 		this.ids = ids;
@@ -583,7 +583,7 @@
 
 	@Override
 	public String toString() {
-		return IndexCoreMessages.Lexicon_3 + this.getCurrentName();
+		return IndexCoreMessages.lexiconDDot + this.getCurrentName();
 	}
 
 	/**
@@ -707,8 +707,8 @@
 
 	@Override
 	public String getResultype() {
-		return IndexCoreMessages.LEXICON_RESULT_TYPE;
+		return IndexCoreMessages.lexicon;
 	}
 
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java	(revision 1335)
@@ -467,10 +467,10 @@
 				Object[] params = new Object[]{this.parent.getSimpleName(), this.getQuery().getQueryString(), this.getProperties(), this.getFmin(), this.getFmax()}; 
 				String str;
 				if(this.parent instanceof Partition)	{
-					str = IndexCoreMessages.DetailsFromPartition;
+					str = IndexCoreMessages.indexDDotPartitionP0queryP1propertiesP2FminP3FmaxP4;
 				}
 				else	{
-					str = IndexCoreMessages.DetailsFromCorpus;
+					str = IndexCoreMessages.indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4;
 				}
 				return NLS.bind(str, params);
 			}
@@ -999,7 +999,7 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
 	public void toConsole() throws CqiClientException, IOException {
-		System.out.println(IndexCoreMessages.Index_1 + (lines.size()));
+		System.out.println(IndexCoreMessages.consoleDDot + (lines.size()));
 		toConsole(0, lines.size());
 	}
 
@@ -1103,7 +1103,7 @@
 		try {
 			toTxt(outfile, 0, lines.size(), encoding, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+			System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 			return false;
 		}
 		return true;
@@ -1131,4 +1131,4 @@
 	public String getResultype() {
 		return PartitionIndex.class.getSimpleName();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 1334)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 1335)
@@ -539,7 +539,7 @@
 			try {
 				Object[] params = new Object[]{this.parent.getSimpleName(), this.getQuery().getQueryString(), this.getProperties(), this.getFmin(), this.getFmax()}; 
 				String str;
-				str = IndexCoreMessages.DetailsFromCorpus;
+				str = IndexCoreMessages.indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4;
 				return NLS.bind(str, params);
 			}
 			catch(Exception e) {
@@ -1043,7 +1043,7 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
 	public void toConsole() throws CqiClientException, IOException {
-		System.out.println(IndexCoreMessages.Index_1 + (lines.size()));
+		System.out.println(IndexCoreMessages.consoleDDot + (lines.size()));
 		toConsole(0, lines.size());
 	}
 
@@ -1170,7 +1170,7 @@
 		try {
 			toTxt(outfile, 0, lines.size(), encoding, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+			System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 			return false;
 		}
 		return true;
@@ -1198,4 +1198,4 @@
 	public String getResultype() {
 		return IndexCoreMessages.RESULT_TYPE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java	(revision 1335)
@@ -99,7 +99,7 @@
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		};
-		new Label(this, SWT.NONE).setText(TXMUIMessages.ComplexSortSelector_0);
+		new Label(this, SWT.NONE).setText(TXMUIMessages.sortKeys);
 		new Label(this, SWT.NONE).setText("#1"); //$NON-NLS-1$
 		firstKey = new Combo(this, SWT.NONE | SWT.READ_ONLY);
 		//firstKey.addSelectionListener(listener);
@@ -124,7 +124,7 @@
 		fourthKey.setLayoutData(griddata);
 		
 		Button sortButton = new Button(this, SWT.PUSH);
-		sortButton.setText(TXMUIMessages.ComplexSortSelector_2);
+		sortButton.setText(TXMUIMessages.sort);
 		sortButton.addSelectionListener(listener);
 		
 	}
@@ -140,12 +140,12 @@
 			comp.add(standardComparators.get(thirdKey.getText()));
 			comp.add(standardComparators.get(fourthKey.getText()));
 			defaultComparator.setComparators(comp);
-			System.out.println(TXMUIMessages.ComplexSortSelector_1+comp);
+			System.out.println(TXMUIMessages.complexSortDDot+comp);
 			editor.resetSortedColumn(firstKey.getSelectionIndex());
 			editor.setCurrentComparator(defaultComparator);
 			editor.sort();
 		} catch (Exception e) {
-			System.err.println(NLS.bind(TXMUIMessages.ComplexSortSelector_5, e));
+			System.err.println(NLS.bind(TXMUIMessages.errorDuringSortDDotP0, e));
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		}
 	}
@@ -191,7 +191,7 @@
 		List<LineComparator> userDefinedComparators = editor
 				.getUserDefinedComparators();
 		for (LineComparator c : userDefinedComparators) {
-			if (c.getName().equals(TXMUIMessages.ComplexSortSelector_6)) {
+			if (c.getName().equals(TXMUIMessages._default)) {
 				defaultComparator = (CompositeComparator) c;
 				List<LineComparator> comp = defaultComparator.getComparators();
 				if (comp.size() >= 4) {
@@ -221,7 +221,7 @@
 
 		// no default comparator found -> create one
 		defaultComparator = new CompositeComparator(
-				TXMUIMessages.ComplexSortSelector_6, standardComparatorslist);
+				TXMUIMessages._default, standardComparatorslist);
 		firstKey.select(0);
 		secondKey.select(0);
 		thirdKey.select(0);
@@ -230,4 +230,4 @@
 		editor.setCurrentComparator(defaultComparator);
 //		editor.sort(); // do it later 
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages.properties	(revision 1335)
@@ -1,157 +1,38 @@
-
-ComputeConcordance_0 = Opening the Concordance result
-ComputeConcordance_1 = Failed to open concordance editor.
-
-ComputeReferencer_0 = Open references editor
-
-ConcordancerPreferencePage_3 = Concordance Parameters
-ConcordancerPreferencePage_4 = Lines per &Page:
-ConcordancerPreferencePage_5 = &Left context length in words
-ConcordancerPreferencePage_6 = &Right context length in words
-
-ConcordancesEditorContributor_0 = Concordance
-
-ConcordancesEditor_0                          = Last CQI error:
-ConcordancesEditor_1                          = Reference
-ConcordancesEditor_10                         = . Aborting back to text.
-ConcordancesEditor_100                        = Available values for {0}
-ConcordancesEditor_101                        = Cancel
-ConcordancesEditor_108                        = \ elements. Continue ?
-ConcordancesEditor_11                         = |<
-ConcordancesEditor_110                        = New value {0} for category {1}  
-ConcordancesEditor_112                        = The value {0} is not associated with the category {1}. Associate it ?   
-ConcordancesEditor_115                        = Add a new category
-ConcordancesEditor_116                        = Proceed to annotation
-ConcordancesEditor_12                         = <
-ConcordancesEditor_13                         = >
-ConcordancesEditor_14                         = >|
-ConcordancesEditor_15                         = Category
-ConcordancesEditor_16                         = &Keyword:
-ConcordancesEditor_17                         = Keywords annotation
-ConcordancesEditor_18                         = &Edit
-ConcordancesEditor_19                         = Found {0} occurrences
-ConcordancesEditor_2                          = Left context
-ConcordancesEditor_20                         = Loading line informations...
-ConcordancesEditor_21                         = Could not instanciate one of the corpus Knowledge repository: 
-ConcordancesEditor_22                         = Affect
-ConcordancesEditor_23                         = to
-ConcordancesEditor_24                         = Delete
-ConcordancesEditor_25                         = of
-ConcordancesEditor_26                         = Project id {0} Corpus id {1} Text id {2}
-ConcordancesEditor_27                         = BackToText: Text {0} is missing
-ConcordancesEditor_28                         = the annotation
-ConcordancesEditor_29                         = No page found... for
-ConcordancesEditor_3                          = Keyword
-ConcordancesEditor_30                         = BackToText: default edition is missing
-ConcordancesEditor_31                         = =
-ConcordancesEditor_32                         = Enter a value for an id
-ConcordancesEditor_33                         = to
-ConcordancesEditor_34                         = Opening the Concordance
-ConcordancesEditor_35                         = selected lines
-ConcordancesEditor_36                         = Annotating concordance selection...
-ConcordancesEditor_37                         = Sorting reference column
-ConcordancesEditor_38                         = Hide settings
-ConcordancesEditor_39                         = Show settings
-ConcordancesEditor_4                          = Right context
-ConcordancesEditor_40                         = Error while annotating concordance selection: 
-ConcordancesEditor_41                         = Sorting left context column
-ConcordancesEditor_42                         = page lines
-ConcordancesEditor_43                         = The {0} corpus has no default references: {1}
-ConcordancesEditor_44                         = Annotating concordance page...
-ConcordancesEditor_45                         = Sorting keyword column
-ConcordancesEditor_46                         = Full text display failed: {0}
-ConcordancesEditor_47                         = Error while annotating concordance page: 
-ConcordancesEditor_48                         = Sorting right context column
-ConcordancesEditor_49                         = all lines
-ConcordancesEditor_5                          = Concordance of <{0}> in corpus {1}
-ConcordancesEditor_50                         = Opening corpus edition
-ConcordancesEditor_51                         = Annotating concordance...
-ConcordancesEditor_53                         = Error while annotating concordance: 
-ConcordancesEditor_54                         = Error while deleting annotation: 
-ConcordancesEditor_55                         = Opening property dialog
-ConcordancesEditor_56                         = Start computing concordance
-ConcordancesEditor_57                         = Looking for TypedValue with id=
-ConcordancesEditor_58                         = No value found with the {0} id.
-ConcordancesEditor_59                         = AFFECT 
-ConcordancesEditor_6                          = Sorting
-ConcordancesEditor_60                         = \ to SELECTION=
-ConcordancesEditor_61                         = Could not annotate the value '
-ConcordancesEditor_62                         = '.\n on certain sequences. \n
-ConcordancesEditor_63                         = \	- The sequence 
-ConcordancesEditor_64                         = \ is overlapping with \n
-ConcordancesEditor_65                         = \	\	- the end of a structure 
-ConcordancesEditor_66                         = , at [
-ConcordancesEditor_67                         = \ - 
-ConcordancesEditor_68                         = ]\n
-ConcordancesEditor_69                         = \	\	- the start of a structure 
-ConcordancesEditor_7                          = CQP error:
-ConcordancesEditor_70                         = , at [
-ConcordancesEditor_71                         = \ - 
-ConcordancesEditor_72                         = ]\n
-ConcordancesEditor_73                         = About annotations
-ConcordancesEditor_74                         = Error while affection annotation: 
-ConcordancesEditor_75                         = Annotate
-ConcordancesEditor_76                         = Save the annotations
-ConcordancesEditor_77                         = Open the list of categories
-ConcordancesEditor_78                         = class
-ConcordancesEditor_79                         = Select a value among the list
-ConcordancesEditor_8                          = The corpus has no text_id property
-ConcordancesEditor_80                         = value=
-ConcordancesEditor_81                         = Please enter the new type name
-ConcordancesEditor_82                         = New category
-ConcordancesEditor_83                         = with the category
-ConcordancesEditor_84                         = with the category
-ConcordancesEditor_85                         = OK
-ConcordancesEditor_86                         = Confirm annotation affectation
-ConcordancesEditor_87                         = You are about to annotate  
-ConcordancesEditor_88                         = Delete selected line(s)
-ConcordancesEditor_9                          = Error: could not retrieve line word id for edition 
-ConcordancesEditor_99                         = List of categories
-ConcordancesEditor_referenceColumn_text       = Reference
-ConcordancesEditor_xpndtmNewExpanditem_text   = New ExpandItem
-ConcordancesEditor_xpndtmNewExpanditem_text_1 = New ExpandItem
-ConcordancesEditor_xpndtmNewExpanditem_text_2 = New ExpandItem
-ConcordancesEditor_xpndtmNewParameters_text   = New Parameters
-CorporaView_3=
-CreateSubcorpusDialog_10=
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+_class=class
+ampLeftContextLengthInWords=&Left context length in words
+ampRightContextLengthInWords=&Right context length in words
+anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0=An error occurred while retrieving the concordance lines\: {0}
+canNotOpenConcordanceEditorWithP0=Can not open ConcordanceEditor with {0}
+concordanceParameters=Concordance Parameters
+cQPErrorDDot=CQP error\:
+deleteSelectedLines=Delete selected line(s)
 editor_19=...
-editor_20=Sort
 editor_21=
-editor_22=...
-editor_23=
-editor_24=...
-editor_25=
-editor_26=...
-editor_27=
-editor_28=...
-editor_29=Size
-editor_30=navigation
-editor_3dots=...
-editor_dot=.
-editor_empty=
-editor_error=Fatal error: {0}
-editor_error_open_editor=Can not open ConcordanceEditor with {0}
-editor_error_ui_creation=Error while building interface: {0}
-editor_keyword=Keyword
-editor_left=Left
-editor_properties_panel=Properties panel
-editor_references=References
-editor_right=Right
-editor_sorting_with=Sorting with 
-editor_view=View
-
-ERROR_WHILE_LOADING_CONCORDANCE_LINE = An error occurred while retrieving the concordance lines: {0}
-
-GetConcordancesDialog_0  = ERROR_GetConcordancesDialog: {0}
-GetConcordancesDialog_1  = Compute specificities
-GetConcordancesDialog_13 = you must select a property.
-GetConcordancesDialog_14 = Invalid property
-GetConcordancesDialog_15 = you must select an property.
-GetConcordancesDialog_4  = &Property:
-GetConcordancesDialog_5  = &Left context size:
-GetConcordancesDialog_6  = &Right context size:
-GetConcordancesDialog_7  = &Reference:
-
-GetConcordances_4        = Error while computing concordances: {0}
-LastCQPError=
-SORT_DONE=
+errorWhileBuildingInterfaceDDotP0=Error while building interface\: {0}
+fatalErrorDDotP0=Fatal error\: {0}
+inf=<
+keyword=Keyword
+left=Left
+leftContext=Left context
+linesPerAmpPageDDot=Lines per &Page\:
+navigation=navigation
+openingCorpusEdition=Opening corpus edition
+openingTheConcordanceResult=Opening the Concordance result
+propertiesPanel=Properties panel
+reference=Reference
+references=References
+right=Right
+rightContext=Right context
+size=Size
+sort=Sort
+sorting=Sorting
+sortingKeywordColumn=Sorting keyword column
+sortingLeftContextColumn=Sorting left context column
+sortingReferenceColumn=Sorting reference column
+sortingRightContextColumn=Sorting right context column
+sortingWith=Sorting with 
+startComputingConcordance=Start computing concordance
+sup=>
+view=View
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/ConcordanceUIMessages.java	(revision 1335)
@@ -14,193 +14,80 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.concordance.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String ConcordancesEditor_referenceColumn_text;
-	public static String ConcordancesEditor_xpndtmNewExpanditem_text;
-	public static String ConcordancesEditor_xpndtmNewParameters_text;
-	public static String ConcordancesEditor_xpndtmNewExpanditem_text_1;
-	public static String ConcordancesEditor_xpndtmNewExpanditem_text_2;
 	
-	public static String ComputeReferencer_0;
 
 	
-	public static String GetConcordancesDialog_0;
-	public static String GetConcordancesDialog_1;
-	public static String GetConcordancesDialog_13;
-	public static String GetConcordancesDialog_14;
-	public static String GetConcordancesDialog_15;
-	public static String GetConcordancesDialog_4;
-	public static String GetConcordancesDialog_5;
-	public static String GetConcordancesDialog_6;
-	public static String GetConcordancesDialog_7;
 	
-	public static String GetConcordances_4;
 	
-	public static String ERROR_WHILE_LOADING_CONCORDANCE_LINE;
+	public static String anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0; 
 	
-	public static String ComputeConcordance_0;
-	public static String ComputeConcordance_1;
+	public static String openingTheConcordanceResult; 
 	
-	public static String ConcordancerPreferencePage_3;
-	public static String ConcordancerPreferencePage_4;
-	public static String ConcordancerPreferencePage_5;
-	public static String ConcordancerPreferencePage_6;
+	public static String concordanceParameters; 
+	public static String linesPerAmpPageDDot; 
+	public static String ampLeftContextLengthInWords; 
+	public static String ampRightContextLengthInWords; 
 	
-	public static String ConcordancesEditorContributor_0;
 	
-	public static String ConcordancesEditor_0;
-	public static String ConcordancesEditor_1;
-	public static String ConcordancesEditor_10;
-	public static String ConcordancesEditor_101;
-	public static String ConcordancesEditor_108;
-	public static String ConcordancesEditor_11;
-	public static String ConcordancesEditor_112;
-	public static String ConcordancesEditor_12;
-	public static String ConcordancesEditor_13;
-	public static String ConcordancesEditor_14;
-	public static String ConcordancesEditor_15;
-	public static String ConcordancesEditor_16;
-	public static String ConcordancesEditor_17;
-	public static String ConcordancesEditor_18;
-	public static String ConcordancesEditor_19;
-	public static String ConcordancesEditor_2;
-	public static String ConcordancesEditor_20;
-	public static String ConcordancesEditor_21;
-	public static String ConcordancesEditor_22;
-	public static String ConcordancesEditor_23;
-	public static String ConcordancesEditor_24;
-	public static String ConcordancesEditor_25;
-	public static String ConcordancesEditor_26;
-	public static String ConcordancesEditor_27;
-	public static String ConcordancesEditor_28;
-	public static String ConcordancesEditor_29;
-	public static String ConcordancesEditor_3;
-	public static String ConcordancesEditor_30;
-	public static String ConcordancesEditor_31;
-	public static String ConcordancesEditor_32;
-	public static String ConcordancesEditor_33;
-	public static String ConcordancesEditor_34;
-	public static String ConcordancesEditor_35;
-	public static String ConcordancesEditor_36;
-	public static String ConcordancesEditor_37;
-	public static String ConcordancesEditor_38;
-	public static String ConcordancesEditor_39;
-	public static String ConcordancesEditor_4;
-	public static String ConcordancesEditor_40;
-	public static String ConcordancesEditor_41;
-	public static String ConcordancesEditor_42;
-	public static String ConcordancesEditor_43;
-	public static String ConcordancesEditor_44;
-	public static String ConcordancesEditor_45;
-	public static String ConcordancesEditor_46;
-	public static String ConcordancesEditor_47;
-	public static String ConcordancesEditor_48;
-	public static String ConcordancesEditor_49;
-	public static String ConcordancesEditor_5;
-	public static String ConcordancesEditor_50;
-	public static String ConcordancesEditor_51;
-	public static String ConcordancesEditor_53;
-	public static String ConcordancesEditor_54;
-	public static String ConcordancesEditor_55;
-	public static String ConcordancesEditor_56;
-	public static String ConcordancesEditor_57;
-	public static String ConcordancesEditor_58;
-	public static String ConcordancesEditor_59;
-	public static String ConcordancesEditor_6;
-	public static String ConcordancesEditor_60;
-	public static String ConcordancesEditor_61;
-	public static String ConcordancesEditor_62;
-	public static String ConcordancesEditor_63;
-	public static String ConcordancesEditor_64;
-	public static String ConcordancesEditor_65;
-	public static String ConcordancesEditor_66;
-	public static String ConcordancesEditor_67;
-	public static String ConcordancesEditor_68;
-	public static String ConcordancesEditor_69;
-	public static String ConcordancesEditor_7;
-	public static String ConcordancesEditor_70;
-	public static String ConcordancesEditor_71;
-	public static String ConcordancesEditor_72;
-	public static String ConcordancesEditor_73;
-	public static String ConcordancesEditor_74;
-	public static String ConcordancesEditor_75;
-	public static String ConcordancesEditor_76;
-	public static String ConcordancesEditor_77;
-	public static String ConcordancesEditor_78;
-	public static String ConcordancesEditor_79;
-	public static String ConcordancesEditor_8;
-	public static String ConcordancesEditor_80;
-	public static String ConcordancesEditor_81;
-	public static String ConcordancesEditor_82;
-	public static String ConcordancesEditor_83;
-	public static String ConcordancesEditor_84;
-	public static String ConcordancesEditor_85;
-	public static String ConcordancesEditor_86;
-	public static String ConcordancesEditor_87;
-	public static String ConcordancesEditor_88;
-	public static String ConcordancesEditor_9;
-	public static String ConcordancesEditor_99;
-	public static String ConcordancesEditor_100;
-	public static String ConcordancesEditor_110;
-	public static String ConcordancesEditor_115;
-	public static String ConcordancesEditor_116;
+	public static String reference; 
+	public static String inf; 
+	public static String sup; 
+	public static String leftContext; 
+	public static String keyword; 
+	public static String sortingReferenceColumn; 
+	public static String rightContext; 
+	public static String sortingLeftContextColumn; 
+	public static String sortingKeywordColumn; 
+	public static String sortingRightContextColumn; 
+	public static String openingCorpusEdition; 
+	public static String startComputingConcordance; 
+	public static String sorting; 
+	public static String cQPErrorDDot; 
+	public static String _class; 
+	public static String deleteSelectedLines; 
 
-	public static String CorporaView_3;
 
-	public static String CreateSubcorpusDialog_10;
 	
 	public static String editor_19;
 
-	public static String editor_20;
+	public static String sort; 
 
 	public static String editor_21;
 
-	public static String editor_22;
 
-	public static String editor_23;
 
-	public static String editor_24;
 
-	public static String editor_25;
 
-	public static String editor_26;
 
-	public static String editor_27;
 
-	public static String editor_28;
 
-	public static String editor_29;
+	public static String size; 
 
-	public static String editor_30;
+	public static String navigation; 
 
-	public static String editor_3dots;
 
-	public static String editor_dot;
 
-	public static String editor_empty;
 
-	public static String editor_error;
+	public static String fatalErrorDDotP0; 
 
-	public static String editor_error_open_editor;
+	public static String canNotOpenConcordanceEditorWithP0; 
 
-	public static String editor_error_ui_creation;
+	public static String errorWhileBuildingInterfaceDDotP0; 
 
-	public static String editor_keyword;
 
-	public static String editor_left;
+	public static String left; 
 
-	public static String editor_properties_panel;
+	public static String propertiesPanel; 
 
-	public static String editor_references;
+	public static String references; 
 
-	public static String editor_right;
+	public static String right; 
 
-	public static String editor_sorting_with;
+	public static String sortingWith; 
 
-	public static String editor_view;
+	public static String view; 
 
-	public static String LastCQPError;
 
-	public static String SORT_DONE;
 
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,60 +1,22 @@
-
-ComputeConcordance_0 = Открытие окна конкорданса
-ComputeConcordance_1 = N/A_Failed to open concordance editor.
-
-ComputeReferencer_0 = Открытие результата Ссылок
-
-ConcordancerPreferencePage_3 = Параметры конкордансов
-ConcordancerPreferencePage_4 = Количество строк на &Странице : 
-ConcordancerPreferencePage_5 = &Левый контекст (в словах)
-ConcordancerPreferencePage_6 = &Правый контекст (в словах)
-
-ConcordancesEditorContributor_0 = Конкорданс
-
-ConcordancesEditor_0            = Последняя ошибка CQi : 
-ConcordancesEditor_1            = Ссылка
-ConcordancesEditor_11           = |<
-ConcordancesEditor_12           = <
-ConcordancesEditor_13           = >
-ConcordancesEditor_14           = >|
-ConcordancesEditor_16           = &Мотив: 
-ConcordancesEditor_18           = &Редактировать
-ConcordancesEditor_19           = {0} употреблений
-ConcordancesEditor_2            = Левый контекст
-ConcordancesEditor_20           = Загрузка данных о строке...
-ConcordancesEditor_26           = идентификатор проекта {0} идентификатор корпуса {1} идентификатор текста {2}
-ConcordancesEditor_27           = Возврат к тексту: текст {0} отсутствует
-ConcordancesEditor_29           = Страница не найдена... для 
-ConcordancesEditor_3            = Мотив
-ConcordancesEditor_30           = Возврат к тексту: издание по умолчанию не найдено
-ConcordancesEditor_34           = Загрузка конкорданса
-ConcordancesEditor_37           = Сортировка ссылок
-ConcordancesEditor_38           = Скрыть параметры
-ConcordancesEditor_39           = Показать параметры
-ConcordancesEditor_4            = Правый контекст
-ConcordancesEditor_41           = Сортировка левого контекста
-ConcordancesEditor_43           = Корпус {0} не имеет ссылок по умолчанию: {1}
-ConcordancesEditor_45           = Сортировка мотива
-ConcordancesEditor_46           = ** Невозможно показать в тексте: {0}
-ConcordancesEditor_48           = Сортировка правого контекста
-ConcordancesEditor_5            = Конкорданс мотива <{0}> в корпусе {1}
-ConcordancesEditor_50           = Открытие издания
-ConcordancesEditor_55           = Открытие диалогового окна свойств
-ConcordancesEditor_56           = Начало расчета конкордансов
-ConcordancesEditor_6            = Сортировка...
-ConcordancesEditor_7            = N/A_Failed to get last CQP error: 
-ConcordancesEditor_8            = N/A_The corpus has no text_id property
-
-ERROR_WHILE_LOADING_CONCORDANCE_LINE = ** Ошибка во время загрузки строк конкорданса: {0}
-
-GetConcordancesDialog_0  = ** Диалоговое окно конкордансов: {0}
-GetConcordancesDialog_1  = Расчет специфичности 
-GetConcordancesDialog_13 = Вы должны выбрать одно свойство
-GetConcordancesDialog_14 = Некорректное свойство
-GetConcordancesDialog_15 = Вы должны выбрать одно свойство
-GetConcordancesDialog_4  = С&войство : 
-GetConcordancesDialog_5  = &Левый контекст (слова) : 
-GetConcordancesDialog_6  = &Правый контекст (слова) : 
-GetConcordancesDialog_7  = &Ссылка: 
-
-GetConcordances_4        = ** Ошибка при расчете конкордансов: {0}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+ampLeftContextLengthInWords=&Левый контекст (в словах)
+ampRightContextLengthInWords=&Правый контекст (в словах)
+anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0=** Ошибка во время загрузки строк конкорданса\: {0}
+concordanceParameters=Параметры конкордансов
+cQPErrorDDot=N/A_Failed to get last CQP error\: 
+inf=<
+keyword=Мотив
+leftContext=Левый контекст
+linesPerAmpPageDDot=Количество строк на &Странице \: 
+openingCorpusEdition=Открытие издания
+openingTheConcordanceResult=Открытие окна конкорданса
+reference=Ссылка
+rightContext=Правый контекст
+sorting=Сортировка...
+sortingKeywordColumn=Сортировка мотива
+sortingLeftContextColumn=Сортировка левого контекста
+sortingReferenceColumn=Сортировка ссылок
+sortingRightContextColumn=Сортировка правого контекста
+startComputingConcordance=Начало расчета конкордансов
+sup=>
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,102 +1,23 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-#Eclipse modern messages class
-#Mon Feb 10 10:26:04 CET 2014
-
-ComputeConcordance_0 = Ouverture de la fenêtre de concordance
-ComputeConcordance_1 = Erreur lors de l'ouverture de l'éditeur des concordances :
-
-ComputeReferencer_0 = Ouverture du résultat du Référenceur
-
-ConcordancerPreferencePage_3 = Paramètres des Concordances 
-ConcordancerPreferencePage_4 = Lignes par &Page : 
-ConcordancerPreferencePage_5 = Contexte &Gauche (en mots)
-ConcordancerPreferencePage_6 = Contexte &Droit (en mots)
-
-ConcordancesEditorContributor_0 = Concordance
-
-ConcordancesEditor_0            = Dernière erreur CQi : 
-ConcordancesEditor_1            = Référence
-ConcordancesEditor_100          = Valeurs disponibles pour {0}
-ConcordancesEditor_108          = \ éléments. Continuez ?
-ConcordancesEditor_11           = |<
-ConcordancesEditor_110          = Nouvelle valeur {0} pour la catégorie {1}
-ConcordancesEditor_112          = La valeur {0} n''est pas encore associée à la catégorie : {1}. Créer l''association ?
-ConcordancesEditor_115          = Ajouter une nouvelle categorie
-ConcordancesEditor_116          = Effectuer l'annotation
-ConcordancesEditor_12           = <
-ConcordancesEditor_13           = >
-ConcordancesEditor_14           = >|
-ConcordancesEditor_15           = Catégorie
-ConcordancesEditor_16           = &Pivot: 
-ConcordancesEditor_18           = &Editer
-ConcordancesEditor_19           = {0} occurrences
-ConcordancesEditor_2            = Contexte gauche
-ConcordancesEditor_20           = Chargement des informations sur la ligne...
-ConcordancesEditor_22           = Annoter
-ConcordancesEditor_24           = Retirer
-ConcordancesEditor_25           = de
-ConcordancesEditor_26           = id projet {0} id corpus {1} id texte {2}
-ConcordancesEditor_27           = Retour au texte : texte {0} manquant
-ConcordancesEditor_28           = l'annotation
-ConcordancesEditor_29           = Page non trouvée... pour 
-ConcordancesEditor_3            = Pivot
-ConcordancesEditor_30           = Retour au texte : édition par défaut introuvable
-ConcordancesEditor_32           = Entrer une valeur correspondant à un id
-ConcordancesEditor_33           = à
-ConcordancesEditor_34           = Chargement de la concordance
-ConcordancesEditor_35           = lignes sélectionées 
-ConcordancesEditor_37           = Tri des références
-ConcordancesEditor_38           = Cacher paramètres
-ConcordancesEditor_39           = Afficher paramètres
-ConcordancesEditor_4            = Contexte droit
-ConcordancesEditor_41           = Tri du contexte gauche
-ConcordancesEditor_42           = lignes de la page
-ConcordancesEditor_43           = Le corpus {0} n''a pas de références par défaut : {1}
-ConcordancesEditor_45           = Tri du pivot
-ConcordancesEditor_46           = ** Impossible d''afficher en plein texte : {0}
-ConcordancesEditor_48           = Tri du contexte droit
-ConcordancesEditor_49           = toutes les lignes
-ConcordancesEditor_5            = Concordance de <{0}> dans le corpus {1}
-ConcordancesEditor_50           = Ouverture de l'édition
-ConcordancesEditor_55           = Ouverture de la boite de dialogue des propriétés
-ConcordancesEditor_56           = Début du calcul des concordances
-ConcordancesEditor_6            = Tri...
-ConcordancesEditor_61           = Impossible d'annoter avec la valeur '
-ConcordancesEditor_62           = '.\n sur certains segments. \n
-ConcordancesEditor_63           = \	- Le segment 
-ConcordancesEditor_64           = \ est à cheval sur \n
-ConcordancesEditor_65           = \	\	- la fin de la structure 
-ConcordancesEditor_66           = , aux positions [
-ConcordancesEditor_69           = \	\	- le début de la structure 
-ConcordancesEditor_7            = Erreur lors de la récupération de la dernière erreur CQP :  
-ConcordancesEditor_73           = Information à propos des annotations
-ConcordancesEditor_74           = Erreur pendant l'affection des annotations: 
-ConcordancesEditor_75           = Annoter
-ConcordancesEditor_76           = Enregistrer les annotations
-ConcordancesEditor_77           = Ouvrir la liste des catégories
-ConcordancesEditor_79           = Sélectionner une valeur parmi la liste
-ConcordancesEditor_8            = Le corpus n'a pas de propriété "text_id"
-ConcordancesEditor_80           = valeur=
-ConcordancesEditor_81           = Veuillez entrer une nouvelle catégorie
-ConcordancesEditor_82           = Nouvelle catégorie
-ConcordancesEditor_83           = avec la catégorie
-ConcordancesEditor_84           = avec la catégorie
-ConcordancesEditor_85           = OK
-ConcordancesEditor_86           = Confirmer l'enregistrement des annotations
-ConcordancesEditor_87           = Vous vous apprêtez à annoter 
-ConcordancesEditor_88           = Supprimer le(s) ligne(s) sélectionnée(s)
-ConcordancesEditor_99           = Liste des catégories
-
-ERROR_WHILE_LOADING_CONCORDANCE_LINE = ** Une erreur est survenue lors du chargement des lignes de la concordance : {0}
-
-GetConcordancesDialog_0  = ** Fenêtre de dialogue de concordances : {0}
-GetConcordancesDialog_1  = Calcul des spécificités 
-GetConcordancesDialog_13 = Vous devez sélectionner une propriété
-GetConcordancesDialog_14 = Propriété invalide
-GetConcordancesDialog_15 = Vous devez sélectionner une propriété
-GetConcordancesDialog_4  = &Propriété : 
-GetConcordancesDialog_5  = Contexte &Gauche (mots) : 
-GetConcordancesDialog_6  = Contexte &Droit (mots) : 
-GetConcordancesDialog_7  = &Référence : 
-
-GetConcordances_4        = ** Erreur lors du calcul des concordances : {0}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+ampLeftContextLengthInWords=Contexte &Gauche (en mots)
+ampRightContextLengthInWords=Contexte &Droit (en mots)
+anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0=** Une erreur est survenue lors du chargement des lignes de la concordance \: {0}
+concordanceParameters=Paramètres des Concordances 
+cQPErrorDDot=Erreur lors de la récupération de la dernière erreur CQP \:  
+deleteSelectedLines=Supprimer le(s) ligne(s) sélectionnée(s)
+inf=<
+keyword=Pivot
+leftContext=Contexte gauche
+linesPerAmpPageDDot=Lignes par &Page \: 
+openingCorpusEdition=Ouverture de l'édition
+openingTheConcordanceResult=Ouverture de la fenêtre de concordance
+reference=Référence
+rightContext=Contexte droit
+sorting=Tri...
+sortingKeywordColumn=Tri du pivot
+sortingLeftContextColumn=Tri du contexte gauche
+sortingReferenceColumn=Tri des références
+sortingRightContextColumn=Tri du contexte droit
+startComputingConcordance=Début du calcul des concordances
+sup=>
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java	(revision 1335)
@@ -58,7 +58,7 @@
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 		if (columnIndex != 0)
-			throw new RuntimeException(TXMUIMessages.LineLabelProvider_1);
+			throw new RuntimeException(TXMUIMessages.shouldNotHappen);
 		Line line = (Line) element;
 		return line.getViewRef().toString();
 	}
@@ -99,4 +99,4 @@
 
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java	(revision 1335)
@@ -136,7 +136,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.SortPropertySelection_0);
+		newShell.setText(TXMUIMessages.sortOptions);
 		newShell.setMinimumSize(300, 200);
 	}
 
@@ -311,4 +311,4 @@
 			super.okPressed();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 1335)
@@ -310,7 +310,7 @@
 		TXMResult result = this.getResult();
 
 		if (!(result instanceof Concordance)) {
-			throw new PartInitException(ConcordanceUIMessages.bind(ConcordanceUIMessages.editor_error_open_editor, result));
+			throw new PartInitException(ConcordanceUIMessages.bind(ConcordanceUIMessages.canNotOpenConcordanceEditorWithP0, result));
 		}
 		this.concordance = (Concordance)result;
 
@@ -336,7 +336,7 @@
 				complexsorter.setComparators(this);
 			}
 		} catch(Exception e) {
-			System.out.println(ConcordanceUIMessages.bind(ConcordanceUIMessages.editor_error_ui_creation, e.getLocalizedMessage()));
+			System.out.println(ConcordanceUIMessages.bind(ConcordanceUIMessages.errorWhileBuildingInterfaceDDotP0, e.getLocalizedMessage()));
 			Log.printStackTrace(e);
 		}
 	}
@@ -368,11 +368,11 @@
 
 		referenceColumn = new TableColumn(viewer2.getTable(), SWT.LEFT|SWT.H_SCROLL);
 		refreshReferenceColumnTitle();
-		referenceColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_1);
+		referenceColumn.setToolTipText(ConcordanceUIMessages.reference);
 		referenceColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_37);
+				StatusLine.setMessage(ConcordanceUIMessages.sortingReferenceColumn);
 				LineComparator comparator = new PropertiesReferenceComparator();
 				if (viewer2.getTable().getSortColumn() != referenceColumn) {
 					viewer2.getTable().setSortColumn(null);
@@ -459,8 +459,8 @@
 
 		TableViewerColumn leftColumnViewer = new TableViewerColumn(viewer, SWT.RIGHT);
 		leftContextColumn = leftColumnViewer.getColumn();
-		leftContextColumn.setText(ConcordanceUIMessages.ConcordancesEditor_2);
-		leftContextColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_2);
+		leftContextColumn.setText(ConcordanceUIMessages.leftContext);
+		leftContextColumn.setToolTipText(ConcordanceUIMessages.leftContext);
 		leftContextColumn.setAlignment(SWT.RIGHT);
 		leftColumnViewer.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -472,7 +472,7 @@
 		leftContextColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_41);
+				StatusLine.setMessage(ConcordanceUIMessages.sortingLeftContextColumn);
 				LineComparator comparator = new LexicographicLeftContextComparator();
 				if (viewer.getTable().getSortColumn() != leftContextColumn) {
 					viewer.getTable().setSortColumn(leftContextColumn);
@@ -496,8 +496,8 @@
 
 		TableViewerColumn keywordColumnViewer = new TableViewerColumn(viewer, SWT.CENTER);
 		keywordColumn = keywordColumnViewer.getColumn();
-		keywordColumn.setText(ConcordanceUIMessages.ConcordancesEditor_3);
-		keywordColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_3);
+		keywordColumn.setText(ConcordanceUIMessages.keyword);
+		keywordColumn.setToolTipText(ConcordanceUIMessages.keyword);
 		keywordColumn.setAlignment(SWT.CENTER);
 		keywordColumnViewer.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -509,7 +509,7 @@
 		keywordColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_45);
+				StatusLine.setMessage(ConcordanceUIMessages.sortingKeywordColumn);
 				LineComparator comparator = new LexicographicKeywordComparator();
 				if (viewer.getTable().getSortColumn() != keywordColumn) {
 					viewer.getTable().setSortColumn(keywordColumn);
@@ -537,8 +537,8 @@
 
 		TableViewerColumn rightContextColumnViewer = new TableViewerColumn(viewer, SWT.LEFT);
 		rightContextColumn = rightContextColumnViewer.getColumn();
-		rightContextColumn.setText(ConcordanceUIMessages.ConcordancesEditor_4);
-		rightContextColumn.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_4);
+		rightContextColumn.setText(ConcordanceUIMessages.rightContext);
+		rightContextColumn.setToolTipText(ConcordanceUIMessages.rightContext);
 		rightContextColumn.setAlignment(SWT.LEFT);
 		rightContextColumnViewer.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -550,7 +550,7 @@
 		rightContextColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_48);
+				StatusLine.setMessage(ConcordanceUIMessages.sortingRightContextColumn);
 				LineComparator comparator = new LexicographicRightContextComparator();
 
 				if (viewer.getTable().getSortColumn() != rightContextColumn) {
@@ -606,7 +606,7 @@
 		MouseListener ms = new MouseListener() {
 			@Override
 			public void mouseDoubleClick(MouseEvent e) {
-				StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_50);
+				StatusLine.setMessage(ConcordanceUIMessages.openingCorpusEdition);
 				backToText();
 				StatusLine.setMessage(""); //$NON-NLS-1$
 			}
@@ -715,7 +715,7 @@
 			concordance.resetLines();
 
 			try {
-				Log.info(ConcordanceUIMessages.editor_sorting_with+currentComparator.getName());
+				Log.info(ConcordanceUIMessages.sortingWith+currentComparator.getName());
 				if (currentComparator instanceof CompositeComparator)
 					Log.info(((CompositeComparator) currentComparator).getComparators().toString());
 				JobHandler jobhandler = new JobHandler("Sorting...") { //$NON-NLS-1$
@@ -724,7 +724,7 @@
 						this.runInit(monitor);
 						JobsTimer.start();
 						try {
-							monitor.beginTask(ConcordanceUIMessages.ConcordancesEditor_6, concordance.getNLines());
+							monitor.beginTask(ConcordanceUIMessages.sorting, concordance.getNLines());
 							concordance.setCurrentMonitor(this);
 							concordance.sort(currentComparator);
 							concordance.setTopIndex(0);
@@ -732,7 +732,7 @@
 							syncExec(new Runnable() {
 								@Override
 								public void run() {
-									StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+									StatusLine.setMessage(TXMUIMessages.sortDone);
 									try {
 										refresh(false);
 									} catch (Exception e1) {
@@ -745,10 +745,10 @@
 						} catch (ThreadDeath td) {
 							return Status.CANCEL_STATUS;
 						} catch (Exception e) {
-							System.err.println(NLS.bind(ConcordanceUIMessages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
+							System.err.println(NLS.bind(ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0, e));
 							org.txm.rcp.utils.Logger.printStackTrace(e);
 						} catch (Error e) {
-							System.err.println(ConcordanceUIMessages.bind(ConcordanceUIMessages.editor_error,e));
+							System.err.println(ConcordanceUIMessages.bind(ConcordanceUIMessages.fatalErrorDDotP0,e));
 							e.printStackTrace();
 						} finally {
 							monitor.done();
@@ -760,7 +760,7 @@
 
 				jobhandler.startJob();
 			} catch (Exception e) {
-				System.err.println(NLS.bind(ConcordanceUIMessages.ERROR_WHILE_LOADING_CONCORDANCE_LINE, e));
+				System.err.println(NLS.bind(ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0, e));
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 		}
@@ -791,7 +791,7 @@
 			try {
 				lines = concordance.getLines(from, to);
 			} catch (Exception e) {
-				System.err.println(ConcordanceUIMessages.ERROR_WHILE_LOADING_CONCORDANCE_LINE+ e);
+				System.err.println(ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0+ e);
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 		}
@@ -876,7 +876,7 @@
 		getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 
 		queryLabel = new Label(getMainParametersComposite(), SWT.NONE);
-		queryLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10);
+		queryLabel.setText(TXMUIMessages.ampQuery);
 		queryLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
 
 		// [ (v)]
@@ -920,7 +920,7 @@
 				true, 4, 1));
 
 		// properties widget like in the portal version
-		GLComposite propertiesPanel = new GLComposite(queryArea, SWT.BORDER, ConcordanceUIMessages.editor_properties_panel);
+		GLComposite propertiesPanel = new GLComposite(queryArea, SWT.BORDER, ConcordanceUIMessages.propertiesPanel);
 		propertiesPanel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 				true, 4, 1));
 		propertiesPanel.getLayout().numColumns = 5;
@@ -928,17 +928,17 @@
 
 		try {
 			Label l = new Label(propertiesPanel, SWT.NONE);
-			l.setText(ConcordanceUIMessages.editor_empty);
+			l.setText(ConcordanceUIMessages.editor_21);
 			l.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
-			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.editor_references);
-			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.editor_left);
-			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.editor_keyword);
-			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.editor_right);
+			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.references);
+			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.left);
+			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.keyword);
+			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.right);
 
-			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.editor_view);
+			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.view);
 			refViewProperties = new PropertiesSelector<Property>(propertiesPanel, SWT.NONE);
-			refViewProperties.setTitle(ConcordanceUIMessages.editor_empty);
-			refViewProperties.setButtonText(ConcordanceUIMessages.editor_3dots);
+			refViewProperties.setTitle(ConcordanceUIMessages.editor_21);
+			refViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			refViewProperties.setProperties(ReferencePattern.getPossibleValues(getCorpus()));
 			refViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
@@ -948,9 +948,9 @@
 				}
 			});
 			leftViewProperties = new PropertiesSelector<WordProperty>(propertiesPanel, SWT.NONE);
-			leftViewProperties.setTitle(ConcordanceUIMessages.editor_empty);
+			leftViewProperties.setTitle(ConcordanceUIMessages.editor_21);
 			leftViewProperties.setProperties(getCorpus().getOrderedProperties());
-			leftViewProperties.setButtonText(ConcordanceUIMessages.editor_3dots);
+			leftViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			leftViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -959,9 +959,9 @@
 				}
 			});
 			keywordViewProperties = new PropertiesSelector<WordProperty>(propertiesPanel, SWT.NONE);
-			keywordViewProperties.setTitle(ConcordanceUIMessages.editor_empty);
+			keywordViewProperties.setTitle(ConcordanceUIMessages.editor_21);
 			keywordViewProperties.setProperties(getCorpus().getOrderedProperties());
-			keywordViewProperties.setButtonText(ConcordanceUIMessages.editor_3dots);
+			keywordViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			keywordViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -970,7 +970,7 @@
 				}
 			});
 			rightViewProperties = new PropertiesSelector<WordProperty>(propertiesPanel, SWT.NONE);
-			rightViewProperties.setTitle(ConcordanceUIMessages.editor_empty);
+			rightViewProperties.setTitle(ConcordanceUIMessages.editor_21);
 			rightViewProperties.setProperties(getCorpus().getOrderedProperties());
 			rightViewProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			rightViewProperties.addSelectionListener(new ComputeSelectionListener(this) {
@@ -981,10 +981,10 @@
 				}
 			});
 
-			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.editor_20);
+			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.sort);
 			refSortProperties = new PropertiesSelector<Property>(propertiesPanel, SWT.NONE);
 			refSortProperties.setTitle(ConcordanceUIMessages.editor_21);
-			refSortProperties.setButtonText(ConcordanceUIMessages.editor_22);
+			refSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			refSortProperties.setProperties(ReferencePattern.getPossibleValues(getCorpus()));
 			refSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
@@ -994,8 +994,8 @@
 				}
 			});
 			leftSortProperties = new PropertiesSelector<WordProperty>(propertiesPanel, SWT.NONE);
-			leftSortProperties.setTitle(ConcordanceUIMessages.editor_23);
-			leftSortProperties.setButtonText(ConcordanceUIMessages.editor_24);
+			leftSortProperties.setTitle(ConcordanceUIMessages.editor_21);
+			leftSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			leftSortProperties.setProperties(getCorpus().getOrderedProperties());
 			leftSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
@@ -1005,8 +1005,8 @@
 				}
 			});
 			keywordSortProperties = new PropertiesSelector<WordProperty>(propertiesPanel, SWT.NONE);
-			keywordSortProperties.setTitle(ConcordanceUIMessages.editor_25);
-			keywordSortProperties.setButtonText(ConcordanceUIMessages.editor_26);
+			keywordSortProperties.setTitle(ConcordanceUIMessages.editor_21);
+			keywordSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			keywordSortProperties.setProperties(getCorpus().getOrderedProperties());
 			keywordSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
@@ -1016,8 +1016,8 @@
 				}
 			});
 			rightSortProperties = new PropertiesSelector<WordProperty>(propertiesPanel, SWT.NONE);
-			rightSortProperties.setTitle(ConcordanceUIMessages.editor_27);
-			rightSortProperties.setButtonText(ConcordanceUIMessages.editor_28);
+			rightSortProperties.setTitle(ConcordanceUIMessages.editor_21);
+			rightSortProperties.setButtonText(ConcordanceUIMessages.editor_19);
 			rightSortProperties.setProperties(getCorpus().getOrderedProperties());
 			rightSortProperties.addSelectionListener(new ComputeSelectionListener(this) {
 				@Override
@@ -1027,7 +1027,7 @@
 				}
 			});
 
-			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.editor_29);
+			new Label(propertiesPanel, SWT.NONE).setText(ConcordanceUIMessages.size);
 			new Label(propertiesPanel, SWT.NONE);
 			leftSizeSpinner = new Spinner(propertiesPanel, SWT.BORDER);
 			leftSizeSpinner.addSelectionListener(new ComputeSelectionListener(this) {
@@ -1076,7 +1076,7 @@
 		// Delete line button
 		deleteLineButton = new Button(navigationArea, SWT.PUSH);
 		deleteLineButton.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
-		deleteLineButton.setToolTipText(ConcordanceUIMessages.ConcordancesEditor_88);
+		deleteLineButton.setToolTipText(ConcordanceUIMessages.deleteSelectedLines);
 		deleteLineButton.setImage(IImageKeys.getImage(IImageKeys.CONCORDANCE_DELETE));
 		deleteLineButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -1089,7 +1089,7 @@
 		});
 
 		// Navigation Area: infoLine and buttons
-		GLComposite navigationAreaComposite = getBottomToolbar().installGLComposite(ConcordanceUIMessages.editor_30, 1, false);
+		GLComposite navigationAreaComposite = getBottomToolbar().installGLComposite(ConcordanceUIMessages.navigation, 1, false);
 		navigationAreaComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
 		navigationWidget = new NavigationWidget(navigationAreaComposite, SWT.NONE);
@@ -1184,7 +1184,7 @@
 	 * @param bottom
 	 */
 	public void updateEditorFromResult(boolean update) {
-		StatusLine.setMessage(ConcordanceUIMessages.ConcordancesEditor_56);
+		StatusLine.setMessage(ConcordanceUIMessages.startComputingConcordance);
 
 		//if (true)// concordance==null || concordance.getQuery()!=query)
 		try {
@@ -1200,13 +1200,13 @@
 			JobsTimer.stopAndPrint();
 
 		} catch (Exception e1) {
-			System.out.println(TXMUIMessages.CorporaView_3 + " " + Log.toString(e1)); //$NON-NLS-1$
+			System.out.println(TXMUIMessages.errorWhileComputingTheConcordanceDDot + " " + Log.toString(e1)); //$NON-NLS-1$
 			//System.err.println(Messages.CorporaView_3);
 			org.txm.rcp.utils.Logger.printStackTrace(e1);
 			try {
-				Log.severe(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+				Log.severe(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 			} catch (Exception e2) {
-				System.out.println(ConcordanceUIMessages.ConcordancesEditor_7+e2);
+				System.out.println(ConcordanceUIMessages.cQPErrorDDot+e2);
 				org.txm.rcp.utils.Logger.printStackTrace(e1);
 				Log.severe(Log.toString(e1));
 			}
@@ -1904,7 +1904,7 @@
 			IConfigurationElement[] config = Platform.getExtensionRegistry()
 					.getConfigurationElementsFor(BACKTOTEXT_COMMAND_ID);
 			for (IConfigurationElement e : config) {
-				Object o = e.createExecutableExtension(ConcordanceUIMessages.ConcordancesEditor_78);
+				Object o = e.createExecutableExtension(ConcordanceUIMessages._class);
 				if (o instanceof BackToTextCommand) {
 					return ((BackToTextCommand) o).backToText(this, line.getMatch());
 				}
@@ -2032,4 +2032,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java	(revision 1335)
@@ -104,7 +104,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.ComplexSort_5);
+		newShell.setText(TXMUIMessages.createANewSorter);
 	}
 
 	/* (non-Javadoc)
@@ -117,7 +117,7 @@
 		mainArea.setLayout(layout);
 
 		Label nameLabel = new Label(mainArea, SWT.NONE);
-		nameLabel.setText(TXMUIMessages.ComplexSort_6);
+		nameLabel.setText(TXMUIMessages.name);
 
 		nameText = new Text(mainArea, SWT.NONE);
 		GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false);
@@ -209,17 +209,17 @@
 	protected void okPressed() {
 		if (nameText.getText().equals("")) { //$NON-NLS-1$
 			MessageDialog.openError(getShell(),
-					TXMUIMessages.CreateSubcorpusDialog_11,
-					TXMUIMessages.ComplexSort_9);
+					TXMUIMessages.invalidName,
+					TXMUIMessages.nameIsMandatory);
 			return;
 		}
 		name = nameText.getText();
 		if (selectedComparators.size() < 2) {
 			MessageDialog.openError(getShell(),
-					TXMUIMessages.ComplexSort_10,
-					TXMUIMessages.ComplexSort_11);
+					TXMUIMessages.invalidComparator,
+					TXMUIMessages.youMustSelectAtLeast2Comparators);
 			return;
 		}
 		super.okPressed();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java	(revision 1335)
@@ -68,8 +68,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.SetLineNumber_0);
-		setToolTipText(TXMUIMessages.SetLineNumber_0);
+		setText(TXMUIMessages.paginationOptions);
+		setToolTipText(TXMUIMessages.paginationOptions);
 	}
 
 	/* (non-Javadoc)
@@ -133,7 +133,7 @@
 			Composite mainArea = new Composite(parent, SWT.NONE);
 			mainArea.setLayout(new GridLayout(2, false));
 
-			new Label(mainArea, SWT.None).setText(TXMUIMessages.SetLineNumber_1);
+			new Label(mainArea, SWT.None).setText(TXMUIMessages.linePerPageDDot);
 			rightSpinner = new Spinner(mainArea, SWT.NONE);
 			rightSpinner.setSelection(concordanceEditor.getLinePerPage());
 			rightSpinner.setMinimum(0);
@@ -151,4 +151,4 @@
 		}
 
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java	(revision 1335)
@@ -81,8 +81,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.ComplexSort_1);
-		setToolTipText(TXMUIMessages.ComplexSort_2);
+		setText(TXMUIMessages.ampMultipleSort);
+		setToolTipText(TXMUIMessages.defineAndUseACompositeSorter);
 	}
 
 	/* (non-Javadoc)
@@ -139,7 +139,7 @@
 		@Override
 		protected void configureShell(Shell newShell) {
 			super.configureShell(newShell);
-			newShell.setText(TXMUIMessages.ComplexSort_3);
+			newShell.setText(TXMUIMessages.selectACompositeSorter);
 		}
 
 		/**
@@ -181,11 +181,11 @@
 			}
 			list.select(0);
 			Button newButton = new Button(mainArea, SWT.PUSH);
-			newButton.setText(TXMUIMessages.ComplexSort_4);
+			newButton.setText(TXMUIMessages.ampNew);
 			newButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(TXMUIMessages.ComplexSort_0);
+					StatusLine.setMessage(TXMUIMessages.openingComplexSortDialog);
 					CompositeSorterCreationDialog sorterCreationDialog = new CompositeSorterCreationDialog(
 							getShell());
 					int code = sorterCreationDialog.open();
@@ -272,7 +272,7 @@
 		@Override
 		protected void configureShell(Shell newShell) {
 			super.configureShell(newShell);
-			newShell.setText(TXMUIMessages.ComplexSort_5);
+			newShell.setText(TXMUIMessages.createANewSorter);
 		}
 
 		/* (non-Javadoc)
@@ -285,7 +285,7 @@
 			mainArea.setLayout(layout);
 
 			Label nameLabel = new Label(mainArea, SWT.NONE);
-			nameLabel.setText(TXMUIMessages.ComplexSort_6);
+			nameLabel.setText(TXMUIMessages.name);
 
 			nameText = new Text(mainArea, SWT.NONE);
 			GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false);
@@ -319,7 +319,7 @@
 			select.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(TXMUIMessages.ComplexSort_12);
+					StatusLine.setMessage(TXMUIMessages.addingToSelection);
 					int ind = availbleItems.getSelectionIndex();
 					selectedItems.add(availbleItems.getItem(ind));
 					availbleItems.remove(ind);
@@ -333,7 +333,7 @@
 			unselect.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(TXMUIMessages.ComplexSort_14);
+					StatusLine.setMessage(TXMUIMessages.removeFromSelection);
 					int ind = selectedItems.getSelectionIndex();
 					availbleItems.add(selectedItems.getItem(ind));
 					selectedItems.remove(ind);
@@ -347,7 +347,7 @@
 			up.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(TXMUIMessages.ComplexSort_16);
+					StatusLine.setMessage(TXMUIMessages.movingUpTheSelection);
 					int ind = selectedItems.getSelectionIndex();
 					if (ind > 0) {
 						selectedItems.add(selectedItems.getItem(ind), ind - 1);
@@ -364,7 +364,7 @@
 			down.addSelectionListener(new SelectionAdapter() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(TXMUIMessages.ComplexSort_18);
+					StatusLine.setMessage(TXMUIMessages.movingDownTheSelection);
 					int ind = selectedItems.getSelectionIndex();
 					if (ind < selectedItems.getItemCount() - 1) {
 						selectedItems.add(selectedItems.getItem(ind), ind + 2);
@@ -386,18 +386,18 @@
 		@Override
 		protected void okPressed() {
 			if (nameText.getText().equals("")) { //$NON-NLS-1$
-				MessageDialog.openError(getShell(), TXMUIMessages.CreateSubcorpusDialog_11,
-						TXMUIMessages.ComplexSort_9);
+				MessageDialog.openError(getShell(), TXMUIMessages.invalidName,
+						TXMUIMessages.nameIsMandatory);
 				return;
 			}
 			name = nameText.getText();
 			if (selectedComparators.size() < 2) {
-				MessageDialog.openError(getShell(), TXMUIMessages.ComplexSort_10,
-						TXMUIMessages.ComplexSort_11);
+				MessageDialog.openError(getShell(), TXMUIMessages.invalidComparator,
+						TXMUIMessages.youMustSelectAtLeast2Comparators);
 				return;
 			}
 			super.okPressed();
 		}
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java	(revision 1335)
@@ -79,8 +79,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.DefineReferencePattern_3);
-		setToolTipText(TXMUIMessages.DefineReferencePattern_4);
+		setText(TXMUIMessages.referencesAmpsortOptions);
+		setToolTipText(TXMUIMessages.referencesSortOptions);
 	}
 
 	/* (non-Javadoc)
@@ -174,7 +174,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(TXMUIMessages.DefineReferencePattern_5);
+		      shell.setText(TXMUIMessages.referencesSortOptions);
 		      
 		      shell.setSize(400, 500);
 		      shell.setLocation(shell.getParent().getLocation());
@@ -335,4 +335,4 @@
 			return mainArea;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java	(revision 1335)
@@ -79,8 +79,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.DefineReferencePattern_1);
-		setToolTipText(TXMUIMessages.DefineReferencePattern_2);
+		setText(TXMUIMessages.referencesAmpdisplayOptions);
+		setToolTipText(TXMUIMessages.referencesDisplayOptions);
 	}
 
 	/* (non-Javadoc)
@@ -174,7 +174,7 @@
 		@Override
 		protected void configureShell(Shell shell) {
 		      super.configureShell(shell);
-		      shell.setText(TXMUIMessages.DefineReferencePattern_0);
+		      shell.setText(TXMUIMessages.referencesDisplayOptions);
 		      
 		      shell.setSize(400, 500);
 		      shell.setLocation(shell.getParent().getLocation());
@@ -335,4 +335,4 @@
 			return mainArea;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java	(revision 1335)
@@ -70,8 +70,8 @@
 			ConcordanceEditor concordanceEditor, TableViewer tableViewer) {
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.SortPropertySelection_0);
-		setToolTipText(TXMUIMessages.SortPropertySelection_0);
+		setText(TXMUIMessages.sortOptions);
+		setToolTipText(TXMUIMessages.sortOptions);
 	}
 
 	/* (non-Javadoc)
@@ -129,4 +129,4 @@
 
 		// concordanceEditor.updateSortPropertiesLabel();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java	(revision 1335)
@@ -58,8 +58,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.BackToText_0);
-		setToolTipText(TXMUIMessages.BackToText_0);
+		setText(TXMUIMessages.displayInFullText);
+		setToolTipText(TXMUIMessages.displayInFullText);
 	}
 
 	/* (non-Javadoc)
@@ -77,4 +77,4 @@
 		concordanceEditor.backToText();
 
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java	(revision 1335)
@@ -74,8 +74,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.SetSortProperty_1);
-		setToolTipText(TXMUIMessages.SetSortProperty_2);
+		setText(TXMUIMessages.ampSortOptions);
+		setToolTipText(TXMUIMessages.sortOptions);
 	}
 
 	/**
@@ -177,7 +177,7 @@
 			mainArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 					true, true));
 			Group group = new Group(mainArea, SWT.SHADOW_IN);
-			group.setText(TXMUIMessages.SetSortProperty_3);
+			group.setText(TXMUIMessages.sortOptions);
 			group.setLayout(new RowLayout(SWT.VERTICAL));
 			for (Property property : properties) {
 				Button button = new Button(group, SWT.RADIO);
@@ -208,4 +208,4 @@
 			return selectedProperty;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java	(revision 1335)
@@ -67,8 +67,8 @@
 		this.window = window;
 		this.concordanceEditor = concordanceEditor;
 		setId(ID);
-		setText(TXMUIMessages.SetContextSize_1);
-		setToolTipText(TXMUIMessages.SetContextSize_2);
+		setText(TXMUIMessages.ampContextsDisplayOptions);
+		setToolTipText(TXMUIMessages.contextsDisplayOptions);
 	}
 
 	/* (non-Javadoc)
@@ -147,12 +147,12 @@
 		protected Control createDialogArea(Composite parent) {
 			Composite mainArea = new Composite(parent, SWT.NONE);
 			mainArea.setLayout(new GridLayout(2, false));
-			new Label(mainArea, SWT.None).setText(TXMUIMessages.SetContextSize_3);
+			new Label(mainArea, SWT.None).setText(TXMUIMessages.leftContextSize);
 			leftSpinner = new Spinner(mainArea, SWT.NONE);
 			leftSpinner.setMinimum(0);
 			leftSpinner.setMaximum(100);
 			leftSpinner.setSelection(concordanceEditor.getLeftContextSize());
-			new Label(mainArea, SWT.None).setText(TXMUIMessages.SetContextSize_4);
+			new Label(mainArea, SWT.None).setText(TXMUIMessages.rightContextSize);
 			rightSpinner = new Spinner(mainArea, SWT.NONE);
 			rightSpinner.setMinimum(0);
 			rightSpinner.setMaximum(100);
@@ -171,4 +171,4 @@
 		}
 
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 1335)
@@ -80,8 +80,8 @@
 			}
 		}
 		
-		StatusLine.setMessage(ConcordanceUIMessages.ComputeConcordance_0);
+		StatusLine.setMessage(ConcordanceUIMessages.openingTheConcordanceResult);
 		TXMEditor.openEditor(concordance, ConcordanceEditor.class.getName());
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/preferences/ConcordancePreferencePage.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/preferences/ConcordancePreferencePage.java	(revision 1334)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/preferences/ConcordancePreferencePage.java	(revision 1335)
@@ -50,9 +50,9 @@
 
 	@Override
 	protected void createFieldEditors() {
-		this.addField(new IntegerFieldEditor(ConcordancePreferences.N_LINES_PER_PAGE, ConcordanceUIMessages.ConcordancerPreferencePage_4, this.getFieldEditorParent()));
-		this.addField(new IntegerFieldEditor(ConcordancePreferences.LEFT_CONTEXT_SIZE, ConcordanceUIMessages.ConcordancerPreferencePage_5, this.getFieldEditorParent()));
-		this.addField(new IntegerFieldEditor(ConcordancePreferences.RIGHT_CONTEXT_SIZE, ConcordanceUIMessages.ConcordancerPreferencePage_6, this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(ConcordancePreferences.N_LINES_PER_PAGE, ConcordanceUIMessages.linesPerAmpPageDDot, this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(ConcordancePreferences.LEFT_CONTEXT_SIZE, ConcordanceUIMessages.ampLeftContextLengthInWords, this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(ConcordancePreferences.RIGHT_CONTEXT_SIZE, ConcordanceUIMessages.ampRightContextLengthInWords, this.getFieldEditorParent()));
 	}
 	
 	
@@ -60,7 +60,7 @@
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(ConcordancePreferences.getInstance().getPreferencesNodeQualifier()));
-		this.setTitle(ConcordanceUIMessages.ConcordancerPreferencePage_3);
+		this.setTitle(ConcordanceUIMessages.concordanceParameters);
 		this.setImageDescriptor(ConcordanceAdapterFactory.ICON);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/preferences/SpecificitiesPreferencePage.java
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/preferences/SpecificitiesPreferencePage.java	(revision 1334)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/preferences/SpecificitiesPreferencePage.java	(revision 1335)
@@ -58,10 +58,10 @@
 	protected void createFieldEditors() {
 				
 		
-		this.addField(new StringFieldEditor(SpecificitiesPreferences.FORMAT, SpecificitiesUIMessages.SpecificitiesPreferencePage_3, this.getFieldEditorParent()));
+		this.addField(new StringFieldEditor(SpecificitiesPreferences.FORMAT, SpecificitiesUIMessages.scoresFormatDefaultIsPercent1f, this.getFieldEditorParent()));
 
 		
-		IntegerFieldEditor maxScoreField = new IntegerFieldEditor(SpecificitiesPreferences.MAX_SCORE, SpecificitiesUIMessages.SpecificitiesPreferencePage_8, this.getFieldEditorParent()); 
+		IntegerFieldEditor maxScoreField = new IntegerFieldEditor(SpecificitiesPreferences.MAX_SCORE, SpecificitiesUIMessages.maximumScore, this.getFieldEditorParent()); 
 		maxScoreField.setTextLimit(4);
 		maxScoreField.setValidRange(10, 1000);
 		this.addField(maxScoreField);
@@ -70,7 +70,7 @@
 		// Charts rendering
 		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent());
 		
-		this.addField(new DoubleFieldEditor(SpecificitiesPreferences.CHART_BANALITY, SpecificitiesUIMessages.SpecificitiesPreferencePage_7, chartsTab));
+		this.addField(new DoubleFieldEditor(SpecificitiesPreferences.CHART_BANALITY, SpecificitiesUIMessages.banality, chartsTab));
 		
 		// Create a group for columns management of mixed boolean fields and field/text input fields
 		Composite booleansGroup = new Composite(chartsTab, SWT.NONE);
@@ -78,9 +78,9 @@
 		gridData.horizontalSpan = 2;
 		booleansGroup.setLayoutData(gridData);
 		
-		this.addField(new BooleanFieldEditor(SpecificitiesPreferences.CHART_GROUP_BY_LINES, SpecificitiesUIMessages.SpecificitiesPreferencePage_4, booleansGroup));
-		this.addField(new BooleanFieldEditor(SpecificitiesPreferences.CHART_DRAW_LINES, SpecificitiesUIMessages.SpecificitiesPreferencePage_5, booleansGroup));
-		this.addField(new BooleanFieldEditor(SpecificitiesPreferences.CHART_DRAW_BARS, SpecificitiesUIMessages.SpecificitiesPreferencePage_6, booleansGroup));
+		this.addField(new BooleanFieldEditor(SpecificitiesPreferences.CHART_GROUP_BY_LINES, SpecificitiesUIMessages.groupBarsByLines, booleansGroup));
+		this.addField(new BooleanFieldEditor(SpecificitiesPreferences.CHART_DRAW_LINES, SpecificitiesUIMessages.drawLines, booleansGroup));
+		this.addField(new BooleanFieldEditor(SpecificitiesPreferences.CHART_DRAW_BARS, SpecificitiesUIMessages.drawBars, booleansGroup));
 		
 		// other shared preferences
 		SWTChartsComponentsProvider.createChartsRenderingPreferencesFields(this, chartsTab);
@@ -91,10 +91,10 @@
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(SpecificitiesPreferences.getInstance().getPreferencesNodeQualifier()));
-		this.setTitle(SpecificitiesUIMessages.SpecificitiesPreferencePage_2);
+		this.setTitle(SpecificitiesUIMessages.specificities);
 		this.setImageDescriptor(SpecificitiesAdapterFactory.ICON);
 	}
 
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,10 +1,10 @@
-
-SpecificitiesPreferencePage_2 = Специфичность
-SpecificitiesPreferencePage_3 = N/A_Scores format (default%,.1f)
-SpecificitiesPreferencePage_4 = Сгруппировать столбики по строкам таблицы
-SpecificitiesPreferencePage_5 = График: показать кривые
-SpecificitiesPreferencePage_6 = График: показать столбики
-SpecificitiesPreferencePage_7 = N/A_Banalit�
-
-SpecificitiesTableEditor_0  = Не удалось подсчитать специфичность
-SpecificitiesTableEditor_11 = T
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+banality=N/A_Banalit�
+drawBars=График\: показать столбики
+drawLines=График\: показать кривые
+failedToComputeSpecificities=Не удалось подсчитать специфичность
+groupBarsByLines=Сгруппировать столбики по строкам таблицы
+scoresFormatDefaultIsPercent1f=N/A_Scores format (default%,.1f)
+specificities=Специфичность
+t=T
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/SpecificitiesUIMessages.java
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/SpecificitiesUIMessages.java	(revision 1334)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/SpecificitiesUIMessages.java	(revision 1335)
@@ -13,16 +13,16 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.specificities.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String SpecificitiesPreferencePage_2;
-	public static String SpecificitiesPreferencePage_3;
-	public static String SpecificitiesPreferencePage_4;
-	public static String SpecificitiesPreferencePage_5;
-	public static String SpecificitiesPreferencePage_6;
-	public static String SpecificitiesPreferencePage_7;
+	public static String specificities; 
+	public static String scoresFormatDefaultIsPercent1f; 
+	public static String groupBarsByLines; 
+	public static String drawLines; 
+	public static String drawBars; 
+	public static String banality; 
 
-	public static String SpecificitiesPreferencePage_8;
-	public static String SpecificitiesTableEditor_0;
-	public static String SpecificitiesTableEditor_11;
+	public static String maximumScore; 
+	public static String failedToComputeSpecificities; 
+	public static String t; 
 	
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,11 +1,11 @@
-
-SpecificitiesPreferencePage_2 = Spécificités
-SpecificitiesPreferencePage_3 = Format des indices (par défaut : %,.1f)
-SpecificitiesPreferencePage_4 = Regrouper les barres par les lignes de la table
-SpecificitiesPreferencePage_5 = Afficher les lignes
-SpecificitiesPreferencePage_6 = Afficher les barres
-SpecificitiesPreferencePage_7 = Banalité
-SpecificitiesPreferencePage_8 = Indice maximum
-
-SpecificitiesTableEditor_0  = Le calcul des spécificités a échoué.
-SpecificitiesTableEditor_11 = T
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+banality=Banalité
+drawBars=Afficher les barres
+drawLines=Afficher les lignes
+failedToComputeSpecificities=Le calcul des spécificités a échoué.
+groupBarsByLines=Regrouper les barres par les lignes de la table
+maximumScore=Indice maximum
+scoresFormatDefaultIsPercent1f=Format des indices (par défaut \: %,.1f)
+specificities=Spécificités
+t=T
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/messages/messages.properties	(revision 1335)
@@ -1,11 +1,11 @@
-
-SpecificitiesPreferencePage_2 = Specificities
-SpecificitiesPreferencePage_3 = Scores format (default is %,.1f)
-SpecificitiesPreferencePage_4 = Group bars by lines
-SpecificitiesPreferencePage_5 = Draw lines
-SpecificitiesPreferencePage_6 = Draw bars
-SpecificitiesPreferencePage_7 = Banality
-SpecificitiesPreferencePage_8 = Maximum score
-
-SpecificitiesTableEditor_0  = Failed to compute specificities.
-SpecificitiesTableEditor_11 = \ T
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+banality=Banality
+drawBars=Draw bars
+drawLines=Draw lines
+failedToComputeSpecificities=Failed to compute specificities.
+groupBarsByLines=Group bars by lines
+maximumScore=Maximum score
+scoresFormatDefaultIsPercent1f=Scores format (default is %,.1f)
+specificities=Specificities
+t=\ T
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java	(revision 1334)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java	(revision 1335)
@@ -180,7 +180,7 @@
 			specificitesTable.setSortDirection(SWT.UP);
 			
 		} catch (Exception e) {
-			Log.severe(NLS.bind(SpecificitiesUIMessages.SpecificitiesTableEditor_0, e.getMessage()));
+			Log.severe(NLS.bind(SpecificitiesUIMessages.failedToComputeSpecificities, e.getMessage()));
 			Log.printStackTrace(e);
 		}
 	}
@@ -237,7 +237,7 @@
 			
 			if(!this.getResult().isDirty())	{
 				
-				typeFrequencyColumn.setText(TXMCoreMessages.common_frequency + " " + SpecificitiesUIMessages.SpecificitiesTableEditor_11 + " " + this.getResult().getCorpusSize()); //$NON-NLS-1$ //$NON-NLS-2$
+				typeFrequencyColumn.setText(TXMCoreMessages.common_frequency + " " + SpecificitiesUIMessages.t + " " + this.getResult().getCorpusSize()); //$NON-NLS-1$ //$NON-NLS-2$
 				typeFrequencyColumn.setToolTipText(typeFrequencyColumn.getText()); 
 				typeFrequencyColumn.pack();
 
@@ -298,4 +298,4 @@
 
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java	(revision 1334)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java	(revision 1335)
@@ -47,7 +47,7 @@
 		
 		// Group bars by lines
 		groupBarsByLines = new ToolItem(this.getToolBar(), SWT.CHECK);
-		groupBarsByLines.setToolTipText(SpecificitiesUIMessages.SpecificitiesPreferencePage_4);
+		groupBarsByLines.setToolTipText(SpecificitiesUIMessages.groupBarsByLines);
 		groupBarsByLines.setImage(IImageKeys.getImage(ComputeSpecifities.class, "icons/silk_group_bars_by_lines.png"));
 		groupBarsByLines.addSelectionListener(computeSelectionListener);
 		
@@ -70,4 +70,4 @@
 		// nothing to do
 	}
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages_fr.properties	(revision 1335)
@@ -1,40 +1,34 @@
-
-EIGENVALUES_RESULT_TYPE = Eigenvalues
-
-RESULT_TYPE = AFC
-
-charts_error_factorialMap_cantCreateCAChartFile           = Impossible de créer le fichier du graphique du plan factoriel de l'AFC (moteur de production de graphiques: {0}).
-charts_error_singularValues_cantCreateSingularValuesChart = Impossible de créer l'histogramme des valeurs propres de l'AFC.
-charts_factorialMap_axisLabelPrefix                       = Axe
-charts_factorialMap_legendColumnsLabel                    = Colonnes
-charts_factorialMap_legendRowsLabel                       = Lignes
-charts_factorialMap_title                                 = Plan factoriel de l'analyse des correspondances\nde {0}
-charts_factorialMap_tooltipColsLabel                      = t
-charts_factorialMap_tooltipCoordinates                    = Coordonnées
-charts_factorialMap_tooltipRowsLabel                      = Fréquence
-charts_singularValues_title                               = Valeurs propres
-charts_singularValues_tooltipPercent                      = %
-charts_singularValues_tooltipSum                          = ∑
-charts_singularValues_tooltipYLabel                       = Valeur propre
-charts_singularValues_xAxisLabel                          = Axe
-charts_singularValues_yAxisLabel                          = Valeur propre
-
-common_c1   = c1
-common_c2   = c2
-common_c3   = c3
-common_cont = Cont
-common_cos2 = Cos²
-common_dist = Dist
-common_mass = Mass
-common_q12  = Q12
-common_q13  = Q13
-common_q23  = Q23
-
-error_canNotLoadCALibrary             = ** Impossible de charger la librairie 'ca'.
-error_errorWhileComputingCA           = ** Erreur lors du calcul de l'analyse factorielle des correspondances : 
-error_failedToGetConstributionRow     = ** Echec d'accès à la ligne des contributions : 
-error_failedToGetContributionColumn   = ** Echec d'accès à la colonne des contributions : 
-error_failedToGetCos2Column           = ** Echec d'accès à la colonne des cos² : 
-error_failedToGetCos2Row              = ** Echec d'accès à la ligne des cos² : 
-error_lexicalTableNotFoundInWorkspace = ** La table lexicale n'a pas été trouvée dans l'espace de travail R.
-error_unableToExtractSingularValues   = ** Impossible d'extraire les valeurs propres.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+axis=Axe
+cantCreateBarChartOfTheCASingularValues=Impossible de créer l'histogramme des valeurs propres de l'AFC.
+cantCreateCAChartFileChartsEngineDDotP0=Impossible de créer le fichier du graphique du plan factoriel de l'AFC (moteur de production de graphiques\: {0}).
+charts_singularValues_tooltipSum=∑
+columns=Colonnes
+common_c1=c1
+common_c2=c2
+common_c3=c3
+common_cont=Cont
+common_cos2=Cos²
+common_dist=Dist
+common_mass=Mass
+common_q12=Q12
+common_q13=Q13
+common_q23=Q23
+coordinates=Coordonnées
+correspondenceAnalysisFactorialMapofTheP0=Plan factoriel de l'analyse des correspondances\nde {0}
+eigenvalue=Valeur propre
+eigenvalues=Eigenvalues
+error_canNotLoadCALibrary=** Impossible de charger la librairie 'ca'.
+error_errorWhileComputingCA=** Erreur lors du calcul de l'analyse factorielle des correspondances \: 
+error_failedToGetConstributionRow=** Echec d'accès à la ligne des contributions \: 
+error_failedToGetContributionColumn=** Echec d'accès à la colonne des contributions \: 
+error_failedToGetCos2Column=** Echec d'accès à la colonne des cos² \: 
+error_failedToGetCos2Row=** Echec d'accès à la ligne des cos² \: 
+error_lexicalTableNotFoundInWorkspace=** La table lexicale n'a pas été trouvée dans l'espace de travail R.
+error_unableToExtractSingularValues=** Impossible d'extraire les valeurs propres.
+frequency=Fréquence
+percent=%
+RESULT_TYPE=AFC
+rows=Lignes
+t=t
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages.properties
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/messages/messages.properties	(revision 1335)
@@ -1,40 +1,34 @@
-
-EIGENVALUES_RESULT_TYPE = Eigenvalues
-
-RESULT_TYPE = CA
-
-charts_error_factorialMap_cantCreateCAChartFile           = Can't create CA chart file (charts engine: {0}).
-charts_error_singularValues_cantCreateSingularValuesChart = Can't create bar chart of the CA singular values.
-charts_factorialMap_axisLabelPrefix                       = Axis
-charts_factorialMap_legendColumnsLabel                    = Columns
-charts_factorialMap_legendRowsLabel                       = Rows
-charts_factorialMap_title                                 = Correspondence analysis factorial map\nof the {0}
-charts_factorialMap_tooltipColsLabel                      = t
-charts_factorialMap_tooltipCoordinates                    = Coordinates
-charts_factorialMap_tooltipRowsLabel                      = Frequency
-charts_singularValues_title                               = Eigenvalues
-charts_singularValues_tooltipPercent                      = %
-charts_singularValues_tooltipSum                          = ∑
-charts_singularValues_tooltipYLabel                       = Eigenvalue
-charts_singularValues_xAxisLabel                          = Axis
-charts_singularValues_yAxisLabel                          = Eigenvalue
-
-common_c1   = c1
-common_c2   = c2
-common_c3   = c3
-common_cont = Cont
-common_cos2 = Cos²
-common_dist = Dist
-common_mass = Mass
-common_q12  = Q12
-common_q13  = Q13
-common_q23  = Q23
-
-error_canNotLoadCALibrary             = ** Cannot load the 'ca' library.
-error_errorWhileComputingCA           = ** Error while computing correspondence analysis: 
-error_failedToGetConstributionRow     = ** Failed to get contribution row: 
-error_failedToGetContributionColumn   = ** Failed to get contribution column: 
-error_failedToGetCos2Column           = ** Failed to get cos² column: 
-error_failedToGetCos2Row              = ** Failed to get cos² row: 
-error_lexicalTableNotFoundInWorkspace = ** The lexical table was not found in the R workspace.
-error_unableToExtractSingularValues   = ** Unable to extract singular values.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+axis=Axis
+cantCreateBarChartOfTheCASingularValues=Can't create bar chart of the CA singular values.
+cantCreateCAChartFileChartsEngineDDotP0=Can't create CA chart file (charts engine\: {0}).
+charts_singularValues_tooltipSum=∑
+columns=Columns
+common_c1=c1
+common_c2=c2
+common_c3=c3
+common_cont=Cont
+common_cos2=Cos²
+common_dist=Dist
+common_mass=Mass
+common_q12=Q12
+common_q13=Q13
+common_q23=Q23
+coordinates=Coordinates
+correspondenceAnalysisFactorialMapofTheP0=Correspondence analysis factorial map\nof the {0}
+eigenvalue=Eigenvalue
+eigenvalues=Eigenvalues
+error_canNotLoadCALibrary=** Cannot load the 'ca' library.
+error_errorWhileComputingCA=** Error while computing correspondence analysis\: 
+error_failedToGetConstributionRow=** Failed to get contribution row\: 
+error_failedToGetContributionColumn=** Failed to get contribution column\: 
+error_failedToGetCos2Column=** Failed to get cos² column\: 
+error_failedToGetCos2Row=** Failed to get cos² row\: 
+error_lexicalTableNotFoundInWorkspace=** The lexical table was not found in the R workspace.
+error_unableToExtractSingularValues=** Unable to extract singular values.
+frequency=Frequency
+percent=%
+RESULT_TYPE=CA
+rows=Rows
+t=t
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/messages/CACoreMessages.java	(revision 1335)
@@ -1,61 +1,58 @@
-package org.txm.ca.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * CA core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class CACoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.ca.core.messages.messages"; //$NON-NLS-1$
-
-	public static String RESULT_TYPE;
-	public static String EIGENVALUES_RESULT_TYPE;
-	
-	public static String charts_error_factorialMap_cantCreateCAChartFile;
-	public static String charts_error_singularValues_cantCreateSingularValuesChart;
-
-	public static String charts_factorialMap_axisLabelPrefix;
-	public static String charts_factorialMap_legendColumnsLabel;
-	public static String charts_factorialMap_legendRowsLabel;
-	public static String charts_factorialMap_title;
-	public static String charts_factorialMap_tooltipColsLabel;
-	public static String charts_factorialMap_tooltipCoordinates;
-	public static String charts_factorialMap_tooltipRowsLabel;
-	
-	public static String charts_singularValues_title;
-	public static String charts_singularValues_tooltipPercent;
-	public static String charts_singularValues_tooltipSum;
-	public static String charts_singularValues_tooltipYLabel;
-	public static String charts_singularValues_xAxisLabel;
-	public static String charts_singularValues_yAxisLabel;
-	
-	public static String common_c1;
-	public static String common_c2;
-	public static String common_c3;
-	public static String common_cont;
-	public static String common_cos2;
-	public static String common_dist;
-	public static String common_mass;
-	public static String common_q12;
-	public static String common_q13;
-	public static String common_q23;
-	
-	public static String error_canNotLoadCALibrary;
-	public static String error_errorWhileComputingCA;
-	public static String error_failedToGetConstributionRow;
-	public static String error_failedToGetContributionColumn;
-	public static String error_failedToGetCos2Column;
-	public static String error_failedToGetCos2Row;
-	public static String error_lexicalTableNotFoundInWorkspace;
-	public static String error_unableToExtractSingularValues;
-
-	static {
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CACoreMessages.class);
-	}
-}
+package org.txm.ca.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * CA core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class CACoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.ca.core.messages.messages"; //$NON-NLS-1$
+
+	public static String RESULT_TYPE;
+	public static String eigenvalues; 
+	
+	public static String cantCreateCAChartFileChartsEngineDDotP0; 
+	public static String cantCreateBarChartOfTheCASingularValues; 
+
+	public static String axis; 
+	public static String columns; 
+	public static String rows; 
+	public static String correspondenceAnalysisFactorialMapofTheP0; 
+	public static String t; 
+	public static String coordinates; 
+	public static String frequency; 
+	
+	public static String percent; 
+	public static String charts_singularValues_tooltipSum;
+	public static String eigenvalue; 
+	
+	public static String common_c1;
+	public static String common_c2;
+	public static String common_c3;
+	public static String common_cont;
+	public static String common_cos2;
+	public static String common_dist;
+	public static String common_mass;
+	public static String common_q12;
+	public static String common_q13;
+	public static String common_q23;
+	
+	public static String error_canNotLoadCALibrary;
+	public static String error_errorWhileComputingCA;
+	public static String error_failedToGetConstributionRow;
+	public static String error_failedToGetContributionColumn;
+	public static String error_failedToGetCos2Column;
+	public static String error_failedToGetCos2Row;
+	public static String error_lexicalTableNotFoundInWorkspace;
+	public static String error_unableToExtractSingularValues;
+
+	static {
+		Utf8NLS.initializeMessages(BUNDLE_NAME, CACoreMessages.class);
+	}
+}
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/functions/Eigenvalues.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/functions/Eigenvalues.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/functions/Eigenvalues.java	(revision 1335)
@@ -111,7 +111,7 @@
 
 	@Override
 	public String getResultype() {
-		return CACoreMessages.EIGENVALUES_RESULT_TYPE;
+		return CACoreMessages.eigenvalues;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RCAChartCreator.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RCAChartCreator.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RCAChartCreator.java	(revision 1335)
@@ -66,7 +66,7 @@
 			
 		}
 		catch(Exception e) {
-			Log.severe(CACoreMessages.bind(CACoreMessages.charts_error_factorialMap_cantCreateCAChartFile + " - FactoMineR package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
+			Log.severe(CACoreMessages.bind(CACoreMessages.cantCreateCAChartFileChartsEngineDDotP0 + " - FactoMineR package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
 			Log.printStackTrace(e);
 		}
 
@@ -110,7 +110,7 @@
 			this.getChartsEngine().plot(destFile, cmd);
 		}
 		catch(Exception e) {
-			Log.severe(CACoreMessages.bind(CACoreMessages.charts_error_factorialMap_cantCreateCAChartFile + " - CA package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
+			Log.severe(CACoreMessages.bind(CACoreMessages.cantCreateCAChartFileChartsEngineDDotP0 + " - CA package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
 			Log.printStackTrace(e);
 		}
 
@@ -174,4 +174,4 @@
 
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java	(revision 1335)
@@ -55,9 +55,9 @@
 
 		String cmd = "tmpY <- " + ca.getSymbol() + "$eig$eigenvalue[1:length(" + ca.getSymbol() + "$eig$eigenvalue) - 1];\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		cmd += "barplot(tmpY, main=\"" //$NON-NLS-1$
-				+ CACoreMessages.charts_singularValues_title + "\", ylab=\"" + //$NON-NLS-1$
-				CACoreMessages.charts_singularValues_yAxisLabel + "\", xlab=\"" + //$NON-NLS-1$
-				CACoreMessages.charts_singularValues_xAxisLabel + "\", names.arg=" + xLabels + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
+				+ CACoreMessages.eigenvalues + "\", ylab=\"" + //$NON-NLS-1$
+				CACoreMessages.eigenvalue + "\", xlab=\"" + //$NON-NLS-1$
+				CACoreMessages.axis + "\", names.arg=" + xLabels + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
 
 		this.getChartsEngine().plot(file, cmd);
 
@@ -86,4 +86,4 @@
 
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/base/Utils.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/base/Utils.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/base/Utils.java	(revision 1335)
@@ -23,8 +23,8 @@
 	 * @return the CA title
 	 */
 	public static String createCAFactorialMapChartTitle(CA ca)	{
-		return ChartsEngineCoreMessages.bind(CACoreMessages.charts_factorialMap_title, ca.getParent().getName());
+		return ChartsEngineCoreMessages.bind(CACoreMessages.correspondenceAnalysisFactorialMapofTheP0, ca.getParent().getName());
 	}
 
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/datasets/CAXYDataset.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/datasets/CAXYDataset.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/datasets/CAXYDataset.java	(revision 1335)
@@ -1,370 +1,370 @@
-package org.txm.ca.core.chartsengine.jfreechart.datasets;
-
-import org.jfree.data.xy.AbstractXYDataset;
-import org.jfree.data.xy.XYDataset;
-import org.txm.ca.core.functions.CA;
-import org.txm.ca.core.messages.CACoreMessages;
-import org.txm.statsengine.core.StatException;
-
-/**
- * XY data set for storing coordinates and frequencies of CA plots.  
- * @author sjacquot
- *
- */
-// TODO: some CA data are duplicated in this data set. We could directly use the CA methods here
-// rather than copy some data but the performances due off access may be altered, however we would gain memory.
-public class CAXYDataset extends AbstractXYDataset implements XYDataset { 
-
-	/**
-	 * The linked CA result.
-	 */
-	protected CA ca;
-	
-	/**
-	 * The row labels.
-	 */
-	protected String[] rowLabels;
-	
-	/**
-	 * The column labels.
-	 */
-	protected String[] columnLabels;
-	
-	
-	/**
-	 * The row coordinates. 
-	 */
-	protected double rowCoordinates[][];
-	
-	/**
-	 * The column coordinates.
-	 */
-	protected double columnCoordinates[][];
-	
-	
-	/**
-	 * The row frequencies.	
-	 */
-	protected int[] rowFrequencies;
-	
-	
-	/**
-	 * The column frequencies. 
-	 */
-	protected int[] columnFrequencies;
-
-	/**
-	 * First axis for point coordinates.
-	 */
-	protected int axis1;
-
-	/**
-	 * Second axis for point coordinates.
-	 */
-	protected int axis2;
-
-
-	/**
-	 * Creates a data set from the specified CA result.
-	 * @param ca
-	 * @throws StatException 
-	 */
-	public CAXYDataset(CA ca) throws Exception {
-
-		this.ca = ca;
-		
-		// Axis/dimensions
-		this.axis1 = ca.getFirstDimension() - 1;
-		this.axis2 = ca.getSecondDimension() - 1;
-		
-		// Labels
-		this.rowLabels = ca.getRowNames();
-		this.columnLabels = ca.getColNames();
-
-		// Coordinates
-		this.rowCoordinates = ca.getRowsCoords();
-		this.columnCoordinates = ca.getColsCoords();
-
-		// Frequencies
-		this.rowFrequencies = ca.getLexicalTable().getRowMarginsVector().asIntArray();
-		this.columnFrequencies = ca.getLexicalTable().getColMarginsVector().asIntArray();
-
-	}
-
-
-	@Override
-	public Number getX(int series, int item) {
-		if(item == -1)	{
-			System.out.println("CAXYDataset.getX()");
-		}
-		// Rows
-		if(series == 0) {
-			return this.rowCoordinates[item][this.axis1];
-		}
-		// Cols
-		else {
-			return this.columnCoordinates[item][this.axis1];
-		}
-	}
-
-	@Override
-	public Number getY(int series, int item) {
-		// Rows
-		if(series == 0) {
-			return this.rowCoordinates[item][this.axis2];
-		}
-		// Cols
-		else {
-			return this.columnCoordinates[item][this.axis2];
-		}
-
-	}
-
-
-	/**
-	 * Gets the maximum X coordinates value in the specified series.
-	 * @param series
-	 * @return
-	 */
-	public double getMaxX(int series)	{
-		return this.getMaxValue(series, this.axis1);
-	}
-	
-
-	/**
-	 * Gets the maximum Y coordinates value in the specified series.
-	 * @param series
-	 * @return
-	 */
-	public double getMaxY(int series)	{
-		return this.getMaxValue(series, this.axis2);
-	}
-
-
-	/**
-	 * Gets the maximum value in the specified series according to the specified axis.
-	 * @param series
-	 * @param axis
-	 * @return
-	 */
-	public double getMaxValue(int series, int axis)	{
-
-		double maxValue = 0;
-		double tmpMaxValue;
-
-		double[][] coordinates = this.rowCoordinates;
-		if(series != 0)	{
-			coordinates = this.columnCoordinates;
-		}
-		
-		for(int i = 0; i < coordinates.length; i++) {
-			tmpMaxValue = coordinates[i][axis];
-			if(tmpMaxValue > maxValue)	{
-				maxValue = tmpMaxValue;
-			}
-		}
-
-		return maxValue;
-	}
-	
-	
-	
-	/**
-	 * Gets the minimum X coordinates value in the specified series.
-	 * @param series
-	 * @return
-	 */
-	public double getMinX(int series)	{
-		return this.getMinValue(series, this.axis1);
-	}
-	
-
-	/**
-	 * Gets the minimum Y coordinates value in the specified series.
-	 * @param series
-	 * @return
-	 */
-	public double getMinY(int series)	{
-		return this.getMinValue(series, this.axis2);
-	}
-
-	
-	/**
-	 * Gets the minimum value in the specified series according to the specified axis.
-	 * @param series
-	 * @param axis
-	 * @return
-	 */
-	public double getMinValue(int series, int axis)	{
-
-		double minValue = 0;
-		double tmpMinValue;
-
-		double[][] coordinates = this.rowCoordinates;
-		if(series != 0)	{
-			coordinates = this.columnCoordinates;
-		}
-		
-		for(int i = 0; i < coordinates.length; i++) {
-			tmpMinValue = coordinates[i][axis];
-			if(tmpMinValue < minValue)	{
-				minValue = tmpMinValue;
-			}
-		}
-
-		return minValue;
-	}
-	
-	
-	@Override
-	public int getSeriesCount() {
-		return 2;
-	}
-
-	@Override
-	public int getItemCount(int series) {
-		// Rows
-		if(series == 0) {
-			return this.rowCoordinates.length;
-		}
-		// Cols
-		else {
-			return this.columnCoordinates.length;
-		}
-	}
-
-	/**
-	 * Gets the key of the specified series.
-	 */
-	public Comparable getSeriesKey(int series) {
-		// Rows
-		if(series == 0) {
-			return CACoreMessages.charts_factorialMap_legendRowsLabel;
-		}
-		// Cols
-		else {
-			return CACoreMessages.charts_factorialMap_legendColumnsLabel;
-		}
-	}
-
-	/**
-	 * Gets the label of a point.
-	 * @param series
-	 * @param item
-	 * @return
-	 */
-	public String getLabel(int series, int item) {
-		// Rows
-		if(series == 0) {
-			return this.rowLabels[item];
-		}
-		// Cols
-		else {
-			return this.columnLabels[item];
-		}
-	}
-
-	
-	/**
-	 * Gets the indices of point from their labels.
-	 * @param series
-	 * @param label
-	 * @return
-	 */
-	public int[] getLabelIndices(int series, String[] labels)	{
-		int[] indices = new int[labels.length];
-	
-		// Rows
-		if(series == 0) {
-			for(int i = 0, j = 0; i < this.rowLabels.length; i++) {
-				for(int k = 0; k < labels.length; k++) {
-					if(this.rowLabels[i].equals(labels[k]))	{
-						indices[j++] = i;
-					}
-				}
-			}
-		}
-		// Cols
-		else {
-			for(int i = 0, j = 0; i < this.columnLabels.length; i++) {
-				for(int k = 0; k < labels.length; k++) {
-					if(this.columnLabels[i].equals(labels[k]))	{
-						indices[j++] = i;
-					}
-				}
-			}
-		}
-		
-		return indices;
-	}
-	
-	/**
-	 * Gets the indices of point from their labels keeping the specified label order.
-	 * @param series
-	 * @param labels
-	 * @return
-	 */
-	public int[] getOrderedLabelIndices(int series, String[] labels)	{
-		int[] indices = new int[labels.length];
-		
-		// Rows
-		if(series == 0) {
-			for(int i = 0, k = 0; i < labels.length; i++) {
-				for(int j = 0; j < this.rowLabels.length; j++) {
-					if(this.rowLabels[j].equals(labels[i]))	{
-						indices[k++] = j;
-						continue;
-					}
-				}
-			}
-		}
-		// Cols
-		else {
-			for(int i = 0, k = 0; i < labels.length; i++) {
-				for(int j = 0; j < this.columnLabels.length; j++) {
-					if(this.columnLabels[j].equals(labels[i]))	{
-						indices[k++] = j;
-						continue;
-					}
-				}
-			}
-		}
-		
-		return indices;
-	}
-	
-	
-	
-	/**
-	 * Gets the frequency of the specified series and items.
-	 * If <code>series</code> is equal to 0, the method returns the frequency of the specified row, otherwise the sum of the occurrences of the specified column.
-	 * @param series
-	 * @param item
-	 * @return
-	 */
-	public String getFrequency(int series, int item) {
-		// Rows
-		if(series == 0) {
-			return String.valueOf(this.rowFrequencies[item]);
-		}
-		// Columns
-		else {
-			return String.valueOf(this.columnFrequencies[item]);
-		}
-	}
-
-	/**
-	 * @param axis1 the axis1 to set
-	 */
-	public void setAxis1(int axis1) {
-		this.axis1 = axis1 - 1;
-	}
-
-	/**
-	 * @param axis2 the axis2 to set
-	 */
-	public void setAxis2(int axis2) {
-		this.axis2 = axis2 - 1;
-	}
-
+package org.txm.ca.core.chartsengine.jfreechart.datasets;
+
+import org.jfree.data.xy.AbstractXYDataset;
+import org.jfree.data.xy.XYDataset;
+import org.txm.ca.core.functions.CA;
+import org.txm.ca.core.messages.CACoreMessages;
+import org.txm.statsengine.core.StatException;
+
+/**
+ * XY data set for storing coordinates and frequencies of CA plots.  
+ * @author sjacquot
+ *
+ */
+// TODO: some CA data are duplicated in this data set. We could directly use the CA methods here
+// rather than copy some data but the performances due off access may be altered, however we would gain memory.
+public class CAXYDataset extends AbstractXYDataset implements XYDataset { 
+
+	/**
+	 * The linked CA result.
+	 */
+	protected CA ca;
+	
+	/**
+	 * The row labels.
+	 */
+	protected String[] rowLabels;
+	
+	/**
+	 * The column labels.
+	 */
+	protected String[] columnLabels;
+	
+	
+	/**
+	 * The row coordinates. 
+	 */
+	protected double rowCoordinates[][];
+	
+	/**
+	 * The column coordinates.
+	 */
+	protected double columnCoordinates[][];
+	
+	
+	/**
+	 * The row frequencies.	
+	 */
+	protected int[] rowFrequencies;
+	
+	
+	/**
+	 * The column frequencies. 
+	 */
+	protected int[] columnFrequencies;
+
+	/**
+	 * First axis for point coordinates.
+	 */
+	protected int axis1;
+
+	/**
+	 * Second axis for point coordinates.
+	 */
+	protected int axis2;
+
+
+	/**
+	 * Creates a data set from the specified CA result.
+	 * @param ca
+	 * @throws StatException 
+	 */
+	public CAXYDataset(CA ca) throws Exception {
+
+		this.ca = ca;
+		
+		// Axis/dimensions
+		this.axis1 = ca.getFirstDimension() - 1;
+		this.axis2 = ca.getSecondDimension() - 1;
+		
+		// Labels
+		this.rowLabels = ca.getRowNames();
+		this.columnLabels = ca.getColNames();
+
+		// Coordinates
+		this.rowCoordinates = ca.getRowsCoords();
+		this.columnCoordinates = ca.getColsCoords();
+
+		// Frequencies
+		this.rowFrequencies = ca.getLexicalTable().getRowMarginsVector().asIntArray();
+		this.columnFrequencies = ca.getLexicalTable().getColMarginsVector().asIntArray();
+
+	}
+
+
+	@Override
+	public Number getX(int series, int item) {
+		if(item == -1)	{
+			System.out.println("CAXYDataset.getX()");
+		}
+		// Rows
+		if(series == 0) {
+			return this.rowCoordinates[item][this.axis1];
+		}
+		// Cols
+		else {
+			return this.columnCoordinates[item][this.axis1];
+		}
+	}
+
+	@Override
+	public Number getY(int series, int item) {
+		// Rows
+		if(series == 0) {
+			return this.rowCoordinates[item][this.axis2];
+		}
+		// Cols
+		else {
+			return this.columnCoordinates[item][this.axis2];
+		}
+
+	}
+
+
+	/**
+	 * Gets the maximum X coordinates value in the specified series.
+	 * @param series
+	 * @return
+	 */
+	public double getMaxX(int series)	{
+		return this.getMaxValue(series, this.axis1);
+	}
+	
+
+	/**
+	 * Gets the maximum Y coordinates value in the specified series.
+	 * @param series
+	 * @return
+	 */
+	public double getMaxY(int series)	{
+		return this.getMaxValue(series, this.axis2);
+	}
+
+
+	/**
+	 * Gets the maximum value in the specified series according to the specified axis.
+	 * @param series
+	 * @param axis
+	 * @return
+	 */
+	public double getMaxValue(int series, int axis)	{
+
+		double maxValue = 0;
+		double tmpMaxValue;
+
+		double[][] coordinates = this.rowCoordinates;
+		if(series != 0)	{
+			coordinates = this.columnCoordinates;
+		}
+		
+		for(int i = 0; i < coordinates.length; i++) {
+			tmpMaxValue = coordinates[i][axis];
+			if(tmpMaxValue > maxValue)	{
+				maxValue = tmpMaxValue;
+			}
+		}
+
+		return maxValue;
+	}
+	
+	
+	
+	/**
+	 * Gets the minimum X coordinates value in the specified series.
+	 * @param series
+	 * @return
+	 */
+	public double getMinX(int series)	{
+		return this.getMinValue(series, this.axis1);
+	}
+	
+
+	/**
+	 * Gets the minimum Y coordinates value in the specified series.
+	 * @param series
+	 * @return
+	 */
+	public double getMinY(int series)	{
+		return this.getMinValue(series, this.axis2);
+	}
+
+	
+	/**
+	 * Gets the minimum value in the specified series according to the specified axis.
+	 * @param series
+	 * @param axis
+	 * @return
+	 */
+	public double getMinValue(int series, int axis)	{
+
+		double minValue = 0;
+		double tmpMinValue;
+
+		double[][] coordinates = this.rowCoordinates;
+		if(series != 0)	{
+			coordinates = this.columnCoordinates;
+		}
+		
+		for(int i = 0; i < coordinates.length; i++) {
+			tmpMinValue = coordinates[i][axis];
+			if(tmpMinValue < minValue)	{
+				minValue = tmpMinValue;
+			}
+		}
+
+		return minValue;
+	}
+	
+	
+	@Override
+	public int getSeriesCount() {
+		return 2;
+	}
+
+	@Override
+	public int getItemCount(int series) {
+		// Rows
+		if(series == 0) {
+			return this.rowCoordinates.length;
+		}
+		// Cols
+		else {
+			return this.columnCoordinates.length;
+		}
+	}
+
+	/**
+	 * Gets the key of the specified series.
+	 */
+	public Comparable getSeriesKey(int series) {
+		// Rows
+		if(series == 0) {
+			return CACoreMessages.rows;
+		}
+		// Cols
+		else {
+			return CACoreMessages.columns;
+		}
+	}
+
+	/**
+	 * Gets the label of a point.
+	 * @param series
+	 * @param item
+	 * @return
+	 */
+	public String getLabel(int series, int item) {
+		// Rows
+		if(series == 0) {
+			return this.rowLabels[item];
+		}
+		// Cols
+		else {
+			return this.columnLabels[item];
+		}
+	}
+
+	
+	/**
+	 * Gets the indices of point from their labels.
+	 * @param series
+	 * @param label
+	 * @return
+	 */
+	public int[] getLabelIndices(int series, String[] labels)	{
+		int[] indices = new int[labels.length];
+	
+		// Rows
+		if(series == 0) {
+			for(int i = 0, j = 0; i < this.rowLabels.length; i++) {
+				for(int k = 0; k < labels.length; k++) {
+					if(this.rowLabels[i].equals(labels[k]))	{
+						indices[j++] = i;
+					}
+				}
+			}
+		}
+		// Cols
+		else {
+			for(int i = 0, j = 0; i < this.columnLabels.length; i++) {
+				for(int k = 0; k < labels.length; k++) {
+					if(this.columnLabels[i].equals(labels[k]))	{
+						indices[j++] = i;
+					}
+				}
+			}
+		}
+		
+		return indices;
+	}
+	
+	/**
+	 * Gets the indices of point from their labels keeping the specified label order.
+	 * @param series
+	 * @param labels
+	 * @return
+	 */
+	public int[] getOrderedLabelIndices(int series, String[] labels)	{
+		int[] indices = new int[labels.length];
+		
+		// Rows
+		if(series == 0) {
+			for(int i = 0, k = 0; i < labels.length; i++) {
+				for(int j = 0; j < this.rowLabels.length; j++) {
+					if(this.rowLabels[j].equals(labels[i]))	{
+						indices[k++] = j;
+						continue;
+					}
+				}
+			}
+		}
+		// Cols
+		else {
+			for(int i = 0, k = 0; i < labels.length; i++) {
+				for(int j = 0; j < this.columnLabels.length; j++) {
+					if(this.columnLabels[j].equals(labels[i]))	{
+						indices[k++] = j;
+						continue;
+					}
+				}
+			}
+		}
+		
+		return indices;
+	}
+	
+	
+	
+	/**
+	 * Gets the frequency of the specified series and items.
+	 * If <code>series</code> is equal to 0, the method returns the frequency of the specified row, otherwise the sum of the occurrences of the specified column.
+	 * @param series
+	 * @param item
+	 * @return
+	 */
+	public String getFrequency(int series, int item) {
+		// Rows
+		if(series == 0) {
+			return String.valueOf(this.rowFrequencies[item]);
+		}
+		// Columns
+		else {
+			return String.valueOf(this.columnFrequencies[item]);
+		}
+	}
+
+	/**
+	 * @param axis1 the axis1 to set
+	 */
+	public void setAxis1(int axis1) {
+		this.axis1 = axis1 - 1;
+	}
+
+	/**
+	 * @param axis2 the axis2 to set
+	 */
+	public void setAxis2(int axis2) {
+		this.axis2 = axis2 - 1;
+	}
+
 }
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java	(revision 1335)
@@ -37,11 +37,11 @@
 			double[] singularValues = ca.getValeursPropres();
 
 			for(int i = 0; i < singularValues.length; i++) {
-				dataset.setValue(singularValues[i], CACoreMessages.charts_singularValues_tooltipYLabel, String.valueOf(i + 1));
+				dataset.setValue(singularValues[i], CACoreMessages.eigenvalue, String.valueOf(i + 1));
 			}
 
 			// Create the chart
-			chart = this.getChartsEngine().createCategoryBarChart(dataset, CACoreMessages.charts_singularValues_title, CACoreMessages.charts_singularValues_xAxisLabel, CACoreMessages.charts_singularValues_yAxisLabel, false, false, false);
+			chart = this.getChartsEngine().createCategoryBarChart(dataset, CACoreMessages.eigenvalues, CACoreMessages.axis, CACoreMessages.eigenvalue, false, false, false);
 
 			// Custom renderer
 			chart.getCategoryPlot().setRenderer(new CASingularValuesItemSelectionRenderer(ca));
@@ -52,7 +52,7 @@
 
 		}
 		catch(StatException e) {
-			Log.severe(CACoreMessages.charts_error_singularValues_cantCreateSingularValuesChart + e);
+			Log.severe(CACoreMessages.cantCreateBarChartOfTheCASingularValues + e);
 			Log.printStackTrace(e);
 		}
 
@@ -69,4 +69,4 @@
 
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCCAChartCreator.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCCAChartCreator.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCCAChartCreator.java	(revision 1335)
@@ -273,8 +273,8 @@
 		 try {
 			 double sinuglarValuesSum = ca.getValeursPropresSum();
 			 DecimalFormat f = new DecimalFormat("###.00"); //$NON-NLS-1$
-			 ((JFreeChart) chart).getXYPlot().getDomainAxis().setLabel(CACoreMessages.charts_factorialMap_axisLabelPrefix + " " + dimension1 + " (" + f.format(100 * ca.getValeursPropres()[dimension1 - 1] / sinuglarValuesSum) + "%)");
-			 ((JFreeChart) chart).getXYPlot().getRangeAxis().setLabel(CACoreMessages.charts_factorialMap_axisLabelPrefix + " " + dimension2 + " (" + f.format(100 * ca.getValeursPropres()[dimension2 - 1] / sinuglarValuesSum) + "%)");
+			 ((JFreeChart) chart).getXYPlot().getDomainAxis().setLabel(CACoreMessages.axis + " " + dimension1 + " (" + f.format(100 * ca.getValeursPropres()[dimension1 - 1] / sinuglarValuesSum) + "%)");
+			 ((JFreeChart) chart).getXYPlot().getRangeAxis().setLabel(CACoreMessages.axis + " " + dimension2 + " (" + f.format(100 * ca.getValeursPropres()[dimension2 - 1] / sinuglarValuesSum) + "%)");
 
 			 // Refresh data set
 			 // FIXME : any way to fire a data set event rather than reassign the same data set?
@@ -361,4 +361,4 @@
 
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CAItemSelectionRenderer.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CAItemSelectionRenderer.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CAItemSelectionRenderer.java	(revision 1335)
@@ -1,303 +1,303 @@
-package org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.labels.XYItemLabelGenerator;
-import org.jfree.chart.labels.XYToolTipGenerator;
-import org.jfree.chart.title.LegendTitle;
-import org.jfree.data.xy.XYDataset;
-import org.txm.ca.core.chartsengine.jfreechart.datasets.CAXYDataset;
-import org.txm.ca.core.functions.CA;
-import org.txm.ca.core.messages.CACoreMessages;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.base.BlockRoundBorder;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionXYLineAndShapeRenderer;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for CA charts.
- * @author sjacquot
- *
- */
-public class CAItemSelectionRenderer extends ItemSelectionXYLineAndShapeRenderer {
-
-	
-
-	/**
-	 * Creates a renderer dedicated to CA charts.
-	 */
-	public CAItemSelectionRenderer(CA ca, JFreeChart chart) {
-		super(ca, chart);
-	}
-
-
-	@Override
-	public void init()	{
-    	this.setBaseLinesVisible(false);
-    	this.setBaseOutlinePaint(Color.decode("#666666"));
-
-		
-      	// Items colors (Highcharts color codes)
-        Color blue = new Color(47, 126, 216, 90);
-        this.setSeriesPaint(0, blue);
-        Color red = new Color(255, 0, 0, 90);
-        this.setSeriesPaint(1, red);
-
-        // Create the fonts
-        ((JFCChartsEngine) this.multipleItemsSelector.getResult().getChartsEngine()).getJFCTheme().createFonts(this.multipleItemsSelector.getResult());
-        
-		// Legends
-		ArrayList<Color> palette = new ArrayList<Color>(2);
-		palette.add(blue);
-		palette.add(red);
-		LegendTitle legendTitle = chart.getLegend(0);
-		if (legendTitle != null) {
-			legendTitle.setFrame(new BlockRoundBorder(Color.GRAY));
-			((JFCChartsEngine) this.multipleItemsSelector.getResult().getChartsEngine()).getJFCTheme().applyLegendDefaultSettings(legendTitle, false, false, palette);
-		}
-        
-    	// Grid
-		chart.getXYPlot().setDomainGridlineStroke(new BasicStroke(0.5f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 1f, new float[] {2f}, 0f)); // Dashed
-		chart.getXYPlot().setRangeGridlineStroke(chart.getXYPlot().getDomainGridlineStroke());
-		chart.getXYPlot().setDomainZeroBaselineVisible(true);
-		chart.getXYPlot().setRangeZeroBaselineVisible(true);
-    	
-    	// Axis
-		chart.getXYPlot().getRangeAxis().setAxisLineVisible(true);
-		chart.getXYPlot().getRangeAxis().setTickMarksVisible(true);
-		chart.getXYPlot().getDomainAxis().setVerticalTickLabels(false);
-		chart.getXYPlot().getDomainAxis().setAxisLineVisible(true);
-
-	}
-	
-	@Override
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		// Rows
-		this.setSeriesToolTipGenerator(0, new XYToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(XYDataset dataset, int series, int item) {
-
-				try {
-					// Coordinates format
-					String pattern = new String("#.##");
-					DecimalFormat format = new DecimalFormat(pattern);
-
-					// Hexadecimal color
-					Color color = (Color) getSeriesPaint(series);
-					String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-					CAXYDataset caDataset = (CAXYDataset) dataset;
-					return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p style=\"color: " + hex + "\"><b>" + caDataset.getLabel(series, item) + "</b></p><p>"
-							+ CACoreMessages.charts_factorialMap_tooltipRowsLabel + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
-					+ "<p>" +  CACoreMessages.charts_factorialMap_tooltipCoordinates + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
-				}
-				catch (Exception e) {
-				}
-				return "";
-			}
-		});
-
-		// Columns
-		this.setSeriesToolTipGenerator(1, new XYToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(XYDataset dataset, int series, int item) {
-
-				try {
-					// Coordinates format
-					String pattern = new String("#.##");
-					DecimalFormat format = new DecimalFormat(pattern);
-
-					// Hexadecimal color
-					Color color = (Color) getSeriesPaint(series);
-					String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-					CAXYDataset caDataset = (CAXYDataset) dataset;
-					// FIXME: to disable tool tip we can return null here or in other renderers generateToolTip methods
-//				return null;
-					return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p style=\"color: " + hex + "\"><b>" + caDataset.getLabel(series, item) + "</b></p><p>"
-						+ CACoreMessages.charts_factorialMap_tooltipColsLabel + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
-					+ "<p>" + CACoreMessages.charts_factorialMap_tooltipCoordinates + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
-				}
-				catch (Exception e) {
-				}
-				return "";
-			}
-		});
-
-	}
-
-
-	@Override
-	public void initItemLabelGenerator()	{
-		XYItemLabelGenerator generator = new XYItemLabelGenerator() {
-
-			@Override
-			public String generateLabel(XYDataset dataset, int series, int item) {
-				CAXYDataset caDataset = (CAXYDataset) dataset;
-				return caDataset.getLabel(series, item);
-			}
-		};
-
-		this.setBaseItemLabelGenerator(generator);
-		this.setBaseItemLabelsVisible(true);
-	}
-
-	@Override
-	public Font getItemLabelFont(int series, int item) {
-
-		// regular
-		Font font = super.getItemLabelFont(series, item);
-		font = font.deriveFont(Font.PLAIN, font.getSize());
-
-		// Change item label font size and style
-		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
-			font = font.deriveFont(Font.BOLD, font.getSize() * 1.2f);
-		}
-		return font;
-	}
-
-
-	@Override
-	public Shape getItemShape(int series, int item) {
-
-		Shape s;
-
-//		String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
-//		Font font = this.getItemLabelFont(series, item);
-//		Rectangle2D bounds = font.getStringBounds(label, ((Graphics2D) this.multipleItemsSelector.getChartPanel().getGraphics()).getFontRenderContext());
-		
-		
-		// visible shapes mode
-		if(((CA) this.multipleItemsSelector.getResult()).isShowPointShapes())	{
-
-			// Scale selected item shape
-			s = super.getItemShape(series, item);
-			
-			// Highlight selected item
-			if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
-
-				// Add a background rectangle to the label selected item
-				String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
-				Font font = this.getItemLabelFont(series, item);
-				Rectangle2D bounds = font.getStringBounds(label, ((Graphics2D) this.multipleItemsSelector.getChartPanel().getGraphics()).getFontRenderContext());
-
-				// FIXME : not rounded rectangle version
-//				Shape labelBackground = new Rectangle2D.Double(-bounds.getWidth() / 2, -s.getBounds2D().getHeight() / 2 + 1, bounds.getWidth() + 4, bounds.getHeight() / 2 + 8);
-
-				Shape labelBackground = new RoundRectangle2D.Double(-(bounds.getWidth() + 4) / 2, -s.getBounds2D().getHeight() / 2 + 1, bounds.getWidth() + 8, bounds.getHeight() / 2 + 10, 5, 5);
-
-				AffineTransform t = new AffineTransform();
-				t.setToTranslation(0,  bounds.getCenterY() - 2 - bounds.getHeight() / 2);
-				labelBackground = t.createTransformedShape(labelBackground);
-				
-				Area a = new Area(s);
-				a.add(new Area(labelBackground));
-
-				// FIXME : test de tooltip text à la main
-//				Shape tooltip = new Rectangle2D.Double(10, 10, 50, 50);
-//				GlyphVector text =  this.getBaseItemLabelFont().createGlyphVector(((Graphics2D) this.multipleItemsSelector.getChartPanel().getGraphics()).getFontRenderContext(), "testteezrezrzerzerzerzerze");
-////				t.setToTranslation(-100,  -200);
-//				Shape textShape = t.createTransformedShape(text.getOutline());
-//				a.add(new Area(tooltip));
-//				a.add(new Area(textShape));
-				
-				return a;
-			}
-
-		}
-		// non visible shapes mode, sets the shape as bounding box of the item label (essentially for the mouse selection purpose)
-		else	{
-//			String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
-//			Font font = this.getItemLabelFont(series, item);
-//			Rectangle2D bounds = font.
-//					getStringBounds(label
-//							, ((Graphics2D) this.multipleItemsSelector.
-//									getChartPanel().
-//									getGraphics()).
-//							getFontRenderContext());
-			
-			
-			String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
-			Font font = this.getItemLabelFont(series, item);
-			Rectangle2D bounds = font.getStringBounds(label, ((Graphics2D) this.multipleItemsSelector
-					.getChartPanel()
-					.getGraphics())
-					.getFontRenderContext());
-
-			
-			s = new RoundRectangle2D.Double(-(bounds.getWidth()) / 2, -bounds.getHeight() / 2, bounds.getWidth(), bounds.getHeight() - 2 , 5, 5);
-			
-			// Highlight selected item
-			if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
-				AffineTransform t = new AffineTransform();
-				t.setToScale(1.1f, 1.1f);
-				s = t.createTransformedShape(s);
-			}
-
-		}
-
-		return s;
-	}
-
-
-	@Override
-	public Paint getItemPaint(int series, int item) {
-
-		Color color = null;
-		
-		if(((CA) this.multipleItemsSelector.getResult()).isShowPointShapes())	{
-			color = (Color) super.getItemPaint(series, item);
-	
-			// Mouse over shape
-			if(this.multipleItemsSelector.isMouseOverItem(series, item)) {
-				return new Color(color.getRed(), color.getGreen(), color.getBlue(), 195);
-			}
-			// Multiple item selection
-			else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
-				return new Color(color.getRed(), color.getGreen(), color.getBlue(), 140);
-			}
-		}
-		else	{
-			
-			// Mouse over shape
-			if(this.multipleItemsSelector.isMouseOverItem(series, item)) {
-				color = new Color(255, 255, 255, 220);
-			}
-			// Multiple item selection
-			else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
-				return new Color(255, 255, 255, 140);
-			}
-			else	{
-				color = new Color(0, 0, 0, 0);	
-			}
-			
-		}
-		return color;
-	}
-
-
-	
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		this.multipleItemsSelector.setItemDrawnAtLast(this);
-	}
-
-
-
-}
+package org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.labels.XYItemLabelGenerator;
+import org.jfree.chart.labels.XYToolTipGenerator;
+import org.jfree.chart.title.LegendTitle;
+import org.jfree.data.xy.XYDataset;
+import org.txm.ca.core.chartsengine.jfreechart.datasets.CAXYDataset;
+import org.txm.ca.core.functions.CA;
+import org.txm.ca.core.messages.CACoreMessages;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.base.BlockRoundBorder;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionXYLineAndShapeRenderer;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for CA charts.
+ * @author sjacquot
+ *
+ */
+public class CAItemSelectionRenderer extends ItemSelectionXYLineAndShapeRenderer {
+
+	
+
+	/**
+	 * Creates a renderer dedicated to CA charts.
+	 */
+	public CAItemSelectionRenderer(CA ca, JFreeChart chart) {
+		super(ca, chart);
+	}
+
+
+	@Override
+	public void init()	{
+    	this.setBaseLinesVisible(false);
+    	this.setBaseOutlinePaint(Color.decode("#666666"));
+
+		
+      	// Items colors (Highcharts color codes)
+        Color blue = new Color(47, 126, 216, 90);
+        this.setSeriesPaint(0, blue);
+        Color red = new Color(255, 0, 0, 90);
+        this.setSeriesPaint(1, red);
+
+        // Create the fonts
+        ((JFCChartsEngine) this.multipleItemsSelector.getResult().getChartsEngine()).getJFCTheme().createFonts(this.multipleItemsSelector.getResult());
+        
+		// Legends
+		ArrayList<Color> palette = new ArrayList<Color>(2);
+		palette.add(blue);
+		palette.add(red);
+		LegendTitle legendTitle = chart.getLegend(0);
+		if (legendTitle != null) {
+			legendTitle.setFrame(new BlockRoundBorder(Color.GRAY));
+			((JFCChartsEngine) this.multipleItemsSelector.getResult().getChartsEngine()).getJFCTheme().applyLegendDefaultSettings(legendTitle, false, false, palette);
+		}
+        
+    	// Grid
+		chart.getXYPlot().setDomainGridlineStroke(new BasicStroke(0.5f, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND, 1f, new float[] {2f}, 0f)); // Dashed
+		chart.getXYPlot().setRangeGridlineStroke(chart.getXYPlot().getDomainGridlineStroke());
+		chart.getXYPlot().setDomainZeroBaselineVisible(true);
+		chart.getXYPlot().setRangeZeroBaselineVisible(true);
+    	
+    	// Axis
+		chart.getXYPlot().getRangeAxis().setAxisLineVisible(true);
+		chart.getXYPlot().getRangeAxis().setTickMarksVisible(true);
+		chart.getXYPlot().getDomainAxis().setVerticalTickLabels(false);
+		chart.getXYPlot().getDomainAxis().setAxisLineVisible(true);
+
+	}
+	
+	@Override
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		// Rows
+		this.setSeriesToolTipGenerator(0, new XYToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(XYDataset dataset, int series, int item) {
+
+				try {
+					// Coordinates format
+					String pattern = new String("#.##");
+					DecimalFormat format = new DecimalFormat(pattern);
+
+					// Hexadecimal color
+					Color color = (Color) getSeriesPaint(series);
+					String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+					CAXYDataset caDataset = (CAXYDataset) dataset;
+					return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p style=\"color: " + hex + "\"><b>" + caDataset.getLabel(series, item) + "</b></p><p>"
+							+ CACoreMessages.frequency + ChartsEngineCoreMessages.EMPTY + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
+					+ "<p>" +  CACoreMessages.coordinates + ChartsEngineCoreMessages.EMPTY + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
+				}
+				catch (Exception e) {
+				}
+				return "";
+			}
+		});
+
+		// Columns
+		this.setSeriesToolTipGenerator(1, new XYToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(XYDataset dataset, int series, int item) {
+
+				try {
+					// Coordinates format
+					String pattern = new String("#.##");
+					DecimalFormat format = new DecimalFormat(pattern);
+
+					// Hexadecimal color
+					Color color = (Color) getSeriesPaint(series);
+					String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+					CAXYDataset caDataset = (CAXYDataset) dataset;
+					// FIXME: to disable tool tip we can return null here or in other renderers generateToolTip methods
+//				return null;
+					return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p style=\"color: " + hex + "\"><b>" + caDataset.getLabel(series, item) + "</b></p><p>"
+						+ CACoreMessages.t + ChartsEngineCoreMessages.EMPTY + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
+					+ "<p>" + CACoreMessages.coordinates + ChartsEngineCoreMessages.EMPTY + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
+				}
+				catch (Exception e) {
+				}
+				return "";
+			}
+		});
+
+	}
+
+
+	@Override
+	public void initItemLabelGenerator()	{
+		XYItemLabelGenerator generator = new XYItemLabelGenerator() {
+
+			@Override
+			public String generateLabel(XYDataset dataset, int series, int item) {
+				CAXYDataset caDataset = (CAXYDataset) dataset;
+				return caDataset.getLabel(series, item);
+			}
+		};
+
+		this.setBaseItemLabelGenerator(generator);
+		this.setBaseItemLabelsVisible(true);
+	}
+
+	@Override
+	public Font getItemLabelFont(int series, int item) {
+
+		// regular
+		Font font = super.getItemLabelFont(series, item);
+		font = font.deriveFont(Font.PLAIN, font.getSize());
+
+		// Change item label font size and style
+		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
+			font = font.deriveFont(Font.BOLD, font.getSize() * 1.2f);
+		}
+		return font;
+	}
+
+
+	@Override
+	public Shape getItemShape(int series, int item) {
+
+		Shape s;
+
+//		String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
+//		Font font = this.getItemLabelFont(series, item);
+//		Rectangle2D bounds = font.getStringBounds(label, ((Graphics2D) this.multipleItemsSelector.getChartPanel().getGraphics()).getFontRenderContext());
+		
+		
+		// visible shapes mode
+		if(((CA) this.multipleItemsSelector.getResult()).isShowPointShapes())	{
+
+			// Scale selected item shape
+			s = super.getItemShape(series, item);
+			
+			// Highlight selected item
+			if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
+
+				// Add a background rectangle to the label selected item
+				String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
+				Font font = this.getItemLabelFont(series, item);
+				Rectangle2D bounds = font.getStringBounds(label, ((Graphics2D) this.multipleItemsSelector.getChartPanel().getGraphics()).getFontRenderContext());
+
+				// FIXME : not rounded rectangle version
+//				Shape labelBackground = new Rectangle2D.Double(-bounds.getWidth() / 2, -s.getBounds2D().getHeight() / 2 + 1, bounds.getWidth() + 4, bounds.getHeight() / 2 + 8);
+
+				Shape labelBackground = new RoundRectangle2D.Double(-(bounds.getWidth() + 4) / 2, -s.getBounds2D().getHeight() / 2 + 1, bounds.getWidth() + 8, bounds.getHeight() / 2 + 10, 5, 5);
+
+				AffineTransform t = new AffineTransform();
+				t.setToTranslation(0,  bounds.getCenterY() - 2 - bounds.getHeight() / 2);
+				labelBackground = t.createTransformedShape(labelBackground);
+				
+				Area a = new Area(s);
+				a.add(new Area(labelBackground));
+
+				// FIXME : test de tooltip text à la main
+//				Shape tooltip = new Rectangle2D.Double(10, 10, 50, 50);
+//				GlyphVector text =  this.getBaseItemLabelFont().createGlyphVector(((Graphics2D) this.multipleItemsSelector.getChartPanel().getGraphics()).getFontRenderContext(), "testteezrezrzerzerzerzerze");
+////				t.setToTranslation(-100,  -200);
+//				Shape textShape = t.createTransformedShape(text.getOutline());
+//				a.add(new Area(tooltip));
+//				a.add(new Area(textShape));
+				
+				return a;
+			}
+
+		}
+		// non visible shapes mode, sets the shape as bounding box of the item label (essentially for the mouse selection purpose)
+		else	{
+//			String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
+//			Font font = this.getItemLabelFont(series, item);
+//			Rectangle2D bounds = font.
+//					getStringBounds(label
+//							, ((Graphics2D) this.multipleItemsSelector.
+//									getChartPanel().
+//									getGraphics()).
+//							getFontRenderContext());
+			
+			
+			String label = ((CAXYDataset) this.getPlot().getDataset()).getLabel(series, item);
+			Font font = this.getItemLabelFont(series, item);
+			Rectangle2D bounds = font.getStringBounds(label, ((Graphics2D) this.multipleItemsSelector
+					.getChartPanel()
+					.getGraphics())
+					.getFontRenderContext());
+
+			
+			s = new RoundRectangle2D.Double(-(bounds.getWidth()) / 2, -bounds.getHeight() / 2, bounds.getWidth(), bounds.getHeight() - 2 , 5, 5);
+			
+			// Highlight selected item
+			if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
+				AffineTransform t = new AffineTransform();
+				t.setToScale(1.1f, 1.1f);
+				s = t.createTransformedShape(s);
+			}
+
+		}
+
+		return s;
+	}
+
+
+	@Override
+	public Paint getItemPaint(int series, int item) {
+
+		Color color = null;
+		
+		if(((CA) this.multipleItemsSelector.getResult()).isShowPointShapes())	{
+			color = (Color) super.getItemPaint(series, item);
+	
+			// Mouse over shape
+			if(this.multipleItemsSelector.isMouseOverItem(series, item)) {
+				return new Color(color.getRed(), color.getGreen(), color.getBlue(), 195);
+			}
+			// Multiple item selection
+			else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
+				return new Color(color.getRed(), color.getGreen(), color.getBlue(), 140);
+			}
+		}
+		else	{
+			
+			// Mouse over shape
+			if(this.multipleItemsSelector.isMouseOverItem(series, item)) {
+				color = new Color(255, 255, 255, 220);
+			}
+			// Multiple item selection
+			else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
+				return new Color(255, 255, 255, 140);
+			}
+			else	{
+				color = new Color(0, 0, 0, 0);	
+			}
+			
+		}
+		return color;
+	}
+
+
+	
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		this.multipleItemsSelector.setItemDrawnAtLast(this);
+	}
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java	(revision 1334)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java	(revision 1335)
@@ -1,77 +1,77 @@
-package org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers;
-
-import java.awt.Color;
-import java.text.DecimalFormat;
-import java.util.List;
-
-import org.jfree.chart.labels.CategoryToolTipGenerator;
-import org.jfree.data.category.CategoryDataset;
-import org.jfree.data.category.DefaultCategoryDataset;
-import org.txm.ca.core.functions.CA;
-import org.txm.ca.core.messages.CACoreMessages;
-import org.txm.chartsengine.core.ChartsEngine;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionCategoryBarRenderer;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for CA singular values bar charts.
- * @author sjacquot
- *
- */
-public class CASingularValuesItemSelectionRenderer extends ItemSelectionCategoryBarRenderer {
-
-
-	/**
-	 * Percent values number format.
-	 */
-	protected DecimalFormat percentValuesNumberFormat;
-
-
-	/**
-	 * Creates a renderer dedicated to CA charts.
-	 */
-	public CASingularValuesItemSelectionRenderer(CA ca) {
-		super();
-		this.mouseOverItemSelector.setResult(ca);
-		this.percentValuesNumberFormat = new DecimalFormat("#.00");
-	}
-
-
-
-	@Override
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(CategoryDataset dataset, int row, int column) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(row);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
-				Number value = catDataset.getValue(row, column);
-
-
-				CA ca = (CA) getItemsSelector().getResult();
-				List<List<Object>> singularValuesData = ca.getSingularValuesInfos();
-
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>#" + catDataset.getColumnKey(column) + "</p>"
-						+ "<p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + ChartsEngineCoreMessages.charts_labelValueSeparator
-							+ " </span><b>" + valuesNumberFormat.format(value) + "</b></p>"
-						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipPercent + ChartsEngineCoreMessages.charts_labelValueSeparator
-							+ " </span><b>" + percentValuesNumberFormat.format(singularValuesData.get(column).get(2)) + "</b></p>"
-						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipSum + CACoreMessages.charts_singularValues_tooltipPercent
-							+ ChartsEngineCoreMessages.charts_labelValueSeparator
-							+ " </span><b>" + percentValuesNumberFormat.format(singularValuesData.get(column).get(3)) + "</b></p>"
-						+ "</body><html>";
-			}
-		});
-	}
-
-
-
-}
+package org.txm.ca.core.chartsengine.jfreechart.themes.highcharts.renderers;
+
+import java.awt.Color;
+import java.text.DecimalFormat;
+import java.util.List;
+
+import org.jfree.chart.labels.CategoryToolTipGenerator;
+import org.jfree.data.category.CategoryDataset;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.txm.ca.core.functions.CA;
+import org.txm.ca.core.messages.CACoreMessages;
+import org.txm.chartsengine.core.ChartsEngine;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers.ItemSelectionCategoryBarRenderer;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for CA singular values bar charts.
+ * @author sjacquot
+ *
+ */
+public class CASingularValuesItemSelectionRenderer extends ItemSelectionCategoryBarRenderer {
+
+
+	/**
+	 * Percent values number format.
+	 */
+	protected DecimalFormat percentValuesNumberFormat;
+
+
+	/**
+	 * Creates a renderer dedicated to CA charts.
+	 */
+	public CASingularValuesItemSelectionRenderer(CA ca) {
+		super();
+		this.mouseOverItemSelector.setResult(ca);
+		this.percentValuesNumberFormat = new DecimalFormat("#.00");
+	}
+
+
+
+	@Override
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(CategoryDataset dataset, int row, int column) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(row);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
+				Number value = catDataset.getValue(row, column);
+
+
+				CA ca = (CA) getItemsSelector().getResult();
+				List<List<Object>> singularValuesData = ca.getSingularValuesInfos();
+
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>#" + catDataset.getColumnKey(column) + "</p>"
+						+ "<p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + ChartsEngineCoreMessages.EMPTY
+							+ " </span><b>" + valuesNumberFormat.format(value) + "</b></p>"
+						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.percent + ChartsEngineCoreMessages.EMPTY
+							+ " </span><b>" + percentValuesNumberFormat.format(singularValuesData.get(column).get(2)) + "</b></p>"
+						+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipSum + CACoreMessages.percent
+							+ ChartsEngineCoreMessages.EMPTY
+							+ " </span><b>" + percentValuesNumberFormat.format(singularValuesData.get(column).get(3)) + "</b></p>"
+						+ "</body><html>";
+			}
+		});
+	}
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java
===================================================================
--- tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java	(revision 1334)
+++ tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/preferences/PropertiesPreferencePage.java	(revision 1335)
@@ -57,8 +57,8 @@
 	public void createFieldEditors() {
 		
 		// The maximum number of word property values to display
-		IntegerFieldEditor maxValue = new IntegerFieldEditor(PropertiesPreferences.MAX_PROPERTIES_TO_DISPLAY, PropertiesUIMessages.Max_Value_To_Display, this.getFieldEditorParent());
+		IntegerFieldEditor maxValue = new IntegerFieldEditor(PropertiesPreferences.MAX_PROPERTIES_TO_DISPLAY, PropertiesUIMessages.maximumValuesToDisplay, this.getFieldEditorParent());
 		maxValue.setValidRange(1, 9999);
 		this.addField(maxValue);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java
===================================================================
--- tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java	(revision 1334)
+++ tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/PropertiesUIMessages.java	(revision 1335)
@@ -14,19 +14,19 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.properties.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String editor_button_apply;
+	public static String apply; 
 
-	public static String editor_composite_edit_properties;
+	public static String editProperties; 
 
-	public static String editor_label_description;
+	public static String descriptionDDot; 
 
-	public static String editor_label_name;
+	public static String displayedNameDDot; 
 
-	public static String editor_label_v_max;
+	public static String vMax; 
 
-	public static String editor_tooltip_v_max;
+	public static String theMaximumNumberOfWordPropertyValuesToShow; 
 
-	public static String Max_Value_To_Display;
+	public static String maximumValuesToDisplay; 
 
 	
 	static {
Index: tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages.properties	(revision 1335)
@@ -1,8 +1,9 @@
-editor_composite_edit_properties=edit properties
-editor_label_description=Description: 
-editor_label_name=Displayed name: 
-editor_label_v_max=V max
-editor_tooltip_v_max=The maximum number of word property values to show
-
-editor_button_apply=Apply
-Max_Value_To_Display = Maximum values to display
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+apply=Apply
+descriptionDDot=Description\: 
+displayedNameDDot=Displayed name\: 
+editProperties=edit properties
+maximumValuesToDisplay=Maximum values to display
+theMaximumNumberOfWordPropertyValuesToShow=The maximum number of word property values to show
+vMax=V max
Index: tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-Max_Value_To_Display = Число отображаемых значений свойства
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+maximumValuesToDisplay=Число отображаемых значений свойства
Index: tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-Max_Value_To_Display = Nombre de valeurs de propriété à afficher
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+maximumValuesToDisplay=Nombre de valeurs de propriété à afficher
Index: tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/editors/PropertiesEditor.java
===================================================================
--- tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/editors/PropertiesEditor.java	(revision 1334)
+++ tmp/org.txm.properties.rcp/src/org/txm/properties/rcp/editors/PropertiesEditor.java	(revision 1335)
@@ -62,27 +62,27 @@
 		Composite parametersArea = this.getExtendedParametersGroup();
 
 		// label
-		new Label(parametersArea, SWT.NONE).setText(PropertiesUIMessages.editor_label_v_max);
+		new Label(parametersArea, SWT.NONE).setText(PropertiesUIMessages.vMax);
 
 		// spinner
 		this.maxPropertiesToDisplay = new Spinner(parametersArea, SWT.BORDER);
-		this.maxPropertiesToDisplay.setToolTipText(PropertiesUIMessages.editor_tooltip_v_max);
+		this.maxPropertiesToDisplay.setToolTipText(PropertiesUIMessages.theMaximumNumberOfWordPropertyValuesToShow);
 		this.maxPropertiesToDisplay.setMinimum(0);
 		RowData gdata = new RowData();
 		gdata.width = 100;
 		this.maxPropertiesToDisplay.setLayoutData(gdata);
 		this.maxPropertiesToDisplay.addSelectionListener(new ComputeSelectionListener(this));
 
-		Group editComposite = this.getTopToolbar().installGroup(PropertiesUIMessages.editor_composite_edit_properties, PropertiesUIMessages.editor_composite_edit_properties, null, null, false);
+		Group editComposite = this.getTopToolbar().installGroup(PropertiesUIMessages.editProperties, PropertiesUIMessages.editProperties, null, null, false);
 		editComposite.setLayout(GLComposite.createDefaultLayout(3));
 
 		Label nameLabel = new Label(editComposite, SWT.NONE);
-		nameLabel.setText(PropertiesUIMessages.editor_label_name);
+		nameLabel.setText(PropertiesUIMessages.displayedNameDDot);
 
 		nameText = new Text(editComposite, SWT.BORDER);
 		nameText.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		nameSaveButton = new Button(editComposite, SWT.PUSH);
-		nameSaveButton.setText(PropertiesUIMessages.editor_button_apply);
+		nameSaveButton.setText(PropertiesUIMessages.apply);
 		nameSaveButton.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -99,12 +99,12 @@
 		});
 
 		Label descLabel = new Label(editComposite, SWT.NONE);
-		descLabel.setText(PropertiesUIMessages.editor_label_description);
+		descLabel.setText(PropertiesUIMessages.descriptionDDot);
 
 		descriptionText = new StyledText(editComposite, SWT.BORDER | SWT.V_SCROLL);
 		descriptionText.setLayoutData(GridDataFactory.fillDefaults().hint(400, 100).minSize(400, 100).span(1, 2).create());
 		descriptionSaveButton = new Button(editComposite, SWT.PUSH);
-		descriptionSaveButton.setText(PropertiesUIMessages.editor_button_apply);
+		descriptionSaveButton.setText(PropertiesUIMessages.apply);
 		descriptionSaveButton.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -151,4 +151,4 @@
 	public void updateResultFromEditor() {
 		// nothing to do
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.translate.rcp/report.txt
===================================================================
--- tmp/org.txm.translate.rcp/report.txt	(revision 1334)
+++ tmp/org.txm.translate.rcp/report.txt	(revision 1335)
@@ -1,40 +1,40 @@
 /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java
-	218	Log.warning(KRAnnotationUIMessages.KRAnnotation_4+typesList);
-	518	Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
-	613	Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
-	691	System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
-	725	KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
-	736	Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
-	786	String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-	789	message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
-	793	message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
-	795	message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
-	815	System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
+	218	Log.warning(KRAnnotationUIMessages.availableAnnotationTypesDDot+typesList);
+	518	Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceDDot+e1);
+	613	Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceSelectionDDot+e);
+	691	System.out.println(KRAnnotationUIMessages.errorWhileDeletingAnnotationDDot+e1);
+	725	KRAnnotationUIMessages.youAreAboutToAnnotate+matches.size()+KRAnnotationUIMessages.elementsContinue);
+	736	Log.warning(KRAnnotationUIMessages.lookingForTypedValueWithIdEquals+svalue);
+	786	String message = KRAnnotationUIMessages.couldNotAnnotateTheValue+value_to_add.getStandardName()+
+	789	message += KRAnnotationUIMessages.theSequence+m+KRAnnotationUIMessages.isOverlappingWith;
+	793	message += KRAnnotationUIMessages.theEndOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+	795	message += KRAnnotationUIMessages.theStartOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+	815	System.out.println(KRAnnotationUIMessages.errorWhileAffectionAnnotationDDot+e1);
 /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java
-	198	Log.warning(KRAnnotationUIMessages.SimpleKRAnnotation_4+typesList);
-	333	Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
-	406	Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
-	478	System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
-	511	KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
-	522	Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
-	564	Log.info(KRAnnotationUIMessages.ConcordancesEditor_59+value_to_add+KRAnnotationUIMessages.ConcordancesEditor_60+matches);
-	572	String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-	575	message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
-	579	message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
-	581	message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
-	598	System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
+	198	Log.warning(KRAnnotationUIMessages.availableAnnotationTypesDDot+typesList);
+	333	Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceDDot+e1);
+	406	Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceSelectionDDot+e);
+	478	System.out.println(KRAnnotationUIMessages.errorWhileDeletingAnnotationDDot+e1);
+	511	KRAnnotationUIMessages.youAreAboutToAnnotate+matches.size()+KRAnnotationUIMessages.elementsContinue);
+	522	Log.warning(KRAnnotationUIMessages.lookingForTypedValueWithIdEquals+svalue);
+	564	Log.info(KRAnnotationUIMessages.aFFECT+value_to_add+KRAnnotationUIMessages.toSELECTIONEquals+matches);
+	572	String message = KRAnnotationUIMessages.couldNotAnnotateTheValue+value_to_add.getStandardName()+
+	575	message += KRAnnotationUIMessages.theSequence+m+KRAnnotationUIMessages.isOverlappingWith;
+	579	message += KRAnnotationUIMessages.theEndOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+	581	message += KRAnnotationUIMessages.theStartOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+	598	System.out.println(KRAnnotationUIMessages.errorWhileAffectionAnnotationDDot+e1);
 /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java
-	173	KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
-	184	Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
-	213	String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-	216	message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
-	220	message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
-	222	message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
-	242	System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
-	279	System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
-	308	Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
-	410	Log.warning(KRAnnotationUIMessages.WordAnnotationToolbar_10+typesList);
-	534	Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
+	173	KRAnnotationUIMessages.youAreAboutToAnnotate+matches.size()+KRAnnotationUIMessages.elementsContinue);
+	184	Log.warning(KRAnnotationUIMessages.lookingForTypedValueWithIdEquals+svalue);
+	213	String message = KRAnnotationUIMessages.couldNotAnnotateTheValue+value_to_add.getStandardName()+
+	216	message += KRAnnotationUIMessages.theSequence+m+KRAnnotationUIMessages.isOverlappingWith;
+	220	message += KRAnnotationUIMessages.theEndOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+	222	message += KRAnnotationUIMessages.theStartOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+	242	System.out.println(KRAnnotationUIMessages.errorWhileAffectionAnnotationDDot+e1);
+	279	System.out.println(KRAnnotationUIMessages.errorWhileDeletingAnnotationDDot+e1);
+	308	Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceSelectionDDot+e);
+	410	Log.warning(KRAnnotationUIMessages.availableAnnotationTypesDDot+typesList);
+	534	Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceDDot+e1);
 /home/mdecorde/workspace047/org.txm.annotation.urs.rcp/src/org/txm/annotation/urs/URSCorpora.java
 	46	System.out.println(Messages.URSCorpora_3+fichierCorpus);
 	53	System.out.println(Messages.URSCorpora_4+fichierCorpus);
@@ -113,25 +113,25 @@
 	142	System.out.println(Messages.NavigationField_2+identifiantCombo.getText());
 	149	System.out.println(Messages.NavigationField_3+identifiantCombo.getText());
 /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCCAChartCreator.java
-	276	((JFreeChart) chart).getXYPlot().getDomainAxis().setLabel(CACoreMessages.charts_factorialMap_axisLabelPrefix + " " + dimension1 + " (" + f.format(100 * ca.getValeursPropres()[dimension1 - 1] / sinuglarValuesSum) + "%)");
-	277	((JFreeChart) chart).getXYPlot().getRangeAxis().setLabel(CACoreMessages.charts_factorialMap_axisLabelPrefix + " " + dimension2 + " (" + f.format(100 * ca.getValeursPropres()[dimension2 - 1] / sinuglarValuesSum) + "%)");
+	276	((JFreeChart) chart).getXYPlot().getDomainAxis().setLabel(CACoreMessages.axis + " " + dimension1 + " (" + f.format(100 * ca.getValeursPropres()[dimension1 - 1] / sinuglarValuesSum) + "%)");
+	277	((JFreeChart) chart).getXYPlot().getRangeAxis().setLabel(CACoreMessages.axis + " " + dimension2 + " (" + f.format(100 * ca.getValeursPropres()[dimension2 - 1] / sinuglarValuesSum) + "%)");
 /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java
-	55	Log.severe(CACoreMessages.charts_error_singularValues_cantCreateSingularValuesChart + e);
+	55	Log.severe(CACoreMessages.cantCreateBarChartOfTheCASingularValues + e);
 /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CAItemSelectionRenderer.java
-	106	+ CACoreMessages.charts_factorialMap_tooltipRowsLabel + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
-	107	+ "<p>" +  CACoreMessages.charts_factorialMap_tooltipCoordinates + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
-	134	+ CACoreMessages.charts_factorialMap_tooltipColsLabel + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
-	135	+ "<p>" + CACoreMessages.charts_factorialMap_tooltipCoordinates + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
+	106	+ CACoreMessages.frequency + ChartsEngineCoreMessages.EMPTY + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
+	107	+ "<p>" +  CACoreMessages.coordinates + ChartsEngineCoreMessages.EMPTY + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
+	134	+ CACoreMessages.t + ChartsEngineCoreMessages.EMPTY + " <b>" + caDataset.getFrequency(series, item).replace("-", "") + "</b></p>"
+	135	+ "<p>" + CACoreMessages.coordinates + ChartsEngineCoreMessages.EMPTY + " <b>[" + format.format(caDataset.getX(series, item)) + ":" + format.format(caDataset.getY(series, item)) + "]</b></p></body><html>";
 /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java
-	65	+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipPercent + ChartsEngineCoreMessages.charts_labelValueSeparator
-	67	+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipSum + CACoreMessages.charts_singularValues_tooltipPercent
+	65	+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.percent + ChartsEngineCoreMessages.EMPTY
+	67	+ "<p><span style=\"color: " + hex + ";\">" + CACoreMessages.charts_singularValues_tooltipSum + CACoreMessages.percent
 /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RCAChartCreator.java
-	69	Log.severe(CACoreMessages.bind(CACoreMessages.charts_error_factorialMap_cantCreateCAChartFile + " - FactoMineR package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
-	113	Log.severe(CACoreMessages.bind(CACoreMessages.charts_error_factorialMap_cantCreateCAChartFile + " - CA package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
+	69	Log.severe(CACoreMessages.bind(CACoreMessages.cantCreateCAChartFileChartsEngineDDotP0 + " - FactoMineR package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
+	113	Log.severe(CACoreMessages.bind(CACoreMessages.cantCreateCAChartFileChartsEngineDDotP0 + " - CA package", RChartsEngine.DESCRIPTION) + e); //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java
-	58	+ CACoreMessages.charts_singularValues_title + "\", ylab=\"" + //$NON-NLS-1$
-	59	CACoreMessages.charts_singularValues_yAxisLabel + "\", xlab=\"" + //$NON-NLS-1$
-	60	CACoreMessages.charts_singularValues_xAxisLabel + "\", names.arg=" + xLabels + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
+	58	+ CACoreMessages.eigenvalues + "\", ylab=\"" + //$NON-NLS-1$
+	59	CACoreMessages.eigenvalue + "\", xlab=\"" + //$NON-NLS-1$
+	60	CACoreMessages.axis + "\", names.arg=" + xLabels + ");\n"; //$NON-NLS-1$ //$NON-NLS-2$
 /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/functions/CA.java
 	399	colnames.add(CACoreMessages.common_cont+ (c + 1)); // ContribN
 	400	colnames.add(CACoreMessages.common_cos2+ (c + 1)); // Cos²N
@@ -161,503 +161,503 @@
 	442	throw new StatException(CACoreMessages.error_unableToExtractSingularValues + e.getMessage(), e);
 	457	System.out.println(CACoreMessages.error_canNotLoadCALibrary+ e);
 /home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java
-	246	System.out.println(CAUIMessages.CaEditor_0 + e1);
-	257	System.out.println(CAUIMessages.CaEditor_0 + e);
+	246	System.out.println(CAUIMessages.errorWhileOpeningCAEditorDDot + e1);
+	257	System.out.println(CAUIMessages.errorWhileOpeningCAEditorDDot + e);
 	375	"%", CAUIMessages.CorrespondanceAnalysisEditorInput_11 + "%", "", ""}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 /home/mdecorde/workspace047/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java
 	414	Log.severe(ChartsEngineCoreMessages.error_cantCreateTmpChartFile + e);
 	420	Log.severe(ChartsEngineCoreMessages.error_cantWriteInFile + file);
 /home/mdecorde/workspace047/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryBarRenderer.java
-	152	+ ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + valuesNumberFormat.format(value) + "</b></p></body><html>";
+	152	+ ChartsEngineCoreMessages.EMPTY + " <b>" + valuesNumberFormat.format(value) + "</b></p></body><html>";
 /home/mdecorde/workspace047/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryLineAndShapeRenderer.java
-	89	+ ChartsEngineCoreMessages.charts_labelValueSeparator + " </span><b>" + catDataset.getValue(row, column) + "</b></p></body><html>";
+	89	+ ChartsEngineCoreMessages.EMPTY + " </span><b>" + catDataset.getValue(row, column) + "</b></p></body><html>";
 /home/mdecorde/workspace047/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYBarRenderer.java
-	87	+ ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + RendererUtils.valuesNumberFormat.format(value) + "</b></p></body><html>";
+	87	+ ChartsEngineCoreMessages.EMPTY + " <b>" + RendererUtils.valuesNumberFormat.format(value) + "</b></p></body><html>";
 /home/mdecorde/workspace047/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYCardinalSplineRenderer.java
-	101	+ ChartsEngineCoreMessages.charts_labelValueSeparator + " </b><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getX(item)) + "</b></p></body><html>";
+	101	+ ChartsEngineCoreMessages.EMPTY + " </b><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getX(item)) + "</b></p></body><html>";
 /home/mdecorde/workspace047/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java
-	147	+ ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + valuesNumberFormat.format(xyDataset.getSeries(series).getY(item)) + "</b></p></body><html>";
+	147	+ ChartsEngineCoreMessages.EMPTY + " <b>" + valuesNumberFormat.format(xyDataset.getSeries(series).getY(item)) + "</b></p></body><html>";
 /home/mdecorde/workspace047/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYSplineRenderer.java
-	120	+ ChartsEngineCoreMessages.charts_labelValueSeparator + " </b><b>" + xyDataset.getSeries(series).getX(item) + "</b></p></body><html>";
+	120	+ ChartsEngineCoreMessages.EMPTY + " </b><b>" + xyDataset.getSeries(series).getX(item) + "</b></p></body><html>";
 /home/mdecorde/workspace047/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/preferences/JFCChartsEnginePreferencePage.java
-	112	System.err.println(org.txm.rcp.messages.TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+	112	System.err.println(org.txm.rcp.messages.TXMUIMessages.failedToSavePreferencesDDot + e);
 /home/mdecorde/workspace047/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java
-	114	System.err.println(org.txm.rcp.messages.TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+	114	System.err.println(org.txm.rcp.messages.TXMUIMessages.failedToSavePreferencesDDot + e);
 /home/mdecorde/workspace047/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java
-	551	Log.info(ConcordanceCoreMessages.Concordance_6 + (to - from + 1) + ConcordanceCoreMessages.Concordance_7);
-	578	Log.severe(ConcordanceCoreMessages.Concordance_8+e);
-	1497	System.err.println(ConcordanceCoreMessages.Concordance_12 + e);
-	1530	System.err.println(ConcordanceCoreMessages.Concordance_12 + e.getLocalizedMessage());
-	1596	txtseparator+ConcordanceCoreMessages.Concordance_17+txtseparator
-	1597	+ colseparator+txtseparator+ConcordanceCoreMessages.Concordance_19+txtseparator
+	551	Log.info(ConcordanceCoreMessages.retrieving + (to - from + 1) + ConcordanceCoreMessages.results);
+	578	Log.severe(ConcordanceCoreMessages.failedToGetTextsLimitsDDot+e);
+	1497	System.err.println(ConcordanceCoreMessages.failedToExportConcordanceDDot + e);
+	1530	System.err.println(ConcordanceCoreMessages.failedToExportConcordanceDDot + e.getLocalizedMessage());
+	1596	txtseparator+ConcordanceCoreMessages.reference+txtseparator
+	1597	+ colseparator+txtseparator+ConcordanceCoreMessages.context+txtseparator
 /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java
-	718	Log.info(ConcordanceUIMessages.editor_sorting_with+currentComparator.getName());
-	794	System.err.println(ConcordanceUIMessages.ERROR_WHILE_LOADING_CONCORDANCE_LINE+ e);
-	1203	System.out.println(TXMUIMessages.CorporaView_3 + " " + Log.toString(e1)); //$NON-NLS-1$
-	1207	Log.severe(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
-	1209	System.out.println(ConcordanceUIMessages.ConcordancesEditor_7+e2);
+	718	Log.info(ConcordanceUIMessages.sortingWith+currentComparator.getName());
+	794	System.err.println(ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0+ e);
+	1203	System.out.println(TXMUIMessages.errorWhileComputingTheConcordanceDDot + " " + Log.toString(e1)); //$NON-NLS-1$
+	1207	Log.severe(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
+	1209	System.out.println(ConcordanceUIMessages.cQPErrorDDot+e2);
 /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java
-	143	System.out.println(TXMUIMessages.ComplexSortSelector_1+comp);
+	143	System.out.println(TXMUIMessages.complexSortDDot+comp);
 /home/mdecorde/workspace047/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java
-	1412	writer.write( txtseparator+CooccurrenceCoreMessages.Cooccurrence_11+txtseparator+colseparator+
-	1413	txtseparator+CooccurrenceCoreMessages.Cooccurrence_12+txtseparator+colseparator+
-	1414	txtseparator+CooccurrenceCoreMessages.Cooccurrence_13+txtseparator+colseparator+
-	1415	txtseparator+CooccurrenceCoreMessages.Cooccurrence_14+txtseparator+colseparator+
-	1416	txtseparator+CooccurrenceCoreMessages.Cooccurrence_15+txtseparator+"\n");//colseparator+ //$NON-NLS-1$
-	1597	return occ+CooccurrenceCoreMessages.Cooccurrence_4+freq+CooccurrenceCoreMessages.Cooccurrence_7+nbocc+CooccurrenceCoreMessages.Cooccurrence_8+score+CooccurrenceCoreMessages.Cooccurrence_9+distmoyenne+CooccurrenceCoreMessages.Cooccurrence_10+props;
+	1412	writer.write( txtseparator+CooccurrenceCoreMessages.occ+txtseparator+colseparator+
+	1413	txtseparator+CooccurrenceCoreMessages.freq+txtseparator+colseparator+
+	1414	txtseparator+CooccurrenceCoreMessages.coFreq+txtseparator+colseparator+
+	1415	txtseparator+CooccurrenceCoreMessages.score+txtseparator+colseparator+
+	1416	txtseparator+CooccurrenceCoreMessages.meanDist+txtseparator+"\n");//colseparator+ //$NON-NLS-1$
+	1597	return occ+CooccurrenceCoreMessages.fDDot+freq+CooccurrenceCoreMessages.occDDot+nbocc+CooccurrenceCoreMessages.scoreDDot+score+CooccurrenceCoreMessages.meanDistDDot+distmoyenne+CooccurrenceCoreMessages.propertiesDDot+props;
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java
-	259	Log.finest("Toolbox states: " + TXMCoreMessages.Toolbox_22 + state); //$NON-NLS-1$
-	367	Log.warning(TXMCoreMessages.ApplicationWorkbenchAdvisor_14 + e.getName() + " from " + e.getContributor().getName());
-	374	Log.severe(TXMCoreMessages.ApplicationWorkbenchAdvisor_6+ exception);
-	402	Log.warning(TXMCoreMessages.ApplicationWorkbenchAdvisor_14 + e.getName() + " from " + e.getContributor().getName());
-	409	Log.severe(TXMCoreMessages.ApplicationWorkbenchAdvisor_6+ exception);
-	575	Log.info(TXMCoreMessages.Toolbox_10 + workspaceFile);
-	603	Log.info(TXMCoreMessages.Toolbox_12 + workspaceFile);
-	607	Log.severe(TXMCoreMessages.Toolbox_14 + workspaceFile);
-	615	Log.severe(TXMCoreMessages.Toolbox_workspace_init_failed + workspaceFile);
-	616	Log.severe(TXMCoreMessages.Toolbox_15 + Log.toString(e));
+	259	Log.finest("Toolbox states: " + TXMCoreMessages.workspaceDDot + state); //$NON-NLS-1$
+	367	Log.warning(TXMCoreMessages.evaluatingExtensionDDot + e.getName() + " from " + e.getContributor().getName());
+	374	Log.severe(TXMCoreMessages.exceptionDDot+ exception);
+	402	Log.warning(TXMCoreMessages.evaluatingExtensionDDot + e.getName() + " from " + e.getContributor().getName());
+	409	Log.severe(TXMCoreMessages.exceptionDDot+ exception);
+	575	Log.info(TXMCoreMessages.noWorkspaceFoundCreatingANewOne + workspaceFile);
+	603	Log.info(TXMCoreMessages.loadingWorkspaceFromFileDDot + workspaceFile);
+	607	Log.severe(TXMCoreMessages.errorLoadingWorkspaceFromFileDDot + workspaceFile);
+	615	Log.severe(TXMCoreMessages.errorDuringWorkspaceInitializationDDot + workspaceFile);
+	616	Log.severe(TXMCoreMessages.errorDDot + Log.toString(e));
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java
-	63	if (!silent) System.out.println(TXMCoreMessages.Convert5To6_7+TXMs);
-	68	if (!silent) System.out.println(TXMCoreMessages.Convert5To6_8+HTMLs);
-	73	if (!silent) System.out.println(TXMCoreMessages.Convert5To6_9+DATAs);
-	78	if (!silent) System.out.println(TXMCoreMessages.Convert5To6_10+REGISTRY);
-	83	if (!silent) System.out.println(TXMCoreMessages.Convert5To6_11+HTMLmulti);
-	110	System.out.println(TXMCoreMessages.Convert5To6_15+OUTDIR);
-	141	System.out.println(TXMCoreMessages.Convert5To6_19+IMPORT);
-	184	System.out.println(TXMCoreMessages.Convert5To6_46+txmFile);
+	63	if (!silent) System.out.println(TXMCoreMessages.txmDirectoryIsMissingDDot+TXMs);
+	68	if (!silent) System.out.println(TXMCoreMessages.htmlDirectoryIsMissingDDot+HTMLs);
+	73	if (!silent) System.out.println(TXMCoreMessages.dataDirectoryIsMissingDDot+DATAs);
+	78	if (!silent) System.out.println(TXMCoreMessages.registryFileIsMissingDDot+REGISTRY);
+	83	if (!silent) System.out.println(TXMCoreMessages.htmlDirectoryIsMissingDDot+HTMLmulti);
+	110	System.out.println(TXMCoreMessages.reorganizingFilesOf+OUTDIR);
+	141	System.out.println(TXMCoreMessages.readCorpusInfosFromOldImportxmlFileDDot+IMPORT);
+	184	System.out.println(TXMCoreMessages.processingTextDDot+txmFile);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/ValidateXml.java
-	60	System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_1);
-	64	System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_2);
-	68	System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_3);
-	126	System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_1);
-	130	System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_2);
-	134	System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_3);
+	60	System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isADirectory);
+	64	System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.doesNotExists_2);
+	68	System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isNotReadable);
+	126	System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isADirectory);
+	130	System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.doesNotExists_2);
+	134	System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isNotReadable);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripting/GroovyImportScriptRunner.java
-	94	System.out.println(TXMCoreMessages.GroovyImportScriptRunner_1 + scriptfile);
+	94	System.out.println(TXMCoreMessages.supBeginningExecutionOf + scriptfile);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/Catalog.java
-	62	System.err.println(TXMCoreMessages.Catalog_0 + path);
+	62	System.err.println(TXMCoreMessages.catalogFileNotFound + path);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/CatalogManager.java
-	57	.println(TXMCoreMessages.CatalogManager_0 + path + TXMCoreMessages.CatalogManager_1);
+	57	.println(TXMCoreMessages.managerErrorDuringInitializationDDot + path + TXMCoreMessages.doesNotExist_3);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/FilterManager.java
-	63	.println(TXMCoreMessages.FilterManager_0 + path + TXMCoreMessages.FilterManager_1);
+	63	.println(TXMCoreMessages.filterManagerErrorDDotInitialization + path + TXMCoreMessages.doesNotExist_3);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/CorpusBuild.java
-	452	System.out.println(TXMCoreMessages.Base_0+binarydir+TXMCoreMessages.Base_3);
-	453	System.out.println(TXMCoreMessages.Base_4+exportzip.getParentFile()+TXMCoreMessages.Base_5);
+	452	System.out.println(TXMCoreMessages.binaryDirectory+binarydir+TXMCoreMessages.doesNotExist);
+	453	System.out.println(TXMCoreMessages.parentDirectory+exportzip.getParentFile()+TXMCoreMessages.doesNotExist);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Page.java
-	115	System.err.println(TXMCoreMessages.Page_3 + htmlfile);
+	115	System.err.println(TXMCoreMessages.malformedURLFile + htmlfile);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Project.java
-	518	System.out.println(TXMCoreMessages.Base_6+target);
-	780	System.out.println(TXMCoreMessages.Base_0+binarydir+TXMCoreMessages.Base_3);
-	781	System.out.println(TXMCoreMessages.Base_4+exportzip.getParentFile()+TXMCoreMessages.Base_5);
+	518	System.out.println(TXMCoreMessages.errorDDotLinkGrplinkAttargetMalformedDDot+target);
+	780	System.out.println(TXMCoreMessages.binaryDirectory+binarydir+TXMCoreMessages.doesNotExist);
+	781	System.out.println(TXMCoreMessages.parentDirectory+exportzip.getParentFile()+TXMCoreMessages.doesNotExist);
 /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java
-	246	System.out.println(TXMCoreMessages.Project_28+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.Project_31+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
-	274	System.out.println(TXMCoreMessages.Project_11+PARAMS);
-	275	Log.severe(TXMCoreMessages.Project_11+PARAMS);
-	309	System.out.println(TXMCoreMessages.Project_17+corpusname);
-	310	System.out.println(TXMCoreMessages.Project_18+PARAMS);
-	321	System.out.println(TXMCoreMessages.Project_28+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.Project_31+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+	246	System.out.println(TXMCoreMessages.tXMNeedsFoldersDDot+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.andFile+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+	274	System.out.println(TXMCoreMessages.failedToLoadBaseParametersFromFileDDot+PARAMS);
+	275	Log.severe(TXMCoreMessages.failedToLoadBaseParametersFromFileDDot+PARAMS);
+	309	System.out.println(TXMCoreMessages.errorDDotSkippingTheLoadingOfCorpusDDot+corpusname);
+	310	System.out.println(TXMCoreMessages.pARAMSDDot+PARAMS);
+	321	System.out.println(TXMCoreMessages.tXMNeedsFoldersDDot+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.andFile+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java
-	158	System.out.println(TXMCoreMessages.QueryIndex_2+line);
-	161	System.out.println(TXMCoreMessages.QueryIndex_3+line);
-	182	System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+	158	System.out.println(TXMCoreMessages.warningDDotDuplicateQueryEntryDDot+line);
+	161	System.out.println(TXMCoreMessages.warningDDotQueryFailedDDot+line);
+	182	System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 /home/mdecorde/workspace047/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java
-	232	System.out.println(TXMCoreMessages.QueryIndex_2+line);
-	341	System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+	232	System.out.println(TXMCoreMessages.warningDDotDuplicateQueryEntryDDot+line);
+	341	System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 /home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java
-	362	System.out.println(EditionUIMessages.SynopticEditionEditor_6+e2);
-	638	System.out.println(EditionUIMessages.SynopticEditionEditor_9+editionName);
-	839	System.out.println(EditionUIMessages.editor_warning_unknowned_param_id+k);
-	878	System.out.println(EditionUIMessages.editor_warning_no_id_parameter+params);
+	362	System.out.println(EditionUIMessages.errorWhileGettingAvailableEditionsDDot+e2);
+	638	System.out.println(EditionUIMessages.warningDDotCouldNotFindEditionForNameEqualsP0+editionName);
+	839	System.out.println(EditionUIMessages.warningDDotUnknownedParameterIdEqualsP0+k);
+	878	System.out.println(EditionUIMessages.cannotCallTxmcommandWithoutIdParameterDDotP0+params);
 /home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java
-	261	Log.info(EditionUIMessages.BackToText_0+editionNames.get(0));
-	268	Log.info(EditionUIMessages.BackToText_5+StringUtils.join(editionsToOpen));
+	261	Log.info(EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDotP0+editionNames.get(0));
+	268	Log.info(EditionUIMessages.openingDefaultEditionsDDotP0+StringUtils.join(editionsToOpen));
 /home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java
-	98	Log.info(EditionUIMessages.OpenEdition_0+editionNames.get(0));
-	105	Log.info(EditionUIMessages.OpenEdition_3+StringUtils.join(editionsToOpen));
-	113	System.out.println(EditionUIMessages.OpenEdition_4+e);
-	185	System.out.println(EditionUIMessages.OpenEdition_10+e);
+	98	Log.info(EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDot+editionNames.get(0));
+	105	Log.info(EditionUIMessages.openingDefaultEditionsDDotP0+StringUtils.join(editionsToOpen));
+	113	System.out.println(EditionUIMessages.errorWhileOpeningEditionDDotP0+e);
+	185	System.out.println(EditionUIMessages.errorWhileOpeningEditorDDotP0+e);
 /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Index.java
 	706	return IndexCoreMessages.RESULT_TYPE + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();
-	1046	System.out.println(IndexCoreMessages.Index_1 + (lines.size()));
-	1173	System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+	1046	System.out.println(IndexCoreMessages.consoleDDot + (lines.size()));
+	1173	System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java
-	200	Log.finest(IndexCoreMessages.LEXICON_RESULT_TYPE + corpus.getID());
-	238	Log.finest(IndexCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
-	449	return IndexCoreMessages.LEXICON_RESULT_TYPE + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();
-	586	return IndexCoreMessages.Lexicon_3 + this.getCurrentName();
+	200	Log.finest(IndexCoreMessages.lexicon + corpus.getID());
+	238	Log.finest(IndexCoreMessages.computingTheLexiconOfSubcorpusP0 + corpus.getName());
+	449	return IndexCoreMessages.lexicon + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();
+	586	return IndexCoreMessages.lexiconDDot + this.getCurrentName();
 /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java
 	638	return IndexCoreMessages.RESULT_TYPE + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();
-	1002	System.out.println(IndexCoreMessages.Index_1 + (lines.size()));
-	1106	System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+	1002	System.out.println(IndexCoreMessages.consoleDDot + (lines.size()));
+	1106	System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java
-	199	Log.finest(IndexCoreMessages.LEXICON_RESULT_TYPE + corpus.getID());
-	241	Log.finest(IndexCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
-	444	return IndexCoreMessages.LEXICON_RESULT_TYPE + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();
-	581	return IndexCoreMessages.Lexicon_3 + this.getCurrentName();
+	199	Log.finest(IndexCoreMessages.lexicon + corpus.getID());
+	241	Log.finest(IndexCoreMessages.computingTheLexiconOfSubcorpusP0 + corpus.getName());
+	444	return IndexCoreMessages.lexicon + ": " + this.parent.getSimpleName() + ": " + this.getSimpleName();
+	581	return IndexCoreMessages.lexiconDDot + this.getCurrentName();
 /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java
-	510	lFminInfo.setText(TXMCoreMessages.FMIN_2 + index.getFmin());
-	511	lFmaxInfo.setText(TXMCoreMessages.FMAX_2 + index.getFmax());
+	510	lFminInfo.setText(TXMCoreMessages.fmin + index.getFmin());
+	511	lFmaxInfo.setText(TXMCoreMessages.fmax + index.getFmax());
 	512	lTInfo.setText(TXMCoreMessages.common_t + index.getT());
-	513	lVInfo.setText(TXMCoreMessages.V + index.getV());
+	513	lVInfo.setText(TXMCoreMessages.v + index.getV());
 /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java
 	475	freqColumn.setText(TXMCoreMessages.common_frequency+" T="+index.getPartition().getTotalSize()); //$NON-NLS-1$
-	600	lFminInfo.setText(TXMCoreMessages.FMIN_2 + index.getFmin());
-	601	lFmaxInfo.setText(TXMCoreMessages.FMAX_2 + index.getFmax());
+	600	lFminInfo.setText(TXMCoreMessages.fmin + index.getFmin());
+	601	lFmaxInfo.setText(TXMCoreMessages.fmax + index.getFmax());
 	602	lTInfo.setText(TXMCoreMessages.common_t + index.getT());
-	603	lVInfo.setText(TXMCoreMessages.V + index.getV());
+	603	lVInfo.setText(TXMCoreMessages.v + index.getV());
 /home/mdecorde/workspace047/org.txm.internalview.core/src/org/txm/internalview/core/functions/InternalView.java
-	293	System.out.println(InternalViewCoreMessages.InternalView_6+e.getMessage());
+	293	System.out.println(InternalViewCoreMessages.internalViewDDotFailedToRetrieveStructPropertiesValuesDDot+e.getMessage());
 /home/mdecorde/workspace047/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java
-	307	System.out.println(InternalViewUIMessages.InternalViewEditor_25+query);
-	325	System.out.println(InternalViewUIMessages.editor_error_backto_match + m);
+	307	System.out.println(InternalViewUIMessages.qUERYDDot+query);
+	325	System.out.println(InternalViewUIMessages.errorWhileInternalViewGoBackTo + m);
 /home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java
-	473	this.setContentDescription(TXMCoreMessages.common_t + lexicalTable.getData().getTotal() + TXMCoreMessages.V + lexicalTable.getData().getNRows()
-	474	+ TXMCoreMessages.FMIN_2 + lexicalTable.getData().getFMin() + TXMCoreMessages.FMAX_2 + lexicalTable.getData().getFMax());
+	473	this.setContentDescription(TXMCoreMessages.common_t + lexicalTable.getData().getTotal() + TXMCoreMessages.v + lexicalTable.getData().getNRows()
+	474	+ TXMCoreMessages.fmin + lexicalTable.getData().getFMin() + TXMCoreMessages.fmax + lexicalTable.getData().getFMax());
 /home/mdecorde/workspace047/org.txm.para.rcp/src/org/txm/para/rcp/editors/ParaBrowserEditor.java
-	330	referenceLabel.setText(ParaBrowserUIMessages.ParaBrowserEditor_3 + selectedReference);
-	713	System.out.println(ParaBrowserUIMessages.ParaBrowserEditor_18 + newValue);
-	720	System.out.println(ParaBrowserUIMessages.ParaBrowserEditor_19 + newValue);
+	330	referenceLabel.setText(ParaBrowserUIMessages.refDDot + selectedReference);
+	713	System.out.println(ParaBrowserUIMessages.mOVETo + newValue);
+	720	System.out.println(ParaBrowserUIMessages.dontMOVENEXTIs + newValue);
 /home/mdecorde/workspace047/org.txm.progression.core/src/org/txm/progression/core/chartsengine/base/Utils.java
-	26	String title = ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF + " "; //$NON-NLS-1$
-	37	title += " " + ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_IN + " " + progression.getCorpus().getName(); //$NON-NLS-1$ //$NON-NLS-2$
-	45	title += "\n(" + ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_STRUCT + progression.getStructuralUnit().getName();
-	47	title += ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_PROPERTY + progression.getStructuralUnitProperty().getName();
-	49	title += ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_REGEX + progression.getPropertyRegex();
+	26	String title = ProgressionCoreMessages.progressionOf + " "; //$NON-NLS-1$
+	37	title += " " + ProgressionCoreMessages.in + " " + progression.getCorpus().getName(); //$NON-NLS-1$ //$NON-NLS-2$
+	45	title += "\n(" + ProgressionCoreMessages.structureDDot + progression.getStructuralUnit().getName();
+	47	title += ProgressionCoreMessages.propertyDDot + progression.getStructuralUnitProperty().getName();
+	49	title += ProgressionCoreMessages.filteringREGEXDDot + progression.getPropertyRegex();
 /home/mdecorde/workspace047/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java
-	244	System.err.println(ProgressionUIMessages.ProgressionEventCallBack_error+e.getLocalizedMessage());
+	244	System.err.println(ProgressionUIMessages.errorDDot+e.getLocalizedMessage());
 /home/mdecorde/workspace047/org.txm.progression.rcp/src/org/txm/progression/rcp/editors/ProgressionEditor.java
-	651	Log.severe(ProgressionUIMessages.ProgressionDialog_17 + e);
-	652	StatusLine.error(ProgressionUIMessages.ProgressionDialog_17 + e);
+	651	Log.severe(ProgressionUIMessages.stripMultiplierErrorDDot + e);
+	652	StatusLine.error(ProgressionUIMessages.stripMultiplierErrorDDot + e);
 /home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java
-	169	Log.severe(PropertiesCoreMessages.Properties_1 + corpus.getName() + PropertiesCoreMessages.Properties_4);
-	177	Log.severe(PropertiesCoreMessages.Properties_6 + corpus.getName() + PropertiesCoreMessages.Properties_8);
-	220	Log.severe(PropertiesCoreMessages.Properties_1 + corpus.getName() + PropertiesCoreMessages.Properties_11);
-	287	buff.append("<h2 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.Properties_3 + this.corpus.getName() + " (id=" + this.corpus.getID() + ")</h2>\n"); //$NON-NLS-2$ //$NON-NLS-1$
-	293	buff.append("<h3 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.Properties_5 + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
-	297	buff.append("<li>" + PropertiesCoreMessages.Properties_7 + numberOfWords + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
-	298	buff.append("<li>" + PropertiesCoreMessages.Properties_9 + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
-	299	buff.append("<li>" + PropertiesCoreMessages.Properties_16 + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
-	332	subbuffer.append("<li>" + PropertiesCoreMessages.Properties_26 + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
-	391	buff.append(PropertiesCoreMessages.Properties_41 + String.format(Locale.FRANCE, "%,d", numberOfWords) + "\n"); //$NON-NLS-1$
-	392	buff.append(PropertiesCoreMessages.Properties_43 + String.format("%,d", NProperties) + "\n"); //$NON-NLS-1$
-	398	buff.append(PropertiesCoreMessages.Properties_49 + String.format("%,d", NStructures) + "\n"); //$NON-NLS-1$
+	169	Log.severe(PropertiesCoreMessages.failedToAccessCorpus + corpus.getName() + PropertiesCoreMessages.properties);
+	177	Log.severe(PropertiesCoreMessages.failedToAccessCorpus + corpus.getName() + PropertiesCoreMessages.lexicon);
+	220	Log.severe(PropertiesCoreMessages.failedToAccessCorpus + corpus.getName() + PropertiesCoreMessages.structures);
+	287	buff.append("<h2 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.descriptionOf + this.corpus.getName() + " (id=" + this.corpus.getID() + ")</h2>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+	293	buff.append("<h3 style'font-family:\"Arial\";'>" + PropertiesCoreMessages.generalStatistics_2 + "</h3>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	297	buff.append("<li>" + PropertiesCoreMessages.numberOfWords + numberOfWords + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	298	buff.append("<li>" + PropertiesCoreMessages.numberOfWordProperties + (NProperties - 1) + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+	299	buff.append("<li>" + PropertiesCoreMessages.numberOfStructuralUnits + NStructures + "</li>\n"); //$NON-NLS-2$ //$NON-NLS-1$
+	332	subbuffer.append("<li>" + PropertiesCoreMessages.noProperty + "</li>\n"); //$NON-NLS-1$ //$NON-NLS-2$
+	391	buff.append(PropertiesCoreMessages.t + String.format(Locale.FRANCE, "%,d", numberOfWords) + "\n"); //$NON-NLS-1$
+	392	buff.append(PropertiesCoreMessages.wordProperties + String.format("%,d", NProperties) + "\n"); //$NON-NLS-1$
+	398	buff.append(PropertiesCoreMessages.s + String.format("%,d", NStructures) + "\n"); //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java
-	102	System.out.println(TXMUIMessages.ComputeCooccurrences_1+ element);
-	124	System.out.println(TXMUIMessages.ComputeCoocMatrix_0+cooc.getSymbol());
-	139	try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+	102	System.out.println(TXMUIMessages.cannotComputeCooccurrencesWithTheSelection+ element);
+	124	System.out.println(TXMUIMessages.coocMatrixDDot+cooc.getSymbol());
+	139	try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 	168	System.out.println(TXMCoreMessages.common_queries+queries);
-	169	System.out.println(TXMUIMessages.MergeCols_5+names);
-	179	System.out.println(TXMUIMessages.ComputeCoocMatrix_1+cooc.getNNodes());
-	180	System.out.println(TXMUIMessages.ComputeCoocMatrix_2+cooc.getNEdges());
-	181	System.out.println(TXMUIMessages.ComputeCoocMatrix_3+dist);
-	185	System.out.println(TXMUIMessages.ComputeCoocMatrix_4+outfile);
-	190	try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+	169	System.out.println(TXMUIMessages.namesDDot+names);
+	179	System.out.println(TXMUIMessages.numberOfNodesDDot+cooc.getNNodes());
+	180	System.out.println(TXMUIMessages.numberOfEdgesDDot+cooc.getNEdges());
+	181	System.out.println(TXMUIMessages.distance_2+dist);
+	185	System.out.println(TXMUIMessages.writingCoocMatrixInGRAPHMLFileDDot+outfile);
+	190	try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java
-	104	System.out.println(TXMUIMessages.ComputeCooccurrences_1+ element);
-	125	System.out.println(TXMUIMessages.ComputeCoocMatrix_0+cooc.getSymbol());
-	140	try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+	104	System.out.println(TXMUIMessages.cannotComputeCooccurrencesWithTheSelection+ element);
+	125	System.out.println(TXMUIMessages.coocMatrixDDot+cooc.getSymbol());
+	140	try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 	166	System.out.println(TXMCoreMessages.common_queries + queries1);
-	167	System.out.println(TXMUIMessages.MergeCols_5+names1);
-	177	System.out.println(TXMUIMessages.ComputeCoocMatrix_1+cooc.getNNodes());
-	178	System.out.println(TXMUIMessages.ComputeCoocMatrix_2+cooc.getNEdges());
-	179	System.out.println(TXMUIMessages.ComputeCoocMatrix_3+dist);
-	183	try { System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+	167	System.out.println(TXMUIMessages.namesDDot+names1);
+	177	System.out.println(TXMUIMessages.numberOfNodesDDot+cooc.getNNodes());
+	178	System.out.println(TXMUIMessages.numberOfEdgesDDot+cooc.getNEdges());
+	179	System.out.println(TXMUIMessages.distance_2+dist);
+	183	try { System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java
-	205	System.out.println(TXMCoreMessages.QueryIndex_2+line);
-	208	System.out.println(TXMCoreMessages.QueryIndex_3+line);
-	230	System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+	205	System.out.println(TXMCoreMessages.warningDDotDuplicateQueryEntryDDot+line);
+	208	System.out.println(TXMCoreMessages.warningDDotQueryFailedDDot+line);
+	230	System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java
 	254	title = Messages.QueryIndexEditor_0 + partition.getName();
 	257	title = Messages.QueryIndexEditor_0 + corpus;
 	299	System.out.println(Messages.QueryIndexEditor_1 + name);
 	491	.println(Messages.QueryIndexEditor_6 + propFile);
-	947	lFminInfo.setText(IndexUIMessages.IndexEditor_25 + queryindex.getFmin());
-	948	lFmaxInfo.setText(IndexUIMessages.IndexEditor_26 + queryindex.getFmax());
-	949	lTInfo.setText(IndexUIMessages.IndexEditor_27 + queryindex.getT());
-	950	lVInfo.setText(IndexUIMessages.IndexEditor_28 + queryindex.getV());
+	947	lFminInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getFmin());
+	948	lFmaxInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getFmax());
+	949	lTInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getT());
+	950	lVInfo.setText(IndexUIMessages.IndexEditor_17 + queryindex.getV());
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java
-	74	System.out.println(TXMUIMessages.Application_0+argsList);
-	151	Log.warning(TXMUIMessages.Application_10+e);
+	74	System.out.println(TXMUIMessages.argsDDot+argsList);
+	151	Log.warning(TXMUIMessages.couldNotStartProxyConfigurationDDot+e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java
-	279	System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_75+e);
-	295	Log.severe(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
-	296	System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
-	400	System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_78+e);
-	592	System.err.println(TXMUIMessages.ApplicationWorkbenchAdvisor_9+ " " +e.getLocalizedMessage());
-	721	System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_47+" "+e.getLocalizedMessage()); //$NON-NLS-1$
-	722	Log.severe(TXMUIMessages.ApplicationWorkbenchAdvisor_47+e.getLocalizedMessage());
-	759	System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_34 + backup);
-	797	System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_44+failed+TXMUIMessages.ApplicationWorkbenchAdvisor_37+backup);
+	279	System.out.println(TXMUIMessages.errorWhileLoadingTXMDDot+e);
+	295	Log.severe(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
+	296	System.out.println(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
+	400	System.out.println(TXMUIMessages.errorWhileUpdatingTXMDDot+e);
+	592	System.err.println(TXMUIMessages.couldNotReadInstallPreferencesFile+ " " +e.getLocalizedMessage());
+	721	System.out.println(TXMUIMessages.failedToBackupExistingCorporaDDot+" "+e.getLocalizedMessage()); //$NON-NLS-1$
+	722	Log.severe(TXMUIMessages.failedToBackupExistingCorporaDDot+e.getLocalizedMessage());
+	759	System.out.println(TXMUIMessages.couldNotCreateBackupDirectoryDDot + backup);
+	797	System.out.println(TXMUIMessages.failedToMoveCorpus+failed+TXMUIMessages.to+backup);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java
-	45	message = ""+((int)t/60)+TXMUIMessages.JobsTimer_9+((int)t%60)+TXMUIMessages.JobsTimer_5; //$NON-NLS-1$
-	47	message = ""+((int)t/3600)+TXMUIMessages.JobsTimer_12+((int)(t%3600)/60)+TXMUIMessages.JobsTimer_13+((int)(t%3600)%60)+ TXMUIMessages.JobsTimer_5; //$NON-NLS-1$
-	69	System.out.println(TXMUIMessages.JobsTimer_20+JobsTimer.stop());
-	70	System.out.println(TXMUIMessages.JobsTimer_21+ExecTimer.stop());
+	45	message = ""+((int)t/60)+TXMUIMessages.minAnd+((int)t%60)+TXMUIMessages.sec; //$NON-NLS-1$
+	47	message = ""+((int)t/3600)+TXMUIMessages.h+((int)(t%3600)/60)+TXMUIMessages.minAnd+((int)(t%3600)%60)+ TXMUIMessages.sec; //$NON-NLS-1$
+	69	System.out.println(TXMUIMessages.jobDDot+JobsTimer.stop());
+	70	System.out.println(TXMUIMessages.execDDot+ExecTimer.stop());
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java
-	653	name = TXMUIMessages.CreatePartitionDialog_7+count++;
+	653	name = TXMUIMessages.part+count++;
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java
-	45	System.out.println(TXMUIMessages.CleanPerspective_1+e);
+	45	System.out.println(TXMUIMessages.errorWhileCallingOrgeclipseuiwindowresetPerspectiveDDot+e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java
-	151	System.out.println(TXMUIMessages.ImportSelectedText_10+lang);
-	154	System.out.println(TXMUIMessages.ImportSelectedText_12+project.getLang()); //$NON-NLS-1$
+	151	System.out.println(TXMUIMessages.identifiedLanguage+lang);
+	154	System.out.println(TXMUIMessages.usingLanguage+project.getLang()); //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java
-	92	System.out.println(TXMUIMessages.SaveAs_2+resultFile+TXMUIMessages.PasteFile_4+e);
+	92	System.out.println(TXMUIMessages.failedToSaveAs+resultFile+TXMUIMessages.dDot+e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java
-	71	TXMUIMessages.SetEncoding_0, TXMUIMessages.SetEncoding_1+currentEncoding+TXMUIMessages.SetEncoding_2+defaultEncoding, currentEncoding, null);
+	71	TXMUIMessages.changeCharactersEncoding, TXMUIMessages.changeCharactersEncodingCurrentEncodingDDot+currentEncoding+TXMUIMessages.defaultEncodingDDot+defaultEncoding, currentEncoding, null);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java
-	620	StatusLine.setMessage(TXMUIMessages.TXMEditor_0 + this.getResult().getName());
-	622	JobHandler job = new JobHandler(TXMUIMessages.TXMEditor_1 + this.getResult().getName()) {
+	620	StatusLine.setMessage(TXMUIMessages.computing + this.getResult().getName());
+	622	JobHandler job = new JobHandler(TXMUIMessages.computing + this.getResult().getName()) {
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java
-	67	Log.info(TXMUIMessages.TableKeyListener_0 + matchingIndexes);
-	113	System.out.println(TXMUIMessages.TableKeyListener_6+str);
+	67	Log.info(TXMUIMessages.foundLinesDDot + matchingIndexes);
+	113	System.out.println(TXMUIMessages.copiedLinesDDot+str);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java
-	116	System.out.println(TXMUIMessages.TxtEditor_0+f+TXMUIMessages.TxtEditor_1+encoding);
+	116	System.out.println(TXMUIMessages.textEditorDDot+f+TXMUIMessages.encodingFound+encoding);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java
-	826	Log.info(TXMUIMessages.CorpusPage_50+moduleParams);
+	826	Log.info(TXMUIMessages.moduleUIParametersDDot+moduleParams);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java
-	430	System.out.println(TXMUIMessages.MetadataPage_4+header);
+	430	System.out.println(TXMUIMessages.metadataColumnTitles+header);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java
-	73	section.setText(TXMUIMessages.MainPage_3+" "+project.getSrcdir()); //$NON-NLS-1$
-	96	System.out.println(TXMUIMessages.CorpusPage_93+corpusText.getText());
-	112	System.out.println(TXMUIMessages.CorpusPage_93+corpusname);
+	73	section.setText(TXMUIMessages.corpusInfos+" "+project.getSrcdir()); //$NON-NLS-1$
+	96	System.out.println(TXMUIMessages.importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot+corpusText.getText());
+	112	System.out.println(TXMUIMessages.importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot+corpusname);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java
-	73	Log.severe(TXMUIMessages.CANT_CREATE_GRAPHIC + e);
+	73	Log.severe(TXMUIMessages.cannotCreateTheGraphic + e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportSVG.java
-	181	System.out.println(NLS.bind(TXMUIMessages.ExportSVG_3 + outfile, "")); //$NON-NLS-1$
+	181	System.out.println(NLS.bind(TXMUIMessages.failedToExportFileP0WithDeviceP1 + outfile, "")); //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java
-	75	dialog.setMessage(TXMUIMessages.DeleteFile_0+file+" ? ");  //$NON-NLS-1$
-	81	if (!file.delete()) System.out.println(TXMUIMessages.DeleteFile_2+file);
-	83	if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.DeleteFile_2+file);
-	98	dialog.setMessage(TXMUIMessages.DeleteFile_0+files+" ? ");  //$NON-NLS-1$
-	108	if (!file.delete()) System.out.println(TXMUIMessages.DeleteFile_2+file);
-	110	if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.DeleteFile_2+file);
+	75	dialog.setMessage(TXMUIMessages.areYouSureYouWantToDeleteToSort+file+" ? ");  //$NON-NLS-1$
+	81	if (!file.delete()) System.out.println(TXMUIMessages.failedToDeleteFile+file);
+	83	if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.failedToDeleteFile+file);
+	98	dialog.setMessage(TXMUIMessages.areYouSureYouWantToDeleteToSort+files+" ? ");  //$NON-NLS-1$
+	108	if (!file.delete()) System.out.println(TXMUIMessages.failedToDeleteFile+file);
+	110	if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.failedToDeleteFile+file);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java
-	83	System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
-	85	System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
-	96	System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
-	98	System.out.println(TXMUIMessages.PasteFile_3+source);
-	101	System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
-	120	System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
-	124	System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
+	83	System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
+	85	System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
+	96	System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
+	98	System.out.println(TXMUIMessages.failedToDelete+source);
+	101	System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
+	120	System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
+	124	System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/RenameFile.java
-	71	TXMUIMessages.RenameFile_0, TXMUIMessages.RenameFile_0+newname, newname, null);
-	74	System.out.println(TXMUIMessages.RenameFile_2+newname);
-	79	System.out.println(TXMUIMessages.RenameFile_3+file+TXMUIMessages.ApplicationWorkbenchAdvisor_37+newname);
+	71	TXMUIMessages.renameFile, TXMUIMessages.renameFile+newname, newname, null);
+	74	System.out.println(TXMUIMessages.renamingByDDot+newname);
+	79	System.out.println(TXMUIMessages.failedToRename+file+TXMUIMessages.to+newname);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java
-	171	StatusLine.setMessage(TXMUIMessages.DeleteObject_3+" : "+o);
+	171	StatusLine.setMessage(TXMUIMessages.errorDDotDeleteReturnedFalse+" : "+o);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java
-	256	System.out.println(TXMUIMessages.ExecuteGroovyScript_9+e);
+	256	System.out.println(TXMUIMessages.errorDuringScriptExecutionDDot+e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java
-	148	System.out.println(TXMUIMessages.ExecuteScriptImport_2+corporadir);
-	149	Log.severe(TXMUIMessages.ExecuteScriptImport_2+corporadir);
+	148	System.out.println(TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot+corporadir);
+	149	Log.severe(TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot+corporadir);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteLastGroovyScript.java
-	80	System.out.println(TXMUIMessages.ExecuteLastGroovyScript_0+lastScript);
-	82	System.out.println(TXMUIMessages.ExecuteLastGroovyScript_1+lastScript);
-	89	System.out.println(TXMUIMessages.ExecuteLastGroovyScript_3+currentRootDir);
+	80	System.out.println(TXMUIMessages.executingLastMacroDDot+lastScript);
+	82	System.out.println(TXMUIMessages.executingLastScriptDDot+lastScript);
+	89	System.out.println(TXMUIMessages.errorDDotCurrentGroovyScriptDirectoryDoesNotExistDDot+currentRootDir);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java
-	131	MessageDialog dialog = new MessageDialog(shell, TXMUIMessages.ExecuteScript_0+result, null,
-	207	System.out.println(TXMUIMessages.ExecuteScript_3+script.getName());
+	131	MessageDialog dialog = new MessageDialog(shell, TXMUIMessages.executionOfP0+result, null,
+	207	System.out.println(TXMUIMessages.noInterpreterFoundForScriptFileExtension+script.getName());
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteText.java
-	91	System.out.println(TXMUIMessages.ExecuteScript_3+script.getName());
+	91	System.out.println(TXMUIMessages.noInterpreterFoundForScriptFileExtension+script.getName());
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java
-	132	System.err.println(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+	132	System.err.println(TXMUIMessages.failedToSavePreferencesDDot + e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMPreferencePage.java
-	84	System.err.println(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+	84	System.err.println(TXMUIMessages.failedToSavePreferencesDDot + e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueTreeDialog.java
-	139	addButton.setText(TXMUIMessages.MultipleValueTreeDialog_0+itemSubName);
+	139	addButton.setText(TXMUIMessages.addDDot+itemSubName);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java
-	237	System.out.println(TXMUIMessages.NavigationWidget_0+e);
+	237	System.out.println(TXMUIMessages.errorWhileGettingCurrentPositionValueDDot+e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java
-	216	p.setTitle(TXMUIMessages.PartitionComposer_5 + (parts.size() + 1));
-	253	p.setTitle(TXMUIMessages.PartitionComposer_5 + (parts.size() + 1));
+	216	p.setTitle(TXMUIMessages.part + (parts.size() + 1));
+	253	p.setTitle(TXMUIMessages.part + (parts.size() + 1));
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java
-	151	System.out.println(TXMUIMessages.ParametersDialog_10+widgetName+TXMUIMessages.FileTreeContentProvider_4);
-	262	System.out.println(TXMUIMessages.ParametersDialog_10+widgetName+TXMUIMessages.FileTreeContentProvider_4);
-	294	System.out.println(TXMUIMessages.ParametersDialog_12+field);
-	357	System.out.println(TXMUIMessages.ParametersDialog_14+e.getMessage());
-	433	System.out.println(TXMUIMessages.ParametersDialog_14+e.getMessage());
+	151	System.out.println(TXMUIMessages.unknowedWidgetNameDDot+widgetName+TXMUIMessages.FileTreeContentProvider_4);
+	262	System.out.println(TXMUIMessages.unknowedWidgetNameDDot+widgetName+TXMUIMessages.FileTreeContentProvider_4);
+	294	System.out.println(TXMUIMessages.errorDDotMissingValueDDot+field);
+	357	System.out.println(TXMUIMessages.errorInAtOptionNameDeclarationDDot+e.getMessage());
+	433	System.out.println(TXMUIMessages.errorInAtOptionNameDeclarationDDot+e.getMessage());
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java
-	17	super(TXMUIMessages.UIParameterException_0+true);
+	17	super(TXMUIMessages.error+true);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java
-	243	System.out.println(TXMUIMessages.JobHandler_1 + " " + this.getName()); //$NON-NLS-1$
-	255	Log.severe(TXMUIMessages.JobHandler_3 + this.getName());
+	243	System.out.println(TXMUIMessages.canceling_2 + " " + this.getName()); //$NON-NLS-1$
+	255	Log.severe(TXMUIMessages.failedToCancel + this.getName());
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java
-	147	System.out.println(TXMUIMessages.LanguageSwitchHandler_7+location);
-	148	Log.severe(TXMUIMessages.LanguageSwitchHandler_7+location);
+	147	System.out.println(TXMUIMessages.tXMiniDDot+location);
+	148	Log.severe(TXMUIMessages.tXMiniDDot+location);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java
-	173	textArea.append(TXMUIMessages.GroovyConsole_5 + e);
+	173	textArea.append(TXMUIMessages.theErrorIsDDot + e);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java
-	351	System.out.println(TXMUIMessages.SummaryView_0+node);
+	351	System.out.println(TXMUIMessages.noDefaultEditionPageFoundForElementDDot+node);
 /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java
-	59	} catch(Exception e) { System.out.println(TXMUIMessages.FileTreeContentProvider_1+regex+TXMUIMessages.FileTreeContentProvider_2+e);}
-	105	System.out.println(TXMUIMessages.FileTreeContentProvider_3+element+TXMUIMessages.FileTreeContentProvider_4);
+	59	} catch(Exception e) { System.out.println(TXMUIMessages.fileExplorerDDotIncorrectPattern+regex+TXMUIMessages.eRROR+e);}
+	105	System.out.println(TXMUIMessages.errorElementDDot+element+TXMUIMessages.FileTreeContentProvider_4);
 /home/mdecorde/workspace047/org.txm.rcp.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java
 	106	mainPage.setTitle(ProvUIMessages.UpdateAction_UpdatesAvailableTitle+" - TXM");
 /home/mdecorde/workspace047/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java
-	525	System.err.println(ReferencerCoreMessages.Referencer_2 + Log.toString(e));
+	525	System.err.println(ReferencerCoreMessages.referencerExportFailedDDot + Log.toString(e));
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java
-	311	System.err.println(CQPSearchEngineCoreMessages.CwbEncode_0 + directory);
-	315	System.err.println(CQPSearchEngineCoreMessages.CwbEncode_21 + bin);
-	319	System.err.println(CQPSearchEngineCoreMessages.CwbEncode_23 + registry);
-	323	System.err.println(CQPSearchEngineCoreMessages.CwbEncode_25 + corpora);
-	330	System.out.println(CQPSearchEngineCoreMessages.CwbEncode_27 + corpus.getName());
-	334	System.err.println(CQPSearchEngineCoreMessages.CwbEncode_29 + data);
+	311	System.err.println(CQPSearchEngineCoreMessages.theDirectoryDoesNotExistsDDot + directory);
+	315	System.err.println(CQPSearchEngineCoreMessages.theBinaryDirectoryDoesNotExistsDDot + bin);
+	319	System.err.println(CQPSearchEngineCoreMessages.theRegistryDirectoryDoesNotExistsDDot + registry);
+	323	System.err.println(CQPSearchEngineCoreMessages.theCorporaDirectoryDoesNotExistsDDot + corpora);
+	330	System.out.println(CQPSearchEngineCoreMessages.processingCorpus + corpus.getName());
+	334	System.err.println(CQPSearchEngineCoreMessages.theDataDirectoryDoesNotExistsDDot + data);
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbProcess.java
-	119	Log.info(CQPSearchEngineCoreMessages.CwbProcess_1 + StringUtils.join(cmd, " ")); //$NON-NLS-1$
-	182	Log.finest(CQPSearchEngineCoreMessages.CwbProcess_3 + name.toUpperCase());
-	184	Log.finest(CQPSearchEngineCoreMessages.CwbProcess_4 + name.toUpperCase());
-	269	Log.severe(CQPSearchEngineCoreMessages.CwbProcess_5 + cwbLoc);
+	119	Log.info(CQPSearchEngineCoreMessages.startingProcessWithCommandDDot + StringUtils.join(cmd, " ")); //$NON-NLS-1$
+	182	Log.finest(CQPSearchEngineCoreMessages.stoppingProcessDDot + name.toUpperCase());
+	184	Log.finest(CQPSearchEngineCoreMessages.processStopedDDot + name.toUpperCase());
+	269	Log.severe(CQPSearchEngineCoreMessages.cantFindCQPLocationDDot + cwbLoc);
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/PatchCwbRegistry.java
-	126	Log.info(CQPSearchEngineCoreMessages.PatchCwbRegistry_2 + corpus
-	127	+ CQPSearchEngineCoreMessages.PatchCwbRegistry_23 + corpusEncoding);
-	194	Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_3+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
-	198	Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_13+registryfile.getAbsolutePath());
-	288	System.out.println(CQPSearchEngineCoreMessages.PatchCwbRegistry_27+datadir +TXMCoreMessages.ValidateXml_2);
-	298	Log.severe(oldname +CQPSearchEngineCoreMessages.PatchCwbRegistry_29+registryfile);
-	302	Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_27+oldname +CQPSearchEngineCoreMessages.PatchCwbRegistry_29+registryfile);
+	126	Log.info(CQPSearchEngineCoreMessages.updating + corpus
+	127	+ CQPSearchEngineCoreMessages.encodingTo + corpusEncoding);
+	194	Log.severe(CQPSearchEngineCoreMessages.theTargetCorpusDoesntExist+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
+	198	Log.severe(CQPSearchEngineCoreMessages.sourceRegistryDoesNotExistsDDot+registryfile.getAbsolutePath());
+	288	System.out.println(CQPSearchEngineCoreMessages.dataDirectory+datadir +TXMCoreMessages.doesNotExists_2);
+	298	Log.severe(oldname +CQPSearchEngineCoreMessages.couldNotBeFoundInRegistryFile+registryfile);
+	302	Log.severe(CQPSearchEngineCoreMessages.dataDirectory+oldname +CQPSearchEngineCoreMessages.couldNotBeFoundInRegistryFile+registryfile);
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java
-	152	Log.severe(TXMCoreMessages.Toolbox_28+e);
-	162	Log.severe(TXMCoreMessages.Toolbox_wrong_port + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT));
-	164	Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST)
-	165	+ TXMCoreMessages.Toolbox_27 + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT));
-	182	System.out.println(TXMCoreMessages.Toolbox_30 +
-	189	System.out.println(TXMCoreMessages.Toolbox_33 + cqiServer.getLastCmdLine());
-	214	Log.severe(TXMCoreMessages.Toolbox_18 + e);
-	354	Log.severe(TXMCoreMessages.Toolbox_31+Log.toString(e));
-	355	System.out.println(TXMCoreMessages.Toolbox_31+Log.toString(e));
-	363	Log.severe(TXMCoreMessages.Toolbox_34+Log.toString(e2));
-	364	System.out.println(TXMCoreMessages.Toolbox_34+Log.toString(e2));
-	377	String cmd = TXMCoreMessages.Toolbox_37 + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT) + TXMCoreMessages.Toolbox_38;
-	396	Log.severe(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e));
-	397	System.out.println(TXMCoreMessages.Toolbox_39+cmd+TXMCoreMessages.Toolbox_40+Log.toString(e));
+	152	Log.severe(TXMCoreMessages.failedToStartMemCqiClientDDot+e);
+	162	Log.severe(TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT));
+	164	Log.severe(TXMCoreMessages.errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_HOST)
+	165	+ TXMCoreMessages.and + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT));
+	182	System.out.println(TXMCoreMessages.wrongLoginOrPasswordOrPortDDot +
+	189	System.out.println(TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot + cqiServer.getLastCmdLine());
+	214	Log.severe(TXMCoreMessages.errorWhileWaitingForCQP + e);
+	354	Log.severe(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
+	355	System.out.println(TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot+Log.toString(e));
+	363	Log.severe(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
+	364	System.out.println(TXMCoreMessages.failedToExecTskillCqpserverexeDDot+Log.toString(e2));
+	377	String cmd = TXMCoreMessages.killPsAuxPipeGrepCqpserverPipeAwkP + CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PORT) + TXMCoreMessages.print2;
+	396	Log.severe(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
+	397	System.out.println(TXMCoreMessages.failedToExec+cmd+TXMCoreMessages.dDot+Log.toString(e));
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiClient.java
-	80	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
-	85	lastError = CQPSearchEngineCoreMessages.MemCqiClient_0+" CQI_ERROR ("+b+")";
-	97	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_5+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
-	125	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_7+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
-	129	lastError = CQPSearchEngineCoreMessages.MemCqiClient_1+"CL_ERROR ("+b+")";
-	155	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
-	160	lastError = CQPSearchEngineCoreMessages.MemCqiClient_2+"CQI_CQP_ERROR ("+b+")";
-	179	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
-	182	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_10+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
+	80	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2); //$NON-NLS-2$
+	85	lastError = CQPSearchEngineCoreMessages.internalCQIErrorDDot+" CQI_ERROR ("+b+")";
+	97	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPCQIErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
+	125	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPCodeDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
+	129	lastError = CQPSearchEngineCoreMessages.cLErrorDDot+"CL_ERROR ("+b+")";
+	155	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
+	160	lastError = CQPSearchEngineCoreMessages.cQPErrorDDot+"CQI_CQP_ERROR ("+b+")";
+	179	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPErrorDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
+	182	throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.unknownCQPCodesDDotB1+b+CQPSearchEngineCoreMessages.b2+b2);
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiClient.java
-	550	lastError = CQPSearchEngineCoreMessages.MemCqiClient_0+b;
-	593	lastError = CQPSearchEngineCoreMessages.MemCqiClient_1+b;
-	617	lastError = CQPSearchEngineCoreMessages.MemCqiClient_2+b;
-	837	Log.severe(CQPSearchEngineCoreMessages.NetCqiClient_1 + e);
-	858	Log.severe(CQPSearchEngineCoreMessages.NetCqiClient_3 + e);
-	1575	System.out.println(CQPSearchEngineCoreMessages.NetCqiClient_5+e);
-	1742	System.out.println(CQPSearchEngineCoreMessages.NetCqiClient_97+Arrays.toString(client.dumpSubCorpus(subcorpusid, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 10)));
+	550	lastError = CQPSearchEngineCoreMessages.internalCQIErrorDDot+b;
+	593	lastError = CQPSearchEngineCoreMessages.cLErrorDDot+b;
+	617	lastError = CQPSearchEngineCoreMessages.cQPErrorDDot+b;
+	837	Log.severe(CQPSearchEngineCoreMessages.lastCQiErrorDDot + e);
+	858	Log.severe(CQPSearchEngineCoreMessages.lastCQPErrorDDot + e);
+	1575	System.out.println(CQPSearchEngineCoreMessages.couldNotReconnectToServerDDot+e);
+	1742	System.out.println(CQPSearchEngineCoreMessages.clientdumpSubCorpussubcorpusNetCqiClientCQICONSTFIELDMATCH12DDot+Arrays.toString(client.dumpSubCorpus(subcorpusid, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 10)));
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiServer.java
-	285	System.out.println(CQPSearchEngineCoreMessages.NetCqiServer_0 + line);
-	304	System.out.println(CQPSearchEngineCoreMessages.NetCqiServer_1 + line);
+	285	System.out.println(CQPSearchEngineCoreMessages.cqpserverStdoutDDot + line);
+	304	System.out.println(CQPSearchEngineCoreMessages.cqpserverStderrDDot + line);
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java
-	119	System.out.println(TXMCoreMessages.Selection_6+corpus+TXMCoreMessages.Selection_7);
-	142	Log.warning(TXMCoreMessages.Selection_8+m.id);
-	147	Log.severe(TXMCoreMessages.Selection_9+e);
-	225	System.out.println(TXMCoreMessages.Corpus_2+corpus);
-	449	System.out.println(TXMCoreMessages.Selection_26+sup.getFullName());
+	119	System.out.println(TXMCoreMessages.selectionErrorDDotTheCorpus+corpus+TXMCoreMessages.hasNoBase);
+	142	Log.warning(TXMCoreMessages.cantFindStructuralUnitForMetadataWithIdDDot+m.id);
+	147	Log.severe(TXMCoreMessages.errorWhileGettingMetadatasFromBaseimportMetadatasDDot+e);
+	225	System.out.println(TXMCoreMessages.corpusDDot+corpus);
+	449	System.out.println(TXMCoreMessages.failedToGetSupValuesOf+sup.getFullName());
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java
-	427	Log.info(SearchEngineCoreMessages.DROP_QUERYRESULT + queryResult.getName());
-	508	return TXMCoreMessages.Corpus_2 + this.pID + TXMCoreMessages.Corpus_3 + getCharset()
-	509	+ TXMCoreMessages.Corpus_4 + getLanguage();
-	543	System.out.println(TXMCoreMessages.Corpus_13+e);
-	801	System.out.println(TXMCoreMessages.Corpus_14+this+TXMCoreMessages.Corpus_15);
-	854	Log.warning(this.pID + TXMCoreMessages.Corpus_19 + name
+	427	Log.info(SearchEngineCoreMessages.deletingQueryResultP0 + queryResult.getName());
+	508	return TXMCoreMessages.corpusDDot + this.pID + TXMCoreMessages.encodingDDot + getCharset()
+	509	+ TXMCoreMessages.languageDDot + getLanguage();
+	543	System.out.println(TXMCoreMessages.corpusDDotgetLocaleDDotCQPIsNotReadyToAnswerDDot+e);
+	801	System.out.println(TXMCoreMessages.warningDDotCantLoadCorpus+this+TXMCoreMessages.informationsFromWorkspaceSelfElementNull);
+	854	Log.warning(this.pID + TXMCoreMessages.failedToRestorePartition + name
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java
-	91	throw new CqiClientException(TXMCoreMessages.Partition_9 + this.getParent().getName() + "_" + this.getName() + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
-	93	Log.severe(TXMCoreMessages.Partition_18 + e1);
+	91	throw new CqiClientException(TXMCoreMessages.failedToCreatePartDDot + this.getParent().getName() + "_" + this.getName() + e + " last error: " + CQPSearchEngine.getCqiClient().getLastCQPError()); //$NON-NLS-1$ //$NON-NLS-2$
+	93	Log.severe(TXMCoreMessages.failedToGetLastCQPErrorDDot + e1);
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java
-	509	Log.finest(TXMCoreMessages.QUERYING_PARTITION + this.userName);
+	509	Log.finest(TXMCoreMessages.queryingPartitionP0 + this.userName);
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java
-	299	Log.warning(this.pID + TXMCoreMessages.Corpus_12 + subcorpusElem.getAttribute("name")
-	324	Log.warning(this.pID + TXMCoreMessages.Corpus_19 + name
+	299	Log.warning(this.pID + TXMCoreMessages.failedToRestoreSubcorpus + subcorpusElem.getAttribute("name")
+	324	Log.warning(this.pID + TXMCoreMessages.failedToRestorePartition + name
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java
-	94	Log.finest(TXMCoreMessages.PartitionFocus_3 + mod
+	94	Log.finest(TXMCoreMessages.theP0PartFocusDoesntBelongToPartitionP1 + mod
 /home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java
-	72	System.out.println(TXMUIMessages.CreateSubCorpus_1+HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor());
-	78	System.out.println(TXMUIMessages.CreateSubCorpus_3+firstElement);
-	150	System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
-	152	System.out.println(TXMUIMessages.CreateSubCorpus_2+e1);
+	72	System.out.println(TXMUIMessages.noSelectionForDDot+HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor());
+	78	System.out.println(TXMUIMessages.selectionIsNotACorpusDDot+firstElement);
+	150	System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
+	152	System.out.println(TXMUIMessages.failedToGetLastCQPErrorDDot+e1);
 /home/mdecorde/workspace047/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java
-	116	String txt = SpecificitiesCoreMessages.SpecificitesResult_8+colseparator+"F"; //$NON-NLS-1$
+	116	String txt = SpecificitiesCoreMessages.unit+colseparator+"F"; //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrasts.java
-	41	System.out.println(TXMCoreMessages.Contrasts_0+m.getName());
+	41	System.out.println(TXMCoreMessages.computingDDot+m.getName());
 /home/mdecorde/workspace047/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java
-	568	String txt = SpecificitiesCoreMessages.SpecificitesResult_8+colseparator+"F"; //$NON-NLS-1$
+	568	String txt = SpecificitiesCoreMessages.unit+colseparator+"F"; //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.specificities.core/src/org/txm/specificities/core/statsengine/r/function/SpecificitiesR.java
-	144	throw new StatException(SpecificitiesCoreMessages.ComputeError_FAILED_TO_GET_SPECIFICITIES + e.getMessage(), e);
+	144	throw new StatException(SpecificitiesCoreMessages.failedToGetTheSpecificitesDDot + e.getMessage(), e);
 /home/mdecorde/workspace047/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java
-	240	typeFrequencyColumn.setText(TXMCoreMessages.common_frequency + " " + SpecificitiesUIMessages.SpecificitiesTableEditor_11 + " " + this.getResult().getCorpusSize()); //$NON-NLS-1$ //$NON-NLS-2$
+	240	typeFrequencyColumn.setText(TXMCoreMessages.common_frequency + " " + SpecificitiesUIMessages.t + " " + this.getResult().getCorpusSize()); //$NON-NLS-1$ //$NON-NLS-2$
 /home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java
-	71	System.out.println(RCoreMessages.ExecuteRScript_2+(System.currentTimeMillis()-time)+RCoreMessages.ExecuteRText_2);
-	133	System.out.println(RCoreMessages.ExecuteRScript_2+(System.currentTimeMillis()-time)+RCoreMessages.ExecuteRScript_3);
+	71	System.out.println(RCoreMessages.doneDDot+(System.currentTimeMillis()-time)+RCoreMessages.ms);
+	133	System.out.println(RCoreMessages.doneDDot+(System.currentTimeMillis()-time)+RCoreMessages.ms);
 /home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java
 	215	System.out.println(RCoreMessages.error_failedToConnectToTheRWorkspace + host+ ", " + port + ", " + user); //$NON-NLS-1$//$NON-NLS-2$
 	216	Log.severe(RCoreMessages.error_failedToConnectToTheRWorkspace + host+ ", " + port + ", " + user); //$NON-NLS-1$//$NON-NLS-2$
-	1137	int[] dims = eval(StatsEngineCoreMessages.MatrixImpl_2+exp+")").asIntegers(); //$NON-NLS-2$
+	1137	int[] dims = eval(StatsEngineCoreMessages.dim+exp+")").asIntegers(); //$NON-NLS-2$
 /home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/StartRserve.java
 	154	Log.severe(RCoreMessages.error_failedToStartRServeWithCommand + x.getMessage());
 	211	System.err.println(RCoreMessages.error_failedToRunREG + rge);
 /home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java
-	438	throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_28 + index
-	439	+ StatsEngineCoreMessages.MatrixImpl_29 + ncol + ")"); //$NON-NLS-1$
-	490	return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.MatrixImpl_2+symbol+")[2]").asInteger(); //$NON-NLS-2$
-	503	return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.MatrixImpl_2+symbol+")[1]").asInteger(); //$NON-NLS-2$
-	505	Log.severe(StatsEngineCoreMessages.MatrixImpl_67 + e);
-	517	throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_22 + index
-	518	+ StatsEngineCoreMessages.MatrixImpl_23 + nrow + ")"); //$NON-NLS-1$
-	615	System.out.println(StatsEngineCoreMessages.MatrixImpl_73+ncol+" imported="+colsize); //$NON-NLS-2$
-	922	throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_10 + row
-	923	+ StatsEngineCoreMessages.MatrixImpl_11 + nrow + ")"); //$NON-NLS-1$
-	926	throw new IllegalArgumentException(StatsEngineCoreMessages.MatrixImpl_13 + col
-	927	+ StatsEngineCoreMessages.MatrixImpl_14 + ncol + ")"); //$NON-NLS-1$
+	438	throw new IllegalArgumentException(StatsEngineCoreMessages.columnIndex + index
+	439	+ StatsEngineCoreMessages.tooBigMax + ncol + ")"); //$NON-NLS-1$
+	490	return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.dim+symbol+")[2]").asInteger(); //$NON-NLS-2$
+	503	return RWorkspace.getRWorkspaceInstance().eval(StatsEngineCoreMessages.dim+symbol+")[1]").asInteger(); //$NON-NLS-2$
+	505	Log.severe(StatsEngineCoreMessages.matrixDDotFailedToGetNrowDDot + e);
+	517	throw new IllegalArgumentException(StatsEngineCoreMessages.rowIndex + index
+	518	+ StatsEngineCoreMessages.tooBigMax + nrow + ")"); //$NON-NLS-1$
+	615	System.out.println(StatsEngineCoreMessages.matrixImplDDotErrorDDotColumnSizeDiffersDDotOriginal+ncol+" imported="+colsize); //$NON-NLS-2$
+	922	throw new IllegalArgumentException(StatsEngineCoreMessages.rowIndex + row
+	923	+ StatsEngineCoreMessages.tooBigMax + nrow + ")"); //$NON-NLS-1$
+	926	throw new IllegalArgumentException(StatsEngineCoreMessages.colIndex + col
+	927	+ StatsEngineCoreMessages.tooBigMax + ncol + ")"); //$NON-NLS-1$
 /home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java
-	49	TXMUIMessages.ShowSvgHelp_1 +
-	50	TXMUIMessages.ShowSvgHelp_2 +
-	51	TXMUIMessages.ShowSvgHelp_3 +
-	52	TXMUIMessages.ShowSvgHelp_4 +
+	49	TXMUIMessages.panDDotRightMousePlusDrag +
+	50	TXMUIMessages.zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag +
+	51	TXMUIMessages.zoomToSelectionDDotCtrlPlusLeftMousePlusdrag +
+	52	TXMUIMessages.EMPTY +
 /home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java
-	100	System.out.println(RUIMessages.CheckRPackages_13+e);
-	124	System.out.println(RUIMessages.CheckRPackages_14+p+RUIMessages.CheckRPackages_15);
-	131	System.out.println(RUIMessages.CheckRPackages_19+p+RUIMessages.CheckRPackages_20);
-	134	System.out.println(RUIMessages.CheckRPackages_21+p+RUIMessages.CheckRPackages_22+p+RUIMessages.CheckRPackages_23);
-	139	System.out.println(RUIMessages.CheckRPackages_24+e);
-	181	System.out.println(RUIMessages.CheckRPackages_31+elem);
-	184	System.out.println(RUIMessages.CheckRPackages_32+rList);
-	187	System.out.println(RUIMessages.CheckRPackages_33+rRez);
-	207	System.out.println(RUIMessages.CheckRPackages_35+p+RUIMessages.CheckRPackages_36+currentVersion+RUIMessages.CheckRPackages_37+packages.get(p));
-	218	System.out.println(RUIMessages.CheckRPackages_42+p+RUIMessages.CheckRPackages_43+newVersion+RUIMessages.CheckRPackages_44);
+	100	System.out.println(RUIMessages.anErrorOccuredWhileGettingRWorkspaceInsanceDDot+e);
+	124	System.out.println(RUIMessages.the+p+RUIMessages.packageIsNotInstalledTryingToInstallItNow);
+	131	System.out.println(RUIMessages.doneDDot+p+RUIMessages.installedSuccessfully);
+	134	System.out.println(RUIMessages.the+p+RUIMessages.packageWasNotInstalledPleaseInstallItManuallyDDotRunRAndExecuteInstallpackages+p+RUIMessages.CheckRPackages_23);
+	139	System.out.println(RUIMessages.errorWhileInstallingPackageDDot+e);
+	181	System.out.println(RUIMessages.eRRORDDotRlistFirstElementIsNotREXPIntegerDDot+elem);
+	184	System.out.println(RUIMessages.eRRORDDotREvalListSizeIs0DDot+rList);
+	187	System.out.println(RUIMessages.eRRORDDotREvalIsNotAListDDot+rRez);
+	207	System.out.println(RUIMessages.updatingThe+p+RUIMessages.CheckRPackages_36+currentVersion+RUIMessages.rPackageUpToVersion+packages.get(p));
+	218	System.out.println(RUIMessages.updateOf+p+RUIMessages.failedCurrentVersionIsStill+newVersion+RUIMessages.warningDDotWindowsUsersNeedToRestartTXM);
 /home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToRCommand.java
-	69	JobHandler jobhandler = new JobHandler(RUIMessages.SendToR_0+ list) {
-	76	monitor.beginTask(RUIMessages.SendToR_0+ list, 100);
-	81	monitor.subTask(RUIMessages.SendToR_0+ o);
+	69	JobHandler jobhandler = new JobHandler(RUIMessages.sendingToRWorkspaceDDot+ list) {
+	76	monitor.beginTask(RUIMessages.sendingToRWorkspaceDDot+ list, 100);
+	81	monitor.subTask(RUIMessages.sendingToRWorkspaceDDot+ o);
 /home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java
-	203	System.err.println(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+	203	System.err.println(TXMUIMessages.failedToSavePreferencesDDot + e);
 /home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java
-	249	System.out.println(RUIMessages.RConsole_1 + e);
+	249	System.out.println(RUIMessages.errorWhileInitializingRConsoleDDot + e);
 /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCmd.java
-	92	System.out.println(TXMCoreMessages.TSCmd_30+ query);
+	92	System.out.println(TXMCoreMessages.queryWasDDot+ query);
 /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpus.java
-	131	catch (Exception e) { System.out.println(TXMCoreMessages.TSCorpus_0+e.getMessage());}
+	131	catch (Exception e) { System.out.println(TXMCoreMessages.couldntReadCorpusDDot+e.getMessage());}
 /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpusManager.java
-	68	System.out.println(TXMCoreMessages.TSCorpusManager_0+registrydir);
-	72	System.out.println(TXMCoreMessages.TSCorpusManager_1+configdir);
+	68	System.out.println(TXMCoreMessages.errorRegDirDDot+registrydir);
+	72	System.out.println(TXMCoreMessages.errorConfigdirDirDDot+configdir);
 /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSResult.java
-	163	System.out.println(TXMCoreMessages.TSResult_0+this.getNumberOfMatch());
-	165	System.out.println(TXMCoreMessages.TSResult_2+this.getCurrentMatch().getNumberOfSubGraph());
+	163	System.out.println(TXMCoreMessages.numberOfMatch+this.getNumberOfMatch());
+	165	System.out.println(TXMCoreMessages.numberOfSubMatch+this.getCurrentMatch().getNumberOfSubGraph());
 /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java
-	42	catch (IOException e) { System.out.println(TXMCoreMessages.TigerXmlIndexing_6+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e); }
-	43	catch (SAXException e) { System.out.println(TXMCoreMessages.TigerXmlIndexing_7+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e);}
+	42	catch (IOException e) { System.out.println(TXMCoreMessages.iODDot+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e); }
+	43	catch (SAXException e) { System.out.println(TXMCoreMessages.sAXDDot+e.getMessage()); org.txm.utils.logger.Log.printStackTrace(e);}
 /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java
-	399	System.out.println(TXMUIMessages.LastCQPError + CQPSearchEngine.getCqiClient().getLastCQPError());
-	401	System.out.println(IndexUIMessages.IndexEditor_10+e1);
+	399	System.out.println(TXMUIMessages.lastCQPErrorDDot + CQPSearchEngine.getCqiClient().getLastCQPError());
+	401	System.out.println(IndexUIMessages.cQPErrorDDot+e1);
 	874	freqColumn.setText(TXMCoreMessages.common_frequency + " T=" + partition.getTotalSize()); //$NON-NLS-1$
 	877	freqColumn.setText(TXMCoreMessages.common_frequency + " T=" + corpus.getSize()); //$NON-NLS-1$
-	1099	lFminInfo.setText(IndexUIMessages.IndexEditor_25 + index.getFmin());
-	1100	lFmaxInfo.setText(IndexUIMessages.IndexEditor_26 + index.getFmax());
-	1101	lTInfo.setText(IndexUIMessages.IndexEditor_27 + index.getT());
-	1102	lVInfo.setText(IndexUIMessages.IndexEditor_28 + index.getV());
+	1099	lFminInfo.setText(IndexUIMessages.IndexEditor_17 + index.getFmin());
+	1100	lFmaxInfo.setText(IndexUIMessages.IndexEditor_17 + index.getFmax());
+	1101	lTInfo.setText(IndexUIMessages.IndexEditor_17 + index.getT());
+	1102	lVInfo.setText(IndexUIMessages.IndexEditor_17 + index.getV());
 /home/mdecorde/workspace047/org.txm.utils.core/src/org/txm/utils/ExecTimer.java
 	33	message = ""+((int)t/60)+UtilsCoreMessages.ExecTimer_2+((int)t%60)+UtilsCoreMessages.ExecTimer_1; //$NON-NLS-1$
 	35	message = ""+((int)t/3600)+UtilsCoreMessages.ExecTimer_3+((int)(t%3600)/60)+UtilsCoreMessages.ExecTimer_2+((int)(t%3600)%60)+ UtilsCoreMessages.ExecTimer_1; //$NON-NLS-1$
@@ -669,6 +669,6 @@
 	140	throw new IOException(UtilsCoreMessages.FileCopy_0 + src.getAbsolutePath()
 	144	throw new IOException(UtilsCoreMessages.FileCopy_2 + src.getAbsolutePath()
 /home/mdecorde/workspace047/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/editors/WordCloudEditor.java
-	72	Log.info(WordCloudUIMessages.Log_WordCloud_ready + this.getResult());
+	72	Log.info(WordCloudUIMessages.wordCloudReadyDDot + this.getResult());
 /home/mdecorde/workspace047/org.txm.xmleditor.rcp/src/org/txm/xmleditor/OpenXMLEditor.java
 	109	System.out.println(XMLEditorMessages.OpenXMLEditor_4+e);
Index: tmp/org.txm.translate.rcp/remove keys.txt
===================================================================
--- tmp/org.txm.translate.rcp/remove keys.txt	(revision 0)
+++ tmp/org.txm.translate.rcp/remove keys.txt	(revision 1335)
@@ -0,0 +1,8 @@
+Initializing project messages...
+ .........|.........|.........|.........|.........|.........|.........|.........|.........|.........|
+
+all keys: [ABMessages.xx, AHCCoreMessages.RESULT_TYPE, AHCCoreMessages.error_errorWhileExportingCAHToTXT, AHCUIMessages.bind, AHCUIMessages.common_metric, AHCUIMessages.computeColumns, AHCUIMessages.computeRows, AHCUIMessages.computingClassificationWithP0, AHCUIMessages.displayChartsIn2D, AHCUIMessages.error_canNotComputeAHCWith, AHCUIMessages.method, AHCUIMessages.numberOfClusters, AHCUIMessages.numberOfClustersDDot, CACoreMessages.RESULT_TYPE, CACoreMessages.axis, CACoreMessages.axis_2, CACoreMessages.bind, CACoreMessages.cantCreateBarChartOfTheCASingularValues, CACoreMessages.cantCreateCAChartFileChartsEngineDDotP0, CACoreMessages.charts_singularValues_tooltipSum, CACoreMessages.columns, CACoreMessages.common_c1, CACoreMessages.common_c2, CACoreMessages.common_c3, CACoreMessages.common_cont, CACoreMessages.common_cos2, CACoreMessages.common_dist, CACoreMessages.common_mass, CACoreMessages.common_q12, CACoreMessages.common_q13, CACoreMessages.common_q23, CACoreMessages.coordinates, CACoreMessages.correspondenceAnalysisFactorialMapofTheP0, CACoreMessages.eigenvalue, CACoreMessages.eigenvalue_2, CACoreMessages.eigenvalues, CACoreMessages.eigenvalues_2, CACoreMessages.error_canNotLoadCALibrary, CACoreMessages.error_errorWhileComputingCA, CACoreMessages.error_failedToGetConstributionRow, CACoreMessages.error_failedToGetContributionColumn, CACoreMessages.error_failedToGetCos2Column, CACoreMessages.error_failedToGetCos2Row, CACoreMessages.error_lexicalTableNotFoundInWorkspace, CACoreMessages.error_unableToExtractSingularValues, CACoreMessages.frequency, CACoreMessages.percent, CACoreMessages.rows, CACoreMessages.t, CAUIMessages.ComputeCorrespondanceAnalysisDialog_0, CAUIMessages.CorrespondanceAnalysisEditorInput_10, CAUIMessages.CorrespondanceAnalysisEditorInput_11, CAUIMessages.CorrespondanceAnalysisEditorInput_4, CAUIMessages.SHOW_HIDE_POINT_SHAPES, CAUIMessages.axesDDot, CAUIMessages.bind, CAUIMessages.canNotComputeCAOnLexicalTableWithLessThan4Columns, CAUIMessages.canNotComputeCAWithLessThan4RowsInTheTable, CAUIMessages.canNotComputeFactorialAnalysisWithOnlyP0PartsTheMinimumIs4Parts, CAUIMessages.chi, CAUIMessages.colsInfos, CAUIMessages.computingCorrespondenceAnalysisOnP0WithPropertyP1, CAUIMessages.contributionColumnFormat, CAUIMessages.coordColumnFormat, CAUIMessages.cosColumnFormat, CAUIMessages.creatingCA, CAUIMessages.distanceColumnFormat, CAUIMessages.eigenvalue, CAUIMessages.eigenvalues, CAUIMessages.eigenvaluesHistogram, CAUIMessages.errorWhileOpeningCAEditorDDot, CAUIMessages.error_cannot_compute_with, CAUIMessages.error_cannot_compute_with_selection, CAUIMessages.error_opening, CAUIMessages.factPlan, CAUIMessages.infosDDotP0, CAUIMessages.lexicalTableCreatedWhenCalledFromAPartition, CAUIMessages.loadingCorrespondenceAnalysisResults, CAUIMessages.massColumnFormat, CAUIMessages.openingTheCorrespondenceAnalysisResults, CAUIMessages.q, CAUIMessages.qualityColumnFormat, CAUIMessages.rowsInfos, CAUIMessages.showPointShapes, CAUIMessages.showTheColumns, CAUIMessages.showTheRows, CAUIMessages.showhidePointShapes, CAUIMessages.showhideTheColumnPoints, CAUIMessages.showhideTheRowPoints, CAUIMessages.wrongInput, CQPSearchEngineCoreMessages.addingAlignmentAttributeToCorpusP0RegistryDDotP1, CQPSearchEngineCoreMessages.b2, CQPSearchEngineCoreMessages.bind, CQPSearchEngineCoreMessages.cLErrorDDot, CQPSearchEngineCoreMessages.cQPErrorDDot, CQPSearchEngineCoreMessages.cantFindCQPLocationDDot, CQPSearchEngineCoreMessages.cantFindRegistryFile, CQPSearchEngineCoreMessages.clientdumpSubCorpussubcorpusNetCqiClientCQICONSTFIELDMATCH12DDot, CQPSearchEngineCoreMessages.connectedToTheSearchEngine, CQPSearchEngineCoreMessages.connectingToTheSearchEngineWithTheFollowingParametersDDotP0DDotP1AtP2P3, CQPSearchEngineCoreMessages.couldNotBeFoundInRegistryFile, CQPSearchEngineCoreMessages.couldNotPatchTheRegistryFile, CQPSearchEngineCoreMessages.couldNotReconnectToServerDDot, CQPSearchEngineCoreMessages.cqpserverStderrDDot, CQPSearchEngineCoreMessages.cqpserverStdoutDDot, CQPSearchEngineCoreMessages.dataDirectory, CQPSearchEngineCoreMessages.encodingTo, CQPSearchEngineCoreMessages.errorDDotEditionDefaultIsNull, CQPSearchEngineCoreMessages.errorDDotTextP0IsNull, CQPSearchEngineCoreMessages.errorDDotTextidsP0AndWordidsP1, CQPSearchEngineCoreMessages.failedToConnectToSearchEngine, CQPSearchEngineCoreMessages.fixingRegistryFileP0WithP1, CQPSearchEngineCoreMessages.gettingLastCQPError, CQPSearchEngineCoreMessages.internalCQIErrorDDot, CQPSearchEngineCoreMessages.lastCQPErrorDDot, CQPSearchEngineCoreMessages.lastCQiErrorDDot, CQPSearchEngineCoreMessages.noError, CQPSearchEngineCoreMessages.p0IsNotAValidCQPIDForASubcorpusItMustBeAnUppercaseCharacterFollowedByLowercaseCharacters, CQPSearchEngineCoreMessages.processStopedDDot, CQPSearchEngineCoreMessages.processingCorpus, CQPSearchEngineCoreMessages.queryError, CQPSearchEngineCoreMessages.readBooleanFromTheCQiServerDDotP0, CQPSearchEngineCoreMessages.readByteFromTheCQiServerDDotP0, CQPSearchEngineCoreMessages.readIntegerArrayFromTheCQiServerDDotP0, CQPSearchEngineCoreMessages.readIntegerFromTheCQiServerDDotP0, CQPSearchEngineCoreMessages.readString2DIntegerFromTheCQiServerDDotP0, CQPSearchEngineCoreMessages.readStringArrayFromTheCQiServerDDotP0, CQPSearchEngineCoreMessages.readStringFromTheCQiServerDDotP0, CQPSearchEngineCoreMessages.readingAnIntegerTableFromTheCQiServer, CQPSearchEngineCoreMessages.readingBooleanFromTheCQiServer, CQPSearchEngineCoreMessages.readingHeaderFromTheCQiServer, CQPSearchEngineCoreMessages.readingIntegerArrayFromTheCQiServer, CQPSearchEngineCoreMessages.readingIntegerFromTheCQiServer, CQPSearchEngineCoreMessages.readingStringArrayFromTheCQiServer, CQPSearchEngineCoreMessages.readingStringFromTheCQiServer, CQPSearchEngineCoreMessages.searchEngineLaunched, CQPSearchEngineCoreMessages.sourceRegistryDoesNotExistsDDot, CQPSearchEngineCoreMessages.startingProcessWithCommandDDot, CQPSearchEngineCoreMessages.stoppingProcessDDot, CQPSearchEngineCoreMessages.theBinaryDirectoryDoesNotExistsDDot, CQPSearchEngineCoreMessages.theCorporaDirectoryDoesNotExistsDDot, CQPSearchEngineCoreMessages.theDataDirectoryDoesNotExistsDDot, CQPSearchEngineCoreMessages.theDirectoryDoesNotExistsDDot, CQPSearchEngineCoreMessages.theFileP0CannotBeFound, CQPSearchEngineCoreMessages.theRegistryDirectoryDoesNotExistsDDot, CQPSearchEngineCoreMessages.theTargetCorpusDoesntExist, CQPSearchEngineCoreMessages.unknownCQPCQIErrorDDotB1, CQPSearchEngineCoreMessages.unknownCQPCodeDDotB1, CQPSearchEngineCoreMessages.unknownCQPCodesDDotB1, CQPSearchEngineCoreMessages.unknownCQPErrorDDotB1, CQPSearchEngineCoreMessages.updating, CQPSearchEngineCoreMessages.updatingP0CorpusLanguageToP1, CQPUIMessages.CQPPreferencePage_16, CQPUIMessages.additionalAmpoptionsForTheCWBServerDDot, CQPUIMessages.ampRemoteCWBServerAddressDDot, CQPUIMessages.cQPlibPath, CQPUIMessages.cWBServerDDotAmphostDDot, CQPUIMessages.cWBServerDDotAmploginDDot, CQPUIMessages.cWBServerDDotAmppasswordDDot, CQPUIMessages.cWBServerDDotAmpportDDot, CQPUIMessages.pathToCWBServerBinary, CQPUIMessages.pathToCWBServerInitializationFile, CQPUIMessages.useNetworkProtocol, ChartsEngineCoreMessages.EMPTY, ChartsEngineCoreMessages.bind, ChartsEngineCoreMessages.error_cantCreateTmpChartFile, ChartsEngineCoreMessages.error_cantWriteInFile, ChartsEngineMessages.ChartsEngine_CA_FACTORIAL_MAP_AXIS_LABEL_PREFIX, ChartsEngineMessages.ChartsEngine_LABEL_VALUE_SEPARATORS, ConcordanceCoreMessages.RESULT_TYPE, ConcordanceCoreMessages.compositeDDot, ConcordanceCoreMessages.context, ConcordanceCoreMessages.failedToExportConcordanceDDot, ConcordanceCoreMessages.failedToGetTextsLimitsDDot, ConcordanceCoreMessages.failedToRetrieveTextidPropertyFromLines, ConcordanceCoreMessages.keyword, ConcordanceCoreMessages.keyword_2, ConcordanceCoreMessages.leftContext, ConcordanceCoreMessages.leftContext_2, ConcordanceCoreMessages.none, ConcordanceCoreMessages.reference, ConcordanceCoreMessages.reference_2, ConcordanceCoreMessages.references, ConcordanceCoreMessages.results, ConcordanceCoreMessages.resultsRetrievedIn, ConcordanceCoreMessages.retrieving, ConcordanceCoreMessages.rightContext, ConcordanceCoreMessages.rightContext_2, ConcordanceCoreMessages.undefined, ConcordanceMessages.java, ConcordanceUIMessages._class, ConcordanceUIMessages.ampLeftContextLengthInWords, ConcordanceUIMessages.ampRightContextLengthInWords, ConcordanceUIMessages.anErrorOccurredWhileRetrievingTheConcordanceLinesDDotP0, ConcordanceUIMessages.bind, ConcordanceUIMessages.cQPErrorDDot, ConcordanceUIMessages.canNotOpenConcordanceEditorWithP0, ConcordanceUIMessages.concordanceParameters, ConcordanceUIMessages.deleteSelectedLines, ConcordanceUIMessages.editor_19, ConcordanceUIMessages.editor_21, ConcordanceUIMessages.editor_22, ConcordanceUIMessages.editor_23, ConcordanceUIMessages.editor_24, ConcordanceUIMessages.editor_25, ConcordanceUIMessages.editor_26, ConcordanceUIMessages.editor_27, ConcordanceUIMessages.editor_28, ConcordanceUIMessages.editor_3dots, ConcordanceUIMessages.editor_empty, ConcordanceUIMessages.errorWhileBuildingInterfaceDDotP0, ConcordanceUIMessages.fatalErrorDDotP0, ConcordanceUIMessages.inf, ConcordanceUIMessages.java, ConcordanceUIMessages.keyword, ConcordanceUIMessages.keyword_2, ConcordanceUIMessages.left, ConcordanceUIMessages.leftContext, ConcordanceUIMessages.linesPerAmpPageDDot, ConcordanceUIMessages.navigation, ConcordanceUIMessages.openingCorpusEdition, ConcordanceUIMessages.openingTheConcordanceResult, ConcordanceUIMessages.propertiesPanel, ConcordanceUIMessages.reference, ConcordanceUIMessages.references, ConcordanceUIMessages.right, ConcordanceUIMessages.rightContext, ConcordanceUIMessages.size, ConcordanceUIMessages.sort, ConcordanceUIMessages.sorting, ConcordanceUIMessages.sortingKeywordColumn, ConcordanceUIMessages.sortingLeftContextColumn, ConcordanceUIMessages.sortingReferenceColumn, ConcordanceUIMessages.sortingRightContextColumn, ConcordanceUIMessages.sortingWith, ConcordanceUIMessages.startComputingConcordance, ConcordanceUIMessages.sup, ConcordanceUIMessages.view, CooccurrenceCoreMessages.Cooccurrence_5, CooccurrenceCoreMessages.RESULT_TYPE, CooccurrenceCoreMessages.coFreq, CooccurrenceCoreMessages.errorDDotNegativeArgumentInFactlnFunction, CooccurrenceCoreMessages.errorDDotNegativeArgumentInRbicolnFunction, CooccurrenceCoreMessages.errorDDotNoCooccurrents, CooccurrenceCoreMessages.fDDot, CooccurrenceCoreMessages.freq, CooccurrenceCoreMessages.info_buildingLexicalTable, CooccurrenceCoreMessages.info_buildingLineSignatures, CooccurrenceCoreMessages.info_buildingQueries, CooccurrenceCoreMessages.info_computingSpecificitiesScores, CooccurrenceCoreMessages.info_counting, CooccurrenceCoreMessages.info_details, CooccurrenceCoreMessages.info_retreivingMatches, CooccurrenceCoreMessages.meanDist, CooccurrenceCoreMessages.meanDistDDot, CooccurrenceCoreMessages.occ, CooccurrenceCoreMessages.occDDot, CooccurrenceCoreMessages.occFreqCoFreqScoreMeanDistMode, CooccurrenceCoreMessages.propertiesDDot, CooccurrenceCoreMessages.score, CooccurrenceCoreMessages.scoreDDot, CooccurrenceUIMessages.CooccurrencesEditor_2, CooccurrenceUIMessages.cmin, CooccurrenceUIMessages.cofrequency, CooccurrenceUIMessages.cooccurrences, CooccurrenceUIMessages.cooccurrent, CooccurrenceUIMessages.cooccurrentsPropertiesDDot, CooccurrenceUIMessages.errorWhileReadingCorpusSize, CooccurrenceUIMessages.maximumLeft, CooccurrenceUIMessages.maximumRight, CooccurrenceUIMessages.meanDistance, CooccurrenceUIMessages.minimumCooccurrencyCountThreshold, CooccurrenceUIMessages.minimumCooccurrencyScoreThreshold, CooccurrenceUIMessages.minimumFrequencyThresholdOfTheCooccurrent, CooccurrenceUIMessages.minimumLeft, CooccurrenceUIMessages.minimumRight, CooccurrenceUIMessages.score, CooccurrenceUIMessages.scoreFormatDefault00000E00, CooccurrenceUIMessages.score_2, CooccurrenceUIMessages.sortByDDotP0, CooccurrenceUIMessages.theScoreThresholdMustBeARealNumberCurrentValueEqualsP0, CooccurrenceUIMessages.thresholdsDDotFmin, CooccurrenceUIMessages.usePartialLexicalTable, EditionUIMessages.CommandLink_empty, EditionUIMessages.abortingDDotSelectionIsNotACorpus, EditionUIMessages.back, EditionUIMessages.bind, EditionUIMessages.cannotCallTxmcommandWithoutIdParameterDDotP0, EditionUIMessages.controls, EditionUIMessages.copyTextSelection, EditionUIMessages.edition, EditionUIMessages.editions, EditionUIMessages.editor_empty, EditionUIMessages.enableFastWordHighlight, EditionUIMessages.errorDDotCouldNotRetrieveLineWordIdsAbortingBackToText, EditionUIMessages.errorDDotTxmeditioncorpusidEditionidTextidWordidCalledWithNoArguments, EditionUIMessages.errorWhileGettingAvailableEditionsDDot, EditionUIMessages.errorWhileOpeningEditionDDotP0, EditionUIMessages.errorWhileOpeningEditorDDotP0, EditionUIMessages.error_while_reading, EditionUIMessages.failToRetrieveFirstPageOfEditionEqualsP0AndTextEqualsP1, EditionUIMessages.firstPageOfTheText, EditionUIMessages.firstTextOfTheCorpus, EditionUIMessages.forward, EditionUIMessages.inTheCorpus, EditionUIMessages.lastPageOfTheText, EditionUIMessages.lastTextOfTheCorpus, EditionUIMessages.nextPage, EditionUIMessages.nextText, EditionUIMessages.noEditionFound, EditionUIMessages.noEditionFoundForTextEqualsP0AndEditionEqualsP1, EditionUIMessages.noEditionToOpen, EditionUIMessages.noEditionToOpen_2, EditionUIMessages.noEditionWithNameEqualsP0AvailableForTextEqualsP1, EditionUIMessages.openingDefaultEditionsDDotP0, EditionUIMessages.openingDefaultEditionsDDotP0_2, EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDot, EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDotP0, EditionUIMessages.pageButtons, EditionUIMessages.pageNotFoundP0, EditionUIMessages.previousPage, EditionUIMessages.previousText, EditionUIMessages.reload, EditionUIMessages.sCRIPTRETURNEDEqualsP0, EditionUIMessages.selectOneOrMoreEditions, EditionUIMessages.textButtons, EditionUIMessages.warningDDotCouldNotFindEditionForNameEqualsP0, EditionUIMessages.warningDDotUnknownedParameterIdEqualsP0, IndexCoreMessages.RESULT_TYPE, IndexCoreMessages.computingTheLexiconOfSubcorpusP0, IndexCoreMessages.consoleDDot, IndexCoreMessages.failedToExportLexiconDDot, IndexCoreMessages.formsAndFrequenciesTablesMustHaveTheSameSize, IndexCoreMessages.indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4, IndexCoreMessages.indexDDotPartitionP0queryP1propertiesP2FminP3FmaxP4, IndexCoreMessages.lexicon, IndexCoreMessages.lexiconDDot, IndexUIMessages.IndexEditor_17, IndexUIMessages.IndexEditor_18, IndexUIMessages.IndexEditor_25, IndexUIMessages.IndexEditor_26, IndexUIMessages.IndexEditor_27, IndexUIMessages.IndexEditor_28, IndexUIMessages.IndexEditor_3, IndexUIMessages.IndexEditor_31, IndexUIMessages.IndexEditor_36, IndexUIMessages.IndexEditor_37, IndexUIMessages.IndexEditor_4, IndexUIMessages.IndexEditor_5, IndexUIMessages.IndexEditor_6, IndexUIMessages.IndexEditor_7, IndexUIMessages.bind, IndexUIMessages.cQPErrorDDot, IndexUIMessages.computingIndex, IndexUIMessages.couldntInitializeIndexTable, IndexUIMessages.failedToComputeIndex, IndexUIMessages.index, IndexUIMessages.indexDDotQueryIsEmpty, IndexUIMessages.indexOfInfP0SupWithPropertyDDotP1InTheCorpusDDotP2, IndexUIMessages.indexOfInfP0SupWithPropertyDDotP1InThePartitionDDotP2, IndexUIMessages.infos, IndexUIMessages.numberOfLinesPerResultPage, IndexUIMessages.openingIndexResults, IndexUIMessages.openingTheIndexResults, IndexUIMessages.pageSize, InformationCoreMessages.Properties_12, InternalViewCoreMessages.RESULT_TYPE, InternalViewCoreMessages.internalViewDDotFailedToRetrieveStructPropertiesValuesDDot, InternalViewCoreMessages.noStructureInformations, InternalViewCoreMessages.structureInformationsDDot, InternalViewUIMessages.bind, InternalViewUIMessages.errorDDot, InternalViewUIMessages.errorDDotSelectionIsNotACorpus, InternalViewUIMessages.errorWhileInternalViewGoBackTo, InternalViewUIMessages.error_backto_internalview, InternalViewUIMessages.navigation, InternalViewUIMessages.qUERYDDot, InternalViewUIMessages.structuralProperties, InternalViewUIMessages.structure, KRAnnotationUIMessages.ConcordancesEditor_67, KRAnnotationUIMessages.ConcordancesEditor_68, KRAnnotationUIMessages.ConcordancesEditor_71, KRAnnotationUIMessages.ConcordancesEditor_72, KRAnnotationUIMessages.aFFECT, KRAnnotationUIMessages.aboutAnnotations, KRAnnotationUIMessages.addANewCategory, KRAnnotationUIMessages.affect, KRAnnotationUIMessages.all, KRAnnotationUIMessages.allLines, KRAnnotationUIMessages.annotatingConcordanceSelection, KRAnnotationUIMessages.annotationCanceledByUser, KRAnnotationUIMessages.annotationCanceledByUser_2, KRAnnotationUIMessages.annotationCanceledByUser_3, KRAnnotationUIMessages.at, KRAnnotationUIMessages.at_2, KRAnnotationUIMessages.availableAnnotationTypesDDot, KRAnnotationUIMessages.availableAnnotationTypesDDot_2, KRAnnotationUIMessages.availableAnnotationTypesDDot_3, KRAnnotationUIMessages.availableValuesForP0, KRAnnotationUIMessages.bind, KRAnnotationUIMessages.category, KRAnnotationUIMessages.closeTheToolbarWithoutSaving, KRAnnotationUIMessages.closeTheToolbarWithoutSaving_2, KRAnnotationUIMessages.closeTheToolbarWithoutSaving_3, KRAnnotationUIMessages.concordanceAnnotationArea, KRAnnotationUIMessages.concordanceAnnotationArea_2, KRAnnotationUIMessages.concordanceAnnotationArea_3, KRAnnotationUIMessages.confirmAnnotationAffectation, KRAnnotationUIMessages.couldNotAnnotateTheValue, KRAnnotationUIMessages.delete, KRAnnotationUIMessages.elementsContinue, KRAnnotationUIMessages.enterAValueForAnId, KRAnnotationUIMessages.errorDDotNoSuitableKnowledgeRepositoryFound, KRAnnotationUIMessages.errorWhileAffectionAnnotationDDot, KRAnnotationUIMessages.errorWhileAnnotatingConcordanceDDot, KRAnnotationUIMessages.errorWhileAnnotatingConcordanceSelectionDDot, KRAnnotationUIMessages.errorWhileDeletingAnnotationDDot, KRAnnotationUIMessages.isOverlappingWith, KRAnnotationUIMessages.keywordsAnnotation, KRAnnotationUIMessages.listOfCategories, KRAnnotationUIMessages.lookingForTypedValueWithIdEquals, KRAnnotationUIMessages.motsPropritsInfDfaut, KRAnnotationUIMessages.newCategory, KRAnnotationUIMessages.newValueP0ForCategoryP1, KRAnnotationUIMessages.noValueFoundWithTheP0Id, KRAnnotationUIMessages.nomDeLaPropritPatternEqualsazaz09Plus, KRAnnotationUIMessages.nouvelleProprit, KRAnnotationUIMessages.oK, KRAnnotationUIMessages.onCertainSequences, KRAnnotationUIMessages.openTheListOfCategories, KRAnnotationUIMessages.pleaseEnterTheNewTypeName, KRAnnotationUIMessages.proceedToAnnotation, KRAnnotationUIMessages.property, KRAnnotationUIMessages.saveTheAnnotations, KRAnnotationUIMessages.selectAValueAmongTheList, KRAnnotationUIMessages.selectedLines, KRAnnotationUIMessages.squencesDeMotsCatgorie, KRAnnotationUIMessages.squencesDeMotsCatgorievaleur, KRAnnotationUIMessages.theEndOfAStructure, KRAnnotationUIMessages.theSequence, KRAnnotationUIMessages.theStartOfAStructure, KRAnnotationUIMessages.theValueP0IsNotAssociatedWithTheCategoryP1AssociateIt, KRAnnotationUIMessages.toSELECTIONEquals, KRAnnotationUIMessages.valueEquals, KRAnnotationUIMessages.withTheCategory, KRAnnotationUIMessages.youAreAboutToAnnotate, LexicalTableCoreMessages.RESULT_TYPE, LexicalTableCoreMessages.bind, LexicalTableCoreMessages.error_lineXDoesNotHaveXXolumns, LexicalTableCoreMessages.error_marginIsHigherThanThePartitionSize, LexicalTableCoreMessages.error_notEnoughColumns, LexicalTableCoreMessages.info_buildingLexicalTableWith, LexicalTableUIMessages.ComputeLexicalTable_10, LexicalTableUIMessages.LexicalTableEditor_16, LexicalTableUIMessages.LexicalTableEditor_4, LexicalTableUIMessages.LexicalTableEditor_5, LexicalTableUIMessages.bind, LexicalTableUIMessages.canNotCreateALexicalTableWithAnIndexCreatedOnACorpus, LexicalTableUIMessages.deleteColsDDotP0, LexicalTableUIMessages.errorDDotDifferentColumnsNumberDDotBeforeP0AfterP1, LexicalTableUIMessages.errorWhileImportingDataDDotP0, LexicalTableUIMessages.failedToImportLexicalTable, LexicalTableUIMessages.mergeColsDDotP0, LexicalTableUIMessages.mergeOrDeleteColumns, LexicalTableUIMessages.mergeOrDeleteRows, LexicalTableUIMessages.mergingLines, LexicalTableUIMessages.openingMargeConfigurationDialog, LexicalTableUIMessages.selectWhichMarginsYouWantToUse, LexicalTableUIMessages.useAllOccurrences, LexicalTableUIMessages.userIndexOccurrences, LexicalTableUIMessages.vocabulariesMustShareTheSamePartitionDDotP0, LexicalTableUIMessages.vocabulariesMustShareTheSamePropertiesDDotP0, Messages.AbstractSplashHandler2_0, Messages.AbstractSplashHandler2_1, Messages.AbstractSplashHandler2_2, Messages.AddBase_10, Messages.AddBase_29, Messages.AnalecPreferencePage_3, Messages.AnalecPreferencePage_4, Messages.AnalecPreferencePage_9, Messages.ApplicationActionBarAdvisor_0, Messages.ApplicationWorkbenchAdvisor_3, Messages.ApplicationWorkbenchAdvisor_57, Messages.ApplicationWorkbenchAdvisor_87, Messages.ApplicationWorkbenchWindowAdvisor_statusready, Messages.Application_11, Messages.Application_2, Messages.CAPreferencePage_0, Messages.CAPreferencePage_1, Messages.CAPreferencePage_3, Messages.CAPreferencePage_4, Messages.CAPreferencePage_5, Messages.CAPreferencePage_6, Messages.CAPreferencePage_7, Messages.CAPreferencePage_8, Messages.Commands_0, Messages.ComputeLexicalTable_1, Messages.ComputeLexicalTable_10, Messages.ComputeLexicalTable_2, Messages.ComputeLexicalTable_5, Messages.ComputeLexicalTable_7, Messages.ComputeSpecificities_0, Messages.ComputeSpecifities_10, Messages.ComputeSpecifities_2, Messages.ComputeWordCloud_3, Messages.Concordance_5, Messages.ConcordancesEditor_10, Messages.ConcordancesEditor_20, Messages.ConcordancesEditor_26, Messages.ConcordancesEditor_27, Messages.ConcordancesEditor_29, Messages.ConcordancesEditor_30, Messages.ConcordancesEditor_46, Messages.ConcordancesEditor_8, Messages.ConcordancesEditor_9, Messages.ConnectorDiscoveryWizardMainPage_noConnectorsFound, Messages.ConnectorDiscoveryWizardMainPage_noConnectorsFound_description, Messages.ConnectorDiscoveryWizardMainPage_provider_and_license, Messages.ConnectorDiscoveryWizardMainPage_tooltip_showOverview, Messages.ConnectorDiscoveryWizardMainPage_warningMessageConnectorUnavailable, Messages.ConnectorDiscoveryWizardMainPage_warningTitleConnectorUnavailable, Messages.ConnectorDiscoveryWizard_installProblems, Messages.CorporaView_3, Messages.CorpusPage_1, Messages.CorpusPage_10, Messages.CorpusPage_11, Messages.CorpusPage_12, Messages.CorpusPage_13, Messages.CorpusPage_14, Messages.CorpusPage_15, Messages.CorpusPage_17, Messages.CorpusPage_18, Messages.CorpusPage_2, Messages.CorpusPage_20, Messages.CorpusPage_21, Messages.CorpusPage_23, Messages.CorpusPage_24, Messages.CorpusPage_25, Messages.CorpusPage_27, Messages.CorpusPage_28, Messages.CorpusPage_29, Messages.CorpusPage_31, Messages.CorpusPage_32, Messages.CorpusPage_33, Messages.CorpusPage_34, Messages.CorpusPage_80, Messages.Corpus_Menu_Label1, Messages.Corpus_Menu_Label2, Messages.CorrespondanceAnalysisEditorInput_10, Messages.CreatePartitionDialog_11, Messages.CreatePartitionDialog_20, Messages.DiscoveryItem_Connector_already_installed_Error_Message, Messages.DiscoveryItem_Connector_already_installed_Error_Title, Messages.DiscoveryItem_Extension_installed, Messages.DiscoveryViewer_Certification_Label0, Messages.DoInstallStep_10, Messages.DoInstallStep_11, Messages.DoInstallStep_17, Messages.DoInstallStep_18, Messages.DoInstallStep_2, Messages.DoInstallStep_5, Messages.DoInstallStep_6, Messages.DoInstallStep_7, Messages.DoInstallStep_9, Messages.EditStructure_0, Messages.ExportGlozzCorpus_0, Messages.ExportGlozzCorpus_1, Messages.ExportGlozzCorpus_2, Messages.ExportGlozzCorpus_3, Messages.ExportGlozzCorpus_4, Messages.ExportPreferencePage_21, Messages.ExportSVG_0, Messages.ExportSVG_1, Messages.ExportSVG_2, Messages.ExportSVG_3, Messages.ExportTEICorpus_0, Messages.ExportTEICorpus_1, Messages.ExportTEICorpus_2, Messages.ExportTEICorpus_3, Messages.ExportTEICorpus_4, Messages.FORMAT_ERROR_FOR_MAP, Messages.FileExplorerPreferencePage_2, Messages.File_Menu_Label1, Messages.File_Menu_Label2, Messages.FrequencyListEditorInput_6, Messages.FrequencyListEditorInput_9, Messages.GAction, Messages.GProgression, Messages.GraphicalLogger_0, Messages.GraphicalLogger_2, Messages.GraphicalLogger_3, Messages.GraphicalLogger_4, Messages.GraphicalLogger_5, Messages.GroovyConsole_4, Messages.GroovyConsole_5, Messages.Help_Menu_Label1, Messages.Help_Menu_Label2, Messages.ILLEGAL_BOOLEAN, Messages.ILLEGAL_CHAR, Messages.ILLEGAL_FIELD_SIGNATURE, Messages.ILLEGAL_LIST, Messages.ILLEGAL_METHOD_SIGNATURE, Messages.ILLEGAL_OPERAND, Messages.ImportDialog_3, Messages.ImportGlozzAnnotations_0, Messages.ImportGlozzAnnotations_1, Messages.ImportGlozzAnnotations_10, Messages.ImportGlozzAnnotations_2, Messages.ImportGlozzAnnotations_3, Messages.ImportGlozzAnnotations_4, Messages.ImportGlozzAnnotations_5, Messages.ImportGlozzAnnotations_6, Messages.ImportGlozzAnnotations_7, Messages.ImportGlozzAnnotations_8, Messages.ImportGlozzAnnotations_9, Messages.ImportGlozzCorpus_0, Messages.ImportGlozzCorpus_1, Messages.ImportGlozzCorpus_10, Messages.ImportGlozzCorpus_11, Messages.ImportGlozzCorpus_15, Messages.ImportGlozzCorpus_17, Messages.ImportGlozzCorpus_23, Messages.ImportGlozzCorpus_24, Messages.ImportGlozzCorpus_25, Messages.ImportGlozzCorpus_26, Messages.ImportGlozzCorpus_27, Messages.ImportGlozzCorpus_28, Messages.ImportGlozzCorpus_29, Messages.ImportGlozzCorpus_3, Messages.ImportGlozzCorpus_30, Messages.ImportGlozzCorpus_32, Messages.ImportGlozzCorpus_4, Messages.ImportGlozzCorpus_5, Messages.ImportGlozzCorpus_8, Messages.ImportGlozzCorpus_9, Messages.ImportTEIAnnotations_0, Messages.ImportTEIAnnotations_1, Messages.ImportTEIAnnotations_2, Messages.ImportTEIAnnotations_3, Messages.ImportTEIAnnotations_4, Messages.ImportTEIAnnotations_5, Messages.ImportTEIAnnotations_6, Messages.ImportTEIAnnotations_7, Messages.ImportTEIAnnotations_8, Messages.ImportTEICorpus_0, Messages.ImportTEICorpus_15, Messages.ImportTEICorpus_16, Messages.ImportTEICorpus_18, Messages.ImportTEICorpus_19, Messages.ImportTEICorpus_2, Messages.ImportTEICorpus_20, Messages.ImportTEICorpus_21, Messages.ImportTEICorpus_22, Messages.ImportTEICorpus_23, Messages.ImportTEICorpus_24, Messages.ImportTEICorpus_3, Messages.ImportTEICorpus_5, Messages.ImportTEICorpus_7, Messages.ImportTEICorpus_9, Messages.InstallConnectorsJob_commaSeparator, Messages.InstallConnectorsJob_connectorsNotAvailable, Messages.InstallConnectorsJob_questionProceed, Messages.InstallConnectorsJob_questionProceed_long, Messages.InstallConnectorsJob_task_configuring, Messages.InstallConnectorsJob_unexpectedError_url, Messages.LexicalTableEditor_8, Messages.LexicalTableImpl_1, Messages.LexicalTablePreferencePage_1, Messages.LoadBinaryCorpus_1, Messages.LoadBinaryCorpus_2, Messages.LoadCorpus_0, Messages.LoadCorpus_1, Messages.LoadCorpus_2, Messages.LoadCorpus_3, Messages.LoadCorpus_4, Messages.LoadCorpus_5, Messages.LoadStructureFromGlozz_0, Messages.LoadStructureFromGlozz_1, Messages.LoadStructureFromGlozz_2, Messages.LoadStructureFromGlozz_3, Messages.LoadStructureFromGlozz_4, Messages.LoadStructure_0, Messages.LoadStructure_1, Messages.LoadStructure_2, Messages.LoadStructure_3, Messages.LoadVue_0, Messages.LoadVue_1, Messages.LoadVue_2, Messages.LoadVue_3, Messages.MAP_HAS_NO_KEY, Messages.METADATA_ERROR, Messages.MISSING_OPERAND, Messages.MULTIPLE_USE_OF_ARGUMENT, Messages.MULTIPLE_USE_OF_OPTION, Messages.MatrixImpl_10, Messages.MatrixImpl_11, Messages.MatrixImpl_13, Messages.MatrixImpl_14, Messages.MatrixImpl_5, Messages.MatrixImpl_7, Messages.MetadataPage_10, Messages.MetadataPage_11, Messages.MetadataPage_12, Messages.MetadataPage_14, Messages.MetadataPage_16, Messages.MetadataPage_18, Messages.MetadataPage_19, Messages.MetadataPage_20, Messages.MetadataPage_8, Messages.MetadataPage_9, Messages.NO_ARGUMENT_ALLOWED, Messages.NO_CONSTRUCTOR_ON_HANDLER, Messages.NO_OPTIONHANDLER, Messages.NavigationField_0, Messages.NavigationField_2, Messages.NavigationField_3, Messages.NavigationField_4, Messages.NavigationField_5, Messages.ObjectExplorer_26, Messages.OpenGraph_8, Messages.ParametersDialog_15, Messages.PartitionComposer_10, Messages.PartitionComposer_12, Messages.PartitionComposer_4, Messages.PrepareInstallProfileJob_calculatingRequirements, Messages.PrepareInstallProfileJob_computeProfileChangeRequestFailed, Messages.PrepareInstallProfileJob_notFoundDescriptorDetail, Messages.PrepareInstallProfileJob_ok, Messages.Project_5, Messages.QuantitativeDataStructureImpl_0, Messages.QuantitativeDataStructureImpl_1, Messages.QueryIndexEditor_0, Messages.QueryIndexEditor_1, Messages.QueryIndexEditor_10, Messages.QueryIndexEditor_11, Messages.QueryIndexEditor_12, Messages.QueryIndexEditor_2, Messages.QueryIndexEditor_3, Messages.QueryIndexEditor_4, Messages.QueryIndexEditor_6, Messages.QueryIndexEditor_7, Messages.QueryIndexEditor_8, Messages.QueryIndexEditor_9, Messages.REQUIRED_ARGUMENT_MISSING, Messages.REQUIRED_OPTION_MISSING, Messages.RETURN_FROM_QUERY, Messages.RPreferencePage_1, Messages.RPreferencePage_5, Messages.RestartTXM_0, Messages.STARTING_SERVER, Messages.SaveCorpus_0, Messages.SaveCorpus_1, Messages.SaveCorpus_3, Messages.SaveCorpus_5, Messages.SaveStructureAsGlozzModel_0, Messages.SaveStructureAsGlozzModel_1, Messages.SaveStructureAsGlozzModel_2, Messages.SaveStructureAsGlozzModel_3, Messages.SaveStructure_0, Messages.SaveStructure_3, Messages.SaveStructure_4, Messages.SaveStructure_5, Messages.SaveVue_0, Messages.SaveVue_3, Messages.SaveVue_4, Messages.SaveVue_5, Messages.SetContextSize_1, Messages.SetLineNumber_0, Messages.SpecificitiesResultEditorInput_11, Messages.StartRserve_0, Messages.TOO_MANY_ARGUMENTS, Messages.TextometriePreferencePage_14, Messages.TextometriePreferencePage_15, Messages.TextometriePreferencePage_18, Messages.TextometriePreferencePage_19, Messages.TextometriePreferencePage_20, Messages.TxmBrowser_1, Messages.TxmBrowser_2, Messages.TxmBrowser_3, Messages.TxmBrowser_4, Messages.UNDEFINED_OPTION, Messages.UNDEFINNED_WIDGET, Messages.UNKNOWN_HANDLER, Messages.URSCorpora_3, Messages.URSCorpora_4, Messages.UnitToolbar_10, Messages.UnitToolbar_12, Messages.UnitToolbar_14, Messages.UnitToolbar_16, Messages.UnitToolbar_27, Messages.UnitToolbar_28, Messages.UnitToolbar_29, Messages.UnitToolbar_3, Messages.UnitToolbar_32, Messages.UnitToolbar_4, Messages.UnitToolbar_44, Messages.UnitToolbar_45, Messages.UnitToolbar_46, Messages.UnitToolbar_47, Messages.UnitToolbar_48, Messages.UnitToolbar_49, Messages.UnitToolbar_5, Messages.UnitToolbar_50, Messages.UnitToolbar_51, Messages.UnitToolbar_52, Messages.UnitToolbar_53, Messages.UnitToolbar_54, Messages.UnitToolbar_59, Messages.UnitToolbar_6, Messages.UnitToolbar_60, Messages.UnitToolbar_61, Messages.UnitToolbar_62, Messages.UnitToolbar_63, Messages.UnitToolbar_7, Messages.UnitToolbar_8, Messages.ViewPropertySelectionDialog_0, Messages.action_text_reset_column_widths, Messages.bind, Messages.class, Messages.confirmationAction, Messages.erreurFatale, Messages.get, Messages.impossibiliteAction, Messages.java, Messages.noMatchesWasSetCommandCanceled, Messages.noQueryWasSetCommandCanceled, Messages.pasImplemente, Messages.put, Messages.xx, ParaBrowserUIMessages.ParaBrowserEditor_21, ParaBrowserUIMessages.dontMOVENEXTIs, ParaBrowserUIMessages.mOVETo, ParaBrowserUIMessages.openParabrowser, ParaBrowserUIMessages.openingTheParabrowser, ParaBrowserUIMessages.paraBrowserDDotGetNextP0StructP1ParaidP2ValueP3, ParaBrowserUIMessages.refDDot, ParaBrowserUIMessages.refDDotP0DDotP1, ParaBrowserUIMessages.references, PartitionCoreMessages.RESULT_TYPE, PartitionCoreMessages.bind, PartitionCoreMessages.cantCreateDimensionsPartitionChartFileChartsEngineDDotP0, PartitionCoreMessages.dimensionsDDotP0, PartitionCoreMessages.dimensionsOfTheP0PartitionInTheP1Corpus, PartitionCoreMessages.numberOfWords, PartitionCoreMessages.part, PartitionCoreMessages.parts, PartitionCoreMessages.sortedBySize, PartitionCoreMessages.t, PartitionUIMessages.dimensionsChartRendering, PartitionUIMessages.displayPartsCountInChartTitle, PartitionUIMessages.sortByPartSize, PluginMessages.class, PluginMessages.findMessageFile, ProgressionCoreMessages.ChartsEngine_PROGRESSION_Y_AXIS_NOT_CUMULATIVE_LABEL, ProgressionCoreMessages.RESULT_TYPE, ProgressionCoreMessages.bind, ProgressionCoreMessages.density, ProgressionCoreMessages.doneDDotNoMatchFound, ProgressionCoreMessages.errorDDotSubcorpusWithSize0, ProgressionCoreMessages.filteringREGEXDDot, ProgressionCoreMessages.in, ProgressionCoreMessages.occurrences, ProgressionCoreMessages.progressionOf, ProgressionCoreMessages.propertyDDot, ProgressionCoreMessages.structureDDot, ProgressionCoreMessages.tEqualsP0, ProgressionCoreMessages.theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora, ProgressionUIMessages.ProgressionDialog_8, ProgressionUIMessages.add, ProgressionUIMessages.addQueriesFromFile, ProgressionUIMessages.bandeSizeMultiplier, ProgressionUIMessages.bandewidthMultiplierDDot, ProgressionUIMessages.bind, ProgressionUIMessages.chartTypeDDot, ProgressionUIMessages.cumulative, ProgressionUIMessages.defaultChartTypeIsCumulative, ProgressionUIMessages.defaultEditionIsMissing, ProgressionUIMessages.density, ProgressionUIMessages.errorDDot, ProgressionUIMessages.error_theQueryIsAlreadyRepresentedByACurveInTheGraphic, ProgressionUIMessages.noQuery, ProgressionUIMessages.queries, ProgressionUIMessages.query, ProgressionUIMessages.regexDDot, ProgressionUIMessages.repeatSameValues, ProgressionUIMessages.repeatTheValuesOfTheStructureProperties, ProgressionUIMessages.selectAnUTF8PropertyFile, ProgressionUIMessages.stripMultiplierErrorDDot, ProgressionUIMessages.textP0IsMissing, PropertiesCoreMessages.RESULT_TYPE, PropertiesCoreMessages.descriptionOf, PropertiesCoreMessages.error, PropertiesCoreMessages.failedToAccessCorpus, PropertiesCoreMessages.failedToAccessCorpus_2, PropertiesCoreMessages.generalStatistics, PropertiesCoreMessages.generalStatistics_2, PropertiesCoreMessages.lexicalUnitsPropertiesMaxP0Values, PropertiesCoreMessages.lexicon, PropertiesCoreMessages.noProperty, PropertiesCoreMessages.numberOfStructuralUnits, PropertiesCoreMessages.numberOfWordProperties, PropertiesCoreMessages.numberOfWords, PropertiesCoreMessages.properties, PropertiesCoreMessages.s, PropertiesCoreMessages.structuralUnitsProperties, PropertiesCoreMessages.structuralUnitsPropertiesMaxP0Values, PropertiesCoreMessages.structures, PropertiesCoreMessages.t, PropertiesCoreMessages.wordProperties, PropertiesUIMessages.apply, PropertiesUIMessages.descriptionDDot, PropertiesUIMessages.displayedNameDDot, PropertiesUIMessages.editProperties, PropertiesUIMessages.maximumValuesToDisplay, PropertiesUIMessages.theMaximumNumberOfWordPropertyValuesToShow, PropertiesUIMessages.vMax, ProvSDKMessages.RemediationOperation_ResolveJobName, ProvSDKMessages.RemediationOperation_ResolveJobTask, ProvSDKMessages.UpdateHandler_NoSitesMessage, ProvSDKMessages.UpdateHandler_ProgressTaskName, ProvUIMessages.AvailableIUsPage_GotoProperties, ProvUIMessages.IUDetailsLabelProvider_Bytes, ProvUIMessages.IUDetailsLabelProvider_KB, ProvUIMessages.IUDetailsLabelProvider_Unknown, ProvUIMessages.InstallIUOperationLabel, ProvUIMessages.InstallIUOperationTask, ProvUIMessages.InstallWizardPage_NoCheckboxDescription, ProvUIMessages.InstallWizardPage_Title, ProvUIMessages.PreselectedIUInstallWizard_Description, ProvUIMessages.PreselectedIUInstallWizard_Title, ProvUIMessages.ProfileModificationWizardPage_DetailsLabel, ProvUIMessages.ProvUI_IdColumnTitle, ProvUIMessages.ProvUI_NameColumnTitle, ProvUIMessages.ProvUI_VersionColumnTitle, ProvUIMessages.RemedyElementNotHighestVersion, ProvUIMessages.SelectableIUsPage_Deselect_All, ProvUIMessages.SelectableIUsPage_Select_All, ProvUIMessages.SizeComputingWizardPage_SizeJobTitle, ProvUIMessages.UpdateAction_UpdatesAvailableMessage, ProvUIMessages.UpdateAction_UpdatesAvailableTitle, ProvUIMessages.UpdateIUOperationLabel, ProvUIMessages.UpdateIUOperationTask, ProvUIMessages.UpdateOrInstallWizardPage_Size, ProvUIMessages.UpdateWizardPage_Description, ProvUIMessages.UpdateWizardPage_Title, RCPMessages.ApplicationWorkbenchAdvisor_25, RCPMessages.ComputeLexicalTable_0, RCPMessages.ComputeLexicalTable_1, RCPMessages.ComputeLexicalTable_10, RCPMessages.ComputeLexicalTable_5, RCPMessages.ComputeLexicalTable_6, RCPMessages.ComputeLexicalTable_7, RCPMessages.ComputeSpecifities_2, RCPMessages.IndexEditor_3, RCPMessages.bind, RCoreMessages.bind, RCoreMessages.doneDDot, RCoreMessages.errorWhileRunningRScriptP0DDotP1, RCoreMessages.errorWhileRunningRScriptP0DDotP1_2, RCoreMessages.error_cantFindRServeInPath, RCoreMessages.error_connectionFailed, RCoreMessages.error_errorDuringItemsListExtraction, RCoreMessages.error_errorWhileEvaluating, RCoreMessages.error_evaluationError, RCoreMessages.error_failedToConnectToTheRWorkspace, RCoreMessages.error_failedToInitializeFileTransfert, RCoreMessages.error_failedToKillRServe, RCoreMessages.error_failedToKillRServe2, RCoreMessages.error_failedToKillRServe3, RCoreMessages.error_failedToLoadLibrary, RCoreMessages.error_failedToRunREG, RCoreMessages.error_failedToStartRServe, RCoreMessages.error_failedToStartRServeWithCommand, RCoreMessages.error_matrixIsEmpty, RCoreMessages.error_requestedObjectNotFoundInR, RCoreMessages.error_rserveIsAlreadyRunningOnPort, RCoreMessages.error_rservePathNotSet, RCoreMessages.error_unexpectedErrorInRStatisticsEngine, RCoreMessages.error_youNeedRSoftware, RCoreMessages.info_connected, RCoreMessages.info_connectingToRAt, RCoreMessages.info_connectingToRAtWithUser, RCoreMessages.info_lastSafeEvalExpression, RCoreMessages.info_rPathNotSetTryingToFindIt, RCoreMessages.info_savingChartToFile, RCoreMessages.info_startingRWithCommandLine, RCoreMessages.info_startingStatsEngine, RCoreMessages.info_statisticsEngineLaunched, RCoreMessages.info_tryingToStartRFrom, RCoreMessages.info_tryingToStartRWithRPath, RCoreMessages.ms, RCoreMessages.ms_2, RCoreMessages.p0RScriptDoesntExist, RCoreMessages.runningP0, RCoreMessages.runningTextSelection, RUIMessages.CheckRPackages_23, RUIMessages.CheckRPackages_36, RUIMessages.anErrorOccuredWhileGettingRWorkspaceInsanceDDot, RUIMessages.checkingRPackages, RUIMessages.connectingRConsoleToRWorkspaceStdoutAndStderr, RUIMessages.doneDDot, RUIMessages.eRRORDDotREvalIsNotAListDDot, RUIMessages.eRRORDDotREvalListSizeIs0DDot, RUIMessages.eRRORDDotRlistFirstElementIsNotREXPIntegerDDot, RUIMessages.errorWhileInitializingRConsoleDDot, RUIMessages.errorWhileInstallingPackageDDot, RUIMessages.failedCurrentVersionIsStill, RUIMessages.installedSuccessfully, RUIMessages.necessaryPackagesAreReady, RUIMessages.packageIsNotInstalledTryingToInstallItNow, RUIMessages.packageWasNotInstalledPleaseInstallItManuallyDDotRunRAndExecuteInstallpackages, RUIMessages.password, RUIMessages.pathToRBinary, RUIMessages.portDefaultIs6311, RUIMessages.rArgs, RUIMessages.rPackageDiagnostic, RUIMessages.rPackageDiagnostic_2, RUIMessages.rPackageUpToVersion, RUIMessages.refreshVariables, RUIMessages.refreshingViews, RUIMessages.remoteConnection, RUIMessages.rserveArgs, RUIMessages.runRServeInDebugMode, RUIMessages.sendingToRWorkspaceDDot, RUIMessages.serverAddress, RUIMessages.showEvalLogs, RUIMessages.somePackagesAreMissingSeeConsoleForDetails, RUIMessages.tXMCouldNotLoadTheFactoMineRRPackageTheCorrespondanceAnalysisClassificationCommandsWontBeAvailable, RUIMessages.tXMCouldNotLoadTheTextometryRPackageTheCooccurenceSpecificityAndProgressionCommandsWontBeAvailable, RUIMessages.tXMCouldNotReinstallRPackagesPleaseDoItManuallySeeManual, RUIMessages.tXMNameP0SupSupRNameP1, RUIMessages.the, RUIMessages.theRStatEngineIsNotRunningTryingToReinstallThePackagesRServeFactoMineRTextometry, RUIMessages.the_2, RUIMessages.updateOf, RUIMessages.updatingThe, RUIMessages.useFileBasedRDataTransfert, RUIMessages.user, RUIMessages.warningDDotWindowsUsersNeedToRestartTXM, ReferencerCoreMessages.RESULT_TYPE, ReferencerCoreMessages.referencer, ReferencerCoreMessages.referencerExportFailedDDot, ReferencerUIMessages.ReferencerEditor_25, ReferencerUIMessages.orderReferencesByFrequency, ReferencerUIMessages.referencePattern, ReferencerUIMessages.referencer, ReferencerUIMessages.references, ReferencerUIMessages.showingFirstResultPage, ReferencerUIMessages.showingLastResultPage, ReferencerUIMessages.showingNextResultPage, ReferencerUIMessages.showingPreviousResultPage, SWTComponentsProviderMessages.SWTChartsComponentProvider_CA_TOOLBAR_BUTTON_SHOW_COLUMS_LABEL, SWTComponentsProviderMessages.SWTChartsComponentProvider_CA_TOOLBAR_BUTTON_SHOW_ROWS_LABEL, SWTComponentsProviderMessages.SWTChartsComponentProvider_SHARED_SEND_SELECTION_TO_CONCORDANCE, SWTComponentsProviderMessages.SWTChartsComponentProvider_SHARED_SEND_SELECTION_TO_COOCCURRENCE, SWTComponentsProviderMessages.SWTChartsComponentProvider_SHARED_SEND_SELECTION_TO_INDEX, SWTComponentsProviderMessages.blackAndWhite, SWTComponentsProviderMessages.chartsRendering, SWTComponentsProviderMessages.colors, SWTComponentsProviderMessages.currentEngine, SWTComponentsProviderMessages.defaultExportFormat, SWTComponentsProviderMessages.displayFormat, SWTComponentsProviderMessages.grayscale, SWTComponentsProviderMessages.monochrome, SWTComponentsProviderMessages.monochromeRenderingColor, SWTComponentsProviderMessages.multipleLineStrokeStyles, SWTComponentsProviderMessages.recreatingChartsEngineAndSWTChartComponentsProvider, SWTComponentsProviderMessages.rendering, SWTComponentsProviderMessages.renderingColorsMode, SWTComponentsProviderMessages.showGrid, SWTComponentsProviderMessages.showHideRenderingParameters, SWTComponentsProviderMessages.showLegend, SWTComponentsProviderMessages.showTitle, SWTComponentsProviderMessages.showhideGrid, SWTComponentsProviderMessages.showhideLegend, SWTComponentsProviderMessages.showhideTitle, SWTComponentsProviderMessages.thesePreferencesWillApplyToNewChartsPreviouslyCreatedChartsWillNotBeAffected, SearchEngineCoreMessages.deletingQueryResultP0, SearchEngineCoreMessages.deletingSubcorpusP0, SearchEngineCoreMessages.info_creatingNewPartition, SearchEngineCoreMessages.info_creatingSubcorpusXFromCorpusYWithTheQueryZ, SearchEngineCoreMessages.info_deletingPartition, SearchEngineCoreMessages.info_partCreatedInXMs, SearchEngineCoreMessages.info_partXCreatedWithQueryZ, SearchEngineCoreMessages.info_partitionCreatedInXMs, SearchEngineCoreMessages.info_searchEngineStopped, SearchEngineCoreMessages.info_stoppingSearchEngine, SearchEngineCoreMessages.sizeOfSubcorpusP0P1ComputedInP2Ms, SearchEngineCoreMessages.subcorpusP0CreatedInP1Ms, SpecificitiesCoreMessages.ComputeError_NEED_AT_LEAST_2_PARTS, SpecificitiesCoreMessages.RESULT_TYPE, SpecificitiesCoreMessages.SpecificitesResult_10, SpecificitiesCoreMessages.SpecificitesResult_7, SpecificitiesCoreMessages.banalityDDotP0, SpecificitiesCoreMessages.bind, SpecificitiesCoreMessages.cantCreateSpecificitiesChartFileChartsEngineDDotP0, SpecificitiesCoreMessages.error_errorWhileComputingSpecificities, SpecificitiesCoreMessages.failedToGetTheSpecificitesDDot, SpecificitiesCoreMessages.noSpecificitiesIndexArray, SpecificitiesCoreMessages.numberOfRowsWantedP0AndFoundP1Mismatch, SpecificitiesCoreMessages.part, SpecificitiesCoreMessages.referenceToNonExistingRow, SpecificitiesCoreMessages.relativeFrequencyPercent, SpecificitiesCoreMessages.score, SpecificitiesCoreMessages.specificitiesSelection, SpecificitiesCoreMessages.specificityIndexComputed, SpecificitiesCoreMessages.theLexicalTableCannotBeNull, SpecificitiesCoreMessages.theSpecificityIndexArrayDoesNotProperlyRepresentAMatrix, SpecificitiesCoreMessages.unit, SpecificitiesUIMessages.banality, SpecificitiesUIMessages.drawBars, SpecificitiesUIMessages.drawLines, SpecificitiesUIMessages.failedToComputeSpecificities, SpecificitiesUIMessages.groupBarsByLines, SpecificitiesUIMessages.maximumScore, SpecificitiesUIMessages.scoresFormatDefaultIsPercent1f, SpecificitiesUIMessages.specificities, SpecificitiesUIMessages.t, StatsEngineCoreMessages.aZerobasedIndexCannotBeInf0OrSupToTheNumberOfIndexedElements, StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength, StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength_2, StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength_3, StatsEngineCoreMessages.anInnerArrayCannotBeNull, StatsEngineCoreMessages.cannotDeleteANonexistingObject, StatsEngineCoreMessages.cannotDeleteAllLines, StatsEngineCoreMessages.colIndex, StatsEngineCoreMessages.columnIndex, StatsEngineCoreMessages.columnNamesOfAContingencyTableCannotBeNull, StatsEngineCoreMessages.dim, StatsEngineCoreMessages.error_statsEngineNotReadyCancelingCommand, StatsEngineCoreMessages.failedToGetRowNames, StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0, StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0_2, StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0_3, StatsEngineCoreMessages.matrixDDotFailedToGetNrowDDot, StatsEngineCoreMessages.matrixImplDDotErrorDDotColumnSizeDiffersDDotOriginal, StatsEngineCoreMessages.mode, StatsEngineCoreMessages.notImplemented, StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix, StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix_2, StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix_3, StatsEngineCoreMessages.rObjectEvaluatedToNull, StatsEngineCoreMessages.rowIndex, StatsEngineCoreMessages.rowIndex_2, StatsEngineCoreMessages.rowNamesOfAContingencyTableCannotBeNull, StatsEngineCoreMessages.theIndexArrayCanNotBeNullOrEmpty, StatsEngineCoreMessages.tooBigMax, StatsEngineCoreMessages.tooBigMax_2, StatsEngineCoreMessages.tooBigMax_3, StatsEngineCoreMessages.tooBigMax_4, StatsEngineCoreMessages.unknownTypeDDot, SynopticEditionUIMessages.BackToText_1, SynopticEditionUIMessages.BackToText_2, TBXMessages.java, TXMCoreMessages.Base_22, TXMCoreMessages.CREATING_PART, TXMCoreMessages.CREATING_SUBCORPUS, TXMCoreMessages.CqiClient_34, TXMCoreMessages.DONE, TXMCoreMessages.DROP_SUBCORPUS, TXMCoreMessages.FAILED, TXMCoreMessages.Partition_21, TXMCoreMessages.Project_14, TXMCoreMessages.Project_15, TXMCoreMessages.SUBCORPUS_CREATED, TXMCoreMessages.SUBCORPUS_SIZE, TXMCoreMessages.Subcorpus_2, TXMCoreMessages.TSResult_13, TXMCoreMessages.TSResult_14, TXMCoreMessages.TSResult_18, TXMCoreMessages.TSResult_7, TXMCoreMessages.TSResult_8, TXMCoreMessages.Toolbox_workspace_init, TXMCoreMessages.VMAX_1, TXMCoreMessages.Workspace_6, TXMCoreMessages.and, TXMCoreMessages.andFile, TXMCoreMessages.binaryDirectory, TXMCoreMessages.bind, TXMCoreMessages.cQiClientNotInitialized, TXMCoreMessages.cantFindStructuralUnitForMetadataWithIdDDot, TXMCoreMessages.catalogFileNotFound, TXMCoreMessages.checkingBinaryFormat, TXMCoreMessages.common_absoluteFrequency, TXMCoreMessages.common_cols, TXMCoreMessages.common_delete, TXMCoreMessages.common_description, TXMCoreMessages.common_done, TXMCoreMessages.common_fMax, TXMCoreMessages.common_fMin, TXMCoreMessages.common_frequency, TXMCoreMessages.common_lowestFrequency, TXMCoreMessages.common_numberOfLines, TXMCoreMessages.common_ok, TXMCoreMessages.common_properties, TXMCoreMessages.common_property, TXMCoreMessages.common_queries, TXMCoreMessages.common_query, TXMCoreMessages.common_reference, TXMCoreMessages.common_rows, TXMCoreMessages.common_structuralUnitAndProperty, TXMCoreMessages.common_structure, TXMCoreMessages.common_t, TXMCoreMessages.common_thresholds, TXMCoreMessages.common_units, TXMCoreMessages.common_vMax, TXMCoreMessages.computingDDot, TXMCoreMessages.connected, TXMCoreMessages.corpusDDot, TXMCoreMessages.corpusDDotgetLocaleDDotCQPIsNotReadyToAnswerDDot, TXMCoreMessages.couldNotCreateTXMHOMEDirectoryDDotP0, TXMCoreMessages.couldntReadCorpusDDot, TXMCoreMessages.dDot, TXMCoreMessages.dataDirectoryIsMissingDDot, TXMCoreMessages.doesNotExist, TXMCoreMessages.doesNotExist_2, TXMCoreMessages.doesNotExist_3, TXMCoreMessages.doesNotExist_4, TXMCoreMessages.doesNotExists, TXMCoreMessages.doesNotExists_2, TXMCoreMessages.eRRORDDotExists, TXMCoreMessages.eRRORDDotRead, TXMCoreMessages.encodingDDot, TXMCoreMessages.endOfCQPWaitTest, TXMCoreMessages.errorConfigdirDirDDot, TXMCoreMessages.errorDDot, TXMCoreMessages.errorDDotLinkGrplinkAttargetMalformedDDot, TXMCoreMessages.errorDDotP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatDDotCorpusSkipped, TXMCoreMessages.errorDDotP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatDDotCorpusSkipped, TXMCoreMessages.errorDDotSkippingTheLoadingOfCorpusDDot, TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat, TXMCoreMessages.errorDDotThisExceptionShouldNotBeThrown, TXMCoreMessages.errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot, TXMCoreMessages.errorDuringWorkspaceInitializationDDot, TXMCoreMessages.errorLoadingWorkspaceFromFileDDot, TXMCoreMessages.errorRegDirDDot, TXMCoreMessages.errorWhileConnectingToSearchEngine, TXMCoreMessages.errorWhileGettingMetadatasFromBaseimportMetadatasDDot, TXMCoreMessages.errorWhileWaitingForCQP, TXMCoreMessages.error_error, TXMCoreMessages.error_error2, TXMCoreMessages.error_errorWhileSortingResult, TXMCoreMessages.evaluatingExtensionDDot, TXMCoreMessages.exceptionDDot, TXMCoreMessages.failedToAccessStructuralPropertyValues, TXMCoreMessages.failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEDDotP0, TXMCoreMessages.failedToCreatePartDDot, TXMCoreMessages.failedToExec, TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot, TXMCoreMessages.failedToExecTskillCqpserverexeDDot, TXMCoreMessages.failedToGetLastCQPErrorDDot, TXMCoreMessages.failedToGetSupValuesOf, TXMCoreMessages.failedToLoadBaseParametersFromFileDDot, TXMCoreMessages.failedToRestorePartition, TXMCoreMessages.failedToRestoreSubcorpus, TXMCoreMessages.failedToStartMemCqiClientDDot, TXMCoreMessages.file, TXMCoreMessages.fillImportxmlWithDDot, TXMCoreMessages.filterManagerErrorDDotInitialization, TXMCoreMessages.fmax, TXMCoreMessages.fmin, TXMCoreMessages.focusIsEmptyOrNull, TXMCoreMessages.hasNoBase, TXMCoreMessages.htmlDirectoryIsMissingDDot, TXMCoreMessages.htmlDirectoryIsMissingDDot_2, TXMCoreMessages.iODDot, TXMCoreMessages.in, TXMCoreMessages.info_partCreatedInXMs, TXMCoreMessages.informationsFromWorkspaceSelfElementNull, TXMCoreMessages.initializationOfGroovyImportScriptRunner, TXMCoreMessages.isADirectory, TXMCoreMessages.isMissing, TXMCoreMessages.isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters, TXMCoreMessages.isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters, TXMCoreMessages.isNotReadable, TXMCoreMessages.java, TXMCoreMessages.killPsAuxPipeGrepCqpserverPipeAwkP, TXMCoreMessages.languageDDot, TXMCoreMessages.loadingExtensions, TXMCoreMessages.loadingWorkspaceFromFileDDot, TXMCoreMessages.malformedURLFile, TXMCoreMessages.managerErrorDuringInitializationDDot, TXMCoreMessages.matchesFound, TXMCoreMessages.noValuesGiven, TXMCoreMessages.noWorkspaceFoundCreatingANewOne, TXMCoreMessages.numberOfMatch, TXMCoreMessages.numberOfSubMatch, TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot, TXMCoreMessages.pARAMSDDot, TXMCoreMessages.parentDirectory, TXMCoreMessages.print2, TXMCoreMessages.processing, TXMCoreMessages.processingTextDDot, TXMCoreMessages.queryOnP0DDotP1InfP2, TXMCoreMessages.queryWasDDot, TXMCoreMessages.queryingPartitionP0, TXMCoreMessages.readCorpusInfosFromOldImportxmlFileDDot, TXMCoreMessages.readError, TXMCoreMessages.registryFileIsMissingDDot, TXMCoreMessages.reorganizingFilesOf, TXMCoreMessages.sAXDDot, TXMCoreMessages.selectionErrorDDotTheCorpus, TXMCoreMessages.supBeginningExecutionOf, TXMCoreMessages.supEndOfExecution, TXMCoreMessages.tXMNeedsFoldersDDot, TXMCoreMessages.textMetadataDDot, TXMCoreMessages.theFocusCannotBeNullOrEmpty, TXMCoreMessages.theFocusIsEmptyOrNull, TXMCoreMessages.theP0PartFocusDoesntBelongToPartitionP1, TXMCoreMessages.txmDirectoryIsMissingDDot, TXMCoreMessages.unknownPartitionName, TXMCoreMessages.v, TXMCoreMessages.warningDDotCantLoadCorpus, TXMCoreMessages.warningDDotDuplicateQueryEntryDDot, TXMCoreMessages.warningDDotQueryFailedDDot, TXMCoreMessages.workspaceDDot, TXMCoreMessages.wrongLoginOrPasswordOrPortDDot, TXMCoreMessages.xmlValidationDDot, TXMUIMessages.ApplicationWorkbenchAdvisor_11, TXMUIMessages.ApplicationWorkbenchAdvisor_22, TXMUIMessages.ApplicationWorkbenchAdvisor_23, TXMUIMessages.ApplicationWorkbenchAdvisor_24, TXMUIMessages.ApplicationWorkbenchAdvisor_26, TXMUIMessages.ApplicationWorkbenchAdvisor_43, TXMUIMessages.ApplicationWorkbenchAdvisor_43_single, TXMUIMessages.ApplicationWorkbenchAdvisor_45, TXMUIMessages.ApplicationWorkbenchAdvisor_48, TXMUIMessages.ApplicationWorkbenchAdvisor_51, TXMUIMessages.ApplicationWorkbenchAdvisor_53, TXMUIMessages.ApplicationWorkbenchAdvisor_54, TXMUIMessages.ApplicationWorkbenchAdvisor_55, TXMUIMessages.ApplicationWorkbenchAdvisor_56, TXMUIMessages.ApplicationWorkbenchAdvisor_58, TXMUIMessages.ApplicationWorkbenchAdvisor_59, TXMUIMessages.ApplicationWorkbenchAdvisor_60, TXMUIMessages.ApplicationWorkbenchAdvisor_61, TXMUIMessages.DeleteInCorporaView_2, TXMUIMessages.EMPTY, TXMUIMessages.ERROR, TXMUIMessages.ExecuteRText_1, TXMUIMessages.ExecuteScriptImport_8, TXMUIMessages.Explorer_4, TXMUIMessages.Explorer_5, TXMUIMessages.Explorer_7, TXMUIMessages.FAILED_TO_PARSE_OPTIONS, TXMUIMessages.FileTreeContentProvider_4, TXMUIMessages.SEARCH, TXMUIMessages._1, TXMUIMessages._2, TXMUIMessages._3, TXMUIMessages._default, TXMUIMessages._default_2, TXMUIMessages.aBinaryCorpusIsATXMFileExtensionTxmOrZip, TXMUIMessages.aWordWithItsProperty, TXMUIMessages.abort, TXMUIMessages.aboutTXM, TXMUIMessages.activateProxyService, TXMUIMessages.addAWord, TXMUIMessages.addAXsltParameter, TXMUIMessages.addDDot, TXMUIMessages.addingToSelection, TXMUIMessages.advanced, TXMUIMessages.advancedUserMode, TXMUIMessages.allCriteria, TXMUIMessages.alwaysSaveBeforeLaunching, TXMUIMessages.ampContextsDisplayOptions, TXMUIMessages.ampMultipleSort, TXMUIMessages.ampNameDDot, TXMUIMessages.ampNew, TXMUIMessages.ampPropertyDDot, TXMUIMessages.ampQuery, TXMUIMessages.ampRunScript, TXMUIMessages.ampSortOptions, TXMUIMessages.ampStructureDDot, TXMUIMessages.ampValue, TXMUIMessages.andFrom, TXMUIMessages.annotateTheCorpus, TXMUIMessages.areYouSureYouWantToDeleteToSort, TXMUIMessages.argsDDot, TXMUIMessages.assign, TXMUIMessages.assisted, TXMUIMessages.automaticRecomputingWhenChangingAParameter, TXMUIMessages.automaticUpdates, TXMUIMessages.bind, TXMUIMessages.buildEdition, TXMUIMessages.canNotCreateATableWithTheProvidedInformationDDotP0, TXMUIMessages.canceling, TXMUIMessages.cancelingRequested, TXMUIMessages.canceling_2, TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab, TXMUIMessages.cannotComputeCooccurrencesWithTheSelection, TXMUIMessages.cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded, TXMUIMessages.cannotCreateTheGraphic, TXMUIMessages.cannotDrawAGraphicWithTheInformationProvided, TXMUIMessages.cannotReadTheFileP0, TXMUIMessages.cannotSaveImportConfigurationNoSourceFolderSelected, TXMUIMessages.cannotStartImportConfigurationNoSourceFolderSelected, TXMUIMessages.cantLoadPropertiesFromCorpusP0DDotP1, TXMUIMessages.cantOpenGraphicP0, TXMUIMessages.changeCharactersEncoding, TXMUIMessages.changeCharactersEncodingCurrentEncodingDDot, TXMUIMessages.characterEncoding, TXMUIMessages.checkForUpdatesAtStartup, TXMUIMessages.checkingForExistingWorkspaceDirectory, TXMUIMessages.chooseOutfile, TXMUIMessages.chooseTheLanguage, TXMUIMessages.clipboard, TXMUIMessages.clipboardIsEmpty, TXMUIMessages.clipboard_2, TXMUIMessages.columnIndexIsTooBig, TXMUIMessages.columnsSeparatedBy, TXMUIMessages.commands, TXMUIMessages.common_areYouSure, TXMUIMessages.common_beginning, TXMUIMessages.common_displayOptions, TXMUIMessages.common_end, TXMUIMessages.common_enterRegularExpressionOfYourSearch, TXMUIMessages.common_refresh, TXMUIMessages.complexSortDDot, TXMUIMessages.computeSubCorpusOnP0QueryDDotP1, TXMUIMessages.computeSubCorpusOnP0StructsDDotP1AmpPropsP2DDotP3, TXMUIMessages.computing, TXMUIMessages.computing_2, TXMUIMessages.computing_3, TXMUIMessages.concordanceContextStructureLimits, TXMUIMessages.configurationOfTheUserInterfaceLanguage, TXMUIMessages.confirm, TXMUIMessages.consoleReportsAnInternalError, TXMUIMessages.contains, TXMUIMessages.contextDDot, TXMUIMessages.contextsDisplayOptions, TXMUIMessages.coocMatrixDDot, TXMUIMessages.coocMatrixParameters, TXMUIMessages.copiedLinesDDot, TXMUIMessages.corporaBackupedDDotP0, TXMUIMessages.corpus, TXMUIMessages.corpusConversionFailed, TXMUIMessages.corpusInfos, TXMUIMessages.corpusNameIsMandatory, TXMUIMessages.corpusNameOnlyCapsAndNoDigitAtBeginning, TXMUIMessages.couldNotCreateBackupDirectoryDDot, TXMUIMessages.couldNotFindDirectoryDDotP0, TXMUIMessages.couldNotFindTextP0InCorpusP1, TXMUIMessages.couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator, TXMUIMessages.couldNotReadInstallPreferencesFile, TXMUIMessages.couldNotStartProxyConfigurationDDot, TXMUIMessages.couldNotUnzipBinaryCorpusDDot, TXMUIMessages.createANewMacroFromATemplate, TXMUIMessages.createANewSorter, TXMUIMessages.createPartition, TXMUIMessages.createSubcorpus, TXMUIMessages.creatingANewPartitionWithP0, TXMUIMessages.creatingASubcorpusInTheSearchEngine, TXMUIMessages.creatingASubcorpusOnP0, TXMUIMessages.creatingTXMUserWorkingDirectory, TXMUIMessages.dDot, TXMUIMessages.dDotMandatoryField, TXMUIMessages.defaultEncodingDDot, TXMUIMessages.defaultLanguage, TXMUIMessages.defineAndUseACompositeSorter, TXMUIMessages.deleteParameter, TXMUIMessages.deletedDDotP0, TXMUIMessages.deletingP0, TXMUIMessages.deletingP0Continue, TXMUIMessages.descriptionHTMLCompleteNameAuthorDateLicenseComment, TXMUIMessages.desktopIsNotSupportedFatal, TXMUIMessages.displayFont, TXMUIMessages.displayInFullText, TXMUIMessages.displayRuntimesInConsole, TXMUIMessages.distance, TXMUIMessages.distance_2, TXMUIMessages.doNotConfirmToDeleteAnObject, TXMUIMessages.doesNotContain, TXMUIMessages.doneDDotP0Created, TXMUIMessages.doneDDotP0Items, TXMUIMessages.doneDDotP0Parts, TXMUIMessages.doneInP0, TXMUIMessages.doneInP0P1, TXMUIMessages.doneP0Ms, TXMUIMessages.doneTheCreatedBinaryFileIsP0, TXMUIMessages.dontSaveAndRun, TXMUIMessages.downloading, TXMUIMessages.eRROR, TXMUIMessages.edit, TXMUIMessages.editTheNameOfTheNewColumnCreatedByTheMergedColumns, TXMUIMessages.editTheNameOfTheNewLineCreatedByTheMergedLines, TXMUIMessages.editXSLStylesheet, TXMUIMessages.editions, TXMUIMessages.elisionCharacters, TXMUIMessages.enableAutomaticSaveOfAllResultsPersistence, TXMUIMessages.encodingFound, TXMUIMessages.endOfColumnMerge, TXMUIMessages.endOfSentenceCharacters, TXMUIMessages.endsWith, TXMUIMessages.equalsTo, TXMUIMessages.error, TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot, TXMUIMessages.errorDDotCurrentGroovyScriptDirectoryDoesNotExistDDot, TXMUIMessages.errorDDotDeleteReturnedFalse, TXMUIMessages.errorDDotElementNotRegistered, TXMUIMessages.errorDDotGetTextDDotP0, TXMUIMessages.errorDDotMissingValueDDot, TXMUIMessages.errorDDotObjectIsNotAnOrgw3cElement, TXMUIMessages.errorDDotP0, TXMUIMessages.errorDDotSubcorpusWasNotCreated, TXMUIMessages.errorDDotThePartitionCreatedHasNoPart, TXMUIMessages.errorDDotThePartitionWasNotCreated, TXMUIMessages.errorDDotThisPartitionHasNoPart, TXMUIMessages.errorDuringParametersInitialisation, TXMUIMessages.errorDuringScriptExecutionDDot, TXMUIMessages.errorDuringSortDDotP0, TXMUIMessages.errorElementDDot, TXMUIMessages.errorInAtOptionNameDeclarationDDot, TXMUIMessages.errorWhileCallingOrgeclipseuiwindowresetPerspectiveDDot, TXMUIMessages.errorWhileCleaningPerspectiveDDotNoHandlerServiceFound, TXMUIMessages.errorWhileComputingCorpusSummary, TXMUIMessages.errorWhileComputingTheConcordanceDDot, TXMUIMessages.errorWhileCreatingAPartitionDDotP0, TXMUIMessages.errorWhileDeletingP0DDotP1, TXMUIMessages.errorWhileGettingCurrentPositionValueDDot, TXMUIMessages.errorWhileLoadingTXMDDot, TXMUIMessages.errorWhileOpeningBibliographicRecordP0WithURLEqualsP1, TXMUIMessages.errorWhileOpeningFileP0, TXMUIMessages.errorWhileOpeningGroovyScriptDDotP0, TXMUIMessages.errorWhileRunningScriptDDotP0, TXMUIMessages.errorWhileUpdatingTXMDDot, TXMUIMessages.errorWhileUpdatingTXMDDotNoHandlerServiceFound, TXMUIMessages.errorWithElementP0, TXMUIMessages.error_invalidRegularExpression, TXMUIMessages.execDDot, TXMUIMessages.executeScript, TXMUIMessages.executingGroovyScript, TXMUIMessages.executingLastMacroDDot, TXMUIMessages.executingLastScriptDDot, TXMUIMessages.executionCanceled, TXMUIMessages.executionOfP0, TXMUIMessages.exit, TXMUIMessages.exportAll, TXMUIMessages.exportDDotCantCreateFileP0DDotP1, TXMUIMessages.exportFileEncoding, TXMUIMessages.exportSettings, TXMUIMessages.exporting, TXMUIMessages.exportingAnnotations, TXMUIMessages.exportingP0ThisMayTakeAWhile, TXMUIMessages.exportingResults, TXMUIMessages.extractingBinaryCorpus, TXMUIMessages.failedToBackupExistingCorporaDDot, TXMUIMessages.failedToCancel, TXMUIMessages.failedToCopy, TXMUIMessages.failedToDelete, TXMUIMessages.failedToDeleteFile, TXMUIMessages.failedToDeleteSubcorpusP0, TXMUIMessages.failedToExportCorpusP0, TXMUIMessages.failedToExportFileP0WithDeviceP1, TXMUIMessages.failedToExportInFileP0WithFormatP1, TXMUIMessages.failedToExportResultP0DDotP1, TXMUIMessages.failedToGetLastCQPErrorDDot, TXMUIMessages.failedToLoadBinaryCorpusNullError, TXMUIMessages.failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents, TXMUIMessages.failedToLoadCorpusP0, TXMUIMessages.failedToMoveCorpus, TXMUIMessages.failedToRename, TXMUIMessages.failedToSaveAs, TXMUIMessages.failedToSavePreferencesDDot, TXMUIMessages.fileDDot, TXMUIMessages.fileExplorerDDotIncorrectPattern, TXMUIMessages.folderP0ShouldNotBeDeleted, TXMUIMessages.followedBy, TXMUIMessages.fontName, TXMUIMessages.forceLoggin, TXMUIMessages.form, TXMUIMessages.foundLinesDDot, TXMUIMessages.foundP0Values, TXMUIMessages.from, TXMUIMessages.frontXSL, TXMUIMessages.generalInformations, TXMUIMessages.generalPreferencesBackup, TXMUIMessages.goToParentFolder, TXMUIMessages.goToTXMHome, TXMUIMessages.goToTXMHome_2, TXMUIMessages.graphicsKeyboardShortcuts, TXMUIMessages.groovy, TXMUIMessages.guessDDot, TXMUIMessages.h, TXMUIMessages.iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage, TXMUIMessages.identifiedLanguage, TXMUIMessages.imLookingForDDot, TXMUIMessages.importClipboardText, TXMUIMessages.importParametersOfP0, TXMUIMessages.importSetupP0, TXMUIMessages.importStarted, TXMUIMessages.importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot, TXMUIMessages.impossibleToReadP0, TXMUIMessages.includeTheKeywordStructureInTheCount, TXMUIMessages.info_txmIsReady, TXMUIMessages.infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt, TXMUIMessages.initializationOfThePlatform, TXMUIMessages.initializingPlatform, TXMUIMessages.installPathDDotP0, TXMUIMessages.integer, TXMUIMessages.interfaceLanguageLOCALEWasNotSet, TXMUIMessages.invalidComparator, TXMUIMessages.invalidName, TXMUIMessages.invalidProperty, TXMUIMessages.invalidQuery, TXMUIMessages.jobDDot, TXMUIMessages.lastCQPErrorDDot, TXMUIMessages.leftContextSize, TXMUIMessages.lexicalSegmentation, TXMUIMessages.lexicon, TXMUIMessages.linePerPageDDot, TXMUIMessages.listOfMilestoneElementsSeparatedByComma, TXMUIMessages.listOfTagsEncodingTheOutsidetextNoStructureOrWordContentIndexedNoStructureOrWordContentEditedInTXM, TXMUIMessages.listOfTagsEncodingTheOutsidetextToEditNoStructureOrWordContentIndexedStructureAndWordContentEditedInTXM, TXMUIMessages.loadingBinaryCorpus, TXMUIMessages.loadingTXMInstallPreferences, TXMUIMessages.loadingTheCorpusInThePlatform, TXMUIMessages.loadingViews, TXMUIMessages.lockRCPWorkspace, TXMUIMessages.logInAFile, TXMUIMessages.logInTheConsole, TXMUIMessages.logLevel, TXMUIMessages.logOptionDetected, TXMUIMessages.logs, TXMUIMessages.macroName, TXMUIMessages.mainLanguage, TXMUIMessages.mainLanguageDDot, TXMUIMessages.mainPage, TXMUIMessages.mandatoryFields, TXMUIMessages.match, TXMUIMessages.merge, TXMUIMessages.mergeDelete, TXMUIMessages.mergeResultName, TXMUIMessages.metadataColumnTitles, TXMUIMessages.metadataPreview, TXMUIMessages.metadatacsvFileFormat, TXMUIMessages.metadatasParameters, TXMUIMessages.milestoneElements, TXMUIMessages.minAnd, TXMUIMessages.minAnd_2, TXMUIMessages.minimalCoFrequence, TXMUIMessages.moduleUIParametersDDot, TXMUIMessages.movingCorporaToP0, TXMUIMessages.movingDownTheSelection, TXMUIMessages.movingUpTheSelection, TXMUIMessages.msec, TXMUIMessages.name, TXMUIMessages.nameIsMandatory, TXMUIMessages.namesDDot, TXMUIMessages.newCorpusDDotP0, TXMUIMessages.newFileDDotP0, TXMUIMessages.newFolderDDotP0, TXMUIMessages.newMacro, TXMUIMessages.newName, TXMUIMessages.newPart, TXMUIMessages.nextPage, TXMUIMessages.nextSessionNumber, TXMUIMessages.nextText, TXMUIMessages.noDefaultEditionPageFoundForElementDDot, TXMUIMessages.noInterpreterFoundForScriptFileExtension, TXMUIMessages.noMetadataFileP0, TXMUIMessages.noPartWasDefined, TXMUIMessages.noPartitionNameWasSpecifiedTheNameIsP0, TXMUIMessages.noPreviousText, TXMUIMessages.noSelectionForDDot, TXMUIMessages.noSubcorpusNameWasSpecifiedWeveGeneratedOne, TXMUIMessages.noTextInCorpusDDotP0, TXMUIMessages.noTextNext, TXMUIMessages.noteDDotUseValueToGuess, TXMUIMessages.numberOfEdgesDDot, TXMUIMessages.numberOfLinesDDot, TXMUIMessages.numberOfNodesDDot, TXMUIMessages.objDDot, TXMUIMessages.openTheQueryAssistant, TXMUIMessages.openingComplexSortDialog, TXMUIMessages.openingCooccurrentsTable, TXMUIMessages.options, TXMUIMessages.outfileDDotNone, TXMUIMessages.outsidetext, TXMUIMessages.outsidetextToedit, TXMUIMessages.p0Import, TXMUIMessages.p0ParametersInput, TXMUIMessages.p0ScriptFileDoesntExist, TXMUIMessages.p1ExportSavedInFileDDotP0, TXMUIMessages.p1FileSavedInP0, TXMUIMessages.pageBreakTag, TXMUIMessages.paginationOptions, TXMUIMessages.panDDotRightMousePlusDrag, TXMUIMessages.parameters, TXMUIMessages.parameters_2, TXMUIMessages.part, TXMUIMessages.part_2, TXMUIMessages.pleaseWriteTheMacroName, TXMUIMessages.preferences, TXMUIMessages.previousPage, TXMUIMessages.previousText, TXMUIMessages.printTheStacktrace, TXMUIMessages.propertiesDDot, TXMUIMessages.punctuations, TXMUIMessages.queriesCannotBeLeftEmpty, TXMUIMessages.queriesDDot, TXMUIMessages.query, TXMUIMessages.queryAssistant, TXMUIMessages.queryCannotBeLeftEmpty, TXMUIMessages.ready, TXMUIMessages.readyToShowUpdateUI, TXMUIMessages.referencesAmpdisplayOptions, TXMUIMessages.referencesAmpsortOptions, TXMUIMessages.referencesDisplayOptions, TXMUIMessages.referencesDisplayOptions_2, TXMUIMessages.referencesSortOptions, TXMUIMessages.referencesSortOptions_2, TXMUIMessages.refresh, TXMUIMessages.refresh_2, TXMUIMessages.refreshingCorpora, TXMUIMessages.regexpPatternToHideFiles, TXMUIMessages.reload, TXMUIMessages.remove, TXMUIMessages.removeFromSelection, TXMUIMessages.removeUnnecessaryE4Elements, TXMUIMessages.removeUnusedEclipseRCPPreferencePage, TXMUIMessages.removingOldCorpusBackupDirectoryP0, TXMUIMessages.renameFile, TXMUIMessages.renamingByDDot, TXMUIMessages.resetTheViewDDotF5, TXMUIMessages.restartTXM, TXMUIMessages.restartingThePlatform, TXMUIMessages.rightContextSize, TXMUIMessages.rmvAllTheParts, TXMUIMessages.run, TXMUIMessages.runScript, TXMUIMessages.sVGGraphic, TXMUIMessages.saveAndRun, TXMUIMessages.saveBeforeExecution, TXMUIMessages.saveFileBeforeExecution, TXMUIMessages.saveScript, TXMUIMessages.saveScriptBeforeExecution, TXMUIMessages.savingImportParameters, TXMUIMessages.scriptExecution, TXMUIMessages.sec, TXMUIMessages.select, TXMUIMessages.selectACompositeSorter, TXMUIMessages.selectAProperty, TXMUIMessages.selectDDot, TXMUIMessages.selectTextId, TXMUIMessages.selectTheSourceDirectory, TXMUIMessages.selectValuesToAssignDDot, TXMUIMessages.selectionIsNotACorpusDDot, TXMUIMessages.separatedByAtLeast0Word, TXMUIMessages.separatedByAtLeast1Word, TXMUIMessages.separatorCharacters, TXMUIMessages.setImportParametersInTheSectionsBelow, TXMUIMessages.settingStatusLineAndConfiguringActionSets, TXMUIMessages.shouldNotHappen, TXMUIMessages.showAllResultNodesInCorporaView, TXMUIMessages.showExportResultInTheTextEditor, TXMUIMessages.showHiddenFiles, TXMUIMessages.showHideCommandParameters, TXMUIMessages.simple, TXMUIMessages.someCriteria, TXMUIMessages.sort, TXMUIMessages.sortDone, TXMUIMessages.sortKeys, TXMUIMessages.sortOptions, TXMUIMessages.sortOptions_2, TXMUIMessages.sortOptions_3, TXMUIMessages.sortingColumn, TXMUIMessages.sourceCharactersEncoding, TXMUIMessages.sourceDirectoryDDot, TXMUIMessages.sourcesCharactersEncodingDDot, TXMUIMessages.spaces, TXMUIMessages.startCorpusImport, TXMUIMessages.startJobDDotCheckTXMHOME, TXMUIMessages.startJobDDotInitializeUI, TXMUIMessages.startJobDDotLoadInstallPreferences, TXMUIMessages.startingUpP0, TXMUIMessages.startingUpdateFetch, TXMUIMessages.startsWith, TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup, TXMUIMessages.string, TXMUIMessages.structuralUnitComboSelected, TXMUIMessages.structure, TXMUIMessages.structureDDot, TXMUIMessages.structureFieldIsMandatory, TXMUIMessages.switchLanguageDDotMalformedUrlDDotP0, TXMUIMessages.systemOutput, TXMUIMessages.tXM, TXMUIMessages.tXMInstallDirectory, TXMUIMessages.tXMUserDirectory, TXMUIMessages.tXMWorkspaceDirectoryAlreadyExistsP0WouldYouLikeToReloadItsCorporaInYourNewTXM, TXMUIMessages.tXMiniDDot, TXMUIMessages.termsOfService, TXMUIMessages.textEditorDDot, TXMUIMessages.textID, TXMUIMessages.textP0HasNoBibliographicRecord, TXMUIMessages.textSeparator, TXMUIMessages.textualPlanes, TXMUIMessages.theCorpusAndTheCorpusP0WillBeDeleted, TXMUIMessages.theErrorIsDDot, TXMUIMessages.theFileP0DoesNotExist, TXMUIMessages.theInputP0CannotBeDisplayed, TXMUIMessages.theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual, TXMUIMessages.theP0CorpusDirectoryAlreadyExistsDoYouWantToReplaceIt, TXMUIMessages.theP1GroovyScriptMustBeInTheP0Folder, TXMUIMessages.theTableMustContainAtLeastOneLine, TXMUIMessages.theTwoArraysMustHaveTheSameSize, TXMUIMessages.theUserCanceledTheScriptExecution, TXMUIMessages.thisComputerEncodingDDot, TXMUIMessages.thisComputerLanguageDDot, TXMUIMessages.thisDirectorySeemsToContainABinaryCorpus, TXMUIMessages.thisFileIsNotATXMFileDDotP0, TXMUIMessages.thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual, TXMUIMessages.titleDDot, TXMUIMessages.to, TXMUIMessages.to_2, TXMUIMessages.to_3, TXMUIMessages.tokenizerParameterFileDDot, TXMUIMessages.unknowedWidgetNameDDot, TXMUIMessages.updateLevel, TXMUIMessages.useLeftWindow, TXMUIMessages.useRightWindow, TXMUIMessages.userInterfaceLanguage, TXMUIMessages.usingLanguage, TXMUIMessages.valueSelector, TXMUIMessages.warning, TXMUIMessages.warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly, TXMUIMessages.warningDDotTheImportScriptIsMissingDDotP0, TXMUIMessages.word, TXMUIMessages.wordsPerPage, TXMUIMessages.workspaceDirectoryBackup, TXMUIMessages.writingCoocMatrixInGRAPHMLFileDDot, TXMUIMessages.wrongInput, TXMUIMessages.youMustSelectAtLeast2Comparators, TXMUIMessages.zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag, TXMUIMessages.zoomToSelectionDDotCtrlPlusLeftMousePlusdrag, TreeTaggerUIMessages.pathToInstallDirectory, TreeTaggerUIMessages.pathToModelsDirectory, UtilsCoreMessages.ExecTimer_0, UtilsCoreMessages.ExecTimer_1, UtilsCoreMessages.ExecTimer_2, UtilsCoreMessages.ExecTimer_3, UtilsCoreMessages.FileCopy_0, UtilsCoreMessages.FileCopy_2, UtilsCoreMessages.FileCopy_4, UtilsCoreMessages.LS_0, UtilsCoreMessages.LS_1, UtilsCoreMessages.Localizer_0, UtilsCoreMessages.Localizer_1, UtilsCoreMessages.Log_3, UtilsCoreMessages.Log_5, UtilsCoreMessages.Log_8, UtilsCoreMessages.MessageBox_0, UtilsCoreMessages.MessageBox_1, UtilsCoreMessages.MessageBox_2, UtilsCoreMessages.Pair_0, UtilsCoreMessages.Pair_1, UtilsCoreMessages.Sh_4, UtilsCoreMessages.class, WordCloudCoreMessages.RESULT_TYPE, WordCloudCoreMessages.bind, WordCloudCoreMessages.error_couldNotInstallRPackage, WordCloudCoreMessages.error_rPackagesInstallationFailed, WordCloudCoreMessages.info_aborting, WordCloudCoreMessages.info_installingRPackage, WordCloudCoreMessages.info_loadingRPackage, WordCloudCoreMessages.info_openingWordCloudResult, WordCloudCoreMessages.info_rPackagesLoaded, WordCloudUIMessages.fmin, WordCloudUIMessages.minimalFrequencyForUsedWords, WordCloudUIMessages.numberOfUsedWords, WordCloudUIMessages.percentOfRotatedLabelsDDot, WordCloudUIMessages.percentOfRotatedWords, WordCloudUIMessages.randomWordPositions, WordCloudUIMessages.randomizePositions, WordCloudUIMessages.vmax, WordCloudUIMessages.wordCloudReadyDDot, WorkbenchMessages.InstallationDialog_ShellTitle, XMLEditorMessages.OpenXMLEditor_1, XMLEditorMessages.OpenXMLEditor_3, XMLEditorMessages.OpenXMLEditor_4, XMLEditorMessages.class, XXMessages.java, XXXMessages.Key, XXXMessages.java]
+core.messages.TXMCore 4 key removed: [common_mode, common_pleaseWait, common_structuralUnit, info_connected]
+concordance.rcp.messages.ConcordanceUI 103 key removed: [ConcordancesEditor_67, ConcordancesEditor_68, ConcordancesEditor_71, ConcordancesEditor_72, CorporaView_3, CreateSubcorpusDialog_10, LastCQPError, SORT_DONE, aFFECT, abortingBackToText, aboutAnnotations, addANewCategory, affect, allLines, ampEdit, ampKeywordDDot, ampLeftContextSizeDDot, ampPropertyDDot, ampReferenceDDot, ampRightContextSizeDDot, annotate, annotatingConcordance, annotatingConcordancePage, annotatingConcordanceSelection, at, at_2, availableValuesForP0, backToTextDDotDefaultEditionIsMissing, backToTextDDotTextP0IsMissing, cancel, category, computeSpecificities, concordance, concordanceOfInfP0SupInCorpusP1, confirmAnnotationAffectation, couldNotAnnotateTheValue, couldNotInstanciateOneOfTheCorpusKnowledgeRepositoryDDot, delete, eRRORGetConcordancesDialogDDotP0, editor_dot, elementsContinue, enterAValueForAnId, equals, errorDDotCouldNotRetrieveLineWordIdForEdition, errorWhileAffectionAnnotationDDot, errorWhileAnnotatingConcordanceDDot, errorWhileAnnotatingConcordancePageDDot, errorWhileAnnotatingConcordanceSelectionDDot, errorWhileComputingConcordancesDDotP0, errorWhileDeletingAnnotationDDot, failedToOpenConcordanceEditor, foundP0Occurrences, fullTextDisplayFailedDDotP0, hideSettings, invalidProperty, isOverlappingWith, keywordsAnnotation, lastCQIErrorDDot, listOfCategories, loadingLineInformations, lookingForTypedValueWithIdEquals, newCategory, newExpandItem, newExpandItem_2, newExpandItem_3, newParameters, newValueP0ForCategoryP1, noPageFoundFor, noValueFoundWithTheP0Id, oK, of, onCertainSequences, openReferencesEditor, openTheListOfCategories, openingPropertyDialog, openingTheConcordance, pageLines, pipeInf, pleaseEnterTheNewTypeName, proceedToAnnotation, projectIdP0CorpusIdP1TextIdP2, reference_2, saveTheAnnotations, selectAValueAmongTheList, selectedLines, showSettings, supPipe, theAnnotation, theCorpusHasNoTextidProperty, theEndOfAStructure, theP0CorpusHasNoDefaultReferencesDDotP1, theSequence, theStartOfAStructure, theValueP0IsNotAssociatedWithTheCategoryP1AssociateIt, to, toSELECTIONEquals, to_2, valueEquals, withTheCategory, withTheCategory_2, youAreAboutToAnnotate, youMustSelectAProperty, youMustSelectAnProperty]
+Done: 107 changes.
+

Property changes on: tmp/org.txm.translate.rcp/remove keys.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.translate.rcp/merge keys.txt
===================================================================
--- tmp/org.txm.translate.rcp/merge keys.txt	(revision 0)
+++ tmp/org.txm.translate.rcp/merge keys.txt	(revision 1335)
@@ -0,0 +1,170 @@
+Initializing project messages...
+ .........|.........|.........|.........|.........|.........|.........|.........|.........|.........|
+
+ Done: index.rcp.messages.IndexUI 1 merges: {IndexEditor_17=[IndexEditor_18, IndexEditor_25, IndexEditor_26, IndexEditor_27, IndexEditor_28, IndexEditor_3, IndexEditor_31, IndexEditor_36, IndexEditor_37, IndexEditor_4, IndexEditor_5, IndexEditor_6, IndexEditor_7]}
+PluginMessagesManager.renameKey(): WARNING new key=eigenvalues already set in /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/messages/messages_fr.properties with value=Eigenvalues new value=Valeurs propres
+ Done: ca.core.messages.CACore 3 merges: {axis=[axis_2], eigenvalue=[eigenvalue_2], eigenvalues=[eigenvalues_2]}
+ Done: core.messages.TXMCore 3 merges: {doesNotExist=[doesNotExist_2], doesNotExist_3=[doesNotExist_4], htmlDirectoryIsMissingDDot=[htmlDirectoryIsMissingDDot_2]}
+PluginMessagesManager.renameKey(): WARNING new key=allTheInnerArrayDoNotHaveTheSameLength already set in /home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_fr.properties with value=** Les tableaux internes n'ont pas tous la même dimension. new value=* Les tableaux internes n'ont pas tous la même dimension.
+ Done: statsengine.core.messages.StatsEngineCore 5 merges: {allTheInnerArrayDoNotHaveTheSameLength=[allTheInnerArrayDoNotHaveTheSameLength_2, allTheInnerArrayDoNotHaveTheSameLength_3], innerArraysMustBeOfDimensionSup0=[innerArraysMustBeOfDimensionSup0_2, innerArraysMustBeOfDimensionSup0_3], nothingToDoWithAnEmptyMatrix=[nothingToDoWithAnEmptyMatrix_2, nothingToDoWithAnEmptyMatrix_3], rowIndex=[rowIndex_2], tooBigMax=[tooBigMax_2, tooBigMax_3, tooBigMax_4]}
+ Done: referencer.core.messages.ReferencerCore 1 merges: {RESULT_TYPE=[referencer]}
+ Done: statsengine.r.core.messages.RCore 1 merges: {ms=[ms_2]}
+ Done: edition.rcp.messages.EditionUI 3 merges: {CommandLink_empty=[editor_empty], noEditionToOpen=[noEditionToOpen_2], openingDefaultEditionsDDotP0=[openingDefaultEditionsDDotP0_2]}
+ Done: statsengine.r.rcp.messages.RUI 2 merges: {rPackageDiagnostic=[rPackageDiagnostic_2], the=[the_2]}
+ Done: annotation.kr.rcp.messages.KRAnnotationUI 7 merges: {ConcordancesEditor_67=[ConcordancesEditor_71], ConcordancesEditor_68=[ConcordancesEditor_72], annotationCanceledByUser=[annotationCanceledByUser_2, annotationCanceledByUser_3], at=[at_2], availableAnnotationTypesDDot=[availableAnnotationTypesDDot_2, availableAnnotationTypesDDot_3], closeTheToolbarWithoutSaving=[closeTheToolbarWithoutSaving_2, closeTheToolbarWithoutSaving_3], concordanceAnnotationArea=[concordanceAnnotationArea_2, concordanceAnnotationArea_3]}
+PluginMessagesManager.renameKey(): WARNING new key=minAnd already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties with value= min and  new value= min et 
+PluginMessagesManager.renameKey(): WARNING new key=part already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties with value=Partie  new value=Partie
+PluginMessagesManager.renameKey(): WARNING new key=part already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties with value=&Часть  new value=Часть
+PluginMessagesManager.renameKey(): WARNING new key=common_refresh already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties with value=Rafraichir new value=Rafraîchir
+PluginMessagesManager.renameKey(): WARNING new key=common_refresh already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties with value=Refresh new value=Обновить
+PluginMessagesManager.renameKey(): WARNING new key=common_refresh already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties with value=Rafraichir new value=Rafraîchir
+PluginMessagesManager.renameKey(): WARNING new key=common_refresh already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties with value=Refresh new value=N/A_Refresh
+PluginMessagesManager.renameKey(): WARNING new key=sortOptions already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties with value=Задать свойство сортировки new value=Сортировка свойств 
+PluginMessagesManager.renameKey(): WARNING new key=sortOptions already set in /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties with value=Задать свойство сортировки new value=Сортировка свойств 
+ Done: rcp.messages.TXMUI 8 merges: {common_refresh=[refresh, refresh_2], computing=[computing_2], minAnd=[minAnd_2], parameters=[parameters_2], part=[part_2], referencesDisplayOptions=[referencesDisplayOptions_2], referencesSortOptions=[referencesSortOptions_2], sortOptions=[sortOptions_2, sortOptions_3]}
+ Done: concordance.core.messages.ConcordanceCore 2 merges: {keyword=[keyword_2], reference=[reference_2]}
+ Done: concordance.rcp.messages.ConcordanceUI 3 merges: {editor_19=[editor_22, editor_24, editor_26, editor_28, editor_3dots], editor_21=[editor_23, editor_25, editor_27, editor_empty], keyword=[keyword_2]}
+ Done: properties.core.messages.PropertiesCore 1 merges: {failedToAccessCorpus=[failedToAccessCorpus_2]}
+Keys to update: [StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength_3, StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength_2, StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0_3, StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0_2, StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix_2, StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix_3, KRAnnotationUIMessages.availableAnnotationTypesDDot_3, KRAnnotationUIMessages.availableAnnotationTypesDDot_2, KRAnnotationUIMessages.closeTheToolbarWithoutSaving_3, KRAnnotationUIMessages.closeTheToolbarWithoutSaving_2, KRAnnotationUIMessages.concordanceAnnotationArea_3, KRAnnotationUIMessages.concordanceAnnotationArea_2, KRAnnotationUIMessages.annotationCanceledByUser_3, KRAnnotationUIMessages.annotationCanceledByUser_2, EditionUIMessages.openingDefaultEditionsDDotP0_2, PropertiesCoreMessages.failedToAccessCorpus_2, KRAnnotationUIMessages.ConcordancesEditor_71, KRAnnotationUIMessages.ConcordancesEditor_72, TXMCoreMessages.htmlDirectoryIsMissingDDot_2, TXMUIMessages.referencesDisplayOptions_2, TXMUIMessages.referencesSortOptions_2, EditionUIMessages.noEditionToOpen_2, ConcordanceCoreMessages.reference_2, StatsEngineCoreMessages.tooBigMax_2, StatsEngineCoreMessages.tooBigMax_4, StatsEngineCoreMessages.tooBigMax_3, ConcordanceUIMessages.editor_3dots, StatsEngineCoreMessages.rowIndex_2, ConcordanceUIMessages.editor_empty, ConcordanceCoreMessages.keyword_2, ReferencerCoreMessages.referencer, RUIMessages.rPackageDiagnostic_2, ConcordanceUIMessages.editor_22, ConcordanceUIMessages.editor_26, ConcordanceUIMessages.editor_25, ConcordanceUIMessages.editor_24, ConcordanceUIMessages.editor_23, ConcordanceUIMessages.editor_28, ConcordanceUIMessages.editor_27, ConcordanceUIMessages.keyword_2, IndexUIMessages.IndexEditor_28, IndexUIMessages.IndexEditor_27, IndexUIMessages.IndexEditor_26, IndexUIMessages.IndexEditor_36, EditionUIMessages.editor_empty, IndexUIMessages.IndexEditor_31, TXMCoreMessages.doesNotExist_4, TXMCoreMessages.doesNotExist_2, IndexUIMessages.IndexEditor_37, IndexUIMessages.IndexEditor_18, IndexUIMessages.IndexEditor_25, IndexUIMessages.IndexEditor_5, IndexUIMessages.IndexEditor_4, IndexUIMessages.IndexEditor_7, IndexUIMessages.IndexEditor_6, IndexUIMessages.IndexEditor_3, CACoreMessages.eigenvalues_2, KRAnnotationUIMessages.at_2, CACoreMessages.eigenvalue_2, TXMUIMessages.sortOptions_3, TXMUIMessages.sortOptions_2, TXMUIMessages.parameters_2, TXMUIMessages.computing_2, TXMUIMessages.refresh_2, TXMUIMessages.minAnd_2, CACoreMessages.axis_2, TXMUIMessages.refresh, TXMUIMessages.part_2, RCoreMessages.ms_2, RUIMessages.the_2]
+Replace KEY=StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength_3([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java]
+Replace KEY=StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength_2([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java]
+Replace KEY=StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0_3([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java]
+Replace KEY=StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0_2([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java]
+Replace KEY=StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix_2([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java]
+Replace KEY=StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix_3([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java]
+Replace KEY=KRAnnotationUIMessages.availableAnnotationTypesDDot_3([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.availableAnnotationTypesDDot
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java]
+Replace KEY=KRAnnotationUIMessages.availableAnnotationTypesDDot_2([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.availableAnnotationTypesDDot
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java]
+Replace KEY=KRAnnotationUIMessages.closeTheToolbarWithoutSaving_3([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.closeTheToolbarWithoutSaving
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java]
+Replace KEY=KRAnnotationUIMessages.closeTheToolbarWithoutSaving_2([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.closeTheToolbarWithoutSaving
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java]
+Replace KEY=KRAnnotationUIMessages.concordanceAnnotationArea_3([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.concordanceAnnotationArea
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java]
+Replace KEY=KRAnnotationUIMessages.concordanceAnnotationArea_2([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.concordanceAnnotationArea
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java]
+Replace KEY=KRAnnotationUIMessages.annotationCanceledByUser_3([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.annotationCanceledByUser
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java]
+Replace KEY=KRAnnotationUIMessages.annotationCanceledByUser_2([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.annotationCanceledByUser
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java]
+Replace KEY=EditionUIMessages.openingDefaultEditionsDDotP0_2([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.openingDefaultEditionsDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=PropertiesCoreMessages.failedToAccessCorpus_2([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.failedToAccessCorpus
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=KRAnnotationUIMessages.ConcordancesEditor_71([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.ConcordancesEditor_67
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java, /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java, /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java]
+Replace KEY=KRAnnotationUIMessages.ConcordancesEditor_72([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.ConcordancesEditor_68
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java, /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java, /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java]
+Replace KEY=TXMCoreMessages.htmlDirectoryIsMissingDDot_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.htmlDirectoryIsMissingDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMUIMessages.referencesDisplayOptions_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.referencesDisplayOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineViewReferencePattern.java, /home/mdecorde/workspace047/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaViewReferencePattern.java]
+Replace KEY=TXMUIMessages.referencesSortOptions_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.referencesSortOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/DefineSortReferencePattern.java, /home/mdecorde/workspace047/org.txm.para.rcp/src/org/txm/para/rcp/editors/DefineParaSortReferencePattern.java]
+Replace KEY=EditionUIMessages.noEditionToOpen_2([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.noEditionToOpen
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=ConcordanceCoreMessages.reference_2([^_0-9a-zA-Z$]) BY KEY=ConcordanceCoreMessages.reference
+Files: [/home/mdecorde/workspace047/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java]
+Replace KEY=StatsEngineCoreMessages.tooBigMax_2([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.tooBigMax
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.tooBigMax_4([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.tooBigMax
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.tooBigMax_3([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.tooBigMax
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=ConcordanceUIMessages.editor_3dots([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_19
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=StatsEngineCoreMessages.rowIndex_2([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.rowIndex
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=ConcordanceUIMessages.editor_empty([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_21
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceCoreMessages.keyword_2([^_0-9a-zA-Z$]) BY KEY=ConcordanceCoreMessages.keyword
+Files: [/home/mdecorde/workspace047/org.txm.concordance.core/src/org/txm/concordance/core/functions/comparators/LexicographicKeywordComparator.java]
+Replace KEY=ReferencerCoreMessages.referencer([^_0-9a-zA-Z$]) BY KEY=ReferencerCoreMessages.RESULT_TYPE
+Files: [/home/mdecorde/workspace047/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java]
+Replace KEY=RUIMessages.rPackageDiagnostic_2([^_0-9a-zA-Z$]) BY KEY=RUIMessages.rPackageDiagnostic
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=ConcordanceUIMessages.editor_22([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_19
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_26([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_19
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_25([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_21
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_24([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_19
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_23([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_21
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_28([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_19
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_27([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.editor_21
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.keyword_2([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.keyword
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_28([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_27([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_26([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_36([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=EditionUIMessages.editor_empty([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.CommandLink_empty
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_31([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=TXMCoreMessages.doesNotExist_4([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExist_3
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/FilterManager.java]
+Replace KEY=TXMCoreMessages.doesNotExist_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExist
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/CorpusBuild.java, /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Project.java]
+Replace KEY=IndexUIMessages.IndexEditor_37([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_18([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_25([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_5([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_4([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_7([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_6([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_3([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.IndexEditor_17
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=CACoreMessages.eigenvalues_2([^_0-9a-zA-Z$]) BY KEY=CACoreMessages.eigenvalues
+Files: [/home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java, /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java]
+Replace KEY=KRAnnotationUIMessages.at_2([^_0-9a-zA-Z$]) BY KEY=KRAnnotationUIMessages.at
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java, /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java, /home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java]
+Replace KEY=CACoreMessages.eigenvalue_2([^_0-9a-zA-Z$]) BY KEY=CACoreMessages.eigenvalue
+Files: [/home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java, /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java]
+Replace KEY=TXMUIMessages.sortOptions_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sortOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SortPropertySelection.java, /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/SortPropertySelectionDialog.java]
+Replace KEY=TXMUIMessages.sortOptions_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sortOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java]
+Replace KEY=TXMUIMessages.parameters_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.parameters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java]
+Replace KEY=TXMUIMessages.computing_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.computing
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java]
+Replace KEY=TXMUIMessages.refresh_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.common_refresh
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java]
+Replace KEY=TXMUIMessages.minAnd_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.minAnd
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=CACoreMessages.axis_2([^_0-9a-zA-Z$]) BY KEY=CACoreMessages.axis
+Files: [/home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/chartcreators/JFCSingularValueChartCreator.java, /home/mdecorde/workspace047/org.txm.ca.core/src/org/txm/ca/core/chartsengine/r/RSingularValuesChartCreator.java]
+Replace KEY=TXMUIMessages.refresh([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.common_refresh
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java]
+Replace KEY=TXMUIMessages.part_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.part
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=RCoreMessages.ms_2([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.ms
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=RUIMessages.the_2([^_0-9a-zA-Z$]) BY KEY=RUIMessages.the
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Done: 40
+

Property changes on: tmp/org.txm.translate.rcp/merge keys.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.translate.rcp/remove translations.txt
===================================================================
--- tmp/org.txm.translate.rcp/remove translations.txt	(revision 0)
+++ tmp/org.txm.translate.rcp/remove translations.txt	(revision 1335)
@@ -0,0 +1,6 @@
+Initializing project messages...
+ .........|.........|.........|.........|.........|.........|.........|.........|.........|.........|
+
+org.txm.ca.rcp.messages.CAUIMessages 4 _ru keys removed: [CorrespondanceAnalysisEditorInput_26, CorrespondanceAnalysisEditorInput_27, CorrespondanceAnalysisEditorInput_29, CorrespondanceAnalysisEditorInput_30]
+Done: 4 keys removed.
+

Property changes on: tmp/org.txm.translate.rcp/remove translations.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.translate.rcp/normalize.txt
===================================================================
--- tmp/org.txm.translate.rcp/normalize.txt	(revision 0)
+++ tmp/org.txm.translate.rcp/normalize.txt	(revision 1335)
@@ -0,0 +1,1264 @@
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_20([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.unknownTypeDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_23([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.tooBigMax_3
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_22([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.rowIndex_2
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_19([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.rObjectEvaluatedToNull
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_10([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.rowIndex
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_14([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.tooBigMax_2
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_13([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.colIndex
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_11([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.tooBigMax
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=TXMUIMessages.AdvancePreferencePage_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.printTheStacktrace
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java]
+Replace KEY=TXMUIMessages.AdvancePreferencePage_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.tXMInstallDirectory
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java]
+Replace KEY=TXMUIMessages.AdvancePreferencePage_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.tXMUserDirectory
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java]
+Replace KEY=TXMUIMessages.AdvancePreferencePage_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.displayRuntimesInConsole
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java]
+Replace KEY=TXMUIMessages.AdvancePreferencePage_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.advancedUserMode
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java]
+Replace KEY=TXMUIMessages.AdvancePreferencePage_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.logs
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java]
+Replace KEY=TXMUIMessages.AdvancePreferencePage_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.updateLevel
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java]
+Replace KEY=AHCUIMessages.tooltips_computeColumns([^_0-9a-zA-Z$]) BY KEY=AHCUIMessages.computeColumns
+Files: [/home/mdecorde/workspace047/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java]
+Replace KEY=TXMUIMessages.ExportPreferencePage_19([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.textSeparator
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=TXMUIMessages.ExportPreferencePage_18([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.columnsSeparatedBy
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=ProgressionCoreMessages.Progression_1([^_0-9a-zA-Z$]) BY KEY=ProgressionCoreMessages.errorDDotSubcorpusWithSize0
+Files: [/home/mdecorde/workspace047/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java]
+Replace KEY=ConcordanceUIMessages.editor_keyword([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.keyword_2
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=TXMUIMessages.CreateSubCorpus_create([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.creatingASubcorpusOnP0
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=PropertiesCoreMessages.Properties_40([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.generalStatistics
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_41([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.t
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_43([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.wordProperties
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_26([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.noProperty
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_16([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.numberOfStructuralUnits
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_22([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.structuralUnitsPropertiesMaxP0Values
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_11([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.structures
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_14([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.lexicalUnitsPropertiesMaxP0Values
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_49([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.s
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=TXMUIMessages.SingularValuesEditor_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.wrongInput
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java]
+Replace KEY=TXMUIMessages.LocalePreferencePage_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.configurationOfTheUserInterfaceLanguage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java]
+Replace KEY=TXMUIMessages.LocalePreferencePage_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.userInterfaceLanguage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java]
+Replace KEY=TXMUIMessages.Preferences_Menu_Label([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.preferences
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java]
+Replace KEY=StatsEngineCoreMessages.ArrayIndex_0([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.theIndexArrayCanNotBeNullOrEmpty
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/ArrayIndex.java]
+Replace KEY=StatsEngineCoreMessages.ArrayIndex_1([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.aZerobasedIndexCannotBeInf0OrSupToTheNumberOfIndexedElements
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/ArrayIndex.java]
+Replace KEY=TXMUIMessages.UIParameterException_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.error
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java]
+Replace KEY=TXMUIMessages.ImportPreferencePage_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.metadatacsvFileFormat
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=TXMUIMessages.ImportPreferencePage_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.characterEncoding
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=TXMUIMessages.ImportPreferencePage_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noteDDotUseValueToGuess
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=TXMUIMessages.ImportPreferencePage_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.clipboard
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=TXMUIMessages.ImportPreferencePage_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.defaultLanguage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=TXMUIMessages.SimpleSubcorpusPanel_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.structuralUnitComboSelected
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SimpleSubcorpusPanel.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_4([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.rowNamesOfAContingencyTableCannotBeNull
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_6([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.columnNamesOfAContingencyTableCannotBeNull
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=TXMUIMessages.ExportPreferencePage_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exportFileEncoding
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java]
+Replace KEY=TXMUIMessages.ExportPreferencePage_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exportSettings
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/FileExplorerPreferencePage.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java]
+Replace KEY=TXMUIMessages.ExportPreferencePage_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.showExportResultInTheTextEditor
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java]
+Replace KEY=StatsEngineCoreMessages.MatrixImpl_2([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.dim
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java, /home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/MatrixImpl.java]
+Replace KEY=TXMUIMessages.ComputeCooccurrences_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cannotComputeCooccurrencesWithTheSelection
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCooccurrences_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.openingCooccurrentsTable
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java]
+Replace KEY=TXMUIMessages.ScriptPreferencePage_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.saveScriptBeforeExecution
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java]
+Replace KEY=TXMUIMessages.ScriptPreferencePage_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.nextSessionNumber
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java]
+Replace KEY=ReferencerCoreMessages.Referencer_2([^_0-9a-zA-Z$]) BY KEY=ReferencerCoreMessages.referencerExportFailedDDot
+Files: [/home/mdecorde/workspace047/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java]
+Replace KEY=ReferencerCoreMessages.Referencer_1([^_0-9a-zA-Z$]) BY KEY=ReferencerCoreMessages.referencer
+Files: [/home/mdecorde/workspace047/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java]
+Replace KEY=TXMUIMessages.ImportSelectedText_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.usingLanguage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java]
+Replace KEY=TXMUIMessages.ImportSelectedText_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.identifiedLanguage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java]
+Replace KEY=TXMUIMessages.ExecuteGroovyScript_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDuringScriptExecutionDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java]
+Replace KEY=IndexCoreMessages.DetailsFromCorpus([^_0-9a-zA-Z$]) BY KEY=IndexCoreMessages.indexDDotCorpusP0queryP1propertiesP2FminP3FmaxP4
+Files: [/home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Index.java, /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java]
+Replace KEY=TXMUIMessages.ComplexSortSelector_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages._default
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java]
+Replace KEY=TXMUIMessages.ComplexSortSelector_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDuringSortDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java]
+Replace KEY=TXMUIMessages.ComplexSortSelector_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sort
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java]
+Replace KEY=TXMUIMessages.ComplexSortSelector_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.complexSortDDot
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java]
+Replace KEY=TXMUIMessages.ComplexSortSelector_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sortKeys
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/widgets/ComplexSortSelector.java]
+Replace KEY=TXMUIMessages.ExecuteGroovyScript_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDuringParametersInitialisation
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java]
+Replace KEY=TXMUIMessages.ExecuteGroovyScript_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.theUserCanceledTheScriptExecution
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java]
+Replace KEY=TXMUIMessages.CreateSubCorpus_begin([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.creatingASubcorpusInTheSearchEngine
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.IndexToLexicalTable_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/handlers/PartitionIndexToLexicalTable.java, /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/link/QueryIndexToLexicalTable.java]
+Replace KEY=TXMUIMessages.ExecuteScriptImport_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.importStarted
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java]
+Replace KEY=TXMUIMessages.ExecuteScriptImport_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java]
+Replace KEY=TXMUIMessages.ExecuteScriptImport_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.p0ScriptFileDoesntExist
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyText.java]
+Replace KEY=TXMUIMessages.RefreshingCorporaView([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.refreshingCorpora
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreatePartition.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.DeleteInCorporaView_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToDeleteSubcorpusP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java]
+Replace KEY=PropertiesCoreMessages.Properties_8([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.lexicon
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_9([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.numberOfWordProperties
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_4([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.properties
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_5([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.generalStatistics_2
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_6([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.failedToAccessCorpus_2
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_7([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.numberOfWords
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_0([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.structuralUnitsProperties
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_1([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.failedToAccessCorpus
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_2([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.error
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=PropertiesCoreMessages.Properties_3([^_0-9a-zA-Z$]) BY KEY=PropertiesCoreMessages.descriptionOf
+Files: [/home/mdecorde/workspace047/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java]
+Replace KEY=IndexCoreMessages.SUBCORPUS_LEXICON([^_0-9a-zA-Z$]) BY KEY=IndexCoreMessages.computingTheLexiconOfSubcorpusP0
+Files: [/home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java, /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java]
+Replace KEY=TXMUIMessages.AssistedQueryWidget_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.openTheQueryAssistant
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedChoiceQueryWidget.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java]
+Replace KEY=PartitionCoreMessages.PartsSize_18([^_0-9a-zA-Z$]) BY KEY=PartitionCoreMessages.dimensionsDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java]
+Replace KEY=ConcordanceUIMessages.editor_right([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.right
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_14([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.cWBServerDDotAmppasswordDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_15([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.pathToCWBServerBinary
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_12([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.cWBServerDDotAmpportDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_13([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.cWBServerDDotAmploginDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_18([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.additionalAmpoptionsForTheCWBServerDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_17([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.pathToCWBServerInitializationFile
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=ConcordanceUIMessages.editor_error([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.fatalErrorDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_10([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.ampRemoteCWBServerAddressDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_11([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.cWBServerDDotAmphostDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=TXMCoreMessages.Toolbox_wrong_port([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=EditionUIMessages.preference_title([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.edition
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/preferences/SynopticEditionPreferencePage.java]
+Replace KEY=TXMCoreMessages.TigerXmlIndexing_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.eRRORDDotExists
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java]
+Replace KEY=TXMCoreMessages.TigerXmlIndexing_3([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.eRRORDDotRead
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java]
+Replace KEY=TXMCoreMessages.TigerXmlIndexing_6([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.iODDot
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java]
+Replace KEY=TXMCoreMessages.TigerXmlIndexing_7([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.sAXDDot
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TigerXmlIndexing.java]
+Replace KEY=TXMUIMessages.InternalCorpusView_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotGetTextDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java]
+Replace KEY=TXMUIMessages.InternalCorpusView_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileComputingCorpusSummary
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java]
+Replace KEY=TXMUIMessages.InternalCorpusView_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.reload
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java]
+Replace KEY=AHCUIMessages.tooltips_computeRows([^_0-9a-zA-Z$]) BY KEY=AHCUIMessages.computeRows
+Files: [/home/mdecorde/workspace047/org.txm.ahc.rcp/src/org/txm/ahc/rcp/editors/AHCChartEditor.java]
+Replace KEY=TXMUIMessages.DownloadJobHandler_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.downloading
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java]
+Replace KEY=TXMUIMessages.ImportSelectedText_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.importClipboardText
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java]
+Replace KEY=TXMUIMessages.ImportSelectedText_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.clipboard_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java]
+Replace KEY=TXMUIMessages.ImportSelectedText_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.clipboardIsEmpty
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java]
+Replace KEY=TXMUIMessages.ImportSelectedText_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.confirm
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java]
+Replace KEY=TXMUIMessages.ImportSelectedText_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.theCorpusAndTheCorpusP0WillBeDeleted
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java]
+Replace KEY=TXMUIMessages.PropertiesSelector_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cantLoadPropertiesFromCorpusP0DDotP1
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java]
+Replace KEY=TXMUIMessages.PropertiesSelector_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.propertiesDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java]
+Replace KEY=TXMUIMessages.PropertiesSelector_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.edit
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java]
+Replace KEY=CAUIMessages.ColsRowsInfosEditor_2([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.infosDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java]
+Replace KEY=TXMUIMessages.PartitionComposer_11([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.remove
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=CAUIMessages.ColsRowsInfosEditor_0([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.wrongInput
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.outfileDDotNone
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_11([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.minimalCoFrequence
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_13([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.chooseOutfile
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.distance
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_33([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.separatedByAtLeast0Word
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_32([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.followedBy
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_34([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.separatedByAtLeast1Word
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMCoreMessages.QUERYING_PARTITION([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.queryingPartitionP0
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_11([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.startsWith
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.equalsTo
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_13([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.contains
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.endsWith
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.UserPreferencePage_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.automaticRecomputingWhenChangingAParameter
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java]
+Replace KEY=TXMUIMessages.UserPreferencePage_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doNotConfirmToDeleteAnObject
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java]
+Replace KEY=ConcordanceUIMessages.editor_left([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.left
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.numberOfNodesDDot
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.coocMatrixDDot
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.distance_2
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.numberOfEdgesDDot
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.writingCoocMatrixInGRAPHMLFileDDot
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java]
+Replace KEY=TXMUIMessages.ComputeCoocMatrix_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.coocMatrixParameters
+Files: [/home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.LineLabelProvider_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.shouldNotHappen
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ReferenceLabelProvider.java]
+Replace KEY=EditionUIMessages.editor_controls([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.controls
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.aWordWithItsProperty
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.queryAssistant
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.addAWord
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.QueryAssistDialog_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.imLookingForDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java]
+Replace KEY=TXMUIMessages.ParametersDialog_14([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorInAtOptionNameDeclarationDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java]
+Replace KEY=TXMUIMessages.ParametersDialog_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotMissingValueDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java]
+Replace KEY=TXMUIMessages.ParametersDialog_11([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.mandatoryFields
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java]
+Replace KEY=TXMUIMessages.ParametersDialog_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.unknowedWidgetNameDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java]
+Replace KEY=TXMCoreMessages.TSCorpusManager_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorConfigdirDirDDot
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpusManager.java]
+Replace KEY=TXMCoreMessages.TSCorpusManager_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorRegDirDDot
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpusManager.java]
+Replace KEY=TXMUIMessages.MergeDeleteDialog_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.merge
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java]
+Replace KEY=TXMUIMessages.MergeDeleteDialog_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.mergeDelete
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java]
+Replace KEY=TXMUIMessages.MergeDeleteDialog_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.mergeResultName
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java]
+Replace KEY=ConcordanceUIMessages.editor_view([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.view
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=TXMUIMessages.CANT_CREATE_GRAPHIC([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cannotCreateTheGraphic
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_1([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.useNetworkProtocol
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=CQPUIMessages.CQPPreferencePage_0([^_0-9a-zA-Z$]) BY KEY=CQPUIMessages.cQPlibPath
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java]
+Replace KEY=TXMUIMessages.PartitionComposer_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.titleDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=TXMUIMessages.PartitionComposer_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.assign
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=TXMUIMessages.PartitionComposer_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.rmvAllTheParts
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=TXMUIMessages.PartitionComposer_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.part_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=TXMUIMessages.PartitionComposer_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.selectValuesToAssignDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=TXMUIMessages.PartitionComposer_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.newPart
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=TXMUIMessages.PartitionComposer_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.structureDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=TXMUIMessages.PartitionComposer_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotThisPartitionHasNoPart
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java]
+Replace KEY=AHCUIMessages.CAHPreferencePage_2([^_0-9a-zA-Z$]) BY KEY=AHCUIMessages.numberOfClusters
+Files: [/home/mdecorde/workspace047/org.txm.ahc.rcp/src/org/txm/ahc/rcp/preferences/AHCPreferencePage.java]
+Replace KEY=AHCUIMessages.CAHPreferencePage_3([^_0-9a-zA-Z$]) BY KEY=AHCUIMessages.method
+Files: [/home/mdecorde/workspace047/org.txm.ahc.rcp/src/org/txm/ahc/rcp/preferences/AHCPreferencePage.java]
+Replace KEY=TXMUIMessages.TableKeyListener_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.foundLinesDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java]
+Replace KEY=TXMUIMessages.TableKeyListener_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.copiedLinesDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java]
+Replace KEY=TXMUIMessages.ImportFormEditor_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.warningDDotTheImportScriptIsMissingDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java]
+Replace KEY=TXMUIMessages.ImportFormEditor_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.p0Import
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java]
+Replace KEY=TXMCoreMessages.CatalogManager_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.managerErrorDuringInitializationDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/CatalogManager.java]
+Replace KEY=TXMUIMessages.ExportAnnotation_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exportingAnnotations
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ExportStandoff.java]
+Replace KEY=TXMCoreMessages.CatalogManager_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExist_3
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/CatalogManager.java]
+Replace KEY=TXMUIMessages.FixUpdateHandler_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.readyToShowUpdateUI
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/FixUpdateHandler.java]
+Replace KEY=TXMCoreMessages.PartitionFocus_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.theFocusCannotBeNullOrEmpty
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java]
+Replace KEY=TXMCoreMessages.PartitionFocus_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.focusIsEmptyOrNull
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java]
+Replace KEY=TXMCoreMessages.PartitionFocus_3([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.theP0PartFocusDoesntBelongToPartitionP1
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java]
+Replace KEY=TXMCoreMessages.PartitionFocus_4([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.unknownPartitionName
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/PartitionFocus.java]
+Replace KEY=TXMUIMessages.CleanPerspective_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileCallingOrgeclipseuiwindowresetPerspectiveDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java]
+Replace KEY=TXMUIMessages.CleanPerspective_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileCleaningPerspectiveDDotNoHandlerServiceFound
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java]
+Replace KEY=TXMUIMessages.ParametersDialog_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.p0ParametersInput
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java]
+Replace KEY=TXMUIMessages.ParametersDialog_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.run
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java]
+Replace KEY=TXMUIMessages.PropertySelector_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.selectAProperty
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/PropertySelector.java]
+Replace KEY=StatsEngineCoreMessages.Factor_0([^_0-9a-zA-Z$]) BY KEY=StatsEngineCoreMessages.notImplemented
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/data/Factor.java]
+Replace KEY=TXMUIMessages.SVGGraphicEditor_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cannotDrawAGraphicWithTheInformationProvided
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java]
+Replace KEY=IndexUIMessages.preference_title([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.index
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/preferences/IndexPreferencesPage.java]
+Replace KEY=EditionUIMessages.OpenEdition_10([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.errorWhileOpeningEditorDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=TXMUIMessages.NavigationWidget_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileGettingCurrentPositionValueDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NewNavigationWidget.java]
+Replace KEY=TXMCoreMessages.CorpusManager_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorDDotThisExceptionShouldNotBeThrown
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java]
+Replace KEY=TXMCoreMessages.CorpusManager_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.cQiClientNotInitialized
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java]
+Replace KEY=TXMCoreMessages.FilterManager_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExist_4
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/FilterManager.java]
+Replace KEY=TXMCoreMessages.FilterManager_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.filterManagerErrorDDotInitialization
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/FilterManager.java]
+Replace KEY=TXMUIMessages.GraphicalLogger_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditorInput.java]
+Replace KEY=ConcordanceUIMessages.editor_30([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.navigation
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_20([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.sort
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=ConcordanceUIMessages.editor_29([^_0-9a-zA-Z$]) BY KEY=ConcordanceUIMessages.size
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=TXMUIMessages.CreateSubcorpus_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.computeSubCorpusOnP0QueryDDotP1
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.CreateSubcorpus_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doneDDotP0Created
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.CreateSubCorpus_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotSubcorpusWasNotCreated
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.CreateSubCorpus_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noSelectionForDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.CreateSubCorpus_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToGetLastCQPErrorDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.CreateSubcorpus_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.computeSubCorpusOnP0StructsDDotP1AmpPropsP2DDotP3
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.CreateSubCorpus_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.selectionIsNotACorpusDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java]
+Replace KEY=TXMUIMessages.RunGroovyScript_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileRunningScriptDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java]
+Replace KEY=TXMUIMessages.RunGroovyScript_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.executeScript
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java]
+Replace KEY=TXMUIMessages.RunGroovyScript_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.runScript
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java]
+Replace KEY=TXMUIMessages.RunGroovyScript_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.groovy
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java]
+Replace KEY=TXMUIMessages.RunGroovyScript_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.scriptExecution
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java]
+Replace KEY=TXMUIMessages.RunGroovyScript_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.ampRunScript
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java]
+Replace KEY=TXMUIMessages.RunGroovyScript_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileOpeningGroovyScriptDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java]
+Replace KEY=TXMUIMessages.OpenEmptyEditor_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.couldNotFindDirectoryDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java]
+Replace KEY=TXMUIMessages.SetSortProperty_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sortOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java]
+Replace KEY=TXMUIMessages.SetSortProperty_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.ampSortOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java]
+Replace KEY=TXMUIMessages.SetSortProperty_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sortOptions_2
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetSortProperty.java]
+Replace KEY=EditionUIMessages.OpenEdition_7([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.inTheCorpus
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=EditionUIMessages.OpenEdition_9([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.abortingDDotSelectionIsNotACorpus
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=EditionUIMessages.OpenEdition_3([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.openingDefaultEditionsDDotP0_2
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=EditionUIMessages.OpenEdition_4([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.errorWhileOpeningEditionDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=EditionUIMessages.OpenEdition_0([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDot
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=EditionUIMessages.OpenEdition_1([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.noEditionToOpen_2
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/OpenEdition.java]
+Replace KEY=TXMUIMessages.CreatePartition_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotThePartitionWasNotCreated
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreatePartition.java]
+Replace KEY=TXMUIMessages.CreatePartition_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doneDDotP0Items
+Files: [/home/mdecorde/workspace047/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=TXMUIMessages.CreatePartition_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.creatingANewPartitionWithP0
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreatePartition.java]
+Replace KEY=IndexUIMessages.composite_infos([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.infos
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java]
+Replace KEY=TXMUIMessages.CreatePartition_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doneDDotP0Parts
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreatePartition.java]
+Replace KEY=TXMUIMessages.SetContextSize_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.ampContextsDisplayOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java]
+Replace KEY=TXMUIMessages.SetContextSize_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.leftContextSize
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java]
+Replace KEY=TXMUIMessages.SetContextSize_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.contextsDisplayOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java]
+Replace KEY=RCoreMessages.ExecuteScriptR_1([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.errorWhileRunningRScriptP0DDotP1_2
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=RCoreMessages.ExecuteScriptR_0([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.p0RScriptDoesntExist
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=TXMUIMessages.SetContextSize_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.rightContextSize
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetContextSize.java]
+Replace KEY=RCoreMessages.ExecuteRScript_2([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.doneDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=RCoreMessages.ExecuteRScript_3([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.ms
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=RCoreMessages.ExecuteRScript_1([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.runningP0
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=TXMUIMessages.ObjectSelector_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.select
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java]
+Replace KEY=TXMUIMessages.ObjectSelector_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.objDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java]
+Replace KEY=EditionUIMessages.BackToText_4([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.noEditionToOpen
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java]
+Replace KEY=EditionUIMessages.BackToText_5([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.openingDefaultEditionsDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java]
+Replace KEY=EditionUIMessages.BackToText_0([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.openingWithFirstEditionNoDefaultEditionSetDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java]
+Replace KEY=EditionUIMessages.BackToText_3([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.errorDDotCouldNotRetrieveLineWordIdsAbortingBackToText
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/handlers/BackToText.java]
+Replace KEY=EditionUIMessages.menu_forward([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.forward
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java]
+Replace KEY=IndexUIMessages.IndexEditor_29([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.openingTheIndexResults
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java, /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_33([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.computingIndex
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.ComputeIndex_0([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.openingIndexResults
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/commands/function/ComputeQueryIndex.java]
+Replace KEY=TXMUIMessages.TablableVector_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.theTwoArraysMustHaveTheSameSize
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/adaptableDataStructure/TablableVector.java]
+Replace KEY=IndexUIMessages.IndexEditor_10([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.cQPErrorDDot
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=TXMUIMessages.CGU_CHECKMESSAGE([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java]
+Replace KEY=IndexUIMessages.IndexEditor_22([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.couldntInitializeIndexTable
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_20([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.indexOfInfP0SupWithPropertyDDotP1InThePartitionDDotP2
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=TXMCoreMessages.Project_26_079([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorDDotP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatDDotCorpusSkipped
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java]
+Replace KEY=TXMCoreMessages.Convert5To6_19([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.readCorpusInfosFromOldImportxmlFileDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMUIMessages.AdapterFactory_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java]
+Replace KEY=TXMCoreMessages.Convert5To6_15([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.reorganizingFilesOf
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMCoreMessages.Convert5To6_11([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.htmlDirectoryIsMissingDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMCoreMessages.Convert5To6_12([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.processing
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMCoreMessages.Convert5To6_10([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.registryFileIsMissingDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMUIMessages.ExecuteScript_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doneP0Ms
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyText.java]
+Replace KEY=TXMUIMessages.ExecuteScript_11([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.executingGroovyScript
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java]
+Replace KEY=TXMUIMessages.About_Menu_Label([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.aboutTXM
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java]
+Replace KEY=TXMCoreMessages.Convert5To6_30([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.fillImportxmlWithDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMUIMessages.MacrosExplorer_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.createANewMacroFromATemplate
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java]
+Replace KEY=TXMUIMessages.MacrosExplorer_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.newMacro
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java]
+Replace KEY=TXMCoreMessages.Convert5To6_46([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.processingTextDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMUIMessages.ConvertCorpus_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.corpusConversionFailed
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java]
+Replace KEY=TXMUIMessages.GroovyConsole_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.consoleReportsAnInternalError
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java]
+Replace KEY=TXMUIMessages.GroovyConsole_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.theErrorIsDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java]
+Replace KEY=TXMCoreMessages.QueryResult_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/QueryResult.java]
+Replace KEY=CAUIMessages.PreferencePage_8([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.coordColumnFormat
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_7([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.cosColumnFormat
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_6([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.distanceColumnFormat
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_5([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.massColumnFormat
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_0([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.qualityColumnFormat
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_4([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.showTheRows
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_3([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.showTheColumns
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_2([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.lexicalTableCreatedWhenCalledFromAPartition
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=CAUIMessages.PreferencePage_1([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.contributionColumnFormat
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java]
+Replace KEY=TXMUIMessages.SetLineNumber_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.linePerPageDDot
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java]
+Replace KEY=TXMUIMessages.SetLineNumber_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.paginationOptions
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/SetLineNumber.java]
+Replace KEY=RUIMessages.RPreferencePage_0([^_0-9a-zA-Z$]) BY KEY=RUIMessages.runRServeInDebugMode
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_2([^_0-9a-zA-Z$]) BY KEY=RUIMessages.pathToRBinary
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_1([^_0-9a-zA-Z$]) BY KEY=RUIMessages.portDefaultIs6311
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_4([^_0-9a-zA-Z$]) BY KEY=RUIMessages.serverAddress
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_3([^_0-9a-zA-Z$]) BY KEY=RUIMessages.remoteConnection
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_6([^_0-9a-zA-Z$]) BY KEY=RUIMessages.password
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_5([^_0-9a-zA-Z$]) BY KEY=RUIMessages.user
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_8([^_0-9a-zA-Z$]) BY KEY=RUIMessages.rArgs
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_7([^_0-9a-zA-Z$]) BY KEY=RUIMessages.useFileBasedRDataTransfert
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=RUIMessages.RPreferencePage_9([^_0-9a-zA-Z$]) BY KEY=RUIMessages.rserveArgs
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java]
+Replace KEY=TXMUIMessages.ImportDialog_22([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.selectDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java]
+Replace KEY=TXMUIMessages.ImportDialog_23([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.options
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=RUIMessages.CheckRPackages_43([^_0-9a-zA-Z$]) BY KEY=RUIMessages.failedCurrentVersionIsStill
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_42([^_0-9a-zA-Z$]) BY KEY=RUIMessages.updateOf
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_44([^_0-9a-zA-Z$]) BY KEY=RUIMessages.warningDDotWindowsUsersNeedToRestartTXM
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_37([^_0-9a-zA-Z$]) BY KEY=RUIMessages.rPackageUpToVersion
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=TXMUIMessages.ImportDialog_19([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.thisComputerLanguageDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=TXMUIMessages.ImportDialog_14([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.thisComputerEncodingDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=TXMUIMessages.ImportDialog_16([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.guessDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java]
+Replace KEY=TXMUIMessages.ImportDialog_13([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.thisDirectorySeemsToContainABinaryCorpus
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=RUIMessages.CheckRPackages_32([^_0-9a-zA-Z$]) BY KEY=RUIMessages.eRRORDDotREvalListSizeIs0DDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_31([^_0-9a-zA-Z$]) BY KEY=RUIMessages.eRRORDDotRlistFirstElementIsNotREXPIntegerDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_33([^_0-9a-zA-Z$]) BY KEY=RUIMessages.eRRORDDotREvalIsNotAListDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_35([^_0-9a-zA-Z$]) BY KEY=RUIMessages.updatingThe
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=TXMUIMessages.Exit_Menu_Label([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exit
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java]
+Replace KEY=RUIMessages.CheckRPackages_26([^_0-9a-zA-Z$]) BY KEY=RUIMessages.tXMCouldNotReinstallRPackagesPleaseDoItManuallySeeManual
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=TXMCoreMessages.ValidateXml_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExists_2
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/ValidateXml.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/PatchCwbRegistry.java]
+Replace KEY=TXMCoreMessages.ValidateXml_3([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.isNotReadable
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/ValidateXml.java]
+Replace KEY=TXMCoreMessages.ValidateXml_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.xmlValidationDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/ValidateXml.java]
+Replace KEY=RUIMessages.CheckRPackages_21([^_0-9a-zA-Z$]) BY KEY=RUIMessages.the_2
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=TXMCoreMessages.ValidateXml_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.isADirectory
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/ValidateXml.java]
+Replace KEY=RUIMessages.CheckRPackages_20([^_0-9a-zA-Z$]) BY KEY=RUIMessages.installedSuccessfully
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_22([^_0-9a-zA-Z$]) BY KEY=RUIMessages.packageWasNotInstalledPleaseInstallItManuallyDDotRunRAndExecuteInstallpackages
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_25([^_0-9a-zA-Z$]) BY KEY=RUIMessages.theRStatEngineIsNotRunningTryingToReinstallThePackagesRServeFactoMineRTextometry
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_24([^_0-9a-zA-Z$]) BY KEY=RUIMessages.errorWhileInstallingPackageDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_15([^_0-9a-zA-Z$]) BY KEY=RUIMessages.packageIsNotInstalledTryingToInstallItNow
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_19([^_0-9a-zA-Z$]) BY KEY=RUIMessages.doneDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_14([^_0-9a-zA-Z$]) BY KEY=RUIMessages.the
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_13([^_0-9a-zA-Z$]) BY KEY=RUIMessages.anErrorOccuredWhileGettingRWorkspaceInsanceDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=IndexUIMessages.IndexEditor_8([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.pageSize
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java, /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_1([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.failedToComputeIndex
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_0([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.indexDDotQueryIsEmpty
+Files: [/home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=IndexUIMessages.IndexEditor_2([^_0-9a-zA-Z$]) BY KEY=IndexUIMessages.indexOfInfP0SupWithPropertyDDotP1InTheCorpusDDotP2
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=EditionUIMessages.menu_reload([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.reload
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java]
+Replace KEY=TXMUIMessages.ExecuteScript_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.saveFileBeforeExecution
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java]
+Replace KEY=TXMUIMessages.ExecuteScript_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.executionOfP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java]
+Replace KEY=TXMUIMessages.ExecuteScript_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noInterpreterFoundForScriptFileExtension
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteText.java]
+Replace KEY=TXMUIMessages.ExecuteScript_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.saveAndRun
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java]
+Replace KEY=TXMUIMessages.ExecuteScript_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.dontSaveAndRun
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java]
+Replace KEY=TXMUIMessages.ExecuteScript_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.abort
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java]
+Replace KEY=TXMUIMessages.ExecuteScript_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.executionCanceled
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java]
+Replace KEY=TXMUIMessages.ExecuteScript_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.alwaysSaveBeforeLaunching
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java]
+Replace KEY=TXMUIMessages.DeleteObject_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.deletedDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java]
+Replace KEY=TXMCoreMessages.Convert5To6_9([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.dataDirectoryIsMissingDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMCoreMessages.Convert5To6_8([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.htmlDirectoryIsMissingDDot_2
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMCoreMessages.Convert5To6_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.isMissing
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMCoreMessages.Convert5To6_7([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.txmDirectoryIsMissingDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMCoreMessages.Convert5To6_6([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.checkingBinaryFormat
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/Convert5To6.java]
+Replace KEY=TXMUIMessages.ExportCorpus_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exportingP0ThisMayTakeAWhile
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/ExportCorpus.java]
+Replace KEY=TXMUIMessages.ExportCorpus_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doneTheCreatedBinaryFileIsP0
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/ExportCorpus.java]
+Replace KEY=TXMUIMessages.ExportCorpus_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToExportCorpusP0
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/ExportCorpus.java]
+Replace KEY=RUIMessages.RVariablesView_9([^_0-9a-zA-Z$]) BY KEY=RUIMessages.tXMNameP0SupSupRNameP1
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java]
+Replace KEY=RUIMessages.RVariablesView_2([^_0-9a-zA-Z$]) BY KEY=RUIMessages.showEvalLogs
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java]
+Replace KEY=RUIMessages.RVariablesView_1([^_0-9a-zA-Z$]) BY KEY=RUIMessages.refreshVariables
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java]
+Replace KEY=TXMCoreMessages.Selection_26([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToGetSupValuesOf
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java]
+Replace KEY=TXMUIMessages.OpenSVGGraph_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sVGGraphic
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java]
+Replace KEY=TXMUIMessages.ShowSelected_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.fileDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java]
+Replace KEY=TXMUIMessages.Application_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.couldNotStartProxyConfigurationDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java]
+Replace KEY=TXMUIMessages.EmpantWidget_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.from
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.to_2
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.andFrom
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.to_3
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.contextDDot
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.word
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.structure
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.includeTheKeywordStructureInTheCount
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.useLeftWindow
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.EmpantWidget_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.useRightWindow
+Files: [/home/mdecorde/workspace047/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/EmpantWidget.java]
+Replace KEY=TXMUIMessages.ComplexSort_18([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.movingDownTheSelection
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_16([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.movingUpTheSelection
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_14([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.removeFromSelection
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.addingToSelection
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_11([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.youMustSelectAtLeast2Comparators
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java, /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java]
+Replace KEY=TXMUIMessages.ComplexSort_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.invalidComparator
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java, /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java]
+Replace KEY=TXMUIMessages.CreateFolder_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.newFolderDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFolder.java]
+Replace KEY=Messages.link_error_no_query([^_0-9a-zA-Z$]) BY KEY=Messages.noQueryWasSetCommandCanceled
+Files: [/home/mdecorde/workspace047/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToQueryable.java]
+Replace KEY=TXMUIMessages.ImportDialog_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.tokenizerParameterFileDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=TXMUIMessages.ImportDialog_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.mainLanguageDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=TXMUIMessages.ImportDialog_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.importSetupP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=TXMUIMessages.ImportDialog_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sourceDirectoryDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=TXMUIMessages.ImportDialog_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sourcesCharactersEncodingDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java]
+Replace KEY=TXMCoreMessages.QueryIndex_3([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.warningDDotQueryFailedDDot
+Files: [/home/mdecorde/workspace047/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java, /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java]
+Replace KEY=TXMCoreMessages.QueryIndex_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.warningDDotDuplicateQueryEntryDDot
+Files: [/home/mdecorde/workspace047/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java, /home/mdecorde/workspace047/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java, /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java]
+Replace KEY=TXMUIMessages.MetadataPage_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noMetadataFileP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java]
+Replace KEY=TXMUIMessages.MetadataPage_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.metadataColumnTitles
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java]
+Replace KEY=TXMUIMessages.MetadataPage_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.textID
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java]
+Replace KEY=TXMUIMessages.MetadataPage_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.metadatasParameters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java]
+Replace KEY=TXMUIMessages.MetadataPage_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.metadataPreview
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java]
+Replace KEY=TXMUIMessages.QueriesView_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWithElementP0
+Files: [/home/mdecorde/workspace047/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/views/knowledgerepositories/KRView.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java]
+Replace KEY=TXMUIMessages.CorpusPage_16a([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.separatorCharacters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java]
+Replace KEY=TXMCoreMessages.Partition_18([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToGetLastCQPErrorDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=Messages.link_error_no_match([^_0-9a-zA-Z$]) BY KEY=Messages.noMatchesWasSetCommandCanceled
+Files: [/home/mdecorde/workspace047/org.txm.links.rcp/src/org/txm/links/rcp/handlers/SendSelectionToMatchable.java]
+Replace KEY=RUIMessages.CheckRPackages_9([^_0-9a-zA-Z$]) BY KEY=RUIMessages.checkingRPackages
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_5([^_0-9a-zA-Z$]) BY KEY=RUIMessages.somePackagesAreMissingSeeConsoleForDetails
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_4([^_0-9a-zA-Z$]) BY KEY=RUIMessages.rPackageDiagnostic_2
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_3([^_0-9a-zA-Z$]) BY KEY=RUIMessages.necessaryPackagesAreReady
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_2([^_0-9a-zA-Z$]) BY KEY=RUIMessages.rPackageDiagnostic
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_1([^_0-9a-zA-Z$]) BY KEY=RUIMessages.tXMCouldNotLoadTheFactoMineRRPackageTheCorrespondanceAnalysisClassificationCommandsWontBeAvailable
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=RUIMessages.CheckRPackages_0([^_0-9a-zA-Z$]) BY KEY=RUIMessages.tXMCouldNotLoadTheTextometryRPackageTheCooccurenceSpecificityAndProgressionCommandsWontBeAvailable
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java]
+Replace KEY=TXMUIMessages.DeleteObject_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorDDotDeleteReturnedFalse
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java]
+Replace KEY=TXMUIMessages.DeleteObject_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.deletingP0Continue
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java]
+Replace KEY=TXMUIMessages.DeleteObject_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.deletingP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java]
+Replace KEY=TXMUIMessages.DeleteObject_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileDeletingP0DDotP1
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java]
+Replace KEY=TXMCoreMessages.MainCorpus_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/MainCorpus.java]
+Replace KEY=RCoreMessages.ExecuteRText_0([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.runningTextSelection
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=RCoreMessages.ExecuteRText_1([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.errorWhileRunningRScriptP0DDotP1
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=RCoreMessages.ExecuteRText_2([^_0-9a-zA-Z$]) BY KEY=RCoreMessages.ms_2
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RScriptEngine.java]
+Replace KEY=TXMUIMessages.ExportResult_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToExportResultP0DDotP1
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java]
+Replace KEY=TXMUIMessages.ExportResult_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.impossibleToReadP0
+Files: [/home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java, /home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java]
+Replace KEY=TXMUIMessages.ExportResult_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToExportInFileP0WithFormatP1
+Files: [/home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java, /home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java]
+Replace KEY=TXMUIMessages.ExportResult_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exportDDotCantCreateFileP0DDotP1
+Files: [/home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java, /home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java]
+Replace KEY=TXMUIMessages.ExportResult_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.p1ExportSavedInFileDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java, /home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java]
+Replace KEY=TXMUIMessages.ExportResult_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exporting
+Files: [/home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java, /home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java]
+Replace KEY=TXMUIMessages.ExportResult_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exportingResults
+Files: [/home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChart.java, /home/mdecorde/workspace047/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ExportChartEditorView.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java]
+Replace KEY=TXMUIMessages.ShowSvgHelp_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java]
+Replace KEY=TXMUIMessages.ShowSvgHelp_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.zoomToSelectionDDotCtrlPlusLeftMousePlusdrag
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java]
+Replace KEY=TXMUIMessages.ShowSvgHelp_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.graphicsKeyboardShortcuts
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java]
+Replace KEY=TXMUIMessages.ShowSvgHelp_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.panDDotRightMousePlusDrag
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java]
+Replace KEY=TXMUIMessages.ShowSvgHelp_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.EMPTY
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java]
+Replace KEY=TXMUIMessages.ShowSvgHelp_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.resetTheViewDDotF5
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java]
+Replace KEY=EditionUIMessages.menu_back([^_0-9a-zA-Z$]) BY KEY=EditionUIMessages.back
+Files: [/home/mdecorde/workspace047/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/EditionPanel.java]
+Replace KEY=TXMUIMessages.TableSorter_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.columnIndexIsTooBig
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableSorter.java]
+Replace KEY=TXMUIMessages.SetEncoding_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.changeCharactersEncoding
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java]
+Replace KEY=TXMUIMessages.SetEncoding_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.defaultEncodingDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java]
+Replace KEY=TXMUIMessages.SetEncoding_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.changeCharactersEncodingCurrentEncodingDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java]
+Replace KEY=TXMCoreMessages.Contrasts_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.computingDDot
+Files: [/home/mdecorde/workspace047/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrasts.java]
+Replace KEY=TXMUIMessages.CreateMacro_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.macroName
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/CreateMacro.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java]
+Replace KEY=TXMUIMessages.CreateMacro_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.pleaseWriteTheMacroName
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/CreateMacro.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java]
+Replace KEY=IndexCoreMessages.Lexicon_0([^_0-9a-zA-Z$]) BY KEY=IndexCoreMessages.formsAndFrequenciesTablesMustHaveTheSameSize
+Files: [/home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java, /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java]
+Replace KEY=IndexCoreMessages.Lexicon_3([^_0-9a-zA-Z$]) BY KEY=IndexCoreMessages.lexiconDDot
+Files: [/home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java, /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java]
+Replace KEY=TXMUIMessages.TableEditor_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.canNotCreateATableWithTheProvidedInformationDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java]
+Replace KEY=TXMUIMessages.ComplexSort_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.defineAndUseACompositeSorter
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.selectACompositeSorter
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.ampNew
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.createANewSorter
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java, /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java]
+Replace KEY=TXMUIMessages.ComplexSort_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.openingComplexSortDialog
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.ampMultipleSort
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java]
+Replace KEY=TXMUIMessages.ComplexSort_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.name
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java, /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java]
+Replace KEY=TXMUIMessages.ComplexSort_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.nameIsMandatory
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComplexSort.java, /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/CompositeSorterCreationDialog.java]
+Replace KEY=TXMUIMessages.DeleteLines_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.theTableMustContainAtLeastOneLine
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java]
+Replace KEY=TXMUIMessages.Application_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.forceLoggin
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java]
+Replace KEY=TXMUIMessages.Application_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.logOptionDetected
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java]
+Replace KEY=TXMUIMessages.Application_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.argsDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java]
+Replace KEY=TXMUIMessages.NumberOfLines([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.numberOfLinesDDot
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAParametersDialog.java]
+Replace KEY=TXMUIMessages.Application_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java]
+Replace KEY=TXMUIMessages.Application_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.activateProxyService
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java]
+Replace KEY=TXMUIMessages.Application_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.lockRCPWorkspace
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/Application.java]
+Replace KEY=TXMUIMessages.CorpusPage_39([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.setImportParametersInTheSectionsBelow
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_38([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages._2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_37([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.selectTheSourceDirectory
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_36([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.wordsPerPage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_35([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages._1
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_30([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.parameters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_40([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.dDotMandatoryField
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_26([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.annotateTheCorpus
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_22([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.endOfSentenceCharacters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_19([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.elisionCharacters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_16([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.punctuations
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java]
+Replace KEY=TXMUIMessages.CorporaView_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.corpus
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java]
+Replace KEY=TXMUIMessages.CorporaView_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileComputingTheConcordanceDDot
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java]
+Replace KEY=TXMUIMessages.TxmBrowser_10([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java]
+Replace KEY=TXMUIMessages.TxmBrowser_11([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noPreviousText
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java]
+Replace KEY=TXMUIMessages.TxmBrowser_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noTextNext
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java]
+Replace KEY=TXMUIMessages.QueriesView_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.queriesDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java]
+Replace KEY=TXMUIMessages.QueriesView_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.exportAll
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java]
+Replace KEY=TXMUIMessages.CorpusPage_93([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_66([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cannotStartImportConfigurationNoSourceFolderSelected
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_65([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cannotSaveImportConfigurationNoSourceFolderSelected
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java]
+Replace KEY=TXMUIMessages.CorpusPage_64([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.concordanceContextStructureLimits
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java]
+Replace KEY=TXMUIMessages.CorpusPage_63([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.commands
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java]
+Replace KEY=TXMUIMessages.CorpusPage_57([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.fontName
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_53([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.corpusNameIsMandatory
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_52([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.savingImportParameters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_61([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.editXSLStylesheet
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_49([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages._default_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_44([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.buildEdition
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_43([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.startCorpusImport
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_42([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages._3
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.CorpusPage_41([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.pageBreakTag
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_50([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.moduleUIParametersDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.OpenBrowser_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileOpeningBibliographicRecordP0WithURLEqualsP1
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenBrowser.java]
+Replace KEY=TXMCoreMessages.Partition_9([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToCreatePartDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=TXMUIMessages.SummaryView_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noDefaultEditionPageFoundForElementDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java]
+Replace KEY=TXMCoreMessages.Selection_8([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.cantFindStructuralUnitForMetadataWithIdDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java]
+Replace KEY=TXMCoreMessages.Selection_7([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.hasNoBase
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java]
+Replace KEY=TXMCoreMessages.Selection_6([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.selectionErrorDDotTheCorpus
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java]
+Replace KEY=TXMCoreMessages.Selection_5([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.textMetadataDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java]
+Replace KEY=TXMCoreMessages.Selection_9([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorWhileGettingMetadatasFromBaseimportMetadatasDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java]
+Replace KEY=TXMUIMessages.JobHandler_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.canceling
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java]
+Replace KEY=TXMUIMessages.JobHandler_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToCancel
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java]
+Replace KEY=TXMUIMessages.JobHandler_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.canceling_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java]
+Replace KEY=TXMUIMessages.JobHandler_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cancelingRequested
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java]
+Replace KEY=TXMUIMessages.DeleteFile_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.areYouSureYouWantToDeleteToSort
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java]
+Replace KEY=TXMUIMessages.DeleteFile_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToDeleteFile
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java]
+Replace KEY=TXMCoreMessages.Project_18([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.pARAMSDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java]
+Replace KEY=TXMUIMessages.OpenBiblio_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.noTextInCorpusDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/OpenBiblio.java]
+Replace KEY=TXMCoreMessages.Project_17([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorDDotSkippingTheLoadingOfCorpusDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java]
+Replace KEY=TXMUIMessages.OpenBiblio_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.selectTextId
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/OpenBiblio.java]
+Replace KEY=TXMUIMessages.OpenBiblio_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.couldNotFindTextP0InCorpusP1
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/OpenBiblio.java]
+Replace KEY=TXMCoreMessages.Project_11([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToLoadBaseParametersFromFileDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java]
+Replace KEY=TXMUIMessages.CorpusPage_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.editions
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.spaces
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.deleteParameter
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.displayFont
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.addAXsltParameter
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.descriptionHTMLCompleteNameAuthorDateLicenseComment
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.generalInformations
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java]
+Replace KEY=TXMUIMessages.CorpusPage_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.corpusNameOnlyCapsAndNoDigitAtBeginning
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java]
+Replace KEY=TXMUIMessages.JobsTimer_15([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doneInP0P1
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.JobsTimer_19([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.doneInP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.RestartTXM_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.restartTXM
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java]
+Replace KEY=TXMUIMessages.JobsTimer_13([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.minAnd
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.JobsTimer_12([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.h
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMCoreMessages.Project_28([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.tXMNeedsFoldersDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java]
+Replace KEY=TXMCoreMessages.Project_26([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorDDotP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatDDotCorpusSkipped
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java]
+Replace KEY=TXMCoreMessages.Project_31([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.andFile
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Workspace.java]
+Replace KEY=TXMUIMessages.JobsTimer_20([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.jobDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.JobsTimer_21([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.execDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.MergeLines_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.editTheNameOfTheNewLineCreatedByTheMergedLines
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java]
+Replace KEY=TXMUIMessages.OpenBiblio_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.textP0HasNoBibliographicRecord
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/OpenBiblio.java]
+Replace KEY=TXMCoreMessages.Toolbox_10([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.noWorkspaceFoundCreatingANewOne
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java]
+Replace KEY=TXMCoreMessages.Toolbox_12([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.loadingWorkspaceFromFileDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java]
+Replace KEY=TXMCoreMessages.Toolbox_14([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorLoadingWorkspaceFromFileDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java]
+Replace KEY=TXMCoreMessages.Toolbox_15([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java]
+Replace KEY=TXMCoreMessages.Toolbox_16([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExists
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java]
+Replace KEY=TXMCoreMessages.Toolbox_17([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.endOfCQPWaitTest
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_18([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorWhileWaitingForCQP
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_22([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.workspaceDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java]
+Replace KEY=TXMCoreMessages.Toolbox_27([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.and
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_28([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToStartMemCqiClientDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_29([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorWhileConnectingToSearchEngine
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_30([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.wrongLoginOrPasswordOrPortDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_31([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToExecTaskkillIMCqpserverexeFDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_33([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.orTheEngineWasNotStartedWithTheCommandLineDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_34([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToExecTskillCqpserverexeDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_37([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.killPsAuxPipeGrepCqpserverPipeAwkP
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_38([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.print2
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.Toolbox_39([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToExec
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMCoreMessages.TSResult_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.numberOfSubMatch
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSResult.java]
+Replace KEY=TXMCoreMessages.Toolbox_40([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.dDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPSearchEngine.java]
+Replace KEY=TXMUIMessages.LastCQPError([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.lastCQPErrorDDot
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java, /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/rcp/editors/QueryIndexEditor.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java, /home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/tigersearch/editors/TSIndexEditor.java]
+Replace KEY=TXMCoreMessages.TSResult_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.numberOfMatch
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSResult.java]
+Replace KEY=AHCUIMessages.ComputeCAH_0([^_0-9a-zA-Z$]) BY KEY=AHCUIMessages.computingClassificationWithP0
+Files: [/home/mdecorde/workspace047/org.txm.ahc.rcp/src/org/txm/ahc/rcp/handlers/ComputeAHC.java]
+Replace KEY=TXMUIMessages.TxmBrowser_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.nextPage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java]
+Replace KEY=TXMUIMessages.TxmBrowser_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.previousPage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java]
+Replace KEY=TXMUIMessages.TxmBrowser_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.previousText
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java]
+Replace KEY=TXMUIMessages.TxmBrowser_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.nextText
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java]
+Replace KEY=TXMUIMessages.CreateFile_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.newFileDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFile.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/CreateMacro.java]
+Replace KEY=TXMUIMessages.BackToText_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.displayInFullText
+Files: [/home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/BackToText.java]
+Replace KEY=TXMUIMessages.RenameFile_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.renameFile
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/RenameFile.java]
+Replace KEY=TXMUIMessages.RenameFile_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToRename
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/RenameFile.java]
+Replace KEY=TXMUIMessages.RenameFile_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.renamingByDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/RenameFile.java]
+Replace KEY=TXMCoreMessages.TSCorpus_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.couldntReadCorpusDDot
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCorpus.java]
+Replace KEY=TXMUIMessages.OpenGraph_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cantOpenGraphicP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java]
+Replace KEY=TXMCoreMessages.Catalog_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.catalogFileNotFound
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/Catalog.java]
+Replace KEY=TXMUIMessages.MainPage_20([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.mainLanguage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java]
+Replace KEY=TXMUIMessages.MainPage_23([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sourceCharactersEncoding
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java]
+Replace KEY=TXMUIMessages.MainPage_18([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.frontXSL
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java]
+Replace KEY=TXMUIMessages.MainPage_19([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.lexicalSegmentation
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java]
+Replace KEY=TXMUIMessages.SORT_COLUMN([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sortingColumn
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java, /home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java, /home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/ColumnSelectionListener.java]
+Replace KEY=TXMUIMessages.CGU_MESSAGE([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java]
+Replace KEY=TXMCoreMessages.Corpus_13([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.corpusDDotgetLocaleDDotCQPIsNotReadyToAnswerDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_12([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToRestoreSubcorpus
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_15([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.informationsFromWorkspaceSelfElementNull
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_14([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.warningDDotCantLoadCorpus
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_19([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.failedToRestorePartition
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=TXMCoreMessages.Toolbox_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.file
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/Toolbox.java]
+Replace KEY=TXMUIMessages.ExportSVG_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToExportFileP0WithDeviceP1
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportSVG.java]
+Replace KEY=TXMUIMessages.ExportSVG_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.p1FileSavedInP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportSVG.java]
+Replace KEY=TXMUIMessages.TXMEditor_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.parameters_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java]
+Replace KEY=TXMUIMessages.TXMEditor_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.computing_3
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java]
+Replace KEY=TXMUIMessages.TXMEditor_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.computing_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java]
+Replace KEY=TXMUIMessages.TXMEditor_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.computing
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java]
+Replace KEY=TXMUIMessages.TXMEditor_7([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.showHideCommandParameters
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java]
+Replace KEY=IndexCoreMessages.Index_7([^_0-9a-zA-Z$]) BY KEY=IndexCoreMessages.failedToExportLexiconDDot
+Files: [/home/mdecorde/workspace047/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java, /home/mdecorde/workspace047/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java, /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Index.java, /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java, /home/mdecorde/workspace047/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java]
+Replace KEY=IndexCoreMessages.Index_1([^_0-9a-zA-Z$]) BY KEY=IndexCoreMessages.consoleDDot
+Files: [/home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/Index.java, /home/mdecorde/workspace047/org.txm.index.core/src/org/txm/index/core/functions/PartitionIndex.java]
+Replace KEY=TXMUIMessages.JobsTimer_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sec
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.JobsTimer_9([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.minAnd_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.PasteFile_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToCopy
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java]
+Replace KEY=TXMUIMessages.PasteFile_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.dDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java]
+Replace KEY=TXMUIMessages.PasteFile_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToDelete
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java]
+Replace KEY=TXMUIMessages.TxtEditor_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.encodingFound
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java]
+Replace KEY=TXMUIMessages.TxtEditor_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.textEditorDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java]
+Replace KEY=TXMUIMessages.MergeCols_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.editTheNameOfTheNewColumnCreatedByTheMergedColumns
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java]
+Replace KEY=TXMUIMessages.MergeCols_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.newName
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java, /home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java]
+Replace KEY=TXMUIMessages.MergeCols_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.endOfColumnMerge
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java]
+Replace KEY=TXMUIMessages.MergeCols_5([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.namesDDot
+Files: [/home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryAutoCooccurrence.java, /home/mdecorde/workspace047/org.txm.querycooccurrences.rcp/src/org/txm/rcp/commands/function/ComputeQueryCooccurrence.java]
+Replace KEY=TXMUIMessages.JobsTimer_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.msec
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java]
+Replace KEY=TXMUIMessages.AddBase_17([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.cannotReadTheFileP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_19([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.warning
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_28([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.extractingBinaryCorpus
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_25([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.aBinaryCorpusIsATXMFileExtensionTxmOrZip
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_24([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToLoadCorpusP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_27([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.loadingBinaryCorpus
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java]
+Replace KEY=TXMUIMessages.AddBase_20([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.theP0CorpusDirectoryAlreadyExistsDoYouWantToReplaceIt
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_22([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.thisFileIsNotATXMFileDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_32([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.loadingTheCorpusInThePlatform
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java]
+Replace KEY=TXMUIMessages.AddBase_31([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.couldNotUnzipBinaryCorpusDDot
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_33([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.restartingThePlatform
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java]
+Replace KEY=TXMUIMessages.Explorer_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.folderP0ShouldNotBeDeleted
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java]
+Replace KEY=TXMUIMessages.Explorer_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.goToTXMHome
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java]
+Replace KEY=TXMUIMessages.Explorer_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.goToParentFolder
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java]
+Replace KEY=TXMUIMessages.Explorer_8([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.goToTXMHome_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java]
+Replace KEY=TXMUIMessages.Explorer_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.tXM
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java]
+Replace KEY=TXMUIMessages.Explorer_6([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.refresh_2
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java]
+Replace KEY=TXMCoreMessages.Filter_7([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.readError
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/importer/scripts/filters/Filter.java]
+Replace KEY=TXMCoreMessages.TSCmd_30([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.queryWasDDot
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCmd.java]
+Replace KEY=TXMCoreMessages.TSCmd_31([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.matchesFound
+Files: [/home/mdecorde/workspace047/org.txm.tigersearch.rcp/src/org/txm/searchengine/ts/TSCmd.java]
+Replace KEY=TXMUIMessages.MainPage_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.mainPage
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java]
+Replace KEY=TXMUIMessages.MainPage_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.importParametersOfP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java]
+Replace KEY=TXMUIMessages.MainPage_3([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.corpusInfos
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java]
+Replace KEY=TXMCoreMessages.Corpus_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.corpusDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/selection/Selection.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_3([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.encodingDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_4([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.languageDDot
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_5([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.noValuesGiven
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java, /home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=TXMCoreMessages.Corpus_8([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.in
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java]
+Replace KEY=TXMUIMessages.AddBase_4([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToLoadBinaryCorpusNullError
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java, /home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.AddBase_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.newCorpusDDotP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java]
+Replace KEY=TXMUIMessages.OpenURI_1([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.errorWhileOpeningFileP0
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java]
+Replace KEY=TXMUIMessages.OpenURI_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.desktopIsNotSupportedFatal
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java]
+Replace KEY=CAUIMessages.CaEditor_0([^_0-9a-zA-Z$]) BY KEY=CAUIMessages.errorWhileOpeningCAEditorDDot
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java]
+Replace KEY=TXMCoreMessages.Focus_1([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.theFocusIsEmptyOrNull
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/Focus.java]
+Replace KEY=TXMUIMessages.CGU_TITLE([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.termsOfService
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java]
+Replace KEY=TXMUIMessages.SORT_DONE([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.sortDone
+Files: [/home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/ColsRowsInfosEditor.java, /home/mdecorde/workspace047/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/SingularValuesEditor.java, /home/mdecorde/workspace047/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java, /home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java]
+Replace KEY=TXMCoreMessages.Base_4([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.parentDirectory
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/CorpusBuild.java, /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Project.java]
+Replace KEY=TXMCoreMessages.Base_5([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExist_2
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/CorpusBuild.java, /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Project.java]
+Replace KEY=TXMCoreMessages.Base_6([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.errorDDotLinkGrplinkAttargetMalformedDDot
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Project.java]
+Replace KEY=TXMCoreMessages.Base_0([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.binaryDirectory
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/CorpusBuild.java, /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Project.java]
+Replace KEY=TXMCoreMessages.Base_3([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.doesNotExist
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/CorpusBuild.java, /home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Project.java]
+Replace KEY=TXMCoreMessages.FMIN_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.fmin
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java, /home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java]
+Replace KEY=TXMUIMessages.Submit_0([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.saveScript
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/Submit.java]
+Replace KEY=RUIMessages.RConsole_0([^_0-9a-zA-Z$]) BY KEY=RUIMessages.connectingRConsoleToRWorkspaceStdoutAndStderr
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java]
+Replace KEY=RUIMessages.RConsole_1([^_0-9a-zA-Z$]) BY KEY=RUIMessages.errorWhileInitializingRConsoleDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java]
+Replace KEY=TXMCoreMessages.FMAX_2([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.fmax
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java, /home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java]
+Replace KEY=TXMCoreMessages.Page_3([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.malformedURLFile
+Files: [/home/mdecorde/workspace047/org.txm.core/src/java/org/txm/objects/Page.java]
+Replace KEY=TXMUIMessages.SaveAs_2([^_0-9a-zA-Z$]) BY KEY=TXMUIMessages.failedToSaveAs
+Files: [/home/mdecorde/workspace047/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java]
+Replace KEY=TXMCoreMessages.QUERY([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.queryOnP0DDotP1InfP2
+Files: [/home/mdecorde/workspace047/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java]
+Replace KEY=RUIMessages.SendToR_3([^_0-9a-zA-Z$]) BY KEY=RUIMessages.refreshingViews
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToRCommand.java]
+Replace KEY=RUIMessages.SendToR_0([^_0-9a-zA-Z$]) BY KEY=RUIMessages.sendingToRWorkspaceDDot
+Files: [/home/mdecorde/workspace047/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToRCommand.java]
+Replace KEY=TXMCoreMessages.V([^_0-9a-zA-Z$]) BY KEY=TXMCoreMessages.v
+Files: [/home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java, /home/mdecorde/workspace047/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java, /home/mdecorde/workspace047/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java]
+Done: 1280 changes.
+

Property changes on: tmp/org.txm.translate.rcp/normalize.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationActionBarAdvisor.java	(revision 1335)
@@ -91,13 +91,13 @@
 	protected void makeActions(IWorkbenchWindow window) {
 
 		preferenceAction = ActionFactory.PREFERENCES.create(window);
-		preferenceAction.setText(TXMUIMessages.Preferences_Menu_Label);
+		preferenceAction.setText(TXMUIMessages.preferences);
 		register(preferenceAction);
 		exitAction = ActionFactory.QUIT.create(window);
-		exitAction.setText(TXMUIMessages.Exit_Menu_Label);
+		exitAction.setText(TXMUIMessages.exit);
 		register(exitAction);
 		aboutAction = ActionFactory.ABOUT.create(window);
-		aboutAction.setText(TXMUIMessages.About_Menu_Label);
+		aboutAction.setText(TXMUIMessages.aboutTXM);
 		register(aboutAction);
 		deleteAction = ActionFactory.DELETE.create(window);
 		// register(deleteAction);
@@ -193,4 +193,4 @@
 		trayItem.add(aboutAction);
 		trayItem.add(exitAction);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportSelectedText.java	(revision 1335)
@@ -70,17 +70,17 @@
 			System.out.println("No copied text. Aborting.");
 			return null;
 		}
-		System.out.println(TXMUIMessages.ImportSelectedText_0);
+		System.out.println(TXMUIMessages.importClipboardText);
 
 		try {
-			String corpusName = TXMUIMessages.ImportSelectedText_1.toUpperCase()+(nextclipcorpus++);
+			String corpusName = TXMUIMessages.clipboard_2.toUpperCase()+(nextclipcorpus++);
 			File wl = Toolbox.workspace.getLocation();
 			if (wl == null) {
 				System.out.println("Error: Toolbox not correctly initialized. Aborting clipboard import.");
 				return null;
 			}
 			while (new File(wl, corpusName).exists()) {
-				corpusName = TXMUIMessages.ImportSelectedText_1.toUpperCase()+(nextclipcorpus++);
+				corpusName = TXMUIMessages.clipboard_2.toUpperCase()+(nextclipcorpus++);
 			}
 			importText(result, corpusName);
 			
@@ -102,7 +102,7 @@
 	public static Object importText(String text, String basename) throws Exception {
 		basename = basename.toUpperCase();
 		if (text.length() == 0) {
-			System.err.println(TXMUIMessages.ImportSelectedText_2);
+			System.err.println(TXMUIMessages.clipboardIsEmpty);
 			return null;
 		}
 		String txmhome = Toolbox.getTxmHomePath();
@@ -112,8 +112,8 @@
 		if (CorpusManager.getCorpusManager().hasCorpus(clipboardDirectory.getName())) {
 			Shell shell = new Shell();
 			boolean b = MessageDialog.openConfirm(shell,
-					TXMUIMessages.ImportSelectedText_3,
-					NLS.bind(TXMUIMessages.ImportSelectedText_4, clipboardDirectory.getName()));
+					TXMUIMessages.confirm,
+					NLS.bind(TXMUIMessages.theCorpusAndTheCorpusP0WillBeDeleted, clipboardDirectory.getName()));
 			if (!b)
 				return null;
 		}
@@ -148,12 +148,12 @@
 		if ("??".equals(lang)) { //$NON-NLS-1$
 			LangDetector detector = new LangDetector(quicksrc);
 			lang = detector.getLang();
-			System.out.println(TXMUIMessages.ImportSelectedText_10+lang);
+			System.out.println(TXMUIMessages.identifiedLanguage+lang);
 		}
 		project.setLang(lang); //$NON-NLS-1$
-		System.out.println(TXMUIMessages.ImportSelectedText_12+project.getLang()); //$NON-NLS-1$
+		System.out.println(TXMUIMessages.usingLanguage+project.getLang()); //$NON-NLS-1$
 		
 		ExecuteImportScript.executeScript(project); 
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/ShowSelected.java	(revision 1335)
@@ -56,7 +56,7 @@
 			
 			if (elem instanceof File) {
 				File f = (File)elem;
-				System.out.println(TXMUIMessages.ShowSelected_0);
+				System.out.println(TXMUIMessages.fileDDot);
 				System.out.println(" path="+f.getAbsolutePath());
 				System.out.println(" size="+f.length()/1000+" kb");
 				System.out.println(" rights: read="+f.canRead()+" write="+f.canWrite()+" execute="+f.canExecute());
@@ -66,4 +66,4 @@
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/CleanPerspective.java	(revision 1335)
@@ -42,13 +42,13 @@
 			try {
 				handlerService.executeCommand("org.eclipse.ui.window.resetPerspective", null); //$NON-NLS-1$
 			} catch (Exception e) {
-				System.out.println(TXMUIMessages.CleanPerspective_1+e);
+				System.out.println(TXMUIMessages.errorWhileCallingOrgeclipseuiwindowresetPerspectiveDDot+e);
 				Log.printStackTrace(e);
 			}
 		} else {
-			System.out.println(TXMUIMessages.CleanPerspective_2);
+			System.out.println(TXMUIMessages.errorWhileCleaningPerspectiveDDotNoHandlerServiceFound);
 		}
 		
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenSVGGraph.java	(revision 1335)
@@ -86,7 +86,7 @@
 	 * @return the sVG graphic editor
 	 */
 	public static SVGGraphicEditor OpenSVGFile(String filepath) {
-		return OpenSVGFile(filepath, TXMUIMessages.OpenSVGGraph_0);
+		return OpenSVGFile(filepath, TXMUIMessages.sVGGraphic);
 	}
 
 	/**
@@ -114,4 +114,4 @@
 		}
 		return editor;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenBrowser.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenBrowser.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenBrowser.java	(revision 1335)
@@ -179,8 +179,8 @@
 			editor.setPartName(editorname);
 			return editor;
 		} catch (Exception e) {
-			Log.severe(TXMUIMessages.bind(TXMUIMessages.OpenBrowser_0, e.toString(), filepath));
-			System.out.println(TXMUIMessages.bind(TXMUIMessages.OpenBrowser_0, e.toString(), filepath));
+			Log.severe(TXMUIMessages.bind(TXMUIMessages.errorWhileOpeningBibliographicRecordP0WithURLEqualsP1, e.toString(), filepath));
+			System.out.println(TXMUIMessages.bind(TXMUIMessages.errorWhileOpeningBibliographicRecordP0WithURLEqualsP1, e.toString(), filepath));
 		}
 		return null;
 	}
@@ -215,9 +215,9 @@
 
 			return editor;
 		} catch (Exception e) {
-			Log.severe(TXMUIMessages.bind(TXMUIMessages.OpenBrowser_0, e.toString(), filepath));
-			System.out.println(TXMUIMessages.bind(TXMUIMessages.OpenBrowser_0, e.toString(), filepath));
+			Log.severe(TXMUIMessages.bind(TXMUIMessages.errorWhileOpeningBibliographicRecordP0WithURLEqualsP1, e.toString(), filepath));
+			System.out.println(TXMUIMessages.bind(TXMUIMessages.errorWhileOpeningBibliographicRecordP0WithURLEqualsP1, e.toString(), filepath));
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SaveAs.java	(revision 1335)
@@ -89,10 +89,10 @@
 					EditFile.openfile(resultFile);
 					Explorer.refresh();
 				} catch (Exception e) {
-					System.out.println(TXMUIMessages.SaveAs_2+resultFile+TXMUIMessages.PasteFile_4+e);
+					System.out.println(TXMUIMessages.failedToSaveAs+resultFile+TXMUIMessages.dDot+e);
 				}
 			}
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/SetEncoding.java	(revision 1335)
@@ -68,7 +68,7 @@
 			if (currentEncoding == null) currentEncoding = defaultEncoding;
 			Shell sh = new Shell();
 			InputDialog dlg = new InputDialog(sh,
-					TXMUIMessages.SetEncoding_0, TXMUIMessages.SetEncoding_1+currentEncoding+TXMUIMessages.SetEncoding_2+defaultEncoding, currentEncoding, null);
+					TXMUIMessages.changeCharactersEncoding, TXMUIMessages.changeCharactersEncodingCurrentEncodingDDot+currentEncoding+TXMUIMessages.defaultEncodingDDot+defaultEncoding, currentEncoding, null);
 			if (dlg.open() == Window.OK) {
 				String newEncoding = dlg.getValue();
 				if (newEncoding != null && newEncoding.trim().length() > 0 && !newEncoding.trim().equals(currentEncoding)) {
@@ -79,4 +79,4 @@
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java	(revision 1335)
@@ -63,7 +63,7 @@
 			protected IStatus run(IProgressMonitor monitor) {
 				JobsTimer.start();
 				try {
-					monitor.beginTask(TXMUIMessages.RestartTXM_1, 100);
+					monitor.beginTask(TXMUIMessages.restartTXM, 100);
 					//Toolbox.updateProperties(TxmPreferences.getProperties());
 					Toolbox.restart();
 
@@ -76,7 +76,7 @@
 					});
 
 				} catch (Exception e) {
-					System.out.println(NLS.bind(TXMUIMessages.RunGroovyScript_8, e));
+					System.out.println(NLS.bind(TXMUIMessages.errorWhileRunningScriptDDotP0, e));
 					org.txm.rcp.utils.Logger.printStackTrace(e);
 				} finally {
 					monitor.done();
@@ -104,4 +104,4 @@
 		//System.err.println(Messages.AddBase_10);
 		//StatusLine.setMessage(Messages.AddBase_10);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java	(revision 1335)
@@ -170,12 +170,12 @@
 				engine.stop();
 			}
 			
-			monitor.beginTask(TXMUIMessages.AddBase_27, 100);
+			monitor.beginTask(TXMUIMessages.loadingBinaryCorpus, 100);
 			job.acquireSemaphore();
 			Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
 			job.releaseSemaphore();
 
-			monitor.subTask(TXMUIMessages.AddBase_32);
+			monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform);
 			for (File corpusDirectory : corporaDirectory.listFiles()) {
 				
 				if (corpusDirectory.isHidden()) continue;
@@ -202,7 +202,7 @@
 				}
 			}
 
-			monitor.subTask(TXMUIMessages.AddBase_33);
+			monitor.subTask(TXMUIMessages.restartingThePlatform);
 			
 		} catch (ThreadDeath td) { 
 		} catch (Exception e2) {
@@ -213,4 +213,4 @@
 		
 		return projects;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load079BinaryCorpus.java	(revision 1335)
@@ -76,8 +76,8 @@
 		}
 
 		//ZIPPED FILE
-		monitor.beginTask(TXMUIMessages.AddBase_27, 100);
-		monitor.subTask(TXMUIMessages.AddBase_28);
+		monitor.beginTask(TXMUIMessages.loadingBinaryCorpus, 100);
+		monitor.subTask(TXMUIMessages.extractingBinaryCorpus);
 		try {
 			//System.out.println(NLS.bind(Messages.AddBase_29, zipFile, corporaDir));
 			Zip.decompress(zipFile, corporaDir, false, monitor);
@@ -86,13 +86,13 @@
 				basedirname = basedirname.toUpperCase();
 			}
 		} catch (Exception e) {
-			System.out.println(NLS.bind(TXMUIMessages.AddBase_31, e));
+			System.out.println(NLS.bind(TXMUIMessages.couldNotUnzipBinaryCorpusDDot, e));
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 			return null;
 		}
 		monitor.worked(50);
 
-		monitor.subTask(TXMUIMessages.AddBase_32);
+		monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform);
 		return loadBinaryCorpusAsDirectory(new File(corporaDir, basedirname), monitor);
 	}
 
@@ -106,8 +106,8 @@
 	 */
 	public static Project loadBinaryCorpusAsDirectory(File binCorpusDirectory, IProgressMonitor monitor) throws Exception {
 		if (!(binCorpusDirectory.exists() && binCorpusDirectory.isDirectory())) {
-			Log.severe(NLS.bind(TXMUIMessages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
-			System.out.println(NLS.bind(TXMUIMessages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
+			Log.severe(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, binCorpusDirectory.getAbsolutePath()));
+			System.out.println(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, binCorpusDirectory.getAbsolutePath()));
 			return null; 
 		}
 
@@ -117,7 +117,7 @@
 		txmcorpora.mkdir();
 		Project project = Toolbox.workspace.scanDirectory079(binCorpusDirectory);
 		if (project == null) {
-			Log.severe(NLS.bind(TXMUIMessages.AddBase_2, binCorpusDirectory)); 
+			Log.severe(NLS.bind(TXMUIMessages.failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents, binCorpusDirectory)); 
 			return null;
 		}
 		
@@ -131,4 +131,4 @@
 		//Toolbox.workspace.save();
 		return project;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java	(revision 1335)
@@ -116,13 +116,13 @@
 		corporaDir.mkdir();
 
 		if (!filename.endsWith(".txm") && !filename.endsWith(".zip")) { //$NON-NLS-1$ //$NON-NLS-2$
-			System.out.println(TXMUIMessages.AddBase_25);
-			System.out.println(NLS.bind(TXMUIMessages.AddBase_22, zipFile));
+			System.out.println(TXMUIMessages.aBinaryCorpusIsATXMFileExtensionTxmOrZip);
+			System.out.println(NLS.bind(TXMUIMessages.thisFileIsNotATXMFileDDotP0, zipFile));
 			return false;
 		}
 
 		if (!zipFile.canRead()) {
-			System.out.println(NLS.bind(TXMUIMessages.AddBase_17, zipFile));
+			System.out.println(NLS.bind(TXMUIMessages.cannotReadTheFileP0, zipFile));
 			return false;
 		}
 		
@@ -140,7 +140,7 @@
 		Project p = Toolbox.workspace.getProject(basedirname);
 		
 		if (corpusdir.exists() || p != null) {
-			boolean b = MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), TXMUIMessages.AddBase_19, NLS.bind(TXMUIMessages.AddBase_20, corpusdir.getName().toUpperCase()));
+			boolean b = MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), TXMUIMessages.warning, NLS.bind(TXMUIMessages.theP0CorpusDirectoryAlreadyExistsDoYouWantToReplaceIt, corpusdir.getName().toUpperCase()));
 			if (b) {
 				//TODO: to enable backup of binary corpus I need to be able to reload correctly a corpus in CQP corpus manager
 //				backup = new File(corpusdir.getParentFile(), corpusdir.getName()+"-back"); //$NON-NLS-1$
@@ -183,7 +183,7 @@
 
 		// scan dir
 		JobHandler jobhandler = new JobHandler(
-				NLS.bind(TXMUIMessages.AddBase_1, corpusdir.getName())) {
+				NLS.bind(TXMUIMessages.newCorpusDDotP0, corpusdir.getName())) {
 			@Override
 			protected IStatus run(final IProgressMonitor monitor) {
 				this.runInit(monitor);
@@ -294,8 +294,8 @@
 	 */
 	public static Project loadBinaryCorpusAsDirectory(File corpusDirectory, IProgressMonitor monitor) throws Exception {
 		if (!(corpusDirectory.exists() && corpusDirectory.isDirectory())) {
-			Log.severe(NLS.bind(TXMUIMessages.AddBase_24, corpusDirectory.getAbsolutePath()));
-			System.out.println(NLS.bind(TXMUIMessages.AddBase_24, corpusDirectory.getAbsolutePath()));
+			Log.severe(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, corpusDirectory.getAbsolutePath()));
+			System.out.println(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, corpusDirectory.getAbsolutePath()));
 			return null; 
 		}
 
@@ -310,7 +310,7 @@
 //		txmcorpora.mkdir();
 //		Project base = Toolbox.workspace.scanDirectory(binCorpusDirectory);
 //		if (base == null) {
-//			Log.severe(NLS.bind(TXMUIMessages.AddBase_2, binCorpusDirectory)); 
+//			Log.severe(NLS.bind(TXMUIMessages.failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents, binCorpusDirectory)); 
 //			return null;
 //		}
 //
@@ -344,4 +344,4 @@
 		
 		return project;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/Load080BinaryCorpus.java	(revision 1335)
@@ -54,8 +54,8 @@
 	 */
 	public static Project loadBinaryCorpus(File zipFile, IProgressMonitor monitor) throws Exception {
 		//ZIPPED FILE
-		if (monitor != null) monitor.beginTask(TXMUIMessages.AddBase_27, 100);
-		if (monitor != null) monitor.subTask(TXMUIMessages.AddBase_28);
+		if (monitor != null) monitor.beginTask(TXMUIMessages.loadingBinaryCorpus, 100);
+		if (monitor != null) monitor.subTask(TXMUIMessages.extractingBinaryCorpus);
 		
 		String basedirname = Zip.getRoot(zipFile);
 		
@@ -74,16 +74,16 @@
 			//System.out.println(NLS.bind(Messages.AddBase_29, zipFile, corporaDir));
 			Zip.decompress(zipFile, Toolbox.workspace.getLocation(), false, monitor);
 		} catch (Exception e) {
-			System.out.println(NLS.bind(TXMUIMessages.AddBase_31, e));
+			System.out.println(NLS.bind(TXMUIMessages.couldNotUnzipBinaryCorpusDDot, e));
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 			return null;
 		}
 		if (monitor != null) monitor.worked(50);
 
-		if (monitor != null) monitor.subTask(TXMUIMessages.AddBase_32);
+		if (monitor != null) monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform);
 		Project newProject = loadBinaryCorpusAsDirectory(new File(Toolbox.workspace.getLocation(), basedirname));
 		if (newProject == null) {
-			System.out.println(TXMUIMessages.AddBase_4);
+			System.out.println(TXMUIMessages.failedToLoadBinaryCorpusNullError);
 			return null;
 		}
 		
@@ -100,8 +100,8 @@
 	 */
 	public static Project loadBinaryCorpusAsDirectory(File binCorpusDirectory) throws Exception {
 		if (!(binCorpusDirectory.exists() && binCorpusDirectory.isDirectory())) {
-			Log.severe(NLS.bind(TXMUIMessages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
-			System.out.println(NLS.bind(TXMUIMessages.AddBase_24, binCorpusDirectory.getAbsolutePath()));
+			Log.severe(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, binCorpusDirectory.getAbsolutePath()));
+			System.out.println(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, binCorpusDirectory.getAbsolutePath()));
 			return null; 
 		}
 
@@ -109,11 +109,11 @@
 		txmcorpora.mkdir();
 		Project base = Toolbox.workspace.scanDirectory(binCorpusDirectory);
 		if (base == null) {
-			Log.severe(NLS.bind(TXMUIMessages.AddBase_2, binCorpusDirectory)); 
+			Log.severe(NLS.bind(TXMUIMessages.failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents, binCorpusDirectory)); 
 			return null;
 		}
 
 		Toolbox.workspace.saveParameters();
 		return base;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/ConvertCorpus.java	(revision 1335)
@@ -55,7 +55,7 @@
 
 						Project base = LoadBinaryCorpus.loadBinaryCorpusAsDirectory(outdir, monitor);
 						if (base == null) {
-							System.out.println(TXMUIMessages.ConvertCorpus_0);
+							System.out.println(TXMUIMessages.corpusConversionFailed);
 							return Status.CANCEL_STATUS;
 						}
 						
@@ -72,7 +72,7 @@
 						});
 						
 					} catch (Throwable e) {
-						System.out.println(NLS.bind(TXMUIMessages.RunGroovyScript_8,
+						System.out.println(NLS.bind(TXMUIMessages.errorWhileRunningScriptDDotP0,
 								e));
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 					} finally {
@@ -91,4 +91,4 @@
 		jobhandler.startJob();
 		return event;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenGraph.java	(revision 1335)
@@ -147,7 +147,7 @@
 		else
 		{
 			if (!OpenURI.open(graphfile))
-				System.out.println(NLS.bind(TXMUIMessages.OpenGraph_8, graphfile.getAbsolutePath()));
+				System.out.println(NLS.bind(TXMUIMessages.cantOpenGraphicP0, graphfile.getAbsolutePath()));
 			return null;
 		}
 	}
@@ -198,4 +198,4 @@
 //		return OpenFile(file.getAbsolutePath(), name, device, image);
 //	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java	(revision 1335)
@@ -87,11 +87,11 @@
 		configurer.setShowFastViewBars(false);
 		configurer.setShowProgressIndicator(true);
 		configurer.setShowPerspectiveBar(true);
-		configurer.setTitle(TXMUIMessages.Explorer_3);
+		configurer.setTitle(TXMUIMessages.tXM);
 		
 
 		// This is a patch to remove the Quick Search Field and spacers from the Main toolbar
-		Log.warning(TXMUIMessages.ApplicationWorkbenchWindowAdvisor_0);
+		Log.warning(TXMUIMessages.removeUnnecessaryE4Elements);
 		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		if (window instanceof WorkbenchWindow) {
 			MWindow model = ((WorkbenchWindow) window).getModel();
@@ -131,7 +131,7 @@
 	 */
 	@Override
 	public void postWindowOpen() {
-		Log.warning(TXMUIMessages.ApplicationWorkbenchWindowAdvisor_9);
+		Log.warning(TXMUIMessages.settingStatusLineAndConfiguringActionSets);
 		StatusLine.set(getWindowConfigurer().getActionBarConfigurer().getStatusLineManager());
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		page.hideActionSet("org.eclipse.ui.edit.text.actionSet.navigation"); //$NON-NLS-1$
@@ -164,4 +164,4 @@
 //			}
 //		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/JobsTimer.java	(revision 1335)
@@ -33,18 +33,18 @@
 	private static String setMessage() {
 		t = time;
 		if (t < 1000) {
-			message = ""+((int)t)+TXMUIMessages.JobsTimer_2; //$NON-NLS-1$
+			message = ""+((int)t)+TXMUIMessages.msec; //$NON-NLS-1$
 		} else {
 			t = t/1000;
 			if (t < 3) {
 				message = ""+t; //$NON-NLS-1$
-				message = ""+(message.substring(0, 3))+TXMUIMessages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+(message.substring(0, 3))+TXMUIMessages.sec; //$NON-NLS-1$
 			} else if (t < 60) 
-				message = ""+((int)t)+TXMUIMessages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+((int)t)+TXMUIMessages.sec; //$NON-NLS-1$
 			else if (t < 3600) {
-				message = ""+((int)t/60)+TXMUIMessages.JobsTimer_9+((int)t%60)+TXMUIMessages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+((int)t/60)+TXMUIMessages.minAnd+((int)t%60)+TXMUIMessages.sec; //$NON-NLS-1$
 			} else { 
-				message = ""+((int)t/3600)+TXMUIMessages.JobsTimer_12+((int)(t%3600)/60)+TXMUIMessages.JobsTimer_13+((int)(t%3600)%60)+ TXMUIMessages.JobsTimer_5; //$NON-NLS-1$
+				message = ""+((int)t/3600)+TXMUIMessages.h+((int)(t%3600)/60)+TXMUIMessages.minAnd+((int)(t%3600)%60)+ TXMUIMessages.sec; //$NON-NLS-1$
 			}
 		}
 		return message;
@@ -56,8 +56,8 @@
 	
 	public static void stopAndPrint() {
 		if (TBXPreferences.getInstance().getBoolean(TBXPreferences.SHOW_TIMINGS)) {
-			if (time <= 1000) System.out.println(NLS.bind(TXMUIMessages.JobsTimer_15, stop(),(int)time));
-			else System.out.println(NLS.bind(TXMUIMessages.JobsTimer_19, stop()));
+			if (time <= 1000) System.out.println(NLS.bind(TXMUIMessages.doneInP0P1, stop(),(int)time));
+			else System.out.println(NLS.bind(TXMUIMessages.doneInP0, stop()));
 		}
 	}
 
@@ -66,7 +66,7 @@
 		Thread.sleep(1000);
 		JobsTimer.start();
 		Thread.sleep(1000);
-		System.out.println(TXMUIMessages.JobsTimer_20+JobsTimer.stop());
-		System.out.println(TXMUIMessages.JobsTimer_21+ExecTimer.stop());
+		System.out.println(TXMUIMessages.jobDDot+JobsTimer.stop());
+		System.out.println(TXMUIMessages.execDDot+ExecTimer.stop());
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 1335)
@@ -184,11 +184,11 @@
 			//Display.getCurrent() works because this code is run during the splash screen
 			String[] dialogButtonLabels = {"OK", "Cancel"};
 			CGUMessageDialog dialog = new CGUMessageDialog(Display.getCurrent().getActiveShell(), 
-					TXMUIMessages.CGU_TITLE, 
+					TXMUIMessages.termsOfService, 
 					IImageKeys.getImage(IImageKeys.TXM_ICON), 
-					TXMUIMessages.CGU_MESSAGE, 
+					TXMUIMessages.infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt, 
 					IImageKeys.getImage(IImageKeys.TXM), 
-					TXMUIMessages.CGU_CHECKMESSAGE, 
+					TXMUIMessages.iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage, 
 					dialogButtonLabels, 0) {
 			};
 			boolean ret = (dialog.open() == MessageDialog.OK) && dialog.hasCheckBeenPressed();
@@ -211,7 +211,7 @@
 		try {			
 			// create the Toolbox initialization job
 			JobHandler jobhandler = new JobHandler(
-					TXMUIMessages.ApplicationWorkbenchAdvisor_1, true) {
+					TXMUIMessages.initializationOfThePlatform, true) {
 				@Override
 				protected IStatus run(final IProgressMonitor monitor) {
 					JobsTimer.start();
@@ -229,17 +229,17 @@
 
 						monitor.beginTask("Starting TXM", 100);
 
-						monitor.setTaskName(TXMUIMessages.ApplicationWorkbenchAdvisor_2);
-						Log.warning(TXMUIMessages.ApplicationWorkbenchAdvisor_72);
+						monitor.setTaskName(TXMUIMessages.loadingTXMInstallPreferences);
+						Log.warning(TXMUIMessages.startJobDDotLoadInstallPreferences);
 						if (!checkInstallDirectory(this)) {
 							monitor.done();
-							System.err.println(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed);
+							System.err.println(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup);
 							return Status.CANCEL_STATUS;
 						}
 						monitor.worked(10);
 
-						monitor.setTaskName(TXMUIMessages.ApplicationWorkbenchAdvisor_3);
-						Log.warning(TXMUIMessages.ApplicationWorkbenchAdvisor_73);
+						monitor.setTaskName(TXMUIMessages.checkingForExistingWorkspaceDirectory);
+						Log.warning(TXMUIMessages.startJobDDotCheckTXMHOME);
 						if (!checkTXMHOME(this, monitor)) {
 							monitor.done();
 							System.err.println("Errors occured during TXM post-installation.");
@@ -247,8 +247,8 @@
 						monitor.worked(30);
 
 						//INITIALIZE TBX AND UI
-						monitor.setTaskName(TXMUIMessages.ApplicationWorkbenchAdvisor_0);
-						Log.warning(TXMUIMessages.ApplicationWorkbenchAdvisor_74);
+						monitor.setTaskName(TXMUIMessages.initializingPlatform);
+						Log.warning(TXMUIMessages.startJobDDotInitializeUI);
 						if (!initializeUI(this)) {
 							monitor.done();
 							return Status.CANCEL_STATUS;
@@ -276,7 +276,7 @@
 
 						monitor.done();
 					} catch (Exception e) {
-						System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_75+e);
+						System.out.println(TXMUIMessages.errorWhileLoadingTXMDDot+e);
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 					} catch(ThreadDeath td) {
 						System.out.println("TXM initialization has been canceled by user. Please restart TXM.");
@@ -292,8 +292,8 @@
 			startUpdateLookUpJob(false);
 
 		} catch (Exception e) {
-			Log.severe(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
-			System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed+" "+e.getMessage());
+			Log.severe(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
+			System.out.println(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup+" "+e.getMessage());
 			Log.printStackTrace(e);
 		}
 	}
@@ -326,7 +326,7 @@
 		// build the properties given to the Toolbox
 		String version =  Activator.getDefault().getBundle().getVersion().toString(); // "0.7.7.201412160925";
 		version = version.replaceAll("(.\\..\\..)\\.(....)(..)(..)(..)(..)", "$1 ($2-$3-$4 $5h$6)"); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(NLS.bind(TXMUIMessages.ApplicationWorkbenchAdvisor_init, version));
+		System.out.println(NLS.bind(TXMUIMessages.startingUpP0, version));
 
 	}
 
@@ -334,7 +334,7 @@
 		PreferenceManager pm = PlatformUI.getWorkbench().getPreferenceManager();
 
 		// Remove RCP Update preference page
-		Log.warning(TXMUIMessages.ApplicationWorkbenchAdvisor_21);
+		Log.warning(TXMUIMessages.removeUnusedEclipseRCPPreferencePage);
 		if (!TBXPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER)) {
 			pm.remove("org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"); //$NON-NLS-1$
 
@@ -385,7 +385,7 @@
 				return;
 			}
 
-			Log.warning(TXMUIMessages.ApplicationWorkbenchAdvisor_77);
+			Log.warning(TXMUIMessages.startingUpdateFetch);
 
 			Display.getDefault().syncExec(new Runnable() {
 				@Override
@@ -397,11 +397,11 @@
 							e.display = Display.getDefault();
 							handlerService.executeCommand(TXMUpdateHandler.ID, e);
 						} catch (Exception e) {
-							System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_78+e);
+							System.out.println(TXMUIMessages.errorWhileUpdatingTXMDDot+e);
 							Log.printStackTrace(e);
 						}
 					} else {
-						System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_79);
+						System.out.println(TXMUIMessages.errorWhileUpdatingTXMDDotNoHandlerServiceFound);
 					}
 				}
 			});
@@ -481,7 +481,7 @@
 	 */
 	private void InitializeLogger() {
 		IOConsole console = new IOConsole(
-				TXMUIMessages.ApplicationWorkbenchAdvisor_5, null);
+				TXMUIMessages.systemOutput, null);
 		ConsolePlugin.getDefault().getConsoleManager().addConsoles(
 				new IConsole[] { console });
 
@@ -589,7 +589,7 @@
 				return true;
 			}
 		} catch (Exception e) {
-			System.err.println(TXMUIMessages.ApplicationWorkbenchAdvisor_9+ " " +e.getLocalizedMessage());
+			System.err.println(TXMUIMessages.couldNotReadInstallPreferencesFile+ " " +e.getLocalizedMessage());
 			Log.printStackTrace(e);
 			return false;
 		}
@@ -679,10 +679,10 @@
 		Log.info("needToRestoreTXMHOME="+needToRestoreTXMHOME+" installPreferenceRestored="+installPreferenceRestored);
 		if (needToRestoreTXMHOME || installPreferenceRestored) {
 
-			System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_7);
+			System.out.println(TXMUIMessages.creatingTXMUserWorkingDirectory);
 
 			try {
-				Log.info(NLS.bind(TXMUIMessages.ApplicationWorkbenchAdvisor_8, Toolbox.getInstallDirectory()));
+				Log.info(NLS.bind(TXMUIMessages.installPathDDotP0, Toolbox.getInstallDirectory()));
 
 				Log.info("Checking TXM user directory.");
 				if (Toolbox.getTxmHomePath().trim().isEmpty()) {
@@ -718,8 +718,8 @@
 				txmHomeRestored = true;
 			} catch (Exception e) {
 				org.txm.rcp.utils.Logger.printStackTrace(e);
-				System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_47+" "+e.getLocalizedMessage()); //$NON-NLS-1$
-				Log.severe(TXMUIMessages.ApplicationWorkbenchAdvisor_47+e.getLocalizedMessage());
+				System.out.println(TXMUIMessages.failedToBackupExistingCorporaDDot+" "+e.getLocalizedMessage()); //$NON-NLS-1$
+				Log.severe(TXMUIMessages.failedToBackupExistingCorporaDDot+e.getLocalizedMessage());
 				return false;
 			}
 
@@ -747,22 +747,22 @@
 				public void run() {
 					Display display = Display.getDefault();
 					Shell shell = display.getActiveShell();
-					go = MessageDialog.openConfirm(shell, TXMUIMessages.ApplicationWorkbenchAdvisor_28, NLS.bind(TXMUIMessages.ApplicationWorkbenchAdvisor_27, txmhomedir));
+					go = MessageDialog.openConfirm(shell, TXMUIMessages.workspaceDirectoryBackup, NLS.bind(TXMUIMessages.tXMWorkspaceDirectoryAlreadyExistsP0WouldYouLikeToReloadItsCorporaInYourNewTXM, txmhomedir));
 				}
 			});
 
 			if (go) {
-				monitor.setTaskName(TXMUIMessages.bind(TXMUIMessages.ApplicationWorkbenchAdvisor_30, backup.getAbsolutePath()));
+				monitor.setTaskName(TXMUIMessages.bind(TXMUIMessages.movingCorporaToP0, backup.getAbsolutePath()));
 				backup.mkdir();
 
 				if (!backup.exists()) {
-					System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_34 + backup);
+					System.out.println(TXMUIMessages.couldNotCreateBackupDirectoryDDot + backup);
 					return;
 				}
 
 				//$NON-NLS-1$
 				if (oldbackup.exists()) {
-					Log.info(TXMUIMessages.bind(TXMUIMessages.ApplicationWorkbenchAdvisor_16, oldbackup));
+					Log.info(TXMUIMessages.bind(TXMUIMessages.removingOldCorpusBackupDirectoryP0, oldbackup));
 					DeleteDir.deleteDirectory(oldbackup); // ]8)
 				}
 
@@ -772,7 +772,7 @@
 
 				if (corpDirs != null) {
 					Arrays.sort(corpDirs);
-					System.out.print(TXMUIMessages.bind(TXMUIMessages.ApplicationWorkbenchAdvisor_30, backup.getAbsolutePath()));
+					System.out.print(TXMUIMessages.bind(TXMUIMessages.movingCorporaToP0, backup.getAbsolutePath()));
 					for (File corpusdir : corpDirs) {
 						File backCorpus = new File(backup, corpusdir.getName());
 						if (corpusdir.canRead() && corpusdir.isDirectory()) {
@@ -791,10 +791,10 @@
 					System.out.println();
 				}
 				if (moved.size() > 0) {
-					Log.info(TXMUIMessages.bind(TXMUIMessages.ApplicationWorkbenchAdvisor_18,oldbackup,StringUtils.join(moved,", "))); //$NON-NLS-1$
+					Log.info(TXMUIMessages.bind(TXMUIMessages.corporaBackupedDDotP0,oldbackup,StringUtils.join(moved,", "))); //$NON-NLS-1$
 				}
 				if (failed.size() > 0) {
-					System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_44+failed+TXMUIMessages.ApplicationWorkbenchAdvisor_37+backup);
+					System.out.println(TXMUIMessages.failedToMoveCorpus+failed+TXMUIMessages.to+backup);
 				}
 			}
 		}
@@ -844,7 +844,7 @@
 //						try {
 //							Zip.decompress(zipFile.getAbsolutePath(), corporaDir.getAbsolutePath(), false);
 //						} catch (IOException e) {
-//							System.out.println(NLS.bind(TXMUIMessages.AddBase_31, e));
+//							System.out.println(NLS.bind(TXMUIMessages.couldNotUnzipBinaryCorpusDDot, e));
 //						}
 //					} else if (zipFile.isDirectory()) {
 //						//basedir = zipFile;
@@ -855,8 +855,8 @@
 ////						}
 ////						FileCopy.copyFiles(zipFile, basedir); // copy the sample corpus to load
 //					} else {
-//						System.out.println(NLS.bind(TXMUIMessages.AddBase_22, zipFile));
-//						System.out.println(TXMUIMessages.AddBase_25);
+//						System.out.println(NLS.bind(TXMUIMessages.thisFileIsNotATXMFileDDotP0, zipFile));
+//						System.out.println(TXMUIMessages.aBinaryCorpusIsATXMFileExtensionTxmOrZip);
 //						continue;
 //					}
 //					
@@ -1042,11 +1042,11 @@
 									// init with Eclipse preference stores
 									
 									if (Toolbox.initialize(TBXPreferences.class, monitor)) {
-										StatusLine.setMessage(TXMUIMessages.ApplicationWorkbenchAdvisor_ready);
-										System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_ready);
+										StatusLine.setMessage(TXMUIMessages.ready);
+										System.out.println(TXMUIMessages.ready);
 									} else {
-										StatusLine.setMessage(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed);
-										System.out.println(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed);
+										StatusLine.setMessage(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup);
+										System.out.println(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup);
 										
 										monitor.done();
 										return;
@@ -1064,13 +1064,13 @@
 						}
 					});
 
-					Log.warning(TXMUIMessages.ApplicationWorkbenchAdvisor_88);
+					Log.warning(TXMUIMessages.loadingViews);
 					RestartTXM.reloadViews(); // reload views
 
 					if (Toolbox.isInitialized()) {
-						StatusLine.setMessage(TXMUIMessages.ApplicationWorkbenchAdvisor_ready);
+						StatusLine.setMessage(TXMUIMessages.ready);
 					} else {
-						StatusLine.setMessage(TXMUIMessages.ApplicationWorkbenchAdvisor_init_failed);
+						StatusLine.setMessage(TXMUIMessages.startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup);
 					}
 
 					setDefaultTheme();
@@ -1124,4 +1124,4 @@
 		//TxmPreferences.dump();
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 1335)
@@ -71,12 +71,12 @@
 		Map args = context.getArguments();
 
 		List<String> argsList = Arrays.asList((String[])(args.get("application.args")));
-		System.out.println(TXMUIMessages.Application_0+argsList);
+		System.out.println(TXMUIMessages.argsDDot+argsList);
 		if (argsList.contains("-log")) { //$NON-NLS-1$
-			System.out.println(TXMUIMessages.Application_1);
+			System.out.println(TXMUIMessages.logOptionDetected);
 			Log.setPrintInConsole(true);
 			Log.setLevel(Level.ALL);
-			Log.severe(TXMUIMessages.Application_2);
+			Log.severe(TXMUIMessages.forceLoggin);
 			Toolbox.setPreference(TBXPreferences.ADD_TECH_LOGS, true);
 			Toolbox.setPreference(TBXPreferences.LOG_LEVEL, "ALL"); //$NON-NLS-1$
 			Toolbox.setPreference(TBXPreferences.LOG_STACKTRACE, true);
@@ -119,9 +119,9 @@
 //			}
 		} else {
 			System.err.println("TXM must be launch with the argument '-run' to start."); //$NON-NLS-1$
-			System.err.println(TXMUIMessages.Application_4);
+			System.err.println(TXMUIMessages.thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual);
 
-			javax.swing.JOptionPane.showMessageDialog(null, TXMUIMessages.Application_4);
+			javax.swing.JOptionPane.showMessageDialog(null, TXMUIMessages.thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual);
 			return IApplication.EXIT_OK;
 		}
 		// test if Java 1.6 is installed
@@ -137,7 +137,7 @@
 		//display.addListener(SWT.OpenDocument, openDocProcessor);
 
 		//Lock the RCP workspace, thus there is only one TXM instance running
-		Log.warning(TXMUIMessages.Application_8);
+		Log.warning(TXMUIMessages.lockRCPWorkspace);
 		if (!Platform.getInstanceLocation().lock()){
 			//Shell shell = display.getActiveShell();
 			System.out.println("TXM is already running. Exiting...");
@@ -145,10 +145,10 @@
 		}
 
 		try {
-			Log.warning(TXMUIMessages.Application_9);
+			Log.warning(TXMUIMessages.activateProxyService);
 			activateProxyService();
 		} catch (Exception e) {
-			Log.warning(TXMUIMessages.Application_10+e);
+			Log.warning(TXMUIMessages.couldNotStartProxyConfigurationDDot+e);
 		}
 
 		try {
@@ -277,7 +277,7 @@
 //		try {
 //			preferences.save();
 //		} catch (IOException e) {
-//			System.err.println(NLS.bind(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES, e));
+//			System.err.println(NLS.bind(TXMUIMessages.failedToSavePreferencesDDot, e));
 //			exit = true;
 //			return exit;
 //		}
@@ -286,4 +286,4 @@
 //			exit = true;
 //		return exit;
 //	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java	(revision 1335)
@@ -78,7 +78,7 @@
 					firstCorpusDiag = false;
 					for (MainCorpus corpus : corpora) {
 						if (corpus.getProject() == null) {
-							System.out.println(NLS.bind(TXMUIMessages.AdapterFactory_0, corpus));
+							System.out.println(NLS.bind(TXMUIMessages.warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly, corpus));
 						}
 					}
 				}
@@ -240,4 +240,4 @@
 		return new Class[] { IWorkbenchAdapter.class };
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 1335)
@@ -185,7 +185,7 @@
 	@Override
 	public void createPartControl(Composite parent) {
 		treeViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(treeViewer.getControl(), TXMUIMessages.CorporaView_0);
+		PlatformUI.getWorkbench().getHelpSystem().setHelp(treeViewer.getControl(), TXMUIMessages.corpus);
 		getSite().setSelectionProvider(treeViewer);
 		treeViewer.setColumnProperties(new String[]{"name"}); // mandatory to enable edit mode -> used to identify columns
 
@@ -591,4 +591,4 @@
 			corporaView.treeViewer.expandToLevel(obj, 1);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/GroovyConsole.java	(revision 1335)
@@ -169,8 +169,8 @@
 					return;
 			}
 		} catch (Exception e) {
-			textArea.append(TXMUIMessages.GroovyConsole_4);
-			textArea.append(TXMUIMessages.GroovyConsole_5 + e);
+			textArea.append(TXMUIMessages.consoleReportsAnInternalError);
+			textArea.append(TXMUIMessages.theErrorIsDDot + e);
 		}
 	}
 
@@ -214,4 +214,4 @@
 
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 1335)
@@ -154,7 +154,7 @@
 		Button export = new Button(parent, SWT.PUSH);
 		export.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 				false));
-		export.setText(TXMUIMessages.QueriesView_1);
+		export.setText(TXMUIMessages.exportAll);
 		export.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent arg0) {
@@ -167,7 +167,7 @@
 					dialog.setFilterPath(LastOpened.getFolder(ID));
 					dialog.setFileName(LastOpened.getFile(ID));
 				} else {
-					dialog.setFilterPath(new File(txmhome, TXMUIMessages.Explorer_3).getAbsolutePath());
+					dialog.setFilterPath(new File(txmhome, TXMUIMessages.tXM).getAbsolutePath());
 				}
 				String path = dialog.open();
 				if (path == null) return;
@@ -181,7 +181,7 @@
 				
 				try {
 					FileWriter writer = new FileWriter(output);
-					writer.write(TXMUIMessages.QueriesView_5);
+					writer.write(TXMUIMessages.queriesDDot);
 					for (MainCorpus b : CorpusManager.getCorpusManager().getCorpora()) {
 						writer.write(" " + b.getID() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 						for (SavedQuery q : b.getQueriesLog()) {
@@ -288,7 +288,7 @@
 				return ((TXMResult) element).getName();
 			else if (element instanceof SavedQuery)
 				return ((SavedQuery) element).toString();
-			return NLS.bind(TXMUIMessages.QueriesView_10, element);
+			return NLS.bind(TXMUIMessages.errorWithElementP0, element);
 		}
 
 		/* (non-Javadoc)
@@ -374,4 +374,4 @@
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/SummaryView.java	(revision 1335)
@@ -156,7 +156,7 @@
 				tv.expandToLevel(selectedProps.size()+1);
 			}
 		} catch (Exception e) {
-			System.out.println(TXMUIMessages.InternalCorpusView_0);
+			System.out.println(TXMUIMessages.errorWhileComputingCorpusSummary);
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		} 
 	}
@@ -309,7 +309,7 @@
 		//Button reload
 		Button openeditdialog = new Button(parent, SWT.PUSH);
 		openeditdialog.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		openeditdialog.setText(TXMUIMessages.InternalCorpusView_1);
+		openeditdialog.setText(TXMUIMessages.reload);
 		openeditdialog.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -348,7 +348,7 @@
 						}
 						attachedBrowserEditor.showPage(openedPage);
 					} else {
-						System.out.println(TXMUIMessages.SummaryView_0+node);
+						System.out.println(TXMUIMessages.noDefaultEditionPageFoundForElementDDot+node);
 					}
 
 					if (progresslistener != null) {
@@ -448,7 +448,7 @@
 				if (s == null || s.length() == 0) return ((Summary.TreeNode) element).toString();
 				return s;
 			}
-			return NLS.bind(TXMUIMessages.InternalCorpusView_2, element);
+			return NLS.bind(TXMUIMessages.errorDDotGetTextDDotP0, element);
 		}
 
 		/* (non-Javadoc)
@@ -528,4 +528,4 @@
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/FileTreeContentProvider.java	(revision 1335)
@@ -56,7 +56,7 @@
 		p = null;
 		try {
 		p = Pattern.compile(regex);
-		} catch(Exception e) { System.out.println(TXMUIMessages.FileTreeContentProvider_1+regex+TXMUIMessages.FileTreeContentProvider_2+e);}
+		} catch(Exception e) { System.out.println(TXMUIMessages.fileExplorerDDotIncorrectPattern+regex+TXMUIMessages.eRROR+e);}
 		
 		Object[] kids = ((File) element).listFiles(new FileFilter() {	
 			@Override
@@ -102,7 +102,7 @@
 	public Object getParent(Object element) {
 		if (element instanceof File)
 			return ((File) element).getParentFile();
-		System.out.println(TXMUIMessages.FileTreeContentProvider_3+element+TXMUIMessages.FileTreeContentProvider_4);
+		System.out.println(TXMUIMessages.errorElementDDot+element+TXMUIMessages.FileTreeContentProvider_4);
 		return null;
 	}
 
@@ -119,4 +119,4 @@
 	@Override
 	public void inputChanged(Viewer viewer, Object old_input, Object new_input) {
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/Explorer.java	(revision 1335)
@@ -132,7 +132,7 @@
 		// its widgets
 		Button go_up = new Button(controls, SWT.NONE);
 		go_up.setText(TXMUIMessages.Explorer_4);
-		go_up.setToolTipText(TXMUIMessages.Explorer_1);
+		go_up.setToolTipText(TXMUIMessages.goToParentFolder);
 		go_up.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -147,7 +147,7 @@
 		if (currentPath == null)
 			currentPath = "/"; //$NON-NLS-1$
 		address.setText(currentPath);
-		address.setToolTipText(TXMUIMessages.Explorer_2);
+		address.setToolTipText(TXMUIMessages.goToTXMHome);
 		address.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent e) {
@@ -162,7 +162,7 @@
 
 		Button go = new Button(controls, SWT.NONE);
 		go.setText(TXMUIMessages.Explorer_5);
-		go.setToolTipText(TXMUIMessages.Explorer_6);
+		go.setToolTipText(TXMUIMessages.common_refresh);
 		go.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -175,7 +175,7 @@
 		
 		Button homeBtn = new Button(controls, SWT.NONE);
 		homeBtn.setText(TXMUIMessages.Explorer_7);
-		homeBtn.setToolTipText(TXMUIMessages.Explorer_8);
+		homeBtn.setToolTipText(TXMUIMessages.goToTXMHome_2);
 		homeBtn.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -311,7 +311,7 @@
 				selectedItem.equals(samples) ||
 				selectedItem.equals(xsl))
 		{
-			System.out.println(NLS.bind(TXMUIMessages.Explorer_0, selectedItem));
+			System.out.println(NLS.bind(TXMUIMessages.folderP0ShouldNotBeDeleted, selectedItem));
 			return false;
 		}
 		return false;
@@ -370,4 +370,4 @@
 
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 1335)
@@ -158,7 +158,7 @@
 		
 		Button refresh = new Button(controls, SWT.NONE);
 		refresh.setText(TXMUIMessages.Explorer_5);
-		refresh.setToolTipText(TXMUIMessages.Explorer_6);
+		refresh.setToolTipText(TXMUIMessages.common_refresh);
 		refresh.setLayoutData(new GridData());
 		refresh.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -171,15 +171,15 @@
 		
 		Button newMacro = new Button(controls, SWT.NONE);
 		newMacro.setLayoutData(new GridData());
-		newMacro.setText(TXMUIMessages.MacrosExplorer_0);
-		newMacro.setToolTipText(TXMUIMessages.MacrosExplorer_1);
+		newMacro.setText(TXMUIMessages.newMacro);
+		newMacro.setToolTipText(TXMUIMessages.createANewMacroFromATemplate);
 		newMacro.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				
 				currentRootDir.mkdirs();
 				
-				InputDialog dialog = new InputDialog(e.display.getActiveShell(), TXMUIMessages.CreateMacro_0, TXMUIMessages.CreateMacro_1, "", null); //$NON-NLS-1$
+				InputDialog dialog = new InputDialog(e.display.getActiveShell(), TXMUIMessages.macroName, TXMUIMessages.pleaseWriteTheMacroName, "", null); //$NON-NLS-1$
 				
 				dialog.open();
 				String name = dialog.getValue();
@@ -314,7 +314,7 @@
 				selectedItem.equals(samples) ||
 				selectedItem.equals(xsl))
 		{
-			System.out.println(NLS.bind(TXMUIMessages.Explorer_0, selectedItem));
+			System.out.println(NLS.bind(TXMUIMessages.folderP0ShouldNotBeDeleted, selectedItem));
 			return false;
 		}
 		return false;
@@ -366,4 +366,4 @@
 	public void setFocus() {
 		tv.getTree().setFocus();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportResult.java	(revision 1335)
@@ -92,7 +92,7 @@
 		}
 
 		if (dialog.open() != null) {
-			StatusLine.setMessage(TXMUIMessages.ExportResult_0);
+			StatusLine.setMessage(TXMUIMessages.exportingResults);
 			String filepath = dialog.getFilterPath()
 					+ "/" + dialog.getFileName(); //$NON-NLS-1$
 			if (!(filepath.endsWith(extensions[0].substring(1))))
@@ -103,10 +103,10 @@
 			try {
 				outfile.createNewFile();
 			} catch (IOException e1) {
-				System.err.println(NLS.bind(TXMUIMessages.ExportResult_3, outfile, e1));
+				System.err.println(NLS.bind(TXMUIMessages.exportDDotCantCreateFileP0DDotP1, outfile, e1));
 			}
 			if (!outfile.canWrite()) {
-				System.out.println(NLS.bind(TXMUIMessages.ExportResult_5, outfile));
+				System.out.println(NLS.bind(TXMUIMessages.impossibleToReadP0, outfile));
 				return null;
 			}
 			if (!outfile.isFile()) {
@@ -120,12 +120,12 @@
 			String _txtseparator = TBXPreferences.getInstance().getString(TBXPreferences.EXPORT_TXT_SEPARATOR);
 			final String txtseparator = _txtseparator;
 
-			JobHandler jobhandler = new JobHandler(TXMUIMessages.ExportResult_0) {
+			JobHandler jobhandler = new JobHandler(TXMUIMessages.exportingResults) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						this.runInit(monitor);
-						monitor.beginTask(TXMUIMessages.ExportResult_1, 100);
+						monitor.beginTask(TXMUIMessages.exporting, 100);
 
 						if (s instanceof TXMResult) {
 							((TXMResult)s).setCurrentMonitor(this); // Allows Functions to protect themselves from interruption
@@ -148,14 +148,14 @@
 
 							System.out.println(NLS.bind("", outfile.getAbsolutePath())); //$NON-NLS-1$
 						} else {
-							System.out.println(NLS.bind(TXMUIMessages.ExportResult_6, outfile.getAbsolutePath()));
+							System.out.println(NLS.bind(TXMUIMessages.failedToExportResultP0DDotP1, outfile.getAbsolutePath()));
 						}
 					} catch (ThreadDeath td) {
 						if (s instanceof TXMResult)
 							((TXMResult)s).clean();
 						return Status.CANCEL_STATUS;
 					} catch (Exception e) {
-						System.out.println(NLS.bind(TXMUIMessages.ExportResult_6, s, e));
+						System.out.println(NLS.bind(TXMUIMessages.failedToExportResultP0DDotP1, s, e));
 						org.txm.rcp.utils.Logger.printStackTrace(e);
 						return Status.CANCEL_STATUS;
 					} finally {
@@ -172,4 +172,4 @@
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportSVG.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportSVG.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/export/ExportSVG.java	(revision 1335)
@@ -176,10 +176,10 @@
 		}
 
 		if (outfile.exists()) {
-			System.out.println(NLS.bind(TXMUIMessages.ExportSVG_1, outfile, ""));  //$NON-NLS-1$
+			System.out.println(NLS.bind(TXMUIMessages.p1FileSavedInP0, outfile, ""));  //$NON-NLS-1$
 		} else {
-			System.out.println(NLS.bind(TXMUIMessages.ExportSVG_3 + outfile, "")); //$NON-NLS-1$
+			System.out.println(NLS.bind(TXMUIMessages.failedToExportFileP0WithDeviceP1 + outfile, "")); //$NON-NLS-1$
 		}
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/DeleteObject.java	(revision 1335)
@@ -120,7 +120,7 @@
 				@Override
 				public void run() {
 					MessageBox messageBox = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
-					messageBox.setMessage(NLS.bind(TXMUIMessages.DeleteObject_0, selection.toList()));
+					messageBox.setMessage(NLS.bind(TXMUIMessages.deletingP0Continue, selection.toList()));
 					int response = messageBox.open();
 					if (response != SWT.YES) {
 						StatusLine.setMessage(""); //$NON-NLS-1$
@@ -158,7 +158,7 @@
 	 * @return 
 	 */
 	public synchronized static HashSet<Object> delete(final List<Object> objects) {
-		StatusLine.setMessage(NLS.bind(TXMUIMessages.DeleteObject_5, objects));
+		StatusLine.setMessage(NLS.bind(TXMUIMessages.deletingP0, objects));
 		
 		final HashSet<Object> allObjectDeleted = new HashSet<Object>();
 		shouldRestartToolbox = false;
@@ -168,14 +168,14 @@
 				List<Object> deleted = delete(o);
 				allObjectDeleted.addAll(deleted);
 				if (deleted.size() == 0) {
-					StatusLine.setMessage(TXMUIMessages.DeleteObject_3+" : "+o);
+					StatusLine.setMessage(TXMUIMessages.errorDDotDeleteReturnedFalse+" : "+o);
 					return new HashSet<Object>();
 				}
 				// remove results already deleted
 				objects.removeAll(deleted);
 			} catch(Exception e) {
-				Log.info(NLS.bind(TXMUIMessages.DeleteObject_4, o, e)); 
-				StatusLine.error(NLS.bind(TXMUIMessages.DeleteObject_4, o, e)); 
+				Log.info(NLS.bind(TXMUIMessages.errorWhileDeletingP0DDotP1, o, e)); 
+				StatusLine.error(NLS.bind(TXMUIMessages.errorWhileDeletingP0DDotP1, o, e)); 
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 				return new HashSet<Object>();
 			}
@@ -226,7 +226,7 @@
 	public static List<Object> delete(Object o) {
 		ArrayList<Object> deleted = new ArrayList<Object>();
 //		if (o instanceof TXMResult) {
-//			Log.info(NLS.bind(TXMUIMessages.DeleteObject_10, ((TXMResult) o).getName()));
+//			Log.info(NLS.bind(TXMUIMessages.deletedDDotP0, ((TXMResult) o).getName()));
 //
 //			try {
 //				if (o instanceof CQPCorpus) {
@@ -239,7 +239,7 @@
 //					deleted.addAll(c.getPartitions());
 //
 //					if (!((TXMResult) o).delete()) {
-//						Log.info(TXMUIMessages.DeleteObject_3);
+//						Log.info(TXMUIMessages.errorDDotDeleteReturnedFalse);
 //						return new ArrayList<Object>(0);
 //					}
 //				} else if (o instanceof Partition) {
@@ -249,7 +249,7 @@
 //						i--;
 //					}
 //					if (!((TXMResult) o).delete()) {
-//						Log.info(TXMUIMessages.DeleteObject_3);
+//						Log.info(TXMUIMessages.errorDDotDeleteReturnedFalse);
 //						return new ArrayList<Object>(0);
 //					}
 //				}
@@ -264,7 +264,7 @@
 			} else {
 				((TXMResult) o).delete();
 			}
-			Log.info(NLS.bind(TXMUIMessages.DeleteObject_10, ((TXMResult) o)));
+			Log.info(NLS.bind(TXMUIMessages.deletedDDotP0, ((TXMResult) o)));
 			deleted.add(o);
 		} else {
 			System.out.println("Cant delete: "+o);
@@ -304,4 +304,4 @@
 		}
 		return new IWorkbenchPage[0];
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/PasteFile.java	(revision 1335)
@@ -80,9 +80,9 @@
 				}
 				try {
 					if (!org.txm.utils.io.FileCopy.copy(source, dest))
-						System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
+						System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
 				} catch (IOException e) {
-					System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
+					System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
 				}
 			} else if (CutFile.toCut != null) {
 				File source = CutFile.toCut;
@@ -93,12 +93,12 @@
 				}
 				try {
 					if (!org.txm.utils.io.FileCopy.copy(source, dest))
-						System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
+						System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
 					if (!source.delete()) 
-						System.out.println(TXMUIMessages.PasteFile_3+source);
+						System.out.println(TXMUIMessages.failedToDelete+source);
 					CutFile.toCut = null;
 				} catch (IOException e) {
-					System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
+					System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
 				}
 			} else {
 				// check clipboard content
@@ -117,11 +117,11 @@
 							org.txm.utils.io.FileCopy.copyFiles(source, dest);
 						} else {
 							if (!org.txm.utils.io.FileCopy.copy(source, dest))
-								System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest);
+								System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest);
 						}
 						
 					} catch (IOException e) {
-						System.out.println(TXMUIMessages.PasteFile_1+source+TXMUIMessages.ApplicationWorkbenchAdvisor_37+dest+TXMUIMessages.PasteFile_4+e);
+						System.out.println(TXMUIMessages.failedToCopy+source+TXMUIMessages.to+dest+TXMUIMessages.dDot+e);
 					}
 				}
 			}
@@ -131,4 +131,4 @@
 			MacroExplorer.refresh();
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFolder.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFolder.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFolder.java	(revision 1335)
@@ -98,7 +98,7 @@
 		LastOpened.set(ID, newfile.getParent(), newfile.getName());
 		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
 			if (newfile.mkdir())
-				System.out.println(NLS.bind(TXMUIMessages.CreateFolder_1, newfile.getAbsolutePath()));
+				System.out.println(NLS.bind(TXMUIMessages.newFolderDDotP0, newfile.getAbsolutePath()));
 
 		}
 		Explorer.refresh();
@@ -106,4 +106,4 @@
 
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/DeleteFile.java	(revision 1335)
@@ -72,15 +72,15 @@
 
 		Shell shell = new Shell();
 		MessageBox dialog = new MessageBox(shell, SWT.YES | SWT.NO);
-		dialog.setMessage(TXMUIMessages.DeleteFile_0+file+" ? ");  //$NON-NLS-1$
+		dialog.setMessage(TXMUIMessages.areYouSureYouWantToDeleteToSort+file+" ? ");  //$NON-NLS-1$
 
 		int buttonID = dialog.open();
 		switch(buttonID) {
 		case SWT.YES:
 			if (file.isFile()) {
-				if (!file.delete()) System.out.println(TXMUIMessages.DeleteFile_2+file);
+				if (!file.delete()) System.out.println(TXMUIMessages.failedToDeleteFile+file);
 			} else if (file.isDirectory()) {
-				if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.DeleteFile_2+file);
+				if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.failedToDeleteFile+file);
 			}
 			Explorer.refresh();
 			MacroExplorer.refresh();
@@ -95,7 +95,7 @@
 	public static void delete(List files) {
 		Shell shell = new Shell();
 		MessageBox dialog = new MessageBox(shell, SWT.YES | SWT.NO);
-		dialog.setMessage(TXMUIMessages.DeleteFile_0+files+" ? ");  //$NON-NLS-1$
+		dialog.setMessage(TXMUIMessages.areYouSureYouWantToDeleteToSort+files+" ? ");  //$NON-NLS-1$
 		
 		int buttonID = dialog.open();
 		switch(buttonID) {
@@ -105,9 +105,9 @@
 					File file = (File) o;
 					if (file.exists())
 					if (file.isFile()) {
-						if (!file.delete()) System.out.println(TXMUIMessages.DeleteFile_2+file);
+						if (!file.delete()) System.out.println(TXMUIMessages.failedToDeleteFile+file);
 					} else if (file.isDirectory()) {
-						if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.DeleteFile_2+file);
+						if (!DeleteDir.deleteDirectory(file)) System.out.println(TXMUIMessages.failedToDeleteFile+file);
 					}
 				}
 			}
@@ -122,4 +122,4 @@
 		
 		
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFile.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/CreateFile.java	(revision 1335)
@@ -107,7 +107,7 @@
 		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
 			try {
 				if (newfile.createNewFile()) {
-					System.out.println(NLS.bind(TXMUIMessages.CreateFile_1, newfile.getAbsolutePath()));
+					System.out.println(NLS.bind(TXMUIMessages.newFileDDotP0, newfile.getAbsolutePath()));
 					//OpenFile.openfile(newfile);
 				}
 			} catch (IOException e) {
@@ -119,4 +119,4 @@
 		MacroExplorer.refresh();
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/RenameFile.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/RenameFile.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/files/RenameFile.java	(revision 1335)
@@ -68,17 +68,17 @@
 	public static void rename(File file) {
 		String newname = file.getName();
 		InputDialog dlg = new InputDialog(new Shell(),
-				TXMUIMessages.RenameFile_0, TXMUIMessages.RenameFile_0+newname, newname, null);
+				TXMUIMessages.renameFile, TXMUIMessages.renameFile+newname, newname, null);
 		if (dlg.open() == Window.OK) {
 			newname = dlg.getValue();
-			System.out.println(TXMUIMessages.RenameFile_2+newname);
+			System.out.println(TXMUIMessages.renamingByDDot+newname);
 			if (newname.equals(file.getName())) return; // nothing to do
 			if (newname == null || newname.trim().length() == 0) return; // error
 			
 			if (!file.renameTo(new File(file.getParentFile(), newname)))
-				System.out.println(TXMUIMessages.RenameFile_3+file+TXMUIMessages.ApplicationWorkbenchAdvisor_37+newname);
+				System.out.println(TXMUIMessages.failedToRename+file+TXMUIMessages.to+newname);
 			Explorer.refresh();
 			MacroExplorer.refresh();
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyScript.java	(revision 1335)
@@ -176,7 +176,7 @@
 		// check script
 		final File scriptfile = new File(scriptpath);
 		if (!scriptfile.exists()) {
-			System.err.println(NLS.bind(TXMUIMessages.ExecuteScriptImport_1, scriptpath));
+			System.err.println(NLS.bind(TXMUIMessages.p0ScriptFileDoesntExist, scriptpath));
 			return;
 		}
 		ExecuteLastGroovyScript.setLastScript(scriptfile, currentRootDir.getName().equals("macro")); // register last groovy script //$NON-NLS-1$
@@ -205,7 +205,7 @@
 		String dir = currentRootDir.getAbsolutePath();
 		String path = scriptfile.getAbsolutePath();
 		if (!path.startsWith(dir)) {
-			System.out.println(TXMUIMessages.bind(TXMUIMessages.ExecuteGroovyScriptFromFile_2, dir, path));
+			System.out.println(TXMUIMessages.bind(TXMUIMessages.theP1GroovyScriptMustBeInTheP0Folder, dir, path));
 			return;
 		}
 		final String relativepath = path.substring(dir.length()+1);
@@ -214,12 +214,12 @@
 			
 		//}
 
-		JobHandler jobhandler = new JobHandler(NLS.bind(TXMUIMessages.ExecuteScript_0, scriptfile.getName())) {
+		JobHandler jobhandler = new JobHandler(NLS.bind(TXMUIMessages.executionOfP0, scriptfile.getName())) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				//this.setCurrentMonitor(monitor);
-				monitor.beginTask(NLS.bind(TXMUIMessages.ExecuteScript_0, scriptfile.getName()), 100);
+				monitor.beginTask(NLS.bind(TXMUIMessages.executionOfP0, scriptfile.getName()), 100);
 
 				try {
 					gse = GSERunner.buildDefaultGSE();
@@ -238,22 +238,22 @@
 					binding.setProperty("MONITOR", this); //$NON-NLS-1$
 					binding.setProperty("gse", gse);
 					
-					System.out.println(NLS.bind(TXMUIMessages.ExecuteScript_11, scriptfile.getName()));
+					System.out.println(NLS.bind(TXMUIMessages.executingGroovyScript, scriptfile.getName()));
 					long time = System.currentTimeMillis();
 					System.out.println(relativepath);
 					gse.run(relativepath, binding);
 					
-					System.out.println(TXMUIMessages.bind(TXMUIMessages.ExecuteScript_12, System.currentTimeMillis()-time));
+					System.out.println(TXMUIMessages.bind(TXMUIMessages.doneP0Ms, System.currentTimeMillis()-time));
 				} catch (ThreadDeath td) {
 					return Status.CANCEL_STATUS;
 				} catch (UIParameterException e) {
 					if (e.isError()) {
-						System.out.println(TXMUIMessages.ExecuteGroovyScript_1);
+						System.out.println(TXMUIMessages.errorDuringParametersInitialisation);
 					} else {
-						System.out.println(TXMUIMessages.ExecuteGroovyScript_2);
+						System.out.println(TXMUIMessages.theUserCanceledTheScriptExecution);
 					}
 				} catch (Exception e) {
-					System.out.println(TXMUIMessages.ExecuteGroovyScript_9+e);
+					System.out.println(TXMUIMessages.errorDuringScriptExecutionDDot+e);
 					org.txm.rcp.utils.Logger.printStackTrace(e);
 				} finally {
 					monitor.done();			
@@ -339,4 +339,4 @@
 		 * {org.txm.rcp.utils.Logger.printStackTrace(e);}
 		 */
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyText.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyText.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyText.java	(revision 1335)
@@ -103,7 +103,7 @@
 	 */
 	public static Object executeText(final String text, final String scriptfile) {
 		if (!new File(scriptfile).exists()) {
-			System.err.println(NLS.bind(TXMUIMessages.ExecuteScriptImport_1, scriptfile));
+			System.err.println(NLS.bind(TXMUIMessages.p0ScriptFileDoesntExist, scriptfile));
 			return null;
 		}
 		final String scriptRootDir = Toolbox.getTxmHomePath() + "/scripts";
@@ -153,7 +153,7 @@
 					System.out.println("Executing text selection..."); //$NON-NLS-1$
 					long time = System.currentTimeMillis();
 					shell.evaluate(text);
-					Log.info(NLS.bind(TXMUIMessages.ExecuteScript_12, (System.currentTimeMillis() - time)));
+					Log.info(NLS.bind(TXMUIMessages.doneP0Ms, (System.currentTimeMillis() - time)));
 				} catch (ThreadDeath td) { 
 					return Status.CANCEL_STATUS;
 				} catch (CompilationFailedException e) {
@@ -168,4 +168,4 @@
 		jobhandler.startJob();
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteLastGroovyScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteLastGroovyScript.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteLastGroovyScript.java	(revision 1335)
@@ -77,19 +77,19 @@
 	public static void execute(IWorkbenchPart page, ISelection selection) {
 		if (lastScript == null) return; // no last script
 		if (macro)
-			System.out.println(TXMUIMessages.ExecuteLastGroovyScript_0+lastScript);
+			System.out.println(TXMUIMessages.executingLastMacroDDot+lastScript);
 		else 
-			System.out.println(TXMUIMessages.ExecuteLastGroovyScript_1+lastScript);
+			System.out.println(TXMUIMessages.executingLastScriptDDot+lastScript);
 		
 		//IPreferencesService service = Platform.getPreferencesService();
 		String scriptRootDir = Toolbox.getTxmHomePath() + "/scripts"; //$NON-NLS-1$
 		File currentRootDir = new File(scriptRootDir, "groovy/user"); //$NON-NLS-1$
 		
 		if (!currentRootDir.exists()) {
-			System.out.println(TXMUIMessages.ExecuteLastGroovyScript_3+currentRootDir);
+			System.out.println(TXMUIMessages.errorDDotCurrentGroovyScriptDirectoryDoesNotExistDDot+currentRootDir);
 			return;
 		}
 		
 		ExecuteGroovyScript.executeScript(currentRootDir, lastScript.getAbsolutePath(), page, selection, false);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteImportScript.java	(revision 1335)
@@ -138,21 +138,21 @@
 		}
 		
 		Display.getDefault().syncExec(new Runnable() {
-			public void run() {	StatusLine.setMessage(TXMUIMessages.ExecuteScriptImport_0); }
+			public void run() {	StatusLine.setMessage(TXMUIMessages.importStarted); }
 		});
 
 		final String txmhome = Toolbox.getTxmHomePath();
 		final File corporadir = new File(txmhome,"corpora"); //$NON-NLS-1$
 		corporadir.mkdir(); // the binary corpus are stored here
 		if (!corporadir.exists()) {
-			System.out.println(TXMUIMessages.ExecuteScriptImport_2+corporadir);
-			Log.severe(TXMUIMessages.ExecuteScriptImport_2+corporadir);
+			System.out.println(TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot+corporadir);
+			Log.severe(TXMUIMessages.errorDDotCorporaDirectoryDoesntExistDDot+corporadir);
 			return null;
 		}
 		
 		if (CQPSearchEngine.isInitialized()) Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
 		
-		JobHandler jobhandler = new JobHandler(TXMUIMessages.RunGroovyScript_0
+		JobHandler jobhandler = new JobHandler(TXMUIMessages.scriptExecution
 				+ project.getImportModuleName()) { //$NON-NLS-1$
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
@@ -214,5 +214,4 @@
 		return BundleUtils.replaceFilesIfNewer("org.txm.groovy.core", "src/groovy", scriptPackage, 
 				script.getName(), script);
 	}
-}
-
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/CreateMacro.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/CreateMacro.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/CreateMacro.java	(revision 1335)
@@ -96,7 +96,7 @@
 		
 		//ask new file name
 		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event).getShell();
-		InputDialog dialog = new InputDialog(shell, TXMUIMessages.CreateMacro_0, TXMUIMessages.CreateMacro_1, "", null); //$NON-NLS-1$
+		InputDialog dialog = new InputDialog(shell, TXMUIMessages.macroName, TXMUIMessages.pleaseWriteTheMacroName, "", null); //$NON-NLS-1$
 		
 		dialog.open();
 		String name = dialog.getValue();
@@ -138,7 +138,7 @@
 		if (!newfile.exists() && newfile.getParentFile().canWrite()) {
 			try {
 				if (newfile.createNewFile()) {
-					System.out.println(NLS.bind(TXMUIMessages.CreateFile_1, newfile.getAbsolutePath()));
+					System.out.println(NLS.bind(TXMUIMessages.newFileDDotP0, newfile.getAbsolutePath()));
 					
 					PrintWriter writer = IOUtils.getWriter(newfile, "UTF-8"); //$NON-NLS-1$
 					writer.println("// STANDARD DECLARATIONS"); //$NON-NLS-1$
@@ -204,4 +204,4 @@
 		
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteScript.java	(revision 1335)
@@ -128,15 +128,15 @@
 				boolean doit = RCPPreferences.getInstance().getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION);
 				//System.out.println("Save file? "+doit);
 				if (!doit) { // ask user
-					MessageDialog dialog = new MessageDialog(shell, TXMUIMessages.ExecuteScript_0+result, null,
-							TXMUIMessages.ExecuteScript_1, MessageDialog.QUESTION, new String[] {TXMUIMessages.ExecuteScript_2, TXMUIMessages.ExecuteScript_4,
-									TXMUIMessages.ExecuteScript_5}, 0) {
+					MessageDialog dialog = new MessageDialog(shell, TXMUIMessages.executionOfP0+result, null,
+							TXMUIMessages.saveFileBeforeExecution, MessageDialog.QUESTION, new String[] {TXMUIMessages.saveAndRun, TXMUIMessages.abort,
+									TXMUIMessages.dontSaveAndRun}, 0) {
 						Button checkDefault;
 						@Override
 						protected Control createDialogArea(Composite parent) {
 							Composite container = (Composite) super.createDialogArea(parent);
 							checkDefault = new Button(container, SWT.CHECK);
-							checkDefault.setText(TXMUIMessages.ExecuteScript_6);
+							checkDefault.setText(TXMUIMessages.alwaysSaveBeforeLaunching);
 							boolean b = RCPPreferences.getInstance().getBoolean(RCPPreferences.SAVE_BEFORE_EXECUTION);
 							checkDefault.setSelection(b);
 
@@ -156,7 +156,7 @@
 					};
 					int c = dialog.open();
 					if (c == 1) {
-						System.out.println(TXMUIMessages.ExecuteScript_7);
+						System.out.println(TXMUIMessages.executionCanceled);
 						return null;
 					} else if (c == 2) {
 						//System.out.println("Don't save and run.");
@@ -204,8 +204,8 @@
 				env.put("selection", selection); // selection
 				se.executeScript(script, env);
 			} else {
-				System.out.println(TXMUIMessages.ExecuteScript_3+script.getName());
+				System.out.println(TXMUIMessages.noInterpreterFoundForScriptFileExtension+script.getName());
 			}
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteText.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteText.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteText.java	(revision 1335)
@@ -88,8 +88,8 @@
 			System.out.println("Execute R text selection not implemented");
 			//ExecuteRText.executeText(text);
 		} else {
-			System.out.println(TXMUIMessages.ExecuteScript_3+script.getName());
+			System.out.println(TXMUIMessages.noInterpreterFoundForScriptFileExtension+script.getName());
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/DownloadJobHandler.java	(revision 1335)
@@ -57,7 +57,7 @@
 	protected IStatus run(final IProgressMonitor monitor) {
 		this.runInit(monitor);
 		//this.setCurrentMonitor(monitor);
-		monitor.beginTask(TXMUIMessages.DownloadJobHandler_0, contentLength);
+		monitor.beginTask(TXMUIMessages.downloading, contentLength);
 		long size = file.length();
 		while (!done) {
 			try {
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/OpenURI.java	(revision 1335)
@@ -50,7 +50,7 @@
 		try
 		{
 			if ( !java.awt.Desktop.isDesktopSupported() ) {
-				System.err.println( TXMUIMessages.OpenURI_0 );
+				System.err.println( TXMUIMessages.desktopIsNotSupportedFatal );
 				return false;
 			}
 
@@ -75,7 +75,7 @@
 		catch(Exception e)
 		{
 			System.out.println(e.getLocalizedMessage());
-			StatusLine.error(NLS.bind(TXMUIMessages.OpenURI_1, file));
+			StatusLine.error(NLS.bind(TXMUIMessages.errorWhileOpeningFileP0, file));
 		}
 		return false;
 	}
@@ -88,7 +88,7 @@
 	 */
 	public static boolean browse(File file) {
 		if ( !java.awt.Desktop.isDesktopSupported() ) {
-			System.err.println( TXMUIMessages.OpenURI_0 );
+			System.err.println( TXMUIMessages.desktopIsNotSupportedFatal );
 			return false;
 		}
 		
@@ -107,4 +107,4 @@
 		return false;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/LanguageSwitchHandler.java	(revision 1335)
@@ -90,7 +90,7 @@
 		values.add("fr"); //$NON-NLS-1$
 		values.add("en"); //$NON-NLS-1$
 		values.add("ru"); //$NON-NLS-1$
-		ComboDialog d = new ComboDialog(shell, TXMUIMessages.LanguageSwitchHandler_3, values,
+		ComboDialog d = new ComboDialog(shell, TXMUIMessages.chooseTheLanguage, values,
 				service.getString(Application.PLUGIN_ID,
 						RCPPreferences.UI_LOCALE, "fr", null)); //$NON-NLS-1$
 		if (d.open() == Window.OK) {
@@ -101,7 +101,7 @@
 		String locale = service.getString(Application.PLUGIN_ID,
 				RCPPreferences.UI_LOCALE, "fr", null); //$NON-NLS-1$
 		if (locale.length() == 0)
-			Log.warning(TXMUIMessages.LanguageSwitchHandler_0);
+			Log.warning(TXMUIMessages.interfaceLanguageLOCALEWasNotSet);
 		// Does not work:
 		//System.getProperties().setProperty("eclipse.exitdata", "-nl " + locale);
 		//changeLocaleTXMIni(locale);
@@ -130,22 +130,22 @@
 			String path = System.getProperty("osgi.instance.area"); //$NON-NLS-1$
 			location = new URL(path + "TXM.ini"); //$NON-NLS-1$
 		} catch (MalformedURLException e) {
-			System.err.println(NLS.bind(TXMUIMessages.LanguageSwitchHandler_5, location));
+			System.err.println(NLS.bind(TXMUIMessages.switchLanguageDDotMalformedUrlDDotP0, location));
 			return;
 		}
 		
 		String fileName = location.getFile();
 		File file = new File(fileName);
 		if (!file.exists()) {
-			MessageBox.error(NLS.bind(TXMUIMessages.LanguageSwitchHandler_1, file.getAbsolutePath()));
+			MessageBox.error(NLS.bind(TXMUIMessages.theFileP0DoesNotExist, file.getAbsolutePath()));
 			return;
 		}
 		fileName += ".bak"; //$NON-NLS-1$
 		file.renameTo(new File(fileName));
 		
 		// update TXM.ini
-		System.out.println(TXMUIMessages.LanguageSwitchHandler_7+location);
-		Log.severe(TXMUIMessages.LanguageSwitchHandler_7+location);
+		System.out.println(TXMUIMessages.tXMiniDDot+location);
+		Log.severe(TXMUIMessages.tXMiniDDot+location);
 		try {
 
 			BufferedReader in = new BufferedReader(new FileReader(fileName));
@@ -233,7 +233,7 @@
 
 		File file = new File(fileName);
 		if (!file.exists()) {
-			MessageBox.error(NLS.bind(TXMUIMessages.LanguageSwitchHandler_1, file.getAbsolutePath()));
+			MessageBox.error(NLS.bind(TXMUIMessages.theFileP0DoesNotExist, file.getAbsolutePath()));
 			return;
 		}
 		String fileNameBackup = fileName + ".bak"; //$NON-NLS-1$
@@ -291,4 +291,4 @@
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java	(revision 1335)
@@ -237,22 +237,22 @@
 		if (!this.canBeInterrupted) // Prevent thread system interruption (ThreadDeath not handled by the programmer)
 			return;
 		
-		Log.info(this.getName() + TXMUIMessages.JobHandler_2);
+		Log.info(this.getName() + TXMUIMessages.cancelingRequested);
 		
 		try {
-			System.out.println(TXMUIMessages.JobHandler_1 + " " + this.getName()); //$NON-NLS-1$
+			System.out.println(TXMUIMessages.canceling_2 + " " + this.getName()); //$NON-NLS-1$
 			this.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					StatusLine.setMessage(TXMUIMessages.JobHandler_0);
+					StatusLine.setMessage(TXMUIMessages.canceling);
 				}
 			});
-			if (currentMonitor != null) this.currentMonitor.setTaskName(TXMUIMessages.JobHandler_0);
+			if (currentMonitor != null) this.currentMonitor.setTaskName(TXMUIMessages.canceling);
 			this.mySemaphore.acquire();
 			this.myThread.stop();
 		} catch (Exception e) {
 			org.txm.rcp.utils.Logger.printStackTrace(e);
-			Log.severe(TXMUIMessages.JobHandler_3 + this.getName());
+			Log.severe(TXMUIMessages.failedToCancel + this.getName());
 		}
 	}
 
@@ -284,4 +284,4 @@
 	public void setTaskName(String name) {
 		if (currentMonitor != null) currentMonitor.setTaskName(name);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/ImportDialog.java	(revision 1335)
@@ -149,7 +149,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(NLS.bind(TXMUIMessages.ImportDialog_0, loadername)); 
+		newShell.setText(NLS.bind(TXMUIMessages.importSetupP0, loadername)); 
 		newShell.setMinimumSize(300, 200);
 	}
 
@@ -172,7 +172,7 @@
 
 			// directory
 			Label dirLabel = new Label(mainPanel, SWT.NONE);
-			dirLabel.setText(TXMUIMessages.ImportDialog_1);
+			dirLabel.setText(TXMUIMessages.sourceDirectoryDDot);
 			dirLabel.setAlignment(SWT.CENTER);
 			dirLabel.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 					false, false));
@@ -203,7 +203,7 @@
 						if (new File(srcdir, "html").exists() && new File(srcdir, "data").exists() && new File(srcdir, "registry").exists()) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
 						{	
 							TXMMessageBox.show(parent
-									.getShell(), TXMUIMessages.AddBase_19, TXMUIMessages.ImportDialog_13, SWT.ICON_WARNING);
+									.getShell(), TXMUIMessages.warning, TXMUIMessages.thisDirectorySeemsToContainABinaryCorpus, SWT.ICON_WARNING);
 						}
 						
 						directory = new File(path);
@@ -243,26 +243,26 @@
 
 			// encoding
 			Group encodingGroup = new Group(optionsPanel, SWT.SHADOW_ETCHED_IN);
-			encodingGroup.setText(TXMUIMessages.ImportDialog_4);
+			encodingGroup.setText(TXMUIMessages.sourcesCharactersEncodingDDot);
 			encodingGroup.setLayout(new GridLayout(2, false));
 			encodingGroup.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 3, 1));
 
 			btnDefaultEncoding = new Button(encodingGroup, SWT.RADIO);
-			btnDefaultEncoding.setText(TXMUIMessages.ImportDialog_14
+			btnDefaultEncoding.setText(TXMUIMessages.thisComputerEncodingDDot
 					+ System.getProperty("file.encoding")); //$NON-NLS-1$
 			btnDefaultEncoding.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 2, 1));
 			btnDefaultEncoding.setSelection(true);
 
 			btnGuessEncoding = new Button(encodingGroup, SWT.RADIO);
-			btnGuessEncoding.setText(TXMUIMessages.ImportDialog_16);
+			btnGuessEncoding.setText(TXMUIMessages.guessDDot);
 
 			btnGuess2Encoding = new Button(encodingGroup, SWT.PUSH);
 			btnGuess2Encoding.setText("??"); //$NON-NLS-1$
 
 			btnSelectEncoding = new Button(encodingGroup, SWT.RADIO);
-			btnSelectEncoding.setText(TXMUIMessages.ImportDialog_22);
+			btnSelectEncoding.setText(TXMUIMessages.selectDDot);
 
 			encodingCombo = new Combo(encodingGroup, SWT.BORDER);
 			encodingCombo.setLayoutData(new GridData(GridData.FILL,
@@ -294,26 +294,26 @@
 
 			// lang
 			Group langGroup = new Group(optionsPanel, SWT.SHADOW_ETCHED_IN);
-			langGroup.setText(TXMUIMessages.ImportDialog_5);
+			langGroup.setText(TXMUIMessages.mainLanguageDDot);
 			langGroup.setLayout(new GridLayout(2, false));
 			langGroup.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 					true, false, 3, 1));
 
 			btnDefaultLang = new Button(langGroup, SWT.RADIO);
-			btnDefaultLang.setText(TXMUIMessages.ImportDialog_19
+			btnDefaultLang.setText(TXMUIMessages.thisComputerLanguageDDot
 					+ Locale.getDefault().getLanguage());
 			btnDefaultLang.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 2, 1));
 			btnDefaultLang.setSelection(true);
 
 			btnGuessLang = new Button(langGroup, SWT.RADIO);
-			btnGuessLang.setText(TXMUIMessages.ImportDialog_16); 
+			btnGuessLang.setText(TXMUIMessages.guessDDot); 
 
 			btnGuess2Lang = new Button(langGroup, SWT.PUSH);
 			btnGuess2Lang.setText("??"); //$NON-NLS-1$
 
 			btnSelectLang = new Button(langGroup, SWT.RADIO);
-			btnSelectLang.setText(TXMUIMessages.ImportDialog_22);
+			btnSelectLang.setText(TXMUIMessages.selectDDot);
 
 			langcombo = new Combo(langGroup, SWT.BORDER);
 			langcombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
@@ -350,7 +350,7 @@
 			selectTokenizerPanel.setLayout(new GridLayout(4, false));
 			selectTokenizerPanel.setLayoutData(new GridData(GridData.FILL,
 					GridData.FILL, true, false, 3, 1));
-			selectTokenizerPanel.setText(TXMUIMessages.ImportDialog_6);
+			selectTokenizerPanel.setText(TXMUIMessages.tokenizerParameterFileDDot);
 
 			final Text tokenizerValue = new Text(selectTokenizerPanel,
 					SWT.SINGLE | SWT.BORDER);
@@ -387,7 +387,7 @@
 			tokenizerButton = new Button(selectTokenizerPanel, SWT.PUSH);
 			// tokenizerButton.setLayoutData(new GridData(GridData.FILL,
 			// GridData.FILL, false, false));
-			tokenizerButton.setText(TXMUIMessages.PropertiesSelector_2);
+			tokenizerButton.setText(TXMUIMessages.edit);
 			tokenizerButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -405,7 +405,7 @@
 			});
 
 			final ExpandItem item0 = new ExpandItem(bar, SWT.NONE, 0);
-			item0.setText(TXMUIMessages.ImportDialog_23);
+			item0.setText(TXMUIMessages.options);
 			item0.setHeight(optionsPanel.computeSize(SWT.DEFAULT,SWT.DEFAULT).y);
 			item0.setControl(optionsPanel);
 						
@@ -509,4 +509,4 @@
 		super.okPressed();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java	(revision 1335)
@@ -151,7 +151,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.CreatePartitionDialog_0);
+		newShell.setText(TXMUIMessages.createPartition);
 		newShell.setMinimumSize(400, 400);
 	}
 
@@ -171,7 +171,7 @@
 		FontData defaultFont = f.getFontData()[0];
 		defaultFont.setStyle(SWT.BOLD);
 		Font newf = new Font(nameLabel.getDisplay(), defaultFont);
-		nameLabel.setText(TXMUIMessages.CreatePartitionDialog_6);
+		nameLabel.setText(TXMUIMessages.ampNameDDot);
 		nameLabel.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
 				false, false));
 		nameLabel.setFont(newf);
@@ -189,7 +189,7 @@
 
 		TabItem simpleTab = new TabItem(tabFolder, SWT.NONE);
 
-		simpleTab.setText(TXMUIMessages.CreatePartitionDialog_1);
+		simpleTab.setText(TXMUIMessages.simple);
 
 		Composite composite = new Composite(tabFolder, SWT.NONE);
 		simpleTab.setControl(composite);
@@ -201,7 +201,7 @@
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 		Label structureLabel = new Label(composite, SWT.NONE);
-		structureLabel.setText(TXMUIMessages.CreatePartitionDialog_2);
+		structureLabel.setText(TXMUIMessages.ampStructureDDot);
 		structureLabel.setLayoutData(new GridData(GridData.END,
 				GridData.CENTER, false, false));
 
@@ -255,7 +255,7 @@
 		// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 		Label propertyLabel = new Label(composite, SWT.NONE);
-		propertyLabel.setText(TXMUIMessages.CreatePartitionDialog_4);
+		propertyLabel.setText(TXMUIMessages.ampPropertyDDot);
 		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -300,7 +300,7 @@
 		// Second Tab : assisted mode
 		TabItem assistedTab = new TabItem(tabFolder, SWT.NONE);
 
-		assistedTab.setText(TXMUIMessages.CreatePartitionDialog_3);
+		assistedTab.setText(TXMUIMessages.assisted);
 
 		compositeForAssisted = new PartitionComposer(tabFolder, SWT.NONE,
 				this.corpus);
@@ -310,7 +310,7 @@
 		// --------------------------------------------------------
 
 		TabItem advancedTab = new TabItem(tabFolder, SWT.NONE);
-		advancedTab.setText(TXMUIMessages.CreatePartitionDialog_5);
+		advancedTab.setText(TXMUIMessages.advanced);
 
 		Composite advanceContainer = new Composite(tabFolder, SWT.NONE);
 		GridLayout advanceLayout = new GridLayout(1, true);
@@ -450,7 +450,7 @@
 	 */
 	private void addQueryField(final Composite composite) {
 		final Text advancedPartLabel = new Text(composite, SWT.NONE);
-		advancedPartLabel.setText(TXMUIMessages.CreatePartitionDialog_7
+		advancedPartLabel.setText(TXMUIMessages.part
 				+ (partNames.size() + 1)); 
 		advancedPartLabel.setLayoutData(new GridData(GridData.END,
 				GridData.CENTER, false, false));
@@ -498,21 +498,21 @@
 			{
 				String name = "partition"+(this.corpus.getPartitions().size()+1); //$NON-NLS-1$
 				nameText.setText(name);
-				System.out.println(TXMUIMessages.CreatePartitionDialog_9);
+				System.out.println(TXMUIMessages.noPartitionNameWasSpecifiedTheNameIsP0);
 			}
 			else if (isAssistedSelected)
 			{
 				String name = this.corpus.getName()+"_"+compositeForAssisted.getProperty().getFullName(); //$NON-NLS-1$
 				nameText.setText(name);
-				System.out.println(TXMUIMessages.CreatePartitionDialog_9);
+				System.out.println(TXMUIMessages.noPartitionNameWasSpecifiedTheNameIsP0);
 			}
 			//return;
 		}
 
 		if (isAdvancedSelected() && noquery()) {
 			MessageDialog.openError(getShell(),
-					TXMUIMessages.CreateSubcorpusDialog_13,
-					TXMUIMessages.CreatePartitionDialog_16);
+					TXMUIMessages.invalidQuery,
+					TXMUIMessages.queriesCannotBeLeftEmpty);
 			return;
 		}
 
@@ -549,7 +549,7 @@
 	public StructuralUnit getStructuralUnit() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					TXMUIMessages.Cannot_ask_simple_when_advance);
+					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
 		return selectedStructuralUnit;
 	}
 
@@ -561,7 +561,7 @@
 	public StructuralUnitProperty getStructuralUnitProperty() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					TXMUIMessages.Cannot_ask_simple_when_advance);
+					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
 		return selectedStructuralUnitProperty;
 	}
 
@@ -573,7 +573,7 @@
 	public List<String> getQueries() {
 		if (!isAdvancedSelected())
 			throw new IllegalStateException(
-					TXMUIMessages.Cannot_ask_simple_when_advance);
+					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
 		return queriesString;
 	}
 
@@ -620,7 +620,7 @@
 		}
 
 		if (p == null) {
-			Log.severe(TXMUIMessages.CreatePartitionDialog_8);
+			Log.severe(TXMUIMessages.noPartWasDefined);
 			return null;
 		}
 		
@@ -633,7 +633,7 @@
 		}
 		
 		if (p.getPartsCount() == 0) {
-			Log.severe(TXMUIMessages.CreatePartitionDialog_10);
+			Log.severe(TXMUIMessages.errorDDotThePartitionCreatedHasNoPart);
 			return null;
 		}		
 		return p;
@@ -650,7 +650,7 @@
 		for (Text t: partNames) {
 			String name = t.getText().trim();
 			if (name.length() == 0)
-				name = TXMUIMessages.CreatePartitionDialog_7+count++; 
+				name = TXMUIMessages.part+count++; 
 			values.add(name);
 		}
 		return values;
@@ -664,4 +664,4 @@
 	public Partition getPartition() {
 		return partition;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___CreateFrequencyListDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___CreateFrequencyListDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___CreateFrequencyListDialog.java	(revision 1335)
@@ -85,7 +85,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.FrequencyListEditorInput_0);
+		newShell.setText(TXMUIMessages.lexicon);
 	}
 
 	/**
@@ -107,7 +107,7 @@
 		composite.setLayout(layout);
 
 		Label anaPropLabel = new Label(composite, SWT.NONE);
-		anaPropLabel.setText(TXMUIMessages.CreatePartitionDialog_4);
+		anaPropLabel.setText(TXMUIMessages.ampPropertyDDot);
 		anaPropLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -131,12 +131,12 @@
 		int propIndex = anaPropCombo.getSelectionIndex();
 		if (propIndex == -1) {
 			MessageDialog.openError(getShell(),
-					TXMUIMessages.Invalid_analysis_property,
-					TXMUIMessages.Structure_field_not_empty);
+					TXMUIMessages.invalidProperty,
+					TXMUIMessages.structureFieldIsMandatory);
 			return;
 		}
 		property = properties.get(propIndex);
 		super.okPressed();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/RunGroovyScript.java	(revision 1335)
@@ -78,8 +78,8 @@
 	public RunGroovyScript(IWorkbenchWindow window) {
 		this.window = window;
 		setId(ID);
-		setText(TXMUIMessages.RunGroovyScript_1);
-		setToolTipText(TXMUIMessages.RunGroovyScript_2);
+		setText(TXMUIMessages.ampRunScript);
+		setToolTipText(TXMUIMessages.runScript);
 		setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
 				Application.PLUGIN_ID, IImageKeys.ACTION_RUN_SCRIPT));
 	}
@@ -102,7 +102,7 @@
 	public void run() {
 
 		FileDialog dialog = new FileDialog(window.getShell(), SWT.OPEN);
-		dialog.setFilterExtensions(new String[] { TXMUIMessages.RunGroovyScript_3 });
+		dialog.setFilterExtensions(new String[] { TXMUIMessages.groovy });
 		String scriptRootDir = Toolbox.getTxmHomePath() + "/scripts";
 		String scriptCurrentDir = Toolbox.getTxmHomePath() + "/scripts";
 		
@@ -122,18 +122,18 @@
 			classPath.add(new File(scriptRootDir));
 			gse = new GroovyImportScriptRunner(script, classPath);
 		} catch (IOException e) {
-			System.err.println(NLS.bind(TXMUIMessages.RunGroovyScript_4, e));
+			System.err.println(NLS.bind(TXMUIMessages.errorWhileOpeningGroovyScriptDDotP0, e));
 			System.err.println(e);
 		}
 
 		if (gse != null) {
-			JobHandler jobhandler = new JobHandler(TXMUIMessages.RunGroovyScript_0,
+			JobHandler jobhandler = new JobHandler(TXMUIMessages.scriptExecution,
 					null) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					this.runInit(monitor);
 					try {
-						monitor.beginTask(TXMUIMessages.RunGroovyScript_9, 100);
+						monitor.beginTask(TXMUIMessages.executeScript, 100);
 						new Binding();
 						// gse.run(binding);
 						monitor.worked(100);
@@ -141,7 +141,7 @@
 					} catch (ThreadDeath td) {
 						return Status.CANCEL_STATUS;
 					} catch (Exception e) {
-						System.out.println(NLS.bind(TXMUIMessages.RunGroovyScript_8,
+						System.out.println(NLS.bind(TXMUIMessages.errorWhileRunningScriptDDotP0,
 								e));
 					} finally {
 						monitor.done();
@@ -152,4 +152,4 @@
 			jobhandler.startJob();
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/SaveBeforeExecutionDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/SaveBeforeExecutionDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/SaveBeforeExecutionDialog.java	(revision 1335)
@@ -61,7 +61,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(org.txm.rcp.messages.TXMUIMessages.SaveBeforeExecutionDialog_0);
+		newShell.setText(org.txm.rcp.messages.TXMUIMessages.saveBeforeExecution);
 		newShell.setMinimumSize(300, 460);
 
 	}
@@ -82,4 +82,4 @@
 	protected void okPressed() {
 		super.okPressed();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/___DeleteInCorporaView.java	(revision 1335)
@@ -99,7 +99,7 @@
 			try {
 				subcorpus.getMainCorpus().dropSubcorpus(subcorpus);
 			} catch (CqiClientException e) {
-				System.err.println(NLS.bind(TXMUIMessages.DeleteInCorporaView_1, e));
+				System.err.println(NLS.bind(TXMUIMessages.failedToDeleteSubcorpusP0, e));
 			}
 		}
 		if (selection.getFirstElement() instanceof Partition) {
@@ -112,4 +112,4 @@
 //			}
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateSubcorpusDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateSubcorpusDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreateSubcorpusDialog.java	(revision 1335)
@@ -115,7 +115,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.CreateSubcorpusDialog_0);
+		newShell.setText(TXMUIMessages.createSubcorpus);
 		newShell.setMinimumSize(300, 300);
 	}
 
@@ -151,7 +151,7 @@
 		nameComposite.setLayout(layout4nameComposite);
 
 		Label nameLabel = new Label(nameComposite, SWT.NONE);
-		nameLabel.setText(TXMUIMessages.CreatePartitionDialog_6);
+		nameLabel.setText(TXMUIMessages.ampNameDDot);
 		nameLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 
 		name = new Text(nameComposite, SWT.BORDER);
@@ -163,19 +163,19 @@
 		
 		// First tab
 		TabItem simpleTab = new TabItem(tabFolder, SWT.NONE);
-		simpleTab.setText(TXMUIMessages.CreatePartitionDialog_1);
+		simpleTab.setText(TXMUIMessages.simple);
 		simplePanel = new SimpleSubcorpusPanel(tabFolder, SWT.NONE, this, corpus);
 		simpleTab.setControl(simplePanel);
 		
 		//Second tab: assisted mode
 		TabItem secondTab = new TabItem(tabFolder, SWT.NONE);
-		secondTab.setText(TXMUIMessages.CreatePartitionDialog_3);
+		secondTab.setText(TXMUIMessages.assisted);
 		this.complexPanel = new ComplexSubcorpusPanel(tabFolder, SWT.NONE, this.corpus);
 		secondTab.setControl(complexPanel);
 
 		// Third tab: advanced mode
 		TabItem advancedTab = new TabItem(tabFolder, SWT.NONE);
-		advancedTab.setText(TXMUIMessages.CreatePartitionDialog_5);
+		advancedTab.setText(TXMUIMessages.advanced);
 
 		Composite compositeForAdvanced = new Composite(tabFolder, SWT.NONE);
 		advancedTab.setControl(compositeForAdvanced);
@@ -184,7 +184,7 @@
 		compositeForAdvanced.setLayout(layoutForAdvanced);
 
 		Label advancedPartLabel = new Label(compositeForAdvanced, SWT.NONE);
-		advancedPartLabel.setText(TXMUIMessages.CreateSubcorpusDialog_10);
+		advancedPartLabel.setText(TXMUIMessages.ampQuery);
 		advancedPartLabel.setLayoutData(new GridData(GridData.END,
 				GridData.CENTER, false, false));
 
@@ -236,7 +236,7 @@
 		if (name.getText().length() == 0) {
 			String generated = "subcorpus"; //$NON-NLS-1$
 
-			System.out.println(TXMUIMessages.CreateSubcorpusDialog_8);
+			System.out.println(TXMUIMessages.noSubcorpusNameWasSpecifiedWeveGeneratedOne);
 			if (isAdvancedSelected()) {
 				generated += ""+(this.corpus.getSubcorpora().size()+1); //$NON-NLS-1$
 			} else if (assistedSelected) {
@@ -250,8 +250,8 @@
 		// test if a query has been set
 		if ((isAdvancedSelected()) && queryText.getText().length() == 0) {
 			MessageDialog.openError(getShell(),
-					TXMUIMessages.CreateSubcorpusDialog_13,
-					TXMUIMessages.CreateSubcorpusDialog_14);
+					TXMUIMessages.invalidQuery,
+					TXMUIMessages.queryCannotBeLeftEmpty);
 			return;
 		}
 
@@ -267,8 +267,8 @@
 				//System.out.println("3 "+queryString);
 				if (queryString == null || queryString.trim().length() == 0) {
 					MessageDialog.openError(getShell(),
-							TXMUIMessages.CreateSubcorpusDialog_13,
-							TXMUIMessages.CreateSubcorpusDialog_14);
+							TXMUIMessages.invalidQuery,
+							TXMUIMessages.queryCannotBeLeftEmpty);
 					return;
 				}
 			}
@@ -304,7 +304,7 @@
 	public StructuralUnit getStructuralUnit() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					TXMUIMessages.Cannot_ask_simple_when_advance);
+					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
 		return simplePanel.selectedStructuralUnit;
 	}
 
@@ -316,7 +316,7 @@
 	public StructuralUnitProperty getStructuralUnitProperty() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					TXMUIMessages.Cannot_ask_simple_when_advance);
+					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
 		return simplePanel.selectedStructuralUnitProperty;
 	}
 
@@ -328,7 +328,7 @@
 	public List<String> getValues() {
 		if (isAdvancedSelected())
 			throw new IllegalStateException(
-					TXMUIMessages.Cannot_ask_simple_when_advance);
+					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
 		return simplePanel.selectedValues;
 	}
 
@@ -340,7 +340,7 @@
 	public String getQuery() {
 		if (isAdvancedSelected() == false && isAssistedSelected() == false)
 			throw new IllegalStateException(
-					TXMUIMessages.Cannot_ask_simple_when_advance);
+					TXMUIMessages.cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab);
 		return queryString;
 	}
 
@@ -361,4 +361,4 @@
 	public String getSubCorpusName() {
 		return name.getText();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DebugPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DebugPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/DebugPreferencePage.java	(revision 1335)
@@ -19,7 +19,7 @@
 	@Override
 	public void createFieldEditors() {
 		// Show all result nodes in Corpora view
-		addField(new BooleanFieldEditor(TBXPreferences.SHOW_ALL_RESULT_NODES, TXMUIMessages.preferences_advanced_showAllResultNodesInCorporaView, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(TBXPreferences.SHOW_ALL_RESULT_NODES, TXMUIMessages.showAllResultNodesInCorporaView, getFieldEditorParent()));
 		addField(new StringFieldEditor(TBXPreferences.UPDATESITE, "Update site addres", getFieldEditorParent()));
 	}
 	
@@ -37,4 +37,4 @@
 		};
 		return false;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/LocalePreferencePage.java	(revision 1335)
@@ -55,7 +55,7 @@
 	 */
 	public LocalePreferencePage() {
 		super();
-		setTitle(TXMUIMessages.LocalePreferencePage_1);
+		setTitle(TXMUIMessages.configurationOfTheUserInterfaceLanguage);
 	}
 
 	/* (non-Javadoc)
@@ -65,8 +65,8 @@
 	protected void createFieldEditors() {
 		String[][] values = { { "français", "fr" }, { "english", "en" } }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		locale = new RadioGroupFieldEditor(RCPPreferences.UI_LOCALE,
-				TXMUIMessages.LocalePreferencePage_2, 1, values,
+				TXMUIMessages.userInterfaceLanguage, 1, values,
 				getFieldEditorParent());
 		addField(locale);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/FileExplorerPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/FileExplorerPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/FileExplorerPreferencePage.java	(revision 1335)
@@ -53,7 +53,7 @@
 	 */
 	public FileExplorerPreferencePage() {
 		super();
-		setTitle(TXMUIMessages.ExportPreferencePage_1);
+		setTitle(TXMUIMessages.exportSettings);
 	}
 
 	/* (non-Javadoc)
@@ -63,11 +63,11 @@
 	protected void createFieldEditors() {
 
 		files_to_hide = new StringFieldEditor(RCPPreferences.FILES_TO_HIDE,
-				TXMUIMessages.FileExplorerPreferencePage_0, getFieldEditorParent());
+				TXMUIMessages.regexpPatternToHideFiles, getFieldEditorParent());
 		addField(files_to_hide);
 
 		show_hidden_files = new BooleanFieldEditor(RCPPreferences.SHOW_HIDDEN_FILES,
-				TXMUIMessages.FileExplorerPreferencePage_1, getFieldEditorParent());
+				TXMUIMessages.showHiddenFiles, getFieldEditorParent());
 		addField(show_hidden_files);
 
 		//show_folders = new BooleanFieldEditor(SHOW_FOLDERS, Messages.FileExplorerPreferencePage_2, getFieldEditorParent());
@@ -84,4 +84,4 @@
 		Explorer.refresh();
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ScriptPreferencePage.java	(revision 1335)
@@ -55,11 +55,11 @@
 	protected void createFieldEditors() {
 		
 		save_before_execution = new BooleanFieldEditor(RCPPreferences.SAVE_BEFORE_EXECUTION,
-				TXMUIMessages.ScriptPreferencePage_1, getFieldEditorParent());
+				TXMUIMessages.saveScriptBeforeExecution, getFieldEditorParent());
 		addField(save_before_execution);
 		
 		nosession = new IntegerFieldEditor(RCPPreferences.NO_SESSION,
-				TXMUIMessages.ScriptPreferencePage_0, getFieldEditorParent());
+				TXMUIMessages.nextSessionNumber, getFieldEditorParent());
 		addField(nosession);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/AdvancedPreferencePage.java	(revision 1335)
@@ -55,13 +55,13 @@
 	protected void createFieldEditors() {
 
 		// install directory
-		addField(new DirectoryFieldEditor(TBXPreferences.INSTALL_DIR, TXMUIMessages.AdvancePreferencePage_1, getFieldEditorParent()));
+		addField(new DirectoryFieldEditor(TBXPreferences.INSTALL_DIR, TXMUIMessages.tXMInstallDirectory, getFieldEditorParent()));
 		
 		// txmhome directory
-		addField(new DirectoryFieldEditor(TBXPreferences.USER_TXM_HOME, TXMUIMessages.AdvancePreferencePage_2, getFieldEditorParent()));
+		addField(new DirectoryFieldEditor(TBXPreferences.USER_TXM_HOME, TXMUIMessages.tXMUserDirectory, getFieldEditorParent()));
 		
 		Group updateGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		updateGroup.setText(TXMUIMessages.AdvancePreferencePage_6);
+		updateGroup.setText(TXMUIMessages.logs);
 		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData2.horizontalSpan = 3;
 		gridData2.verticalIndent = 10;
@@ -81,22 +81,22 @@
 		choices[6][0] = choices[6][1] = "FINER"; //$NON-NLS-1$
 		choices[7][0] = choices[7][1] = "FINEST"; //$NON-NLS-1$
 		choices[8][0] = choices[8][1] = "ALL"; //$NON-NLS-1$
-		addField(new ComboFieldEditor(TBXPreferences.LOG_LEVEL, TXMUIMessages.AdvancePreferencePage_12, choices, updateGroup));
+		addField(new ComboFieldEditor(TBXPreferences.LOG_LEVEL, TXMUIMessages.logLevel, choices, updateGroup));
 
 		// Log timings
-		addField(new BooleanFieldEditor(TBXPreferences.SHOW_TIMINGS, TXMUIMessages.AdvancePreferencePage_3, updateGroup));
+		addField(new BooleanFieldEditor(TBXPreferences.SHOW_TIMINGS, TXMUIMessages.displayRuntimesInConsole, updateGroup));
 		
 		// Log stack trace
-		addField(new BooleanFieldEditor(TBXPreferences.LOG_STACKTRACE, TXMUIMessages.AdvancePreferencePage_0, updateGroup));
+		addField(new BooleanFieldEditor(TBXPreferences.LOG_STACKTRACE, TXMUIMessages.printTheStacktrace, updateGroup));
 		
 		// Log console
-		addField(new BooleanFieldEditor(TBXPreferences.ADD_TECH_LOGS, TXMUIMessages.AdvancePreferencePage_13, updateGroup));
+		addField(new BooleanFieldEditor(TBXPreferences.ADD_TECH_LOGS, TXMUIMessages.logInTheConsole, updateGroup));
 		
 		// Show dialog on severe error
 		addField(new BooleanFieldEditor(RCPPreferences.SHOW_SEVERE_DIALOG, "Show a dialog box when a severe error occurs", updateGroup));
 
 		// Log in file
-		addField(new BooleanFieldEditor(TBXPreferences.LOG_IN_FILE, TXMUIMessages.AdvancePreferencePage_14, updateGroup));
+		addField(new BooleanFieldEditor(TBXPreferences.LOG_IN_FILE, TXMUIMessages.logInAFile, updateGroup));
 		
 		// Update level
 		String[][] choices2 = new String[4][2];
@@ -104,13 +104,13 @@
 		choices2[1][0] = choices2[1][1] = "BETA"; //$NON-NLS-1$
 		choices2[2][0] = choices2[2][1] = "ALPHA"; //$NON-NLS-1$
 		choices2[3][0] = choices2[3][1] = "DEV"; //$NON-NLS-1$
-		addField(new ComboFieldEditor(RCPPreferences.UPDATE_LEVEL, TXMUIMessages.AdvancePreferencePage_7,choices2, getFieldEditorParent()));
+		addField(new ComboFieldEditor(RCPPreferences.UPDATE_LEVEL, TXMUIMessages.updateLevel,choices2, getFieldEditorParent()));
 		
 		// Expert mode
-		addField(new BooleanFieldEditor(TBXPreferences.EXPERT_USER, TXMUIMessages.AdvancePreferencePage_4, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(TBXPreferences.EXPERT_USER, TXMUIMessages.advancedUserMode, getFieldEditorParent()));
 
 		// Auto save each result after computing and auto load them at startup
-		addField(new BooleanFieldEditor(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TXMUIMessages.preferences_advanced_enableResultsPersistence, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(TBXPreferences.AUTO_PERSISTENCE_ENABLED, TXMUIMessages.enableAutomaticSaveOfAllResultsPersistence, getFieldEditorParent()));
 
 	}
 
@@ -129,7 +129,7 @@
 			service.executeCommand("org.txm.rcp.p2.plugins.FixUpdateHandler", null); //$NON-NLS-1$
 			
 		} catch (Exception e) {
-			System.err.println(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(TXMUIMessages.failedToSavePreferencesDDot + e);
 		}
 		return true;
 	}
@@ -138,4 +138,4 @@
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(TBXPreferences.getInstance().getPreferencesNodeQualifier()));
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMPreferencePage.java	(revision 1335)
@@ -81,8 +81,8 @@
 			super.performOk();
 			((ScopedPreferenceStore) this.getPreferenceStore()).save();
 		} catch (Exception e) {
-			System.err.println(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(TXMUIMessages.failedToSavePreferencesDDot + e);
 		}
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ImportPreferencePage.java	(revision 1335)
@@ -65,7 +65,7 @@
 	 */
 	public ImportPreferencePage() {
 		super();
-		setTitle(TXMUIMessages.ExportPreferencePage_1);
+		setTitle(TXMUIMessages.exportSettings);
 	}
 
 	/* (non-Javadoc)
@@ -92,7 +92,7 @@
 //		}
 
 		Group csvMetadataGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		csvMetadataGroup.setText(TXMUIMessages.ImportPreferencePage_2);
+		csvMetadataGroup.setText(TXMUIMessages.metadatacsvFileFormat);
 		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData2.horizontalSpan = 3;
 		gridData2.verticalIndent = 10;
@@ -108,19 +108,19 @@
 		csvMetadataGroup.setLayout(gridlayout);
 		
 		
-		encoding = new ComboFieldEditor(TBXPreferences.METADATA_ENCODING, TXMUIMessages.ImportPreferencePage_0, values, csvMetadataGroup);
+		encoding = new ComboFieldEditor(TBXPreferences.METADATA_ENCODING, TXMUIMessages.characterEncoding, values, csvMetadataGroup);
 		addField(encoding);
 		
 		String[][] cols = {{"TAB","\t"}, {",", ","}, {";", ";"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 		String txts[][] = {{"none", ""}, {"\"", "\""}, {"'", "'"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-		colseparators = new ComboFieldEditor(TBXPreferences.METADATA_COLSEPARATOR, TXMUIMessages.ExportPreferencePage_18, cols, csvMetadataGroup);
+		colseparators = new ComboFieldEditor(TBXPreferences.METADATA_COLSEPARATOR, TXMUIMessages.columnsSeparatedBy, cols, csvMetadataGroup);
 		addField(colseparators);
 
-		txtseparators = new ComboFieldEditor(TBXPreferences.METADATA_TXTSEPARATOR, TXMUIMessages.ExportPreferencePage_19, txts, csvMetadataGroup);
+		txtseparators = new ComboFieldEditor(TBXPreferences.METADATA_TXTSEPARATOR, TXMUIMessages.textSeparator, txts, csvMetadataGroup);
 		addField(txtseparators);
 		
 		Group langGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		langGroup.setText(TXMUIMessages.ImportPreferencePage_3);
+		langGroup.setText(TXMUIMessages.clipboard);
 		gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData2.horizontalSpan = 3;
 		gridData2.verticalIndent = 10;
@@ -129,11 +129,11 @@
 		rlayout.marginHeight = 5;
 		langGroup.setLayout(rlayout);
 		
-		defaultlang = new StringFieldEditor(TBXPreferences.IMPORT_DEFAULT_LANG, TXMUIMessages.ImportPreferencePage_4, langGroup);
+		defaultlang = new StringFieldEditor(TBXPreferences.IMPORT_DEFAULT_LANG, TXMUIMessages.defaultLanguage, langGroup);
 		defaultlang.setEmptyStringAllowed(false);
 		
 		Label l = new Label(langGroup, SWT.NONE);
-		l.setText(TXMUIMessages.ImportPreferencePage_5);
+		l.setText(TXMUIMessages.noteDDotUseValueToGuess);
 		GridData ldata = new GridData(SWT.FILL, SWT.FILL, true, false);
 		ldata.horizontalSpan = 3;
 		l.setLayoutData(ldata);
@@ -148,4 +148,4 @@
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(TBXPreferences.getInstance().getPreferencesNodeQualifier()));
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMMainPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMMainPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/TXMMainPreferencePage.java	(revision 1335)
@@ -76,7 +76,7 @@
 	@Override
 	protected void createFieldEditors() {
 		Group generalGroup = new Group(getFieldEditorParent(), SWT.NONE);
-		generalGroup.setText(TXMUIMessages.TextometriePreferencePage_1);
+		generalGroup.setText(TXMUIMessages.generalPreferencesBackup);
 		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData.horizontalSpan = 2;
 		generalGroup.setLayoutData(gridData);
@@ -187,7 +187,7 @@
 		// disable if expert user
 		if (!TBXPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER)) {
 			Group updateGroup = new Group(getFieldEditorParent(), SWT.NONE);
-			updateGroup.setText(TXMUIMessages.TextometriePreferencePage_2);
+			updateGroup.setText(TXMUIMessages.automaticUpdates);
 			GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, false);
 			gridData2.horizontalSpan = 2;
 			gridData2.verticalIndent = 10;
@@ -197,7 +197,7 @@
 			//System.out.println(AutomaticUpdatePlugin.getDefault().getStateLocation());
 			final IPreferenceStore updatePrefStore = AutomaticUpdatePlugin.getDefault().getPreferenceStore();
 			update = new BooleanFieldEditor(TBXPreferences.FETCH_UPDATES_AT_STARTUP,
-					TXMUIMessages.TextometriePreferencePage_0, updateGroup);
+					TXMUIMessages.checkForUpdatesAtStartup, updateGroup);
 			
 			//update.setPreferenceStore(updatePrefStore);
 			//boolean enabled = updatePrefStore.getBoolean(PreferenceConstants.PREF_AUTO_UPDATE_ENABLED);
@@ -207,4 +207,4 @@
 			addField(update);
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/UserPreferencePage.java	(revision 1335)
@@ -47,7 +47,7 @@
 
 	@Override
 	protected void createFieldEditors() {
-		addField(new BooleanFieldEditor(RCPPreferences.USER_ALERT_DELETE, TXMUIMessages.UserPreferencePage_3, BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent()));
-		addField(new BooleanFieldEditor(RCPPreferences.AUTO_UPDATE_EDITOR, TXMUIMessages.UserPreferencePage_1, BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(RCPPreferences.USER_ALERT_DELETE, TXMUIMessages.doNotConfirmToDeleteAnObject, BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent()));
+		addField(new BooleanFieldEditor(RCPPreferences.AUTO_UPDATE_EDITOR, TXMUIMessages.automaticRecomputingWhenChangingAParameter, BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent()));
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/ExportPreferencePage.java	(revision 1335)
@@ -56,7 +56,7 @@
 	 */
 	public ExportPreferencePage() {
 		super();
-		setTitle(TXMUIMessages.ExportPreferencePage_1);
+		setTitle(TXMUIMessages.exportSettings);
 	}
 
 	/* (non-Javadoc)
@@ -74,22 +74,22 @@
 		}
 
 		encoding = new ComboFieldEditor(TBXPreferences.EXPORT_ENCODING,
-				TXMUIMessages.ExportPreferencePage_3, values, getFieldEditorParent());
+				TXMUIMessages.exportFileEncoding, values, getFieldEditorParent());
 		addField(encoding);
 		
 		String[][] cols = {{"\t","\t"}, {",", ","}, {";", ";"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 		String txts[][] = {{"", ""}, {"\"", "\""}, {"'", "'"}}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
 		colseparators = new ComboFieldEditor(TBXPreferences.EXPORT_COL_SEPARATOR,
-				TXMUIMessages.ExportPreferencePage_18, cols, getFieldEditorParent());
+				TXMUIMessages.columnsSeparatedBy, cols, getFieldEditorParent());
 		addField(colseparators);
 		
 		
 		txtseparators = new ComboFieldEditor(TBXPreferences.EXPORT_TXT_SEPARATOR,
-				TXMUIMessages.ExportPreferencePage_19, txts, getFieldEditorParent());
+				TXMUIMessages.textSeparator, txts, getFieldEditorParent());
 		addField(txtseparators);
 
 		show_export = new BooleanFieldEditor(TBXPreferences.EXPORT_SHOW,
-				TXMUIMessages.ExportPreferencePage_4,
+				TXMUIMessages.showExportResultInTheTextEditor,
 				BooleanFieldEditor.SEPARATE_LABEL, getFieldEditorParent());
 		
 		
@@ -113,4 +113,4 @@
 		addField(show_export);
 	
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,511 +1,390 @@
-
-About_Menu_Label = О платформе TXM...
-
-AdapterFactory_0 = ** Предупреждение: корпус {0} поврежден. Некоторые команды могут быть недоступны или функционировать некорркетно.
-
-AddBase_1  = Новый корпус: {0}.
-AddBase_17 = ** Файл {0} недоступен
-AddBase_19 = Внимание
-AddBase_2  = ** Ошибка загрузки корпуса из папки: {0}.\nНевозможно найти необходимые составные элементы.
-AddBase_20 = Корпус {0} уже существует. Хотите ли вы его заменить?
-AddBase_22 = Файл {0} не соответствует формату TXM.
-AddBase_24 = ** Не удалось загрузить корпус {0}
-AddBase_25 = Корпус TXM в бинарном формате - это либо файл с расширением .txm или .zip, либо директория с папками 'html', 'data', 'registry', 'txm'
-AddBase_27 = Загрузить корпус
-AddBase_28 = Извлечение бинарного корпуса
-AddBase_31 = ** Не удалось загрузить бинарный корпус: {0}
-AddBase_32 = Загрузка корпуса в платформу
-AddBase_33 = Перезагрузка платформы
-AddBase_4  = ** Не удалось загрузить бинарный корпу (null error).
-
-AdvancePreferencePage_1  = Папка установки TXM
-AdvancePreferencePage_12 = Уровень детализации отчета
-AdvancePreferencePage_13 = Добавить технический комментарий
-AdvancePreferencePage_14 = Копировать отчет в файл
-AdvancePreferencePage_2  = Папка пользователя TXM
-AdvancePreferencePage_3  = Показывать время выполнения на консоли
-AdvancePreferencePage_4  = N/A_Expert user mode
-
-ApplicationWorkbenchAdvisor_0           = Инициализация платформы...
-ApplicationWorkbenchAdvisor_1           = Инициализация платформы...
-ApplicationWorkbenchAdvisor_16          = N/A_Removing old corpus backup directory {0}. 
-ApplicationWorkbenchAdvisor_18          = Corpora backuped: {0} 
-ApplicationWorkbenchAdvisor_2           = Загрузка опций установки TXM из: {0}
-ApplicationWorkbenchAdvisor_27          = Рабочая папка TXM уже существует. Загрузить ранее созданные корпусы?
-ApplicationWorkbenchAdvisor_28          = Сохранение рабочей папки...
-ApplicationWorkbenchAdvisor_3           = Проверка наличия рабочей папки
-ApplicationWorkbenchAdvisor_30          = Перемещение существующих корпусов...
-ApplicationWorkbenchAdvisor_34          = ** Ошибка: не удалсоь создать папку для сохранения корпуса
-ApplicationWorkbenchAdvisor_37          = \ в 
-ApplicationWorkbenchAdvisor_44          = ** Невозможно перенести корпус 
-ApplicationWorkbenchAdvisor_47          = ** Невозможно сохранить существующие корпусы:
-ApplicationWorkbenchAdvisor_5           = Стандартный выход
-ApplicationWorkbenchAdvisor_7           = Создание рабочего пространства пользователя TXM.
-ApplicationWorkbenchAdvisor_8           = Путь установки: {0}
-ApplicationWorkbenchAdvisor_9           = ** Ошибка чтения файла опций установки
-ApplicationWorkbenchAdvisor_init        = Запуск {0}...
-ApplicationWorkbenchAdvisor_init_failed = ** Запуск платформы прерван. Пожалуйста, отрегулируйте опции (в меню 'Файл>Опции')
-ApplicationWorkbenchAdvisor_ready       = Готово.
-
-Application_4                           = N/A_This file is not meant to run TXM. Please consult TXM user manual.
-
-AssistedQueryWidget_0 = Ouvrir l'assistant de requêtes
-
-BackToText_0 = Показать в полнотекстовом режиме
-
-CANT_CREATE_GRAPHIC = ** Невозможно создать график
-
-CGU_CHECKMESSAGE = J'accepte la licence et je m'engage à citer TXM dans mes travaux de recherche \n(voir la section Citation de la page <http://textometrie.ens-lyon.fr/spip.php?rubrique61>)
-CGU_MESSAGE      = <p>TXM est diffusé sous licence GNU GPL 2 &lt;<a href="https://www.gnu.org/licenses/gpl-2.0.fr.html">https://www.gnu.org/licenses/gpl-2.0.fr.html</a>
-CGU_TITLE        = Licence d'utilisation
-
-Cannot_ask_simple_when_advance = Невозможно отобразить закладку простых опций, когда пользователь выбрал отображение дополнительных опций
-
-ComplexSortSelector_0 = Ключи для сортировки:
-ComplexSortSelector_1 = Мульти-сортировка
-ComplexSortSelector_2 = Сортировка
-ComplexSortSelector_5 = ** Ошибка при сортировке: {0}
-ComplexSortSelector_6 = по умолчанию
-
-ComplexSort_0         = Открытие диалогового окна сложной сортировки
-ComplexSort_1         = &Сложная сортировка
-ComplexSort_10        = Недопустимый блок сравнения
-ComplexSort_11        = Необходимо выбрать не менее двух блоков сравнения
-ComplexSort_12        = Добавить в выделенному
-ComplexSort_14        = Удалить из выделенного
-ComplexSort_16        = Поднять выделение на один уровень
-ComplexSort_18        = Опустить выделение на один уровень
-ComplexSort_2         = Задать и использовать сложную сортировку
-ComplexSort_3         = Выберите сложную сортировку
-ComplexSort_4         = &Новый
-ComplexSort_5         = Создать новый метод сортировки
-ComplexSort_6         = Имя: 
-ComplexSort_9         = Поле Имя обязательно.
-
-ComplexSubcorpusPanel_0  = Выделить
-ComplexSubcorpusPanel_1  = Все критерии
-ComplexSubcorpusPanel_16 = не содержит
-ComplexSubcorpusPanel_2  = отдельные критерии
-ComplexSubcorpusPanel_4  = Запрос 
-ComplexSubcorpusPanel_5  = Обновить
-
-ConvertCorpus_0 = 
-
-CorporaView_0 = Корпус
-CorporaView_3 = ** Произошла ошибка при расчете конкорданса
-
-CorpusPage_0  = Издания
-CorpusPage_3  = Шрифт
-CorpusPage_35 = 1.\	Нажмите на значок 
-CorpusPage_36 = 'папка', чтобы 
-CorpusPage_37 = выбрать папку с исходными материалами.
-CorpusPage_38 = 2.\	Вы можете изменить параметры на следующих этапах.
-CorpusPage_39 = 3.\	Вы можете 
-CorpusPage_4  = Добавить параметр
-CorpusPage_40 = сохранить параметры импорта,
-CorpusPage_41 = \ нажав на значок дискеты: 
-CorpusPage_42 = 4.\	Чтобы
-CorpusPage_43 = начать импортирование,
-CorpusPage_44 = \ нажмите на этот значок: 
-CorpusPage_49 = N/A_Default
-CorpusPage_5  = N/A_caract�res blancs s�parateurs
-CorpusPage_50 = Параметры модуля: 
-CorpusPage_52 = Сохранение параметров импорта...
-CorpusPage_53 = Имя корпуса обязательно
-CorpusPage_6  = Удалить параметр
-CorpusPage_61 = Edit XSL stylesheet...
-CorpusPage_7  = Общая информация
-CorpusPage_8  = Имя корпуса*
-CorpusPage_9  = Описание - HTML
-
-CreateFile_1 = Новый файл: {0}
-
-CreateFolder_1 = Новая папка: {0}
-
-CreatePartitionDialog_0  = Создать Распределение
-CreatePartitionDialog_1  = Простое
-CreatePartitionDialog_16 = Запросы не должны быть пустыми
-CreatePartitionDialog_2  = &Структура: 
-CreatePartitionDialog_3  = С подсказкой
-CreatePartitionDialog_4  = С&войство: 
-CreatePartitionDialog_5  = Продвинутое
-CreatePartitionDialog_6  = &Имя: 
-CreatePartitionDialog_7  = &Часть 
-CreatePartitionDialog_8  = Не задана ни одна часть
-CreatePartitionDialog_9  = Имя распределения не вводилось. Автоматическое имя: {0}
-
-CreatePartition_0        = Создание распределения по {0}
-CreatePartition_2        = ** Ошибка: распределение не создано
-CreatePartition_5        = Готово: {0} пунктов на {1} употреблений
-CreatePartition_6        = Готово: {0} частей
-
-CreateSubCorpus_0      = ** Ошибка: подкорпус не был создан
-CreateSubCorpus_begin  = Новый &Подкорпус
-CreateSubCorpus_create = Создать новый подокорпус для {0}
-
-CreateSubcorpusDialog_0  = Создать подкорпус
-CreateSubcorpusDialog_10 = &Запрос: 
-CreateSubcorpusDialog_11 = Некорректное имя
-CreateSubcorpusDialog_13 = Некорректный запрос
-CreateSubcorpusDialog_14 = Поле Запрос не должно быть пустым.
-CreateSubcorpusDialog_6  = Зна&чение: 
-CreateSubcorpusDialog_8  = Имя подкорпуса создано автоматически.
-
-CreateSubcorpus_7        = Составление подкорпуса для {0}, структура {1}, свойство {2} : {3}
-CreateSubcorpus_8        = Готово : {0} образован 
-CreateSubcorpus_9        = Составление подкорпуса для {0} по запросу <{1}>
-
-DefineReferencePattern_0 = Шаблон ссылок для отображения
-DefineReferencePattern_1 = Шаблон ссылок для &отображения
-DefineReferencePattern_2 = Шаблон ссылок для отображения
-DefineReferencePattern_3 = Шаблон ссылок для &сортировки
-DefineReferencePattern_4 = Шаблон ссылок для сортировки
-DefineReferencePattern_5 = Шаблон ссылок для сортировки
-
-DeleteFile_0 = Вы уверены, что хотите удалить 
-DeleteFile_2 = ** Не удалось удалить файл 
-
-DeleteInCorporaView_1 = ** Ошибка при удалении подкорпуса {0}
-
-DeleteLines_0 = Таблица должна содержать хотя бы одну строчку
-
-DeleteObject_0  = Вы действительно хотите удалить {0}?
-DeleteObject_10 = {0} удален(о)
-DeleteObject_3  = ** Ошибка во время удаления
-DeleteObject_4  = Ошибка во время удаления {0} : {1}
-DeleteObject_5  = Удаление {0}
-
-ElementTreeLabelProvider_0 = ** Ошибка: элемент не записан 
-ElementTreeLabelProvider_1 = ** Ошибка: объект не является 'org.w3c.Element'
-
-EmpantWidget_0 = Контекст: 
-EmpantWidget_1 = форма
-EmpantWidget_2 = структура
-EmpantWidget_3 = от -
-EmpantWidget_4 = до -
-EmpantWidget_5 = и от
-EmpantWidget_6 = до
-EmpantWidget_7 = вклюая структуру, содержащую мотив
-EmpantWidget_8 = Активный левый контекст
-EmpantWidget_9 = Активный правый контекст
-
-Error_creating_partition = ** Ошибка во время создания распределения: {0}
-
-ExecuteGroovyScriptFromFile_2 = Скрипт Groovy должен находиться в папке {0} {1}
-
-ExecuteGroovyScript_1         = N/A_Error during parameters initialisation
-ExecuteGroovyScript_2         = N/A_The user canceled the script execution
-
-ExecuteScriptImport_0 = Начало импортирования
-ExecuteScriptImport_1 = ** Файл скрипта {0} не найден
-ExecuteScriptImport_2 = ** Ошибка: папка 'corpora' не существует: 
-
-ExecuteScript_3       = ** Не найдено ни одного интерпретатора для расширения файла скрипта 
-
-Exit_Menu_Label = Выход
-
-Explorer_0 = Папка {0} не должна быть удалена
-Explorer_1 = N/A_Go to parent folder
-Explorer_2 = N/A_Go to TXM home
-Explorer_3 = TXM
-Explorer_4 = ⇧
-Explorer_5 = ↻
-Explorer_6 = N/A_Refresh
-Explorer_7 = N/A_⌂
-Explorer_8 = N/A_Go to TXM home
-
-ExportCorpus_0 = ** Не удалось экспортировать корпу {0}
-ExportCorpus_3 = Экпортирование 
-ExportCorpus_4 = Готово, бинарный файл - {0} 
-
-ExportPreferencePage_1  = Конфигурация экспорта
-ExportPreferencePage_18 = Разделитель полей
-ExportPreferencePage_19 = Разделитель текста
-ExportPreferencePage_3  = Кодировка экспортируемых файлов
-ExportPreferencePage_4  = Показать результаты экспорта в текстовом редакторе
-
-ExportResult_0 = Экспорт результатов
-ExportResult_1 = N/A_Exporting...
-ExportResult_2 = Результаты экспорта сохранены: 
-ExportResult_3 = ** Экспорт: невозможно создать файл {0}: {1}
-ExportResult_4 = ** Не удалось произвести экспорт в 
-ExportResult_5 = ** Не удается прочитать {0}
-ExportResult_6 = ** Не удалось экспортировать результат {0}: {1}
-
-FAILED_TO_SAVE_PREFERENCES = ** Не удалось сохранить персональные настройки
-
-FileExplorerPreferencePage_0 = Рег. выр. скрытых файлов
-FileExplorerPreferencePage_1 = Показать скрытые файлы
-
-FileTreeContentProvider_1 = ** Проводник: некорректное регулярное выражение
-FileTreeContentProvider_2 = \ ОШИБКА 
-FileTreeContentProvider_3 = Элемент ошибки: '
-FileTreeContentProvider_4 = '
-
-FrequencyListEditorInput_0 = Список форм
-FrequencyListEditorInput_3 = Форма
-FrequencyListEditorInput_5 = Цепочка знаков
-FrequencyListEditorInput_6 = Целое
-
-GenericMultiPageEditor_1 = ** Внутренняя ошибка: невозможно показать данные {0}.
-GenericMultiPageEditor_3 = ** Внутренняя ошибка: число редакторов RCP ({0}) должно соответствовать числу вводов ({1}).
-
-GraphicalLogger_0 = ** Ошибка {0}
-
-GroovyConsole_4 = \nВнутренняя ошибка.
-GroovyConsole_5 = Ошибка: 
-
-ImportDialog_0  = Параметры импорта - {0}
-ImportDialog_1  = Папка с исходными материалами
-ImportDialog_13 = Не удается найти корпус в бинарном формате в этой папке
-ImportDialog_14 = Кодировка по умолчанию этого компьютера
-ImportDialog_16 = Угадать
-ImportDialog_19 = Язык по умолчанию этого компьютера
-ImportDialog_22 = Выбрать
-ImportDialog_23 = Опции
-ImportDialog_4  = Кодировка букв: 
-ImportDialog_5  = Основной язык: 
-ImportDialog_6  = Параметры словарной сегментации: 
-
-ImportFormEditor_0 = ** отсутствует скрипт для импорта {0} 
-
-ImportPreferencePage_0 = Кодировка
-
-ImportSelectedText_0  = Импорт текста из буфера обмена
-ImportSelectedText_1  = clipboard
-ImportSelectedText_10 = Идентифицированный язык 
-ImportSelectedText_12 = Будет использован 
-ImportSelectedText_2  = ** Буфер обмена пуст
-ImportSelectedText_3  = Подтвердить
-ImportSelectedText_4  = Корпус {0} будет удален
-
-IndexToLexicalTable_0 = Невозможно составить словарную таблицу из Индекса, полученного на Корпусе
-
-InternalCorpusView_0 = ** Ошибка при подготовке информации о корпусе
-InternalCorpusView_1 = Перезагрузить
-InternalCorpusView_2 = ** Внутренняя ошибка: getText {0}
-
-Invalid_analysis_property = Некорректное свойство
-
-JobHandler_0 = N/A_Canceling...
-JobHandler_1 = N/A_Canceling 
-JobHandler_2 = N/A_ canceling requested
-JobHandler_3 = N/A_Failed to cancel 
-
-JobsTimer_12 = ч., 
-JobsTimer_13 = \ мин. и 
-JobsTimer_15 = Проделано за {0} ({1}).
-JobsTimer_19 = Проделано за {0}.
-JobsTimer_2  = \ мс
-JobsTimer_20 = Job: 
-JobsTimer_21 = Exec: 
-JobsTimer_5  = \ с
-JobsTimer_9  = \ мин. и 
-
-LanguageSwitchHandler_0 = Язык интерфейса (LOCALE) не был определен
-LanguageSwitchHandler_1 = Файл {0} не найден
-LanguageSwitchHandler_3 = Выбрать язык
-LanguageSwitchHandler_5 = ** Изменение яызка: некорректый формат URL {0}
-LanguageSwitchHandler_7 = TXM.ini : 
-
-LastCQPError = Последняя ошибка CQP: 
-
-LineLabelProvider_1 = Не должно происходить
-
-LocalePreferencePage_1 = Конфигрурация языка пользовательского интерфейса
-LocalePreferencePage_2 = Язык интерфейса 
-
-MacrosExplorer_0 = N/A_New macro
-MacrosExplorer_1 = N/A_Create a new macro from a template
-
-MainPage_0  = Главная страница
-MainPage_18 = Входная стилевая таблица XSL
-MainPage_19 = Параметры словарной сегментации
-MainPage_2  = Параметры импорта в модуле {0}
-MainPage_20 = Основной язык
-MainPage_23 = Кодировка
-MainPage_3  = Папка с исходными материалами: 
-
-MergeCols_1 = Новое имя
-MergeCols_2 = Имя новой колонки, образованной объединением
-MergeCols_5 = Имена: 
-MergeCols_6 = Объединение колонок завершено.
-
-MergeDeleteDialog_0 = объединить
-MergeDeleteDialog_1 = Объединить/Удалить
-MergeDeleteDialog_4 = имя результата объединения
-
-MergeLines_2 = Наберите имя новой строки, образованной в результате объединения
-
-MetadataPage_1 = Метаданные
-MetadataPage_2 = Параметры метаданных
-MetadataPage_4 = Заглавия колонок в файле с метаданными 
-MetadataPage_5 = Индентификатор текста
-MetadataPage_7 = No metadata file {0}
-
-MultipleValueTreeDialog_0 = добавление: 
-
-NavigationWidget_0 = N/A_Error while getting current position value : 
-
-ObjectSelectionDialog_0 = Селектор значений
-ObjectSelectionDialog_3 = Найдено {0} значений
-
-ObjectSelector_0 = Объект: 
-ObjectSelector_1 = Выбор
-
-OpenBiblio_1 = ** В корпусе нет ни одного текста {0}
-OpenBiblio_2 = Выбрать текст
-OpenBiblio_7 = ** Не удается найти текст {0} в корпусе {1}
-OpenBiblio_9 = ** Нет ни одной библиографической записи для текста {0}
-
-OpenBrowser_0 = ** Ошибка при открытии библиографической записи {0} URL={1}
-
-OpenEmptyEditor_2 = ** Библиография: не удается найти папку {0}
-
-OpenGraph_8 = ** Не удается октрыть график {0}
-
-OpenSVGGraph_0 = График SVG 
-
-OpenURI_0 = ** OpenURL : Рабочий стол не поддерживается
-OpenURI_1 = ** Ошибка при открытии файла {0}
-
-ParametersDialog_0  = {0} parameters input
-ParametersDialog_1  = N/A_Run
-ParametersDialog_10 = N/A_Unknowed widget name: '
-ParametersDialog_11 = N/A_(* mandatory fields)
-ParametersDialog_12 = N/A_** Error : missing value: 
-ParametersDialog_14 = N/A_Error in @Option name declaration: 
-
-PartitionComposer_0  = Структура: 
-PartitionComposer_11 = Удалить
-PartitionComposer_2  = Выбрать значения для назначения: 
-PartitionComposer_3  = Новая часть
-PartitionComposer_5  = Часть
-PartitionComposer_6  = Удалить все части
-PartitionComposer_8  = Заголовок: 
-PartitionComposer_9  = Назначить
-
-PasteFile_1 = ** Ошибка при копировании  
-PasteFile_3 = ** Не удалось удалить
-PasteFile_4 = : 
-
-Preferences_Menu_Label = Опции
-
-PropertiesSelector_0 = Не удается загрузить свойства корпуса {0} ({1})
-PropertiesSelector_1 = Свойства: 
-PropertiesSelector_2 = Править
-
-PropertySelector_0 = Выбрать свойство
-
-QueriesView_1  = Экспортировать всё
-QueriesView_10 = ошибка: 
-QueriesView_5  = Запросы:\n
-
-QueryAssistDialog_0  = Мастер Запросов
-QueryAssistDialog_1  = Дополнительное слово
-QueryAssistDialog_10 = совпадает с
-QueryAssistDialog_11 = начинается с
-QueryAssistDialog_12 = заканчивается на
-QueryAssistDialog_13 = содержит
-QueryAssistDialog_2  = Я ищу: 
-QueryAssistDialog_32 = за ним 
-QueryAssistDialog_33 = с интервалом не менее 0 слов
-QueryAssistDialog_34 = с интервалом не менее 1 слова
-QueryAssistDialog_8  = - Слово №
-
-RefreshingCorporaView = Обновление вида корпусов...
-
-RenameFile_0 = Переименовать файл
-RenameFile_2 = Переименование через: 
-RenameFile_3 = ** Не удалось переименовать 
-
-RestartTXM_1 = Перезагрузить TXM
-
-RunGroovyScript_0 = Выполнение скрипта
-RunGroovyScript_1 = &Выполнить скрипт
-RunGroovyScript_2 = Выполнить скрипт
-RunGroovyScript_3 = *.groovy
-RunGroovyScript_4 = Ошибка при открытии скрипта groovy : {0}
-RunGroovyScript_8 = ** Ошибка при выполнении скрипта groovy : {0}
-RunGroovyScript_9 = Выполнение скрипта
-
-SORT_COLUMN = 
-SORT_DONE   = Сортировка завершена.
-
-SVGGraphicEditor_1 = Не удается показать график на основе предоставленной информации.
-
-SaveAs_2 = ** Не удалось сохранить 
-
-ScriptPreferencePage_0 = Следующий номер сессии 
-
-SetContextSize_1 = Задать размер &контекстов
-SetContextSize_2 = Задать размер контекстов
-SetContextSize_3 = Размер левого контекста
-SetContextSize_4 = Размер правого контекста
-
-SetEncoding_0 = Изменить кодировку
-SetEncoding_1 = Изменить кодировку.\n\n\	Используемая кодировка: 
-SetEncoding_2 = \n\	Кодировка по умолчанию:  
-
-SetLineNumber_0 = Количество строк на странице
-SetLineNumber_1 = № строки
-
-SetSortProperty_1 = Задать свойство &Сортировки
-SetSortProperty_2 = Задать свойство сортировки
-SetSortProperty_3 = Сортировка свойств 
-
-ShowSvgHelp_0 = Команды SVG
-ShowSvgHelp_1 = Перевод: Shift + Левый щелчок + Перетащить\n
-ShowSvgHelp_2 = Масштаб +/- : Shift + Правый щелчок + Перетащить\n
-ShowSvgHelp_3 = Увеличение выделения: Ctrl + Левый щелчок + Перетащить\n
-ShowSvgHelp_4 = Поворот: Ctrl + Правый щелчок + Перетащить\n
-ShowSvgHelp_5 = Исходное состояние: F5
-
-SingularValuesEditor_0 = Ошибочный ввод
-
-SortPropertySelection_0 = Сортировка свойств 
-
-Structure_field_not_empty = Поле Структура не должно быть пустым.
-
-Submit_0 = Сохранить
-
-TablableVector_0 = Обе таблицы должны быть одинакового размера.
-
-TableEditor_0 = Невозможно показать таблицу с предложенной информациейn: {0}
-
-TableKeyListener_6 = Скопированные строки: \n
-
-TableSorter_0 = Номер колонки слишком велик.
-
-TextometriePreferencePage_0 = N/A_Automatically find new updates and notify me
-TextometriePreferencePage_1 = N/A_General preferences backup
-TextometriePreferencePage_2 = 
-
-TxmBrowser_10 = Не удается запустить встроенные браузер. Вы должны отрегулировать соответствующий параметр в Настройках, с помощью меню Общие / Веб браузер
-TxmBrowser_11 = Нет предыдущего текста
-TxmBrowser_12 = Нет следующего текста
-TxmBrowser_5  = предыдущая страница
-TxmBrowser_6  = следующая страница
-TxmBrowser_8  = следующий текст
-TxmBrowser_9  = предыдущий текст
-
-TxtEditor_0 = ТекстовыйРедактор: 
-TxtEditor_1 = Найденная кодировка 
-
-UIParameterException_0 = N/A_Error  
-
-UserPreferencePage_3 = Не требуется подтверждение для удаления объекта
-
-common_areYouSure                         = Вы уверены?
-common_beginning                          = Начало
-common_displayOptions                     = Отображение свойств
-common_end                                = В конец
-common_enterRegularExpressionOfYourSearch = Наберите регулярное выражение вашего запроса
-common_refresh                            = Refresh
-
-error_invalidRegularExpression = Некорректное регулярное выражение: {0}
-
-info_txmIsReady = Платформа TXM готова к использованию.
-
-preferences_advanced_enableResultsPersistence        = 
-preferences_advanced_showAllResultNodesInCorporaView = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+_1=1.\tНажмите на значок 
+_2=2.\tВы можете изменить параметры на следующих этапах.
+_3=4.\tЧтобы
+_default=по умолчанию
+_default_2=N/A_Default
+aBinaryCorpusIsATXMFileExtensionTxmOrZip=Корпус TXM в бинарном формате - это либо файл с расширением .txm или .zip, либо директория с папками 'html', 'data', 'registry', 'txm'
+aboutTXM=О платформе TXM...
+addAWord=Дополнительное слово
+addAXsltParameter=Добавить параметр
+addDDot=добавление\: 
+addingToSelection=Добавить в выделенному
+advanced=Продвинутое
+advancedUserMode=N/A_Expert user mode
+allCriteria=Все критерии
+ampContextsDisplayOptions=Задать размер &контекстов
+ampMultipleSort=&Сложная сортировка
+ampNameDDot=&Имя\: 
+ampNew=&Новый
+ampPropertyDDot=С&войство\: 
+ampQuery=&Запрос\: 
+ampRunScript=&Выполнить скрипт
+ampSortOptions=Задать свойство &Сортировки
+ampStructureDDot=&Структура\: 
+ampValue=Зна&чение\: 
+andFrom=и от
+areYouSureYouWantToDeleteToSort=Вы уверены, что хотите удалить 
+assign=Назначить
+assisted=С подсказкой
+automaticUpdates=
+aWordWithItsProperty=- Слово №
+buildEdition=\ нажмите на этот значок\: 
+canceling=N/A_Canceling...
+canceling_2=N/A_Canceling 
+cancelingRequested=N/A_ canceling requested
+cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab=Невозможно отобразить закладку простых опций, когда пользователь выбрал отображение дополнительных опций
+cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded=Невозможно составить словарную таблицу из Индекса, полученного на Корпусе
+canNotCreateATableWithTheProvidedInformationDDotP0=Невозможно показать таблицу с предложенной информациейn\: {0}
+cannotCreateTheGraphic=** Невозможно создать график
+cannotDrawAGraphicWithTheInformationProvided=Не удается показать график на основе предоставленной информации.
+cannotReadTheFileP0=** Файл {0} недоступен
+cantLoadPropertiesFromCorpusP0DDotP1=Не удается загрузить свойства корпуса {0} ({1})
+cantOpenGraphicP0=** Не удается октрыть график {0}
+changeCharactersEncoding=Изменить кодировку
+changeCharactersEncodingCurrentEncodingDDot=Изменить кодировку.\n\n\tИспользуемая кодировка\: 
+characterEncoding=Кодировка
+checkForUpdatesAtStartup=N/A_Automatically find new updates and notify me
+checkingForExistingWorkspaceDirectory=Проверка наличия рабочей папки
+chooseTheLanguage=Выбрать язык
+clipboard_2=clipboard
+clipboardIsEmpty=** Буфер обмена пуст
+columnIndexIsTooBig=Номер колонки слишком велик.
+columnsSeparatedBy=Разделитель полей
+common_areYouSure=Вы уверены?
+common_beginning=Начало
+common_displayOptions=Отображение свойств
+common_end=В конец
+common_enterRegularExpressionOfYourSearch=Наберите регулярное выражение вашего запроса
+common_refresh=Refresh
+complexSortDDot=Мульти-сортировка
+computeSubCorpusOnP0QueryDDotP1=Составление подкорпуса для {0} по запросу <{1}>
+computeSubCorpusOnP0StructsDDotP1AmpPropsP2DDotP3=Составление подкорпуса для {0}, структура {1}, свойство {2} \: {3}
+configurationOfTheUserInterfaceLanguage=Конфигрурация языка пользовательского интерфейса
+confirm=Подтвердить
+consoleReportsAnInternalError=\nВнутренняя ошибка.
+contains=содержит
+contextDDot=Контекст\: 
+contextsDisplayOptions=Задать размер контекстов
+copiedLinesDDot=Скопированные строки\: \n
+corporaBackupedDDotP0=Corpora backuped\: {0} 
+corpus=Корпус
+corpusConversionFailed=
+corpusInfos=Папка с исходными материалами\: 
+corpusNameIsMandatory=Имя корпуса обязательно
+corpusNameOnlyCapsAndNoDigitAtBeginning=Имя корпуса*
+couldNotCreateBackupDirectoryDDot=** Ошибка\: не удалсоь создать папку для сохранения корпуса
+couldNotFindDirectoryDDotP0=** Библиография\: не удается найти папку {0}
+couldNotFindTextP0InCorpusP1=** Не удается найти текст {0} в корпусе {1}
+couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator=Не удается запустить встроенные браузер. Вы должны отрегулировать соответствующий параметр в Настройках, с помощью меню Общие / Веб браузер
+couldNotReadInstallPreferencesFile=** Ошибка чтения файла опций установки
+couldNotUnzipBinaryCorpusDDot=** Не удалось загрузить бинарный корпус\: {0}
+createANewMacroFromATemplate=N/A_Create a new macro from a template
+createANewSorter=Создать новый метод сортировки
+createPartition=Создать Распределение
+createSubcorpus=Создать подкорпус
+creatingANewPartitionWithP0=Создание распределения по {0}
+creatingASubcorpusInTheSearchEngine=Новый &Подкорпус
+creatingASubcorpusOnP0=Создать новый подокорпус для {0}
+creatingTXMUserWorkingDirectory=Создание рабочего пространства пользователя TXM.
+dDot=\: 
+dDotMandatoryField=сохранить параметры импорта,
+defaultEncodingDDot=\n\tКодировка по умолчанию\:  
+defineAndUseACompositeSorter=Задать и использовать сложную сортировку
+deletedDDotP0={0} удален(о)
+deleteParameter=Удалить параметр
+deletingP0=Удаление {0}
+deletingP0Continue=Вы действительно хотите удалить {0}?
+descriptionHTMLCompleteNameAuthorDateLicenseComment=Описание - HTML
+desktopIsNotSupportedFatal=** OpenURL \: Рабочий стол не поддерживается
+displayFont=Шрифт
+displayInFullText=Показать в полнотекстовом режиме
+displayRuntimesInConsole=Показывать время выполнения на консоли
+doesNotContain=не содержит
+doneDDotP0Created=Готово \: {0} образован 
+doneDDotP0Items=Готово\: {0} пунктов на {1} употреблений
+doneDDotP0Parts=Готово\: {0} частей
+doneInP0=Проделано за {0}.
+doneInP0P1=Проделано за {0} ({1}).
+doneTheCreatedBinaryFileIsP0=Готово, бинарный файл - {0} 
+doNotConfirmToDeleteAnObject=Не требуется подтверждение для удаления объекта
+edit=Править
+editions=Издания
+editTheNameOfTheNewColumnCreatedByTheMergedColumns=Имя новой колонки, образованной объединением
+editTheNameOfTheNewLineCreatedByTheMergedLines=Наберите имя новой строки, образованной в результате объединения
+editXSLStylesheet=Edit XSL stylesheet...
+EMPTY=Поворот\: Ctrl + Правый щелчок + Перетащить\n
+enableAutomaticSaveOfAllResultsPersistence=
+encodingFound=Найденная кодировка 
+endOfColumnMerge=Объединение колонок завершено.
+endsWith=заканчивается на
+equalsTo=совпадает с
+error=N/A_Error  
+eRROR=\ ОШИБКА 
+error_invalidRegularExpression=Некорректное регулярное выражение\: {0}
+errorDDotCorporaDirectoryDoesntExistDDot=** Ошибка\: папка 'corpora' не существует\: 
+errorDDotDeleteReturnedFalse=** Ошибка во время удаления
+errorDDotElementNotRegistered=** Ошибка\: элемент не записан 
+errorDDotGetTextDDotP0=** Внутренняя ошибка\: getText {0}
+errorDDotMissingValueDDot=N/A_** Error \: missing value\: 
+errorDDotObjectIsNotAnOrgw3cElement=** Ошибка\: объект не является 'org.w3c.Element'
+errorDDotP0=** Ошибка {0}
+errorDDotSubcorpusWasNotCreated=** Ошибка\: подкорпус не был создан
+errorDDotThePartitionWasNotCreated=** Ошибка\: распределение не создано
+errorDuringParametersInitialisation=N/A_Error during parameters initialisation
+errorDuringSortDDotP0=** Ошибка при сортировке\: {0}
+errorElementDDot=Элемент ошибки\: '
+errorInAtOptionNameDeclarationDDot=N/A_Error in @Option name declaration\: 
+errorWhileComputingCorpusSummary=** Ошибка при подготовке информации о корпусе
+errorWhileComputingTheConcordanceDDot=** Произошла ошибка при расчете конкорданса
+errorWhileCreatingAPartitionDDotP0=** Ошибка во время создания распределения\: {0}
+errorWhileDeletingP0DDotP1=Ошибка во время удаления {0} \: {1}
+errorWhileGettingCurrentPositionValueDDot=N/A_Error while getting current position value \: 
+errorWhileOpeningBibliographicRecordP0WithURLEqualsP1=** Ошибка при открытии библиографической записи {0} URL\={1}
+errorWhileOpeningFileP0=** Ошибка при открытии файла {0}
+errorWhileOpeningGroovyScriptDDotP0=Ошибка при открытии скрипта groovy \: {0}
+errorWhileRunningScriptDDotP0=** Ошибка при выполнении скрипта groovy \: {0}
+errorWithElementP0=ошибка\: 
+execDDot=Exec\: 
+executeScript=Выполнение скрипта
+exit=Выход
+Explorer_4=⇧
+Explorer_5=↻
+Explorer_7=N/A_⌂
+exportAll=Экспортировать всё
+exportDDotCantCreateFileP0DDotP1=** Экспорт\: невозможно создать файл {0}\: {1}
+exportFileEncoding=Кодировка экспортируемых файлов
+exporting=N/A_Exporting...
+exportingP0ThisMayTakeAWhile=Экпортирование 
+exportingResults=Экспорт результатов
+exportSettings=Конфигурация экспорта
+extractingBinaryCorpus=Извлечение бинарного корпуса
+failedToBackupExistingCorporaDDot=** Невозможно сохранить существующие корпусы\:
+failedToCancel=N/A_Failed to cancel 
+failedToCopy=** Ошибка при копировании  
+failedToDelete=** Не удалось удалить
+failedToDeleteFile=** Не удалось удалить файл 
+failedToDeleteSubcorpusP0=** Ошибка при удалении подкорпуса {0}
+failedToExportCorpusP0=** Не удалось экспортировать корпу {0}
+failedToExportInFileP0WithFormatP1=** Не удалось произвести экспорт в 
+failedToExportResultP0DDotP1=** Не удалось экспортировать результат {0}\: {1}
+failedToLoadBinaryCorpusNullError=** Не удалось загрузить бинарный корпу (null error).
+failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents=** Ошибка загрузки корпуса из папки\: {0}.\nНевозможно найти необходимые составные элементы.
+failedToLoadCorpusP0=** Не удалось загрузить корпус {0}
+failedToMoveCorpus=** Невозможно перенести корпус 
+failedToRename=** Не удалось переименовать 
+failedToSaveAs=** Не удалось сохранить 
+failedToSavePreferencesDDot=** Не удалось сохранить персональные настройки
+fileExplorerDDotIncorrectPattern=** Проводник\: некорректное регулярное выражение
+FileTreeContentProvider_4='
+folderP0ShouldNotBeDeleted=Папка {0} не должна быть удалена
+followedBy=за ним 
+form=Форма
+foundP0Values=Найдено {0} значений
+from=от -
+frontXSL=Входная стилевая таблица XSL
+generalInformations=Общая информация
+generalPreferencesBackup=N/A_General preferences backup
+goToParentFolder=N/A_Go to parent folder
+goToTXMHome=N/A_Go to TXM home
+goToTXMHome_2=N/A_Go to TXM home
+graphicsKeyboardShortcuts=Команды SVG
+groovy=*.groovy
+guessDDot=Угадать
+h=ч., 
+iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage=J'accepte la licence et je m'engage à citer TXM dans mes travaux de recherche \n(voir la section Citation de la page <http\://textometrie.ens-lyon.fr/spip.php?rubrique61>)
+identifiedLanguage=Идентифицированный язык 
+imLookingForDDot=Я ищу\: 
+importClipboardText=Импорт текста из буфера обмена
+importParametersOfP0=Параметры импорта в модуле {0}
+importSetupP0=Параметры импорта - {0}
+importStarted=Начало импортирования
+impossibleToReadP0=** Не удается прочитать {0}
+includeTheKeywordStructureInTheCount=вклюая структуру, содержащую мотив
+info_txmIsReady=Платформа TXM готова к использованию.
+infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt=<p>TXM est diffusé sous licence GNU GPL 2 &lt;<a href\="https\://www.gnu.org/licenses/gpl-2.0.fr.html">https\://www.gnu.org/licenses/gpl-2.0.fr.html</a>
+initializationOfThePlatform=Инициализация платформы...
+initializingPlatform=Инициализация платформы...
+installPathDDotP0=Путь установки\: {0}
+integer=Целое
+interfaceLanguageLOCALEWasNotSet=Язык интерфейса (LOCALE) не был определен
+invalidComparator=Недопустимый блок сравнения
+invalidName=Некорректное имя
+invalidProperty=Некорректное свойство
+invalidQuery=Некорректный запрос
+jobDDot=Job\: 
+lastCQPErrorDDot=Последняя ошибка CQP\: 
+leftContextSize=Размер левого контекста
+lexicalSegmentation=Параметры словарной сегментации
+lexicon=Список форм
+linePerPageDDot=№ строки
+loadingBinaryCorpus=Загрузить корпус
+loadingTheCorpusInThePlatform=Загрузка корпуса в платформу
+loadingTXMInstallPreferences=Загрузка опций установки TXM из\: {0}
+logInAFile=Копировать отчет в файл
+logInTheConsole=Добавить технический комментарий
+logLevel=Уровень детализации отчета
+mainLanguage=Основной язык
+mainLanguageDDot=Основной язык\: 
+mainPage=Главная страница
+mandatoryFields=N/A_(* mandatory fields)
+match=Выделить
+merge=объединить
+mergeDelete=Объединить/Удалить
+mergeResultName=имя результата объединения
+metadataColumnTitles=Заглавия колонок в файле с метаданными 
+metadataPreview=Метаданные
+metadatasParameters=Параметры метаданных
+minAnd=\ мин. и 
+moduleUIParametersDDot=Параметры модуля\: 
+movingCorporaToP0=Перемещение существующих корпусов...
+movingDownTheSelection=Опустить выделение на один уровень
+movingUpTheSelection=Поднять выделение на один уровень
+msec=\ мс
+name=Имя\: 
+nameIsMandatory=Поле Имя обязательно.
+namesDDot=Имена\: 
+newCorpusDDotP0=Новый корпус\: {0}.
+newFileDDotP0=Новый файл\: {0}
+newFolderDDotP0=Новая папка\: {0}
+newMacro=N/A_New macro
+newName=Новое имя
+newPart=Новая часть
+nextPage=следующая страница
+nextSessionNumber=Следующий номер сессии 
+nextText=следующий текст
+noInterpreterFoundForScriptFileExtension=** Не найдено ни одного интерпретатора для расширения файла скрипта 
+noMetadataFileP0=No metadata file {0}
+noPartitionNameWasSpecifiedTheNameIsP0=Имя распределения не вводилось. Автоматическое имя\: {0}
+noPartWasDefined=Не задана ни одна часть
+noPreviousText=Нет предыдущего текста
+noSubcorpusNameWasSpecifiedWeveGeneratedOne=Имя подкорпуса создано автоматически.
+noTextInCorpusDDotP0=** В корпусе нет ни одного текста {0}
+noTextNext=Нет следующего текста
+objDDot=Объект\: 
+openingComplexSortDialog=Открытие диалогового окна сложной сортировки
+openTheQueryAssistant=Ouvrir l'assistant de requêtes
+options=Опции
+p0ParametersInput={0} parameters input
+p0ScriptFileDoesntExist=** Файл скрипта {0} не найден
+p1ExportSavedInFileDDotP0=Результаты экспорта сохранены\: 
+pageBreakTag=\ нажав на значок дискеты\: 
+paginationOptions=Количество строк на странице
+panDDotRightMousePlusDrag=Перевод\: Shift + Левый щелчок + Перетащить\n
+part=&Часть 
+preferences=Опции
+previousPage=предыдущая страница
+previousText=предыдущий текст
+propertiesDDot=Свойства\: 
+queriesCannotBeLeftEmpty=Запросы не должны быть пустыми
+queriesDDot=Запросы\:\n
+query=Запрос 
+queryAssistant=Мастер Запросов
+queryCannotBeLeftEmpty=Поле Запрос не должно быть пустым.
+ready=Готово.
+referencesAmpdisplayOptions=Шаблон ссылок для &отображения
+referencesAmpsortOptions=Шаблон ссылок для &сортировки
+referencesDisplayOptions=Шаблон ссылок для отображения
+referencesSortOptions=Шаблон ссылок для сортировки
+refreshingCorpora=Обновление вида корпусов...
+regexpPatternToHideFiles=Рег. выр. скрытых файлов
+reload=Перезагрузить
+remove=Удалить
+removeFromSelection=Удалить из выделенного
+removingOldCorpusBackupDirectoryP0=N/A_Removing old corpus backup directory {0}. 
+renameFile=Переименовать файл
+renamingByDDot=Переименование через\: 
+resetTheViewDDotF5=Исходное состояние\: F5
+restartingThePlatform=Перезагрузка платформы
+restartTXM=Перезагрузить TXM
+rightContextSize=Размер правого контекста
+rmvAllTheParts=Удалить все части
+run=N/A_Run
+runScript=Выполнить скрипт
+saveScript=Сохранить
+savingImportParameters=Сохранение параметров импорта...
+scriptExecution=Выполнение скрипта
+sec=\ с
+select=Выбор
+selectACompositeSorter=Выберите сложную сортировку
+selectAProperty=Выбрать свойство
+selectDDot=Выбрать
+selectTextId=Выбрать текст
+selectTheSourceDirectory=выбрать папку с исходными материалами.
+selectValuesToAssignDDot=Выбрать значения для назначения\: 
+separatedByAtLeast0Word=с интервалом не менее 0 слов
+separatedByAtLeast1Word=с интервалом не менее 1 слова
+setImportParametersInTheSectionsBelow=3.\tВы можете 
+shouldNotHappen=Не должно происходить
+showAllResultNodesInCorporaView=
+showExportResultInTheTextEditor=Показать результаты экспорта в текстовом редакторе
+showHiddenFiles=Показать скрытые файлы
+simple=Простое
+someCriteria=отдельные критерии
+sort=Сортировка
+sortDone=Сортировка завершена.
+sortingColumn=
+sortKeys=Ключи для сортировки\:
+sortOptions=Задать свойство сортировки
+sourceCharactersEncoding=Кодировка
+sourceDirectoryDDot=Папка с исходными материалами
+sourcesCharactersEncodingDDot=Кодировка букв\: 
+spaces=N/A_caract�res blancs s�parateurs
+startCorpusImport=начать импортирование,
+startingUpP0=Запуск {0}...
+startsWith=начинается с
+startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup=** Запуск платформы прерван. Пожалуйста, отрегулируйте опции (в меню 'Файл>Опции')
+string=Цепочка знаков
+structure=структура
+structureDDot=Структура\: 
+structureFieldIsMandatory=Поле Структура не должно быть пустым.
+sVGGraphic=График SVG 
+switchLanguageDDotMalformedUrlDDotP0=** Изменение яызка\: некорректый формат URL {0}
+systemOutput=Стандартный выход
+termsOfService=Licence d'utilisation
+textEditorDDot=ТекстовыйРедактор\: 
+textID=Индентификатор текста
+textP0HasNoBibliographicRecord=** Нет ни одной библиографической записи для текста {0}
+textSeparator=Разделитель текста
+theCorpusAndTheCorpusP0WillBeDeleted=Корпус {0} будет удален
+theErrorIsDDot=Ошибка\: 
+theFileP0DoesNotExist=Файл {0} не найден
+theInputP0CannotBeDisplayed=** Внутренняя ошибка\: невозможно показать данные {0}.
+theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual=** Внутренняя ошибка\: число редакторов RCP ({0}) должно соответствовать числу вводов ({1}).
+theP0CorpusDirectoryAlreadyExistsDoYouWantToReplaceIt=Корпус {0} уже существует. Хотите ли вы его заменить?
+theP1GroovyScriptMustBeInTheP0Folder=Скрипт Groovy должен находиться в папке {0} {1}
+theTableMustContainAtLeastOneLine=Таблица должна содержать хотя бы одну строчку
+theTwoArraysMustHaveTheSameSize=Обе таблицы должны быть одинакового размера.
+theUserCanceledTheScriptExecution=N/A_The user canceled the script execution
+thisComputerEncodingDDot=Кодировка по умолчанию этого компьютера
+thisComputerLanguageDDot=Язык по умолчанию этого компьютера
+thisDirectorySeemsToContainABinaryCorpus=Не удается найти корпус в бинарном формате в этой папке
+thisFileIsNotATXMFileDDotP0=Файл {0} не соответствует формату TXM.
+thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual=N/A_This file is not meant to run TXM. Please consult TXM user manual.
+titleDDot=Заголовок\: 
+to=\ в 
+to_2=до -
+to_3=до
+tokenizerParameterFileDDot=Параметры словарной сегментации\: 
+tXM=TXM
+tXMiniDDot=TXM.ini \: 
+tXMInstallDirectory=Папка установки TXM
+tXMUserDirectory=Папка пользователя TXM
+tXMWorkspaceDirectoryAlreadyExistsP0WouldYouLikeToReloadItsCorporaInYourNewTXM=Рабочая папка TXM уже существует. Загрузить ранее созданные корпусы?
+unknowedWidgetNameDDot=N/A_Unknowed widget name\: '
+useLeftWindow=Активный левый контекст
+useRightWindow=Активный правый контекст
+userInterfaceLanguage=Язык интерфейса 
+usingLanguage=Будет использован 
+valueSelector=Селектор значений
+warning=Внимание
+warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly=** Предупреждение\: корпус {0} поврежден. Некоторые команды могут быть недоступны или функционировать некорркетно.
+warningDDotTheImportScriptIsMissingDDotP0=** отсутствует скрипт для импорта {0} 
+word=форма
+wordsPerPage='папка', чтобы 
+workspaceDirectoryBackup=Сохранение рабочей папки...
+wrongInput=Ошибочный ввод
+youMustSelectAtLeast2Comparators=Необходимо выбрать не менее двух блоков сравнения
+zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag=Масштаб +/- \: Shift + Правый щелчок + Перетащить\n
+zoomToSelectionDDotCtrlPlusLeftMousePlusdrag=Увеличение выделения\: Ctrl + Левый щелчок + Перетащить\n
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,577 +1,443 @@
-﻿#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-#Eclipse modern messages class
-#Mon Feb 10 10:26:04 CET 2014
-
-About_Menu_Label = À propos de TXM...
-
-AdapterFactory_0 = ** Avertissement : le corpus {0} est corrompu. Certaines commandes ne fonctionneront pas correctement.
-
-AddBase_1  = Nouveau corpus : {0}.
-AddBase_17 = ** Impossible de lire le fichier {0}
-AddBase_19 = Attention
-AddBase_2  = ** Échec du chargement du corpus à partir du dossier : {0}.\nImpossible de trouver les composants nécessaires.
-AddBase_20 = Le répertoire du corpus {0} existe déjà. Voulez-vous le remplacer ?
-AddBase_22 = Le fichier {0} n''est pas un fichier TXM.
-AddBase_24 = ** Échec du chargement du corpus {0}
-AddBase_25 = Un corpus TXM au format binaire est soit un fichier d'extension .txm ou .zip, soit un dossier composé des sous-dossiers 'html', 'data', 'registry', 'txm'
-AddBase_27 = Chargement du corpus
-AddBase_28 = Extraction du corpus binaire
-AddBase_31 = ** Échec de l''extraction du corpus binaire : {0}
-AddBase_32 = Chargement du corpus dans la plateforme
-AddBase_33 = Redémarrage de la plateforme
-AddBase_4  = ** Échec de chargement du corpus binaire(null error).
-
-AdvancePreferencePage_0  = Afficher la stacktrace
-AdvancePreferencePage_1  = Dossier d'installation de TXM
-AdvancePreferencePage_12 = Niveau de détails du journal
-AdvancePreferencePage_13 = Ajouter des commentaires techniques
-AdvancePreferencePage_14 = Copier le journal dans un fichier
-AdvancePreferencePage_2  = Dossier utilisateur TXM
-AdvancePreferencePage_3  = Afficher les temps d'exécution dans la console
-AdvancePreferencePage_4  = Mode avancé
-AdvancePreferencePage_6  = Journal et messages
-AdvancePreferencePage_7  = Niveau de mise à jour
-
-ApplicationWorkbenchAdvisor_0           = Initialisation de la plateforme...
-ApplicationWorkbenchAdvisor_1           = Initialisation de la plateforme...
-ApplicationWorkbenchAdvisor_16          = Nettoyage de l''ancien dossier de sauvegarde des corpus ''{0}''. 
-ApplicationWorkbenchAdvisor_18          = Corpus sauvegardés dans : {0}.
-ApplicationWorkbenchAdvisor_2           = Chargement des préférences d''installation de TXM à partir de : {0}
-ApplicationWorkbenchAdvisor_27          = Le dossier de travail de TXM existe déjà : {0}. Voulez vous recharger les corpus sauvegardés ?
-ApplicationWorkbenchAdvisor_28          = Récupération des corpus existants…
-ApplicationWorkbenchAdvisor_3           = Vérification de la présence du dossier de travail
-ApplicationWorkbenchAdvisor_30          = Sauvegarde des corpus existants dans ''{0}''.
-ApplicationWorkbenchAdvisor_34          = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé
-ApplicationWorkbenchAdvisor_37          = \ vers 
-ApplicationWorkbenchAdvisor_44          = ** Impossible de déplacer le corpus 
-ApplicationWorkbenchAdvisor_47          = ** Impossible de sauvegarder les corpus existants : 
-ApplicationWorkbenchAdvisor_5           = Sortie standard
-ApplicationWorkbenchAdvisor_7           = Création de l'espace de travail utilisateur de TXM.
-ApplicationWorkbenchAdvisor_8           = Chemin d''installation : {0}
-ApplicationWorkbenchAdvisor_9           = ** Échec de lecture du fichier des préférences d'installation
-ApplicationWorkbenchAdvisor_init        = Démarrage de TXM {0}...
-ApplicationWorkbenchAdvisor_init_failed = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences')
-ApplicationWorkbenchAdvisor_ready       = Prêt.
-
-Application_4                           = Ce fichier ne permet pas de lancer TXM. Veuillez consulter les instructions de lancement dans le manuel de TXM. 
-
-AssistedQueryWidget_0 = Ouvrir l'assistant de requêtes
-
-BackToText_0 = Afficher en plein texte...
-
-CANT_CREATE_GRAPHIC = ** Impossible de créer le graphique
-
-CGU_CHECKMESSAGE = J'accepte la licence et je m'engage à citer TXM dans mes travaux de recherche \n(voir la section 'Citation de TXM' de la page <http://textometrie.ens-lyon.fr/spip.php?rubrique61>)
-CGU_MESSAGE      = <p>TXM est diffusé sous licence GNU GPL 2 &lt;<a href="https://www.gnu.org/licenses/gpl-2.0.fr.html">https://www.gnu.org/licenses/gpl-2.0.fr.html</a>
-CGU_TITLE        = Licence d'utilisation
-
-Cannot_ask_simple_when_advance = Impossible d'afficher l'onglet des options simples quand l'utilisateur a sélectionné l'affichage des options avancées
-
-ComplexSortSelector_0 = Clés de tri 
-ComplexSortSelector_1 = Tri multiple 
-ComplexSortSelector_2 = Tri
-ComplexSortSelector_5 = ** Erreur pendant le tri : {0}
-ComplexSortSelector_6 = par défaut
-
-ComplexSort_0         = Ouverture de la boite de dialogue du tri composé
-ComplexSort_1         = &Tri composé
-ComplexSort_10        = Comparateur invalide
-ComplexSort_11        = Il faut sélectionner au moins deux comparateurs
-ComplexSort_12        = Ajouter à la sélection
-ComplexSort_14        = Retirer de la sélection
-ComplexSort_16        = Monter d'un cran la sélection
-ComplexSort_18        = Descendre d'un cran la sélection
-ComplexSort_2         = Définir et utiliser un tri composé
-ComplexSort_3         = Sélectionnez un tri composé
-ComplexSort_4         = &Nouveau
-ComplexSort_5         = Créer une nouvelle méthode de tri
-ComplexSort_6         = Nom 
-ComplexSort_9         = Le champ Nom est obligatoire.
-
-ComplexSubcorpusPanel_0  = Sélectionner
-ComplexSubcorpusPanel_1  = Tous les critères
-ComplexSubcorpusPanel_16 = ne contient pas
-ComplexSubcorpusPanel_2  = certains critères
-ComplexSubcorpusPanel_4  = Requête 
-ComplexSubcorpusPanel_5  = Rafraîchir
-
-ComputeCoocMatrix_0  = Matrice mot-mot : 
-ComputeCoocMatrix_1  = Nombre de noeuds : 
-ComputeCoocMatrix_10 = Distance en mot
-ComputeCoocMatrix_11 = Co-fréquence minimum
-ComputeCoocMatrix_12 = Fichier de sortie : aucun
-ComputeCoocMatrix_13 = Sélection du fichier de sortie
-ComputeCoocMatrix_2  = Nombre d'arcs : 
-ComputeCoocMatrix_3  = Distance en mot : 
-ComputeCoocMatrix_4  = Ecriture de la matrice mot-mot dans un fichier GRAPHML :
-ComputeCoocMatrix_7  = Paramètres de la matrice mot-mot
-
-ComputeCooccurrences_0 = Chargement du tableau de cooccurrents
-ComputeCooccurrences_1 = ** Impossible de calculer les cooccurrents de la sélection
-
-ConvertCorpus_0 = La conversion du corpus a échoué.
-
-CorporaView_0 = Corpus
-CorporaView_3 = ** Une erreur est survenue lors du calcul de la concordance
-
-CorpusPage_0   = Éditions
-CorpusPage_16  = Ponctuations
-CorpusPage_16a = Caractères séparateurs
-CorpusPage_19  = Caractères d'élision
-CorpusPage_22  = Caractères de fin de phrase
-CorpusPage_26  = Annoter le corpus
-CorpusPage_3   = Police d'affichage
-CorpusPage_30  = Paramètres
-CorpusPage_35  = 1.\	
-CorpusPage_36  = Nombre de mots par page
-CorpusPage_37  = Sélectionner le répertoire des sources.
-CorpusPage_38  = 2.\	
-CorpusPage_39  = Régler les paramètres d'import dans les sections ci-dessous.
-CorpusPage_4   = Ajouter un paramètre
-CorpusPage_40  = * : champ obligatoire
-CorpusPage_41  = Elément de pagination
-CorpusPage_42  = 3.\	
-CorpusPage_43  = Lancer l'import du corpus.
-CorpusPage_44  = Construire l'édition
-CorpusPage_49  = Défaut
-CorpusPage_5   = Espaces
-CorpusPage_50  = Paramètres du module : 
-CorpusPage_52  = Sauvegarde des paramètres d'importation...
-CorpusPage_53  = Le nom du corpus est obligatoire
-CorpusPage_6   = Supprimer un paramètre
-CorpusPage_61  = Editer la feuille XSL...
-CorpusPage_63  = Commandes
-CorpusPage_64  = Structures de limite des contextes de concordance
-CorpusPage_65  = Impossible de sauvegarder l'import : pas de dossier source sélectionné.
-CorpusPage_66  = Impossible de commencer l'import : pas de dossier source sélectionné.
-CorpusPage_7   = Informations générales
-CorpusPage_8   = Nom du corpus* (majuscules et pas de chiffre en début)
-CorpusPage_9   = Description - HTML (nom complet, auteur, date, license, commentaire...)
-
-CreateFile_1 = Nouveau fichier : {0}
-
-CreateFolder_1 = Nouveau dossier : {0}
-
-CreateMacro_0 = Nom de la macro
-CreateMacro_1 = Nom de la macro
-
-CreatePartitionDialog_0  = Créer une Partition
-CreatePartitionDialog_1  = Simple
-CreatePartitionDialog_16 = Les requêtes ne doivent pas être vides
-CreatePartitionDialog_2  = &Structure 
-CreatePartitionDialog_3  = Assisté
-CreatePartitionDialog_4  = &Propriété 
-CreatePartitionDialog_5  = Avancé
-CreatePartitionDialog_6  = &Nom 
-CreatePartitionDialog_7  = Partie 
-CreatePartitionDialog_8  = Aucune partie définie
-CreatePartitionDialog_9  = Le nom de la partition n''a pas été précisé. Le nom est {0}
-
-CreatePartition_0        = Création d''une partition sur {0}
-CreatePartition_2        = ** Erreur : la partition n'a pas été créé
-CreatePartition_5        = Terminé : {0} items pour {1} occurrences.
-CreatePartition_6        = Terminé : {0} parties
-
-CreateSubCorpus_0      = ** Erreur : le sous-corpus n'a pas été créé
-CreateSubCorpus_2      = Erreur lors de la récupération de la dernière erreur CQP : 
-CreateSubCorpus_begin  = Nouveau &Sous-corpus
-CreateSubCorpus_create = Créer un nouveau sous-corpus de {0}
-
-CreateSubcorpusDialog_0  = Créer un sous-corpus
-CreateSubcorpusDialog_10 = &Requête 
-CreateSubcorpusDialog_11 = Nom incorrect
-CreateSubcorpusDialog_13 = Requête invalide
-CreateSubcorpusDialog_14 = Le champ Requête ne doit pas être vide.
-CreateSubcorpusDialog_6  = &Valeur 
-CreateSubcorpusDialog_8  = Un nom de sous-corpus a été généré.
-
-CreateSubcorpus_7        = Calcul d''un sous-corpus de {0}, structure {1}, propriété {2} : {3}
-CreateSubcorpus_8        = Terminé : {0} a été créé  
-CreateSubcorpus_9        = Calcul d''un sous-corpus de {0} avec la requête <{1}>
-
-DefineReferencePattern_0 = Options d'affichage des références
-DefineReferencePattern_1 = Options d'&affichage des références
-DefineReferencePattern_2 = Options d'affichage des références
-DefineReferencePattern_3 = Options de &tri des références
-DefineReferencePattern_4 = Options de tri des références
-DefineReferencePattern_5 = Options de tri des références
-
-DeleteFile_0 = Etes vous sûr de vouloir supprimer 
-DeleteFile_2 = ** Échec de la suppression du fichier 
-
-DeleteInCorporaView_1 = ** Erreur lors de la suppression du sous-corpus {0}
-
-DeleteLines_0 = Le tableau doit comporter au moins une ligne
-
-DeleteObject_0  = Voulez-vous vraiment supprimer {0} ?
-DeleteObject_10 = {0} supprimé.
-DeleteObject_3  = ** Erreur lors de la suppression.
-DeleteObject_4  = Erreur lors de la suppression de {0} : {1}
-DeleteObject_5  = Suppression de {0}
-
-ElementTreeLabelProvider_0 = ** Erreur : élément non enregistré 
-ElementTreeLabelProvider_1 = ** Erreur: l'objet n'est pas un 'org.w3c.Element'
-
-EmpantWidget_0 = Contexte : 
-EmpantWidget_1 = forme
-EmpantWidget_2 = structure
-EmpantWidget_3 = de -
-EmpantWidget_4 = à -
-EmpantWidget_5 = et de
-EmpantWidget_6 = à
-EmpantWidget_7 = inclure la structure contenant le pivot
-EmpantWidget_8 = Contexte gauche actif
-EmpantWidget_9 = Contexte droit actif
-
-Error_creating_partition = ** Erreur lors de la création de la partition : {0}
-
-ExecuteGroovyScriptFromFile_2 = Le script Groovy {1} doit être dans le dossier {0}
-
-ExecuteGroovyScript_1         = Erreur lors de l'initialisation des paramètres
-ExecuteGroovyScript_2         = L'utilisateur a intérompu l'exécution du script
-
-ExecuteScriptImport_0 = Début de l'importation
-ExecuteScriptImport_1 = ** Le fichier de script {0} n''existe pas
-ExecuteScriptImport_2 = ** Erreur: le dossier 'corpora' n'existe pas : 
-
-ExecuteScript_0       = Exécution de {0} ...
-ExecuteScript_1       = Sauver le fichier avant d'exécuter ?
-ExecuteScript_11      = Exécution Groovy...
-ExecuteScript_12      = Terminé en {0} ms.
-ExecuteScript_2       = Sauver et lancer
-ExecuteScript_3       = ** Aucun interpréteur trouvé pour l'extension du fichier de script 
-ExecuteScript_4       = Annuler
-ExecuteScript_5       = Ne pas sauver et lancer
-ExecuteScript_6       = Toujours sauvegarder avant de lancer
-ExecuteScript_7       = Exécution annulée.
-
-Exit_Menu_Label = Quitter
-
-Explorer_0 = Le dossier {0} ne devrait pas être supprimé
-Explorer_1 = Aller au dossier parent
-Explorer_2 = Aller au dossier de travail de TXM
-Explorer_3 = TXM
-Explorer_4 = ⇧
-Explorer_5 = ↻
-Explorer_6 = Rafraîchir
-Explorer_7 = ⌂
-Explorer_8 = Aller au dossier de travail de TXM
-
-ExportAnnotation_0 = Exportation des annotations
-
-ExportCorpus_0 = ** Échec de l''exportation du corpus {0}
-ExportCorpus_3 = Exportation de {0}. Cela peut prendre du temps en fonction de la taille du corpus.
-ExportCorpus_4 = Terminé, le fichier binaire créé est {0}
-
-ExportPreferencePage_1  = Configuration de l'export
-ExportPreferencePage_18 = Colonnes séparées par
-ExportPreferencePage_19 = Séparateur de texte
-ExportPreferencePage_3  = Encodage des fichiers d'export
-ExportPreferencePage_4  = Afficher le résultat de l'export dans un éditeur de texte
-
-ExportResult_0 = Exportation des résultats
-ExportResult_1 = Exportation...
-ExportResult_2 = Graphique enregistré au format {1} dans le fichier {0}
-ExportResult_3 = ** Export : impossible de créer le fichier {0} : {1}
-ExportResult_4 = ** Échec de l''export dans le fichier {0} de format {1}
-ExportResult_5 = ** Impossible de lire {0}
-ExportResult_6 = ** Échec de l''exportation du résultat {0} : {1}
-
-ExportSVG_1 = Graphique enregistré au format {1} dans le fichier {0} 
-ExportSVG_3 = Échec de l''export dans le fichier {0} au format {1}
-
-FAILED_TO_SAVE_PREFERENCES = ** Échec de la sauvegarde des préférences
-
-FileExplorerPreferencePage_0 = Exp. Rég. des fichiers cachés
-FileExplorerPreferencePage_1 = Afficher les fichiers cachés
-
-FileTreeContentProvider_1 = ** Explorateur de fichiers : expression régulière incorrecte
-FileTreeContentProvider_2 = \ ERREUR 
-FileTreeContentProvider_3 = Element d'erreur : '
-FileTreeContentProvider_4 = '
-
-FrequencyListEditorInput_0 = Lexique
-FrequencyListEditorInput_3 = Forme
-FrequencyListEditorInput_5 = Chaîne de caractères
-FrequencyListEditorInput_6 = Entier
-
-GenericMultiPageEditor_1 = ** Erreur interne : Impossible d''afficher la donnée {0}.
-GenericMultiPageEditor_3 = ** Erreur interne : le nombre d''éditeurs RCP ({0}) doit correspondre au nombre d''inputs ({1}).
-
-GraphicalLogger_0 = ** Erreur {0}
-
-GroovyConsole_4 = \nErreur Interne.
-GroovyConsole_5 = L'erreur est :  
-
-ImportDialog_0  = Paramètres d''import - {0}
-ImportDialog_1  = Dossier source
-ImportDialog_13 = Ce dossier semble contenir un corpus au format binaire
-ImportDialog_14 = Encodage par défaut de cet ordinateur
-ImportDialog_16 = Deviner
-ImportDialog_19 = Langue par défaut de cet ordinateur
-ImportDialog_22 = Sélectionner
-ImportDialog_23 = Options
-ImportDialog_4  = Encodage des caractères 
-ImportDialog_5  = Langue principale 
-ImportDialog_6  = Paramètres du segmenteur lexical : 
-
-ImportFormEditor_0 = ** le script d''import est manquant {0} 
-ImportFormEditor_1 = Import {0}
-
-ImportPreferencePage_0 = Encodage des caractères
-
-ImportSelectedText_0  = Importe le texte du presse-papier
-ImportSelectedText_1  = pressepapier
-ImportSelectedText_10 = Langue identifiée 
-ImportSelectedText_12 = La langue suivante sera utilisée 
-ImportSelectedText_2  = ** Le presse-papier est vide
-ImportSelectedText_3  = Confirmer
-ImportSelectedText_4  = Le corpus {0} va être supprimé
-
-IndexToLexicalTable_0 = Impossible de créer une table lexicale à partir d'un Index créé sur un Corpus
-
-InternalCorpusView_0 = ** Erreur lors du calcul des informations du corpus
-InternalCorpusView_1 = Recharger
-InternalCorpusView_2 = ** Erreur interne : getText {0}
-
-Invalid_analysis_property = Propriété invalide
-
-JobHandler_0 = Annulation...
-JobHandler_1 = Annulation
-JobHandler_2 = \ : annulation demandée
-JobHandler_3 = Impossible d'annuler  
-
-JobsTimer_12 = h, 
-JobsTimer_13 = \ min and 
-JobsTimer_15 = Effectué en {0} ({1}).
-JobsTimer_19 = Effectué en {0}.
-JobsTimer_2  = \ msec
-JobsTimer_20 = Job : 
-JobsTimer_21 = Exec : 
-JobsTimer_5  = \ sec
-JobsTimer_9  = \ min et 
-
-LanguageSwitchHandler_0 = La langue de l'interface (LOCALE) n'a pas été fixée
-LanguageSwitchHandler_1 = Le fichier {0} n''existe pas
-LanguageSwitchHandler_3 = Choisir la langue
-LanguageSwitchHandler_5 = ** Changement de langue : URL {0} mal formée
-LanguageSwitchHandler_7 = TXM.ini : 
-
-LastCQPError = Dernière erreur CQP : 
-
-LineLabelProvider_1 = Ne devrait pas se produire
-
-LocalePreferencePage_1 = Configuration de la langue de l'interface utilisateur
-LocalePreferencePage_2 = Langue de l'interface 
-
-MacrosExplorer_0 = Nouvelle macro
-MacrosExplorer_1 = Créer une template de 
-
-MainPage_0  = Page principale
-MainPage_18 = Feuille XSL d'entrée
-MainPage_19 = Segmentation lexicale
-MainPage_2  = Paramètres d''import du module {0}
-MainPage_20 = Langue principale
-MainPage_23 = Encodage des caractères
-MainPage_3  = Dossier des sources : 
-
-MergeCols_1 = Nouveau nom
-MergeCols_2 = Nom de la nouvelle colonne issue de la fusion
-MergeCols_5 = Noms : 
-MergeCols_6 = Fin de la fusion des colonnes.
-
-MergeDeleteDialog_0 = fusionner
-MergeDeleteDialog_1 = Fusionner/Supprimer
-MergeDeleteDialog_4 = nom du résultat de la fusion
-
-MergeLines_2 = Saisissez le nom de la nouvelle ligne issue de la fusion
-
-MetadataPage_1 = Aperçu des métadonnées
-MetadataPage_2 = Paramètres des métadonnées
-MetadataPage_4 = Titre des colonnes du fichier de métadonnées 
-MetadataPage_5 = Identifiant de texte
-MetadataPage_7 = Pas de fichier de métadonnées {0}
-
-MultipleValueTreeDialog_0 = ajout : 
-
-NavigationWidget_0 = Erreur lors de la récupération des données à l'indice : 
-
-NumberOfLines = Nombre de lignes :
-
-ObjectSelectionDialog_0 = Sélecteur de valeurs
-ObjectSelectionDialog_3 = Trouvé {0} valeur(s)
-
-ObjectSelector_0 = Objet : 
-ObjectSelector_1 = Sélection
-
-OpenBiblio_1 = ** Aucun texte {0} dans le corpus
-OpenBiblio_2 = Sélectionner un texte
-OpenBiblio_7 = ** Impossible de trouver le texte {0} dans le corpus {1}
-OpenBiblio_9 = ** Le texte {0} n''a aucune entrée bibliographique
-
-OpenBrowser_0 = ** Erreur lors de l'ouverture de la fiche bibliographique {0} avec l'URL {1}
-
-OpenEmptyEditor_2 = ** Bibliographie : dossier {0} introuvable
-
-OpenGraph_8 = ** Impossible d''ouvrir le graphique {0}
-
-OpenSVGGraph_0 = Graphique SVG 
-
-OpenURI_0 = ** OpenURL : Bureau non supporté
-OpenURI_1 = ** Erreur lors de l''ouverture du fichier {0}
-
-ParametersDialog_0  = Saisie des paramètres de {0}
-ParametersDialog_1  = Exécution
-ParametersDialog_10 = Erreur : widget sans nom : '
-ParametersDialog_11 = (* champ obligatoire)
-ParametersDialog_12 = ** Erreur : valeur non fournie : 
-ParametersDialog_14 = ** Erreur : déclaration du nom de l'@Option : 
-
-PartitionComposer_0  = Structure 
-PartitionComposer_11 = Supprimer
-PartitionComposer_2  = Sélectionner les valeurs à affecter : 
-PartitionComposer_3  = Nouvelle partie
-PartitionComposer_5  = Partie
-PartitionComposer_6  = Supp. toutes les parties
-PartitionComposer_8  = Titre 
-PartitionComposer_9  = Affecter
-
-PasteFile_1 = ** Erreur lors de la copie  
-PasteFile_3 = ** Échec de la suppression
-PasteFile_4 = : 
-
-Preferences_Menu_Label = Préférences
-
-PropertiesSelector_0 = Impossible de charger les propriétés du corpus {0} ({1})
-PropertiesSelector_1 = Propriétés : 
-PropertiesSelector_2 = Editer
-
-PropertySelector_0 = Sélectionner une propriété
-
-QueriesView_1  = Tout exporter
-QueriesView_10 = Erreur : 
-QueriesView_5  = Requêtes :\n
-
-QueryAssistDialog_0  = Assistant de Requête
-QueryAssistDialog_1  = Mot supplémentaire
-QueryAssistDialog_10 = correspond à
-QueryAssistDialog_11 = commence par
-QueryAssistDialog_12 = se termine par
-QueryAssistDialog_13 = contient
-QueryAssistDialog_2  = Je recherche : 
-QueryAssistDialog_32 = suivi de 
-QueryAssistDialog_33 = séparé d'au moins 0 mot
-QueryAssistDialog_34 = séparé d'au moins 1 mot
-QueryAssistDialog_8  = un mot dont
-
-RefreshingCorporaView = Mise à jour de la vue des corpus...
-
-RenameFile_0 = Renommer le fichier
-RenameFile_2 = Renommage par : 
-RenameFile_3 = ** Échec du renommage 
-
-RestartTXM_1 = Redémarrer TXM
-
-RunGroovyScript_0 = Exécution du script
-RunGroovyScript_1 = &Exécuter un script
-RunGroovyScript_2 = Exécuter un script
-RunGroovyScript_3 = *.groovy
-RunGroovyScript_4 = Erreur lors de l''ouverture du script groovy : {0}
-RunGroovyScript_8 = ** Erreur lors de l''exécution du script groovy : {0}
-RunGroovyScript_9 = Exécution du script
-
-SORT_COLUMN = Tri de la colonne...
-SORT_DONE   = Tri terminé.
-
-SVGGraphicEditor_1 = Impossible d'afficher un graphique avec les informations fournies.
-
-SaveAs_2 = ** Échec de la sauvegarde 
-
-ScriptPreferencePage_0 = Prochain numéro de session 
-
-SetContextSize_1 = Options d'affichage des &contextes
-SetContextSize_2 = Options d'affichage des contextes
-SetContextSize_3 = Taille du contexte gauche
-SetContextSize_4 = Taille du contexte droit
-
-SetEncoding_0 = Changer l'encodage des caractères
-SetEncoding_1 = Changer l'encodage des caractères.\n\n\	Encodage actuel 
-SetEncoding_2 = \n\	Encodage par défaut 
-
-SetLineNumber_0 = Options de pagination
-SetLineNumber_1 = Lignes par page 
-
-SetSortProperty_1 = Options de tri
-SetSortProperty_2 = Options de tri
-SetSortProperty_3 = Options de tri
-
-ShowSvgHelp_0 = Raccourcis clavier graphiques
-ShowSvgHelp_1 = \	Translation :  Clic droit + Glisser\n
-ShowSvgHelp_2 = \	Zoom +/- : Roulette OU Shift + Clic Droit + Glisser\n
-ShowSvgHelp_3 = \	Zoomer sur la sélection : Ctrl + Clic Gauche + Glisser\n
-ShowSvgHelp_4 = \	\n
-ShowSvgHelp_5 = \	État initial : F5
-
-SingularValuesEditor_0 = Entrée erronée
-
-SortPropertySelection_0 = Options de tri
-
-Structure_field_not_empty = Le champ structure ne doit pas être vide.
-
-Submit_0 = Enregistrer
-
-TXMEditor_0 = Calcul
-TXMEditor_1 = Calcul
-TXMEditor_2 = Calcul
-TXMEditor_3 = Paramètres
-TXMEditor_7 = Afficher/Masquer les paramètres de commande
-
-TablableVector_0 = Les deux tables doivent être de même taille.
-
-TableEditor_0 = Impossible d'afficher un tableau avec les informations fourniesn: {0}
-
-TableKeyListener_6 = Lignes copiées : \n
-
-TableSorter_0 = Le numéro de colonne est trop grand.
-
-TextometriePreferencePage_0 = Vérifier les mises à jour au démarrage
-TextometriePreferencePage_1 = Sauvegarde générale des préférences
-TextometriePreferencePage_2 = Mises à jour automatiques
-
-TextualPlansSection_milestone_label           = Elements milestones
-TextualPlansSection_milestone_tooltip         = Liste des éléments milestones à encoder dans les mots (séparés par une virgule ",")
-TextualPlansSection_outsidetext_label         = Hors texte
-TextualPlansSection_outsidetext_tooltip       = Liste des balises codant le hors-texte
-TextualPlansSection_outsidetexttoedit_label   = Hors texte à éditer
-TextualPlansSection_outsidetexttoedit_tooltip = Liste des balises codant le hors-texte à afficher dans l'édition)
-TextualPlansSection_title                     = Plans textuels
-
-TxmBrowser_10 = Impossible de lancer le navigateur interne. Vous devez régler ce paramètre dans les préférences, au menu : Général / Navigateur web
-TxmBrowser_11 = Pas de texte précédent
-TxmBrowser_12 = Pas de texte suivant
-TxmBrowser_5  = Page précédente
-TxmBrowser_6  = Page suivante
-TxmBrowser_8  = Prochain texte
-TxmBrowser_9  = Texte précedent
-
-TxtEditor_0 = Editeur de Texte: 
-TxtEditor_1 = Encodage trouvé 
-
-UIParameterException_0 = Erreur  
-
-UserPreferencePage_1 = Recalcul automatique lors du changement d'un paramètre
-UserPreferencePage_3 = Pas de confirmation pour supprimer un objet
-
-common_areYouSure                         = Sûr(e) ?
-common_beginning                          = Début
-common_displayOptions                     = Options d'affichage
-common_end                                = Fin
-common_enterRegularExpressionOfYourSearch = Saisissez l'expression régulière de votre recherche
-common_refresh                            = Rafraichir
-
-error_invalidRegularExpression = Expression régulière invalide : {0}
-
-info_txmIsReady = TXM est prêt.
-
-preferences_advanced_enableResultsPersistence        = Activer la sauvegarde automatique de tous les résultats (persistance)
-preferences_advanced_showAllResultNodesInCorporaView = Afficher les noeuds de tous les résultats dans la vue corpus
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+_1=1.\t
+_2=2.\t
+_3=3.\t
+_default=par défaut
+_default_2=Défaut
+aBinaryCorpusIsATXMFileExtensionTxmOrZip=Un corpus TXM au format binaire est soit un fichier d'extension .txm ou .zip, soit un dossier composé des sous-dossiers 'html', 'data', 'registry', 'txm'
+abort=Annuler
+aboutTXM=À propos de TXM...
+addAWord=Mot supplémentaire
+addAXsltParameter=Ajouter un paramètre
+addDDot=ajout \: 
+addingToSelection=Ajouter à la sélection
+advanced=Avancé
+advancedUserMode=Mode avancé
+allCriteria=Tous les critères
+alwaysSaveBeforeLaunching=Toujours sauvegarder avant de lancer
+ampContextsDisplayOptions=Options d'affichage des &contextes
+ampMultipleSort=&Tri composé
+ampNameDDot=&Nom 
+ampNew=&Nouveau
+ampPropertyDDot=&Propriété 
+ampQuery=&Requête 
+ampRunScript=&Exécuter un script
+ampSortOptions=Options de tri
+ampStructureDDot=&Structure 
+ampValue=&Valeur 
+andFrom=et de
+annotateTheCorpus=Annoter le corpus
+areYouSureYouWantToDeleteToSort=Etes vous sûr de vouloir supprimer 
+assign=Affecter
+assisted=Assisté
+automaticRecomputingWhenChangingAParameter=Recalcul automatique lors du changement d'un paramètre
+automaticUpdates=Mises à jour automatiques
+aWordWithItsProperty=un mot dont
+buildEdition=Construire l'édition
+canceling=Annulation...
+canceling_2=Annulation
+cancelingRequested=\ \: annulation demandée
+cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab=Impossible d'afficher l'onglet des options simples quand l'utilisateur a sélectionné l'affichage des options avancées
+cannotComputeCooccurrencesWithTheSelection=** Impossible de calculer les cooccurrents de la sélection
+cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded=Impossible de créer une table lexicale à partir d'un Index créé sur un Corpus
+canNotCreateATableWithTheProvidedInformationDDotP0=Impossible d'afficher un tableau avec les informations fourniesn\: {0}
+cannotCreateTheGraphic=** Impossible de créer le graphique
+cannotDrawAGraphicWithTheInformationProvided=Impossible d'afficher un graphique avec les informations fournies.
+cannotReadTheFileP0=** Impossible de lire le fichier {0}
+cannotSaveImportConfigurationNoSourceFolderSelected=Impossible de sauvegarder l'import \: pas de dossier source sélectionné.
+cannotStartImportConfigurationNoSourceFolderSelected=Impossible de commencer l'import \: pas de dossier source sélectionné.
+cantLoadPropertiesFromCorpusP0DDotP1=Impossible de charger les propriétés du corpus {0} ({1})
+cantOpenGraphicP0=** Impossible d''ouvrir le graphique {0}
+changeCharactersEncoding=Changer l'encodage des caractères
+changeCharactersEncodingCurrentEncodingDDot=Changer l'encodage des caractères.\n\n\tEncodage actuel 
+characterEncoding=Encodage des caractères
+checkForUpdatesAtStartup=Vérifier les mises à jour au démarrage
+checkingForExistingWorkspaceDirectory=Vérification de la présence du dossier de travail
+chooseOutfile=Sélection du fichier de sortie
+chooseTheLanguage=Choisir la langue
+clipboard_2=pressepapier
+clipboardIsEmpty=** Le presse-papier est vide
+columnIndexIsTooBig=Le numéro de colonne est trop grand.
+columnsSeparatedBy=Colonnes séparées par
+commands=Commandes
+common_areYouSure=Sûr(e) ?
+common_beginning=Début
+common_displayOptions=Options d'affichage
+common_end=Fin
+common_enterRegularExpressionOfYourSearch=Saisissez l'expression régulière de votre recherche
+common_refresh=Rafraichir
+complexSortDDot=Tri multiple 
+computeSubCorpusOnP0QueryDDotP1=Calcul d''un sous-corpus de {0} avec la requête <{1}>
+computeSubCorpusOnP0StructsDDotP1AmpPropsP2DDotP3=Calcul d''un sous-corpus de {0}, structure {1}, propriété {2} \: {3}
+computing=Calcul
+computing_3=Calcul
+concordanceContextStructureLimits=Structures de limite des contextes de concordance
+configurationOfTheUserInterfaceLanguage=Configuration de la langue de l'interface utilisateur
+confirm=Confirmer
+consoleReportsAnInternalError=\nErreur Interne.
+contains=contient
+contextDDot=Contexte \: 
+contextsDisplayOptions=Options d'affichage des contextes
+coocMatrixDDot=Matrice mot-mot \: 
+coocMatrixParameters=Paramètres de la matrice mot-mot
+copiedLinesDDot=Lignes copiées \: \n
+corporaBackupedDDotP0=Corpus sauvegardés dans \: {0}.
+corpus=Corpus
+corpusConversionFailed=La conversion du corpus a échoué.
+corpusInfos=Dossier des sources \: 
+corpusNameIsMandatory=Le nom du corpus est obligatoire
+corpusNameOnlyCapsAndNoDigitAtBeginning=Nom du corpus* (majuscules et pas de chiffre en début)
+couldNotCreateBackupDirectoryDDot=** Échec \: le dossier de sauvegarde des corpus n'a pas pu être créé
+couldNotFindDirectoryDDotP0=** Bibliographie \: dossier {0} introuvable
+couldNotFindTextP0InCorpusP1=** Impossible de trouver le texte {0} dans le corpus {1}
+couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator=Impossible de lancer le navigateur interne. Vous devez régler ce paramètre dans les préférences, au menu \: Général / Navigateur web
+couldNotReadInstallPreferencesFile=** Échec de lecture du fichier des préférences d'installation
+couldNotUnzipBinaryCorpusDDot=** Échec de l''extraction du corpus binaire \: {0}
+createANewMacroFromATemplate=Créer une template de 
+createANewSorter=Créer une nouvelle méthode de tri
+createPartition=Créer une Partition
+createSubcorpus=Créer un sous-corpus
+creatingANewPartitionWithP0=Création d''une partition sur {0}
+creatingASubcorpusInTheSearchEngine=Nouveau &Sous-corpus
+creatingASubcorpusOnP0=Créer un nouveau sous-corpus de {0}
+creatingTXMUserWorkingDirectory=Création de l'espace de travail utilisateur de TXM.
+dDot=\: 
+dDotMandatoryField=* \: champ obligatoire
+defaultEncodingDDot=\n\tEncodage par défaut 
+defineAndUseACompositeSorter=Définir et utiliser un tri composé
+deletedDDotP0={0} supprimé.
+deleteParameter=Supprimer un paramètre
+deletingP0=Suppression de {0}
+deletingP0Continue=Voulez-vous vraiment supprimer {0} ?
+descriptionHTMLCompleteNameAuthorDateLicenseComment=Description - HTML (nom complet, auteur, date, license, commentaire...)
+desktopIsNotSupportedFatal=** OpenURL \: Bureau non supporté
+displayFont=Police d'affichage
+displayInFullText=Afficher en plein texte...
+displayRuntimesInConsole=Afficher les temps d'exécution dans la console
+distance=Distance en mot
+distance_2=Distance en mot \: 
+doesNotContain=ne contient pas
+doneDDotP0Created=Terminé \: {0} a été créé  
+doneDDotP0Items=Terminé \: {0} items pour {1} occurrences.
+doneDDotP0Parts=Terminé \: {0} parties
+doneInP0=Effectué en {0}.
+doneInP0P1=Effectué en {0} ({1}).
+doneP0Ms=Terminé en {0} ms.
+doneTheCreatedBinaryFileIsP0=Terminé, le fichier binaire créé est {0}
+doNotConfirmToDeleteAnObject=Pas de confirmation pour supprimer un objet
+dontSaveAndRun=Ne pas sauver et lancer
+edit=Editer
+editions=Éditions
+editTheNameOfTheNewColumnCreatedByTheMergedColumns=Nom de la nouvelle colonne issue de la fusion
+editTheNameOfTheNewLineCreatedByTheMergedLines=Saisissez le nom de la nouvelle ligne issue de la fusion
+editXSLStylesheet=Editer la feuille XSL...
+elisionCharacters=Caractères d'élision
+EMPTY=\t\n
+enableAutomaticSaveOfAllResultsPersistence=Activer la sauvegarde automatique de tous les résultats (persistance)
+encodingFound=Encodage trouvé 
+endOfColumnMerge=Fin de la fusion des colonnes.
+endOfSentenceCharacters=Caractères de fin de phrase
+endsWith=se termine par
+equalsTo=correspond à
+error=Erreur  
+eRROR=\ ERREUR 
+error_invalidRegularExpression=Expression régulière invalide \: {0}
+errorDDotCorporaDirectoryDoesntExistDDot=** Erreur\: le dossier 'corpora' n'existe pas \: 
+errorDDotDeleteReturnedFalse=** Erreur lors de la suppression.
+errorDDotElementNotRegistered=** Erreur \: élément non enregistré 
+errorDDotGetTextDDotP0=** Erreur interne \: getText {0}
+errorDDotMissingValueDDot=** Erreur \: valeur non fournie \: 
+errorDDotObjectIsNotAnOrgw3cElement=** Erreur\: l'objet n'est pas un 'org.w3c.Element'
+errorDDotP0=** Erreur {0}
+errorDDotSubcorpusWasNotCreated=** Erreur \: le sous-corpus n'a pas été créé
+errorDDotThePartitionWasNotCreated=** Erreur \: la partition n'a pas été créé
+errorDuringParametersInitialisation=Erreur lors de l'initialisation des paramètres
+errorDuringSortDDotP0=** Erreur pendant le tri \: {0}
+errorElementDDot=Element d'erreur \: '
+errorInAtOptionNameDeclarationDDot=** Erreur \: déclaration du nom de l'@Option \: 
+errorWhileComputingCorpusSummary=** Erreur lors du calcul des informations du corpus
+errorWhileComputingTheConcordanceDDot=** Une erreur est survenue lors du calcul de la concordance
+errorWhileCreatingAPartitionDDotP0=** Erreur lors de la création de la partition \: {0}
+errorWhileDeletingP0DDotP1=Erreur lors de la suppression de {0} \: {1}
+errorWhileGettingCurrentPositionValueDDot=Erreur lors de la récupération des données à l'indice \: 
+errorWhileOpeningBibliographicRecordP0WithURLEqualsP1=** Erreur lors de l'ouverture de la fiche bibliographique {0} avec l'URL {1}
+errorWhileOpeningFileP0=** Erreur lors de l''ouverture du fichier {0}
+errorWhileOpeningGroovyScriptDDotP0=Erreur lors de l''ouverture du script groovy \: {0}
+errorWhileRunningScriptDDotP0=** Erreur lors de l''exécution du script groovy \: {0}
+errorWithElementP0=Erreur \: 
+execDDot=Exec \: 
+executeScript=Exécution du script
+executingGroovyScript=Exécution Groovy...
+executionCanceled=Exécution annulée.
+executionOfP0=Exécution de {0} ...
+exit=Quitter
+Explorer_4=⇧
+Explorer_5=↻
+Explorer_7=⌂
+exportAll=Tout exporter
+exportDDotCantCreateFileP0DDotP1=** Export \: impossible de créer le fichier {0} \: {1}
+exportFileEncoding=Encodage des fichiers d'export
+exporting=Exportation...
+exportingAnnotations=Exportation des annotations
+exportingP0ThisMayTakeAWhile=Exportation de {0}. Cela peut prendre du temps en fonction de la taille du corpus.
+exportingResults=Exportation des résultats
+exportSettings=Configuration de l'export
+extractingBinaryCorpus=Extraction du corpus binaire
+failedToBackupExistingCorporaDDot=** Impossible de sauvegarder les corpus existants \: 
+failedToCancel=Impossible d'annuler  
+failedToCopy=** Erreur lors de la copie  
+failedToDelete=** Échec de la suppression
+failedToDeleteFile=** Échec de la suppression du fichier 
+failedToDeleteSubcorpusP0=** Erreur lors de la suppression du sous-corpus {0}
+failedToExportCorpusP0=** Échec de l''exportation du corpus {0}
+failedToExportFileP0WithDeviceP1=Échec de l''export dans le fichier {0} au format {1}
+failedToExportInFileP0WithFormatP1=** Échec de l''export dans le fichier {0} de format {1}
+failedToExportResultP0DDotP1=** Échec de l''exportation du résultat {0} \: {1}
+failedToGetLastCQPErrorDDot=Erreur lors de la récupération de la dernière erreur CQP \: 
+failedToLoadBinaryCorpusNullError=** Échec de chargement du corpus binaire(null error).
+failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents=** Échec du chargement du corpus à partir du dossier \: {0}.\nImpossible de trouver les composants nécessaires.
+failedToLoadCorpusP0=** Échec du chargement du corpus {0}
+failedToMoveCorpus=** Impossible de déplacer le corpus 
+failedToRename=** Échec du renommage 
+failedToSaveAs=** Échec de la sauvegarde 
+failedToSavePreferencesDDot=** Échec de la sauvegarde des préférences
+fileExplorerDDotIncorrectPattern=** Explorateur de fichiers \: expression régulière incorrecte
+FileTreeContentProvider_4='
+folderP0ShouldNotBeDeleted=Le dossier {0} ne devrait pas être supprimé
+followedBy=suivi de 
+form=Forme
+foundP0Values=Trouvé {0} valeur(s)
+from=de -
+frontXSL=Feuille XSL d'entrée
+generalInformations=Informations générales
+generalPreferencesBackup=Sauvegarde générale des préférences
+goToParentFolder=Aller au dossier parent
+goToTXMHome=Aller au dossier de travail de TXM
+goToTXMHome_2=Aller au dossier de travail de TXM
+graphicsKeyboardShortcuts=Raccourcis clavier graphiques
+groovy=*.groovy
+guessDDot=Deviner
+h=h, 
+iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage=J'accepte la licence et je m'engage à citer TXM dans mes travaux de recherche \n(voir la section 'Citation de TXM' de la page <http\://textometrie.ens-lyon.fr/spip.php?rubrique61>)
+identifiedLanguage=Langue identifiée 
+imLookingForDDot=Je recherche \: 
+importClipboardText=Importe le texte du presse-papier
+importParametersOfP0=Paramètres d''import du module {0}
+importSetupP0=Paramètres d''import - {0}
+importStarted=Début de l'importation
+impossibleToReadP0=** Impossible de lire {0}
+includeTheKeywordStructureInTheCount=inclure la structure contenant le pivot
+info_txmIsReady=TXM est prêt.
+infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt=<p>TXM est diffusé sous licence GNU GPL 2 &lt;<a href\="https\://www.gnu.org/licenses/gpl-2.0.fr.html">https\://www.gnu.org/licenses/gpl-2.0.fr.html</a>
+initializationOfThePlatform=Initialisation de la plateforme...
+initializingPlatform=Initialisation de la plateforme...
+installPathDDotP0=Chemin d''installation \: {0}
+integer=Entier
+interfaceLanguageLOCALEWasNotSet=La langue de l'interface (LOCALE) n'a pas été fixée
+invalidComparator=Comparateur invalide
+invalidName=Nom incorrect
+invalidProperty=Propriété invalide
+invalidQuery=Requête invalide
+jobDDot=Job \: 
+lastCQPErrorDDot=Dernière erreur CQP \: 
+leftContextSize=Taille du contexte gauche
+lexicalSegmentation=Segmentation lexicale
+lexicon=Lexique
+linePerPageDDot=Lignes par page 
+listOfMilestoneElementsSeparatedByComma=Liste des éléments milestones à encoder dans les mots (séparés par une virgule ",")
+listOfTagsEncodingTheOutsidetextNoStructureOrWordContentIndexedNoStructureOrWordContentEditedInTXM=Liste des balises codant le hors-texte
+listOfTagsEncodingTheOutsidetextToEditNoStructureOrWordContentIndexedStructureAndWordContentEditedInTXM=Liste des balises codant le hors-texte à afficher dans l'édition)
+loadingBinaryCorpus=Chargement du corpus
+loadingTheCorpusInThePlatform=Chargement du corpus dans la plateforme
+loadingTXMInstallPreferences=Chargement des préférences d''installation de TXM à partir de \: {0}
+logInAFile=Copier le journal dans un fichier
+logInTheConsole=Ajouter des commentaires techniques
+logLevel=Niveau de détails du journal
+logs=Journal et messages
+macroName=Nom de la macro
+mainLanguage=Langue principale
+mainLanguageDDot=Langue principale 
+mainPage=Page principale
+mandatoryFields=(* champ obligatoire)
+match=Sélectionner
+merge=fusionner
+mergeDelete=Fusionner/Supprimer
+mergeResultName=nom du résultat de la fusion
+metadataColumnTitles=Titre des colonnes du fichier de métadonnées 
+metadataPreview=Aperçu des métadonnées
+metadatasParameters=Paramètres des métadonnées
+milestoneElements=Elements milestones
+minAnd=\ min and 
+minimalCoFrequence=Co-fréquence minimum
+moduleUIParametersDDot=Paramètres du module \: 
+movingCorporaToP0=Sauvegarde des corpus existants dans ''{0}''.
+movingDownTheSelection=Descendre d'un cran la sélection
+movingUpTheSelection=Monter d'un cran la sélection
+msec=\ msec
+name=Nom 
+nameIsMandatory=Le champ Nom est obligatoire.
+namesDDot=Noms \: 
+newCorpusDDotP0=Nouveau corpus \: {0}.
+newFileDDotP0=Nouveau fichier \: {0}
+newFolderDDotP0=Nouveau dossier \: {0}
+newMacro=Nouvelle macro
+newName=Nouveau nom
+newPart=Nouvelle partie
+nextPage=Page suivante
+nextSessionNumber=Prochain numéro de session 
+nextText=Prochain texte
+noInterpreterFoundForScriptFileExtension=** Aucun interpréteur trouvé pour l'extension du fichier de script 
+noMetadataFileP0=Pas de fichier de métadonnées {0}
+noPartitionNameWasSpecifiedTheNameIsP0=Le nom de la partition n''a pas été précisé. Le nom est {0}
+noPartWasDefined=Aucune partie définie
+noPreviousText=Pas de texte précédent
+noSubcorpusNameWasSpecifiedWeveGeneratedOne=Un nom de sous-corpus a été généré.
+noTextInCorpusDDotP0=** Aucun texte {0} dans le corpus
+noTextNext=Pas de texte suivant
+numberOfEdgesDDot=Nombre d'arcs \: 
+numberOfLinesDDot=Nombre de lignes \:
+numberOfNodesDDot=Nombre de noeuds \: 
+objDDot=Objet \: 
+openingComplexSortDialog=Ouverture de la boite de dialogue du tri composé
+openingCooccurrentsTable=Chargement du tableau de cooccurrents
+openTheQueryAssistant=Ouvrir l'assistant de requêtes
+options=Options
+outfileDDotNone=Fichier de sortie \: aucun
+outsidetext=Hors texte
+outsidetextToedit=Hors texte à éditer
+p0Import=Import {0}
+p0ParametersInput=Saisie des paramètres de {0}
+p0ScriptFileDoesntExist=** Le fichier de script {0} n''existe pas
+p1ExportSavedInFileDDotP0=Graphique enregistré au format {1} dans le fichier {0}
+p1FileSavedInP0=Graphique enregistré au format {1} dans le fichier {0} 
+pageBreakTag=Elément de pagination
+paginationOptions=Options de pagination
+panDDotRightMousePlusDrag=\tTranslation \:  Clic droit + Glisser\n
+parameters=Paramètres
+part=Partie 
+pleaseWriteTheMacroName=Nom de la macro
+preferences=Préférences
+previousPage=Page précédente
+previousText=Texte précedent
+printTheStacktrace=Afficher la stacktrace
+propertiesDDot=Propriétés \: 
+punctuations=Ponctuations
+queriesCannotBeLeftEmpty=Les requêtes ne doivent pas être vides
+queriesDDot=Requêtes \:\n
+query=Requête 
+queryAssistant=Assistant de Requête
+queryCannotBeLeftEmpty=Le champ Requête ne doit pas être vide.
+ready=Prêt.
+referencesAmpdisplayOptions=Options d'&affichage des références
+referencesAmpsortOptions=Options de &tri des références
+referencesDisplayOptions=Options d'affichage des références
+referencesSortOptions=Options de tri des références
+refreshingCorpora=Mise à jour de la vue des corpus...
+regexpPatternToHideFiles=Exp. Rég. des fichiers cachés
+reload=Recharger
+remove=Supprimer
+removeFromSelection=Retirer de la sélection
+removingOldCorpusBackupDirectoryP0=Nettoyage de l''ancien dossier de sauvegarde des corpus ''{0}''. 
+renameFile=Renommer le fichier
+renamingByDDot=Renommage par \: 
+resetTheViewDDotF5=\tÉtat initial \: F5
+restartingThePlatform=Redémarrage de la plateforme
+restartTXM=Redémarrer TXM
+rightContextSize=Taille du contexte droit
+rmvAllTheParts=Supp. toutes les parties
+run=Exécution
+runScript=Exécuter un script
+saveAndRun=Sauver et lancer
+saveFileBeforeExecution=Sauver le fichier avant d'exécuter ?
+saveScript=Enregistrer
+savingImportParameters=Sauvegarde des paramètres d'importation...
+scriptExecution=Exécution du script
+sec=\ sec
+select=Sélection
+selectACompositeSorter=Sélectionnez un tri composé
+selectAProperty=Sélectionner une propriété
+selectDDot=Sélectionner
+selectTextId=Sélectionner un texte
+selectTheSourceDirectory=Sélectionner le répertoire des sources.
+selectValuesToAssignDDot=Sélectionner les valeurs à affecter \: 
+separatedByAtLeast0Word=séparé d'au moins 0 mot
+separatedByAtLeast1Word=séparé d'au moins 1 mot
+separatorCharacters=Caractères séparateurs
+setImportParametersInTheSectionsBelow=Régler les paramètres d'import dans les sections ci-dessous.
+shouldNotHappen=Ne devrait pas se produire
+showAllResultNodesInCorporaView=Afficher les noeuds de tous les résultats dans la vue corpus
+showExportResultInTheTextEditor=Afficher le résultat de l'export dans un éditeur de texte
+showHiddenFiles=Afficher les fichiers cachés
+showHideCommandParameters=Afficher/Masquer les paramètres de commande
+simple=Simple
+someCriteria=certains critères
+sort=Tri
+sortDone=Tri terminé.
+sortingColumn=Tri de la colonne...
+sortKeys=Clés de tri 
+sortOptions=Options de tri
+sourceCharactersEncoding=Encodage des caractères
+sourceDirectoryDDot=Dossier source
+sourcesCharactersEncodingDDot=Encodage des caractères 
+spaces=Espaces
+startCorpusImport=Lancer l'import du corpus.
+startingUpP0=Démarrage de TXM {0}...
+startsWith=commence par
+startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup=** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences')
+string=Chaîne de caractères
+structure=structure
+structureDDot=Structure 
+structureFieldIsMandatory=Le champ structure ne doit pas être vide.
+sVGGraphic=Graphique SVG 
+switchLanguageDDotMalformedUrlDDotP0=** Changement de langue \: URL {0} mal formée
+systemOutput=Sortie standard
+termsOfService=Licence d'utilisation
+textEditorDDot=Editeur de Texte\: 
+textID=Identifiant de texte
+textP0HasNoBibliographicRecord=** Le texte {0} n''a aucune entrée bibliographique
+textSeparator=Séparateur de texte
+textualPlanes=Plans textuels
+theCorpusAndTheCorpusP0WillBeDeleted=Le corpus {0} va être supprimé
+theErrorIsDDot=L'erreur est \:  
+theFileP0DoesNotExist=Le fichier {0} n''existe pas
+theInputP0CannotBeDisplayed=** Erreur interne \: Impossible d''afficher la donnée {0}.
+theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual=** Erreur interne \: le nombre d''éditeurs RCP ({0}) doit correspondre au nombre d''inputs ({1}).
+theP0CorpusDirectoryAlreadyExistsDoYouWantToReplaceIt=Le répertoire du corpus {0} existe déjà. Voulez-vous le remplacer ?
+theP1GroovyScriptMustBeInTheP0Folder=Le script Groovy {1} doit être dans le dossier {0}
+theTableMustContainAtLeastOneLine=Le tableau doit comporter au moins une ligne
+theTwoArraysMustHaveTheSameSize=Les deux tables doivent être de même taille.
+theUserCanceledTheScriptExecution=L'utilisateur a intérompu l'exécution du script
+thisComputerEncodingDDot=Encodage par défaut de cet ordinateur
+thisComputerLanguageDDot=Langue par défaut de cet ordinateur
+thisDirectorySeemsToContainABinaryCorpus=Ce dossier semble contenir un corpus au format binaire
+thisFileIsNotATXMFileDDotP0=Le fichier {0} n''est pas un fichier TXM.
+thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual=Ce fichier ne permet pas de lancer TXM. Veuillez consulter les instructions de lancement dans le manuel de TXM. 
+titleDDot=Titre 
+to=\ vers 
+to_2=à -
+to_3=à
+tokenizerParameterFileDDot=Paramètres du segmenteur lexical \: 
+tXM=TXM
+tXMiniDDot=TXM.ini \: 
+tXMInstallDirectory=Dossier d'installation de TXM
+tXMUserDirectory=Dossier utilisateur TXM
+tXMWorkspaceDirectoryAlreadyExistsP0WouldYouLikeToReloadItsCorporaInYourNewTXM=Le dossier de travail de TXM existe déjà \: {0}. Voulez vous recharger les corpus sauvegardés ?
+unknowedWidgetNameDDot=Erreur \: widget sans nom \: '
+updateLevel=Niveau de mise à jour
+useLeftWindow=Contexte gauche actif
+useRightWindow=Contexte droit actif
+userInterfaceLanguage=Langue de l'interface 
+usingLanguage=La langue suivante sera utilisée 
+valueSelector=Sélecteur de valeurs
+warning=Attention
+warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly=** Avertissement \: le corpus {0} est corrompu. Certaines commandes ne fonctionneront pas correctement.
+warningDDotTheImportScriptIsMissingDDotP0=** le script d''import est manquant {0} 
+word=forme
+wordsPerPage=Nombre de mots par page
+workspaceDirectoryBackup=Récupération des corpus existants…
+writingCoocMatrixInGRAPHMLFileDDot=Ecriture de la matrice mot-mot dans un fichier GRAPHML \:
+wrongInput=Entrée erronée
+youMustSelectAtLeast2Comparators=Il faut sélectionner au moins deux comparateurs
+zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag=\tZoom +/- \: Roulette OU Shift + Clic Droit + Glisser\n
+zoomToSelectionDDotCtrlPlusLeftMousePlusdrag=\tZoomer sur la sélection \: Ctrl + Clic Gauche + Glisser\n
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 1335)
@@ -21,8 +21,8 @@
 	
 	public static String info_txmIsReady;
 	
-	public static String preferences_advanced_enableResultsPersistence;
-	public static String preferences_advanced_showAllResultNodesInCorporaView;
+	public static String enableAutomaticSaveOfAllResultsPersistence; 
+	public static String showAllResultNodesInCorporaView; 
 
 
 	
@@ -79,488 +79,478 @@
 	
 	
 	
-	public static String About_Menu_Label;
-	public static String AdapterFactory_0;
-	public static String AddBase_17;
-	public static String AddBase_19;
-	public static String AddBase_1;
-	public static String AddBase_20;
-	public static String AddBase_22;
-	public static String AddBase_24;
-	public static String AddBase_25;
-	public static String AddBase_27;
-	public static String AddBase_28;
-	public static String AddBase_2;
-	public static String AddBase_31;
-	public static String AddBase_32;
-	public static String AddBase_33;
-	public static String AddBase_4;
-	public static String AdvancePreferencePage_0;
-	public static String AdvancePreferencePage_12;
-	public static String AdvancePreferencePage_13;
-	public static String AdvancePreferencePage_14;
-	public static String AdvancePreferencePage_1;
-	public static String AdvancePreferencePage_2;
-	public static String AdvancePreferencePage_3;
-	public static String AdvancePreferencePage_4;
-	public static String AdvancePreferencePage_6;
-	public static String AdvancePreferencePage_7;
-	public static String Application_0;
-	public static String Application_10;
-	public static String Application_1;
-	public static String Application_2;
-	public static String Application_4;
-	public static String Application_8;
-	public static String Application_9;
-	public static String ApplicationWorkbenchAdvisor_0;
-	public static String ApplicationWorkbenchAdvisor_16;
-	public static String ApplicationWorkbenchAdvisor_18;
-	public static String ApplicationWorkbenchAdvisor_1;
-	public static String ApplicationWorkbenchAdvisor_21;
-	public static String ApplicationWorkbenchAdvisor_27;
-	public static String ApplicationWorkbenchAdvisor_28;
-	public static String ApplicationWorkbenchAdvisor_2;
-	public static String ApplicationWorkbenchAdvisor_30;
-	public static String ApplicationWorkbenchAdvisor_34;
-	public static String ApplicationWorkbenchAdvisor_37;
-	public static String ApplicationWorkbenchAdvisor_3;
-	public static String ApplicationWorkbenchAdvisor_44;
-	public static String ApplicationWorkbenchAdvisor_47;
-	public static String ApplicationWorkbenchAdvisor_5;
-	public static String ApplicationWorkbenchAdvisor_72;
-	public static String ApplicationWorkbenchAdvisor_73;
-	public static String ApplicationWorkbenchAdvisor_74;
-	public static String ApplicationWorkbenchAdvisor_75;
-	public static String ApplicationWorkbenchAdvisor_77;
-	public static String ApplicationWorkbenchAdvisor_78;
-	public static String ApplicationWorkbenchAdvisor_79;
-	public static String ApplicationWorkbenchAdvisor_7;
-	public static String ApplicationWorkbenchAdvisor_88;
-	public static String ApplicationWorkbenchAdvisor_8;
-	public static String ApplicationWorkbenchAdvisor_9;
-	public static String ApplicationWorkbenchAdvisor_init;
-	public static String ApplicationWorkbenchAdvisor_init_failed;
-	public static String ApplicationWorkbenchAdvisor_ready;
-	public static String ApplicationWorkbenchWindowAdvisor_0;
-	public static String ApplicationWorkbenchWindowAdvisor_9;
-	public static String AssistedQueryWidget_0;
-	public static String BackToText_0;
-	public static String Cannot_ask_simple_when_advance;
-	public static String CANT_CREATE_GRAPHIC;
-	public static String CGU_CHECKMESSAGE;
-	public static String CGU_MESSAGE;
-	public static String CGU_TITLE;
-	public static String CleanPerspective_1;
-	public static String CleanPerspective_2;
-	public static String ComplexSort_0;
-	public static String ComplexSort_10;
-	public static String ComplexSort_11;
-	public static String ComplexSort_12;
-	public static String ComplexSort_14;
-	public static String ComplexSort_16;
-	public static String ComplexSort_18;
-	public static String ComplexSort_1;
-	public static String ComplexSort_2;
-	public static String ComplexSort_3;
-	public static String ComplexSort_4;
-	public static String ComplexSort_5;
-	public static String ComplexSort_6;
-	public static String ComplexSort_9;
-	public static String ComplexSortSelector_0;
-	public static String ComplexSortSelector_1;
-	public static String ComplexSortSelector_2;
-	public static String ComplexSortSelector_5;
-	public static String ComplexSortSelector_6;
-	public static String ComplexSubcorpusPanel_0;
-	public static String ComplexSubcorpusPanel_16;
-	public static String ComplexSubcorpusPanel_1;
-	public static String ComplexSubcorpusPanel_2;
-	public static String ComplexSubcorpusPanel_4;
-	public static String ComplexSubcorpusPanel_5;
-	public static String ComputeCooccurrences_0;
-	public static String ComputeCooccurrences_1;
-	public static String ComputeCoocMatrix_0;
-	public static String ComputeCoocMatrix_10;
-	public static String ComputeCoocMatrix_11;
-	public static String ComputeCoocMatrix_12;
-	public static String ComputeCoocMatrix_13;
-	public static String ComputeCoocMatrix_1;
-	public static String ComputeCoocMatrix_2;
-	public static String ComputeCoocMatrix_3;
-	public static String ComputeCoocMatrix_4;
-	public static String ComputeCoocMatrix_7;
-	public static String ConvertCorpus_0;
-	public static String CorporaView_0;
-	public static String CorporaView_3;
-	public static String CorpusPage_0;
-	public static String CorpusPage_16;
-	public static String CorpusPage_16a;
-	public static String CorpusPage_19;
-	public static String CorpusPage_22;
-	public static String CorpusPage_26;
-	public static String CorpusPage_30;
-	public static String CorpusPage_35;
-	public static String CorpusPage_36;
-	public static String CorpusPage_37;
-	public static String CorpusPage_38;
-	public static String CorpusPage_39;
-	public static String CorpusPage_3;
-	public static String CorpusPage_40;
-	public static String CorpusPage_41;
-	public static String CorpusPage_42;
-	public static String CorpusPage_43;
-	public static String CorpusPage_44;
-	public static String CorpusPage_49;
-	public static String CorpusPage_4;
-	public static String CorpusPage_50;
-	public static String CorpusPage_52;
-	public static String CorpusPage_53;
-	public static String CorpusPage_57;
-	public static String CorpusPage_5;
-	public static String CorpusPage_61;
-	public static String CorpusPage_63;
-	public static String CorpusPage_64;
-	public static String CorpusPage_65;
-	public static String CorpusPage_66;
-	public static String CorpusPage_6;
-	public static String CorpusPage_7;
-	public static String CorpusPage_8;
-	public static String CorpusPage_93;
-	public static String CorpusPage_9;
-	public static String CreateFile_1;
-	public static String CreateFolder_1;
-	public static String CreateMacro_0;
-	public static String CreateMacro_1;
-	public static String CreatePartition_0;
-	public static String CreatePartition_2;
-	public static String CreatePartition_5;
-	public static String CreatePartition_6;
-	public static String CreatePartitionDialog_0;
-	public static String CreatePartitionDialog_10;
-	public static String CreatePartitionDialog_16;
-	public static String CreatePartitionDialog_1;
-	public static String CreatePartitionDialog_2;
-	public static String CreatePartitionDialog_3;
-	public static String CreatePartitionDialog_4;
-	public static String CreatePartitionDialog_5;
-	public static String CreatePartitionDialog_6;
-	public static String CreatePartitionDialog_7;
-	public static String CreatePartitionDialog_8;
-	public static String CreatePartitionDialog_9;
-	public static String CreateSubCorpus_0;
-	public static String CreateSubCorpus_1;
-	public static String CreateSubCorpus_2;
-	public static String CreateSubCorpus_3;
-	public static String CreateSubcorpus_7;
-	public static String CreateSubcorpus_8;
-	public static String CreateSubcorpus_9;
-	public static String CreateSubCorpus_begin;
-	public static String CreateSubCorpus_create;
-	public static String CreateSubcorpusDialog_0;
-	public static String CreateSubcorpusDialog_10;
-	public static String CreateSubcorpusDialog_11;
-	public static String CreateSubcorpusDialog_13;
-	public static String CreateSubcorpusDialog_14;
-	public static String CreateSubcorpusDialog_6;
-	public static String CreateSubcorpusDialog_8;
-	public static String DefineReferencePattern_0;
-	public static String DefineReferencePattern_1;
-	public static String DefineReferencePattern_2;
-	public static String DefineReferencePattern_3;
-	public static String DefineReferencePattern_4;
-	public static String DefineReferencePattern_5;
-	public static String DeleteFile_0;
-	public static String DeleteFile_2;
-	public static String DeleteInCorporaView_1;
-	public static String DeleteLines_0;
-	public static String DeleteObject_0;
-	public static String DeleteObject_10;
-	public static String DeleteObject_3;
-	public static String DeleteObject_4;
-	public static String DeleteObject_5;
-	public static String DownloadJobHandler_0;
-	public static String ElementTreeLabelProvider_0;
-	public static String ElementTreeLabelProvider_1;
-	public static String EmpantWidget_0;
-	public static String EmpantWidget_1;
-	public static String EmpantWidget_2;
-	public static String EmpantWidget_3;
-	public static String EmpantWidget_4;
-	public static String EmpantWidget_5;
-	public static String EmpantWidget_6;
-	public static String EmpantWidget_7;
-	public static String EmpantWidget_8;
-	public static String EmpantWidget_9;
-	public static String Error_creating_partition;
-	public static String ExecuteGroovyScript_1;
-	public static String ExecuteGroovyScript_2;
-	public static String ExecuteGroovyScript_9;
-	public static String ExecuteGroovyScriptFromFile_2;
-	public static String ExecuteLastGroovyScript_0;
-	public static String ExecuteLastGroovyScript_1;
-	public static String ExecuteLastGroovyScript_3;
-	public static String ExecuteScript_0;
-	public static String ExecuteScript_11;
-	public static String ExecuteScript_12;
-	public static String ExecuteScript_1;
-	public static String ExecuteScript_2;
-	public static String ExecuteScript_3;
-	public static String ExecuteScript_4;
-	public static String ExecuteScript_5;
-	public static String ExecuteScript_6;
-	public static String ExecuteScript_7;
-	public static String ExecuteScriptImport_0;
-	public static String ExecuteScriptImport_1;
-	public static String ExecuteScriptImport_2;
-	public static String Exit_Menu_Label;
-	public static String Explorer_0;
-	public static String Explorer_1;
-	public static String Explorer_2;
-	public static String Explorer_3;
+	public static String aboutTXM; 
+	public static String warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly; 
+	public static String cannotReadTheFileP0; 
+	public static String warning; 
+	public static String newCorpusDDotP0; 
+	public static String theP0CorpusDirectoryAlreadyExistsDoYouWantToReplaceIt; 
+	public static String thisFileIsNotATXMFileDDotP0; 
+	public static String failedToLoadCorpusP0; 
+	public static String aBinaryCorpusIsATXMFileExtensionTxmOrZip; 
+	public static String loadingBinaryCorpus; 
+	public static String extractingBinaryCorpus; 
+	public static String failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents; 
+	public static String couldNotUnzipBinaryCorpusDDot; 
+	public static String loadingTheCorpusInThePlatform; 
+	public static String restartingThePlatform; 
+	public static String failedToLoadBinaryCorpusNullError; 
+	public static String printTheStacktrace; 
+	public static String logLevel; 
+	public static String logInTheConsole; 
+	public static String logInAFile; 
+	public static String tXMInstallDirectory; 
+	public static String tXMUserDirectory; 
+	public static String displayRuntimesInConsole; 
+	public static String advancedUserMode; 
+	public static String logs; 
+	public static String updateLevel; 
+	public static String argsDDot; 
+	public static String couldNotStartProxyConfigurationDDot; 
+	public static String logOptionDetected; 
+	public static String forceLoggin; 
+	public static String thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual; 
+	public static String lockRCPWorkspace; 
+	public static String activateProxyService; 
+	public static String initializingPlatform; 
+	public static String removingOldCorpusBackupDirectoryP0; 
+	public static String corporaBackupedDDotP0; 
+	public static String initializationOfThePlatform; 
+	public static String removeUnusedEclipseRCPPreferencePage; 
+	public static String tXMWorkspaceDirectoryAlreadyExistsP0WouldYouLikeToReloadItsCorporaInYourNewTXM; 
+	public static String workspaceDirectoryBackup; 
+	public static String loadingTXMInstallPreferences; 
+	public static String movingCorporaToP0; 
+	public static String couldNotCreateBackupDirectoryDDot; 
+	public static String to; 
+	public static String checkingForExistingWorkspaceDirectory; 
+	public static String failedToMoveCorpus; 
+	public static String failedToBackupExistingCorporaDDot; 
+	public static String systemOutput; 
+	public static String startJobDDotLoadInstallPreferences; 
+	public static String startJobDDotCheckTXMHOME; 
+	public static String startJobDDotInitializeUI; 
+	public static String errorWhileLoadingTXMDDot; 
+	public static String startingUpdateFetch; 
+	public static String errorWhileUpdatingTXMDDot; 
+	public static String errorWhileUpdatingTXMDDotNoHandlerServiceFound; 
+	public static String creatingTXMUserWorkingDirectory; 
+	public static String loadingViews; 
+	public static String installPathDDotP0; 
+	public static String couldNotReadInstallPreferencesFile; 
+	public static String startingUpP0; 
+	public static String startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup; 
+	public static String ready; 
+	public static String removeUnnecessaryE4Elements; 
+	public static String settingStatusLineAndConfiguringActionSets; 
+	public static String openTheQueryAssistant; 
+	public static String displayInFullText; 
+	public static String cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab; 
+	public static String cannotCreateTheGraphic; 
+	public static String iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage; 
+	public static String infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt; 
+	public static String termsOfService; 
+	public static String errorWhileCallingOrgeclipseuiwindowresetPerspectiveDDot; 
+	public static String errorWhileCleaningPerspectiveDDotNoHandlerServiceFound; 
+	public static String openingComplexSortDialog; 
+	public static String invalidComparator; 
+	public static String youMustSelectAtLeast2Comparators; 
+	public static String addingToSelection; 
+	public static String removeFromSelection; 
+	public static String movingUpTheSelection; 
+	public static String movingDownTheSelection; 
+	public static String ampMultipleSort; 
+	public static String defineAndUseACompositeSorter; 
+	public static String selectACompositeSorter; 
+	public static String ampNew; 
+	public static String createANewSorter; 
+	public static String name; 
+	public static String nameIsMandatory; 
+	public static String sortKeys; 
+	public static String complexSortDDot; 
+	public static String sort; 
+	public static String errorDuringSortDDotP0; 
+	public static String _default; 
+	public static String match; 
+	public static String doesNotContain; 
+	public static String allCriteria; 
+	public static String someCriteria; 
+	public static String query; 
+	public static String openingCooccurrentsTable; 
+	public static String cannotComputeCooccurrencesWithTheSelection; 
+	public static String coocMatrixDDot; 
+	public static String distance; 
+	public static String minimalCoFrequence; 
+	public static String outfileDDotNone; 
+	public static String chooseOutfile; 
+	public static String numberOfNodesDDot; 
+	public static String numberOfEdgesDDot; 
+	public static String distance_2; 
+	public static String writingCoocMatrixInGRAPHMLFileDDot; 
+	public static String coocMatrixParameters; 
+	public static String corpusConversionFailed; 
+	public static String corpus; 
+	public static String errorWhileComputingTheConcordanceDDot; 
+	public static String editions; 
+	public static String punctuations; 
+	public static String separatorCharacters; 
+	public static String elisionCharacters; 
+	public static String endOfSentenceCharacters; 
+	public static String annotateTheCorpus; 
+	public static String parameters; 
+	public static String _1; 
+	public static String wordsPerPage; 
+	public static String selectTheSourceDirectory; 
+	public static String _2; 
+	public static String setImportParametersInTheSectionsBelow; 
+	public static String displayFont; 
+	public static String dDotMandatoryField; 
+	public static String pageBreakTag; 
+	public static String _3; 
+	public static String startCorpusImport; 
+	public static String buildEdition; 
+	public static String _default_2; 
+	public static String addAXsltParameter; 
+	public static String moduleUIParametersDDot; 
+	public static String savingImportParameters; 
+	public static String corpusNameIsMandatory; 
+	public static String fontName; 
+	public static String spaces; 
+	public static String editXSLStylesheet; 
+	public static String commands; 
+	public static String concordanceContextStructureLimits; 
+	public static String cannotSaveImportConfigurationNoSourceFolderSelected; 
+	public static String cannotStartImportConfigurationNoSourceFolderSelected; 
+	public static String deleteParameter; 
+	public static String generalInformations; 
+	public static String corpusNameOnlyCapsAndNoDigitAtBeginning; 
+	public static String importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot; 
+	public static String descriptionHTMLCompleteNameAuthorDateLicenseComment; 
+	public static String newFileDDotP0; 
+	public static String newFolderDDotP0; 
+	public static String macroName; 
+	public static String pleaseWriteTheMacroName; 
+	public static String creatingANewPartitionWithP0; 
+	public static String errorDDotThePartitionWasNotCreated; 
+	public static String doneDDotP0Items; 
+	public static String doneDDotP0Parts; 
+	public static String createPartition; 
+	public static String errorDDotThePartitionCreatedHasNoPart; 
+	public static String queriesCannotBeLeftEmpty; 
+	public static String simple; 
+	public static String ampStructureDDot; 
+	public static String assisted; 
+	public static String ampPropertyDDot; 
+	public static String advanced; 
+	public static String ampNameDDot; 
+	public static String part; 
+	public static String noPartWasDefined; 
+	public static String noPartitionNameWasSpecifiedTheNameIsP0; 
+	public static String errorDDotSubcorpusWasNotCreated; 
+	public static String noSelectionForDDot; 
+	public static String failedToGetLastCQPErrorDDot; 
+	public static String selectionIsNotACorpusDDot; 
+	public static String computeSubCorpusOnP0StructsDDotP1AmpPropsP2DDotP3; 
+	public static String doneDDotP0Created; 
+	public static String computeSubCorpusOnP0QueryDDotP1; 
+	public static String creatingASubcorpusInTheSearchEngine; 
+	public static String creatingASubcorpusOnP0; 
+	public static String createSubcorpus; 
+	public static String ampQuery; 
+	public static String invalidName; 
+	public static String invalidQuery; 
+	public static String queryCannotBeLeftEmpty; 
+	public static String ampValue; 
+	public static String noSubcorpusNameWasSpecifiedWeveGeneratedOne; 
+	public static String referencesDisplayOptions; 
+	public static String referencesAmpdisplayOptions; 
+	public static String referencesAmpsortOptions; 
+	public static String referencesSortOptions; 
+	public static String areYouSureYouWantToDeleteToSort; 
+	public static String failedToDeleteFile; 
+	public static String failedToDeleteSubcorpusP0; 
+	public static String theTableMustContainAtLeastOneLine; 
+	public static String deletingP0Continue; 
+	public static String deletedDDotP0; 
+	public static String errorDDotDeleteReturnedFalse; 
+	public static String errorWhileDeletingP0DDotP1; 
+	public static String deletingP0; 
+	public static String downloading; 
+	public static String errorDDotElementNotRegistered; 
+	public static String errorDDotObjectIsNotAnOrgw3cElement; 
+	public static String contextDDot; 
+	public static String word; 
+	public static String structure; 
+	public static String from; 
+	public static String to_2; 
+	public static String andFrom; 
+	public static String to_3; 
+	public static String includeTheKeywordStructureInTheCount; 
+	public static String useLeftWindow; 
+	public static String useRightWindow; 
+	public static String errorWhileCreatingAPartitionDDotP0; 
+	public static String errorDuringParametersInitialisation; 
+	public static String theUserCanceledTheScriptExecution; 
+	public static String errorDuringScriptExecutionDDot; 
+	public static String theP1GroovyScriptMustBeInTheP0Folder; 
+	public static String executingLastMacroDDot; 
+	public static String executingLastScriptDDot; 
+	public static String errorDDotCurrentGroovyScriptDirectoryDoesNotExistDDot; 
+	public static String executionOfP0; 
+	public static String executingGroovyScript; 
+	public static String doneP0Ms; 
+	public static String saveFileBeforeExecution; 
+	public static String saveAndRun; 
+	public static String noInterpreterFoundForScriptFileExtension; 
+	public static String abort; 
+	public static String dontSaveAndRun; 
+	public static String alwaysSaveBeforeLaunching; 
+	public static String executionCanceled; 
+	public static String importStarted; 
+	public static String p0ScriptFileDoesntExist; 
+	public static String errorDDotCorporaDirectoryDoesntExistDDot; 
+	public static String exit; 
+	public static String folderP0ShouldNotBeDeleted; 
+	public static String goToParentFolder; 
+	public static String goToTXMHome; 
+	public static String tXM; 
 	public static String Explorer_4;
 	public static String Explorer_5;
-	public static String Explorer_6;
 	public static String Explorer_7;
-	public static String Explorer_8;
-	public static String ExportAnnotation_0;
-	public static String ExportCorpus_0;
-	public static String ExportCorpus_3;
-	public static String ExportCorpus_4;
-	public static String ExportPreferencePage_18;
-	public static String ExportPreferencePage_19;
-	public static String ExportPreferencePage_1;
-	public static String ExportPreferencePage_3;
-	public static String ExportPreferencePage_4;
-	public static String ExportResult_0;
-	public static String ExportResult_1;
-	public static String ExportResult_2;
-	public static String ExportResult_3;
-	public static String ExportResult_4;
-	public static String ExportResult_5;
-	public static String ExportResult_6;
-	public static String ExportSVG_1;
-	public static String ExportSVG_3;
-	public static String FAILED_TO_SAVE_PREFERENCES;
-	public static String FileExplorerPreferencePage_0;
-	public static String FileExplorerPreferencePage_1;
-	public static String FileTreeContentProvider_1;
-	public static String FileTreeContentProvider_2;
-	public static String FileTreeContentProvider_3;
+	public static String goToTXMHome_2; 
+	public static String exportingAnnotations; 
+	public static String failedToExportCorpusP0; 
+	public static String exportingP0ThisMayTakeAWhile; 
+	public static String doneTheCreatedBinaryFileIsP0; 
+	public static String columnsSeparatedBy; 
+	public static String textSeparator; 
+	public static String exportSettings; 
+	public static String exportFileEncoding; 
+	public static String showExportResultInTheTextEditor; 
+	public static String exportingResults; 
+	public static String exporting; 
+	public static String p1ExportSavedInFileDDotP0; 
+	public static String exportDDotCantCreateFileP0DDotP1; 
+	public static String failedToExportInFileP0WithFormatP1; 
+	public static String impossibleToReadP0; 
+	public static String failedToExportResultP0DDotP1; 
+	public static String p1FileSavedInP0; 
+	public static String failedToExportFileP0WithDeviceP1; 
+	public static String failedToSavePreferencesDDot; 
+	public static String regexpPatternToHideFiles; 
+	public static String showHiddenFiles; 
+	public static String fileExplorerDDotIncorrectPattern; 
+	public static String eRROR; 
+	public static String errorElementDDot; 
 	public static String FileTreeContentProvider_4;
-	public static String FixUpdateHandler_0;
-	public static String FrequencyListEditorInput_0;
-	public static String FrequencyListEditorInput_3;
-	public static String FrequencyListEditorInput_5;
-	public static String FrequencyListEditorInput_6;
-	public static String GenericMultiPageEditor_1;
-	public static String GenericMultiPageEditor_3;
-	public static String GraphicalLogger_0;
-	public static String GroovyConsole_4;
-	public static String GroovyConsole_5;
-	public static String ImportDialog_0;
-	public static String ImportDialog_13;
-	public static String ImportDialog_14;
-	public static String ImportDialog_16;
-	public static String ImportDialog_19;
-	public static String ImportDialog_1;
-	public static String ImportDialog_22;
-	public static String ImportDialog_23;
-	public static String ImportDialog_4;
-	public static String ImportDialog_5;
-	public static String ImportDialog_6;
-	public static String ImportFormEditor_0;
-	public static String ImportFormEditor_1;
-	public static String ImportPreferencePage_0;
-	public static String ImportPreferencePage_2;
-	public static String ImportPreferencePage_3;
-	public static String ImportPreferencePage_4;
-	public static String ImportPreferencePage_5;
-	public static String ImportSelectedText_0;
-	public static String ImportSelectedText_10;
-	public static String ImportSelectedText_12;
-	public static String ImportSelectedText_1;
-	public static String ImportSelectedText_2;
-	public static String ImportSelectedText_3;
-	public static String ImportSelectedText_4;
-	public static String IndexToLexicalTable_0;
-	public static String InternalCorpusView_0;
-	public static String InternalCorpusView_1;
-	public static String InternalCorpusView_2;
-	public static String Invalid_analysis_property;
-	public static String JobHandler_0;
-	public static String JobHandler_1;
-	public static String JobHandler_2;
-	public static String JobHandler_3;
-	public static String JobsTimer_12;
-	public static String JobsTimer_13;
-	public static String JobsTimer_15;
-	public static String JobsTimer_19;
-	public static String JobsTimer_20;
-	public static String JobsTimer_21;
-	public static String JobsTimer_2;
-	public static String JobsTimer_5;
-	public static String JobsTimer_9;
-	public static String LanguageSwitchHandler_0;
-	public static String LanguageSwitchHandler_1;
-	public static String LanguageSwitchHandler_3;
-	public static String LanguageSwitchHandler_5;
-	public static String LanguageSwitchHandler_7;
-	public static String LastCQPError;
-	public static String LineLabelProvider_1;
-	public static String LocalePreferencePage_1;
-	public static String LocalePreferencePage_2;
-	public static String MacrosExplorer_0;
-	public static String MacrosExplorer_1;
-	public static String MainPage_0;
-	public static String MainPage_18;
-	public static String MainPage_19;
-	public static String MainPage_20;
-	public static String MainPage_23;
-	public static String MainPage_2;
-	public static String MainPage_3;
-	public static String MergeCols_1;
-	public static String MergeCols_2;
-	public static String MergeCols_5;
-	public static String MergeCols_6;
-	public static String MergeDeleteDialog_0;
-	public static String MergeDeleteDialog_1;
-	public static String MergeDeleteDialog_4;
-	public static String MergeLines_2;
-	public static String MetadataPage_1;
-	public static String MetadataPage_2;
-	public static String MetadataPage_4;
-	public static String MetadataPage_5;
-	public static String MetadataPage_7;
-	public static String MultipleValueTreeDialog_0;
-	public static String NavigationWidget_0;
-	public static String NumberOfLines;
-	public static String ObjectSelectionDialog_0;
-	public static String ObjectSelectionDialog_3;
-	public static String ObjectSelector_0;
-	public static String ObjectSelector_1;
-	public static String OpenBiblio_1;
-	public static String OpenBiblio_2;
-	public static String OpenBiblio_7;
-	public static String OpenBiblio_9;
-	public static String OpenBrowser_0;
-	public static String OpenEmptyEditor_2;
-	public static String OpenGraph_8;
-	public static String OpenSVGGraph_0;
-	public static String OpenURI_0;
-	public static String OpenURI_1;
-	public static String ParametersDialog_0;
-	public static String ParametersDialog_10;
-	public static String ParametersDialog_11;
-	public static String ParametersDialog_12;
-	public static String ParametersDialog_14;
-	public static String ParametersDialog_1;
-	public static String PartitionComposer_0;
-	public static String PartitionComposer_11;
-	public static String PartitionComposer_1;
-	public static String PartitionComposer_2;
-	public static String PartitionComposer_3;
-	public static String PartitionComposer_5;
-	public static String PartitionComposer_6;
-	public static String PartitionComposer_8;
-	public static String PartitionComposer_9;
-	public static String PasteFile_1;
-	public static String PasteFile_3;
-	public static String PasteFile_4;
-	public static String Preferences_Menu_Label;
-	public static String PropertiesSelector_0;
-	public static String PropertiesSelector_1;
-	public static String PropertiesSelector_2;
-	public static String PropertySelector_0;
-	public static String QueriesView_10;
-	public static String QueriesView_1;
-	public static String QueriesView_5;
-	public static String QueryAssistDialog_0;
-	public static String QueryAssistDialog_10;
-	public static String QueryAssistDialog_11;
-	public static String QueryAssistDialog_12;
-	public static String QueryAssistDialog_13;
-	public static String QueryAssistDialog_1;
-	public static String QueryAssistDialog_2;
-	public static String QueryAssistDialog_32;
-	public static String QueryAssistDialog_33;
-	public static String QueryAssistDialog_34;
-	public static String QueryAssistDialog_8;
-	public static String RefreshingCorporaView;
-	public static String RenameFile_0;
-	public static String RenameFile_2;
-	public static String RenameFile_3;
-	public static String RestartTXM_1;
-	public static String RunGroovyScript_0;
-	public static String RunGroovyScript_1;
-	public static String RunGroovyScript_2;
-	public static String RunGroovyScript_3;
-	public static String RunGroovyScript_4;
-	public static String RunGroovyScript_8;
-	public static String RunGroovyScript_9;
-	public static String SaveAs_2;
-	public static String SaveBeforeExecutionDialog_0;
-	public static String ScriptPreferencePage_0;
-	public static String ScriptPreferencePage_1;
-	public static String SetContextSize_1;
-	public static String SetContextSize_2;
-	public static String SetContextSize_3;
-	public static String SetContextSize_4;
-	public static String SetEncoding_0;
-	public static String SetEncoding_1;
-	public static String SetEncoding_2;
-	public static String SetLineNumber_0;
-	public static String SetLineNumber_1;
-	public static String SetSortProperty_1;
-	public static String SetSortProperty_2;
-	public static String SetSortProperty_3;
-	public static String ShowSelected_0;
-	public static String ShowSvgHelp_0;
-	public static String ShowSvgHelp_1;
-	public static String ShowSvgHelp_2;
-	public static String ShowSvgHelp_3;
-	public static String ShowSvgHelp_4;
-	public static String ShowSvgHelp_5;
-	public static String SimpleSubcorpusPanel_0;
-	public static String SingularValuesEditor_0;
-	public static String SORT_COLUMN;
-	public static String SORT_DONE;
-	public static String SortPropertySelection_0;
-	public static String Structure_field_not_empty;
-	public static String Submit_0;
-	public static String SummaryView_0;
-	public static String SVGGraphicEditor_1;
-	public static String TablableVector_0;
-	public static String TableEditor_0;
-	public static String TableKeyListener_0;
-	public static String TableKeyListener_6;
-	public static String TableSorter_0;
-	public static String TextometriePreferencePage_0;
-	public static String TextometriePreferencePage_1;
-	public static String TextometriePreferencePage_2;
-	public static String TextualPlansSection_milestone_label;
-	public static String TextualPlansSection_milestone_tooltip;
-	public static String TextualPlansSection_outsidetext_label;
-	public static String TextualPlansSection_outsidetext_tooltip;
-	public static String TextualPlansSection_outsidetexttoedit_label;
-	public static String TextualPlansSection_outsidetexttoedit_tooltip;
-	public static String TextualPlansSection_title;
-	public static String TxmBrowser_10;
-	public static String TxmBrowser_11;
-	public static String TxmBrowser_12;
-	public static String TxmBrowser_5;
-	public static String TxmBrowser_6;
-	public static String TxmBrowser_8;
-	public static String TxmBrowser_9;
-	public static String TXMEditor_0;
-	public static String TXMEditor_1;
-	public static String TXMEditor_2;
-	public static String TXMEditor_3;
-	public static String TXMEditor_7;
-	public static String TxtEditor_0;
-	public static String TxtEditor_1;
-	public static String UIParameterException_0;
-	public static String UserPreferencePage_1;
-	public static String UserPreferencePage_3;
+	public static String readyToShowUpdateUI; 
+	public static String lexicon; 
+	public static String form; 
+	public static String string; 
+	public static String integer; 
+	public static String theInputP0CannotBeDisplayed; 
+	public static String theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual; 
+	public static String errorDDotP0; 
+	public static String consoleReportsAnInternalError; 
+	public static String theErrorIsDDot; 
+	public static String importSetupP0; 
+	public static String thisDirectorySeemsToContainABinaryCorpus; 
+	public static String thisComputerEncodingDDot; 
+	public static String guessDDot; 
+	public static String thisComputerLanguageDDot; 
+	public static String sourceDirectoryDDot; 
+	public static String selectDDot; 
+	public static String options; 
+	public static String sourcesCharactersEncodingDDot; 
+	public static String mainLanguageDDot; 
+	public static String tokenizerParameterFileDDot; 
+	public static String warningDDotTheImportScriptIsMissingDDotP0; 
+	public static String p0Import; 
+	public static String characterEncoding; 
+	public static String metadatacsvFileFormat; 
+	public static String clipboard; 
+	public static String defaultLanguage; 
+	public static String noteDDotUseValueToGuess; 
+	public static String importClipboardText; 
+	public static String identifiedLanguage; 
+	public static String usingLanguage; 
+	public static String clipboard_2; 
+	public static String clipboardIsEmpty; 
+	public static String confirm; 
+	public static String theCorpusAndTheCorpusP0WillBeDeleted; 
+	public static String cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded; 
+	public static String errorWhileComputingCorpusSummary; 
+	public static String reload; 
+	public static String errorDDotGetTextDDotP0; 
+	public static String invalidProperty; 
+	public static String canceling; 
+	public static String canceling_2; 
+	public static String cancelingRequested; 
+	public static String failedToCancel; 
+	public static String h; 
+	public static String minAnd; 
+	public static String doneInP0P1; 
+	public static String doneInP0; 
+	public static String jobDDot; 
+	public static String execDDot; 
+	public static String msec; 
+	public static String sec; 
+	public static String interfaceLanguageLOCALEWasNotSet; 
+	public static String theFileP0DoesNotExist; 
+	public static String chooseTheLanguage; 
+	public static String switchLanguageDDotMalformedUrlDDotP0; 
+	public static String tXMiniDDot; 
+	public static String lastCQPErrorDDot; 
+	public static String shouldNotHappen; 
+	public static String configurationOfTheUserInterfaceLanguage; 
+	public static String userInterfaceLanguage; 
+	public static String newMacro; 
+	public static String createANewMacroFromATemplate; 
+	public static String mainPage; 
+	public static String frontXSL; 
+	public static String lexicalSegmentation; 
+	public static String mainLanguage; 
+	public static String sourceCharactersEncoding; 
+	public static String importParametersOfP0; 
+	public static String corpusInfos; 
+	public static String newName; 
+	public static String editTheNameOfTheNewColumnCreatedByTheMergedColumns; 
+	public static String namesDDot; 
+	public static String endOfColumnMerge; 
+	public static String merge; 
+	public static String mergeDelete; 
+	public static String mergeResultName; 
+	public static String editTheNameOfTheNewLineCreatedByTheMergedLines; 
+	public static String metadataPreview; 
+	public static String metadatasParameters; 
+	public static String metadataColumnTitles; 
+	public static String textID; 
+	public static String noMetadataFileP0; 
+	public static String addDDot; 
+	public static String errorWhileGettingCurrentPositionValueDDot; 
+	public static String numberOfLinesDDot; 
+	public static String valueSelector; 
+	public static String foundP0Values; 
+	public static String objDDot; 
+	public static String select; 
+	public static String noTextInCorpusDDotP0; 
+	public static String selectTextId; 
+	public static String couldNotFindTextP0InCorpusP1; 
+	public static String textP0HasNoBibliographicRecord; 
+	public static String errorWhileOpeningBibliographicRecordP0WithURLEqualsP1; 
+	public static String couldNotFindDirectoryDDotP0; 
+	public static String cantOpenGraphicP0; 
+	public static String sVGGraphic; 
+	public static String desktopIsNotSupportedFatal; 
+	public static String errorWhileOpeningFileP0; 
+	public static String p0ParametersInput; 
+	public static String unknowedWidgetNameDDot; 
+	public static String mandatoryFields; 
+	public static String errorDDotMissingValueDDot; 
+	public static String errorInAtOptionNameDeclarationDDot; 
+	public static String run; 
+	public static String structureDDot; 
+	public static String remove; 
+	public static String errorDDotThisPartitionHasNoPart; 
+	public static String selectValuesToAssignDDot; 
+	public static String newPart; 
+	public static String rmvAllTheParts; 
+	public static String titleDDot; 
+	public static String assign; 
+	public static String failedToCopy; 
+	public static String failedToDelete; 
+	public static String dDot; 
+	public static String preferences; 
+	public static String cantLoadPropertiesFromCorpusP0DDotP1; 
+	public static String propertiesDDot; 
+	public static String edit; 
+	public static String selectAProperty; 
+	public static String errorWithElementP0; 
+	public static String exportAll; 
+	public static String queriesDDot; 
+	public static String queryAssistant; 
+	public static String equalsTo; 
+	public static String startsWith; 
+	public static String endsWith; 
+	public static String contains; 
+	public static String addAWord; 
+	public static String imLookingForDDot; 
+	public static String followedBy; 
+	public static String separatedByAtLeast0Word; 
+	public static String separatedByAtLeast1Word; 
+	public static String aWordWithItsProperty; 
+	public static String refreshingCorpora; 
+	public static String renameFile; 
+	public static String renamingByDDot; 
+	public static String failedToRename; 
+	public static String restartTXM; 
+	public static String scriptExecution; 
+	public static String ampRunScript; 
+	public static String runScript; 
+	public static String groovy; 
+	public static String errorWhileOpeningGroovyScriptDDotP0; 
+	public static String errorWhileRunningScriptDDotP0; 
+	public static String executeScript; 
+	public static String failedToSaveAs; 
+	public static String saveBeforeExecution; 
+	public static String nextSessionNumber; 
+	public static String saveScriptBeforeExecution; 
+	public static String ampContextsDisplayOptions; 
+	public static String contextsDisplayOptions; 
+	public static String leftContextSize; 
+	public static String rightContextSize; 
+	public static String changeCharactersEncoding; 
+	public static String changeCharactersEncodingCurrentEncodingDDot; 
+	public static String defaultEncodingDDot; 
+	public static String paginationOptions; 
+	public static String linePerPageDDot; 
+	public static String ampSortOptions; 
+	public static String sortOptions; 
+	public static String fileDDot; 
+	public static String graphicsKeyboardShortcuts; 
+	public static String panDDotRightMousePlusDrag; 
+	public static String zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag; 
+	public static String zoomToSelectionDDotCtrlPlusLeftMousePlusdrag; 
+	public static String EMPTY; 
+	public static String resetTheViewDDotF5; 
+	public static String structuralUnitComboSelected; 
+	public static String wrongInput; 
+	public static String sortingColumn; 
+	public static String sortDone; 
+	public static String structureFieldIsMandatory; 
+	public static String saveScript; 
+	public static String noDefaultEditionPageFoundForElementDDot; 
+	public static String cannotDrawAGraphicWithTheInformationProvided; 
+	public static String theTwoArraysMustHaveTheSameSize; 
+	public static String canNotCreateATableWithTheProvidedInformationDDotP0; 
+	public static String foundLinesDDot; 
+	public static String copiedLinesDDot; 
+	public static String columnIndexIsTooBig; 
+	public static String checkForUpdatesAtStartup; 
+	public static String generalPreferencesBackup; 
+	public static String automaticUpdates; 
+	public static String milestoneElements; 
+	public static String listOfMilestoneElementsSeparatedByComma; 
+	public static String outsidetext; 
+	public static String listOfTagsEncodingTheOutsidetextNoStructureOrWordContentIndexedNoStructureOrWordContentEditedInTXM; 
+	public static String outsidetextToedit; 
+	public static String listOfTagsEncodingTheOutsidetextToEditNoStructureOrWordContentIndexedStructureAndWordContentEditedInTXM; 
+	public static String textualPlanes; 
+	public static String couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator; 
+	public static String noPreviousText; 
+	public static String noTextNext; 
+	public static String previousPage; 
+	public static String nextPage; 
+	public static String nextText; 
+	public static String previousText; 
+	public static String computing; 
+	public static String computing_3; 
+	public static String showHideCommandParameters; 
+	public static String textEditorDDot; 
+	public static String encodingFound; 
+	public static String error; 
+	public static String automaticRecomputingWhenChangingAParameter; 
+	public static String doNotConfirmToDeleteAnObject; 
 
 
 	
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 1335)
@@ -1,627 +1,484 @@
-#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
-#Eclipse modern messages class
-#Mon Feb 10 11:04:14 CET 2014
-
-About_Menu_Label = About TXM...
-
-AdapterFactory_0 = ** Warning: the corpus {0} is corrupted. Some commands won''t work correctly.
-
-AddBase_1  = New corpus: {0}.
-AddBase_17 = ** Cannot read the file {0}
-AddBase_19 = Warning
-AddBase_2  = ** Failed to load corpus  from directory: {0}.\nWe cannot find the necessary components
-AddBase_20 = The {0} corpus directory already exists. Do you want to replace it ?
-AddBase_22 = This file is not a TXM file: {0}
-AddBase_24 = ** Failed to load corpus  {0}
-AddBase_25 = A binary corpus is a TXM file (extension .txm or .zip)
-AddBase_27 = Loading binary corpus
-AddBase_28 = Extracting binary corpus
-AddBase_31 = ** Could not unzip binary corpus:
-AddBase_32 = Loading the corpus in the platform
-AddBase_33 = Restarting the platform
-AddBase_4  = ** Failed to load binary corpus (null error).
-
-AdvancePreferencePage_0  = Print the stacktrace
-AdvancePreferencePage_1  = TXM Install directory
-AdvancePreferencePage_12 = Log level
-AdvancePreferencePage_13 = Log in the console
-AdvancePreferencePage_14 = Log in a file
-AdvancePreferencePage_2  = TXM user directory
-AdvancePreferencePage_3  = Display runtimes in console
-AdvancePreferencePage_4  = Advanced user mode
-AdvancePreferencePage_6  = Logs
-AdvancePreferencePage_7  = Update level
-
-ApplicationWorkbenchAdvisor_0           = Initializing platform...
-ApplicationWorkbenchAdvisor_1           = Initialization of the platform
-ApplicationWorkbenchAdvisor_16          = Removing old corpus backup directory {0}.
-ApplicationWorkbenchAdvisor_18          = Corpora backuped: {0}
-ApplicationWorkbenchAdvisor_2           = Loading TXM install preferences
-ApplicationWorkbenchAdvisor_21          = Remove unused Eclipse RCP preference page
-ApplicationWorkbenchAdvisor_27          = TXM workspace directory already exists ({0}). Would you like to reload its corpora in your new TXM?"
-ApplicationWorkbenchAdvisor_28          = Workspace directory backup
-ApplicationWorkbenchAdvisor_3           = Checking for existing workspace directory
-ApplicationWorkbenchAdvisor_30          = Moving corpora to {0}.
-ApplicationWorkbenchAdvisor_34          = ** Could not create backup directory :
-ApplicationWorkbenchAdvisor_37          = \ to
-ApplicationWorkbenchAdvisor_44          = ** Failed to move corpus
-ApplicationWorkbenchAdvisor_47          = ** Failed to backup existing corpora:
-ApplicationWorkbenchAdvisor_5           = System Output
-ApplicationWorkbenchAdvisor_7           = Creating TXM user working directory.
-ApplicationWorkbenchAdvisor_72          = Start job: load install preferences
-ApplicationWorkbenchAdvisor_73          = Start job: check TXMHOME
-ApplicationWorkbenchAdvisor_74          = Start job: initialize UI
-ApplicationWorkbenchAdvisor_75          = Error while loading TXM: 
-ApplicationWorkbenchAdvisor_77          = Starting update fetch
-ApplicationWorkbenchAdvisor_78          = Error while updating TXM: 
-ApplicationWorkbenchAdvisor_79          = Error while updating TXM: no handler service found
-ApplicationWorkbenchAdvisor_8           = Install path: {0}
-ApplicationWorkbenchAdvisor_88          = Loading views
-ApplicationWorkbenchAdvisor_9           = ** Could not read install preferences file
-ApplicationWorkbenchAdvisor_init        = Starting up {0}...
-ApplicationWorkbenchAdvisor_init_failed = ** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu: Help>
-ApplicationWorkbenchAdvisor_ready       = Ready.
-
-ApplicationWorkbenchWindowAdvisor_0 = Remove unnecessary e4 elements
-ApplicationWorkbenchWindowAdvisor_9 = Setting status line and configuring action sets
-
-Application_0                           = Args: 
-Application_1                           = '-log' option detected
-Application_10                          = Could not start proxy configuration: 
-Application_2                           = Force loggin...
-Application_4                           = This file is not meant to run TXM. Please consult TXM user manual.
-Application_8                           = Lock RCP workspace
-Application_9                           = Activate Proxy Service
-
-AssistedQueryWidget_0 = Open the query assistant
-
-BackToText_0 = Display in full text...
-
-CANT_CREATE_GRAPHIC = ** Cannot create the graphic
-
-CGU_CHECKMESSAGE = I accept the licence and I undertake to cite TXM for acknowledging my use of TXM in my research work \n(see the Citation section of the <http://textometrie.ens-lyon.fr/spip.php?rubrique61> page).
-CGU_MESSAGE      = <p>TXM is published under the GNU GPL 2 license &lt;<a href="https://www.gnu.org/licenses/gpl-2.0.en.html">https://www.gnu.org/licenses/gpl-2.0.en.html</a>&gt;.
-CGU_TITLE        = Terms of service
-
-Cannot_ask_simple_when_advance = Cannot ask for the simple tab when the user has selected the advanced tab
-
-CleanPerspective_1 = Error while calling 'org.eclipse.ui.window.resetPerspective': 
-CleanPerspective_2 = Error while cleaning perspective: no handler service found
-
-ComplexSortSelector_0 = Sort keys
-ComplexSortSelector_1 = Complex sort:
-ComplexSortSelector_2 = Sort
-ComplexSortSelector_5 = ** Error during sort: {0}
-ComplexSortSelector_6 = default
-
-ComplexSort_0         = Opening complex sort dialog
-ComplexSort_1         = &Multiple Sort
-ComplexSort_10        = Invalid comparator
-ComplexSort_11        = you must select at least 2 comparators
-ComplexSort_12        = Adding to selection
-ComplexSort_14        = Remove from selection
-ComplexSort_16        = Moving up the selection
-ComplexSort_18        = Moving down the selection
-ComplexSort_2         = Define and use a composite sorter
-ComplexSort_3         = Select a composite sorter
-ComplexSort_4         = &New
-ComplexSort_5         = Create a new sorter
-ComplexSort_6         = Name 
-ComplexSort_9         = Name is mandatory.
-
-ComplexSubcorpusPanel_0  = Match
-ComplexSubcorpusPanel_1  = All criteria
-ComplexSubcorpusPanel_16 = does not contain
-ComplexSubcorpusPanel_2  = Some criteria
-ComplexSubcorpusPanel_4  = Query
-ComplexSubcorpusPanel_5  = Refresh
-
-ComputeCoocMatrix_0  = Cooc matrix:
-ComputeCoocMatrix_1  = Number of nodes:
-ComputeCoocMatrix_10 = Distance
-ComputeCoocMatrix_11 = Minimal co frequence
-ComputeCoocMatrix_12 = Outfile: none
-ComputeCoocMatrix_13 = Choose outfile
-ComputeCoocMatrix_2  = Number of edges:
-ComputeCoocMatrix_3  = Distance 
-ComputeCoocMatrix_4  = Writing cooc matrix in GRAPHML file:
-ComputeCoocMatrix_7  = CoocMatrix parameters
-
-ComputeCooccurrences_0 = Opening cooccurrents table
-ComputeCooccurrences_1 = cannot compute cooccurrences with the selection
-
-ConvertCorpus_0 = Corpus conversion failed.
-
-CorporaView_0 = Corpus
-CorporaView_3 = Error while computing the concordance:
-
-CorpusPage_0   = Editions
-CorpusPage_16  = Punctuations
-CorpusPage_16a = Separator characters
-CorpusPage_19  = Elision characters
-CorpusPage_22  = End of sentence characters
-CorpusPage_26  = Annotate the corpus
-CorpusPage_3   = Display font
-CorpusPage_30  = Parameters
-CorpusPage_35  = 1.\	
-CorpusPage_36  = Words per page
-CorpusPage_37  = Select the source directory.
-CorpusPage_38  = 2.\	
-CorpusPage_39  = Set import parameters in the sections below.
-CorpusPage_4   = Add a xslt parameter
-CorpusPage_40  = *: mandatory field
-CorpusPage_41  = Page break tag
-CorpusPage_42  = 3.\	
-CorpusPage_43  = Start corpus import.
-CorpusPage_44  = Build edition
-CorpusPage_49  = Default
-CorpusPage_5   = Spaces
-CorpusPage_50  = module UI parameters:
-CorpusPage_52  = Saving import parameters...
-CorpusPage_53  = Corpus name is mandatory
-CorpusPage_57  = Font name
-CorpusPage_6   = Delete parameter
-CorpusPage_61  = Edit XSL stylesheet...
-CorpusPage_63  = Commands
-CorpusPage_64  = Concordance context structure limits
-CorpusPage_65  = Cannot save import configuration. No source folder selected.
-CorpusPage_66  = Cannot start import configuration. No source folder selected.
-CorpusPage_7   = General informations
-CorpusPage_8   = Corpus name* (only caps and no digit at beginning)
-CorpusPage_9   = Description - HTML (complete name, author, date, license, comment...)
-CorpusPage_93  = Import stopped: corpus name does not matches the '[A-Z][-A-Z0-9]{1,20}' pattern: 
-
-CreateFile_1 = New file: {0}
-
-CreateFolder_1 = New folder: {0}
-
-CreateMacro_0 = Macro name
-CreateMacro_1 = Please write the macro name
-
-CreatePartitionDialog_0  = Create Partition
-CreatePartitionDialog_1  = Simple
-CreatePartitionDialog_10 = Error: the partition created has no part
-CreatePartitionDialog_16 = Queries cannot be left empty.
-CreatePartitionDialog_2  = &Structure:
-CreatePartitionDialog_3  = Assisted
-CreatePartitionDialog_4  = &Property:
-CreatePartitionDialog_5  = Advanced
-CreatePartitionDialog_6  = &Name:
-CreatePartitionDialog_7  = Part
-CreatePartitionDialog_8  = No part was defined
-CreatePartitionDialog_9  = No partition name was specified. The name is {0}
-
-CreatePartition_0        = Creating a new partition with {0}
-CreatePartition_2        = ** Error: the partition was not created
-CreatePartition_5        = Done: {0} items
-CreatePartition_6        = Done: {0} parts
-
-CreateSubCorpus_0      = ** Error: subcorpus was not created
-CreateSubCorpus_1      = No selection for: 
-CreateSubCorpus_2      = Failed to get last CQP error:
-CreateSubCorpus_3      = Selection is not a corpus: 
-CreateSubCorpus_begin  = Creating a sub-corpus in the Search Engine
-CreateSubCorpus_create = Creating a sub-corpus on {0}
-
-CreateSubcorpusDialog_0  = Create subcorpus
-CreateSubcorpusDialog_10 = &Query 
-CreateSubcorpusDialog_11 = Invalid name
-CreateSubcorpusDialog_13 = Invalid query
-CreateSubcorpusDialog_14 = Query cannot be left empty.
-CreateSubcorpusDialog_6  = &Value 
-CreateSubcorpusDialog_8  = No subcorpus name was specified. We've generated one.
-
-CreateSubcorpus_7        = Compute SubCorpus on {0}. Structs: {1} & props {2}: {3}
-CreateSubcorpus_8        = Done: {0} created
-CreateSubcorpus_9        = Compute SubCorpus on {0}. Query: {1}
-
-DefineReferencePattern_0 = References display options
-DefineReferencePattern_1 = References &display options
-DefineReferencePattern_2 = References display options
-DefineReferencePattern_3 = References &sort options
-DefineReferencePattern_4 = References sort options
-DefineReferencePattern_5 = References sort options
-
-DeleteFile_0 = Are you sure you want to delete to sort
-DeleteFile_2 = ** Failed to delete file
-
-DeleteInCorporaView_1 = ** Failed to delete subcorpus {0}
-
-DeleteLines_0 = The table must contain at least one line
-
-DeleteObject_0  = Deleting {0}, continue ?
-DeleteObject_10 = Deleted: {0}
-DeleteObject_3  = Error: delete() returned 'false'
-DeleteObject_4  = Error while deleting {0}: {1}
-DeleteObject_5  = Deleting {0}
-
-DownloadJobHandler_0 = Downloading...
-
-ElementTreeLabelProvider_0 = ** Error: element not registered
-ElementTreeLabelProvider_1 = ** Error: object is not an 'org.w3c.Element'
-
-EmpantWidget_0 = Context:
-EmpantWidget_1 = word
-EmpantWidget_2 = structure
-EmpantWidget_3 = from -
-EmpantWidget_4 = to -
-EmpantWidget_5 = and from
-EmpantWidget_6 = to
-EmpantWidget_7 = include the keyword structure in the count
-EmpantWidget_8 = use left Window
-EmpantWidget_9 = use right Window
-
-Error_creating_partition = Error while creating a partition: {0}
-
-ExecuteGroovyScriptFromFile_2 = The {1} Groovy script must be in the {0} folder. 
-
-ExecuteGroovyScript_1         = Error during parameters initialisation
-ExecuteGroovyScript_2         = The user canceled the script execution
-ExecuteGroovyScript_9         = Error during script execution: 
-
-ExecuteLastGroovyScript_0 = Executing last macro: 
-ExecuteLastGroovyScript_1 = Executing last script: 
-ExecuteLastGroovyScript_3 = Error: Current Groovy script directory does not exist: 
-
-ExecuteScriptImport_0 = Import started
-ExecuteScriptImport_1 = ** {0} script file doesn''t exist
-ExecuteScriptImport_2 = ** Error: 'corpora' directory doesn't exist:
-
-ExecuteScript_0       = Execution of {0}
-ExecuteScript_1       = Save file before execution ?
-ExecuteScript_11      = Executing Groovy script...
-ExecuteScript_12      = Done {0} ms.
-ExecuteScript_2       = Save and run
-ExecuteScript_3       = ** No interpreter found for script file extension
-ExecuteScript_4       = Abort
-ExecuteScript_5       = Don't save and run
-ExecuteScript_6       = Always save before launching
-ExecuteScript_7       = Execution canceled.
-
-Exit_Menu_Label = Exit
-
-Explorer_0 = Folder {0} should not be deleted
-Explorer_1 = Go to parent folder
-Explorer_2 = Go to TXM home
-Explorer_3 = TXM
-Explorer_4 = ⇧
-Explorer_5 = ↻
-Explorer_6 = Refresh
-Explorer_7 = ⌂
-Explorer_8 = Go to TXM Home
-
-ExportAnnotation_0 = Exporting annotations.
-
-ExportCorpus_0 = ** Failed to export corpus {0}
-ExportCorpus_3 = Exporting {0}. This may take a while.
-ExportCorpus_4 = Done, the created binary file is {0}
-
-ExportPreferencePage_1  = Export settings
-ExportPreferencePage_18 = Columns separated by
-ExportPreferencePage_19 = Text separator
-ExportPreferencePage_3  = Export file encoding
-ExportPreferencePage_4  = Show export result in the text editor
-
-ExportResult_0 = Exporting results.
-ExportResult_1 = Exporting...
-ExportResult_2 = {1} export saved in file: {0}
-ExportResult_3 = ** Export: Can''t create file {0}: {1}
-ExportResult_4 = ** Failed to export in file {0} with format {1}
-ExportResult_5 = ** Impossible to read {0}
-ExportResult_6 = ** Failed to export result {0}: {1}
-
-ExportSVG_1 = {1} file saved in {0}
-ExportSVG_3 = Failed to export file {0} with device {1}
-
-FAILED_TO_SAVE_PREFERENCES = Failed to save preferences:
-
-FileExplorerPreferencePage_0 = Regexp pattern to hide files
-FileExplorerPreferencePage_1 = Show hidden files
-
-FileTreeContentProvider_1 = ** File Explorer: Incorrect pattern
-FileTreeContentProvider_2 = \ ERROR
-FileTreeContentProvider_3 = Error element: '
-FileTreeContentProvider_4 = '
-
-FixUpdateHandler_0 = Ready to show Update UI
-
-FrequencyListEditorInput_0 = Lexicon
-FrequencyListEditorInput_3 = Form
-FrequencyListEditorInput_5 = String
-FrequencyListEditorInput_6 = Integer
-
-GenericMultiPageEditor_1 = The input {0} cannot be displayed.
-GenericMultiPageEditor_3 = The number of editors ({0}) and number of inputs ({1}) must be equal.
-
-GraphicalLogger_0 = Error: {0}
-
-GroovyConsole_4 = \nConsole reports an Internal error.
-GroovyConsole_5 = The error is:
-
-ImportDialog_0  = Import setup - {0}
-ImportDialog_1  = Source directory:
-ImportDialog_13 = This directory seems to contain a binary corpus
-ImportDialog_14 = This computer encoding:
-ImportDialog_16 = Guess:
-ImportDialog_19 = This computer language:
-ImportDialog_22 = Select:
-ImportDialog_23 = Options
-ImportDialog_4  = Sources characters encoding:
-ImportDialog_5  = Main language:
-ImportDialog_6  = Tokenizer parameter file:
-
-ImportFormEditor_0 = Warning: the import script is missing: {0}
-ImportFormEditor_1 = {0} Import
-
-ImportPreferencePage_0 = Character encoding
-ImportPreferencePage_2 = metadata.csv file format
-ImportPreferencePage_3 = Clipboard
-ImportPreferencePage_4 = Default language
-ImportPreferencePage_5 = Note: Use '??' value to guess.
-
-ImportSelectedText_0  = Import clipboard text
-ImportSelectedText_1  = clipboard
-ImportSelectedText_10 = Identified Language
-ImportSelectedText_12 = Using language
-ImportSelectedText_2  = ** Clipboard is empty
-ImportSelectedText_3  = Confirm
-ImportSelectedText_4  = The corpus  and the corpus {0} will be deleted
-
-IndexToLexicalTable_0 = Cannot create a Lexical Table from an Index created with a Corpus (more than one column is needed)
-
-InternalCorpusView_0 = Error while computing corpus summary
-InternalCorpusView_1 = Reload
-InternalCorpusView_2 = Error: getText: {0}
-
-Invalid_analysis_property = Invalid property
-
-JobHandler_0 = Canceling...
-JobHandler_1 = Canceling
-JobHandler_2 = \ canceling requested
-JobHandler_3 = Failed to cancel
-
-JobsTimer_12 = h,
-JobsTimer_13 = \ min and
-JobsTimer_15 = Done in {0} ({1}).
-JobsTimer_19 = Done in {0}.
-JobsTimer_2  = \ msec
-JobsTimer_20 = Job:
-JobsTimer_21 = Exec:
-JobsTimer_5  = \ sec
-JobsTimer_9  = \ min and
-
-LanguageSwitchHandler_0 = Interface language (LOCALE) was not set
-LanguageSwitchHandler_1 = The file {0} does not exist
-LanguageSwitchHandler_3 = Choose the language
-LanguageSwitchHandler_5 = SwitchLanguage: Malformed url: {0}
-LanguageSwitchHandler_7 = TXM.ini:
-
-LastCQPError = Last CQP error:
-
-LineLabelProvider_1 = Should not happen
-
-LocalePreferencePage_1 = Configuration of the user interface language
-LocalePreferencePage_2 = User interface language
-
-MacrosExplorer_0 = New macro
-MacrosExplorer_1 = Create a new macro from a template
-
-MainPage_0  = MainPage
-MainPage_18 = Front XSL
-MainPage_19 = Lexical Segmentation
-MainPage_2  = Import parameters of {0}
-MainPage_20 = Main language
-MainPage_23 = Source characters encoding
-MainPage_3  = Corpus  infos
-
-MergeCols_1 = New name
-MergeCols_2 = Edit the name of the new column created by the merged columns
-MergeCols_5 = Names:
-MergeCols_6 = End of column merge.
-
-MergeDeleteDialog_0 = merge
-MergeDeleteDialog_1 = Merge/Delete
-MergeDeleteDialog_4 = merge result name
-
-MergeLines_2 = Edit the name of the new line created by the merged lines
-
-MetadataPage_1 = Metadata preview
-MetadataPage_2 = Metadatas parameters
-MetadataPage_4 = Metadata column titles
-MetadataPage_5 = Text ID
-MetadataPage_7 = No metadata file {0}
-
-MultipleValueTreeDialog_0 = add:
-
-NavigationWidget_0 = Error while getting current position value:
-
-NumberOfLines = Number of lines:
-
-ObjectSelectionDialog_0 = Value selector
-ObjectSelectionDialog_3 = Found {0} value(s)
-
-ObjectSelector_0 = Obj:
-ObjectSelector_1 = Select
-
-OpenBiblio_1 = No text in corpus : {0}
-OpenBiblio_2 = Select text id
-OpenBiblio_7 = Could not find text {0} in corpus  {1}
-OpenBiblio_9 = Text {0} has no bibliographic record
-
-OpenBrowser_0 = ** Error while opening bibliographic record {0} with URL={1}
-
-OpenEmptyEditor_2 = Could not find directory: {0}
-
-OpenGraph_8 = Can''t open graphic {0}
-
-OpenSVGGraph_0 = SVG Graphic
-
-OpenURI_0 = ** Desktop is not supported (fatal)
-OpenURI_1 = ** Error while opening file {0}
-
-ParametersDialog_0  = {0} parameters input
-ParametersDialog_1  = Run
-ParametersDialog_10 = Unknowed widget name: '
-ParametersDialog_11 = (* mandatory fields)
-ParametersDialog_12 = ** Error: missing value:
-ParametersDialog_14 = Error in @Option name declaration:
-
-PartitionComposer_0  = Structure:
-PartitionComposer_1  = Error: this partition has no part.
-PartitionComposer_11 = Remove
-PartitionComposer_2  = Select values to assign:
-PartitionComposer_3  = New part
-PartitionComposer_5  = Part
-PartitionComposer_6  = Rmv all the parts
-PartitionComposer_8  = Title:
-PartitionComposer_9  = Assign
-
-PasteFile_1 = ** Failed to copy
-PasteFile_3 = ** Failed to delete
-PasteFile_4 = :
-
-Preferences_Menu_Label = Preferences
-
-PropertiesSelector_0 = Can''t load properties from corpus {0}: {1}
-PropertiesSelector_1 = Properties:
-PropertiesSelector_2 = Edit
-
-PropertySelector_0 = Select a property
-
-QueriesView_1  = Export all
-QueriesView_10 = Error with element {0}
-QueriesView_5  = Queries:\n
-
-QueryAssistDialog_0  = Query Assistant
-QueryAssistDialog_1  = Add a word
-QueryAssistDialog_10 = equals to
-QueryAssistDialog_11 = starts with
-QueryAssistDialog_12 = ends with
-QueryAssistDialog_13 = contains
-QueryAssistDialog_2  = I'm looking for:
-QueryAssistDialog_32 = followed by
-QueryAssistDialog_33 = separated by at least 0 word
-QueryAssistDialog_34 = separated by at least 1 word
-QueryAssistDialog_8  = a word with its property
-
-RefreshingCorporaView = Refreshing corpora...
-
-RenameFile_0 = Rename file
-RenameFile_2 = renaming by:
-RenameFile_3 = ** Failed to rename
-
-RestartTXM_1 = Restart TXM
-
-RunGroovyScript_0 = Script execution
-RunGroovyScript_1 = &Run script
-RunGroovyScript_2 = Run script
-RunGroovyScript_3 = *.groovy
-RunGroovyScript_4 = Error while opening groovy script: {0}
-RunGroovyScript_8 = Error while running script: {0}
-RunGroovyScript_9 = Execute script
-
-SORT_COLUMN = Sorting column...
-SORT_DONE   = Sort done.
-
-SVGGraphicEditor_1 = Cannot draw a graphic with the information provided.
-
-SaveAs_2 = ** Failed to save as
-
-SaveBeforeExecutionDialog_0 = Save before execution ?
-
-ScriptPreferencePage_0 = Next session number
-ScriptPreferencePage_1 = Save script before execution
-
-SetContextSize_1 = &Contexts display options
-SetContextSize_2 = Contexts display options
-SetContextSize_3 = Left context size
-SetContextSize_4 = Right context size
-
-SetEncoding_0 = Change characters encoding
-SetEncoding_1 = Change characters encoding.\n\n\	Current encoding:
-SetEncoding_2 = \n\	Default encoding:
-
-SetLineNumber_0 = Pagination options
-SetLineNumber_1 = Line per page:
-
-SetSortProperty_1 = &Sort options
-SetSortProperty_2 = Sort options
-SetSortProperty_3 = Sort options
-
-ShowSelected_0 = File: 
-
-ShowSvgHelp_0 = Graphics keyboard shortcuts
-ShowSvgHelp_1 = \	Pan: Right Mouse + Drag\n
-ShowSvgHelp_2 = \	Zoom in&out: Mouse wheel OR Shift + Right Mouse + Drag\n
-ShowSvgHelp_3 = \	Zoom to selection: Ctrl+Left Mouse+drag\n
-ShowSvgHelp_4 = \	\n
-ShowSvgHelp_5 = \	Reset the view: F5
-
-SimpleSubcorpusPanel_0 = Structural unit combo selected
-
-SingularValuesEditor_0 = wrong input
-
-SortPropertySelection_0 = Sort options
-
-Structure_field_not_empty = structure field is mandatory.
-
-Submit_0 = Save script
-
-SummaryView_0 = No default edition page found for element: 
-
-TXMEditor_0 = Computing 
-TXMEditor_1 = Computing 
-TXMEditor_2 = Computing
-TXMEditor_3 = Parameters
-TXMEditor_7 = Show/Hide command parameters
-
-TablableVector_0 = The two arrays must have the same size.
-
-TableEditor_0 = Can not create a table with the provided information: {0}
-
-TableKeyListener_0 = Found lines: 
-TableKeyListener_6 = Copied line(s): \n
-
-TableSorter_0 = Column index is too big.
-
-TextometriePreferencePage_0 = Check for updates at startup
-TextometriePreferencePage_1 = General preferences backup
-TextometriePreferencePage_2 = Automatic updates
-
-TextualPlansSection_milestone_label           = Milestone elements
-TextualPlansSection_milestone_tooltip         = List of milestone elements, separated by ',' (comma).
-TextualPlansSection_outsidetext_label         = Outside-text
-TextualPlansSection_outsidetext_tooltip       = List of tags encoding the outside-text \n(no structure or word content indexed, no structure or word content edited in TXM)
-TextualPlansSection_outsidetexttoedit_label   = Outside-text to-edit
-TextualPlansSection_outsidetexttoedit_tooltip = List of tags encoding the outside-text to edit \n(no structure or word content indexed, structure and word content edited in TXM)
-TextualPlansSection_title                     = Textual planes
-
-TxmBrowser_10 = Could not launch the internal web browser. You must set that parameter in the preferences, menu: General>WebNavigator
-TxmBrowser_11 = No previous text
-TxmBrowser_12 = No text next
-TxmBrowser_5  = Previous page
-TxmBrowser_6  = Next page
-TxmBrowser_8  = Next text
-TxmBrowser_9  = Previous text
-
-TxtEditor_0 = TextEditor:
-TxtEditor_1 = Encoding found
-
-UIParameterException_0 = Error
-
-UserPreferencePage_1 = Automatic recomputing when changing a parameter
-UserPreferencePage_3 = Do not confirm to delete an object
-
-common_areYouSure                         = Are you sure ?
-common_beginning                          = Beginning
-common_displayOptions                     = Display options
-common_end                                = End
-common_enterRegularExpressionOfYourSearch = Enter the regular expression of your search
-common_refresh                            = Refresh
-
-error_invalidRegularExpression = Invalid regular expression: {0}
-
-info_txmIsReady = TXM is ready.
-
-preferences_advanced_enableResultsPersistence        = Enable automatic save of all results (persistence)
-preferences_advanced_showAllResultNodesInCorporaView = Show all result nodes in corpora view
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+_1=1.\t
+_2=2.\t
+_3=3.\t
+_default=default
+_default_2=Default
+aBinaryCorpusIsATXMFileExtensionTxmOrZip=A binary corpus is a TXM file (extension .txm or .zip)
+abort=Abort
+aboutTXM=About TXM...
+activateProxyService=Activate Proxy Service
+addAWord=Add a word
+addAXsltParameter=Add a xslt parameter
+addDDot=add\:
+addingToSelection=Adding to selection
+advanced=Advanced
+advancedUserMode=Advanced user mode
+allCriteria=All criteria
+alwaysSaveBeforeLaunching=Always save before launching
+ampContextsDisplayOptions=&Contexts display options
+ampMultipleSort=&Multiple Sort
+ampNameDDot=&Name\:
+ampNew=&New
+ampPropertyDDot=&Property\:
+ampQuery=&Query 
+ampRunScript=&Run script
+ampSortOptions=&Sort options
+ampStructureDDot=&Structure\:
+ampValue=&Value 
+andFrom=and from
+annotateTheCorpus=Annotate the corpus
+areYouSureYouWantToDeleteToSort=Are you sure you want to delete to sort
+argsDDot=Args\: 
+assign=Assign
+assisted=Assisted
+automaticRecomputingWhenChangingAParameter=Automatic recomputing when changing a parameter
+automaticUpdates=Automatic updates
+aWordWithItsProperty=a word with its property
+buildEdition=Build edition
+canceling=Canceling...
+canceling_2=Canceling
+cancelingRequested=\ canceling requested
+cannotAskForTheSimpleTabWhenTheUserHasSelectedTheAdvancedTab=Cannot ask for the simple tab when the user has selected the advanced tab
+cannotComputeCooccurrencesWithTheSelection=cannot compute cooccurrences with the selection
+cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded=Cannot create a Lexical Table from an Index created with a Corpus (more than one column is needed)
+canNotCreateATableWithTheProvidedInformationDDotP0=Can not create a table with the provided information\: {0}
+cannotCreateTheGraphic=** Cannot create the graphic
+cannotDrawAGraphicWithTheInformationProvided=Cannot draw a graphic with the information provided.
+cannotReadTheFileP0=** Cannot read the file {0}
+cannotSaveImportConfigurationNoSourceFolderSelected=Cannot save import configuration. No source folder selected.
+cannotStartImportConfigurationNoSourceFolderSelected=Cannot start import configuration. No source folder selected.
+cantLoadPropertiesFromCorpusP0DDotP1=Can''t load properties from corpus {0}\: {1}
+cantOpenGraphicP0=Can''t open graphic {0}
+changeCharactersEncoding=Change characters encoding
+changeCharactersEncodingCurrentEncodingDDot=Change characters encoding.\n\n\tCurrent encoding\:
+characterEncoding=Character encoding
+checkForUpdatesAtStartup=Check for updates at startup
+checkingForExistingWorkspaceDirectory=Checking for existing workspace directory
+chooseOutfile=Choose outfile
+chooseTheLanguage=Choose the language
+clipboard=Clipboard
+clipboard_2=clipboard
+clipboardIsEmpty=** Clipboard is empty
+columnIndexIsTooBig=Column index is too big.
+columnsSeparatedBy=Columns separated by
+commands=Commands
+common_areYouSure=Are you sure ?
+common_beginning=Beginning
+common_displayOptions=Display options
+common_end=End
+common_enterRegularExpressionOfYourSearch=Enter the regular expression of your search
+common_refresh=Refresh
+complexSortDDot=Complex sort\:
+computeSubCorpusOnP0QueryDDotP1=Compute SubCorpus on {0}. Query\: {1}
+computeSubCorpusOnP0StructsDDotP1AmpPropsP2DDotP3=Compute SubCorpus on {0}. Structs\: {1} & props {2}\: {3}
+computing=Computing 
+computing_3=Computing
+concordanceContextStructureLimits=Concordance context structure limits
+configurationOfTheUserInterfaceLanguage=Configuration of the user interface language
+confirm=Confirm
+consoleReportsAnInternalError=\nConsole reports an Internal error.
+contains=contains
+contextDDot=Context\:
+contextsDisplayOptions=Contexts display options
+coocMatrixDDot=Cooc matrix\:
+coocMatrixParameters=CoocMatrix parameters
+copiedLinesDDot=Copied line(s)\: \n
+corporaBackupedDDotP0=Corpora backuped\: {0}
+corpus=Corpus
+corpusConversionFailed=Corpus conversion failed.
+corpusInfos=Corpus  infos
+corpusNameIsMandatory=Corpus name is mandatory
+corpusNameOnlyCapsAndNoDigitAtBeginning=Corpus name* (only caps and no digit at beginning)
+couldNotCreateBackupDirectoryDDot=** Could not create backup directory \:
+couldNotFindDirectoryDDotP0=Could not find directory\: {0}
+couldNotFindTextP0InCorpusP1=Could not find text {0} in corpus  {1}
+couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator=Could not launch the internal web browser. You must set that parameter in the preferences, menu\: General>WebNavigator
+couldNotReadInstallPreferencesFile=** Could not read install preferences file
+couldNotStartProxyConfigurationDDot=Could not start proxy configuration\: 
+couldNotUnzipBinaryCorpusDDot=** Could not unzip binary corpus\:
+createANewMacroFromATemplate=Create a new macro from a template
+createANewSorter=Create a new sorter
+createPartition=Create Partition
+createSubcorpus=Create subcorpus
+creatingANewPartitionWithP0=Creating a new partition with {0}
+creatingASubcorpusInTheSearchEngine=Creating a sub-corpus in the Search Engine
+creatingASubcorpusOnP0=Creating a sub-corpus on {0}
+creatingTXMUserWorkingDirectory=Creating TXM user working directory.
+dDot=\:
+dDotMandatoryField=*\: mandatory field
+defaultEncodingDDot=\n\tDefault encoding\:
+defaultLanguage=Default language
+defineAndUseACompositeSorter=Define and use a composite sorter
+deletedDDotP0=Deleted\: {0}
+deleteParameter=Delete parameter
+deletingP0=Deleting {0}
+deletingP0Continue=Deleting {0}, continue ?
+descriptionHTMLCompleteNameAuthorDateLicenseComment=Description - HTML (complete name, author, date, license, comment...)
+desktopIsNotSupportedFatal=** Desktop is not supported (fatal)
+displayFont=Display font
+displayInFullText=Display in full text...
+displayRuntimesInConsole=Display runtimes in console
+distance=Distance
+distance_2=Distance 
+doesNotContain=does not contain
+doneDDotP0Created=Done\: {0} created
+doneDDotP0Items=Done\: {0} items
+doneDDotP0Parts=Done\: {0} parts
+doneInP0=Done in {0}.
+doneInP0P1=Done in {0} ({1}).
+doneP0Ms=Done {0} ms.
+doneTheCreatedBinaryFileIsP0=Done, the created binary file is {0}
+doNotConfirmToDeleteAnObject=Do not confirm to delete an object
+dontSaveAndRun=Don't save and run
+downloading=Downloading...
+edit=Edit
+editions=Editions
+editTheNameOfTheNewColumnCreatedByTheMergedColumns=Edit the name of the new column created by the merged columns
+editTheNameOfTheNewLineCreatedByTheMergedLines=Edit the name of the new line created by the merged lines
+editXSLStylesheet=Edit XSL stylesheet...
+elisionCharacters=Elision characters
+EMPTY=\t\n
+enableAutomaticSaveOfAllResultsPersistence=Enable automatic save of all results (persistence)
+encodingFound=Encoding found
+endOfColumnMerge=End of column merge.
+endOfSentenceCharacters=End of sentence characters
+endsWith=ends with
+equalsTo=equals to
+error=Error
+eRROR=\ ERROR
+error_invalidRegularExpression=Invalid regular expression\: {0}
+errorDDotCorporaDirectoryDoesntExistDDot=** Error\: 'corpora' directory doesn't exist\:
+errorDDotCurrentGroovyScriptDirectoryDoesNotExistDDot=Error\: Current Groovy script directory does not exist\: 
+errorDDotDeleteReturnedFalse=Error\: delete() returned 'false'
+errorDDotElementNotRegistered=** Error\: element not registered
+errorDDotGetTextDDotP0=Error\: getText\: {0}
+errorDDotMissingValueDDot=** Error\: missing value\:
+errorDDotObjectIsNotAnOrgw3cElement=** Error\: object is not an 'org.w3c.Element'
+errorDDotP0=Error\: {0}
+errorDDotSubcorpusWasNotCreated=** Error\: subcorpus was not created
+errorDDotThePartitionCreatedHasNoPart=Error\: the partition created has no part
+errorDDotThePartitionWasNotCreated=** Error\: the partition was not created
+errorDDotThisPartitionHasNoPart=Error\: this partition has no part.
+errorDuringParametersInitialisation=Error during parameters initialisation
+errorDuringScriptExecutionDDot=Error during script execution\: 
+errorDuringSortDDotP0=** Error during sort\: {0}
+errorElementDDot=Error element\: '
+errorInAtOptionNameDeclarationDDot=Error in @Option name declaration\:
+errorWhileCallingOrgeclipseuiwindowresetPerspectiveDDot=Error while calling 'org.eclipse.ui.window.resetPerspective'\: 
+errorWhileCleaningPerspectiveDDotNoHandlerServiceFound=Error while cleaning perspective\: no handler service found
+errorWhileComputingCorpusSummary=Error while computing corpus summary
+errorWhileComputingTheConcordanceDDot=Error while computing the concordance\:
+errorWhileCreatingAPartitionDDotP0=Error while creating a partition\: {0}
+errorWhileDeletingP0DDotP1=Error while deleting {0}\: {1}
+errorWhileGettingCurrentPositionValueDDot=Error while getting current position value\:
+errorWhileLoadingTXMDDot=Error while loading TXM\: 
+errorWhileOpeningBibliographicRecordP0WithURLEqualsP1=** Error while opening bibliographic record {0} with URL\={1}
+errorWhileOpeningFileP0=** Error while opening file {0}
+errorWhileOpeningGroovyScriptDDotP0=Error while opening groovy script\: {0}
+errorWhileRunningScriptDDotP0=Error while running script\: {0}
+errorWhileUpdatingTXMDDot=Error while updating TXM\: 
+errorWhileUpdatingTXMDDotNoHandlerServiceFound=Error while updating TXM\: no handler service found
+errorWithElementP0=Error with element {0}
+execDDot=Exec\:
+executeScript=Execute script
+executingGroovyScript=Executing Groovy script...
+executingLastMacroDDot=Executing last macro\: 
+executingLastScriptDDot=Executing last script\: 
+executionCanceled=Execution canceled.
+executionOfP0=Execution of {0}
+exit=Exit
+Explorer_4=⇧
+Explorer_5=↻
+Explorer_7=⌂
+exportAll=Export all
+exportDDotCantCreateFileP0DDotP1=** Export\: Can''t create file {0}\: {1}
+exportFileEncoding=Export file encoding
+exporting=Exporting...
+exportingAnnotations=Exporting annotations.
+exportingP0ThisMayTakeAWhile=Exporting {0}. This may take a while.
+exportingResults=Exporting results.
+exportSettings=Export settings
+extractingBinaryCorpus=Extracting binary corpus
+failedToBackupExistingCorporaDDot=** Failed to backup existing corpora\:
+failedToCancel=Failed to cancel
+failedToCopy=** Failed to copy
+failedToDelete=** Failed to delete
+failedToDeleteFile=** Failed to delete file
+failedToDeleteSubcorpusP0=** Failed to delete subcorpus {0}
+failedToExportCorpusP0=** Failed to export corpus {0}
+failedToExportFileP0WithDeviceP1=Failed to export file {0} with device {1}
+failedToExportInFileP0WithFormatP1=** Failed to export in file {0} with format {1}
+failedToExportResultP0DDotP1=** Failed to export result {0}\: {1}
+failedToGetLastCQPErrorDDot=Failed to get last CQP error\:
+failedToLoadBinaryCorpusNullError=** Failed to load binary corpus (null error).
+failedToLoadCorpusFromDirectoryDDotP0WeCannotFindTheNecessaryComponents=** Failed to load corpus  from directory\: {0}.\nWe cannot find the necessary components
+failedToLoadCorpusP0=** Failed to load corpus  {0}
+failedToMoveCorpus=** Failed to move corpus
+failedToRename=** Failed to rename
+failedToSaveAs=** Failed to save as
+failedToSavePreferencesDDot=Failed to save preferences\:
+fileDDot=File\: 
+fileExplorerDDotIncorrectPattern=** File Explorer\: Incorrect pattern
+FileTreeContentProvider_4='
+folderP0ShouldNotBeDeleted=Folder {0} should not be deleted
+followedBy=followed by
+fontName=Font name
+forceLoggin=Force loggin...
+form=Form
+foundLinesDDot=Found lines\: 
+foundP0Values=Found {0} value(s)
+from=from -
+frontXSL=Front XSL
+generalInformations=General informations
+generalPreferencesBackup=General preferences backup
+goToParentFolder=Go to parent folder
+goToTXMHome=Go to TXM home
+goToTXMHome_2=Go to TXM Home
+graphicsKeyboardShortcuts=Graphics keyboard shortcuts
+groovy=*.groovy
+guessDDot=Guess\:
+h=h,
+iAcceptTheLicenceAndIUndertakeToCiteTXMForAcknowledgingMyUseOfTXMInMyResearchWorkSeeTheCitationSectionOfTheInfhttpDDottextometrieenslyonfrspipphprubrique61SupPage=I accept the licence and I undertake to cite TXM for acknowledging my use of TXM in my research work \n(see the Citation section of the <http\://textometrie.ens-lyon.fr/spip.php?rubrique61> page).
+identifiedLanguage=Identified Language
+imLookingForDDot=I'm looking for\:
+importClipboardText=Import clipboard text
+importParametersOfP0=Import parameters of {0}
+importSetupP0=Import setup - {0}
+importStarted=Import started
+importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot=Import stopped\: corpus name does not matches the '[A-Z][-A-Z0-9]{1,20}' pattern\: 
+impossibleToReadP0=** Impossible to read {0}
+includeTheKeywordStructureInTheCount=include the keyword structure in the count
+info_txmIsReady=TXM is ready.
+infpSupTXMIsPublishedUnderTheGNUGPL2LicenseAmpltInfaHrefEqualshttpsDDotwwwgnuorglicensesgpl20enhtmlSuphttpsDDotwwwgnuorglicensesgpl20enhtmlInfaSupAmpgt=<p>TXM is published under the GNU GPL 2 license &lt;<a href\="https\://www.gnu.org/licenses/gpl-2.0.en.html">https\://www.gnu.org/licenses/gpl-2.0.en.html</a>&gt;.
+initializationOfThePlatform=Initialization of the platform
+initializingPlatform=Initializing platform...
+installPathDDotP0=Install path\: {0}
+integer=Integer
+interfaceLanguageLOCALEWasNotSet=Interface language (LOCALE) was not set
+invalidComparator=Invalid comparator
+invalidName=Invalid name
+invalidProperty=Invalid property
+invalidQuery=Invalid query
+jobDDot=Job\:
+lastCQPErrorDDot=Last CQP error\:
+leftContextSize=Left context size
+lexicalSegmentation=Lexical Segmentation
+lexicon=Lexicon
+linePerPageDDot=Line per page\:
+listOfMilestoneElementsSeparatedByComma=List of milestone elements, separated by ',' (comma).
+listOfTagsEncodingTheOutsidetextNoStructureOrWordContentIndexedNoStructureOrWordContentEditedInTXM=List of tags encoding the outside-text \n(no structure or word content indexed, no structure or word content edited in TXM)
+listOfTagsEncodingTheOutsidetextToEditNoStructureOrWordContentIndexedStructureAndWordContentEditedInTXM=List of tags encoding the outside-text to edit \n(no structure or word content indexed, structure and word content edited in TXM)
+loadingBinaryCorpus=Loading binary corpus
+loadingTheCorpusInThePlatform=Loading the corpus in the platform
+loadingTXMInstallPreferences=Loading TXM install preferences
+loadingViews=Loading views
+lockRCPWorkspace=Lock RCP workspace
+logInAFile=Log in a file
+logInTheConsole=Log in the console
+logLevel=Log level
+logOptionDetected='-log' option detected
+logs=Logs
+macroName=Macro name
+mainLanguage=Main language
+mainLanguageDDot=Main language\:
+mainPage=MainPage
+mandatoryFields=(* mandatory fields)
+match=Match
+merge=merge
+mergeDelete=Merge/Delete
+mergeResultName=merge result name
+metadataColumnTitles=Metadata column titles
+metadatacsvFileFormat=metadata.csv file format
+metadataPreview=Metadata preview
+metadatasParameters=Metadatas parameters
+milestoneElements=Milestone elements
+minAnd=\ min and
+minimalCoFrequence=Minimal co frequence
+moduleUIParametersDDot=module UI parameters\:
+movingCorporaToP0=Moving corpora to {0}.
+movingDownTheSelection=Moving down the selection
+movingUpTheSelection=Moving up the selection
+msec=\ msec
+name=Name 
+nameIsMandatory=Name is mandatory.
+namesDDot=Names\:
+newCorpusDDotP0=New corpus\: {0}.
+newFileDDotP0=New file\: {0}
+newFolderDDotP0=New folder\: {0}
+newMacro=New macro
+newName=New name
+newPart=New part
+nextPage=Next page
+nextSessionNumber=Next session number
+nextText=Next text
+noDefaultEditionPageFoundForElementDDot=No default edition page found for element\: 
+noInterpreterFoundForScriptFileExtension=** No interpreter found for script file extension
+noMetadataFileP0=No metadata file {0}
+noPartitionNameWasSpecifiedTheNameIsP0=No partition name was specified. The name is {0}
+noPartWasDefined=No part was defined
+noPreviousText=No previous text
+noSelectionForDDot=No selection for\: 
+noSubcorpusNameWasSpecifiedWeveGeneratedOne=No subcorpus name was specified. We've generated one.
+noteDDotUseValueToGuess=Note\: Use '??' value to guess.
+noTextInCorpusDDotP0=No text in corpus \: {0}
+noTextNext=No text next
+numberOfEdgesDDot=Number of edges\:
+numberOfLinesDDot=Number of lines\:
+numberOfNodesDDot=Number of nodes\:
+objDDot=Obj\:
+openingComplexSortDialog=Opening complex sort dialog
+openingCooccurrentsTable=Opening cooccurrents table
+openTheQueryAssistant=Open the query assistant
+options=Options
+outfileDDotNone=Outfile\: none
+outsidetext=Outside-text
+outsidetextToedit=Outside-text to-edit
+p0Import={0} Import
+p0ParametersInput={0} parameters input
+p0ScriptFileDoesntExist=** {0} script file doesn''t exist
+p1ExportSavedInFileDDotP0={1} export saved in file\: {0}
+p1FileSavedInP0={1} file saved in {0}
+pageBreakTag=Page break tag
+paginationOptions=Pagination options
+panDDotRightMousePlusDrag=\tPan\: Right Mouse + Drag\n
+parameters=Parameters
+part=Part
+pleaseWriteTheMacroName=Please write the macro name
+preferences=Preferences
+previousPage=Previous page
+previousText=Previous text
+printTheStacktrace=Print the stacktrace
+propertiesDDot=Properties\:
+punctuations=Punctuations
+queriesCannotBeLeftEmpty=Queries cannot be left empty.
+queriesDDot=Queries\:\n
+query=Query
+queryAssistant=Query Assistant
+queryCannotBeLeftEmpty=Query cannot be left empty.
+ready=Ready.
+readyToShowUpdateUI=Ready to show Update UI
+referencesAmpdisplayOptions=References &display options
+referencesAmpsortOptions=References &sort options
+referencesDisplayOptions=References display options
+referencesSortOptions=References sort options
+refreshingCorpora=Refreshing corpora...
+regexpPatternToHideFiles=Regexp pattern to hide files
+reload=Reload
+remove=Remove
+removeFromSelection=Remove from selection
+removeUnnecessaryE4Elements=Remove unnecessary e4 elements
+removeUnusedEclipseRCPPreferencePage=Remove unused Eclipse RCP preference page
+removingOldCorpusBackupDirectoryP0=Removing old corpus backup directory {0}.
+renameFile=Rename file
+renamingByDDot=renaming by\:
+resetTheViewDDotF5=\tReset the view\: F5
+restartingThePlatform=Restarting the platform
+restartTXM=Restart TXM
+rightContextSize=Right context size
+rmvAllTheParts=Rmv all the parts
+run=Run
+runScript=Run script
+saveAndRun=Save and run
+saveBeforeExecution=Save before execution ?
+saveFileBeforeExecution=Save file before execution ?
+saveScript=Save script
+saveScriptBeforeExecution=Save script before execution
+savingImportParameters=Saving import parameters...
+scriptExecution=Script execution
+sec=\ sec
+select=Select
+selectACompositeSorter=Select a composite sorter
+selectAProperty=Select a property
+selectDDot=Select\:
+selectionIsNotACorpusDDot=Selection is not a corpus\: 
+selectTextId=Select text id
+selectTheSourceDirectory=Select the source directory.
+selectValuesToAssignDDot=Select values to assign\:
+separatedByAtLeast0Word=separated by at least 0 word
+separatedByAtLeast1Word=separated by at least 1 word
+separatorCharacters=Separator characters
+setImportParametersInTheSectionsBelow=Set import parameters in the sections below.
+settingStatusLineAndConfiguringActionSets=Setting status line and configuring action sets
+shouldNotHappen=Should not happen
+showAllResultNodesInCorporaView=Show all result nodes in corpora view
+showExportResultInTheTextEditor=Show export result in the text editor
+showHiddenFiles=Show hidden files
+showHideCommandParameters=Show/Hide command parameters
+simple=Simple
+someCriteria=Some criteria
+sort=Sort
+sortDone=Sort done.
+sortingColumn=Sorting column...
+sortKeys=Sort keys
+sortOptions=Sort options
+sourceCharactersEncoding=Source characters encoding
+sourceDirectoryDDot=Source directory\:
+sourcesCharactersEncodingDDot=Sources characters encoding\:
+spaces=Spaces
+startCorpusImport=Start corpus import.
+startingUpdateFetch=Starting update fetch
+startingUpP0=Starting up {0}...
+startJobDDotCheckTXMHOME=Start job\: check TXMHOME
+startJobDDotInitializeUI=Start job\: initialize UI
+startJobDDotLoadInstallPreferences=Start job\: load install preferences
+startsWith=starts with
+startupFailedPleaseCheckTXMPreferencesInTheFileSupPreferencesMenuOrContactTxmusersMailingListMenuDDotHelpSup=** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu\: Help>
+string=String
+structuralUnitComboSelected=Structural unit combo selected
+structure=structure
+structureDDot=Structure\:
+structureFieldIsMandatory=structure field is mandatory.
+sVGGraphic=SVG Graphic
+switchLanguageDDotMalformedUrlDDotP0=SwitchLanguage\: Malformed url\: {0}
+systemOutput=System Output
+termsOfService=Terms of service
+textEditorDDot=TextEditor\:
+textID=Text ID
+textP0HasNoBibliographicRecord=Text {0} has no bibliographic record
+textSeparator=Text separator
+textualPlanes=Textual planes
+theCorpusAndTheCorpusP0WillBeDeleted=The corpus  and the corpus {0} will be deleted
+theErrorIsDDot=The error is\:
+theFileP0DoesNotExist=The file {0} does not exist
+theInputP0CannotBeDisplayed=The input {0} cannot be displayed.
+theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual=The number of editors ({0}) and number of inputs ({1}) must be equal.
+theP0CorpusDirectoryAlreadyExistsDoYouWantToReplaceIt=The {0} corpus directory already exists. Do you want to replace it ?
+theP1GroovyScriptMustBeInTheP0Folder=The {1} Groovy script must be in the {0} folder. 
+theTableMustContainAtLeastOneLine=The table must contain at least one line
+theTwoArraysMustHaveTheSameSize=The two arrays must have the same size.
+theUserCanceledTheScriptExecution=The user canceled the script execution
+thisComputerEncodingDDot=This computer encoding\:
+thisComputerLanguageDDot=This computer language\:
+thisDirectorySeemsToContainABinaryCorpus=This directory seems to contain a binary corpus
+thisFileIsNotATXMFileDDotP0=This file is not a TXM file\: {0}
+thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual=This file is not meant to run TXM. Please consult TXM user manual.
+titleDDot=Title\:
+to=\ to
+to_2=to -
+to_3=to
+tokenizerParameterFileDDot=Tokenizer parameter file\:
+tXM=TXM
+tXMiniDDot=TXM.ini\:
+tXMInstallDirectory=TXM Install directory
+tXMUserDirectory=TXM user directory
+tXMWorkspaceDirectoryAlreadyExistsP0WouldYouLikeToReloadItsCorporaInYourNewTXM=TXM workspace directory already exists ({0}). Would you like to reload its corpora in your new TXM?"
+unknowedWidgetNameDDot=Unknowed widget name\: '
+updateLevel=Update level
+useLeftWindow=use left Window
+useRightWindow=use right Window
+userInterfaceLanguage=User interface language
+usingLanguage=Using language
+valueSelector=Value selector
+warning=Warning
+warningDDotTheCorpusP0IsCorruptedSomeCommandsWontWorkCorrectly=** Warning\: the corpus {0} is corrupted. Some commands won''t work correctly.
+warningDDotTheImportScriptIsMissingDDotP0=Warning\: the import script is missing\: {0}
+word=word
+wordsPerPage=Words per page
+workspaceDirectoryBackup=Workspace directory backup
+writingCoocMatrixInGRAPHMLFileDDot=Writing cooc matrix in GRAPHML file\:
+wrongInput=wrong input
+youMustSelectAtLeast2Comparators=you must select at least 2 comparators
+zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag=\tZoom in&out\: Mouse wheel OR Shift + Right Mouse + Drag\n
+zoomToSelectionDDotCtrlPlusLeftMousePlusdrag=\tZoom to selection\: Ctrl+Left Mouse+drag\n
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableSorter.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableSorter.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableSorter.java	(revision 1335)
@@ -95,7 +95,7 @@
 			direction = DESCENDING;
 		}
 		if (columnTypes != null && column >= columnTypes.length) {
-			throw new IllegalArgumentException(TXMUIMessages.TableSorter_0);
+			throw new IllegalArgumentException(TXMUIMessages.columnIndexIsTooBig);
 		}
 	}
 
@@ -137,4 +137,4 @@
 		this.collator = Collator.getInstance(locale);
 		this.collator.setStrength(Collator.TERTIARY);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TxtEditor.java	(revision 1335)
@@ -113,7 +113,7 @@
 			if (encoding != null && encodingSupport != null) {
 				try {
 					encodingSupport.setEncoding(encoding);
-					System.out.println(TXMUIMessages.TxtEditor_0+f+TXMUIMessages.TxtEditor_1+encoding);
+					System.out.println(TXMUIMessages.textEditorDDot+f+TXMUIMessages.encodingFound+encoding);
 				} catch(Throwable e) { }
 
 			}
@@ -125,4 +125,4 @@
 	public TextViewer getTextViewer() {
 		return ((TextViewer) this.getSourceViewer());
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMMultiPageEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMMultiPageEditor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMMultiPageEditor.java	(revision 1335)
@@ -80,7 +80,7 @@
 		IEditorInput input = getEditorInput();
 		if (!(input instanceof IProvidingMultiPageEditorInput)) {
 			throw new IllegalArgumentException(NLS.bind(
-					TXMUIMessages.GenericMultiPageEditor_1, input.getName()));
+					TXMUIMessages.theInputP0CannotBeDisplayed, input.getName()));
 		}
 
 		editors = ((IProvidingMultiPageEditorInput) input).getEditors();
@@ -89,7 +89,7 @@
 
 		if (editors.size() != inputs.size()) {
 			throw new IllegalArgumentException(NLS.bind(
-					TXMUIMessages.GenericMultiPageEditor_3, editors.size(), inputs.size()));
+					TXMUIMessages.theNumberOfEditorsP0AndNumberOfInputsP1MustBeEqual, editors.size(), inputs.size()));
 		}
 
 		for (int i = 0; i < editors.size(); i++) {
@@ -171,4 +171,4 @@
 	public List<EditorPart> getEditors() {
 		return editors;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java	(revision 1335)
@@ -160,7 +160,7 @@
 				}
 				
 			} else {
-				throw new IllegalArgumentException(TXMUIMessages.SVGGraphicEditor_1);
+				throw new IllegalArgumentException(TXMUIMessages.cannotDrawAGraphicWithTheInformationProvided);
 			}
 		}
 		svgComp.resetZoom();
@@ -250,4 +250,4 @@
 //		svgComp.setSVGFile(svgfile);
 		svgComp.redraw();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableKeyListener.java	(revision 1335)
@@ -64,7 +64,7 @@
 					}
 				}
 			}
-			Log.info(TXMUIMessages.TableKeyListener_0 + matchingIndexes);
+			Log.info(TXMUIMessages.foundLinesDDot + matchingIndexes);
 
 			// TODO: useless ?
 //			int[] indexes = new int[matchingIndexes.size()];
@@ -110,6 +110,6 @@
 			}
 		}
 		org.txm.rcp.utils.IOClipboard.write(str);
-		System.out.println(TXMUIMessages.TableKeyListener_6+str);
+		System.out.println(TXMUIMessages.copiedLinesDDot+str);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/adaptableDataStructure/TablableVector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/adaptableDataStructure/TablableVector.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/adaptableDataStructure/TablableVector.java	(revision 1335)
@@ -58,7 +58,7 @@
 		this.columnTitles = columnTitles;
 		this.columnTypes = columnTypes;
 		if (columnTitles.length != columnTypes.length)
-			throw new IllegalArgumentException(TXMUIMessages.TablableVector_0);
+			throw new IllegalArgumentException(TXMUIMessages.theTwoArraysMustHaveTheSameSize);
 	}
 
 	/* (non-Javadoc)
@@ -158,4 +158,4 @@
 		return columnTypes;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMBrowser.java	(revision 1335)
@@ -205,7 +205,7 @@
 			String editionName = corpus.getDefaultEdition();
 			currentPage = firstText.getEdition(editionName).getFirstPage(); 
 			if (currentPage == null) {
-				StatusLine.setMessage(TXMUIMessages.TxmBrowser_11);
+				StatusLine.setMessage(TXMUIMessages.noPreviousText);
 				return;
 			}
 			this.setEdition(firstText.getEdition(editionName)); 
@@ -225,7 +225,7 @@
 		if (lastText != null) {
 			currentPage = lastText.getEdition(b.getDefaultEdition()).getFirstPage(); 
 			if (currentPage == null) {
-				StatusLine.setMessage(TXMUIMessages.TxmBrowser_12);
+				StatusLine.setMessage(TXMUIMessages.noTextNext);
 				return;
 			}
 			this.setEdition(lastText.getEdition(b.getDefaultEdition())); 
@@ -312,7 +312,7 @@
 				currentPage = previousText.getEdition(editionName).getFirstPage();
 			}
 			if (currentPage == null) {
-				StatusLine.setMessage(TXMUIMessages.TxmBrowser_11);
+				StatusLine.setMessage(TXMUIMessages.noPreviousText);
 				return;
 			}
 			this.setEdition(previousText.getEdition(editionName)); 
@@ -333,7 +333,7 @@
 		if (nextText != null) {
 			currentPage = nextText.getEdition(b.getDefaultEdition()).getFirstPage(); 
 			if (currentPage == null) {
-				StatusLine.setMessage(TXMUIMessages.TxmBrowser_12);
+				StatusLine.setMessage(TXMUIMessages.noTextNext);
 				return;
 			}
 			this.setEdition(nextText.getEdition(b.getDefaultEdition())); 
@@ -351,7 +351,7 @@
 		try {
 			super.createPartControl(parent);
 		} catch (Exception e) {
-			System.err.println(TXMUIMessages.TxmBrowser_10);
+			System.err.println(TXMUIMessages.couldNotLaunchTheInternalWebBrowserYouMustSetThatParameterInThePreferencesMenuDDotGeneralSupWebNavigator);
 			return;
 		}
 		
@@ -396,17 +396,17 @@
 		firstText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWINDSTART));
 		firstText.setToolTipText("|<<");
 		previousText.setImage(IImageKeys.getImage(IImageKeys.CTRLREWIND));
-		previousText.setToolTipText(TXMUIMessages.TxmBrowser_9);
+		previousText.setToolTipText(TXMUIMessages.previousText);
 		first.setImage(IImageKeys.getImage(IImageKeys.CTRLSTART)); 
 		first.setToolTipText(TXMUIMessages.common_beginning);
 		previous.setImage(IImageKeys.getImage(IImageKeys.CTRLREVERSE));
-		previous.setToolTipText(TXMUIMessages.TxmBrowser_5);
+		previous.setToolTipText(TXMUIMessages.previousPage);
 		next.setImage(IImageKeys.getImage(IImageKeys.CTRLPLAY));
-		next.setToolTipText(TXMUIMessages.TxmBrowser_6);
+		next.setToolTipText(TXMUIMessages.nextPage);
 		last.setImage(IImageKeys.getImage(IImageKeys.CTRLEND));
 		last.setToolTipText(TXMUIMessages.common_end);
 		nextText.setImage(IImageKeys.getImage(IImageKeys.CTRLFASTFORWARD));
-		nextText.setToolTipText(TXMUIMessages.TxmBrowser_8);
+		nextText.setToolTipText(TXMUIMessages.nextText);
 		lastText.setImage(IImageKeys.getImage(IImageKeys.CTRLFASTFORWARDEND));
 		lastText.setToolTipText(">>|");
 		
@@ -661,4 +661,4 @@
 	public Page getCurrentPage() {
 		return currentPage;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/ImportFormEditor.java	(revision 1335)
@@ -131,7 +131,7 @@
 		//ExecuteImportScript.getImportScriptFromToolboxPlugin(getGroovyscript()); // always update if script from Toolbox is more recent
 		
 		if (!getGroovyscript().exists()) // just a warning message
-			System.out.println(NLS.bind(TXMUIMessages.ImportFormEditor_0, getGroovyscript()));
+			System.out.println(NLS.bind(TXMUIMessages.warningDDotTheImportScriptIsMissingDDotP0, getGroovyscript()));
 	}
 
 	/**
@@ -186,7 +186,7 @@
 	 */
 	@Override
 	public String getPartName() {
-		String name = TXMUIMessages.bind(TXMUIMessages.ImportFormEditor_1,ImportModuleCustomization.getName(groovyscript.getName()));
+		String name = TXMUIMessages.bind(TXMUIMessages.p0Import,ImportModuleCustomization.getName(groovyscript.getName()));
 		return name;
 	}
 	
@@ -237,4 +237,4 @@
 	public void setGroovyscript(File groovyscript) {
 		this.groovyscript = groovyscript;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TokenizerSection.java	(revision 1335)
@@ -41,7 +41,7 @@
 	public TokenizerSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style, HashMap<String, Boolean> moduleParams) {
 		super(toolkit2, form2, parent, style);
 		this.moduleParams = moduleParams;
-		this.section.setText(TXMUIMessages.MainPage_19);
+		this.section.setText(TXMUIMessages.lexicalSegmentation);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -87,13 +87,13 @@
 			public void widgetDefaultSelected(SelectionEvent e) { }
 		});
 
-		Label l0 = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_16a, SWT.WRAP);
+		Label l0 = toolkit.createLabel(sectionClient, TXMUIMessages.separatorCharacters, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 3;
 		gdata.indent = 10;
 		l0.setLayoutData(gdata);
 
-		Label l1 = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_5, SWT.WRAP);
+		Label l1 = toolkit.createLabel(sectionClient, TXMUIMessages.spaces, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 20;
@@ -103,7 +103,7 @@
 		gdata = getLongTextGridData();
 		textWhiteSpaces.setLayoutData(gdata);
 
-		Label l2 = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_16, SWT.WRAP);
+		Label l2 = toolkit.createLabel(sectionClient, TXMUIMessages.punctuations, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 20;
@@ -113,7 +113,7 @@
 		gdata = getLongTextGridData();
 		textPuncts.setLayoutData(gdata);
 
-		Label l4 = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_19, SWT.WRAP);
+		Label l4 = toolkit.createLabel(sectionClient, TXMUIMessages.elisionCharacters, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 10;
@@ -123,7 +123,7 @@
 		gdata = getLongTextGridData();
 		textElisions.setLayoutData(gdata);
 
-		Label l3 = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_22, SWT.WRAP);
+		Label l3 = toolkit.createLabel(sectionClient, TXMUIMessages.endOfSentenceCharacters, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 10;
@@ -133,7 +133,7 @@
 		gdata = getLongTextGridData();
 		textPunctsStrong.setLayoutData(gdata);
 
-		Button defaultBtn = toolkit.createButton(sectionClient, TXMUIMessages.CorpusPage_49, SWT.PUSH);
+		Button defaultBtn = toolkit.createButton(sectionClient, TXMUIMessages._default_2, SWT.PUSH);
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL);
 		gdata.colspan = 2;
 		gdata.indent = 10;
@@ -344,4 +344,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EditionSection.java	(revision 1335)
@@ -50,7 +50,7 @@
 	public EditionSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style, HashMap<String, Boolean> moduleParams, String scriptName) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(TXMUIMessages.CorpusPage_0);
+		this.section.setText(TXMUIMessages.editions);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		layout.numColumns = 1;
@@ -71,7 +71,7 @@
 		this.section.setClient(sectionClient);
 
 		// build text edition or not button
-		buildEditionCheckButton = toolkit.createButton(sectionClient, TXMUIMessages.CorpusPage_44, SWT.CHECK);
+		buildEditionCheckButton = toolkit.createButton(sectionClient, TXMUIMessages.buildEdition, SWT.CHECK);
 		buildEditionCheckButton.setSelection(true);
 		TableWrapData gdata2 = getButtonLayoutData();
 		gdata2.colspan = 4; // one line
@@ -80,7 +80,7 @@
 		// words per page -> pageSize
 		Label tmpLabel = null;
 		if (moduleParams.get(ImportModuleCustomization.EDITIONS_WORDSPERPAGE)) {
-			tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_36);
+			tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.wordsPerPage);
 			tmpLabel.setLayoutData(getLabelGridData());
 
 			wordsPerPageText = toolkit.createText(sectionClient, "500", SWT.BORDER); //$NON-NLS-1$
@@ -90,7 +90,7 @@
 
 		if (moduleParams.get(ImportModuleCustomization.EDITIONS_PAGEELEMENT)) {
 			// page break tag
-			tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_41);
+			tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.pageBreakTag);
 			tmpLabel.setLayoutData(getLabelGridData());
 			pageBreakText = toolkit.createText(sectionClient, "pb", SWT.BORDER); //$NON-NLS-1$
 			TableWrapData gdata = getTextGridData();
@@ -288,4 +288,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/UISection.java	(revision 1335)
@@ -22,7 +22,7 @@
 	public UISection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(TXMUIMessages.CorpusPage_63);
+		this.section.setText(TXMUIMessages.commands);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -40,8 +40,8 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		Label tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_64);
-		tmpLabel.setToolTipText(TXMUIMessages.CorpusPage_65);
+		Label tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.concordanceContextStructureLimits);
+		tmpLabel.setToolTipText(TXMUIMessages.cannotSaveImportConfigurationNoSourceFolderSelected);
 		tmpLabel.setLayoutData(getLabelGridData());
 
 		structLimitsText = toolkit.createText(sectionClient, "text", SWT.BORDER); //$NON-NLS-1$
@@ -84,4 +84,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/InfosSection.java	(revision 1335)
@@ -30,7 +30,7 @@
 		super(toolkit2, form2, parent, style);
 		
 		//this = toolkit.createSection(form.getBody(), ExpandableComposite.TITLE_BAR|ExpandableComposite.TWISTIE);
-		this.section.setText(TXMUIMessages.CorpusPage_7);
+		this.section.setText(TXMUIMessages.generalInformations);
 		section.setExpanded(true);
 		
 		TableWrapLayout layout = new TableWrapLayout();
@@ -49,11 +49,11 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		corpusNameLabel = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_8, SWT.WRAP);
+		corpusNameLabel = toolkit.createLabel(sectionClient, TXMUIMessages.corpusNameOnlyCapsAndNoDigitAtBeginning, SWT.WRAP);
 		TableWrapData gdata = new TableWrapData();
 		corpusNameLabel.setLayoutData(gdata);
 
-		Label label = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_9, SWT.WRAP);
+		Label label = toolkit.createLabel(sectionClient, TXMUIMessages.descriptionHTMLCompleteNameAuthorDateLicenseComment, SWT.WRAP);
 		gdata = new TableWrapData();
 		label.setLayoutData(gdata);
 
@@ -70,7 +70,7 @@
 
 	@Override
 	public void update(Project project) {
-		section.setText(TXMUIMessages.MainPage_3+" "+project.getSrcdir()); //$NON-NLS-1$
+		section.setText(TXMUIMessages.corpusInfos+" "+project.getSrcdir()); //$NON-NLS-1$
 		
 		corpusText.setText(project.getName());
 		
@@ -88,12 +88,12 @@
 		System.out.println("");
 		
 		if (corpusText.getText().trim().length() == 0) {
-			System.out.println(TXMUIMessages.CorpusPage_53);
+			System.out.println(TXMUIMessages.corpusNameIsMandatory);
 			return false;
 		}
 		
 		if (!corpusText.getText().matches("[A-Z][-A-Z0-9]{1,20}")) { //$NON-NLS-1$
-			System.out.println(TXMUIMessages.CorpusPage_93+corpusText.getText());
+			System.out.println(TXMUIMessages.importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot+corpusText.getText());
 			return false;
 		}
 		
@@ -109,7 +109,7 @@
 		String corpusname = corpusText.getText();
 		Log.warning("Checking corpus name validity with '[A-Z][-A-Z0-9]+': "+corpusname);
 		if (!corpusname.matches("[A-Z][-A-Z0-9]+")) { //$NON-NLS-1$
-			System.out.println(TXMUIMessages.CorpusPage_93+corpusname);
+			System.out.println(TXMUIMessages.importStoppedDDotCorpusNameDoesNotMatchesTheAZAZ09120PatternDDot+corpusname);
 
 			Device device = Display.getCurrent ();
 			Color red = new Color (device, 255, 0, 0);
@@ -125,4 +125,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FrontXSLSection.java	(revision 1335)
@@ -48,7 +48,7 @@
 	public FrontXSLSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(TXMUIMessages.MainPage_18);
+		this.section.setText(TXMUIMessages.frontXSL);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -99,7 +99,7 @@
 			}
 		});
 
-		Button editXSLTButton = toolkit.createButton(sectionClient, TXMUIMessages.CorpusPage_61, SWT.PUSH);
+		Button editXSLTButton = toolkit.createButton(sectionClient, TXMUIMessages.editXSLStylesheet, SWT.PUSH);
 		editXSLTButton.setLayoutData(getButtonLayoutData());
 		editXSLTButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -117,7 +117,7 @@
 		Label l = toolkit.createLabel(sectionClient, ""); // empty cell //$NON-NLS-1$
 		l.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.MIDDLE));
 
-		Button addButton = toolkit.createButton(sectionClient, TXMUIMessages.CorpusPage_4, SWT.PUSH);
+		Button addButton = toolkit.createButton(sectionClient, TXMUIMessages.addAXsltParameter, SWT.PUSH);
 		addButton.setLayoutData(getButtonLayoutData());
 		addButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -131,14 +131,14 @@
 				LinkedHashMap<String, String> values = new LinkedHashMap<String, String>();
 				values.put("name", ""); //$NON-NLS-1$ //$NON-NLS-2$
 				values.put("value", "");			 //$NON-NLS-1$ //$NON-NLS-2$
-				MultipleValueDialog dlg = new MultipleValueDialog(form.getShell(), TXMUIMessages.CorpusPage_4, values);
+				MultipleValueDialog dlg = new MultipleValueDialog(form.getShell(), TXMUIMessages.addAXsltParameter, values);
 				if (dlg.open() == Window.OK) {
 					project.setXsltParameter(values.get("name"), values.get("value")); //$NON-NLS-1$ //$NON-NLS-2$
 				}
 			}
 		});
 
-		Button removeButton = toolkit.createButton(sectionClient, TXMUIMessages.CorpusPage_6, SWT.PUSH);
+		Button removeButton = toolkit.createButton(sectionClient, TXMUIMessages.deleteParameter, SWT.PUSH);
 		TableWrapData td = getButtonLayoutData();
 		td.colspan = 3;
 		removeButton.setLayoutData(td);
@@ -219,4 +219,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java	(revision 1335)
@@ -33,7 +33,7 @@
 	public LangSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(TXMUIMessages.MainPage_20);
+		this.section.setText(TXMUIMessages.mainLanguage);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -53,13 +53,13 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		btnSelectAnnotate = toolkit.createButton(sectionClient, TXMUIMessages.CorpusPage_26, SWT.CHECK); 
+		btnSelectAnnotate = toolkit.createButton(sectionClient, TXMUIMessages.annotateTheCorpus, SWT.CHECK); 
 		toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
 
-		btnGuessLang = toolkit.createButton(sectionClient, TXMUIMessages.ImportDialog_16, SWT.RADIO);
+		btnGuessLang = toolkit.createButton(sectionClient, TXMUIMessages.guessDDot, SWT.RADIO);
 		toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
 
-		btnSelectLang = toolkit.createButton(sectionClient, TXMUIMessages.ImportDialog_22, SWT.RADIO);
+		btnSelectLang = toolkit.createButton(sectionClient, TXMUIMessages.selectDDot, SWT.RADIO);
 
 		langcombo = new Combo(sectionClient, SWT.BORDER);
 		TableWrapData gdata = getTextGridData();
@@ -172,4 +172,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TextualPlansSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TextualPlansSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/TextualPlansSection.java	(revision 1335)
@@ -25,7 +25,7 @@
 	public TextualPlansSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(TXMUIMessages.TextualPlansSection_title);
+		this.section.setText(TXMUIMessages.textualPlanes);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -43,16 +43,16 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		Label tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.TextualPlansSection_outsidetext_label);
-		tmpLabel.setToolTipText(TXMUIMessages.TextualPlansSection_outsidetext_tooltip);
+		Label tmpLabel = toolkit.createLabel(sectionClient, TXMUIMessages.outsidetext);
+		tmpLabel.setToolTipText(TXMUIMessages.listOfTagsEncodingTheOutsidetextNoStructureOrWordContentIndexedNoStructureOrWordContentEditedInTXM);
 		tmpLabel.setLayoutData(getLabelGridData());
 
 		outsideTextElementsText = toolkit.createText(sectionClient, "teiHeader", SWT.BORDER); //$NON-NLS-1$
 		TableWrapData gdata = getTextGridData();
 		outsideTextElementsText.setLayoutData(gdata);
 
-		Label tmpLabel2 = toolkit.createLabel(sectionClient, TXMUIMessages.TextualPlansSection_outsidetexttoedit_label);
-		tmpLabel2.setToolTipText(TXMUIMessages.TextualPlansSection_outsidetexttoedit_tooltip);
+		Label tmpLabel2 = toolkit.createLabel(sectionClient, TXMUIMessages.outsidetextToedit);
+		tmpLabel2.setToolTipText(TXMUIMessages.listOfTagsEncodingTheOutsidetextToEditNoStructureOrWordContentIndexedStructureAndWordContentEditedInTXM);
 		tmpLabel2.setLayoutData(getLabelGridData());
 
 		outsideTextElementsToEditText = toolkit.createText(sectionClient, "", SWT.BORDER); //$NON-NLS-1$
@@ -67,8 +67,8 @@
 		gdata = getTextGridData();
 		noteElementsText.setLayoutData(gdata);
 
-		Label tmpLabel4 = toolkit.createLabel(sectionClient, TXMUIMessages.TextualPlansSection_milestone_label);
-		tmpLabel4.setToolTipText(TXMUIMessages.TextualPlansSection_milestone_tooltip);
+		Label tmpLabel4 = toolkit.createLabel(sectionClient, TXMUIMessages.milestoneElements);
+		tmpLabel4.setToolTipText(TXMUIMessages.listOfMilestoneElementsSeparatedByComma);
 		tmpLabel4.setLayoutData(getLabelGridData());
 
 		milestoneElementsText = toolkit.createText(sectionClient, "", SWT.BORDER); //$NON-NLS-1$
@@ -113,4 +113,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/EncodingSection.java	(revision 1335)
@@ -30,7 +30,7 @@
 	public EncodingSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 		
-		this.section.setText(TXMUIMessages.MainPage_23);
+		this.section.setText(TXMUIMessages.sourceCharactersEncoding);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		layout.numColumns = 1;
@@ -53,12 +53,12 @@
 		btnGuessEncoding = toolkit.createButton(sectionClient, "", SWT.RADIO); //$NON-NLS-1$
 		TableWrapData td = getButtonLayoutData();
 		btnGuessEncoding.setLayoutData(td);
-		btnGuessEncoding.setText(TXMUIMessages.ImportDialog_16);
+		btnGuessEncoding.setText(TXMUIMessages.guessDDot);
 		toolkit.createLabel(sectionClient, ""); //$NON-NLS-1$
 
 		btnSelectEncoding = toolkit.createButton(sectionClient, "", SWT.RADIO); //$NON-NLS-1$
 		btnSelectEncoding.setLayoutData(getButtonLayoutData());
-		btnSelectEncoding.setText(TXMUIMessages.ImportDialog_22);
+		btnSelectEncoding.setText(TXMUIMessages.selectDDot);
 
 		encodingCombo = new Combo(sectionClient, SWT.BORDER);
 		TableWrapData gdata = getTextGridData();
@@ -150,4 +150,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/FontSection.java	(revision 1335)
@@ -25,7 +25,7 @@
 	public FontSection(FormToolkit toolkit2, ScrolledForm form2, Composite parent, int style) {
 		super(toolkit2, form2, parent, style);
 
-		this.section.setText(TXMUIMessages.CorpusPage_3);
+		this.section.setText(TXMUIMessages.displayFont);
 		TableWrapLayout layout = new TableWrapLayout();
 		layout.makeColumnsEqualWidth = true;
 		this.section.setLayout(layout);
@@ -45,7 +45,7 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 
-		Label l = toolkit.createLabel(sectionClient, TXMUIMessages.CorpusPage_57, SWT.WRAP);
+		Label l = toolkit.createLabel(sectionClient, TXMUIMessages.fontName, SWT.WRAP);
 		l.setLayoutData(new TableWrapData(TableWrapData.LEFT, TableWrapData.MIDDLE));
 
 		fontCombo = new Combo(sectionClient, SWT.BORDER);
@@ -101,4 +101,4 @@
 	public int getSectionSize() {
 		return SECTION_SIZE;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/CorpusPage.java	(revision 1335)
@@ -127,7 +127,7 @@
 	 * @param corpusname 
 	 */
 	public CorpusPage(ImportFormEditor editor) {
-		super(editor, TXMUIMessages.CorpusPage_30, TXMUIMessages.CorpusPage_30); 
+		super(editor, TXMUIMessages.parameters, TXMUIMessages.parameters); 
 		this.editor = editor;
 	}
 
@@ -222,7 +222,7 @@
 		gdata.colspan = 2;
 		separatorLabel.setLayoutData(gdata);
 
-		Label mandatoryLabel = toolkit.createLabel(form.getBody(), TXMUIMessages.CorpusPage_40, SWT.WRAP);
+		Label mandatoryLabel = toolkit.createLabel(form.getBody(), TXMUIMessages.dDotMandatoryField, SWT.WRAP);
 		gdata = new TableWrapData(TableWrapData.FILL, TableWrapData.MIDDLE, 2,1);
 		gdata.colspan = 2;
 		mandatoryLabel.setLayoutData(gdata);
@@ -710,7 +710,7 @@
 
 		Label titleLabel = toolkit.createLabel(hyperlinks,"", SWT.WRAP); //$NON-NLS-1$
 		titleLabel.setLayoutData(new TableWrapData(TableWrapData.FILL, TableWrapData.TOP));
-		titleLabel.setText(NLS.bind(TXMUIMessages.MainPage_2, 
+		titleLabel.setText(NLS.bind(TXMUIMessages.importParametersOfP0, 
 				ImportModuleCustomization.getName(editor.getGroovyScript().getName())));
 		FontData[] fD = titleLabel.getFont().getFontData();
 		fD[0].setHeight(16);
@@ -730,7 +730,7 @@
 				if (project != null) {
 					saveConfig();
 				} else 
-					System.out.println(TXMUIMessages.CorpusPage_66);
+					System.out.println(TXMUIMessages.cannotStartImportConfigurationNoSourceFolderSelected);
 			}
 		};
 
@@ -743,7 +743,7 @@
 						startImport();
 					}
 				} else 
-					System.out.println(TXMUIMessages.CorpusPage_66);
+					System.out.println(TXMUIMessages.cannotStartImportConfigurationNoSourceFolderSelected);
 			}
 		};
 
@@ -770,9 +770,9 @@
 		RowLayout hLayout = new RowLayout();
 		hLayout.center = true;
 		line1.setLayout(hLayout);
-		toolkit.createLabel(line1, TXMUIMessages.CorpusPage_35, SWT.WRAP);
+		toolkit.createLabel(line1, TXMUIMessages._1, SWT.WRAP);
 
-		Hyperlink hyperlink1 = toolkit.createHyperlink(line1, TXMUIMessages.CorpusPage_37, SWT.WRAP);
+		Hyperlink hyperlink1 = toolkit.createHyperlink(line1, TXMUIMessages.selectTheSourceDirectory, SWT.WRAP);
 		hyperlink1.addHyperlinkListener(selectDirHListener);
 
 		ImageHyperlink openImportLink2 = toolkit.createImageHyperlink(line1, SWT.WRAP);
@@ -786,8 +786,8 @@
 		hLayout = new RowLayout();
 		hLayout.center = true;
 		line2.setLayout(hLayout);
-		toolkit.createLabel(line2, TXMUIMessages.CorpusPage_38, SWT.WRAP);
-		toolkit.createLabel(line2, TXMUIMessages.CorpusPage_39, SWT.WRAP);
+		toolkit.createLabel(line2, TXMUIMessages._2, SWT.WRAP);
+		toolkit.createLabel(line2, TXMUIMessages.setImportParametersInTheSectionsBelow, SWT.WRAP);
 
 		Composite line4 = toolkit.createComposite(form.getBody());
 		gdata = new TableWrapData(TableWrapData.LEFT, TableWrapData.FILL, 2, 1);
@@ -796,8 +796,8 @@
 		hLayout = new RowLayout();
 		hLayout.center = true;
 		line4.setLayout(hLayout);
-		toolkit.createLabel(line4, TXMUIMessages.CorpusPage_42);
-		Hyperlink hyperlink3 = toolkit.createHyperlink(line4, TXMUIMessages.CorpusPage_43, SWT.WRAP);
+		toolkit.createLabel(line4, TXMUIMessages._3);
+		Hyperlink hyperlink3 = toolkit.createHyperlink(line4, TXMUIMessages.startCorpusImport, SWT.WRAP);
 		hyperlink3.addHyperlinkListener(startImportListener);
 		ImageHyperlink startImportLink2 = toolkit.createImageHyperlink(line4, SWT.NULL);
 		startImportLink2.setImage(IImageKeys.getImage(IImageKeys.START));
@@ -823,7 +823,7 @@
 		if (metadataFile.exists())
 			this.editor.getMetaPage().setMetadataFile(metadataFile);
 
-		Log.info(TXMUIMessages.CorpusPage_50+moduleParams);
+		Log.info(TXMUIMessages.moduleUIParametersDDot+moduleParams);
 		this.setPartName(project.getName());
 
 		if (infosSection != null && !infosSection.isDisposed()) {
@@ -893,7 +893,7 @@
 	 * @return true if import parameters are saved
 	 */
 	public boolean saveConfig() {
-		System.out.println(TXMUIMessages.CorpusPage_52);
+		System.out.println(TXMUIMessages.savingImportParameters);
 
 		//		params.rootDir = project.getSrcdir().getAbsolutePath();
 		//		project.scriptFile = editor.getGroovyScript().getName();
@@ -1090,4 +1090,4 @@
 	public String getRootDir() {
 		return project.getSrcdir().getAbsolutePath();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/MetadataPage.java	(revision 1335)
@@ -168,7 +168,7 @@
 	 * @param main 
 	 */
 	public MetadataPage(FormEditor editor, CorpusPage main) {
-		super(editor, TXMUIMessages.MainPage_0, TXMUIMessages.MetadataPage_1);
+		super(editor, TXMUIMessages.mainPage, TXMUIMessages.metadataPreview);
 		this.main = main;
 	}
 	int index = 0;
@@ -179,7 +179,7 @@
 	protected void createFormContent(final IManagedForm managedForm) {
 		form = managedForm.getForm();
 		toolkit = managedForm.getToolkit();
-		form.setText(TXMUIMessages.MetadataPage_2);
+		form.setText(TXMUIMessages.metadatasParameters);
 		GridLayout layout = new GridLayout(2, false);
 		form.getBody().setLayout(layout);
 
@@ -427,7 +427,7 @@
 				if (inputElement instanceof Metadatas) {
 					Metadatas m = (Metadatas) inputElement;
 					ArrayList<String> header = m.getHeadersList();
-					System.out.println(TXMUIMessages.MetadataPage_4+header);
+					System.out.println(TXMUIMessages.metadataColumnTitles+header);
 
 					Object[] elems = new Object[m.keySet().size()];
 					int i = 0;
@@ -451,7 +451,7 @@
 
 		displayColumn2 = new TableViewerColumn(viewer2, SWT.NONE);
 		displayColumn2.getColumn().setWidth(120);
-		displayColumn2.getColumn().setText(TXMUIMessages.MetadataPage_5);
+		displayColumn2.getColumn().setText(TXMUIMessages.textID);
 		displayColumn2.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -487,7 +487,7 @@
 				String txtsep = TBXPreferences.getInstance().getString(TBXPreferences.METADATA_TXTSEPARATOR);
 				temp = new Metadatas(metadataFile, encoding, colsep, txtsep, 1);
 		} else {
-			System.out.println(NLS.bind(TXMUIMessages.MetadataPage_7, metadataFile));
+			System.out.println(NLS.bind(TXMUIMessages.noMetadataFileP0, metadataFile));
 			return;
 		}
 				
@@ -583,4 +583,4 @@
 	public void reload() {
 		reloadViewers();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java	(revision 1335)
@@ -70,10 +70,10 @@
 			this.path = Path.fromOSString(tmp.getCanonicalPath());
 			
 			} catch (IOException e) {
-				Log.severe(TXMUIMessages.CANT_CREATE_GRAPHIC + e);
+				Log.severe(TXMUIMessages.cannotCreateTheGraphic + e);
 			}
 		}
 		return this.path;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 1335)
@@ -99,7 +99,7 @@
 	public final static String TOP_TOOLBAR_ID = "TXMEditorTopToolBar"; //$NON-NLS-1$
 	public final static String BOTTOM_TOOLBAR_ID = "TXMEditorBottomToolBar"; //$NON-NLS-1$
 	//FIXME: SJ: bad idea to use the ID as title, need to change the system
-	public final static String COMPUTING_PARAMETERS_GROUP_ID = TXMUIMessages.TXMEditor_3;
+	public final static String COMPUTING_PARAMETERS_GROUP_ID = TXMUIMessages.parameters;
 
 	/**
 	 * The editor main tool bar, positioned at the top of the editor.
@@ -314,7 +314,7 @@
 			//			if(!this.getResult().canCompute() && this.getResult().isDirty())	{
 			//				showExtendedParameters = true;
 			//			}
-			this.extendedParametersGroup = this.topToolBar.installGroup(COMPUTING_PARAMETERS_GROUP_ID, TXMUIMessages.TXMEditor_7, 
+			this.extendedParametersGroup = this.topToolBar.installGroup(COMPUTING_PARAMETERS_GROUP_ID, TXMUIMessages.showHideCommandParameters, 
 					"icons/show_computing_parameters.png",  //$NON-NLS-1$
 					"icons/hide_computing_parameters.png",  //$NON-NLS-1$
 					showExtendedParameters);
@@ -617,9 +617,9 @@
 	 */
 	public JobHandler compute(final boolean update)	{
 
-		StatusLine.setMessage(TXMUIMessages.TXMEditor_0 + this.getResult().getName());
+		StatusLine.setMessage(TXMUIMessages.computing + this.getResult().getName());
 
-		JobHandler job = new JobHandler(TXMUIMessages.TXMEditor_1 + this.getResult().getName()) {
+		JobHandler job = new JobHandler(TXMUIMessages.computing + this.getResult().getName()) {
 
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
@@ -649,7 +649,7 @@
 
 
 					// computing result
-					monitor.beginTask(TXMUIMessages.TXMEditor_2, 100);
+					monitor.beginTask(TXMUIMessages.computing_3, 100);
 
 					notifyExtensions("notifyStartOfCompute"); //$NON-NLS-1$
 					if (!TXMEditor.this.getResult().compute(monitor)) {
@@ -1413,4 +1413,4 @@
 		return editors;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/provider/ElementTreeLabelProvider.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/provider/ElementTreeLabelProvider.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/provider/ElementTreeLabelProvider.java	(revision 1335)
@@ -31,11 +31,11 @@
 			} else if (elem.getNodeName().equals(childName)) {
 				return show(elem, index, childAttrs);
 			} else {
-				return TXMUIMessages.ElementTreeLabelProvider_0;
+				return TXMUIMessages.errorDDotElementNotRegistered;
 			}
 			
 		}
-		return TXMUIMessages.ElementTreeLabelProvider_1;
+		return TXMUIMessages.errorDDotObjectIsNotAnOrgw3cElement;
 	}
 
 	private String show(Element elem, int index, String[] attrs) {
@@ -51,4 +51,4 @@
 	public Image getImage(Object obj){
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/PropertySelector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/PropertySelector.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/PropertySelector.java	(revision 1335)
@@ -80,8 +80,8 @@
 		super(parentShell);
 		try {
 			this.properties = new ArrayList<Property>(corpus.getOrderedProperties());
-			this.title = TXMUIMessages.PropertySelector_0;
-			this.mess = TXMUIMessages.PropertySelector_0;
+			this.title = TXMUIMessages.selectAProperty;
+			this.mess = TXMUIMessages.selectAProperty;
 		} catch (CqiClientException e) {
 			// TODO Auto-generated catch block
 			org.txm.rcp.utils.Logger.printStackTrace(e);
@@ -116,7 +116,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.PropertySelector_0);
+		newShell.setText(TXMUIMessages.selectAProperty);
 		if (title != null)
 			newShell.setText(title);
 	}
@@ -166,8 +166,8 @@
 		int propIndex = anaPropCombo.getSelectionIndex();
 		if (propIndex == -1) {
 			MessageDialog.openError(getShell(),
-					TXMUIMessages.Invalid_analysis_property,
-					TXMUIMessages.Structure_field_not_empty);
+					TXMUIMessages.invalidProperty,
+					TXMUIMessages.structureFieldIsMandatory);
 			return;
 		}
 		property = properties.get(propIndex);
@@ -183,4 +183,4 @@
 	public Property getProperty() {
 		return property;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueTreeDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueTreeDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueTreeDialog.java	(revision 1335)
@@ -136,7 +136,7 @@
 		//		});
 
 		Button addButton = new Button(p, SWT.PUSH);
-		addButton.setText(TXMUIMessages.MultipleValueTreeDialog_0+itemSubName);
+		addButton.setText(TXMUIMessages.addDDot+itemSubName);
 		addButton.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -218,4 +218,4 @@
 	public HashMap<String, String> getValues() {
 		return values;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ObjectSelectionDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ObjectSelectionDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ObjectSelectionDialog.java	(revision 1335)
@@ -104,7 +104,7 @@
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		newShell
-				.setText(TXMUIMessages.ObjectSelectionDialog_0);
+				.setText(TXMUIMessages.valueSelector);
 		newShell.setMinimumSize(300, 260);
 
 	}
@@ -341,7 +341,7 @@
 					availablesView.select(i);
 					count++;
 				}
-			System.out.println(NLS.bind(TXMUIMessages.ObjectSelectionDialog_3, count));
+			System.out.println(NLS.bind(TXMUIMessages.foundP0Values, count));
 		} catch (Exception ex) {
 			System.out.println(NLS.bind(TXMUIMessages.error_invalidRegularExpression, ex.getMessage()));
 		}
@@ -363,9 +363,9 @@
 					selectedsView.select(i);
 					count++;
 				}
-			System.out.println(NLS.bind(TXMUIMessages.ObjectSelectionDialog_3, count));
+			System.out.println(NLS.bind(TXMUIMessages.foundP0Values, count));
 		} catch (Exception ex) {
 			System.out.println(NLS.bind(TXMUIMessages.error_invalidRegularExpression, ex.getMessage()));
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/QueryAssistDialog.java	(revision 1335)
@@ -127,7 +127,7 @@
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		newShell.setText(TXMUIMessages.QueryAssistDialog_0);
+		newShell.setText(TXMUIMessages.queryAssistant);
 		newShell.setMinimumSize(300, 300);
 	}
 
@@ -150,7 +150,7 @@
 			chercheLabel = new Label(mainPanel, SWT.NONE);
 			chercheLabel.setAlignment(SWT.CENTER);
 			chercheLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.FILL, true, false));
-			chercheLabel.setText(TXMUIMessages.QueryAssistDialog_2);
+			chercheLabel.setText(TXMUIMessages.imLookingForDDot);
 			
 			scrollComposite = new ScrolledComposite(mainPanel, SWT.V_SCROLL);
 			scrollComposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
@@ -198,7 +198,7 @@
 			
 			Button addwordButton = new Button(mainPanel, SWT.PUSH);
 			addwordButton.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-			addwordButton.setText(TXMUIMessages.QueryAssistDialog_1);
+			addwordButton.setText(TXMUIMessages.addAWord);
 			addwordButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -312,7 +312,7 @@
 			this.setLayout(new GridLayout(5, false));
 
 			Label titleL = new Label(this, SWT.NONE);
-			titleL.setText(NLS.bind(TXMUIMessages.QueryAssistDialog_8, no));
+			titleL.setText(NLS.bind(TXMUIMessages.aWordWithItsProperty, no));
 			GridData datalayout = new GridData(GridData.FILL, GridData.CENTER,
 					true, false);
 			titleL.setLayoutData(datalayout);
@@ -325,10 +325,10 @@
 			}
 
 			testCombo = new Combo(this, SWT.READ_ONLY | SWT.SINGLE);
-			testCombo.add(TXMUIMessages.QueryAssistDialog_10);
-			testCombo.add(TXMUIMessages.QueryAssistDialog_11);
-			testCombo.add(TXMUIMessages.QueryAssistDialog_12);
-			testCombo.add(TXMUIMessages.QueryAssistDialog_13);
+			testCombo.add(TXMUIMessages.equalsTo);
+			testCombo.add(TXMUIMessages.startsWith);
+			testCombo.add(TXMUIMessages.endsWith);
+			testCombo.add(TXMUIMessages.contains);
 			testCombo.select(0);
 
 			valueT = new Text(this, SWT.SINGLE | SWT.BORDER);
@@ -409,9 +409,9 @@
 			this.setLayout(new RowLayout());
 
 			linkCombo = new Combo(this, SWT.READ_ONLY | SWT.SINGLE);
-			linkCombo.add(TXMUIMessages.QueryAssistDialog_32);
-			linkCombo.add(TXMUIMessages.QueryAssistDialog_33);
-			linkCombo.add(TXMUIMessages.QueryAssistDialog_34);
+			linkCombo.add(TXMUIMessages.followedBy);
+			linkCombo.add(TXMUIMessages.separatedByAtLeast0Word);
+			linkCombo.add(TXMUIMessages.separatedByAtLeast1Word);
 
 			linkCombo.select(0);
 		}
@@ -431,4 +431,4 @@
 			return ""; //$NON-NLS-1$
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NewNavigationWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NewNavigationWidget.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NewNavigationWidget.java	(revision 1335)
@@ -319,7 +319,7 @@
 		try {
 			ret = Integer.parseInt(this.currentPositionText.getText());
 		} catch(Exception e) {
-			System.out.println(TXMUIMessages.NavigationWidget_0);
+			System.out.println(TXMUIMessages.errorWhileGettingCurrentPositionValueDDot);
 			Log.printStackTrace(e);
 		}
 		return ret;
@@ -414,4 +414,4 @@
 		return currentPositionText;
 	}
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java	(revision 1335)
@@ -84,7 +84,7 @@
 		magicstick = new Button(this, SWT.PUSH);
 		magicstick.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, true));
 		magicstick.setImage(IImageKeys.getImage(IImageKeys.ACTION_ASSISTQUERY));
-		magicstick.setToolTipText(TXMUIMessages.AssistedQueryWidget_0);
+		magicstick.setToolTipText(TXMUIMessages.openTheQueryAssistant);
 		magicstick.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -164,4 +164,4 @@
 	public void setName(String string) {
 		nameField.setText(string);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PartitionComposer.java	(revision 1335)
@@ -131,7 +131,7 @@
 		layout.center = true;
 		firstArea.setLayout(layout);
 		Label structLabel = new Label(firstArea, SWT.NONE);
-		structLabel.setText(TXMUIMessages.PartitionComposer_0);
+		structLabel.setText(TXMUIMessages.structureDDot);
 		structCombo = new Combo(firstArea, SWT.READ_ONLY | SWT.SINGLE);
 		try {
 			List<StructuralUnit> sus = corpus.getOrderedStructuralUnits();
@@ -191,7 +191,7 @@
 		GridLayout layout2 = new GridLayout(2, false);
 		dispoArea.setLayout(layout2);
 		Label dispoLabel = new Label(dispoArea, SWT.NONE);
-		dispoLabel.setText(TXMUIMessages.PartitionComposer_2);
+		dispoLabel.setText(TXMUIMessages.selectValuesToAssignDDot);
 		dispoLabel.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 				false, false));
 		availableList = new org.eclipse.swt.widgets.List(dispoArea, SWT.MULTI
@@ -204,7 +204,7 @@
 		// btn
 		btnArea.setLayout(new RowLayout());
 		Button addPart = new Button(btnArea, SWT.PUSH);
-		addPart.setText(TXMUIMessages.PartitionComposer_3);
+		addPart.setText(TXMUIMessages.newPart);
 		addPart.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -213,7 +213,7 @@
 				GridData gdata = new GridData(GridData.FILL, GridData.FILL, true, true);
 				gdata.minimumHeight = 200;
 				p.setLayoutData(gdata);
-				p.setTitle(TXMUIMessages.PartitionComposer_5 + (parts.size() + 1));
+				p.setTitle(TXMUIMessages.part + (parts.size() + 1));
 				parts.add(p);
 				partArea.layout(true);
 				updateDisplay();
@@ -225,7 +225,7 @@
 			}
 		});
 		Button rmvPart = new Button(btnArea, SWT.PUSH);
-		rmvPart.setText(TXMUIMessages.PartitionComposer_6);
+		rmvPart.setText(TXMUIMessages.rmvAllTheParts);
 		rmvPart.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -250,7 +250,7 @@
 		GridData gdata = new GridData(GridData.FILL, GridData.FILL, true, true);
 		gdata.minimumHeight = 200;
 		p.setLayoutData(gdata);
-		p.setTitle(TXMUIMessages.PartitionComposer_5 + (parts.size() + 1));
+		p.setTitle(TXMUIMessages.part + (parts.size() + 1));
 		parts.add(p);
 
 	}
@@ -443,7 +443,7 @@
 			Label titleLabel = new Label(this, SWT.NONE);
 			titleLabel.setLayoutData(new GridData(GridData.FILL,
 					GridData.CENTER, false, false, 1, 1));
-			titleLabel.setText(TXMUIMessages.PartitionComposer_8);
+			titleLabel.setText(TXMUIMessages.titleDDot);
 			Font f = titleLabel.getFont();
 			FontData defaultFont = f.getFontData()[0];
 			defaultFont.setStyle(SWT.BOLD);
@@ -479,7 +479,7 @@
 			Button add = new Button(this, SWT.PUSH);
 			add.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 					false, 2, 1));
-			add.setText(TXMUIMessages.PartitionComposer_9);
+			add.setText(TXMUIMessages.assign);
 			add.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -502,7 +502,7 @@
 			Button rmv = new Button(this, SWT.PUSH);
 			rmv.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 					false, 2, 1));
-			rmv.setText(TXMUIMessages.PartitionComposer_11);
+			rmv.setText(TXMUIMessages.remove);
 			rmv.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -583,7 +583,7 @@
 	 */
 	public Partition getPartition(String name) {
 		if (this.parts.size() == 0) {
-			System.out.println(TXMUIMessages.PartitionComposer_1);
+			System.out.println(TXMUIMessages.errorDDotThisPartitionHasNoPart);
 			return null;
 		}
 		
@@ -625,4 +625,4 @@
 		// TODO Auto-generated method stub
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/UIParameterException.java	(revision 1335)
@@ -14,7 +14,7 @@
 	private boolean error;
 
 	public UIParameterException(boolean error) {
-		super(TXMUIMessages.UIParameterException_0+true);
+		super(TXMUIMessages.error+true);
 		this.error = error;
 	}
 	
@@ -22,4 +22,4 @@
 	public boolean isError() {
 		return error;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/ParametersDialog.java	(revision 1335)
@@ -148,7 +148,7 @@
 			} else if ("Boolean".equals(widgetName)) { //$NON-NLS-1$
 				value = Boolean.parseBoolean(stringValue);
 			} else {
-				System.out.println(TXMUIMessages.ParametersDialog_10+widgetName+TXMUIMessages.FileTreeContentProvider_4);
+				System.out.println(TXMUIMessages.unknowedWidgetNameDDot+widgetName+TXMUIMessages.FileTreeContentProvider_4);
 			}
 		}
 	}
@@ -162,7 +162,7 @@
 		super.configureShell(newShell);
 		int idx2 = script.lastIndexOf("Macro");
 		if (idx2 < 0) idx2 = script.length();
-		title = TXMUIMessages.bind(TXMUIMessages.ParametersDialog_0,script.substring(script.lastIndexOf(".")+1, idx2));
+		title = TXMUIMessages.bind(TXMUIMessages.p0ParametersInput,script.substring(script.lastIndexOf(".")+1, idx2));
 		newShell.setText(title);
 	}
 
@@ -184,7 +184,7 @@
 		if (numberOfParameters == 0) button.setEnabled(false);
 
 		super.createButtonsForButtonBar(parent);
-		this.getButton(IDialogConstants.OK_ID).setText(TXMUIMessages.ParametersDialog_1);
+		this.getButton(IDialogConstants.OK_ID).setText(TXMUIMessages.run);
 	}
 
 	protected Control createButtonBar(Composite parent) {
@@ -259,7 +259,7 @@
 			} else if ("Boolean".equals(widgetName)) { //$NON-NLS-1$
 				widget = new BooleanField(composite, SWT.NONE, option);
 			} else {
-				System.out.println(TXMUIMessages.ParametersDialog_10+widgetName+TXMUIMessages.FileTreeContentProvider_4);
+				System.out.println(TXMUIMessages.unknowedWidgetNameDDot+widgetName+TXMUIMessages.FileTreeContentProvider_4);
 			}
 
 			if (widget != null) {
@@ -273,7 +273,7 @@
 			}
 			//			}
 		}
-		new Label(composite, SWT.NONE).setText(TXMUIMessages.ParametersDialog_11);
+		new Label(composite, SWT.NONE).setText(TXMUIMessages.mandatoryFields);
 
 		return composite;
 	}
@@ -291,7 +291,7 @@
 			Object value = w.getWidgetValue();
 
 			if (w.isWidgetMandatory() && value == null) {
-				System.out.println(TXMUIMessages.ParametersDialog_12+field);
+				System.out.println(TXMUIMessages.errorDDotMissingValueDDot+field);
 				error = true;
 			} else if (value != null) {
 				values.put(field, value);
@@ -354,7 +354,7 @@
 				field.setAccessible(true);
 				field.set(bean, value);
 			}  catch (Exception e) {
-				System.out.println(TXMUIMessages.ParametersDialog_14+e.getMessage());
+				System.out.println(TXMUIMessages.errorInAtOptionNameDeclarationDDot+e.getMessage());
 				Log.printStackTrace(e);
 				error = true;
 			}
@@ -430,7 +430,7 @@
 							c.getDeclaredField(option.name());
 						}
 					}  catch (NoSuchFieldException e) {
-						System.out.println(TXMUIMessages.ParametersDialog_14+e.getMessage());
+						System.out.println(TXMUIMessages.errorInAtOptionNameDeclarationDDot+e.getMessage());
 						okNames = false;
 					}
 				}
@@ -470,4 +470,4 @@
 	//			return super.open();
 	//		}
 	//	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedChoiceQueryWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedChoiceQueryWidget.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedChoiceQueryWidget.java	(revision 1335)
@@ -119,7 +119,7 @@
 		magicstick.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
 				false, false));
 		magicstick.setImage(IImageKeys.getImage(IImageKeys.ACTION_ASSISTQUERY));
-		magicstick.setToolTipText(TXMUIMessages.AssistedQueryWidget_0);
+		magicstick.setToolTipText(TXMUIMessages.openTheQueryAssistant);
 		magicstick.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -211,4 +211,4 @@
 	public Query getQuery() {
 		return this.querywidget.getQuery();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java	(revision 1335)
@@ -92,7 +92,7 @@
 		this.setLayout(new GridLayout(3, false));
 		// = properties
 		propLabel = new Label(this, SWT.NONE);
-		propLabel.setText(TXMUIMessages.PropertiesSelector_1);
+		propLabel.setText(TXMUIMessages.propertiesDDot);
 		propLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
 
 		// word_pos
@@ -103,7 +103,7 @@
 		openeditdialog = new Button(this, SWT.PUSH);
 		openeditdialog.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false,
 				true));
-		openeditdialog.setText(TXMUIMessages.PropertiesSelector_2);
+		openeditdialog.setText(TXMUIMessages.edit);
 
 		openeditdialog.addSelectionListener(new SelectionListener() {
 			@Override
@@ -219,7 +219,7 @@
 				}
 			}
 		} catch (CqiClientException e) {
-			Log.severe(NLS.bind(TXMUIMessages.PropertiesSelector_0, e.getMessage()));
+			Log.severe(NLS.bind(TXMUIMessages.cantLoadPropertiesFromCorpusP0DDotP1, e.getMessage()));
 		}
 	}
 
@@ -339,4 +339,4 @@
 	public void addValueChangeListener(Listener listener) {
 		listeners.add(listener);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ComplexSubcorpusPanel.java	(revision 1335)
@@ -131,16 +131,16 @@
 		}
 
 		Group andorGroup = new Group(this, SWT.SHADOW_ETCHED_IN);
-		andorGroup.setText(TXMUIMessages.ComplexSubcorpusPanel_0);
+		andorGroup.setText(TXMUIMessages.match);
 		andorGroup.setLayout(new GridLayout(2, false));
 		andorGroup.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
 
 		andBtn = new Button(andorGroup, SWT.RADIO);
-		andBtn.setText(TXMUIMessages.ComplexSubcorpusPanel_1);
+		andBtn.setText(TXMUIMessages.allCriteria);
 		andBtn.setSelection(true);
 
 		Button orBtn = new Button(andorGroup, SWT.RADIO);
-		orBtn.setText(TXMUIMessages.ComplexSubcorpusPanel_2);
+		orBtn.setText(TXMUIMessages.someCriteria);
 		
 		//structure choice
 		Label l = new Label(this, SWT.None);
@@ -177,11 +177,11 @@
 		// Add/Rmv contrainte
 		// affichage requete
 		l = new Label(this, SWT.NONE);
-		l.setText(TXMUIMessages.ComplexSubcorpusPanel_4);
+		l.setText(TXMUIMessages.query);
 		queryField = new Text(this, SWT.BORDER);
 		queryField.setLayoutData(new GridData(GridData.FILL,GridData.FILL,true, false));
 		Button refreshBtn = new Button(this, SWT.PUSH);
-		refreshBtn.setText(TXMUIMessages.ComplexSubcorpusPanel_5);
+		refreshBtn.setText(TXMUIMessages.common_refresh);
 		refreshBtn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -378,8 +378,8 @@
 			testCombo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 			testCombo.add("is"); //$NON-NLS-1$
 			testCombo.add("is not"); //$NON-NLS-1$
-			testCombo.add(TXMUIMessages.QueryAssistDialog_13);
-			testCombo.add(TXMUIMessages.ComplexSubcorpusPanel_16);
+			testCombo.add(TXMUIMessages.contains);
+			testCombo.add(TXMUIMessages.doesNotContain);
 			testCombo.select(0);
 
 			valueCombo = new ListViewer(this, SWT.SINGLE | SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL);
@@ -465,4 +465,4 @@
 			return null;
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NavigationWidget.java	(revision 1335)
@@ -234,8 +234,8 @@
 		try {
 			ret = Integer.parseInt(currentPosition.getText());
 		} catch(Exception e) {
-			System.out.println(TXMUIMessages.NavigationWidget_0+e);
+			System.out.println(TXMUIMessages.errorWhileGettingCurrentPositionValueDDot+e);
 		}
 		return ret;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SimpleSubcorpusPanel.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SimpleSubcorpusPanel.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SimpleSubcorpusPanel.java	(revision 1335)
@@ -51,14 +51,14 @@
 		this.setLayout(layout);
 
 		Label structureLabel = new Label(this, SWT.NONE);
-		structureLabel.setText(TXMUIMessages.CreatePartitionDialog_2);
+		structureLabel.setText(TXMUIMessages.ampStructureDDot);
 		structureLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 
 		structuralUnitsCombo = new Combo(this, SWT.READ_ONLY);
 		structuralUnitsCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
 
 		Label propertyLabel = new Label(this, SWT.NONE);
-		propertyLabel.setText(TXMUIMessages.CreatePartitionDialog_4);
+		propertyLabel.setText(TXMUIMessages.ampPropertyDDot);
 		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
 				false, false));
 
@@ -66,7 +66,7 @@
 		propertyCombo.setLayoutData(new GridData(GridData.FILL,GridData.FILL, true, false));
 
 		Label valuesLabel = new Label(this, SWT.NONE);
-		valuesLabel.setText(TXMUIMessages.CreateSubcorpusDialog_6);
+		valuesLabel.setText(TXMUIMessages.ampValue);
 		valuesLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
 
 		valueCombo = new ListViewer(this, SWT.MULTI |SWT.V_SCROLL | SWT.BORDER | SWT.VIRTUAL);
@@ -130,7 +130,7 @@
 
 			@Override
 			public void widgetSelected(SelectionEvent event) {
-				System.out.println(TXMUIMessages.SimpleSubcorpusPanel_0);
+				System.out.println(TXMUIMessages.structuralUnitComboSelected);
 				reloadProperties();
 			}
 		});
@@ -243,4 +243,4 @@
 		reloadValues();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ObjectSelector.java	(revision 1335)
@@ -80,7 +80,7 @@
 		this.setLayout(new GridLayout(3, false));
 
 		propLabel = new Label(this, SWT.NONE);
-		propLabel.setText(TXMUIMessages.ObjectSelector_0);
+		propLabel.setText(TXMUIMessages.objDDot);
 		propLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
 
 		// word_pos
@@ -91,7 +91,7 @@
 		openeditdialog = new Button(this, SWT.PUSH);
 		openeditdialog.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false,
 				true));
-		openeditdialog.setText(TXMUIMessages.ObjectSelector_1);
+		openeditdialog.setText(TXMUIMessages.select);
 
 		openeditdialog.addSelectionListener(new SelectionListener() {
 			@Override
@@ -215,4 +215,4 @@
 	public void setSeparator(String string) {
 		this.separator = string;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/AssistedQueryWidget.java	(revision 1335)
@@ -77,7 +77,7 @@
 		magicstick.setLayoutData(new GridData(GridData.FILL, GridData.CENTER,
 				false, false));
 		magicstick.setImage(IImageKeys.getImage(IImageKeys.ACTION_ASSISTQUERY));
-		magicstick.setToolTipText(TXMUIMessages.AssistedQueryWidget_0);
+		magicstick.setToolTipText(TXMUIMessages.openTheQueryAssistant);
 		magicstick.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
@@ -170,4 +170,4 @@
 	public Query getQuery() {
 		return this.querywidget.getQuery();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/TXMUpdateHandler.java	(revision 1335)
@@ -140,7 +140,7 @@
 		try {
 			location = new URL(path); //$NON-NLS-1$
 		} catch (MalformedURLException e) {
-			Log.severe(NLS.bind(TXMUIMessages.LanguageSwitchHandler_5, location));
+			Log.severe(NLS.bind(TXMUIMessages.switchLanguageDDotMalformedUrlDDotP0, location));
 			return false;
 		}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/FixUpdateHandler.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/FixUpdateHandler.java	(revision 1334)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/p2/plugins/FixUpdateHandler.java	(revision 1335)
@@ -67,6 +67,6 @@
 		// this is the default repository
 		//TXMUpdateHandler.addDefaultUpdateSites(agent);
 
-		Log.info(TXMUIMessages.FixUpdateHandler_0);
+		Log.info(TXMUIMessages.readyToShowUpdateUI);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/messages.properties	(revision 1335)
@@ -1,12 +1,11 @@
-
-EditorToolBar_Percent_of_rotated_labels = % of rotated labels: 
-EditorToolBar_Randomize_positions       = Randomize positions
-EditorToolBar_fmin                      = Fmin 
-EditorToolBar_vmax                      = Vmax 
-
-Log_WordCloud_ready = WordCloud ready: 
-
-PreferencePage_Minimal_frequency        = Minimal frequency for used words
-PreferencePage_Number_of_used_words     = Number of used words
-PreferencePage_Percent_of_rotated_words = Percent of rotated words
-PreferencePage_Random_word_positions    = Random word positions
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+fmin=Fmin 
+minimalFrequencyForUsedWords=Minimal frequency for used words
+numberOfUsedWords=Number of used words
+percentOfRotatedLabelsDDot=% of rotated labels\: 
+percentOfRotatedWords=Percent of rotated words
+randomizePositions=Randomize positions
+randomWordPositions=Random word positions
+vmax=Vmax 
+wordCloudReadyDDot=WordCloud ready\: 
Index: tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/WordCloudUIMessages.java
===================================================================
--- tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/WordCloudUIMessages.java	(revision 1334)
+++ tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/WordCloudUIMessages.java	(revision 1335)
@@ -13,15 +13,15 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.wordcloud.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String EditorToolBar_vmax;
-	public static String EditorToolBar_fmin;
-	public static String EditorToolBar_Percent_of_rotated_labels;
-	public static String EditorToolBar_Randomize_positions;
-	public static String Log_WordCloud_ready;
-	public static String PreferencePage_Number_of_used_words;
-	public static String PreferencePage_Minimal_frequency;
-	public static String PreferencePage_Percent_of_rotated_words;
-	public static String PreferencePage_Random_word_positions;
+	public static String vmax; 
+	public static String fmin; 
+	public static String percentOfRotatedLabelsDDot; 
+	public static String randomizePositions; 
+	public static String wordCloudReadyDDot; 
+	public static String numberOfUsedWords; 
+	public static String minimalFrequencyForUsedWords; 
+	public static String percentOfRotatedWords; 
+	public static String randomWordPositions; 
 
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,12 +1,11 @@
-
-EditorToolBar_Percent_of_rotated_labels = % de labels verticaux : 
-EditorToolBar_Randomize_positions       = Position aléatoire
-EditorToolBar_fmin                      = Fmin : 
-EditorToolBar_vmax                      = Vmax : 
-
-Log_WordCloud_ready = WordCloud est prêt : 
-
-PreferencePage_Minimal_frequency        = Filtre en fréquence minimal des mots à utiliser
-PreferencePage_Number_of_used_words     = Filtre en nombre de mots à utiliser
-PreferencePage_Percent_of_rotated_words = Pourcentage de mots verticaux
-PreferencePage_Random_word_positions    = Position aléatoire des mots
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+fmin=Fmin \: 
+minimalFrequencyForUsedWords=Filtre en fréquence minimal des mots à utiliser
+numberOfUsedWords=Filtre en nombre de mots à utiliser
+percentOfRotatedLabelsDDot=% de labels verticaux \: 
+percentOfRotatedWords=Pourcentage de mots verticaux
+randomizePositions=Position aléatoire
+randomWordPositions=Position aléatoire des mots
+vmax=Vmax \: 
+wordCloudReadyDDot=WordCloud est prêt \: 
Index: tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/editors/WordCloudEditor.java
===================================================================
--- tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/editors/WordCloudEditor.java	(revision 1334)
+++ tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/editors/WordCloudEditor.java	(revision 1335)
@@ -44,32 +44,32 @@
 		Composite parametersArea = this.getExtendedParametersGroup();
 
 		// fmin
-		new Label(parametersArea, SWT.NONE).setText(WordCloudUIMessages.EditorToolBar_fmin);
+		new Label(parametersArea, SWT.NONE).setText(WordCloudUIMessages.fmin);
 		minFreq = new Spinner(parametersArea, SWT.BORDER);
 		minFreq.setMinimum(1);
 		minFreq.setIncrement(1);
 		minFreq.setMaximum(100000000);
 
 		// max words / vmax
-		new Label(parametersArea, SWT.NONE).setText(WordCloudUIMessages.EditorToolBar_vmax);
+		new Label(parametersArea, SWT.NONE).setText(WordCloudUIMessages.vmax);
 		maxWordsCount = new Spinner(parametersArea, SWT.BORDER);
 		maxWordsCount.setMinimum(10);
 		maxWordsCount.setIncrement(1);
 		maxWordsCount.setMaximum(100000);
 
 		// rotation percent
-		new Label(parametersArea, SWT.NONE).setText(WordCloudUIMessages.EditorToolBar_Percent_of_rotated_labels);
+		new Label(parametersArea, SWT.NONE).setText(WordCloudUIMessages.percentOfRotatedLabelsDDot);
 		rotationPercent = new FloatSpinner(parametersArea, SWT.BORDER);
 		rotationPercent.setMaximumAsFloat(100);
 
 		// random positions
 		randomPositions = new Button(parametersArea, SWT.CHECK);
-		randomPositions.setText(WordCloudUIMessages.EditorToolBar_Randomize_positions);
+		randomPositions.setText(WordCloudUIMessages.randomizePositions);
 		
 
 		parametersArea.pack();
 
-		Log.info(WordCloudUIMessages.Log_WordCloud_ready + this.getResult());
+		Log.info(WordCloudUIMessages.wordCloudReadyDDot + this.getResult());
 
 	}
 
@@ -80,4 +80,4 @@
 		// Nothing to do
 	}
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/preferences/WordCloudPreferencePage.java
===================================================================
--- tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/preferences/WordCloudPreferencePage.java	(revision 1334)
+++ tmp/org.txm.wordcloud.rcp/src/org/txm/wordcloud/rcp/preferences/WordCloudPreferencePage.java	(revision 1335)
@@ -55,10 +55,10 @@
 		// Charts rendering
 		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent());
 		
-		this.addField(new IntegerFieldEditor(WordCloudPreferences.MAX_WORDS_COUNT, WordCloudUIMessages.PreferencePage_Number_of_used_words, chartsTab));
-		this.addField(new IntegerFieldEditor(WordCloudPreferences.F_MIN, WordCloudUIMessages.PreferencePage_Minimal_frequency, chartsTab));
-		this.addField(new IntegerFieldEditor(WordCloudPreferences.ROTATION_PERCENT, WordCloudUIMessages.PreferencePage_Percent_of_rotated_words, chartsTab));
-		this.addField(new BooleanFieldEditor(WordCloudPreferences.RANDOM_POSITIONS, WordCloudUIMessages.PreferencePage_Random_word_positions, chartsTab));
+		this.addField(new IntegerFieldEditor(WordCloudPreferences.MAX_WORDS_COUNT, WordCloudUIMessages.numberOfUsedWords, chartsTab));
+		this.addField(new IntegerFieldEditor(WordCloudPreferences.F_MIN, WordCloudUIMessages.minimalFrequencyForUsedWords, chartsTab));
+		this.addField(new IntegerFieldEditor(WordCloudPreferences.ROTATION_PERCENT, WordCloudUIMessages.percentOfRotatedWords, chartsTab));
+		this.addField(new BooleanFieldEditor(WordCloudPreferences.RANDOM_POSITIONS, WordCloudUIMessages.randomWordPositions, chartsTab));
 		
 		// other shared preferences
 		SWTChartsComponentsProvider.createChartsRenderingPreferencesFields(this, chartsTab);
@@ -72,4 +72,4 @@
 		//this.setTitle("WordCloud");
 		this.setImageDescriptor(WordCloudAdapterFactory.ICON);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/objects/CorpusBuild.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/CorpusBuild.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/objects/CorpusBuild.java	(revision 1335)
@@ -449,8 +449,8 @@
 			}
 			return true;
 		} else {
-			System.out.println(TXMCoreMessages.Base_0+binarydir+TXMCoreMessages.Base_3);
-			System.out.println(TXMCoreMessages.Base_4+exportzip.getParentFile()+TXMCoreMessages.Base_5);
+			System.out.println(TXMCoreMessages.binaryDirectory+binarydir+TXMCoreMessages.doesNotExist);
+			System.out.println(TXMCoreMessages.parentDirectory+exportzip.getParentFile()+TXMCoreMessages.doesNotExist);
 
 		}
 		return false;
@@ -868,4 +868,4 @@
 	public void setID(String id) {
 		this.pID = id;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/objects/Workspace.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Workspace.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/objects/Workspace.java	(revision 1335)
@@ -242,8 +242,8 @@
 			
 			return b;
 		} else {
-			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.Project_26, binCorpusDir));
-			System.out.println(TXMCoreMessages.Project_28+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.Project_31+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.errorDDotP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatDDotCorpusSkipped, binCorpusDir));
+			System.out.println(TXMCoreMessages.tXMNeedsFoldersDDot+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.andFile+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -271,8 +271,8 @@
 		{// minimal base data
 			BaseOldParameters parameters = new BaseOldParameters(PARAMS);
 			if (!parameters.load()) {
-				System.out.println(TXMCoreMessages.Project_11+PARAMS);
-				Log.severe(TXMCoreMessages.Project_11+PARAMS);
+				System.out.println(TXMCoreMessages.failedToLoadBaseParametersFromFileDDot+PARAMS);
+				Log.severe(TXMCoreMessages.failedToLoadBaseParametersFromFileDDot+PARAMS);
 				return null;
 			}
 
@@ -306,8 +306,8 @@
 				File DATAc = new File(DATAs, corpusname);
 
 				if (!(PARAMS.exists() && HTMLc.exists() && REGISTRYc.exists() && DATAc.exists())) {
-					System.out.println(TXMCoreMessages.Project_17+corpusname);
-					System.out.println(TXMCoreMessages.Project_18+PARAMS);
+					System.out.println(TXMCoreMessages.errorDDotSkippingTheLoadingOfCorpusDDot+corpusname);
+					System.out.println(TXMCoreMessages.pARAMSDDot+PARAMS);
 					System.out.println("HTMLc: "+HTMLc+" : "+HTMLc.exists()); //$NON-NLS-1$ //$NON-NLS-2$
 					System.out.println("REGISTRYc: "+REGISTRYc+" : "+REGISTRYc.exists()); //$NON-NLS-1$ //$NON-NLS-2$
 					System.out.println("DATAc: "+DATAc+" : "+DATAc.exists()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -317,8 +317,8 @@
 			
 			return project;
 		} else {
-			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.Project_26_079, binCorpusDir));
-			System.out.println(TXMCoreMessages.Project_28+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.Project_31+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.errorDDotP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatDDotCorpusSkipped, binCorpusDir));
+			System.out.println(TXMCoreMessages.tXMNeedsFoldersDDot+HTMLs+", "+DATAs+", "+REGISTRY+TXMCoreMessages.andFile+PARAMS); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
 		}
 		return null;
 	}
@@ -382,4 +382,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/objects/Project.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Project.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/objects/Project.java	(revision 1335)
@@ -515,7 +515,7 @@
 			String target = link.getAttribute("target"); //$NON-NLS-1$
 			String[] split = target.split("#"); //$NON-NLS-1$
 			if (split.length != 3) {
-				System.out.println(TXMCoreMessages.Base_6+target);
+				System.out.println(TXMCoreMessages.errorDDotLinkGrplinkAttargetMalformedDDot+target);
 				continue;
 			}
 			String from = split[1].trim();
@@ -777,8 +777,8 @@
 			}
 			return true;
 		} else {
-			System.out.println(TXMCoreMessages.Base_0+binarydir+TXMCoreMessages.Base_3);
-			System.out.println(TXMCoreMessages.Base_4+exportzip.getParentFile()+TXMCoreMessages.Base_5);
+			System.out.println(TXMCoreMessages.binaryDirectory+binarydir+TXMCoreMessages.doesNotExist);
+			System.out.println(TXMCoreMessages.parentDirectory+exportzip.getParentFile()+TXMCoreMessages.doesNotExist);
 
 		}
 		return false;
@@ -1284,4 +1284,4 @@
 	public String toString() {
 		return this.userName+" "+this.rcpProject.getLocation();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/objects/Page.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/objects/Page.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/objects/Page.java	(revision 1335)
@@ -112,7 +112,7 @@
 		try {
 			return this.htmlfile.toURI().toURL().toString();
 		} catch (MalformedURLException e) {
-			System.err.println(TXMCoreMessages.Page_3 + htmlfile);
+			System.err.println(TXMCoreMessages.malformedURLFile + htmlfile);
 			return ""; //$NON-NLS-1$
 		}
 	}
@@ -181,4 +181,4 @@
 	public String getName() {
 		return this.name;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/importer/ValidateXml.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/ValidateXml.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/importer/ValidateXml.java	(revision 1335)
@@ -57,15 +57,15 @@
 	 */
 	public static boolean testAndThrow(File infile) throws XMLStreamException {
 		if (infile.isDirectory()) {
-			System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_1);
+			System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isADirectory);
 			return false;
 		}
 		if (!infile.exists()) {
-			System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_2);
+			System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.doesNotExists_2);
 			return false;
 		}
 		if (!infile.canRead()) {
-			System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_3);
+			System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isNotReadable);
 			return false;
 		}
 		try {
@@ -123,15 +123,15 @@
 	 */
 	public static boolean test(File infile) {
 		if (infile.isDirectory()) {
-			System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_1);
+			System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isADirectory);
 			return false;
 		}
 		if (!infile.exists()) {
-			System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_2);
+			System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.doesNotExists_2);
 			return false;
 		}
 		if (!infile.canRead()) {
-			System.out.println(TXMCoreMessages.ValidateXml_0 + infile + TXMCoreMessages.ValidateXml_3);
+			System.out.println(TXMCoreMessages.xmlValidationDDot + infile + TXMCoreMessages.isNotReadable);
 			return false;
 		}
 		try {
@@ -163,4 +163,4 @@
 		else
 			System.out.println("ERROR"); //$NON-NLS-1$
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/importer/Convert5To6.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/Convert5To6.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/importer/Convert5To6.java	(revision 1335)
@@ -35,7 +35,7 @@
 		File param = new File(corpusdir, "import.xml"); //$NON-NLS-1$
 		if (!param.exists()) { 
 			//System.out.println("\n");
-			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.Convert5To6_1,param)); //$NON-NLS-1$
+			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.isMissing,param)); //$NON-NLS-1$
 			return false; 
 		}
 
@@ -58,29 +58,29 @@
 		File REGISTRY = new File(INDIR, "registry"); //$NON-NLS-1$
 		File IMPORT = new File(INDIR, "import.xml"); //$NON-NLS-1$
 		
-		if (!silent) System.out.println(TXMCoreMessages.Convert5To6_6);
+		if (!silent) System.out.println(TXMCoreMessages.checkingBinaryFormat);
 		if (!TXMs.exists()) {
-			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_7+TXMs);
+			if (!silent) System.out.println(TXMCoreMessages.txmDirectoryIsMissingDDot+TXMs);
 			return false;
 		}
 
 		if (!HTMLs.exists()) {
-			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_8+HTMLs);
+			if (!silent) System.out.println(TXMCoreMessages.htmlDirectoryIsMissingDDot+HTMLs);
 			return false;
 		}
 
 		if (!DATAs.exists()) {
-			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_9+DATAs);
+			if (!silent) System.out.println(TXMCoreMessages.dataDirectoryIsMissingDDot+DATAs);
 			return false;
 		}
 
 		if (!REGISTRY.exists()) {
-			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_10+REGISTRY);
+			if (!silent) System.out.println(TXMCoreMessages.registryFileIsMissingDDot+REGISTRY);
 			return false;
 		}
 
 		if (!HTMLmulti.exists()) {
-			if (!silent) System.out.println(TXMCoreMessages.Convert5To6_11+HTMLmulti);
+			if (!silent) System.out.println(TXMCoreMessages.htmlDirectoryIsMissingDDot+HTMLmulti);
 			return false;
 		}
 
@@ -88,7 +88,7 @@
 	}
 
 	private boolean process() throws Exception {
-		System.out.println(TXMCoreMessages.Convert5To6_12);
+		System.out.println(TXMCoreMessages.processing);
 		String corpusname = REGISTRY.listFiles()[0].getName().toUpperCase();
 
 		// create the corpus directories
@@ -107,7 +107,7 @@
 		TXMc.mkdir();
 		DATAc.mkdir();
 		
-		System.out.println(TXMCoreMessages.Convert5To6_15+OUTDIR);
+		System.out.println(TXMCoreMessages.reorganizingFilesOf+OUTDIR);
 		// move files
 		for (File f : HTMLmulti.listFiles())
 			f.renameTo(new File(HTMLcmulti, f.getName()));
@@ -138,7 +138,7 @@
 		String date = BaseOldParameters.dateformat.format(new Date(IMPORT.lastModified()));
 
 		if (IMPORT.exists()) {
-			System.out.println(TXMCoreMessages.Convert5To6_19+IMPORT);
+			System.out.println(TXMCoreMessages.readCorpusInfosFromOldImportxmlFileDDot+IMPORT);
 			Document doc = DomUtils.load(IMPORT);
 			Element root = doc.getDocumentElement();
 			lang = root.getAttribute("language"); //$NON-NLS-1$
@@ -156,7 +156,7 @@
 		File PARAMS = new File(BINDIR, "import.xml"); //$NON-NLS-1$
 		System.out.println("writing "+PARAMS); //$NON-NLS-1$
 		BaseOldParameters.createEmptyParams(PARAMS, corpusname.toUpperCase());
-		System.out.println(TXMCoreMessages.Convert5To6_30);
+		System.out.println(TXMCoreMessages.fillImportxmlWithDDot);
 		BaseOldParameters params = new BaseOldParameters(PARAMS);
 		params.load();
 
@@ -181,7 +181,7 @@
 		//params.addEditionDefinition(corpusElem, "default", "groovy", "");
 		params.addEditionDefinition(corpusElem, "onepage", "groovy", ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		for (File txmFile : TXMc.listFiles()) {
-			System.out.println(TXMCoreMessages.Convert5To6_46+txmFile);
+			System.out.println(TXMCoreMessages.processingTextDDot+txmFile);
 			String textname = txmFile.getName();
 			textname = textname.substring(0, textname.lastIndexOf(".")); //$NON-NLS-1$
 
@@ -292,4 +292,4 @@
 		//converter.zip(zipFile);
 		//	println Convert5To6.is6(new File("/home/mdecorde/TXM-corpus-backup/bfm1"))
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/importer/scripting/GroovyImportScriptRunner.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/scripting/GroovyImportScriptRunner.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/importer/scripting/GroovyImportScriptRunner.java	(revision 1335)
@@ -80,7 +80,7 @@
 	 * @param args the args
 	 */
 	public GroovyImportScriptRunner(File scriptfile, Object[] args) {
-		System.out.println(TXMCoreMessages.GroovyImportScriptRunner_0);
+		System.out.println(TXMCoreMessages.initializationOfGroovyImportScriptRunner);
 		this.executeScript(scriptfile.getAbsolutePath(), args);
 	}
 
@@ -91,7 +91,7 @@
 	 * @param args the args
 	 */
 	public void executeScript(String scriptfile, Object args) {
-		System.out.println(TXMCoreMessages.GroovyImportScriptRunner_1 + scriptfile);
+		System.out.println(TXMCoreMessages.supBeginningExecutionOf + scriptfile);
 		ClassLoader parent = getClass().getClassLoader();
 		GroovyClassLoader loader = new GroovyClassLoader(parent);
 		Class groovyClass = null;
@@ -123,7 +123,7 @@
 			System.err.println(e);
 			org.txm.utils.logger.Log.printStackTrace(e);
 		}
-		System.out.println(TXMCoreMessages.GroovyImportScriptRunner_3);
+		System.out.println(TXMCoreMessages.supEndOfExecution);
 	}
 
 	/**
@@ -137,4 +137,4 @@
 		// gse
 
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/Catalog.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/Catalog.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/Catalog.java	(revision 1335)
@@ -59,7 +59,7 @@
 	public Catalog(String path) {
 		source = new File(path);
 		if (!source.exists()) {
-			System.err.println(TXMCoreMessages.Catalog_0 + path); 
+			System.err.println(TXMCoreMessages.catalogFileNotFound + path); 
 			System.exit(-1);
 		}
 
Index: tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/FilterManager.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/FilterManager.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/FilterManager.java	(revision 1335)
@@ -60,7 +60,7 @@
 		File home = new File(path);
 		if (!home.exists())
 			System.out
-					.println(TXMCoreMessages.FilterManager_0 + path + TXMCoreMessages.FilterManager_1); 
+					.println(TXMCoreMessages.filterManagerErrorDDotInitialization + path + TXMCoreMessages.doesNotExist_3); 
 		else {
 			File[] list = home.listFiles();
 			for (File f : list)
@@ -123,4 +123,4 @@
 
 		System.out.println(m);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/CatalogManager.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/CatalogManager.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/CatalogManager.java	(revision 1335)
@@ -54,7 +54,7 @@
 		File home = new File(path);
 		if (!home.exists())
 			System.out
-					.println(TXMCoreMessages.CatalogManager_0 + path + TXMCoreMessages.CatalogManager_1); 
+					.println(TXMCoreMessages.managerErrorDuringInitializationDDot + path + TXMCoreMessages.doesNotExist_3); 
 		else {
 			File[] list = home.listFiles();
 			for (File f : list)
@@ -106,4 +106,4 @@
 		System.out.println(m);
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/Filter.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/Filter.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/importer/scripts/filters/Filter.java	(revision 1335)
@@ -258,7 +258,7 @@
 			if (this.line != null)
 				return true;
 		} catch (IOException e) {
-			System.err.println(TXMCoreMessages.Filter_7); 
+			System.err.println(TXMCoreMessages.readError); 
 			org.txm.utils.logger.Log.printStackTrace(e);
 			return false;
 		}
@@ -313,4 +313,4 @@
 	 * After.
 	 */
 	protected abstract void after();
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/Toolbox.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/Toolbox.java	(revision 1335)
@@ -191,9 +191,9 @@
 		File configFile = new File(txmDirectory, "textometrie.properties"); //$NON-NLS-1$
 		if (!configFile.exists()) {
 			initializing = false;
-			throw new IllegalArgumentException(TXMCoreMessages.Toolbox_0 
+			throw new IllegalArgumentException(TXMCoreMessages.file 
 					+ configFile.getAbsolutePath()
-					+ TXMCoreMessages.Toolbox_16); 
+					+ TXMCoreMessages.doesNotExists); 
 		}
 
 		boolean ret = initialize(configFile);
@@ -256,7 +256,7 @@
 			throw e;
 		}
 
-		Log.finest("Toolbox states: " + TXMCoreMessages.Toolbox_22 + state); //$NON-NLS-1$
+		Log.finest("Toolbox states: " + TXMCoreMessages.workspaceDDot + state); //$NON-NLS-1$
 
 		try {
 			if (monitor != null) {
@@ -359,19 +359,19 @@
 
 		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(PostInstallationStep.EXTENSION_ID);
 
-		Log.warning(TXMCoreMessages.ApplicationWorkbenchAdvisor_15);
+		Log.warning(TXMCoreMessages.loadingExtensions);
 		Log.warning(Arrays.toString(config));
 
 		for (IConfigurationElement e : config) {
 			try {
-				Log.warning(TXMCoreMessages.ApplicationWorkbenchAdvisor_14 + e.getName() + " from " + e.getContributor().getName());
+				Log.warning(TXMCoreMessages.evaluatingExtensionDDot + e.getName() + " from " + e.getContributor().getName());
 
 				final Object o = e.createExecutableExtension("class"); //$NON-NLS-1$
 				if (o instanceof PostInstallationStep) {
 					ISafeRunnable runnable = new ISafeRunnable() {
 						@Override
 						public void handleException(Throwable exception) {
-							Log.severe(TXMCoreMessages.ApplicationWorkbenchAdvisor_6+ exception);
+							Log.severe(TXMCoreMessages.exceptionDDot+ exception);
 						}
 
 						@Override
@@ -394,19 +394,19 @@
 	private static void pluginsPreinstallation() {
 
 		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(PostInstallationStep.EXTENSION_ID);
-		Log.warning(TXMCoreMessages.ApplicationWorkbenchAdvisor_15);
+		Log.warning(TXMCoreMessages.loadingExtensions);
 		Log.warning(Arrays.toString(config));
 
 		for (IConfigurationElement e : config) {
 			try {
-				Log.warning(TXMCoreMessages.ApplicationWorkbenchAdvisor_14 + e.getName() + " from " + e.getContributor().getName());
+				Log.warning(TXMCoreMessages.evaluatingExtensionDDot + e.getName() + " from " + e.getContributor().getName());
 
 				final Object o = e.createExecutableExtension("class"); //$NON-NLS-1$
 				if (o instanceof PostInstallationStep) {
 					ISafeRunnable runnable = new ISafeRunnable() {
 						@Override
 						public void handleException(Throwable exception) {
-							Log.severe(TXMCoreMessages.ApplicationWorkbenchAdvisor_6+ exception);
+							Log.severe(TXMCoreMessages.exceptionDDot+ exception);
 						}
 
 						@Override
@@ -572,7 +572,7 @@
 			// no directory
 			if (!workspaceFile.exists()) {
 
-				Log.info(TXMCoreMessages.Toolbox_10 + workspaceFile); 
+				Log.info(TXMCoreMessages.noWorkspaceFoundCreatingANewOne + workspaceFile); 
 
 				// create or update the workspace & create TXM default.xml workspace file
 				Toolbox.workspace = createOrUpdate(new File(txmhomedir)); //$NON-NLS-1$
@@ -600,11 +600,11 @@
 				workspace = Workspace.getInstance();
 			}
 
-			Log.info(TXMCoreMessages.Toolbox_12 + workspaceFile); 
+			Log.info(TXMCoreMessages.loadingWorkspaceFromFileDDot + workspaceFile); 
 			state = true;
 
 			if (workspace == null) { //$NON-NLS-1$
-				Log.severe(TXMCoreMessages.Toolbox_14 + workspaceFile); 
+				Log.severe(TXMCoreMessages.errorLoadingWorkspaceFromFileDDot + workspaceFile); 
 				state = false;
 				//System.out.println(TXMCoreMessages.FAILED);
 				return false;
@@ -612,8 +612,8 @@
 				//System.out.println(TXMCoreMessages.DONE);
 			}
 		} catch (Exception e) {
-			Log.severe(TXMCoreMessages.Toolbox_workspace_init_failed + workspaceFile); 
-			Log.severe(TXMCoreMessages.Toolbox_15 + Log.toString(e));
+			Log.severe(TXMCoreMessages.errorDuringWorkspaceInitializationDDot + workspaceFile); 
+			Log.severe(TXMCoreMessages.errorDDot + Log.toString(e));
 			Log.printStackTrace(e);
 			state = false;
 		}
@@ -680,7 +680,7 @@
 			txmhomedir.mkdirs();
 
 			if (!txmhomedir.exists()) {
-				System.out.println(NLS.bind(TXMCoreMessages.ApplicationWorkbenchAdvisor_13, txmhomedir));
+				System.out.println(NLS.bind(TXMCoreMessages.couldNotCreateTXMHOMEDirectoryDDotP0, txmhomedir));
 				return null;
 			}
 
@@ -741,8 +741,8 @@
 
 			return workspace;
 		} catch (Exception e) {
-			Log.severe(NLS.bind(TXMCoreMessages.ApplicationWorkbenchAdvisor_40, e.getLocalizedMessage()));
-			System.err.println(NLS.bind(TXMCoreMessages.ApplicationWorkbenchAdvisor_40, e.getLocalizedMessage()));
+			Log.severe(NLS.bind(TXMCoreMessages.failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEDDotP0, e.getLocalizedMessage()));
+			System.err.println(NLS.bind(TXMCoreMessages.failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEDDotP0, e.getLocalizedMessage()));
 			e.printStackTrace();
 			return null;
 		}
@@ -772,4 +772,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 1335)
@@ -1,181 +1,139 @@
-
-ApplicationWorkbenchAdvisor_13 = ** Could not create TXMHOME directory: {0}.
-ApplicationWorkbenchAdvisor_14 = \ evaluating extension:
-ApplicationWorkbenchAdvisor_15 = Loading extensions...
-ApplicationWorkbenchAdvisor_40 = Failed to copy TXM files from TXMINSTALL DIR to TXMHOME: {0}.
-ApplicationWorkbenchAdvisor_6  = Exception:
-
-Base_0 = Binary directory 
-Base_3 = \ does not exist?
-Base_4 = Parent directory 
-Base_5 = \ does not exist?
-Base_6 = Error: linkGrp/link/@target malformed: 
-
-CatalogManager_0 = ** Manager Error during initialization: 
-CatalogManager_1 = \ does not exist.
-
-Catalog_0        = ** Catalog File Not found 
-
-Contrasts_0 = Computing: 
-
-Convert5To6_1  = is missing
-Convert5To6_10 = 'registry' file is missing: 
-Convert5To6_11 = 'html' directory is missing: 
-Convert5To6_12 = processing...
-Convert5To6_15 = reorganizing files of 
-Convert5To6_19 = Read corpus infos from old import.xml file: 
-Convert5To6_30 = Fill import.xml with: 
-Convert5To6_46 = processing text: 
-Convert5To6_6  = checking binary format...
-Convert5To6_7  = 'txm' directory is missing: 
-Convert5To6_8  = 'html' directory is missing: 
-Convert5To6_9  = 'data' directory is missing: 
-
-CorpusManager_0 = ** CQi Client not initialized
-CorpusManager_1 = ** Error: This exception should not be thrown
-
-Corpus_12       = ** Failed to restore subcorpus 
-Corpus_13       = Corpus:getLocale: CQP is not ready to answer: 
-Corpus_14       = Warning: can't load corpus 
-Corpus_15       = informations from workspace (selfElement  null)
-Corpus_19       = ** Failed to restore partition 
-Corpus_2        = Corpus: 
-Corpus_3        = , Encoding: 
-Corpus_4        = , Language: 
-Corpus_5        = No values given
-Corpus_8        = \ in \	\	\	\	\	\	\	\	
-
-Error_CONNECTION_FAILED = ** Error : while connection to search engine, with the following parameters: 
-
-FMAX_2 = , fmax 
-
-FMIN_2 = , fmin 
-
-FilterManager_0 = ** Filter manager error : initialization 
-FilterManager_1 = \ does not exist.
-
-Filter_7        = ** Read error
-
-Focus_1 = ** The focus is empty or null.
-
-GroovyImportScriptRunner_0 = Initialization of GroovyImportScriptRunner
-GroovyImportScriptRunner_1 = > beginning execution of 
-GroovyImportScriptRunner_3 = > end of execution 
-
-MainCorpus_0 = \ is not a valid CQP ID for a corpus. It must be in uppercase characters.
-
-Page_3 = ** Malformed URL, file 
-
-PartitionFocus_1 = The focus cannot be null or empty.
-PartitionFocus_2 = Focus is empty or null
-PartitionFocus_3 = The {0} part focus doesn''t belong to partition {1}.
-PartitionFocus_4 = ** Unknown partition name.
-
-Partition_18     = Failed to get last CQP error: 
-Partition_9      = ** Failed to create part: 
-
-Project_11     = Failed to load base parameters from file: 
-Project_17     = Error: skipping the loading of corpus: 
-Project_18     = PARAMS: 
-Project_26     = ** Error: ''{0}'' corpus directory is not conformant to TXM corpus binary format: corpus skipped."
-Project_26_079 = ** Error: ''{0}'' corpus directory is not conformant to TXM 0.7.9 corpus binary format: corpus skipped."  
-Project_28     = TXM needs folders: 
-Project_31     = and file 
-
-QUERY = Query on {0} : {1} <- {2}
-
-QUERYING_PARTITION = Querying partition {0}
-
-QueryIndex_2 = Warning: duplicate query entry: 
-QueryIndex_3 = Warning: query failed: 
-
-QueryResult_0 = \ is not a valid CQP Id for a subcorpus. It must be an uppercase characters followed by lowercase characters.
-
-Selection_26 = Failed to get sup values of 
-Selection_5  = Text metadata: 
-Selection_6  = Selection error: the corpus 
-Selection_7  = has no base
-Selection_8  = Can't find structural unit for metadata with id: 
-Selection_9  = Error while getting metadatas from Base.importMetadatas: 
-
-StructuralUnitProperty_0 = ** Failed to access structural property values 
-
-TSCmd_30 = Query was: 
-TSCmd_31 = matches found.
-
-TSCorpusManager_0 = Error reg dir: 
-TSCorpusManager_1 = Error configdir dir: 
-
-TSCorpus_0        = Couldn't read corpus: 
-
-TSResult_0 = Number of match 
-TSResult_2 = Number of sub match 
-
-TigerXmlIndexing_2 = ERROR: !exists
-TigerXmlIndexing_3 = ERROR: !read
-TigerXmlIndexing_6 = IO: 
-TigerXmlIndexing_7 = SAX: 
-
-Toolbox_0                         = ** File
-Toolbox_10                        = ** No workspace found. Creating a new one.
-Toolbox_12                        = Loading workspace from file: 
-Toolbox_14                        = ** Error loading workspace from file: 
-Toolbox_15                        = ** Error: 
-Toolbox_16                        = \ does not exists
-Toolbox_17                        = End of CQP wait test
-Toolbox_18                        = ** Error while waiting for CQP
-Toolbox_22                        = \ Workspace: 
-Toolbox_27                        = \ and 
-Toolbox_28                        = Failed to start MemCqiClient: 
-Toolbox_29                        = ** Error while connecting to search engine.
-Toolbox_30                        = - wrong login or password or port : 
-Toolbox_31                        = Failed to exec 'taskkill /IM cqpserver.exe /F': 
-Toolbox_33                        = - or the engine was not started with the command line: 
-Toolbox_34                        = Failed to exec 'tskill cqpserver.exe': 
-Toolbox_37                        = kill `ps aux | grep cqpserver | awk '/-P 
-Toolbox_38                        = / {print $2}'`
-Toolbox_39                        = Failed to exec '
-Toolbox_40                        = ': 
-Toolbox_connected_to_corpus_sever = connected
-Toolbox_workspace_init_failed     = ** Error during workspace initialization:
-Toolbox_wrong_port                = ** Error : the connexion to the server failed: wrong port format
-
-V = , v 
-
-ValidateXml_0 = XmlValidation: 
-ValidateXml_1 = is a directory
-ValidateXml_2 = does not exists
-ValidateXml_3 = is not read-able
-
-common_absoluteFrequency         = Absolute Frequency
-common_cols                      = Cols
-common_delete                    = Delete
-common_description               = Description
-common_done                      = Done.
-common_fMax                      = Fmax
-common_fMin                      = Fmin
-common_frequency                 = Frequency
-common_lowestFrequency           = Lowest frequency
-common_mode                      = Mode
-common_numberOfLines             = Number of lines
-common_ok                        = OK
-common_pleaseWait                = Please wait...
-common_properties                = Properties:
-common_property                  = Property:
-common_queries                   = Queries:
-common_query                     = Query 
-common_reference                 = Reference
-common_rows                      = Rows
-common_structuralUnit            = Structural Unit: 
-common_structuralUnitAndProperty = Structural unit and property
-common_structure                 = Structure
-common_t                         = t 
-common_thresholds                = Thresholds
-common_units                     = Units
-common_vMax                      = Vmax
-
-error_error                   = ** Error: {0}.
-error_error2                  = Error
-error_errorWhileSortingResult = Error while sorting result.
-
-info_connected = Connected.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+and=\ and 
+andFile=and file 
+binaryDirectory=Binary directory 
+cantFindStructuralUnitForMetadataWithIdDDot=Can't find structural unit for metadata with id\: 
+catalogFileNotFound=** Catalog File Not found 
+checkingBinaryFormat=checking binary format...
+common_absoluteFrequency=Absolute Frequency
+common_cols=Cols
+common_delete=Delete
+common_description=Description
+common_done=Done.
+common_fMax=Fmax
+common_fMin=Fmin
+common_frequency=Frequency
+common_lowestFrequency=Lowest frequency
+common_numberOfLines=Number of lines
+common_ok=OK
+common_properties=Properties\:
+common_property=Property\:
+common_queries=Queries\:
+common_query=Query 
+common_reference=Reference
+common_rows=Rows
+common_structuralUnitAndProperty=Structural unit and property
+common_structure=Structure
+common_t=t 
+common_thresholds=Thresholds
+common_units=Units
+common_vMax=Vmax
+computingDDot=Computing\: 
+connected=connected
+corpusDDot=Corpus\: 
+corpusDDotgetLocaleDDotCQPIsNotReadyToAnswerDDot=Corpus\:getLocale\: CQP is not ready to answer\: 
+couldNotCreateTXMHOMEDirectoryDDotP0=** Could not create TXMHOME directory\: {0}.
+couldntReadCorpusDDot=Couldn't read corpus\: 
+cQiClientNotInitialized=** CQi Client not initialized
+dataDirectoryIsMissingDDot='data' directory is missing\: 
+dDot='\: 
+doesNotExist=\ does not exist?
+doesNotExist_3=\ does not exist.
+doesNotExists=\ does not exists
+doesNotExists_2=does not exists
+encodingDDot=, Encoding\: 
+endOfCQPWaitTest=End of CQP wait test
+error_error=** Error\: {0}.
+error_error2=Error
+error_errorWhileSortingResult=Error while sorting result.
+errorConfigdirDirDDot=Error configdir dir\: 
+errorDDot=** Error\: 
+eRRORDDotExists=ERROR\: \!exists
+errorDDotLinkGrplinkAttargetMalformedDDot=Error\: linkGrp/link/@target malformed\: 
+errorDDotP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatDDotCorpusSkipped=** Error\: ''{0}'' corpus directory is not conformant to TXM 0.7.9 corpus binary format\: corpus skipped."  
+errorDDotP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatDDotCorpusSkipped=** Error\: ''{0}'' corpus directory is not conformant to TXM corpus binary format\: corpus skipped."
+eRRORDDotRead=ERROR\: \!read
+errorDDotSkippingTheLoadingOfCorpusDDot=Error\: skipping the loading of corpus\: 
+errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat=** Error \: the connexion to the server failed\: wrong port format
+errorDDotThisExceptionShouldNotBeThrown=** Error\: This exception should not be thrown
+errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot=** Error \: while connection to search engine, with the following parameters\: 
+errorDuringWorkspaceInitializationDDot=** Error during workspace initialization\:
+errorLoadingWorkspaceFromFileDDot=** Error loading workspace from file\: 
+errorRegDirDDot=Error reg dir\: 
+errorWhileConnectingToSearchEngine=** Error while connecting to search engine.
+errorWhileGettingMetadatasFromBaseimportMetadatasDDot=Error while getting metadatas from Base.importMetadatas\: 
+errorWhileWaitingForCQP=** Error while waiting for CQP
+evaluatingExtensionDDot=\ evaluating extension\:
+exceptionDDot=Exception\:
+failedToAccessStructuralPropertyValues=** Failed to access structural property values 
+failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEDDotP0=Failed to copy TXM files from TXMINSTALL DIR to TXMHOME\: {0}.
+failedToCreatePartDDot=** Failed to create part\: 
+failedToExec=Failed to exec '
+failedToExecTaskkillIMCqpserverexeFDDot=Failed to exec 'taskkill /IM cqpserver.exe /F'\: 
+failedToExecTskillCqpserverexeDDot=Failed to exec 'tskill cqpserver.exe'\: 
+failedToGetLastCQPErrorDDot=Failed to get last CQP error\: 
+failedToGetSupValuesOf=Failed to get sup values of 
+failedToLoadBaseParametersFromFileDDot=Failed to load base parameters from file\: 
+failedToRestorePartition=** Failed to restore partition 
+failedToRestoreSubcorpus=** Failed to restore subcorpus 
+failedToStartMemCqiClientDDot=Failed to start MemCqiClient\: 
+file=** File
+fillImportxmlWithDDot=Fill import.xml with\: 
+filterManagerErrorDDotInitialization=** Filter manager error \: initialization 
+fmax=, fmax 
+fmin=, fmin 
+focusIsEmptyOrNull=Focus is empty or null
+hasNoBase=has no base
+htmlDirectoryIsMissingDDot='html' directory is missing\: 
+in=\ in \t\t\t\t\t\t\t\t
+informationsFromWorkspaceSelfElementNull=informations from workspace (selfElement  null)
+initializationOfGroovyImportScriptRunner=Initialization of GroovyImportScriptRunner
+iODDot=IO\: 
+isADirectory=is a directory
+isMissing=is missing
+isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters=\ is not a valid CQP ID for a corpus. It must be in uppercase characters.
+isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters=\ is not a valid CQP Id for a subcorpus. It must be an uppercase characters followed by lowercase characters.
+isNotReadable=is not read-able
+killPsAuxPipeGrepCqpserverPipeAwkP=kill `ps aux | grep cqpserver | awk '/-P 
+languageDDot=, Language\: 
+loadingExtensions=Loading extensions...
+loadingWorkspaceFromFileDDot=Loading workspace from file\: 
+malformedURLFile=** Malformed URL, file 
+managerErrorDuringInitializationDDot=** Manager Error during initialization\: 
+matchesFound=matches found.
+noValuesGiven=No values given
+noWorkspaceFoundCreatingANewOne=** No workspace found. Creating a new one.
+numberOfMatch=Number of match 
+numberOfSubMatch=Number of sub match 
+orTheEngineWasNotStartedWithTheCommandLineDDot=- or the engine was not started with the command line\: 
+pARAMSDDot=PARAMS\: 
+parentDirectory=Parent directory 
+print2=/ {print $2}'`
+processing=processing...
+processingTextDDot=processing text\: 
+queryingPartitionP0=Querying partition {0}
+queryOnP0DDotP1InfP2=Query on {0} \: {1} <- {2}
+queryWasDDot=Query was\: 
+readCorpusInfosFromOldImportxmlFileDDot=Read corpus infos from old import.xml file\: 
+readError=** Read error
+registryFileIsMissingDDot='registry' file is missing\: 
+reorganizingFilesOf=reorganizing files of 
+sAXDDot=SAX\: 
+selectionErrorDDotTheCorpus=Selection error\: the corpus 
+supBeginningExecutionOf=> beginning execution of 
+supEndOfExecution=> end of execution 
+textMetadataDDot=Text metadata\: 
+theFocusCannotBeNullOrEmpty=The focus cannot be null or empty.
+theFocusIsEmptyOrNull=** The focus is empty or null.
+theP0PartFocusDoesntBelongToPartitionP1=The {0} part focus doesn''t belong to partition {1}.
+txmDirectoryIsMissingDDot='txm' directory is missing\: 
+tXMNeedsFoldersDDot=TXM needs folders\: 
+unknownPartitionName=** Unknown partition name.
+v=, v 
+warningDDotCantLoadCorpus=Warning\: can't load corpus 
+warningDDotDuplicateQueryEntryDDot=Warning\: duplicate query entry\: 
+warningDDotQueryFailedDDot=Warning\: query failed\: 
+workspaceDDot=\ Workspace\: 
+wrongLoginOrPasswordOrPortDDot=- wrong login or password or port \: 
+xmlValidationDDot=XmlValidation\: 
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 1335)
@@ -1,27 +1,22 @@
-
-ApplicationWorkbenchAdvisor_13 = ** Не удалось создать папку TXMHOME : {0}
-ApplicationWorkbenchAdvisor_40 = ** Не удалось скопировать файлы из папки TXMINSTALL в TXMHOME: {0}
-
-common_cols            = 
-common_delete          = удалить
-common_description     = Описание
-common_fMax            = 
-common_fMin            = 
-common_frequency       = Частотность
-common_lowestFrequency = Минимальная частотность
-common_numberOfLines   = Число строк
-common_ok              = OK
-common_pleaseWait      = Пожалуйста, подождите...
-common_property        = Свойство
-common_queries         = Запросы: 
-common_query           = Запрос:
-common_structuralUnit  = Структурная единица: 
-common_structure       = Структура
-common_thresholds      = Пороги
-common_units           = Единицы
-
-error_error                   = ** Ошибка: {0}
-error_error2                  = Ошибка
-error_errorWhileSortingResult = 
-
-info_connected = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+common_cols=
+common_delete=удалить
+common_description=Описание
+common_fMax=
+common_fMin=
+common_frequency=Частотность
+common_lowestFrequency=Минимальная частотность
+common_numberOfLines=Число строк
+common_ok=OK
+common_property=Свойство
+common_queries=Запросы\: 
+common_query=Запрос\:
+common_structure=Структура
+common_thresholds=Пороги
+common_units=Единицы
+couldNotCreateTXMHOMEDirectoryDDotP0=** Не удалось создать папку TXMHOME \: {0}
+error_error=** Ошибка\: {0}
+error_error2=Ошибка
+error_errorWhileSortingResult=
+failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEDDotP0=** Не удалось скопировать файлы из папки TXMINSTALL в TXMHOME\: {0}
Index: tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 1335)
@@ -25,17 +25,14 @@
 	public static String common_fMin;
 	public static String common_frequency;
 	public static String common_lowestFrequency;
-	public static String common_mode;
 	public static String common_numberOfLines;
 	public static String common_ok;
-	public static String common_pleaseWait;
 	public static String common_properties;
 	public static String common_property;
 	public static String common_queries;
 	public static String common_query;
 	public static String common_reference;
 	public static String common_rows;
-	public static String common_structuralUnit;
 	public static String common_structuralUnitAndProperty;
 	public static String common_structure;
 	public static String common_thresholds;
@@ -51,132 +48,128 @@
 
 
 	
-	public static String info_connected;
 
 	
-	public static String ApplicationWorkbenchAdvisor_13;
-	public static String ApplicationWorkbenchAdvisor_14;
-	public static String ApplicationWorkbenchAdvisor_15;
-	public static String ApplicationWorkbenchAdvisor_40;
-	public static String ApplicationWorkbenchAdvisor_6;
-	public static String FMAX_2;
-	public static String FMIN_2;
-	public static String V;
+	public static String couldNotCreateTXMHOMEDirectoryDDotP0; 
+	public static String evaluatingExtensionDDot; 
+	public static String loadingExtensions; 
+	public static String failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEDDotP0; 
+	public static String exceptionDDot; 
+	public static String fmax; 
+	public static String fmin; 
+	public static String v; 
 
 	
 
 	
 	public static String common_absoluteFrequency;
 
-	public static String Base_0;
-	public static String Base_3;
-	public static String Base_4;
-	public static String Base_5;
-	public static String Base_6;
-	public static String Catalog_0;
-	public static String CatalogManager_0;
-	public static String CatalogManager_1;
-	public static String Contrasts_0;
-	public static String Convert5To6_10;
-	public static String Convert5To6_11;
-	public static String Convert5To6_12;
-	public static String Convert5To6_15;
-	public static String Convert5To6_19;
-	public static String Convert5To6_1;
-	public static String Convert5To6_30;
-	public static String Convert5To6_46;
-	public static String Convert5To6_6;
-	public static String Convert5To6_7;
-	public static String Convert5To6_8;
-	public static String Convert5To6_9;
-	public static String Corpus_12;
-	public static String Corpus_13;
-	public static String Corpus_14;
-	public static String Corpus_15;
-	public static String Corpus_19;
-	public static String Corpus_2;
-	public static String Corpus_3;
-	public static String Corpus_4;
-	public static String Corpus_5;
-	public static String Corpus_8;
-	public static String CorpusManager_0;
-	public static String CorpusManager_1;
+	public static String binaryDirectory; 
+	public static String doesNotExist; 
+	public static String parentDirectory; 
+	public static String errorDDotLinkGrplinkAttargetMalformedDDot; 
+	public static String catalogFileNotFound; 
+	public static String managerErrorDuringInitializationDDot; 
+	public static String doesNotExist_3; 
+	public static String computingDDot; 
+	public static String registryFileIsMissingDDot; 
+	public static String htmlDirectoryIsMissingDDot; 
+	public static String processing; 
+	public static String reorganizingFilesOf; 
+	public static String readCorpusInfosFromOldImportxmlFileDDot; 
+	public static String isMissing; 
+	public static String fillImportxmlWithDDot; 
+	public static String processingTextDDot; 
+	public static String checkingBinaryFormat; 
+	public static String txmDirectoryIsMissingDDot; 
+	public static String dataDirectoryIsMissingDDot; 
+	public static String failedToRestoreSubcorpus; 
+	public static String corpusDDotgetLocaleDDotCQPIsNotReadyToAnswerDDot; 
+	public static String warningDDotCantLoadCorpus; 
+	public static String informationsFromWorkspaceSelfElementNull; 
+	public static String failedToRestorePartition; 
+	public static String corpusDDot; 
+	public static String encodingDDot; 
+	public static String languageDDot; 
+	public static String noValuesGiven; 
+	public static String in; 
+	public static String cQiClientNotInitialized; 
+	public static String errorDDotThisExceptionShouldNotBeThrown; 
 
-	public static String Error_CONNECTION_FAILED;
-	public static String Filter_7;
-	public static String FilterManager_0;
-	public static String FilterManager_1;
-	public static String Focus_1;
-	public static String GroovyImportScriptRunner_0;
-	public static String GroovyImportScriptRunner_1;
-	public static String GroovyImportScriptRunner_3;
-	public static String MainCorpus_0;
+	public static String errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot; 
+	public static String readError; 
+	public static String filterManagerErrorDDotInitialization; 
+	public static String theFocusIsEmptyOrNull; 
+	public static String initializationOfGroovyImportScriptRunner; 
+	public static String supBeginningExecutionOf; 
+	public static String supEndOfExecution; 
+	public static String isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters; 
 	
 	
-	public static String Page_3;
-	public static String Partition_18;
-	public static String Partition_9;
-	public static String PartitionFocus_1;
-	public static String PartitionFocus_2;
-	public static String PartitionFocus_3;
-	public static String PartitionFocus_4;
-	public static String Project_11;
-	public static String Project_17;
-	public static String Project_18;
-	public static String Project_26;
-	public static String Project_26_079;
-	public static String Project_28;
-	public static String Project_31;
-	public static String QUERY;
-	public static String QueryIndex_2;
-	public static String QueryIndex_3;
-	public static String QUERYING_PARTITION;
-	public static String QueryResult_0;
-	public static String Selection_26;
-	public static String Selection_5;
-	public static String Selection_6;
-	public static String Selection_7;
-	public static String Selection_8;
-	public static String Selection_9;
-	public static String StructuralUnitProperty_0;
-	public static String TigerXmlIndexing_2;
-	public static String TigerXmlIndexing_3;
-	public static String TigerXmlIndexing_6;
-	public static String TigerXmlIndexing_7;
-	public static String Toolbox_0;
-	public static String Toolbox_10;
-	public static String Toolbox_12;
-	public static String Toolbox_14;
-	public static String Toolbox_15;
-	public static String Toolbox_16;
-	public static String Toolbox_17;
-	public static String Toolbox_18;
-	public static String Toolbox_22;
-	public static String Toolbox_27;
-	public static String Toolbox_28;
-	public static String Toolbox_29;
-	public static String Toolbox_30;
-	public static String Toolbox_31;
-	public static String Toolbox_33;
-	public static String Toolbox_34;
-	public static String Toolbox_37;
-	public static String Toolbox_38;
-	public static String Toolbox_39;
-	public static String Toolbox_40;
-	public static String Toolbox_connected_to_corpus_sever;
-	public static String Toolbox_workspace_init_failed;
-	public static String Toolbox_wrong_port;
-	public static String TSCmd_30;
-	public static String TSCmd_31;
-	public static String TSCorpus_0;
-	public static String TSCorpusManager_0;
-	public static String TSCorpusManager_1;
-	public static String TSResult_0;
-	public static String TSResult_2;
-	public static String ValidateXml_0;
-	public static String ValidateXml_1;
-	public static String ValidateXml_2;
-	public static String ValidateXml_3;
+	public static String malformedURLFile; 
+	public static String failedToGetLastCQPErrorDDot; 
+	public static String failedToCreatePartDDot; 
+	public static String theFocusCannotBeNullOrEmpty; 
+	public static String focusIsEmptyOrNull; 
+	public static String theP0PartFocusDoesntBelongToPartitionP1; 
+	public static String unknownPartitionName; 
+	public static String failedToLoadBaseParametersFromFileDDot; 
+	public static String errorDDotSkippingTheLoadingOfCorpusDDot; 
+	public static String pARAMSDDot; 
+	public static String errorDDotP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatDDotCorpusSkipped; 
+	public static String errorDDotP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatDDotCorpusSkipped; 
+	public static String tXMNeedsFoldersDDot; 
+	public static String andFile; 
+	public static String queryOnP0DDotP1InfP2; 
+	public static String warningDDotDuplicateQueryEntryDDot; 
+	public static String warningDDotQueryFailedDDot; 
+	public static String queryingPartitionP0; 
+	public static String isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters; 
+	public static String failedToGetSupValuesOf; 
+	public static String textMetadataDDot; 
+	public static String selectionErrorDDotTheCorpus; 
+	public static String hasNoBase; 
+	public static String cantFindStructuralUnitForMetadataWithIdDDot; 
+	public static String errorWhileGettingMetadatasFromBaseimportMetadatasDDot; 
+	public static String failedToAccessStructuralPropertyValues; 
+	public static String eRRORDDotExists; 
+	public static String eRRORDDotRead; 
+	public static String iODDot; 
+	public static String sAXDDot; 
+	public static String file; 
+	public static String noWorkspaceFoundCreatingANewOne; 
+	public static String loadingWorkspaceFromFileDDot; 
+	public static String errorLoadingWorkspaceFromFileDDot; 
+	public static String errorDDot; 
+	public static String doesNotExists; 
+	public static String endOfCQPWaitTest; 
+	public static String errorWhileWaitingForCQP; 
+	public static String workspaceDDot; 
+	public static String and; 
+	public static String failedToStartMemCqiClientDDot; 
+	public static String errorWhileConnectingToSearchEngine; 
+	public static String wrongLoginOrPasswordOrPortDDot; 
+	public static String failedToExecTaskkillIMCqpserverexeFDDot; 
+	public static String orTheEngineWasNotStartedWithTheCommandLineDDot; 
+	public static String failedToExecTskillCqpserverexeDDot; 
+	public static String killPsAuxPipeGrepCqpserverPipeAwkP; 
+	public static String print2; 
+	public static String failedToExec; 
+	public static String dDot; 
+	public static String connected; 
+	public static String errorDuringWorkspaceInitializationDDot; 
+	public static String errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat; 
+	public static String queryWasDDot; 
+	public static String matchesFound; 
+	public static String couldntReadCorpusDDot; 
+	public static String errorRegDirDDot; 
+	public static String errorConfigdirDirDDot; 
+	public static String numberOfMatch; 
+	public static String numberOfSubMatch; 
+	public static String xmlValidationDDot; 
+	public static String isADirectory; 
+	public static String doesNotExists_2; 
+	public static String isNotReadable; 
 	
 	
 	/**
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 1335)
@@ -1,170 +1,132 @@
-
-ApplicationWorkbenchAdvisor_13 = ** Échec de la création du dossier TXMHOME : {0}.
-ApplicationWorkbenchAdvisor_40 = ** Échec de la copie des fichiers TXM du dossier TXMINSTALL vers TXMHOME : {0}.
-
-Base_0 = Dossier binaire 
-Base_3 = \ n'existe pas ?
-Base_4 = Le dossier parent 
-Base_5 = \ n'existe pas ?
-Base_6 = Erreur: linkGrp/link/@target mal formé : 
-
-CatalogManager_0 = ** Erreur du gestionnaire de catalogue : initialisation 
-CatalogManager_1 = \ n'existe pas.
-
-Catalog_0        = ** Fichier de catalogue introuvable
-
-Contrasts_0 = Calcul: 
-
-Convert5To6_1  = ''{0}'' est introuvable.
-Convert5To6_10 = le dossier 'registry' est manquant
-Convert5To6_11 = le dossier 'html' est manquant
-Convert5To6_12 = traitement en cours...
-Convert5To6_15 = Reorganisation des fichiers de 
-Convert5To6_19 = Lecture des informatins sur le corpus depuis le fichier import.xml : 
-Convert5To6_30 = Remplissage du fichier 'import.xml' avec : 
-Convert5To6_46 = traitement du fichier : 
-Convert5To6_6  = Vérification du format...
-Convert5To6_7  = le dossier 'txm' est manquant
-Convert5To6_8  = le dossier 'html' est manquant
-Convert5To6_9  = le dossier 'data' est manquant
-
-CorpusManager_0 = ** Le client CQi n'est pas initilialisé
-CorpusManager_1 = ** Erreur : Cette exception ne devrait pas se lever
-
-Corpus_12       = ** Echec de la restauration du sous-corpus
-Corpus_13       = Corpus: getLocale: CQP est pas prêt à répondre : 
-Corpus_14       = Attention: le corpus ne peut pas être chargé 
-Corpus_15       = informations from workspace (selfElement  null)
-Corpus_19       = ** Echec de la restauration de la partition
-Corpus_2        = Corpus : 
-Corpus_3        = , Encodage : 
-Corpus_4        = , Langue : 
-Corpus_5        = Pas de valeur donnée
-Corpus_8        = \ dans
-
-Error_CONNECTION_FAILED = ** Echec de connexion au moteur de recherche avec les paramètres suivants : 
-
-FilterManager_0 = ** Erreur du gestionnaire de filtre : initialisation 
-FilterManager_1 = \ n'existe pas.
-
-Filter_7        = ** Erreur de lecture
-
-Focus_1 = ** Le focus est vide ou nul.
-
-GroovyImportScriptRunner_0 = Initialisation de GroovyImportScriptRunner
-GroovyImportScriptRunner_1 = > début de l'exécution de 
-GroovyImportScriptRunner_3 = > fin de l'exécution
-
-MainCorpus_0 = \ n'est pas un identifiant de corpus CQP valide. Il doit être en majuscule.
-
-Page_3 = ** URL mal formée, fichier 
-
-PartitionFocus_1 = Le focus ne doit pas être vide ou nul.
-PartitionFocus_2 = Le focus est vide ou nul
-PartitionFocus_3 = Le focus de la partie {0} n''appartient pas à la partition {1}.
-PartitionFocus_4 = ** Nom de partition inconnu.
-
-Partition_18     = Erreur lors de la récupération de la dernière erreur CQP : 
-Partition_9      = ** Echec de la création de la partie :
-
-Project_11     = Erreur lors  de la récupération des 
-Project_17     = Erreur : le corpus ne sera pas chargé
-Project_18     = Paramètres : 
-Project_26     = ** Erreur : le dossier d''entrée n''est pas conforme au format de corpus binaire de TXM :
-Project_26_079 = ** Erreur : le dossier d''entrée n''est pas conforme au format de corpus binaire de TXM 0.7.9 :    
-Project_28     = TXM a besoin des dossiers suivants : 
-Project_31     = et le fichier
-
-QUERY = Requête sur {0} : {1} <- {2}
-
-QUERYING_PARTITION = Requête sur la partition {0}
-
-QueryIndex_2 = Attention : requête dupliquée : 
-QueryIndex_3 = Attention : échec de la requête:
-
-QueryResult_0 = \ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
-
-Selection_26 = Echec de la récupération des valeurs de structures de
-Selection_5  = Métadonnées de textes : 
-Selection_6  = Erreur : le corpus
-Selection_7  = n'a pas de 'Base'
-Selection_8  = Erreur : pas de structures trouvées pour la métadonnée d'identifiant : 
-Selection_9  = Erreur lors de la récupération des metadonnées du corpus
-
-StructuralUnitProperty_0 = ** Echec de lecture des valeurs de la propriété de structure 
-
-TSCmd_30 = La requête était : 
-TSCmd_31 = résultats trouvés
-
-TSCorpusManager_0 = Erreur dans le dossier registre :
-TSCorpusManager_1 = Erreur dans le dossier de configuration : 
-
-TSCorpus_0        = Erreur : le corpus n'a pas les droits de lecture
-
-TSResult_0 = Nombre de match
-TSResult_2 = Nombre de sous graph
-
-TigerXmlIndexing_2 = Erreur : n'existe pas
-TigerXmlIndexing_3 = Erreur : n'a pas les droits de lecture
-TigerXmlIndexing_6 = IO :
-TigerXmlIndexing_7 = SAX : 
-
-Toolbox_0                         = ** Le fichier 
-Toolbox_10                        = ** Pas d'espace de travail trouvé, création d'un nouvel espace de travail dans le dossier 
-Toolbox_12                        = Chargement de l'espace de travail à partir du fichier 
-Toolbox_14                        = ** Echec de lecture de l'espace de travail à partir du fichier 
-Toolbox_15                        = ** Erreur :
-Toolbox_16                        = \ n'existe pas.
-Toolbox_17                        = Fin du test d'attente de CQP
-Toolbox_18                        = ** Échec du test d'attente de CQP : 
-Toolbox_22                        = \ Espace de travail : 
-Toolbox_27                        = \ et  
-Toolbox_28                        = Erreur lors du démarage du mode mémoire de CQP
-Toolbox_29                        = ** Échec de la connexion au moteur de recherche : 
-Toolbox_30                        = - mauvais login/mot de passe/nom de machine/port :
-Toolbox_31                        = Echec de la commande 'taskkill /IM cqpserver.exe /F': 
-Toolbox_33                        = - ou le moteur de recherche n'a pas été lancé avec la ligne de commande : 
-Toolbox_34                        = Echec de la commande 'tskill cqpserver.exe': 
-Toolbox_37                        = kill `ps aux | grep cqpserver | awk '/-P 
-Toolbox_38                        = / {print $2}'`
-Toolbox_39                        = Echec de l'exécution de '
-Toolbox_40                        = ' :
-Toolbox_connected_to_corpus_sever = connecté.
-Toolbox_workspace_init_failed     = ** Echec de l'initialisation de l'espace de travail : 
-Toolbox_wrong_port                = ** La connexion au moteur de recherche a échoué : le port fourni en paramètre n'est pas un nombre entier
-
-ValidateXml_0 = Validation XML : 
-ValidateXml_1 = est un dossier
-ValidateXml_2 = n'existe pas
-ValidateXml_3 = n'a pas les bon droits de lecture
-
-common_absoluteFrequency         = Fréquence absolue
-common_cols                      = Colonnes
-common_delete                    = Supprimer
-common_description               = Description
-common_done                      = Terminé.
-common_fMax                      = Fmax
-common_fMin                      = Fmin
-common_frequency                 = Fréquence
-common_lowestFrequency           = Fréquence minimale
-common_mode                      = Mode
-common_numberOfLines             = Nombre de lignes
-common_ok                        = OK
-common_pleaseWait                = Veuillez patienter...
-common_properties                = Propriétés :
-common_property                  = Propriété :
-common_queries                   = Requêtes 
-common_query                     = Requête 
-common_reference                 = Référence
-common_rows                      = Lignes
-common_structuralUnitAndProperty = Unité structurelle et propriété
-common_structure                 = Structure
-common_t                         = t
-common_thresholds                = Seuils
-common_units                     = Unités
-
-error_error                   = ** Erreur : {0}.
-error_error2                  = Erreur
-error_errorWhileSortingResult = Erreur pendant le tri du résultat.
-
-info_connected = Connecté.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+and=\ et  
+andFile=et le fichier
+binaryDirectory=Dossier binaire 
+cantFindStructuralUnitForMetadataWithIdDDot=Erreur \: pas de structures trouvées pour la métadonnée d'identifiant \: 
+catalogFileNotFound=** Fichier de catalogue introuvable
+checkingBinaryFormat=Vérification du format...
+common_absoluteFrequency=Fréquence absolue
+common_cols=Colonnes
+common_delete=Supprimer
+common_description=Description
+common_done=Terminé.
+common_fMax=Fmax
+common_fMin=Fmin
+common_frequency=Fréquence
+common_lowestFrequency=Fréquence minimale
+common_numberOfLines=Nombre de lignes
+common_ok=OK
+common_properties=Propriétés \:
+common_property=Propriété \:
+common_queries=Requêtes 
+common_query=Requête 
+common_reference=Référence
+common_rows=Lignes
+common_structuralUnitAndProperty=Unité structurelle et propriété
+common_structure=Structure
+common_t=t
+common_thresholds=Seuils
+common_units=Unités
+computingDDot=Calcul\: 
+connected=connecté.
+corpusDDot=Corpus \: 
+corpusDDotgetLocaleDDotCQPIsNotReadyToAnswerDDot=Corpus\: getLocale\: CQP est pas prêt à répondre \: 
+couldNotCreateTXMHOMEDirectoryDDotP0=** Échec de la création du dossier TXMHOME \: {0}.
+couldntReadCorpusDDot=Erreur \: le corpus n'a pas les droits de lecture
+cQiClientNotInitialized=** Le client CQi n'est pas initilialisé
+dataDirectoryIsMissingDDot=le dossier 'data' est manquant
+dDot=' \:
+doesNotExist=\ n'existe pas ?
+doesNotExist_3=\ n'existe pas.
+doesNotExists=\ n'existe pas.
+doesNotExists_2=n'existe pas
+encodingDDot=, Encodage \: 
+endOfCQPWaitTest=Fin du test d'attente de CQP
+error_error=** Erreur \: {0}.
+error_error2=Erreur
+error_errorWhileSortingResult=Erreur pendant le tri du résultat.
+errorConfigdirDirDDot=Erreur dans le dossier de configuration \: 
+errorDDot=** Erreur \:
+eRRORDDotExists=Erreur \: n'existe pas
+errorDDotLinkGrplinkAttargetMalformedDDot=Erreur\: linkGrp/link/@target mal formé \: 
+errorDDotP0CorpusDirectoryIsNotConformantToTXM079CorpusBinaryFormatDDotCorpusSkipped=** Erreur \: le dossier d''entrée n''est pas conforme au format de corpus binaire de TXM 0.7.9 \:    
+errorDDotP0CorpusDirectoryIsNotConformantToTXMCorpusBinaryFormatDDotCorpusSkipped=** Erreur \: le dossier d''entrée n''est pas conforme au format de corpus binaire de TXM \:
+eRRORDDotRead=Erreur \: n'a pas les droits de lecture
+errorDDotSkippingTheLoadingOfCorpusDDot=Erreur \: le corpus ne sera pas chargé
+errorDDotTheConnexionToTheServerFailedDDotWrongPortFormat=** La connexion au moteur de recherche a échoué \: le port fourni en paramètre n'est pas un nombre entier
+errorDDotThisExceptionShouldNotBeThrown=** Erreur \: Cette exception ne devrait pas se lever
+errorDDotWhileConnectionToSearchEngineWithTheFollowingParametersDDot=** Echec de connexion au moteur de recherche avec les paramètres suivants \: 
+errorDuringWorkspaceInitializationDDot=** Echec de l'initialisation de l'espace de travail \: 
+errorLoadingWorkspaceFromFileDDot=** Echec de lecture de l'espace de travail à partir du fichier 
+errorRegDirDDot=Erreur dans le dossier registre \:
+errorWhileConnectingToSearchEngine=** Échec de la connexion au moteur de recherche \: 
+errorWhileGettingMetadatasFromBaseimportMetadatasDDot=Erreur lors de la récupération des metadonnées du corpus
+errorWhileWaitingForCQP=** Échec du test d'attente de CQP \: 
+failedToAccessStructuralPropertyValues=** Echec de lecture des valeurs de la propriété de structure 
+failedToCopyTXMFilesFromTXMINSTALLDIRToTXMHOMEDDotP0=** Échec de la copie des fichiers TXM du dossier TXMINSTALL vers TXMHOME \: {0}.
+failedToCreatePartDDot=** Echec de la création de la partie \:
+failedToExec=Echec de l'exécution de '
+failedToExecTaskkillIMCqpserverexeFDDot=Echec de la commande 'taskkill /IM cqpserver.exe /F'\: 
+failedToExecTskillCqpserverexeDDot=Echec de la commande 'tskill cqpserver.exe'\: 
+failedToGetLastCQPErrorDDot=Erreur lors de la récupération de la dernière erreur CQP \: 
+failedToGetSupValuesOf=Echec de la récupération des valeurs de structures de
+failedToLoadBaseParametersFromFileDDot=Erreur lors  de la récupération des 
+failedToRestorePartition=** Echec de la restauration de la partition
+failedToRestoreSubcorpus=** Echec de la restauration du sous-corpus
+failedToStartMemCqiClientDDot=Erreur lors du démarage du mode mémoire de CQP
+file=** Le fichier 
+fillImportxmlWithDDot=Remplissage du fichier 'import.xml' avec \: 
+filterManagerErrorDDotInitialization=** Erreur du gestionnaire de filtre \: initialisation 
+focusIsEmptyOrNull=Le focus est vide ou nul
+hasNoBase=n'a pas de 'Base'
+htmlDirectoryIsMissingDDot=le dossier 'html' est manquant
+in=\ dans
+informationsFromWorkspaceSelfElementNull=informations from workspace (selfElement  null)
+initializationOfGroovyImportScriptRunner=Initialisation de GroovyImportScriptRunner
+iODDot=IO \:
+isADirectory=est un dossier
+isMissing=''{0}'' est introuvable.
+isNotAValidCQPIDForACorpusItMustBeInUppercaseCharacters=\ n'est pas un identifiant de corpus CQP valide. Il doit être en majuscule.
+isNotAValidCQPIdForASubcorpusItMustBeAnUppercaseCharactersFollowedByLowercaseCharacters=\ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
+isNotReadable=n'a pas les bon droits de lecture
+killPsAuxPipeGrepCqpserverPipeAwkP=kill `ps aux | grep cqpserver | awk '/-P 
+languageDDot=, Langue \: 
+loadingWorkspaceFromFileDDot=Chargement de l'espace de travail à partir du fichier 
+malformedURLFile=** URL mal formée, fichier 
+managerErrorDuringInitializationDDot=** Erreur du gestionnaire de catalogue \: initialisation 
+matchesFound=résultats trouvés
+noValuesGiven=Pas de valeur donnée
+noWorkspaceFoundCreatingANewOne=** Pas d'espace de travail trouvé, création d'un nouvel espace de travail dans le dossier 
+numberOfMatch=Nombre de match
+numberOfSubMatch=Nombre de sous graph
+orTheEngineWasNotStartedWithTheCommandLineDDot=- ou le moteur de recherche n'a pas été lancé avec la ligne de commande \: 
+pARAMSDDot=Paramètres \: 
+parentDirectory=Le dossier parent 
+print2=/ {print $2}'`
+processing=traitement en cours...
+processingTextDDot=traitement du fichier \: 
+queryingPartitionP0=Requête sur la partition {0}
+queryOnP0DDotP1InfP2=Requête sur {0} \: {1} <- {2}
+queryWasDDot=La requête était \: 
+readCorpusInfosFromOldImportxmlFileDDot=Lecture des informatins sur le corpus depuis le fichier import.xml \: 
+readError=** Erreur de lecture
+registryFileIsMissingDDot=le dossier 'registry' est manquant
+reorganizingFilesOf=Reorganisation des fichiers de 
+sAXDDot=SAX \: 
+selectionErrorDDotTheCorpus=Erreur \: le corpus
+supBeginningExecutionOf=> début de l'exécution de 
+supEndOfExecution=> fin de l'exécution
+textMetadataDDot=Métadonnées de textes \: 
+theFocusCannotBeNullOrEmpty=Le focus ne doit pas être vide ou nul.
+theFocusIsEmptyOrNull=** Le focus est vide ou nul.
+theP0PartFocusDoesntBelongToPartitionP1=Le focus de la partie {0} n''appartient pas à la partition {1}.
+txmDirectoryIsMissingDDot=le dossier 'txm' est manquant
+tXMNeedsFoldersDDot=TXM a besoin des dossiers suivants \: 
+unknownPartitionName=** Nom de partition inconnu.
+warningDDotCantLoadCorpus=Attention\: le corpus ne peut pas être chargé 
+warningDDotDuplicateQueryEntryDDot=Attention \: requête dupliquée \: 
+warningDDotQueryFailedDDot=Attention \: échec de la requête\:
+workspaceDDot=\ Espace de travail \: 
+wrongLoginOrPasswordOrPortDDot=- mauvais login/mot de passe/nom de machine/port \:
+xmlValidationDDot=Validation XML \: 
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE = Сортировать части по размеру
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+sortByPartSize=Сортировать части по размеру
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,2 +1,4 @@
-PreferencesPage_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE=Afficher le nombre de parties dans le titre du graphique
-PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE=Trier par taille de partie
\ No newline at end of file
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+displayPartsCountInChartTitle=Afficher le nombre de parties dans le titre du graphique
+sortByPartSize=Trier par taille de partie
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/PartitionUIMessages.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/PartitionUIMessages.java	(revision 1334)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/PartitionUIMessages.java	(revision 1335)
@@ -1,29 +1,29 @@
-package org.txm.partition.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * Partition UI Messages.
- * @author sjacquot
- *
- */
-public class PartitionUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.partition.rcp.messages.messages"; //$NON-NLS-1$
-	
-	public static String PreferencesPage_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE;
-	public static String PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE;
-
-	public static String preferences_charts_tabfolder_title; // "Dimensions chart rendering"
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionUIMessages.class);
-	}
-
-	private PartitionUIMessages() {
-	}
-	
-}
+package org.txm.partition.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Partition UI Messages.
+ * @author sjacquot
+ *
+ */
+public class PartitionUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.partition.rcp.messages.messages"; //$NON-NLS-1$
+	
+	public static String displayPartsCountInChartTitle; 
+	public static String sortByPartSize; 
+
+	public static String dimensionsChartRendering; // "Dimensions chart rendering"
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionUIMessages.class);
+	}
+
+	private PartitionUIMessages() {
+	}
+	
+}
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/messages/messages.properties	(revision 1335)
@@ -1,3 +1,5 @@
-PreferencesPage_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE=Display parts count in chart title
-PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE=Sort by part size
-preferences_charts_tabfolder_title=Dimensions chart rendering
\ No newline at end of file
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+dimensionsChartRendering=Dimensions chart rendering
+displayPartsCountInChartTitle=Display parts count in chart title
+sortByPartSize=Sort by part size
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/editors/PartitionDimensionsEditor.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/editors/PartitionDimensionsEditor.java	(revision 1334)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/editors/PartitionDimensionsEditor.java	(revision 1335)
@@ -36,7 +36,7 @@
 		new ToolItem(this.getToolBar(), SWT.SEPARATOR);
 		this.sortByPartSize = new ToolItem(this.getToolBar(), SWT.CHECK);
 		this.sortByPartSize.setImage(IImageKeys.getImage(this.getClass(), "icons/silk_sort_by_size.png")); //$NON-NLS-1$
-		this.sortByPartSize.setToolTipText(PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE);
+		this.sortByPartSize.setToolTipText(PartitionUIMessages.sortByPartSize);
 		
 		this.sortByPartSize.addSelectionListener(new ComputeSelectionListener(this));
 		
@@ -52,4 +52,4 @@
 	}
 	
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java	(revision 1334)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java	(revision 1335)
@@ -54,10 +54,10 @@
 	public void createFieldEditors() {
 		
 		// Charts rendering
-		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent(), PartitionUIMessages.preferences_charts_tabfolder_title);
+		Composite chartsTab = SWTChartsComponentsProvider.createChartsRenderingPreferencesTabFolderComposite(this.getFieldEditorParent(), PartitionUIMessages.dimensionsChartRendering);
 		
-		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORT_BY_SIZE, PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE, chartsTab));
-		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE, PartitionUIMessages.PreferencesPage_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE, chartsTab));
+		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORT_BY_SIZE, PartitionUIMessages.sortByPartSize, chartsTab));
+		this.addField(new BooleanFieldEditor(PartitionDimensionsPreferences.CHART_DIMENSIONS_DISPLAY_PARTS_COUNT_IN_TITLE, PartitionUIMessages.displayPartsCountInChartTitle, chartsTab));
 		
 		// other shared preferences
 		SWTChartsComponentsProvider.createChartsRenderingPreferencesFields(this, chartsTab);
@@ -69,4 +69,4 @@
 		this.setPreferenceStore(new TXMPreferenceStore(PartitionDimensionsPreferences.getInstance().getPreferencesNodeQualifier()));
 		this.setTitle(TXMCoreMessages.common_description);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages_ru.properties	(revision 1335)
@@ -1,4 +1,4 @@
-
-PartsSize_18 = Размеры: {0}
-
-RESULT_TYPE = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+dimensionsDDotP0=Размеры\: {0}
+RESULT_TYPE=
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages_fr.properties	(revision 1335)
@@ -1,6 +1,5 @@
-
-PartsSize_18 = Dimensions : {0}
-
-RESULT_TYPE = Propriétés
-
-charts_error_cantCreatePartitionDismensionsFileChart = Impossible de créer le fichier du graphique de dimensions de partition (moteur de graphique : {0})
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+cantCreateDimensionsPartitionChartFileChartsEngineDDotP0=Impossible de créer le fichier du graphique de dimensions de partition (moteur de graphique \: {0})
+dimensionsDDotP0=Dimensions \: {0}
+RESULT_TYPE=Propriétés
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/messages/PartitionCoreMessages.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/messages/PartitionCoreMessages.java	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/messages/PartitionCoreMessages.java	(revision 1335)
@@ -1,36 +1,36 @@
-package org.txm.partition.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * Partition core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class PartitionCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.partition.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String RESULT_TYPE;
-	
-	public static String charts_error_cantCreatePartitionDismensionsFileChart;
-	public static String CHARTSENGINE_PARTITION_DIMENSIONS_SORTED_BY_SIZE;
-	public static String CHARTSENGINE_PARTITION_DIMENSIONS_DIMENSIONS_OF_PARTITION;
-	public static String CHARTSENGINE_PARTITION_DIMENSIONS_PARTS;
-	public static String CHARTSENGINE_PARTITION_DIMENSIONS_CATEGORY;
-	public static String CHARTSENGINE_PARTITION_DIMENSIONS_X_AXIS_LABEL;
-	public static String CHARTSENGINE_PARTITION_DIMENSIONS_Y_AXIS_LABEL;
-	public static String PartsSize_18;
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionCoreMessages.class);
-	}
-
-	private PartitionCoreMessages() {
-	}
-}
+package org.txm.partition.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * Partition core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class PartitionCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.partition.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String RESULT_TYPE;
+	
+	public static String cantCreateDimensionsPartitionChartFileChartsEngineDDotP0; 
+	public static String sortedBySize; 
+	public static String dimensionsOfTheP0PartitionInTheP1Corpus; 
+	public static String parts; 
+	public static String t; 
+	public static String part; 
+	public static String numberOfWords; 
+	public static String dimensionsDDotP0; 
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, PartitionCoreMessages.class);
+	}
+
+	private PartitionCoreMessages() {
+	}
+}
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages.properties
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/messages/messages.properties	(revision 1335)
@@ -1,12 +1,11 @@
-
-charts_error_cantCreatePartitionDismensionsFileChart=Can''t create dimensions partition chart file (charts engine: {0})
-CHARTSENGINE_PARTITION_DIMENSIONS_CATEGORY                = t
-CHARTSENGINE_PARTITION_DIMENSIONS_DIMENSIONS_OF_PARTITION = Dimensions of the {0} partition in the {1} corpus
-CHARTSENGINE_PARTITION_DIMENSIONS_PARTS                   = Part(s)
-CHARTSENGINE_PARTITION_DIMENSIONS_SORTED_BY_SIZE          = sorted by size
-CHARTSENGINE_PARTITION_DIMENSIONS_X_AXIS_LABEL            = Part
-CHARTSENGINE_PARTITION_DIMENSIONS_Y_AXIS_LABEL            = Number of words
-
-PartsSize_18 = Dimensions: {0}
-
-RESULT_TYPE = Properties
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+cantCreateDimensionsPartitionChartFileChartsEngineDDotP0=Can''t create dimensions partition chart file (charts engine\: {0})
+dimensionsDDotP0=Dimensions\: {0}
+dimensionsOfTheP0PartitionInTheP1Corpus=Dimensions of the {0} partition in the {1} corpus
+numberOfWords=Number of words
+part=Part
+parts=Part(s)
+RESULT_TYPE=Properties
+sortedBySize=sorted by size
+t=t
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java	(revision 1335)
@@ -188,7 +188,7 @@
 	@Override
 	public String getName()	{
 		try {
-			return PartitionCoreMessages.bind(PartitionCoreMessages.PartsSize_18, this.getParent().getName());
+			return PartitionCoreMessages.bind(PartitionCoreMessages.dimensionsDDotP0, this.getParent().getName());
 		}
 		catch(Exception e) {
 		}	
@@ -240,4 +240,4 @@
 		return PartitionCoreMessages.RESULT_TYPE;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/base/Utils.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/base/Utils.java	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/base/Utils.java	(revision 1335)
@@ -24,15 +24,15 @@
 	 */
 	public static String createPartitionDimensionsChartTitle(PartitionDimensions partitionDimensions, boolean sortPartsBySize, boolean displayPartsCountInTitle)	{
 
-		String title = PartitionCoreMessages.bind(PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_DIMENSIONS_OF_PARTITION, partitionDimensions.getParent().getSimpleName(), partitionDimensions.getCorpus().getSimpleName());
+		String title = PartitionCoreMessages.bind(PartitionCoreMessages.dimensionsOfTheP0PartitionInTheP1Corpus, partitionDimensions.getParent().getSimpleName(), partitionDimensions.getCorpus().getSimpleName());
 
 		// FIXME
 //		if(displayPartsCountInTitle)	{
-//			title += "\n(" +  partitionDimensions.getPartsCount() + " " + PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_PARTS + ")"; //$NON-NLS-1$ //$NON-NLS-3$
+//			title += "\n(" +  partitionDimensions.getPartsCount() + " " + PartitionCoreMessages.parts + ")"; //$NON-NLS-1$ //$NON-NLS-3$
 //		}
 //
 //		if(sortPartsBySize) {
-//			title += PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_SORTED_BY_SIZE;
+//			title += PartitionCoreMessages.sortedBySize;
 //		}
 
 		return title;
@@ -44,7 +44,7 @@
 		String title = "";
 		
 		if(displayPartsCountInTitle)	{
-			title += partitionDimensions.getPartsCount() + " " + PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_PARTS; //$NON-NLS-1$
+			title += partitionDimensions.getPartsCount() + " " + PartitionCoreMessages.parts; //$NON-NLS-1$
 		}
 
 		if(displayPartsCountInTitle && sortPartsBySize) {
@@ -52,10 +52,10 @@
 		}
 		
 		if(sortPartsBySize) {
-			title += PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_SORTED_BY_SIZE;
+			title += PartitionCoreMessages.sortedBySize;
 		}
 
 		return title;
 		
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java	(revision 1335)
@@ -39,7 +39,7 @@
 		XYSeriesCollection dataset = new XYSeriesCollection();
 
 		// Create the chart
-        chart = this.getChartsEngine().createXYBarChart(dataset, null, PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_X_AXIS_LABEL, PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_Y_AXIS_LABEL, false, true);
+        chart = this.getChartsEngine().createXYBarChart(dataset, null, PartitionCoreMessages.part, PartitionCoreMessages.numberOfWords, false, true);
         // Custom range axis for ticks drawing options
         chart.getXYPlot().setRangeAxis(new ExtendedNumberAxis((NumberAxis) chart.getXYPlot().getRangeAxis(), false, true, 0, DatasetUtilities.findMaximumRangeValue(chart.getXYPlot().getDataset()).doubleValue()));
 
@@ -69,7 +69,7 @@
 			XYSeriesCollection dataset = (XYSeriesCollection) chart.getXYPlot().getDataset();
 			dataset.removeAllSeries();
 			
-			XYSeries series = new XYSeries(PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_CATEGORY);
+			XYSeries series = new XYSeries(PartitionCoreMessages.t);
 			dataset.addSeries(series);
 	
 			List<Part> parts = partitionDimensions.getParts(sortPartsBySize);
@@ -122,4 +122,4 @@
 	
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsPieChartCreator.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsPieChartCreator.java	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsPieChartCreator.java	(revision 1335)
@@ -67,7 +67,7 @@
 			this.getChartsEngine().setColors(result.getRenderingColorsMode(),  parts.size());
 
 			
-			String ylab = PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_Y_AXIS_LABEL;
+			String ylab = PartitionCoreMessages.numberOfWords;
 
 			String cmd = "pie(" + ssizes + ", col=colors, labels=" + snames + //$NON-NLS-1$ //$NON-NLS-2$
 					", main=\"" + title + "\", horiz=F, las=2, ylab=\"" + ylab + "\")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -76,7 +76,7 @@
 			((RChartsEngine) this.chartsEngine).plot(file, cmd);
 		}
 		catch(Exception e) {
-			Log.severe(PartitionCoreMessages.bind(PartitionCoreMessages.charts_error_cantCreatePartitionDismensionsFileChart, RChartsEngine.DESCRIPTION) + e);
+			Log.severe(PartitionCoreMessages.bind(PartitionCoreMessages.cantCreateDimensionsPartitionChartFileChartsEngineDDotP0, RChartsEngine.DESCRIPTION) + e);
 		}
 
 		return file;
@@ -88,4 +88,4 @@
 		return PartitionDimensions.class;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsBarChartCreator.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsBarChartCreator.java	(revision 1334)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/r/RPartitionDimensionsBarChartCreator.java	(revision 1335)
@@ -67,7 +67,7 @@
 			// FIXME: one color by part
 			//this.getChartsEngine().setColors(TXMPreferences.getInt(preferencesNode, result, ChartsEnginePreferences.RENDERING_COLORS_MODE),  parts.size());
 			
-			String ylab = PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_Y_AXIS_LABEL;
+			String ylab = PartitionCoreMessages.numberOfWords;
 
 			String cmd = "";
 			
@@ -92,7 +92,7 @@
 			
 		}
 		catch(Exception e) {
-			Log.severe(PartitionCoreMessages.bind(PartitionCoreMessages.charts_error_cantCreatePartitionDismensionsFileChart, RChartsEngine.DESCRIPTION) + e);
+			Log.severe(PartitionCoreMessages.bind(PartitionCoreMessages.cantCreateDimensionsPartitionChartFileChartsEngineDDotP0, RChartsEngine.DESCRIPTION) + e);
 			Log.printStackTrace(e);
 		}
 
@@ -107,4 +107,4 @@
 		return PartitionDimensions.class;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_ru.properties	(revision 1335)
@@ -1,4 +1,4 @@
-
-ComputeProgression_0 = Функция Прогрессия в настоящее время недоступна на прерывных подкорпусах.
-
-RESULT_TYPE = Прогрессия
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+RESULT_TYPE=Прогрессия
+theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora=Функция Прогрессия в настоящее время недоступна на прерывных подкорпусах.
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages_fr.properties	(revision 1335)
@@ -1,16 +1,14 @@
-
-ChartsEngine_PROGRESSION_TITLE_DENSITY           = (densité)
-ChartsEngine_PROGRESSION_TITLE_IN                = dans
-ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF    = Progression de
-ChartsEngine_PROGRESSION_TITLE_PROPERTY          = , propriété :  
-ChartsEngine_PROGRESSION_TITLE_REGEX             = , filtrage REGEX: 
-ChartsEngine_PROGRESSION_TITLE_STRUCT            = structure :  
-ChartsEngine_PROGRESSION_X_AXIS_LABEL            = T = {0}
-ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL = Occurrences
-
-ComputeProgression_0 = La fonctionnalité Progression n'est pas encore disponible pour les sous-corpus discontinus.
-ComputeProgression_3 = Terminé: pas de match trouvé.
-
-Progression_1 = Erreur la taille du sous-corpus est 0
-
-RESULT_TYPE = Progression
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+density=(densité)
+doneDDotNoMatchFound=Terminé\: pas de match trouvé.
+errorDDotSubcorpusWithSize0=Erreur la taille du sous-corpus est 0
+filteringREGEXDDot=, filtrage REGEX\: 
+in=dans
+occurrences=Occurrences
+progressionOf=Progression de
+propertyDDot=, propriété \:  
+RESULT_TYPE=Progression
+structureDDot=structure \:  
+tEqualsP0=T \= {0}
+theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora=La fonctionnalité Progression n'est pas encore disponible pour les sous-corpus discontinus.
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java	(revision 1334)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/messages/ProgressionCoreMessages.java	(revision 1335)
@@ -1,43 +1,43 @@
-package org.txm.progression.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Progression core messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class ProgressionCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.progression.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String RESULT_TYPE;
-
-	public static String ChartsEngine_PROGRESSION_X_AXIS_LABEL;
-	public static String ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL;
-
-	public static String ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF;
-	public static String ChartsEngine_PROGRESSION_TITLE_IN;
-	public static String ChartsEngine_PROGRESSION_TITLE_DENSITY;
-	public static String ChartsEngine_PROGRESSION_TITLE_STRUCT;
-	public static String ChartsEngine_PROGRESSION_TITLE_PROPERTY;
-	public static String ChartsEngine_PROGRESSION_TITLE_REGEX;
-
-	public static String ComputeProgression_0;
-	public static String ComputeProgression_3;
-	
-	
-	public static String Progression_1;
-	
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, ProgressionCoreMessages.class);
-	}
-
-	private ProgressionCoreMessages() {
-	}
-}
+package org.txm.progression.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Progression core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class ProgressionCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.progression.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String RESULT_TYPE;
+
+	public static String tEqualsP0; 
+	public static String occurrences; 
+
+	public static String progressionOf; 
+	public static String in; 
+	public static String density; 
+	public static String structureDDot; 
+	public static String propertyDDot; 
+	public static String filteringREGEXDDot; 
+
+	public static String theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora; 
+	public static String doneDDotNoMatchFound; 
+	
+	
+	public static String errorDDotSubcorpusWithSize0; 
+	
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, ProgressionCoreMessages.class);
+	}
+
+	private ProgressionCoreMessages() {
+	}
+}
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages.properties
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/messages/messages.properties	(revision 1335)
@@ -1,16 +1,14 @@
-
-ChartsEngine_PROGRESSION_TITLE_DENSITY           = (density)
-ChartsEngine_PROGRESSION_TITLE_IN                = in
-ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF    = Progression of
-ChartsEngine_PROGRESSION_TITLE_PROPERTY          = , property: 
-ChartsEngine_PROGRESSION_TITLE_REGEX             = , filtering REGEX: 
-ChartsEngine_PROGRESSION_TITLE_STRUCT            = structure: 
-ChartsEngine_PROGRESSION_X_AXIS_LABEL            = T = {0}
-ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL = Occurrences
-
-ComputeProgression_0 = The Progression command is not yet available for discontinuous sub-corpora.
-ComputeProgression_3 = Done: no match found.
-
-Progression_1 = Error: subcorpus with size 0
-
-RESULT_TYPE = Progression
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+density=(density)
+doneDDotNoMatchFound=Done\: no match found.
+errorDDotSubcorpusWithSize0=Error\: subcorpus with size 0
+filteringREGEXDDot=, filtering REGEX\: 
+in=in
+occurrences=Occurrences
+progressionOf=Progression of
+propertyDDot=, property\: 
+RESULT_TYPE=Progression
+structureDDot=structure\: 
+tEqualsP0=T \= {0}
+theProgressionCommandIsNotYetAvailableForDiscontinuousSubcorpora=The Progression command is not yet available for discontinuous sub-corpora.
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java	(revision 1334)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/functions/Progression.java	(revision 1335)
@@ -302,7 +302,7 @@
 
 			this.subTask("Processing queries.");
 			if (!stepQueries()) {
-				Log.severe(ProgressionCoreMessages.ComputeProgression_3);
+				Log.severe(ProgressionCoreMessages.doneDDotNoMatchFound);
 				return false;
 			}
 
@@ -534,7 +534,7 @@
 		if (getCorpus() instanceof Subcorpus) {
 			List<Match> matches = ((Subcorpus) getCorpus()).getMatches();
 			if (matches.size() == 0) {
-				System.out.println(ProgressionCoreMessages.Progression_1);
+				System.out.println(ProgressionCoreMessages.errorDDotSubcorpusWithSize0);
 				return false;
 			}
 
@@ -859,4 +859,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/base/Utils.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/base/Utils.java	(revision 1334)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/base/Utils.java	(revision 1335)
@@ -23,7 +23,7 @@
 	 */
 	public static String createProgressionChartTitle(Progression progression, boolean doCumulative)	{
 
-		String title = ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_PROGRESSION_OF + " "; //$NON-NLS-1$
+		String title = ProgressionCoreMessages.progressionOf + " "; //$NON-NLS-1$
 
 		// Put queries in title
 		for(int i = 0; i < progression.getQueries().size(); i++) {
@@ -34,19 +34,19 @@
 		}
 
 
-		title += " " + ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_IN + " " + progression.getCorpus().getName(); //$NON-NLS-1$ //$NON-NLS-2$
+		title += " " + ProgressionCoreMessages.in + " " + progression.getCorpus().getName(); //$NON-NLS-1$ //$NON-NLS-2$
 
 		if(!doCumulative)	{
-			title += " " + ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_DENSITY; //$NON-NLS-1$
+			title += " " + ProgressionCoreMessages.density; //$NON-NLS-1$
 		}
 
 
 		if (progression.getStructuralUnit() != null) {
-			title += "\n(" + ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_STRUCT + progression.getStructuralUnit().getName();
+			title += "\n(" + ProgressionCoreMessages.structureDDot + progression.getStructuralUnit().getName();
 			if (progression.getStructuralUnitProperty() != null) {
-				title += ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_PROPERTY + progression.getStructuralUnitProperty().getName();
+				title += ProgressionCoreMessages.propertyDDot + progression.getStructuralUnitProperty().getName();
 				if (progression.getPropertyRegex() != null)	{
-					title += ProgressionCoreMessages.ChartsEngine_PROGRESSION_TITLE_REGEX + progression.getPropertyRegex();
+					title += ProgressionCoreMessages.filteringREGEXDDot + progression.getPropertyRegex();
 				}
 			}
 			title += ")";
@@ -56,4 +56,4 @@
 	}
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java	(revision 1334)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java	(revision 1335)
@@ -59,9 +59,9 @@
 		if(cumulative)	{
 
 			// Create the chart
-			yAxisLabel = ProgressionCoreMessages.ChartsEngine_PROGRESSION_Y_AXIS_CUMULATIVE_LABEL;
+			yAxisLabel = ProgressionCoreMessages.occurrences;
 			chart = this.getChartsEngine().createXYStepChart(dataset, Utils.createProgressionChartTitle(progression, cumulative),
-					ProgressionCoreMessages.bind(ProgressionCoreMessages.ChartsEngine_PROGRESSION_X_AXIS_LABEL, progression.getXmaxCorpus()), yAxisLabel, true, true, true, true, true);
+					ProgressionCoreMessages.bind(ProgressionCoreMessages.tEqualsP0, progression.getXmaxCorpus()), yAxisLabel, true, true, true, true, true);
 
 
 			// Custom renderer
@@ -95,7 +95,7 @@
 //			// Create the chart
 //			yAxisLabel =  ProgressionCoreMessages.ChartsEngine_PROGRESSION_Y_AXIS_NOT_CUMULATIVE_LABEL;
 //			chart = this.getChartsEngine().createXYLineChart(dataset, Utils.createProgressionChartTitle(progression, cumulative),
-//					ProgressionCoreMessages.bind(ProgressionCoreMessages.ChartsEngine_PROGRESSION_X_AXIS_LABEL, progression.getXmaxCorpus()), yAxisLabel,
+//					ProgressionCoreMessages.bind(ProgressionCoreMessages.tEqualsP0, progression.getXmaxCorpus()), yAxisLabel,
 //					true, true, true, false, true, false, true, null);
 		}
 
@@ -337,4 +337,4 @@
 
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/CooccurrenceCoreMessages.java
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/CooccurrenceCoreMessages.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/CooccurrenceCoreMessages.java	(revision 1335)
@@ -1,47 +1,47 @@
-package org.txm.cooccurrence.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Cooccurrence core message.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class CooccurrenceCoreMessages extends NLS {
-	
-	private static final String BUNDLE_NAME = "org.txm.cooccurrence.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String RESULT_TYPE;
-
-	
-	public static String Cooccurrence_10;
-	public static String Cooccurrence_102;
-	public static String Cooccurrence_103;
-	public static String Cooccurrence_11;
-	public static String Cooccurrence_12;
-	public static String Cooccurrence_13;
-	public static String Cooccurrence_14;
-	public static String Cooccurrence_15;
-	public static String Cooccurrence_23;
-	public static String Cooccurrence_4;
-	public static String Cooccurrence_6;
-	public static String Cooccurrence_7;
-	public static String Cooccurrence_8;
-	public static String Cooccurrence_9;
-
-	public static String info_buildingQueries;
-	public static String info_retreivingMatches;
-	public static String info_buildingLineSignatures;
-	public static String info_counting;
-	public static String info_buildingLexicalTable;
-	public static String info_computingSpecificitiesScores;
-	public static String info_details;
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, CooccurrenceCoreMessages.class);
-	}
-}
+package org.txm.cooccurrence.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Cooccurrence core message.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class CooccurrenceCoreMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.cooccurrence.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String RESULT_TYPE;
+
+	
+	public static String propertiesDDot; 
+	public static String errorDDotNegativeArgumentInFactlnFunction; 
+	public static String errorDDotNegativeArgumentInRbicolnFunction; 
+	public static String occ; 
+	public static String freq; 
+	public static String coFreq; 
+	public static String score; 
+	public static String meanDist; 
+	public static String errorDDotNoCooccurrents; 
+	public static String fDDot; 
+	public static String occFreqCoFreqScoreMeanDistMode; 
+	public static String occDDot; 
+	public static String scoreDDot; 
+	public static String meanDistDDot; 
+
+	public static String info_buildingQueries;
+	public static String info_retreivingMatches;
+	public static String info_buildingLineSignatures;
+	public static String info_counting;
+	public static String info_buildingLexicalTable;
+	public static String info_computingSpecificitiesScores;
+	public static String info_details;
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, CooccurrenceCoreMessages.class);
+	}
+}
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages.properties
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages.properties	(revision 1335)
@@ -1,25 +1,24 @@
-
-Cooccurrence_10  = \ properties: 
-Cooccurrence_102 = ** Error: negative argument in 'factln' function
-Cooccurrence_103 = ** Error: negative argument in 'rbicoln' function
-Cooccurrence_11  = Occ
-Cooccurrence_12  = Freq
-Cooccurrence_13  = CoFreq
-Cooccurrence_14  = Score
-Cooccurrence_15  = MeanDist
-Cooccurrence_23  = Error: no cooccurrents
-Cooccurrence_4   = \ F: 
-Cooccurrence_6   = Occ\	Freq\	CoFreq\	Score\	MeanDist\	Mode
-Cooccurrence_7   = \ Occ:
-Cooccurrence_8   = \ Score:
-Cooccurrence_9   = \ MeanDist:
-
-RESULT_TYPE = Cooccurrence
-
-info_buildingLexicalTable         = Building lexical table.
-info_buildingLineSignatures       = Building line signatures.
-info_buildingQueries              = Building queries.
-info_computingSpecificitiesScores = Computing specificities scores.
-info_counting                     = Counting.
-info_details                      = Cooc:\n Corpus: {0}\n Query:  {1}\n Properties: {2}\n Structure: {3}\n Empans: {4} < left < {5} ; {6} < right < {7}\n Filters: freq > {8} ; count > {9} ; score > {10}\n\n
-info_retreivingMatches            = Retreiving matches.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+coFreq=CoFreq
+errorDDotNegativeArgumentInFactlnFunction=** Error\: negative argument in 'factln' function
+errorDDotNegativeArgumentInRbicolnFunction=** Error\: negative argument in 'rbicoln' function
+errorDDotNoCooccurrents=Error\: no cooccurrents
+fDDot=\ F\: 
+freq=Freq
+info_buildingLexicalTable=Building lexical table.
+info_buildingLineSignatures=Building line signatures.
+info_buildingQueries=Building queries.
+info_computingSpecificitiesScores=Computing specificities scores.
+info_counting=Counting.
+info_details=Cooc\:\n Corpus\: {0}\n Query\:  {1}\n Properties\: {2}\n Structure\: {3}\n Empans\: {4} < left < {5} ; {6} < right < {7}\n Filters\: freq > {8} ; count > {9} ; score > {10}\n\n
+info_retreivingMatches=Retreiving matches.
+meanDist=MeanDist
+meanDistDDot=\ MeanDist\:
+occ=Occ
+occDDot=\ Occ\:
+occFreqCoFreqScoreMeanDistMode=Occ\tFreq\tCoFreq\tScore\tMeanDist\tMode
+propertiesDDot=\ properties\: 
+RESULT_TYPE=Cooccurrence
+score=Score
+scoreDDot=\ Score\:
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_ru.properties	(revision 1335)
@@ -1,10 +1,10 @@
-
-RESULT_TYPE = 
-
-info_buildingLexicalTable         = Расчет словарной таблицы
-info_buildingLineSignatures       = Расчет подписей к строкам
-info_buildingQueries              = Расчет запроса
-info_computingSpecificitiesScores = Расчет показателей специфичности\	
-info_counting                     = Подсчет
-info_details                      = 
-info_retreivingMatches            = Расчет ответов
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+info_buildingLexicalTable=Расчет словарной таблицы
+info_buildingLineSignatures=Расчет подписей к строкам
+info_buildingQueries=Расчет запроса
+info_computingSpecificitiesScores=Расчет показателей специфичности\t
+info_counting=Подсчет
+info_details=
+info_retreivingMatches=Расчет ответов
+RESULT_TYPE=
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/messages/messages_fr.properties	(revision 1335)
@@ -1,25 +1,24 @@
-
-Cooccurrence_10  = \ propriétés : 
-Cooccurrence_102 = ** Erreur : argument négatif dans la fonction 'factln'
-Cooccurrence_103 = ** Erreur : argument négatif dans la fonction 'rbicoln'
-Cooccurrence_11  = Occ
-Cooccurrence_12  = Fréq
-Cooccurrence_13  = CoFréq
-Cooccurrence_14  = Indice
-Cooccurrence_15  = DistMoy
-Cooccurrence_23  = Erreur: pas de cooccurrents
-Cooccurrence_4   = \ F : 
-Cooccurrence_6   = Occ\	Fréq\	CoFréq\	Indice\	DistMoy\	Mode
-Cooccurrence_7   = \ Occ :
-Cooccurrence_8   = \ Indice:
-Cooccurrence_9   = \ DistMoy:
-
-RESULT_TYPE = Cooccurrence
-
-info_buildingLexicalTable         = Calcul de la table lexicale.
-info_buildingLineSignatures       = Calcul des signatures de lignes.
-info_buildingQueries              = Calcul des requêtes.
-info_computingSpecificitiesScores = Calcul des indices de spécificité.
-info_counting                     = Comptage.
-info_details                      = 
-info_retreivingMatches            = Calcul des retours.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+coFreq=CoFréq
+errorDDotNegativeArgumentInFactlnFunction=** Erreur \: argument négatif dans la fonction 'factln'
+errorDDotNegativeArgumentInRbicolnFunction=** Erreur \: argument négatif dans la fonction 'rbicoln'
+errorDDotNoCooccurrents=Erreur\: pas de cooccurrents
+fDDot=\ F \: 
+freq=Fréq
+info_buildingLexicalTable=Calcul de la table lexicale.
+info_buildingLineSignatures=Calcul des signatures de lignes.
+info_buildingQueries=Calcul des requêtes.
+info_computingSpecificitiesScores=Calcul des indices de spécificité.
+info_counting=Comptage.
+info_details=
+info_retreivingMatches=Calcul des retours.
+meanDist=DistMoy
+meanDistDDot=\ DistMoy\:
+occ=Occ
+occDDot=\ Occ \:
+occFreqCoFreqScoreMeanDistMode=Occ\tFréq\tCoFréq\tIndice\tDistMoy\tMode
+propertiesDDot=\ propriétés \: 
+RESULT_TYPE=Cooccurrence
+score=Indice
+scoreDDot=\ Indice\:
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/CooccurrenceMaths.java
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/CooccurrenceMaths.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/CooccurrenceMaths.java	(revision 1335)
@@ -41,7 +41,7 @@
 	 */
 	static double factln(int n) {
 		if (n < 0)
-			System.err.println(CooccurrenceCoreMessages.Cooccurrence_102);
+			System.err.println(CooccurrenceCoreMessages.errorDDotNegativeArgumentInFactlnFunction);
 		if (n <= 1)
 			return 0.0;
 		if (n <= 100)
@@ -131,9 +131,9 @@
 	 */
 	static double rbicoln(int n, int k) {
 		if (n < 0)
-			System.err.println(CooccurrenceCoreMessages.Cooccurrence_103);
+			System.err.println(CooccurrenceCoreMessages.errorDDotNegativeArgumentInRbicolnFunction);
 		if (k < 0)
-			System.err.println(CooccurrenceCoreMessages.Cooccurrence_103);
+			System.err.println(CooccurrenceCoreMessages.errorDDotNegativeArgumentInRbicolnFunction);
 		if (n <= 100 && k <= 100)
 			return (arbicoln[n][k] >= 0) ? arbicoln[n][k]
 					: (arbicoln[n][k] = factln(n) - factln(k) - factln(n - k));
@@ -230,4 +230,4 @@
 	//
 	//		return true;
 	//	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java	(revision 1334)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java	(revision 1335)
@@ -750,7 +750,7 @@
 		// System.out.println("Lines "+lines.size());
 		System.out.println("FA : " + FA); //$NON-NLS-1$
 		System.out.println("P : " + P); //$NON-NLS-1$
-		System.out.println(CooccurrenceCoreMessages.Cooccurrence_6);
+		System.out.println(CooccurrenceCoreMessages.occFreqCoFreqScoreMeanDistMode);
 		for (CLine line : lines)
 			System.out.println(line.resume("\t", "")); //$NON-NLS-1$ //$NON-NLS-2$
 	}
@@ -999,7 +999,7 @@
 
 		//time = System.currentTimeMillis();
 		if (freqs.length == 0) {
-			System.out.println(CooccurrenceCoreMessages.Cooccurrence_23);
+			System.out.println(CooccurrenceCoreMessages.errorDDotNoCooccurrents);
 		}
 		//		try {
 		//			PrintWriter writer = IOUtils.getWriter("/home/mdecorde/test_cooc.txt");
@@ -1409,11 +1409,11 @@
 	public boolean toTxt(Writer writer, String colseparator, String txtseparator) {
 		try {
 			//Occ	Freq	CoFreq	Score	MeanDist
-			writer.write( txtseparator+CooccurrenceCoreMessages.Cooccurrence_11+txtseparator+colseparator+
-					txtseparator+CooccurrenceCoreMessages.Cooccurrence_12+txtseparator+colseparator+
-					txtseparator+CooccurrenceCoreMessages.Cooccurrence_13+txtseparator+colseparator+
-					txtseparator+CooccurrenceCoreMessages.Cooccurrence_14+txtseparator+colseparator+
-					txtseparator+CooccurrenceCoreMessages.Cooccurrence_15+txtseparator+"\n");//colseparator+ //$NON-NLS-1$
+			writer.write( txtseparator+CooccurrenceCoreMessages.occ+txtseparator+colseparator+
+					txtseparator+CooccurrenceCoreMessages.freq+txtseparator+colseparator+
+					txtseparator+CooccurrenceCoreMessages.coFreq+txtseparator+colseparator+
+					txtseparator+CooccurrenceCoreMessages.score+txtseparator+colseparator+
+					txtseparator+CooccurrenceCoreMessages.meanDist+txtseparator+"\n");//colseparator+ //$NON-NLS-1$
 			for (CLine line : lines) 
 				writer.write(line.resume(colseparator, txtseparator) + "\n"); //$NON-NLS-1$
 			writer.close();
@@ -1594,7 +1594,7 @@
 
 		@Override
 		public String toString() {
-			return occ+CooccurrenceCoreMessages.Cooccurrence_4+freq+CooccurrenceCoreMessages.Cooccurrence_7+nbocc+CooccurrenceCoreMessages.Cooccurrence_8+score+CooccurrenceCoreMessages.Cooccurrence_9+distmoyenne+CooccurrenceCoreMessages.Cooccurrence_10+props;
+			return occ+CooccurrenceCoreMessages.fDDot+freq+CooccurrenceCoreMessages.occDDot+nbocc+CooccurrenceCoreMessages.scoreDDot+score+CooccurrenceCoreMessages.meanDistDDot+distmoyenne+CooccurrenceCoreMessages.propertiesDDot+props;
 		}
 	}
 
@@ -1605,4 +1605,4 @@
 	}
 
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryBarRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryBarRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryBarRenderer.java	(revision 1335)
@@ -1,237 +1,237 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.Color;
-import java.awt.Paint;
-import java.text.DecimalFormat;
-
-import org.jfree.chart.labels.CategoryToolTipGenerator;
-import org.jfree.chart.renderer.category.BarRenderer;
-import org.jfree.data.category.CategoryDataset;
-import org.jfree.data.category.DefaultCategoryDataset;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for bar charts.
- * @author Sebastien Jacquot
- *
- */
-public class ItemSelectionCategoryBarRenderer extends BarRenderer implements IRendererWithItemSelection {
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MouseOverItemSelector mouseOverItemSelector;
-
-	/**
-	 * Values number format.
-	 */
-	protected DecimalFormat valuesNumberFormat;
-
-	/**
-	 *
-	 */
-	public ItemSelectionCategoryBarRenderer() {
-		super();
-		this.mouseOverItemSelector = new MouseOverItemSelector(this);
-
-		// Default Values format
-		this.valuesNumberFormat = new DecimalFormat("#0.####");
-
-
-		// Labels
-		this.initItemLabelGenerator();
-
-		// Tooltips
-		this.initToolTipGenerator(this);
-	}
-
-	// FIXME : set a minimum width for bars, tests for drawing large bar plot, to use with scrolling
-//	@Override
-//	protected void calculateBarWidth(CategoryPlot plot,
-//              Rectangle2D dataArea,
-//              int rendererIndex,
-//              CategoryItemRendererState state) {
-//
-//		CategoryAxis domainAxis = getDomainAxis(plot, rendererIndex);
-//		CategoryDataset dataset = plot.getDataset(rendererIndex);
-//		if (dataset != null) {
-//		int columns = dataset.getColumnCount();
-//		int rows = state.getVisibleSeriesCount() >= 0
-//		? state.getVisibleSeriesCount() : dataset.getRowCount();
-//		double space = 0.0;
-//		PlotOrientation orientation = plot.getOrientation();
-//		if (orientation == PlotOrientation.HORIZONTAL) {
-//		space = dataArea.getHeight() * 4;
-//		}
-//		else if (orientation == PlotOrientation.VERTICAL) {
-//		space = dataArea.getWidth() * 4;
-//		}
-//		double maxWidth = space * getMaximumBarWidth();
-//		double categoryMargin = 0.0;
-//		double currentItemMargin = 0.0;
-//		if (columns > 1) {
-//		categoryMargin = domainAxis.getCategoryMargin();
-//		}
-//		if (rows > 1) {
-//		currentItemMargin = getItemMargin();
-//		}
-//		double used = space * (1 - domainAxis.getLowerMargin()
-//		              - domainAxis.getUpperMargin()
-//		              - categoryMargin - currentItemMargin);
-//		if ((rows * columns) > 0) {
-//		state.setBarWidth(Math.min(used / (rows * columns), maxWidth));
-//		}
-//		else {
-//		state.setBarWidth(Math.min(used, maxWidth));
-//		}
-//		}
-//	}
-//
-//
-//    protected double calculateBarW0(CategoryPlot plot,
-//            PlotOrientation orientation, Rectangle2D dataArea,
-//            CategoryAxis domainAxis, CategoryItemRendererState state,
-//            int row, int column) {
-//        // calculate bar width...
-//        double space;
-//        if (orientation == PlotOrientation.HORIZONTAL) {
-//            space = dataArea.getHeight() * 4;
-//        }
-//        else {
-//            space = dataArea.getWidth() * 4;
-//        }
-//        double barW0 = domainAxis.getCategoryStart(column, getColumnCount(),
-//                dataArea, plot.getDomainAxisEdge());
-//        int seriesCount = state.getVisibleSeriesCount() >= 0
-//                ? state.getVisibleSeriesCount() : getRowCount();
-//        int categoryCount = getColumnCount();
-//        if (seriesCount > 1) {
-//            double seriesGap = space * getItemMargin()
-//                               / (categoryCount * (seriesCount - 1));
-//            double seriesW = calculateSeriesWidth(space, domainAxis,
-//                    categoryCount, seriesCount);
-//            barW0 = barW0 + row * (seriesW + seriesGap)
-//                          + (seriesW / 2.0) - (state.getBarWidth() / 2.0);
-//        }
-//        else {
-//            barW0 = domainAxis.getCategoryMiddle(column, getColumnCount(),
-//                    dataArea, plot.getDomainAxisEdge()) - state.getBarWidth()
-//                    / 2.0;
-//        }
-//        return barW0;
-//    }
-//
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(CategoryDataset dataset, int row, int column) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(row);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
-				Number value = catDataset.getValue(row, column);
-
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + catDataset.getColumnKey(column) + "</p><p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + "</span>"
-				 + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + valuesNumberFormat.format(value) + "</b></p></body><html>";
-			}
-		});
-	}
-
-
-
-
-	/**
-	 * Sets the values number format. Used by the tool tips generator to create the values labels.
-	 * @param valuesNumberFormat the valuesNumberFormat to set
-	 */
-	public void setValuesNumberFormat(DecimalFormat valuesNumberFormat) {
-		this.valuesNumberFormat = valuesNumberFormat;
-	}
-
-
-
-	@Override
-	public Paint getItemOutlinePaint(int row, int col) {
-		//FIXME : en attente de voir si l'on trace un contour ou non pour l'item sélectionnée
-		// Draw item shape outline
-//		if(this.itemSelector.isSelectedItem(row, col)) {
-//			return super.getItemOutlinePaint(row, col);
-//		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-
-	@Override
-	public Paint getItemPaint(int row, int col) {
-
-		Color color = (Color) super.getItemPaint(row, col);
-
-		// Bright the item color paint for selected item
-		if(this.mouseOverItemSelector.isMouseOverItem(row, col)) {
-
-		 	// Gray scale rendering mode
-		 	if(color.getRed() == color.getGreen() &&  color.getGreen() == color.getBlue())	{
-			 	color = Color.RED;
-		 	}
-		 	// Color rendering and Monochrome modes
-		 	else	{
-				// FIXME : old version, to remove when new version will be validated, brighter() does not work when value are 0
-				color = color.brighter();
-				// FIXME : new version, brightening
-//				float hsbVals[] = Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), null);
-////			 	//color  = Color.getHSBColor(hsbVals[0], hsbVals[1], 0.5f * ( 1f + hsbVals[2]));
-//				// saturation version
-//				color  = Color.getHSBColor(hsbVals[0], 0.7f * hsbVals[1], hsbVals[2]);
-
-		 	}
-
-
-		}
-		return color;
-	}
-
-
-
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return mouseOverItemSelector;
-	}
-
-
-
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		// Do nothing for bar renderer
-	}
-
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-
-}
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.Color;
+import java.awt.Paint;
+import java.text.DecimalFormat;
+
+import org.jfree.chart.labels.CategoryToolTipGenerator;
+import org.jfree.chart.renderer.category.BarRenderer;
+import org.jfree.data.category.CategoryDataset;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for bar charts.
+ * @author Sebastien Jacquot
+ *
+ */
+public class ItemSelectionCategoryBarRenderer extends BarRenderer implements IRendererWithItemSelection {
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MouseOverItemSelector mouseOverItemSelector;
+
+	/**
+	 * Values number format.
+	 */
+	protected DecimalFormat valuesNumberFormat;
+
+	/**
+	 *
+	 */
+	public ItemSelectionCategoryBarRenderer() {
+		super();
+		this.mouseOverItemSelector = new MouseOverItemSelector(this);
+
+		// Default Values format
+		this.valuesNumberFormat = new DecimalFormat("#0.####");
+
+
+		// Labels
+		this.initItemLabelGenerator();
+
+		// Tooltips
+		this.initToolTipGenerator(this);
+	}
+
+	// FIXME : set a minimum width for bars, tests for drawing large bar plot, to use with scrolling
+//	@Override
+//	protected void calculateBarWidth(CategoryPlot plot,
+//              Rectangle2D dataArea,
+//              int rendererIndex,
+//              CategoryItemRendererState state) {
+//
+//		CategoryAxis domainAxis = getDomainAxis(plot, rendererIndex);
+//		CategoryDataset dataset = plot.getDataset(rendererIndex);
+//		if (dataset != null) {
+//		int columns = dataset.getColumnCount();
+//		int rows = state.getVisibleSeriesCount() >= 0
+//		? state.getVisibleSeriesCount() : dataset.getRowCount();
+//		double space = 0.0;
+//		PlotOrientation orientation = plot.getOrientation();
+//		if (orientation == PlotOrientation.HORIZONTAL) {
+//		space = dataArea.getHeight() * 4;
+//		}
+//		else if (orientation == PlotOrientation.VERTICAL) {
+//		space = dataArea.getWidth() * 4;
+//		}
+//		double maxWidth = space * getMaximumBarWidth();
+//		double categoryMargin = 0.0;
+//		double currentItemMargin = 0.0;
+//		if (columns > 1) {
+//		categoryMargin = domainAxis.getCategoryMargin();
+//		}
+//		if (rows > 1) {
+//		currentItemMargin = getItemMargin();
+//		}
+//		double used = space * (1 - domainAxis.getLowerMargin()
+//		              - domainAxis.getUpperMargin()
+//		              - categoryMargin - currentItemMargin);
+//		if ((rows * columns) > 0) {
+//		state.setBarWidth(Math.min(used / (rows * columns), maxWidth));
+//		}
+//		else {
+//		state.setBarWidth(Math.min(used, maxWidth));
+//		}
+//		}
+//	}
+//
+//
+//    protected double calculateBarW0(CategoryPlot plot,
+//            PlotOrientation orientation, Rectangle2D dataArea,
+//            CategoryAxis domainAxis, CategoryItemRendererState state,
+//            int row, int column) {
+//        // calculate bar width...
+//        double space;
+//        if (orientation == PlotOrientation.HORIZONTAL) {
+//            space = dataArea.getHeight() * 4;
+//        }
+//        else {
+//            space = dataArea.getWidth() * 4;
+//        }
+//        double barW0 = domainAxis.getCategoryStart(column, getColumnCount(),
+//                dataArea, plot.getDomainAxisEdge());
+//        int seriesCount = state.getVisibleSeriesCount() >= 0
+//                ? state.getVisibleSeriesCount() : getRowCount();
+//        int categoryCount = getColumnCount();
+//        if (seriesCount > 1) {
+//            double seriesGap = space * getItemMargin()
+//                               / (categoryCount * (seriesCount - 1));
+//            double seriesW = calculateSeriesWidth(space, domainAxis,
+//                    categoryCount, seriesCount);
+//            barW0 = barW0 + row * (seriesW + seriesGap)
+//                          + (seriesW / 2.0) - (state.getBarWidth() / 2.0);
+//        }
+//        else {
+//            barW0 = domainAxis.getCategoryMiddle(column, getColumnCount(),
+//                    dataArea, plot.getDomainAxisEdge()) - state.getBarWidth()
+//                    / 2.0;
+//        }
+//        return barW0;
+//    }
+//
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(CategoryDataset dataset, int row, int column) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(row);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
+				Number value = catDataset.getValue(row, column);
+
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + catDataset.getColumnKey(column) + "</p><p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + "</span>"
+				 + ChartsEngineCoreMessages.EMPTY + " <b>" + valuesNumberFormat.format(value) + "</b></p></body><html>";
+			}
+		});
+	}
+
+
+
+
+	/**
+	 * Sets the values number format. Used by the tool tips generator to create the values labels.
+	 * @param valuesNumberFormat the valuesNumberFormat to set
+	 */
+	public void setValuesNumberFormat(DecimalFormat valuesNumberFormat) {
+		this.valuesNumberFormat = valuesNumberFormat;
+	}
+
+
+
+	@Override
+	public Paint getItemOutlinePaint(int row, int col) {
+		//FIXME : en attente de voir si l'on trace un contour ou non pour l'item sélectionnée
+		// Draw item shape outline
+//		if(this.itemSelector.isSelectedItem(row, col)) {
+//			return super.getItemOutlinePaint(row, col);
+//		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+
+	@Override
+	public Paint getItemPaint(int row, int col) {
+
+		Color color = (Color) super.getItemPaint(row, col);
+
+		// Bright the item color paint for selected item
+		if(this.mouseOverItemSelector.isMouseOverItem(row, col)) {
+
+		 	// Gray scale rendering mode
+		 	if(color.getRed() == color.getGreen() &&  color.getGreen() == color.getBlue())	{
+			 	color = Color.RED;
+		 	}
+		 	// Color rendering and Monochrome modes
+		 	else	{
+				// FIXME : old version, to remove when new version will be validated, brighter() does not work when value are 0
+				color = color.brighter();
+				// FIXME : new version, brightening
+//				float hsbVals[] = Color.RGBtoHSB(color.getRed(), color.getGreen(), color.getBlue(), null);
+////			 	//color  = Color.getHSBColor(hsbVals[0], hsbVals[1], 0.5f * ( 1f + hsbVals[2]));
+//				// saturation version
+//				color  = Color.getHSBColor(hsbVals[0], 0.7f * hsbVals[1], hsbVals[2]);
+
+		 	}
+
+
+		}
+		return color;
+	}
+
+
+
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return mouseOverItemSelector;
+	}
+
+
+
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		// Do nothing for bar renderer
+	}
+
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYBarRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYBarRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYBarRenderer.java	(revision 1335)
@@ -1,190 +1,190 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.Color;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.text.DecimalFormat;
-
-import org.jfree.chart.LegendItem;
-import org.jfree.chart.axis.SymbolAxis;
-import org.jfree.chart.labels.XYSeriesLabelGenerator;
-import org.jfree.chart.labels.XYToolTipGenerator;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.ClusteredXYBarRenderer;
-import org.jfree.data.xy.XYDataset;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.RendererUtils;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for bar charts.
- * @author sjacquot
- *
- */
-public class ItemSelectionXYBarRenderer extends ClusteredXYBarRenderer implements IRendererWithItemSelection {
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MouseOverItemSelector itemsSelector;
-
-	/**
-	 *
-	 */
-	public ItemSelectionXYBarRenderer() {
-		super();
-		this.itemsSelector = new MultipleItemsSelector(this);
-		
-		// Labels
-		this.initItemLabelGenerator();
-
-		// Tooltips
-		this.initToolTipGenerator(this);
-	}
-
-
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(XYDataset dataset, int series, int item) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(series);
-				if(color != null)	{
-					String hex = "#" + Integer.toHexString(color.getRGB()).
-							substring(2);
-	
-					XYDataset xyDataset = (XYDataset) dataset;
-					Number value = xyDataset.getY(series, item);
-	
-	
-					String label;
-	
-					// Symbol Axis
-					if(getPlot().getDomainAxis() instanceof SymbolAxis && item < ((SymbolAxis)getPlot().getDomainAxis()).getSymbols().length)	{
-						label = ((SymbolAxis)getPlot().getDomainAxis()).getSymbols()[item];
-					}
-					else	{
-						label = String.valueOf(xyDataset.getXValue(series, item));
-					}
-	
-					return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + label + "</p><p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series) + "</span>"
-					 + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + RendererUtils.valuesNumberFormat.format(value) + "</b></p></body><html>";
-				}
-				return "";
-			}
-		});
-	}
-
-
-
-
-	@Override
-	public Paint getItemOutlinePaint(int row, int col) {
-		// Multiple selection, draw item shape outline
-		if(this.itemsSelector instanceof MultipleItemsSelector && ((MultipleItemsSelector)this.itemsSelector).isSelectedItem(row, col)) {
-			return super.getItemOutlinePaint(row, col);
-		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-
-	@Override
-	public Paint getItemPaint(int row, int col) {
-
-		Color color = (Color) super.getItemPaint(row, col);
-
-		// Mouse over item
-		if(this.itemsSelector.isMouseOverItem(row, col)) {
-			color = (Color) RendererUtils.getMouseOverItemPaint(color);
-		}
-		// Multiple selection
-		else if(this.itemsSelector instanceof MultipleItemsSelector && ((MultipleItemsSelector)this.itemsSelector).isSelectedItem(row, col))	{
-			color = (Color) RendererUtils.getSelectedItemPaint(color);
-		}
-		return color;
-	}
-
-
-	@Override
-    public LegendItem getLegendItem(int datasetIndex, int series) {
-        XYPlot xyplot = getPlot();
-        if (xyplot == null) {
-            return null;
-        }
-        XYDataset dataset = xyplot.getDataset(datasetIndex);
-        if (dataset == null) {
-            return null;
-        }
-        LegendItem result;
-        XYSeriesLabelGenerator lg = getLegendItemLabelGenerator();
-        String label = lg.generateLabel(dataset, series);
-        String description = label;
-        String toolTipText = null;
-        if (getLegendItemToolTipGenerator() != null) {
-            toolTipText = getLegendItemToolTipGenerator().generateLabel(
-                    dataset, series);
-        }
-        String urlText = null;
-        if (getLegendItemURLGenerator() != null) {
-            urlText = getLegendItemURLGenerator().generateLabel(dataset, 
-                    series);
-        }
-        Shape shape = this.getLegendBar();
-        Paint paint = lookupSeriesPaint(series);
-        result = new LegendItem(label, description, toolTipText, urlText, shape, paint);
-        result.setLabelFont(lookupLegendTextFont(series));
-        Paint labelPaint = lookupLegendTextPaint(series);
-        if (labelPaint != null) {
-            result.setLabelPaint(labelPaint);
-        }
-        result.setDataset(dataset);
-        result.setDatasetIndex(datasetIndex);
-        result.setSeriesKey(dataset.getSeriesKey(series));
-        result.setSeriesIndex(series);
-        if (getGradientPaintTransformer() != null) {
-            result.setFillPaintTransformer(getGradientPaintTransformer());
-        }
-        return result;
-    }
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return itemsSelector;
-	}
-
-
-
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		// Do nothing for bar renderer
-	}
-
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-
-}
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.Color;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.text.DecimalFormat;
+
+import org.jfree.chart.LegendItem;
+import org.jfree.chart.axis.SymbolAxis;
+import org.jfree.chart.labels.XYSeriesLabelGenerator;
+import org.jfree.chart.labels.XYToolTipGenerator;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.ClusteredXYBarRenderer;
+import org.jfree.data.xy.XYDataset;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.RendererUtils;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for bar charts.
+ * @author sjacquot
+ *
+ */
+public class ItemSelectionXYBarRenderer extends ClusteredXYBarRenderer implements IRendererWithItemSelection {
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MouseOverItemSelector itemsSelector;
+
+	/**
+	 *
+	 */
+	public ItemSelectionXYBarRenderer() {
+		super();
+		this.itemsSelector = new MultipleItemsSelector(this);
+		
+		// Labels
+		this.initItemLabelGenerator();
+
+		// Tooltips
+		this.initToolTipGenerator(this);
+	}
+
+
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(XYDataset dataset, int series, int item) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(series);
+				if(color != null)	{
+					String hex = "#" + Integer.toHexString(color.getRGB()).
+							substring(2);
+	
+					XYDataset xyDataset = (XYDataset) dataset;
+					Number value = xyDataset.getY(series, item);
+	
+	
+					String label;
+	
+					// Symbol Axis
+					if(getPlot().getDomainAxis() instanceof SymbolAxis && item < ((SymbolAxis)getPlot().getDomainAxis()).getSymbols().length)	{
+						label = ((SymbolAxis)getPlot().getDomainAxis()).getSymbols()[item];
+					}
+					else	{
+						label = String.valueOf(xyDataset.getXValue(series, item));
+					}
+	
+					return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + label + "</p><p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series) + "</span>"
+					 + ChartsEngineCoreMessages.EMPTY + " <b>" + RendererUtils.valuesNumberFormat.format(value) + "</b></p></body><html>";
+				}
+				return "";
+			}
+		});
+	}
+
+
+
+
+	@Override
+	public Paint getItemOutlinePaint(int row, int col) {
+		// Multiple selection, draw item shape outline
+		if(this.itemsSelector instanceof MultipleItemsSelector && ((MultipleItemsSelector)this.itemsSelector).isSelectedItem(row, col)) {
+			return super.getItemOutlinePaint(row, col);
+		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+
+	@Override
+	public Paint getItemPaint(int row, int col) {
+
+		Color color = (Color) super.getItemPaint(row, col);
+
+		// Mouse over item
+		if(this.itemsSelector.isMouseOverItem(row, col)) {
+			color = (Color) RendererUtils.getMouseOverItemPaint(color);
+		}
+		// Multiple selection
+		else if(this.itemsSelector instanceof MultipleItemsSelector && ((MultipleItemsSelector)this.itemsSelector).isSelectedItem(row, col))	{
+			color = (Color) RendererUtils.getSelectedItemPaint(color);
+		}
+		return color;
+	}
+
+
+	@Override
+    public LegendItem getLegendItem(int datasetIndex, int series) {
+        XYPlot xyplot = getPlot();
+        if (xyplot == null) {
+            return null;
+        }
+        XYDataset dataset = xyplot.getDataset(datasetIndex);
+        if (dataset == null) {
+            return null;
+        }
+        LegendItem result;
+        XYSeriesLabelGenerator lg = getLegendItemLabelGenerator();
+        String label = lg.generateLabel(dataset, series);
+        String description = label;
+        String toolTipText = null;
+        if (getLegendItemToolTipGenerator() != null) {
+            toolTipText = getLegendItemToolTipGenerator().generateLabel(
+                    dataset, series);
+        }
+        String urlText = null;
+        if (getLegendItemURLGenerator() != null) {
+            urlText = getLegendItemURLGenerator().generateLabel(dataset, 
+                    series);
+        }
+        Shape shape = this.getLegendBar();
+        Paint paint = lookupSeriesPaint(series);
+        result = new LegendItem(label, description, toolTipText, urlText, shape, paint);
+        result.setLabelFont(lookupLegendTextFont(series));
+        Paint labelPaint = lookupLegendTextPaint(series);
+        if (labelPaint != null) {
+            result.setLabelPaint(labelPaint);
+        }
+        result.setDataset(dataset);
+        result.setDatasetIndex(datasetIndex);
+        result.setSeriesKey(dataset.getSeriesKey(series));
+        result.setSeriesIndex(series);
+        if (getGradientPaintTransformer() != null) {
+            result.setFillPaintTransformer(getGradientPaintTransformer());
+        }
+        return result;
+    }
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return itemsSelector;
+	}
+
+
+
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		// Do nothing for bar renderer
+	}
+
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryLineAndShapeRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryLineAndShapeRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryLineAndShapeRenderer.java	(revision 1335)
@@ -1,195 +1,194 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-
-import org.jfree.chart.axis.CategoryAxis;
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
-import org.jfree.chart.plot.CategoryPlot;
-import org.jfree.chart.renderer.category.CategoryItemRendererState;
-import org.jfree.chart.renderer.category.LineAndShapeRenderer;
-import org.jfree.data.category.CategoryDataset;
-import org.jfree.data.category.DefaultCategoryDataset;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for category charts.
- * @author Sebastien Jacquot
- *
- */
-public class ItemSelectionCategoryLineAndShapeRenderer extends LineAndShapeRenderer implements IRendererWithItemSelection {
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MouseOverItemSelector mouseOverItemSelector;
-
-
-
-	/**
-	 *
-	 */
-	public ItemSelectionCategoryLineAndShapeRenderer()	{
-		this(true, true);
-	}
-
-
-	/**
-	 *
-	 * @param linesVisible
-	 * @param shapesVisible
-	 */
-	public ItemSelectionCategoryLineAndShapeRenderer(boolean linesVisible, boolean shapesVisible) {
-		super(linesVisible, shapesVisible);
-		this.mouseOverItemSelector = new MouseOverItemSelector(this);
-
-		// Labels
-		this.initItemLabelGenerator();
-
-		// Tooltips
-		this.initToolTipGenerator(this);
-	}
-
-
-
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(CategoryDataset dataset, int row, int column) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(row);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + catDataset.getColumnKey(column) + "</p><p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row)
-						+ ChartsEngineCoreMessages.charts_labelValueSeparator + " </span><b>" + catDataset.getValue(row, column) + "</b></p></body><html>";
-			}
-		});
-	}
-
-
-	@Override
-	public Paint getItemOutlinePaint(int series, int item) {
-		// Change item shape outline color
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			return super.getItemOutlinePaint(series, item);
-		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-	@Override
-	public Shape getItemShape(int series, int item) {
-
-		Shape shape = super.getItemShape(series, item);
-
-		// Scale item shape
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			AffineTransform t = new AffineTransform();
-			t.setToScale(1.9f, 1.9f);
-			shape = t.createTransformedShape(shape);
-		}
-		return shape;
-	}
-
-
-	@Override
-	public Font getItemLabelFont(int series, int item) {
-
-		Font font = super.getItemLabelFont(series, item);
-
-		// Change item label font size and style
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
-		}
-		return font;
-	}
-
-
-	@Override
-	public Stroke getSeriesStroke(int series)	{
-		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
-
-		// Change line width of selected series
-		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
-			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
-		}
-		return stroke;
-	}
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return mouseOverItemSelector;
-	}
-
-
-
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		// FIXME : to remove when validated
-		//this.itemSelector.setItemDrawnAtLast(this);
-
-	}
-
-
-	@Override
-	public void drawItem(Graphics2D g2, CategoryItemRendererState state, Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
-	            ValueAxis rangeAxis, CategoryDataset dataset, int row, int column, int pass) {
-
-		// Manage the drawing as last of the selected plot item if exists
-		if(this.mouseOverItemSelector.getMouseOverSeries() != -1)	{
-
-			// FIXME: this code bug, sometimes selected point is not display especially after a zoom, because the last index item is computed on the whole dataset but it should be the last item index
-			// only of the visible current area, see the tips XY renderer to correct this
-			int lastSeriesIndex = ((CategoryPlot)this.getPlot()).getDataset().getRowCount() - 1;
-
-			// Draw the item of last series instead of the selected
-			if(row == this.mouseOverItemSelector.getMouseOverSeries())	{
-				row = lastSeriesIndex;
-			}
-			// Draw the item of the selected series instead of the last
-			else if(row == lastSeriesIndex)	{
-				row = this.mouseOverItemSelector.getMouseOverSeries();
-			}
-		}
-		super.drawItem(g2, state, dataArea, plot, domainAxis, rangeAxis, dataset, row, column, pass);
-	 }
-
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-
-
-}
-
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+
+import org.jfree.chart.axis.CategoryAxis;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.labels.CategoryToolTipGenerator;
+import org.jfree.chart.plot.CategoryPlot;
+import org.jfree.chart.renderer.category.CategoryItemRendererState;
+import org.jfree.chart.renderer.category.LineAndShapeRenderer;
+import org.jfree.data.category.CategoryDataset;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for category charts.
+ * @author Sebastien Jacquot
+ *
+ */
+public class ItemSelectionCategoryLineAndShapeRenderer extends LineAndShapeRenderer implements IRendererWithItemSelection {
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MouseOverItemSelector mouseOverItemSelector;
+
+
+
+	/**
+	 *
+	 */
+	public ItemSelectionCategoryLineAndShapeRenderer()	{
+		this(true, true);
+	}
+
+
+	/**
+	 *
+	 * @param linesVisible
+	 * @param shapesVisible
+	 */
+	public ItemSelectionCategoryLineAndShapeRenderer(boolean linesVisible, boolean shapesVisible) {
+		super(linesVisible, shapesVisible);
+		this.mouseOverItemSelector = new MouseOverItemSelector(this);
+
+		// Labels
+		this.initItemLabelGenerator();
+
+		// Tooltips
+		this.initToolTipGenerator(this);
+	}
+
+
+
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(CategoryDataset dataset, int row, int column) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(row);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + catDataset.getColumnKey(column) + "</p><p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row)
+						+ ChartsEngineCoreMessages.EMPTY + " </span><b>" + catDataset.getValue(row, column) + "</b></p></body><html>";
+			}
+		});
+	}
+
+
+	@Override
+	public Paint getItemOutlinePaint(int series, int item) {
+		// Change item shape outline color
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			return super.getItemOutlinePaint(series, item);
+		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+	@Override
+	public Shape getItemShape(int series, int item) {
+
+		Shape shape = super.getItemShape(series, item);
+
+		// Scale item shape
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			AffineTransform t = new AffineTransform();
+			t.setToScale(1.9f, 1.9f);
+			shape = t.createTransformedShape(shape);
+		}
+		return shape;
+	}
+
+
+	@Override
+	public Font getItemLabelFont(int series, int item) {
+
+		Font font = super.getItemLabelFont(series, item);
+
+		// Change item label font size and style
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
+		}
+		return font;
+	}
+
+
+	@Override
+	public Stroke getSeriesStroke(int series)	{
+		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
+
+		// Change line width of selected series
+		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
+			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
+		}
+		return stroke;
+	}
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return mouseOverItemSelector;
+	}
+
+
+
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		// FIXME : to remove when validated
+		//this.itemSelector.setItemDrawnAtLast(this);
+
+	}
+
+
+	@Override
+	public void drawItem(Graphics2D g2, CategoryItemRendererState state, Rectangle2D dataArea, CategoryPlot plot, CategoryAxis domainAxis,
+	            ValueAxis rangeAxis, CategoryDataset dataset, int row, int column, int pass) {
+
+		// Manage the drawing as last of the selected plot item if exists
+		if(this.mouseOverItemSelector.getMouseOverSeries() != -1)	{
+
+			// FIXME: this code bug, sometimes selected point is not display especially after a zoom, because the last index item is computed on the whole dataset but it should be the last item index
+			// only of the visible current area, see the tips XY renderer to correct this
+			int lastSeriesIndex = ((CategoryPlot)this.getPlot()).getDataset().getRowCount() - 1;
+
+			// Draw the item of last series instead of the selected
+			if(row == this.mouseOverItemSelector.getMouseOverSeries())	{
+				row = lastSeriesIndex;
+			}
+			// Draw the item of the selected series instead of the last
+			else if(row == lastSeriesIndex)	{
+				row = this.mouseOverItemSelector.getMouseOverSeries();
+			}
+		}
+		super.drawItem(g2, state, dataArea, plot, domainAxis, rangeAxis, dataset, row, column, pass);
+	 }
+
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+
+
+}
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryStepRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryStepRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryStepRenderer.java	(revision 1335)
@@ -1,164 +1,164 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Stroke;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.text.DecimalFormat;
-
-import org.jfree.chart.axis.CategoryAxis;
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.labels.CategoryToolTipGenerator;
-import org.jfree.chart.plot.CategoryMarker;
-import org.jfree.chart.plot.CategoryPlot;
-import org.jfree.chart.plot.IntervalMarker;
-import org.jfree.chart.plot.Marker;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.ValueMarker;
-import org.jfree.chart.renderer.category.CategoryStepRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.category.CategoryDataset;
-import org.jfree.data.category.DefaultCategoryDataset;
-import org.jfree.text.TextUtilities;
-import org.jfree.ui.GradientPaintTransformer;
-import org.jfree.ui.LengthAdjustmentType;
-import org.jfree.ui.RectangleAnchor;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-public class ItemSelectionCategoryStepRenderer extends CategoryStepRenderer implements IRendererWithItemSelection {
-
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MouseOverItemSelector mouseOverItemSelector;
-
-
-
-	/**
-	 * Values number format.
-	 */
-	protected DecimalFormat valuesNumberFormat;
-
-
-	/**
-	 *
-	 */
-	public ItemSelectionCategoryStepRenderer() {
-
-		this.mouseOverItemSelector = new MouseOverItemSelector(this);
-
-		// Default Values format
-		String pattern = new String("#0.####");
-		this.valuesNumberFormat = new DecimalFormat(pattern);
-
-		// Labels
-		this.initItemLabelGenerator();
-		// Tooltips
-		this.initToolTipGenerator(this);
-	}
-
-
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(CategoryDataset dataset, int row, int column) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(row);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
-				Number value = catDataset.getValue(row, column);
-
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + catDataset.getColumnKey(column) + "</p><p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + ChartsEngineCoreMessages.charts_labelValueSeparator
-						+ " </span><b>" + valuesNumberFormat.format(value) + "</b></p></body><html>";
-			}
-		});
-	}
-
-
-	@Override
-	public Paint getItemOutlinePaint(int series, int item) {
-		// Trace the shape outline
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			return super.getItemOutlinePaint(series, item);
-		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-
-	@Override
-	public Stroke getSeriesStroke(int series)	{
-		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
-
-		// Change line width of selected series
-		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
-			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
-		}
-		return stroke;
-	}
-
-
-	@Override
-	public Font getItemLabelFont(int series, int item) {
-
-		Font font = super.getItemLabelFont(series, item);
-
-		// Change item label font size and style
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
-		}
-		return font;
-	}
-
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return mouseOverItemSelector;
-	}
-
-
-
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		// FIXME : to remove when validated
-		//this.itemSelector.setItemDrawnAtLast(this);
-	}
-
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-
-}
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Font;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Stroke;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.text.DecimalFormat;
+
+import org.jfree.chart.axis.CategoryAxis;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.labels.CategoryToolTipGenerator;
+import org.jfree.chart.plot.CategoryMarker;
+import org.jfree.chart.plot.CategoryPlot;
+import org.jfree.chart.plot.IntervalMarker;
+import org.jfree.chart.plot.Marker;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.ValueMarker;
+import org.jfree.chart.renderer.category.CategoryStepRenderer;
+import org.jfree.data.Range;
+import org.jfree.data.category.CategoryDataset;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.text.TextUtilities;
+import org.jfree.ui.GradientPaintTransformer;
+import org.jfree.ui.LengthAdjustmentType;
+import org.jfree.ui.RectangleAnchor;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+public class ItemSelectionCategoryStepRenderer extends CategoryStepRenderer implements IRendererWithItemSelection {
+
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MouseOverItemSelector mouseOverItemSelector;
+
+
+
+	/**
+	 * Values number format.
+	 */
+	protected DecimalFormat valuesNumberFormat;
+
+
+	/**
+	 *
+	 */
+	public ItemSelectionCategoryStepRenderer() {
+
+		this.mouseOverItemSelector = new MouseOverItemSelector(this);
+
+		// Default Values format
+		String pattern = new String("#0.####");
+		this.valuesNumberFormat = new DecimalFormat(pattern);
+
+		// Labels
+		this.initItemLabelGenerator();
+		// Tooltips
+		this.initToolTipGenerator(this);
+	}
+
+
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new CategoryToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(CategoryDataset dataset, int row, int column) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(row);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+				DefaultCategoryDataset catDataset = (DefaultCategoryDataset) dataset;
+				Number value = catDataset.getValue(row, column);
+
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p>" + catDataset.getColumnKey(column) + "</p><p><span style=\"color: " + hex + ";\">" + catDataset.getRowKey(row) + ChartsEngineCoreMessages.EMPTY
+						+ " </span><b>" + valuesNumberFormat.format(value) + "</b></p></body><html>";
+			}
+		});
+	}
+
+
+	@Override
+	public Paint getItemOutlinePaint(int series, int item) {
+		// Trace the shape outline
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			return super.getItemOutlinePaint(series, item);
+		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+
+	@Override
+	public Stroke getSeriesStroke(int series)	{
+		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
+
+		// Change line width of selected series
+		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
+			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
+		}
+		return stroke;
+	}
+
+
+	@Override
+	public Font getItemLabelFont(int series, int item) {
+
+		Font font = super.getItemLabelFont(series, item);
+
+		// Change item label font size and style
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
+		}
+		return font;
+	}
+
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return mouseOverItemSelector;
+	}
+
+
+
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		// FIXME : to remove when validated
+		//this.itemSelector.setItemDrawnAtLast(this);
+	}
+
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYCardinalSplineRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYCardinalSplineRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYCardinalSplineRenderer.java	(revision 1335)
@@ -1,357 +1,357 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.labels.XYToolTipGenerator;
-import org.jfree.chart.plot.IntervalMarker;
-import org.jfree.chart.plot.Marker;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.ValueMarker;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.data.Range;
-import org.jfree.data.xy.XYDataset;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.text.TextUtilities;
-import org.jfree.ui.GradientPaintTransformer;
-import org.jfree.ui.LengthAdjustmentType;
-import org.jfree.ui.RectangleAnchor;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.XYCardinalSplineRenderer;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.RendererUtils;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for XY charts with cardinal splines drawing support.
- * @author Sebastien Jacquot
- *
- */
-public class ItemSelectionXYCardinalSplineRenderer extends XYCardinalSplineRenderer implements IRendererWithItemSelection {
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MouseOverItemSelector mouseOverItemSelector;
-
-	/**
-	 * Marker label rotation angle.
-	 */
-	protected float markerLabelRotationAngle;
-
-
-	/**
-	 *
-	 * @param precision
-	 * @param tension
-	 * @param linesVisible
-	 * @param shapesVisible
-	 */
-	public ItemSelectionXYCardinalSplineRenderer(int precision, double tension, boolean linesVisible, boolean shapesVisible) {
-		super(precision, tension, linesVisible, shapesVisible);
-
-		this.mouseOverItemSelector = new MouseOverItemSelector(this);
-		this.markerLabelRotationAngle = 0;
-
-
-		// Labels
-		this.initItemLabelGenerator();
-		// Tooltips
-		this.initToolTipGenerator(this);
-	}
-
-
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(XYDataset dataset, int series, int item) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(series);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series) + "</span></p><p><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getY(item))
-						 + ChartsEngineCoreMessages.charts_labelValueSeparator + " </b><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getX(item)) + "</b></p></body><html>";
-			}
-		});
-
-	}
-
-
-
-
-
-    @Override
-    public void drawDomainMarker(Graphics2D g2, XYPlot plot, ValueAxis domainAxis, Marker marker, Rectangle2D dataArea) {
-
-    	// Overrides for adding rotated marker label functionality
-        if (marker instanceof ValueMarker) {
-            ValueMarker vm = (ValueMarker) marker;
-            double value = vm.getValue();
-            Range range = domainAxis.getRange();
-            if (!range.contains(value)) {
-                return;
-            }
-
-            double v = domainAxis.valueToJava2D(value, dataArea,
-                    plot.getDomainAxisEdge());
-
-            PlotOrientation orientation = plot.getOrientation();
-            Line2D line = null;
-            if (orientation == PlotOrientation.HORIZONTAL) {
-                line = new Line2D.Double(dataArea.getMinX(), v,
-                        dataArea.getMaxX(), v);
-            }
-            else if (orientation == PlotOrientation.VERTICAL) {
-                line = new Line2D.Double(v, dataArea.getMinY(), v,
-                        dataArea.getMaxY());
-            } else {
-                throw new IllegalStateException();
-            }
-
-            final Composite originalComposite = g2.getComposite();
-            g2.setComposite(AlphaComposite.getInstance(
-                    AlphaComposite.SRC_OVER, marker.getAlpha()));
-            g2.setPaint(marker.getPaint());
-            g2.setStroke(marker.getStroke());
-            g2.draw(line);
-
-            String label = marker.getLabel();
-            RectangleAnchor anchor = marker.getLabelAnchor();
-            if (label != null) {
-                Font labelFont = marker.getLabelFont();
-                g2.setFont(labelFont);
-                g2.setPaint(marker.getLabelPaint());
-                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
-                        g2, orientation, dataArea, line.getBounds2D(),
-                        marker.getLabelOffset(),
-                        LengthAdjustmentType.EXPAND, anchor);
-                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
-                // Draw rotated marker label
-                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
-            }
-            g2.setComposite(originalComposite);
-        }
-        else if (marker instanceof IntervalMarker) {
-            IntervalMarker im = (IntervalMarker) marker;
-            double start = im.getStartValue();
-            double end = im.getEndValue();
-            Range range = domainAxis.getRange();
-            if (!(range.intersects(start, end))) {
-                return;
-            }
-
-            double start2d = domainAxis.valueToJava2D(start, dataArea,
-                    plot.getDomainAxisEdge());
-            double end2d = domainAxis.valueToJava2D(end, dataArea,
-                    plot.getDomainAxisEdge());
-            double low = Math.min(start2d, end2d);
-            double high = Math.max(start2d, end2d);
-
-            PlotOrientation orientation = plot.getOrientation();
-            Rectangle2D rect = null;
-            if (orientation == PlotOrientation.HORIZONTAL) {
-                // clip top and bottom bounds to data area
-                low = Math.max(low, dataArea.getMinY());
-                high = Math.min(high, dataArea.getMaxY());
-                rect = new Rectangle2D.Double(dataArea.getMinX(),
-                        low, dataArea.getWidth(),
-                        high - low);
-            }
-            else if (orientation == PlotOrientation.VERTICAL) {
-                // clip left and right bounds to data area
-                low = Math.max(low, dataArea.getMinX());
-                high = Math.min(high, dataArea.getMaxX());
-                rect = new Rectangle2D.Double(low,
-                        dataArea.getMinY(), high - low,
-                        dataArea.getHeight());
-            }
-
-            final Composite originalComposite = g2.getComposite();
-            g2.setComposite(AlphaComposite.getInstance(
-                    AlphaComposite.SRC_OVER, marker.getAlpha()));
-            Paint p = marker.getPaint();
-            if (p instanceof GradientPaint) {
-                GradientPaint gp = (GradientPaint) p;
-                GradientPaintTransformer t = im.getGradientPaintTransformer();
-                if (t != null) {
-                    gp = t.transform(gp, rect);
-                }
-                g2.setPaint(gp);
-            }
-            else {
-                g2.setPaint(p);
-            }
-            g2.fill(rect);
-
-            // now draw the outlines, if visible...
-            if (im.getOutlinePaint() != null && im.getOutlineStroke() != null) {
-                if (orientation == PlotOrientation.VERTICAL) {
-                    Line2D line = new Line2D.Double();
-                    double y0 = dataArea.getMinY();
-                    double y1 = dataArea.getMaxY();
-                    g2.setPaint(im.getOutlinePaint());
-                    g2.setStroke(im.getOutlineStroke());
-                    if (range.contains(start)) {
-                        line.setLine(start2d, y0, start2d, y1);
-                        g2.draw(line);
-                    }
-                    if (range.contains(end)) {
-                        line.setLine(end2d, y0, end2d, y1);
-                        g2.draw(line);
-                    }
-                }
-                else { // PlotOrientation.HORIZONTAL
-                    Line2D line = new Line2D.Double();
-                    double x0 = dataArea.getMinX();
-                    double x1 = dataArea.getMaxX();
-                    g2.setPaint(im.getOutlinePaint());
-                    g2.setStroke(im.getOutlineStroke());
-                    if (range.contains(start)) {
-                        line.setLine(x0, start2d, x1, start2d);
-                        g2.draw(line);
-                    }
-                    if (range.contains(end)) {
-                        line.setLine(x0, end2d, x1, end2d);
-                        g2.draw(line);
-                    }
-                }
-            }
-
-            String label = marker.getLabel();
-            RectangleAnchor anchor = marker.getLabelAnchor();
-            if (label != null) {
-                Font labelFont = marker.getLabelFont();
-                g2.setFont(labelFont);
-                g2.setPaint(marker.getLabelPaint());
-                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
-                        g2, orientation, dataArea, rect,
-                        marker.getLabelOffset(), marker.getLabelOffsetType(),
-                        anchor);
-                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
-                // Draw rotated marker label
-                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
-            }
-            g2.setComposite(originalComposite);
-
-        }
-
-    }
-
-
-	@Override
-	public Paint getItemOutlinePaint(int series, int item) {
-		// Change item shape outline color
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			return super.getItemOutlinePaint(series, item);
-		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-	@Override
-	public Shape getItemShape(int series, int item) {
-
-		Shape s = super.getItemShape(series, item);
-
-		// Scale item shape
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			AffineTransform t = new AffineTransform();
-			t.setToScale(1.9f, 1.9f);
-			s = t.createTransformedShape(s);
-		}
-		return s;
-	}
-
-	@Override
-	public Stroke getSeriesStroke(int series)	{
-		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
-
-		// Change line width of selected series
-		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
-			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
-		}
-		return stroke;
-	}
-
-	@Override
-	public Paint getItemLabelPaint(int series, int item) {
-		// Change item label font color
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			return Color.orange;
-		}
-		return super.getItemLabelPaint(series, item);
-	}
-
-	@Override
-	public Font getItemLabelFont(int series, int item) {
-
-		Font font = super.getItemLabelFont(series, item);
-
-		// Change item label font size and style
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
-		}
-		return font;
-	}
-
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return mouseOverItemSelector;
-	}
-
-
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		// FIXME : to remove when validated
-		//this.itemSelector.setItemDrawnAtLast(this);
-	}
-
-
-	/**
-	 * @param markerLabelRotationAngle the markerLabelRotationAngle to set
-	 */
-	public void setMarkerLabelRotationAngle(float markerLabelRotationAngle) {
-		this.markerLabelRotationAngle = markerLabelRotationAngle;
-	}
-
-
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-}
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Font;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.labels.XYToolTipGenerator;
+import org.jfree.chart.plot.IntervalMarker;
+import org.jfree.chart.plot.Marker;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.ValueMarker;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.data.Range;
+import org.jfree.data.xy.XYDataset;
+import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.text.TextUtilities;
+import org.jfree.ui.GradientPaintTransformer;
+import org.jfree.ui.LengthAdjustmentType;
+import org.jfree.ui.RectangleAnchor;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.XYCardinalSplineRenderer;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.RendererUtils;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for XY charts with cardinal splines drawing support.
+ * @author Sebastien Jacquot
+ *
+ */
+public class ItemSelectionXYCardinalSplineRenderer extends XYCardinalSplineRenderer implements IRendererWithItemSelection {
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MouseOverItemSelector mouseOverItemSelector;
+
+	/**
+	 * Marker label rotation angle.
+	 */
+	protected float markerLabelRotationAngle;
+
+
+	/**
+	 *
+	 * @param precision
+	 * @param tension
+	 * @param linesVisible
+	 * @param shapesVisible
+	 */
+	public ItemSelectionXYCardinalSplineRenderer(int precision, double tension, boolean linesVisible, boolean shapesVisible) {
+		super(precision, tension, linesVisible, shapesVisible);
+
+		this.mouseOverItemSelector = new MouseOverItemSelector(this);
+		this.markerLabelRotationAngle = 0;
+
+
+		// Labels
+		this.initItemLabelGenerator();
+		// Tooltips
+		this.initToolTipGenerator(this);
+	}
+
+
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(XYDataset dataset, int series, int item) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(series);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series) + "</span></p><p><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getY(item))
+						 + ChartsEngineCoreMessages.EMPTY + " </b><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getX(item)) + "</b></p></body><html>";
+			}
+		});
+
+	}
+
+
+
+
+
+    @Override
+    public void drawDomainMarker(Graphics2D g2, XYPlot plot, ValueAxis domainAxis, Marker marker, Rectangle2D dataArea) {
+
+    	// Overrides for adding rotated marker label functionality
+        if (marker instanceof ValueMarker) {
+            ValueMarker vm = (ValueMarker) marker;
+            double value = vm.getValue();
+            Range range = domainAxis.getRange();
+            if (!range.contains(value)) {
+                return;
+            }
+
+            double v = domainAxis.valueToJava2D(value, dataArea,
+                    plot.getDomainAxisEdge());
+
+            PlotOrientation orientation = plot.getOrientation();
+            Line2D line = null;
+            if (orientation == PlotOrientation.HORIZONTAL) {
+                line = new Line2D.Double(dataArea.getMinX(), v,
+                        dataArea.getMaxX(), v);
+            }
+            else if (orientation == PlotOrientation.VERTICAL) {
+                line = new Line2D.Double(v, dataArea.getMinY(), v,
+                        dataArea.getMaxY());
+            } else {
+                throw new IllegalStateException();
+            }
+
+            final Composite originalComposite = g2.getComposite();
+            g2.setComposite(AlphaComposite.getInstance(
+                    AlphaComposite.SRC_OVER, marker.getAlpha()));
+            g2.setPaint(marker.getPaint());
+            g2.setStroke(marker.getStroke());
+            g2.draw(line);
+
+            String label = marker.getLabel();
+            RectangleAnchor anchor = marker.getLabelAnchor();
+            if (label != null) {
+                Font labelFont = marker.getLabelFont();
+                g2.setFont(labelFont);
+                g2.setPaint(marker.getLabelPaint());
+                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
+                        g2, orientation, dataArea, line.getBounds2D(),
+                        marker.getLabelOffset(),
+                        LengthAdjustmentType.EXPAND, anchor);
+                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
+                // Draw rotated marker label
+                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
+            }
+            g2.setComposite(originalComposite);
+        }
+        else if (marker instanceof IntervalMarker) {
+            IntervalMarker im = (IntervalMarker) marker;
+            double start = im.getStartValue();
+            double end = im.getEndValue();
+            Range range = domainAxis.getRange();
+            if (!(range.intersects(start, end))) {
+                return;
+            }
+
+            double start2d = domainAxis.valueToJava2D(start, dataArea,
+                    plot.getDomainAxisEdge());
+            double end2d = domainAxis.valueToJava2D(end, dataArea,
+                    plot.getDomainAxisEdge());
+            double low = Math.min(start2d, end2d);
+            double high = Math.max(start2d, end2d);
+
+            PlotOrientation orientation = plot.getOrientation();
+            Rectangle2D rect = null;
+            if (orientation == PlotOrientation.HORIZONTAL) {
+                // clip top and bottom bounds to data area
+                low = Math.max(low, dataArea.getMinY());
+                high = Math.min(high, dataArea.getMaxY());
+                rect = new Rectangle2D.Double(dataArea.getMinX(),
+                        low, dataArea.getWidth(),
+                        high - low);
+            }
+            else if (orientation == PlotOrientation.VERTICAL) {
+                // clip left and right bounds to data area
+                low = Math.max(low, dataArea.getMinX());
+                high = Math.min(high, dataArea.getMaxX());
+                rect = new Rectangle2D.Double(low,
+                        dataArea.getMinY(), high - low,
+                        dataArea.getHeight());
+            }
+
+            final Composite originalComposite = g2.getComposite();
+            g2.setComposite(AlphaComposite.getInstance(
+                    AlphaComposite.SRC_OVER, marker.getAlpha()));
+            Paint p = marker.getPaint();
+            if (p instanceof GradientPaint) {
+                GradientPaint gp = (GradientPaint) p;
+                GradientPaintTransformer t = im.getGradientPaintTransformer();
+                if (t != null) {
+                    gp = t.transform(gp, rect);
+                }
+                g2.setPaint(gp);
+            }
+            else {
+                g2.setPaint(p);
+            }
+            g2.fill(rect);
+
+            // now draw the outlines, if visible...
+            if (im.getOutlinePaint() != null && im.getOutlineStroke() != null) {
+                if (orientation == PlotOrientation.VERTICAL) {
+                    Line2D line = new Line2D.Double();
+                    double y0 = dataArea.getMinY();
+                    double y1 = dataArea.getMaxY();
+                    g2.setPaint(im.getOutlinePaint());
+                    g2.setStroke(im.getOutlineStroke());
+                    if (range.contains(start)) {
+                        line.setLine(start2d, y0, start2d, y1);
+                        g2.draw(line);
+                    }
+                    if (range.contains(end)) {
+                        line.setLine(end2d, y0, end2d, y1);
+                        g2.draw(line);
+                    }
+                }
+                else { // PlotOrientation.HORIZONTAL
+                    Line2D line = new Line2D.Double();
+                    double x0 = dataArea.getMinX();
+                    double x1 = dataArea.getMaxX();
+                    g2.setPaint(im.getOutlinePaint());
+                    g2.setStroke(im.getOutlineStroke());
+                    if (range.contains(start)) {
+                        line.setLine(x0, start2d, x1, start2d);
+                        g2.draw(line);
+                    }
+                    if (range.contains(end)) {
+                        line.setLine(x0, end2d, x1, end2d);
+                        g2.draw(line);
+                    }
+                }
+            }
+
+            String label = marker.getLabel();
+            RectangleAnchor anchor = marker.getLabelAnchor();
+            if (label != null) {
+                Font labelFont = marker.getLabelFont();
+                g2.setFont(labelFont);
+                g2.setPaint(marker.getLabelPaint());
+                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
+                        g2, orientation, dataArea, rect,
+                        marker.getLabelOffset(), marker.getLabelOffsetType(),
+                        anchor);
+                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
+                // Draw rotated marker label
+                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
+            }
+            g2.setComposite(originalComposite);
+
+        }
+
+    }
+
+
+	@Override
+	public Paint getItemOutlinePaint(int series, int item) {
+		// Change item shape outline color
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			return super.getItemOutlinePaint(series, item);
+		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+	@Override
+	public Shape getItemShape(int series, int item) {
+
+		Shape s = super.getItemShape(series, item);
+
+		// Scale item shape
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			AffineTransform t = new AffineTransform();
+			t.setToScale(1.9f, 1.9f);
+			s = t.createTransformedShape(s);
+		}
+		return s;
+	}
+
+	@Override
+	public Stroke getSeriesStroke(int series)	{
+		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
+
+		// Change line width of selected series
+		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
+			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
+		}
+		return stroke;
+	}
+
+	@Override
+	public Paint getItemLabelPaint(int series, int item) {
+		// Change item label font color
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			return Color.orange;
+		}
+		return super.getItemLabelPaint(series, item);
+	}
+
+	@Override
+	public Font getItemLabelFont(int series, int item) {
+
+		Font font = super.getItemLabelFont(series, item);
+
+		// Change item label font size and style
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
+		}
+		return font;
+	}
+
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return mouseOverItemSelector;
+	}
+
+
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		// FIXME : to remove when validated
+		//this.itemSelector.setItemDrawnAtLast(this);
+	}
+
+
+	/**
+	 * @param markerLabelRotationAngle the markerLabelRotationAngle to set
+	 */
+	public void setMarkerLabelRotationAngle(float markerLabelRotationAngle) {
+		this.markerLabelRotationAngle = markerLabelRotationAngle;
+	}
+
+
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYSplineRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYSplineRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYSplineRenderer.java	(revision 1335)
@@ -1,376 +1,376 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.labels.XYToolTipGenerator;
-import org.jfree.chart.plot.IntervalMarker;
-import org.jfree.chart.plot.Marker;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.ValueMarker;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYSplineRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.xy.XYDataset;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.text.TextUtilities;
-import org.jfree.ui.GradientPaintTransformer;
-import org.jfree.ui.LengthAdjustmentType;
-import org.jfree.ui.RectangleAnchor;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for XY charts with splines drawing support.
- * 
- * @author sjacquot
- *
- */
-public class ItemSelectionXYSplineRenderer extends XYSplineRenderer implements IRendererWithItemSelection {
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MouseOverItemSelector mouseOverItemSelector;
-
-	/**
-	 * Marker label rotation angle.
-	 */
-	protected float markerLabelRotationAngle;
-
-
-	/**
-	 *
-	 */
-	public ItemSelectionXYSplineRenderer()	{
-		this(10, true, true);
-	}
-
-
-	/**
-	 *
-	 * @param precision the number of points between data items
-	 * @param linesVisible
-	 * @param shapesVisible
-	 */
-	public ItemSelectionXYSplineRenderer(int precision, boolean linesVisible, boolean shapesVisible) {
-		super(precision);
-		this.setBaseLinesVisible(linesVisible);
-		this.setBaseShapesVisible(shapesVisible);
-		this.mouseOverItemSelector = new MouseOverItemSelector(this);
-		this.markerLabelRotationAngle = 0;
-
-
-		// Labels
-		this.initItemLabelGenerator();
-		// Tooltips
-		this.initToolTipGenerator(this);
-	}
-
-
-
-	/**
-	 *
-	 * @param precision the number of points between data items
-	 */
-	public ItemSelectionXYSplineRenderer(int precision) {
-		this(precision, true, true);
-	}
-
-
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(XYDataset dataset, int series, int item) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(series);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series) + "</span></p><p><b>" + xyDataset.getSeries(series).getY(item)
-						 + ChartsEngineCoreMessages.charts_labelValueSeparator + " </b><b>" + xyDataset.getSeries(series).getX(item) + "</b></p></body><html>";
-			}
-		});
-
-	}
-
-
-
-
-
-    @Override
-    public void drawDomainMarker(Graphics2D g2, XYPlot plot, ValueAxis domainAxis, Marker marker, Rectangle2D dataArea) {
-
-    	// Overrides for adding rotated marker label functionality
-        if (marker instanceof ValueMarker) {
-            ValueMarker vm = (ValueMarker) marker;
-            double value = vm.getValue();
-            Range range = domainAxis.getRange();
-            if (!range.contains(value)) {
-                return;
-            }
-
-            double v = domainAxis.valueToJava2D(value, dataArea,
-                    plot.getDomainAxisEdge());
-
-            PlotOrientation orientation = plot.getOrientation();
-            Line2D line = null;
-            if (orientation == PlotOrientation.HORIZONTAL) {
-                line = new Line2D.Double(dataArea.getMinX(), v,
-                        dataArea.getMaxX(), v);
-            }
-            else if (orientation == PlotOrientation.VERTICAL) {
-                line = new Line2D.Double(v, dataArea.getMinY(), v,
-                        dataArea.getMaxY());
-            } else {
-                throw new IllegalStateException();
-            }
-
-            final Composite originalComposite = g2.getComposite();
-            g2.setComposite(AlphaComposite.getInstance(
-                    AlphaComposite.SRC_OVER, marker.getAlpha()));
-            g2.setPaint(marker.getPaint());
-            g2.setStroke(marker.getStroke());
-            g2.draw(line);
-
-            String label = marker.getLabel();
-            RectangleAnchor anchor = marker.getLabelAnchor();
-            if (label != null) {
-                Font labelFont = marker.getLabelFont();
-                g2.setFont(labelFont);
-                g2.setPaint(marker.getLabelPaint());
-                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
-                        g2, orientation, dataArea, line.getBounds2D(),
-                        marker.getLabelOffset(),
-                        LengthAdjustmentType.EXPAND, anchor);
-                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
-                // Draw rotated marker label
-                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
-            }
-            g2.setComposite(originalComposite);
-        }
-        else if (marker instanceof IntervalMarker) {
-            IntervalMarker im = (IntervalMarker) marker;
-            double start = im.getStartValue();
-            double end = im.getEndValue();
-            Range range = domainAxis.getRange();
-            if (!(range.intersects(start, end))) {
-                return;
-            }
-
-            double start2d = domainAxis.valueToJava2D(start, dataArea,
-                    plot.getDomainAxisEdge());
-            double end2d = domainAxis.valueToJava2D(end, dataArea,
-                    plot.getDomainAxisEdge());
-            double low = Math.min(start2d, end2d);
-            double high = Math.max(start2d, end2d);
-
-            PlotOrientation orientation = plot.getOrientation();
-            Rectangle2D rect = null;
-            if (orientation == PlotOrientation.HORIZONTAL) {
-                // clip top and bottom bounds to data area
-                low = Math.max(low, dataArea.getMinY());
-                high = Math.min(high, dataArea.getMaxY());
-                rect = new Rectangle2D.Double(dataArea.getMinX(),
-                        low, dataArea.getWidth(),
-                        high - low);
-            }
-            else if (orientation == PlotOrientation.VERTICAL) {
-                // clip left and right bounds to data area
-                low = Math.max(low, dataArea.getMinX());
-                high = Math.min(high, dataArea.getMaxX());
-                rect = new Rectangle2D.Double(low,
-                        dataArea.getMinY(), high - low,
-                        dataArea.getHeight());
-            }
-
-            final Composite originalComposite = g2.getComposite();
-            g2.setComposite(AlphaComposite.getInstance(
-                    AlphaComposite.SRC_OVER, marker.getAlpha()));
-            Paint p = marker.getPaint();
-            if (p instanceof GradientPaint) {
-                GradientPaint gp = (GradientPaint) p;
-                GradientPaintTransformer t = im.getGradientPaintTransformer();
-                if (t != null) {
-                    gp = t.transform(gp, rect);
-                }
-                g2.setPaint(gp);
-            }
-            else {
-                g2.setPaint(p);
-            }
-            g2.fill(rect);
-
-            // now draw the outlines, if visible...
-            if (im.getOutlinePaint() != null && im.getOutlineStroke() != null) {
-                if (orientation == PlotOrientation.VERTICAL) {
-                    Line2D line = new Line2D.Double();
-                    double y0 = dataArea.getMinY();
-                    double y1 = dataArea.getMaxY();
-                    g2.setPaint(im.getOutlinePaint());
-                    g2.setStroke(im.getOutlineStroke());
-                    if (range.contains(start)) {
-                        line.setLine(start2d, y0, start2d, y1);
-                        g2.draw(line);
-                    }
-                    if (range.contains(end)) {
-                        line.setLine(end2d, y0, end2d, y1);
-                        g2.draw(line);
-                    }
-                }
-                else { // PlotOrientation.HORIZONTAL
-                    Line2D line = new Line2D.Double();
-                    double x0 = dataArea.getMinX();
-                    double x1 = dataArea.getMaxX();
-                    g2.setPaint(im.getOutlinePaint());
-                    g2.setStroke(im.getOutlineStroke());
-                    if (range.contains(start)) {
-                        line.setLine(x0, start2d, x1, start2d);
-                        g2.draw(line);
-                    }
-                    if (range.contains(end)) {
-                        line.setLine(x0, end2d, x1, end2d);
-                        g2.draw(line);
-                    }
-                }
-            }
-
-            String label = marker.getLabel();
-            RectangleAnchor anchor = marker.getLabelAnchor();
-            if (label != null) {
-                Font labelFont = marker.getLabelFont();
-                g2.setFont(labelFont);
-                g2.setPaint(marker.getLabelPaint());
-                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
-                        g2, orientation, dataArea, rect,
-                        marker.getLabelOffset(), marker.getLabelOffsetType(),
-                        anchor);
-                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
-                // Draw rotated marker label
-                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
-            }
-            g2.setComposite(originalComposite);
-
-        }
-
-    }
-
-
-	@Override
-	public Paint getItemOutlinePaint(int series, int item) {
-		// Change item shape outline color
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			return super.getItemOutlinePaint(series, item);
-		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-	@Override
-	public Shape getItemShape(int series, int item) {
-
-		Shape s = super.getItemShape(series, item);
-
-		// Scale item shape
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			AffineTransform t = new AffineTransform();
-			t.setToScale(1.9f, 1.9f);
-			s = t.createTransformedShape(s);
-		}
-		return s;
-	}
-
-	@Override
-	public Stroke getSeriesStroke(int series)	{
-		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
-
-		// Change line width of selected series
-		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
-			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
-		}
-		return stroke;
-	}
-
-	@Override
-	public Paint getItemLabelPaint(int series, int item) {
-		// Change item label font color
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			return Color.orange;
-		}
-		return super.getItemLabelPaint(series, item);
-	}
-
-	@Override
-	public Font getItemLabelFont(int series, int item) {
-
-		Font font = super.getItemLabelFont(series, item);
-
-		// Change item label font size and style
-		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
-			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
-		}
-		return font;
-	}
-
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return mouseOverItemSelector;
-	}
-
-
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		// FIXME : to remove when validated
-		//this.itemSelector.setItemDrawnAtLast(this);
-	}
-
-
-	/**
-	 * @param markerLabelRotationAngle the markerLabelRotationAngle to set
-	 */
-	public void setMarkerLabelRotationAngle(float markerLabelRotationAngle) {
-		this.markerLabelRotationAngle = markerLabelRotationAngle;
-	}
-
-
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-		
-	}
-
-
-}
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Font;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.labels.XYToolTipGenerator;
+import org.jfree.chart.plot.IntervalMarker;
+import org.jfree.chart.plot.Marker;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.ValueMarker;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYSplineRenderer;
+import org.jfree.data.Range;
+import org.jfree.data.xy.XYDataset;
+import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.text.TextUtilities;
+import org.jfree.ui.GradientPaintTransformer;
+import org.jfree.ui.LengthAdjustmentType;
+import org.jfree.ui.RectangleAnchor;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for XY charts with splines drawing support.
+ * 
+ * @author sjacquot
+ *
+ */
+public class ItemSelectionXYSplineRenderer extends XYSplineRenderer implements IRendererWithItemSelection {
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MouseOverItemSelector mouseOverItemSelector;
+
+	/**
+	 * Marker label rotation angle.
+	 */
+	protected float markerLabelRotationAngle;
+
+
+	/**
+	 *
+	 */
+	public ItemSelectionXYSplineRenderer()	{
+		this(10, true, true);
+	}
+
+
+	/**
+	 *
+	 * @param precision the number of points between data items
+	 * @param linesVisible
+	 * @param shapesVisible
+	 */
+	public ItemSelectionXYSplineRenderer(int precision, boolean linesVisible, boolean shapesVisible) {
+		super(precision);
+		this.setBaseLinesVisible(linesVisible);
+		this.setBaseShapesVisible(shapesVisible);
+		this.mouseOverItemSelector = new MouseOverItemSelector(this);
+		this.markerLabelRotationAngle = 0;
+
+
+		// Labels
+		this.initItemLabelGenerator();
+		// Tooltips
+		this.initToolTipGenerator(this);
+	}
+
+
+
+	/**
+	 *
+	 * @param precision the number of points between data items
+	 */
+	public ItemSelectionXYSplineRenderer(int precision) {
+		this(precision, true, true);
+	}
+
+
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(XYDataset dataset, int series, int item) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(series);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series) + "</span></p><p><b>" + xyDataset.getSeries(series).getY(item)
+						 + ChartsEngineCoreMessages.EMPTY + " </b><b>" + xyDataset.getSeries(series).getX(item) + "</b></p></body><html>";
+			}
+		});
+
+	}
+
+
+
+
+
+    @Override
+    public void drawDomainMarker(Graphics2D g2, XYPlot plot, ValueAxis domainAxis, Marker marker, Rectangle2D dataArea) {
+
+    	// Overrides for adding rotated marker label functionality
+        if (marker instanceof ValueMarker) {
+            ValueMarker vm = (ValueMarker) marker;
+            double value = vm.getValue();
+            Range range = domainAxis.getRange();
+            if (!range.contains(value)) {
+                return;
+            }
+
+            double v = domainAxis.valueToJava2D(value, dataArea,
+                    plot.getDomainAxisEdge());
+
+            PlotOrientation orientation = plot.getOrientation();
+            Line2D line = null;
+            if (orientation == PlotOrientation.HORIZONTAL) {
+                line = new Line2D.Double(dataArea.getMinX(), v,
+                        dataArea.getMaxX(), v);
+            }
+            else if (orientation == PlotOrientation.VERTICAL) {
+                line = new Line2D.Double(v, dataArea.getMinY(), v,
+                        dataArea.getMaxY());
+            } else {
+                throw new IllegalStateException();
+            }
+
+            final Composite originalComposite = g2.getComposite();
+            g2.setComposite(AlphaComposite.getInstance(
+                    AlphaComposite.SRC_OVER, marker.getAlpha()));
+            g2.setPaint(marker.getPaint());
+            g2.setStroke(marker.getStroke());
+            g2.draw(line);
+
+            String label = marker.getLabel();
+            RectangleAnchor anchor = marker.getLabelAnchor();
+            if (label != null) {
+                Font labelFont = marker.getLabelFont();
+                g2.setFont(labelFont);
+                g2.setPaint(marker.getLabelPaint());
+                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
+                        g2, orientation, dataArea, line.getBounds2D(),
+                        marker.getLabelOffset(),
+                        LengthAdjustmentType.EXPAND, anchor);
+                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
+                // Draw rotated marker label
+                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
+            }
+            g2.setComposite(originalComposite);
+        }
+        else if (marker instanceof IntervalMarker) {
+            IntervalMarker im = (IntervalMarker) marker;
+            double start = im.getStartValue();
+            double end = im.getEndValue();
+            Range range = domainAxis.getRange();
+            if (!(range.intersects(start, end))) {
+                return;
+            }
+
+            double start2d = domainAxis.valueToJava2D(start, dataArea,
+                    plot.getDomainAxisEdge());
+            double end2d = domainAxis.valueToJava2D(end, dataArea,
+                    plot.getDomainAxisEdge());
+            double low = Math.min(start2d, end2d);
+            double high = Math.max(start2d, end2d);
+
+            PlotOrientation orientation = plot.getOrientation();
+            Rectangle2D rect = null;
+            if (orientation == PlotOrientation.HORIZONTAL) {
+                // clip top and bottom bounds to data area
+                low = Math.max(low, dataArea.getMinY());
+                high = Math.min(high, dataArea.getMaxY());
+                rect = new Rectangle2D.Double(dataArea.getMinX(),
+                        low, dataArea.getWidth(),
+                        high - low);
+            }
+            else if (orientation == PlotOrientation.VERTICAL) {
+                // clip left and right bounds to data area
+                low = Math.max(low, dataArea.getMinX());
+                high = Math.min(high, dataArea.getMaxX());
+                rect = new Rectangle2D.Double(low,
+                        dataArea.getMinY(), high - low,
+                        dataArea.getHeight());
+            }
+
+            final Composite originalComposite = g2.getComposite();
+            g2.setComposite(AlphaComposite.getInstance(
+                    AlphaComposite.SRC_OVER, marker.getAlpha()));
+            Paint p = marker.getPaint();
+            if (p instanceof GradientPaint) {
+                GradientPaint gp = (GradientPaint) p;
+                GradientPaintTransformer t = im.getGradientPaintTransformer();
+                if (t != null) {
+                    gp = t.transform(gp, rect);
+                }
+                g2.setPaint(gp);
+            }
+            else {
+                g2.setPaint(p);
+            }
+            g2.fill(rect);
+
+            // now draw the outlines, if visible...
+            if (im.getOutlinePaint() != null && im.getOutlineStroke() != null) {
+                if (orientation == PlotOrientation.VERTICAL) {
+                    Line2D line = new Line2D.Double();
+                    double y0 = dataArea.getMinY();
+                    double y1 = dataArea.getMaxY();
+                    g2.setPaint(im.getOutlinePaint());
+                    g2.setStroke(im.getOutlineStroke());
+                    if (range.contains(start)) {
+                        line.setLine(start2d, y0, start2d, y1);
+                        g2.draw(line);
+                    }
+                    if (range.contains(end)) {
+                        line.setLine(end2d, y0, end2d, y1);
+                        g2.draw(line);
+                    }
+                }
+                else { // PlotOrientation.HORIZONTAL
+                    Line2D line = new Line2D.Double();
+                    double x0 = dataArea.getMinX();
+                    double x1 = dataArea.getMaxX();
+                    g2.setPaint(im.getOutlinePaint());
+                    g2.setStroke(im.getOutlineStroke());
+                    if (range.contains(start)) {
+                        line.setLine(x0, start2d, x1, start2d);
+                        g2.draw(line);
+                    }
+                    if (range.contains(end)) {
+                        line.setLine(x0, end2d, x1, end2d);
+                        g2.draw(line);
+                    }
+                }
+            }
+
+            String label = marker.getLabel();
+            RectangleAnchor anchor = marker.getLabelAnchor();
+            if (label != null) {
+                Font labelFont = marker.getLabelFont();
+                g2.setFont(labelFont);
+                g2.setPaint(marker.getLabelPaint());
+                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
+                        g2, orientation, dataArea, rect,
+                        marker.getLabelOffset(), marker.getLabelOffsetType(),
+                        anchor);
+                //TextUtilities.drawAlignedString(label, g2, (float) coordinates.getX(), (float) coordinates.getY(), marker.getLabelTextAnchor());
+                // Draw rotated marker label
+                TextUtilities.drawRotatedString(label, g2, Math.toRadians(90), (float) coordinates.getX(), (float) coordinates.getY());
+            }
+            g2.setComposite(originalComposite);
+
+        }
+
+    }
+
+
+	@Override
+	public Paint getItemOutlinePaint(int series, int item) {
+		// Change item shape outline color
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			return super.getItemOutlinePaint(series, item);
+		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+	@Override
+	public Shape getItemShape(int series, int item) {
+
+		Shape s = super.getItemShape(series, item);
+
+		// Scale item shape
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			AffineTransform t = new AffineTransform();
+			t.setToScale(1.9f, 1.9f);
+			s = t.createTransformedShape(s);
+		}
+		return s;
+	}
+
+	@Override
+	public Stroke getSeriesStroke(int series)	{
+		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
+
+		// Change line width of selected series
+		if(this.mouseOverItemSelector.isMouseOverSeries(series)) {
+			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
+		}
+		return stroke;
+	}
+
+	@Override
+	public Paint getItemLabelPaint(int series, int item) {
+		// Change item label font color
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			return Color.orange;
+		}
+		return super.getItemLabelPaint(series, item);
+	}
+
+	@Override
+	public Font getItemLabelFont(int series, int item) {
+
+		Font font = super.getItemLabelFont(series, item);
+
+		// Change item label font size and style
+		if(this.mouseOverItemSelector.isMouseOverItem(series, item)) {
+			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
+		}
+		return font;
+	}
+
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return mouseOverItemSelector;
+	}
+
+
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		// FIXME : to remove when validated
+		//this.itemSelector.setItemDrawnAtLast(this);
+	}
+
+
+	/**
+	 * @param markerLabelRotationAngle the markerLabelRotationAngle to set
+	 */
+	public void setMarkerLabelRotationAngle(float markerLabelRotationAngle) {
+		this.markerLabelRotationAngle = markerLabelRotationAngle;
+	}
+
+
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java	(revision 1335)
@@ -1,361 +1,361 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.text.DecimalFormat;
-
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.SymbolAxis;
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.labels.XYToolTipGenerator;
-import org.jfree.chart.plot.CategoryPlot;
-import org.jfree.chart.plot.CrosshairState;
-import org.jfree.chart.plot.PlotRenderingInfo;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYItemRendererState;
-import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
-import org.jfree.data.xy.XYDataset;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.core.results.ChartResult;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-/**
- * Renderer providing item selection system and drawing features for selected item and custom rendering for XY charts.
- * @author Sebastien Jacquot
- *
- */
-public class ItemSelectionXYLineAndShapeRenderer extends XYLineAndShapeRenderer implements IRendererWithItemSelection {
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MultipleItemsSelector multipleItemsSelector;
-
-	
-	/**
-	 * The linked chart.
-	 */
-	protected JFreeChart chart;
-	
-
-	/**
-	 * Values number format.
-	 */
-	protected DecimalFormat valuesNumberFormat;
-
-
-	/**
-	 * Creates a renderer with visible lines and visible shapes.
-	 */
-	public ItemSelectionXYLineAndShapeRenderer(ChartResult result, JFreeChart chart)	{
-		this(result, chart, true, true);
-	}
-
-
-	/**
-	 * Creates a renderer.
-	 * @param linesVisible
-	 * @param shapesVisible
-	 */
-	public ItemSelectionXYLineAndShapeRenderer(ChartResult result, JFreeChart chart, boolean linesVisible, boolean shapesVisible) {
-		super(linesVisible, shapesVisible);
-
-		this.multipleItemsSelector = new MultipleItemsSelector(this);
-		this.multipleItemsSelector.setResult(result);
-
-//		// FIXME: test to recycle the existing chart panel to fix a null pointer exception in the renderer
-//		if(result.getChart() != null)	{
-//			JFreeChart existingChart = (JFreeChart) result.getChart();
-//			if(existingChart.getPlot() instanceof XYPlot && existingChart.getXYPlot().getRenderer() instanceof IRendererWithItemSelection)	{
-//				this.multipleItemsSelector.setChartPanel(((IRendererWithItemSelection) existingChart.getXYPlot().getRenderer()).getItemsSelector().getChartPanel());
-//			}
-//			else if(existingChart.getPlot() instanceof CategoryPlot && existingChart.getCategoryPlot().getRenderer() instanceof IRendererWithItemSelection)	{
-//				this.multipleItemsSelector.setChartPanel(((IRendererWithItemSelection) existingChart.getCategoryPlot().getRenderer()).getItemsSelector().getChartPanel());
-//			}
-//		}
-		
-		this.chart = chart;
-		
-		// Default Values format
-		String pattern = new String("#0.####");
-		this.valuesNumberFormat = new DecimalFormat(pattern);
-
-		
-		this.init();
-		
-		// Labels
-		this.initItemLabelGenerator();
-		// Tooltips
-		this.initToolTipGenerator(this);
-		
-		
-	}
-
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-	}
-	
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(XYDataset dataset, int series, int item) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(series);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-
-				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
-
-
-				String label;
-
-				// Symbol Axis
-				if(getPlot().getDomainAxis() instanceof SymbolAxis)	{
-					label = ((SymbolAxis)getPlot().getDomainAxis()).getSymbols()[item];
-				}
-				else	{
-					label = String.valueOf(xyDataset.getXValue(series, item));
-				}
-
-
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + label + "</span></p><p>" + xyDataset.getSeriesKey(series)
-						 + ChartsEngineCoreMessages.charts_labelValueSeparator + " <b>" + valuesNumberFormat.format(xyDataset.getSeries(series).getY(item)) + "</b></p></body><html>";
-			}
-		});
-	}
-
-
-	@Override
-	public Paint getItemOutlinePaint(int series, int item) {
-		// Trace the shape outline for unique selected item
-		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
-			return super.getItemOutlinePaint(series, item);
-		}
-		// FIXME: rendering tests
-//		// Trace the shape outline for multiple selected item
-//		else if(this.itemSelector.isMultipleSelectedItem(series, item))	{
-//			return super.getItemPaint(series, item);
-//		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-	@Override
-	public Shape getItemShape(int series, int item) {
-
-
-		Shape shape = super.getItemShape(series, item);
-
-		// FIXME
-//		int lastItemIndex = ((XYPlot)this.getPlot()).getDataset().getItemCount(series) - 1;
-//
-//		// Store the selected shape to draw it at last if it's not already the last
-//		if(item != lastItemIndex && this.itemSelector.isSelectedItem(series, item)) {
-//			this.selectedShape = shape;
-//			return super.getItemShape(series, lastItemIndex); // return the last shape instead of the selected
-//		}
-//
-//		// Draw the selected item instead of the last
-//		if(item == lastItemIndex && this.selectedShape != null)	{
-//			// Scale item shape
-//			AffineTransform t = new AffineTransform();
-//			t.setToScale(1.9f, 1.9f);
-//			Shape selectedShape = t.createTransformedShape(this.selectedShape);
-//			this.selectedShape = null;
-//			return selectedShape;
-//		}
-
-		// Scale item shape
-		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
-			AffineTransform t = new AffineTransform();
-			t.setToScale(1.9f, 1.9f);
-			shape = t.createTransformedShape(shape);
-		}
-
-		return shape;
-	}
-
-
-
-
-	@Override
-	public Stroke getSeriesStroke(int series)	{
-		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
-
-		// Change line width of selected series
-		if(this.multipleItemsSelector.isMouseOverSeries(series)) {
-			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
-		}
-		return stroke;
-	}
-
-
-	@Override
-	public Font getItemLabelFont(int series, int item) {
-
-		Font font = super.getItemLabelFont(series, item);
-
-		// Change item label font size and style
-		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
-			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
-		}
-		return font;
-	}
-
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return multipleItemsSelector;
-	}
-
-
-
-//	
-//    @Override
-//    public XYItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea,
-//            XYPlot plot, XYDataset data, PlotRenderingInfo info) {
-//    	
-//    	final Graphics2D fG2 = g2;
-//    	final Rectangle2D fDataArea = dataArea;
-//    	final XYPlot fPlot = plot;
-//    	final XYDataset fData = data;
-//    	
-//        return new State(info)	{
-//        	@Override
-//        	public void endSeriesPass(XYDataset dataset, int series, int firstItem, int lastItem, int pass, int passCount) {
-//	        	// TODO Auto-generated method stub
-//	        	super.endSeriesPass(dataset, series, firstItem, lastItem, pass, passCount);
-//	        	
-//	        	
-//				   // FIXME: draw all passes of all previously skipped selected items
-//				   for(series = 0; series < ((MultipleItemSelector)itemSelector).getSelectedSeriesCount(); series++) {
-//					   int[] selectedItems = ((MultipleItemSelector)itemSelector).getSelectedItems(series);
-//					   for(int i = 0; i < selectedItems.length; i++) {
-//				        	for(pass = 0; pass < passCount - 1; pass++) {
-//				        		System.out.println("ItemSelectionXYLineAndShapeRenderer.drawItem(): draw skipped pass " + pass + " for selected item " + selectedItems[i]);
-//				        		super.drawItem(fG2, ((XYLineAndShapeRenderer.State)this), fDataArea, this.getInfo(), fPlot, fPlot.getDomainAxis(), fPlot.getRangeAxis(), dataset, series, selectedItems[i], null, pass);
-//				        	}
-//					   }
-//				   }
-//
-//        	}
-//        };
-//    }
-	
-	
-    /**
-     * Returns <code>true</code> if the specified pass is the one for drawing the selected items that have been pushed to draw as last elements.
-     *
-     * @param pass  the pass.
-     *
-     * @return A boolean.
-     */
-    protected boolean isSelectedItemPass(int pass) {
-        return pass == 2;
-    }
-	
-    
-    @Override
-    public int getPassCount() {
-        return 3;
-    }
-	
-    
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		this.multipleItemsSelector.setItemDrawnAtLast(this);
-	}
-
-	
-   @Override
-    public void drawItem(Graphics2D g2, XYItemRendererState state,
-            Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
-            ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
-            int series, int item, CrosshairState crosshairState, int pass) {
-
-
-	   // Mouse over selected item or multiple selected items
-	   if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item))	{
-		   // First pass, push the selected item and skip the drawing
-		   if(this.isLinePass(pass))	{
-
-			   // Mouse over
-			   if(this.multipleItemsSelector.isMouseOverItem(series, item))	{
-				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, true);
-			   }
-			   // Multiple selection
-			   else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
-				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, false);
-			   }
-			   return;
-		   }
-		   // Second pass, skip the drawing
-		   else if(this.isItemPass(pass))	{
-			   return;
-		   }
-		   // Third pass, pop the selected item and draw all the previously skipped passes
-		   else if(this.isSelectedItemPass(pass))	{
-			   
-			   item = this.multipleItemsSelector.popItemToDrawAsLast(series);
-			   // draw all skipped passes of the selected item
-			   for(int i = 0; i < this.getPassCount() - 1; i++) {
-				   if(series > -1 && item > -1)	{
-					   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, i);
-				   }
-			   }
-
-			   // FIXME: draw all passes of all previously skipped selected items
-//			   for(series = 0; series < ((MultipleItemSelector)this.itemSelector).getSelectedSeriesCount(); series++) {
-//				   int[] selectedItems = ((MultipleItemSelector)this.itemSelector).getSelectedItems(series);
-//				   for(int i = 0; i < selectedItems.length; i++) {
-//			        	for(pass = 0; pass < this.getPassCount() - 1; pass++) {
-//			        		System.out.println("ItemSelectionXYLineAndShapeRenderer.drawItem(): draw skipped pass " + pass + " for selected item " + item);
-//			        		super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, selectedItems[i], crosshairState, pass);
-//			        	}
-//				   }
-//			   }
-			   
-			   
-			   
-		   }
-			
-	   }
-	   // Normal item
-	   else 	{
-		   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
-	   }
-
-    }
-
-
-
-
-
-}
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.text.DecimalFormat;
+
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.axis.SymbolAxis;
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.labels.XYToolTipGenerator;
+import org.jfree.chart.plot.CategoryPlot;
+import org.jfree.chart.plot.CrosshairState;
+import org.jfree.chart.plot.PlotRenderingInfo;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYItemRendererState;
+import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
+import org.jfree.data.xy.XYDataset;
+import org.jfree.data.xy.XYSeriesCollection;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.core.results.ChartResult;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+/**
+ * Renderer providing item selection system and drawing features for selected item and custom rendering for XY charts.
+ * @author Sebastien Jacquot
+ *
+ */
+public class ItemSelectionXYLineAndShapeRenderer extends XYLineAndShapeRenderer implements IRendererWithItemSelection {
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MultipleItemsSelector multipleItemsSelector;
+
+	
+	/**
+	 * The linked chart.
+	 */
+	protected JFreeChart chart;
+	
+
+	/**
+	 * Values number format.
+	 */
+	protected DecimalFormat valuesNumberFormat;
+
+
+	/**
+	 * Creates a renderer with visible lines and visible shapes.
+	 */
+	public ItemSelectionXYLineAndShapeRenderer(ChartResult result, JFreeChart chart)	{
+		this(result, chart, true, true);
+	}
+
+
+	/**
+	 * Creates a renderer.
+	 * @param linesVisible
+	 * @param shapesVisible
+	 */
+	public ItemSelectionXYLineAndShapeRenderer(ChartResult result, JFreeChart chart, boolean linesVisible, boolean shapesVisible) {
+		super(linesVisible, shapesVisible);
+
+		this.multipleItemsSelector = new MultipleItemsSelector(this);
+		this.multipleItemsSelector.setResult(result);
+
+//		// FIXME: test to recycle the existing chart panel to fix a null pointer exception in the renderer
+//		if(result.getChart() != null)	{
+//			JFreeChart existingChart = (JFreeChart) result.getChart();
+//			if(existingChart.getPlot() instanceof XYPlot && existingChart.getXYPlot().getRenderer() instanceof IRendererWithItemSelection)	{
+//				this.multipleItemsSelector.setChartPanel(((IRendererWithItemSelection) existingChart.getXYPlot().getRenderer()).getItemsSelector().getChartPanel());
+//			}
+//			else if(existingChart.getPlot() instanceof CategoryPlot && existingChart.getCategoryPlot().getRenderer() instanceof IRendererWithItemSelection)	{
+//				this.multipleItemsSelector.setChartPanel(((IRendererWithItemSelection) existingChart.getCategoryPlot().getRenderer()).getItemsSelector().getChartPanel());
+//			}
+//		}
+		
+		this.chart = chart;
+		
+		// Default Values format
+		String pattern = new String("#0.####");
+		this.valuesNumberFormat = new DecimalFormat(pattern);
+
+		
+		this.init();
+		
+		// Labels
+		this.initItemLabelGenerator();
+		// Tooltips
+		this.initToolTipGenerator(this);
+		
+		
+	}
+
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+	}
+	
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(XYDataset dataset, int series, int item) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(series);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+
+				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
+
+
+				String label;
+
+				// Symbol Axis
+				if(getPlot().getDomainAxis() instanceof SymbolAxis)	{
+					label = ((SymbolAxis)getPlot().getDomainAxis()).getSymbols()[item];
+				}
+				else	{
+					label = String.valueOf(xyDataset.getXValue(series, item));
+				}
+
+
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + label + "</span></p><p>" + xyDataset.getSeriesKey(series)
+						 + ChartsEngineCoreMessages.EMPTY + " <b>" + valuesNumberFormat.format(xyDataset.getSeries(series).getY(item)) + "</b></p></body><html>";
+			}
+		});
+	}
+
+
+	@Override
+	public Paint getItemOutlinePaint(int series, int item) {
+		// Trace the shape outline for unique selected item
+		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
+			return super.getItemOutlinePaint(series, item);
+		}
+		// FIXME: rendering tests
+//		// Trace the shape outline for multiple selected item
+//		else if(this.itemSelector.isMultipleSelectedItem(series, item))	{
+//			return super.getItemPaint(series, item);
+//		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+	@Override
+	public Shape getItemShape(int series, int item) {
+
+
+		Shape shape = super.getItemShape(series, item);
+
+		// FIXME
+//		int lastItemIndex = ((XYPlot)this.getPlot()).getDataset().getItemCount(series) - 1;
+//
+//		// Store the selected shape to draw it at last if it's not already the last
+//		if(item != lastItemIndex && this.itemSelector.isSelectedItem(series, item)) {
+//			this.selectedShape = shape;
+//			return super.getItemShape(series, lastItemIndex); // return the last shape instead of the selected
+//		}
+//
+//		// Draw the selected item instead of the last
+//		if(item == lastItemIndex && this.selectedShape != null)	{
+//			// Scale item shape
+//			AffineTransform t = new AffineTransform();
+//			t.setToScale(1.9f, 1.9f);
+//			Shape selectedShape = t.createTransformedShape(this.selectedShape);
+//			this.selectedShape = null;
+//			return selectedShape;
+//		}
+
+		// Scale item shape
+		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
+			AffineTransform t = new AffineTransform();
+			t.setToScale(1.9f, 1.9f);
+			shape = t.createTransformedShape(shape);
+		}
+
+		return shape;
+	}
+
+
+
+
+	@Override
+	public Stroke getSeriesStroke(int series)	{
+		BasicStroke stroke = (BasicStroke) super.getSeriesStroke(series);
+
+		// Change line width of selected series
+		if(this.multipleItemsSelector.isMouseOverSeries(series)) {
+			stroke = new BasicStroke(stroke.getLineWidth() * 1.8f);
+		}
+		return stroke;
+	}
+
+
+	@Override
+	public Font getItemLabelFont(int series, int item) {
+
+		Font font = super.getItemLabelFont(series, item);
+
+		// Change item label font size and style
+		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
+			font = font.deriveFont(Font.BOLD, font.getSize() * 1.5f);
+		}
+		return font;
+	}
+
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return multipleItemsSelector;
+	}
+
+
+
+//	
+//    @Override
+//    public XYItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea,
+//            XYPlot plot, XYDataset data, PlotRenderingInfo info) {
+//    	
+//    	final Graphics2D fG2 = g2;
+//    	final Rectangle2D fDataArea = dataArea;
+//    	final XYPlot fPlot = plot;
+//    	final XYDataset fData = data;
+//    	
+//        return new State(info)	{
+//        	@Override
+//        	public void endSeriesPass(XYDataset dataset, int series, int firstItem, int lastItem, int pass, int passCount) {
+//	        	// TODO Auto-generated method stub
+//	        	super.endSeriesPass(dataset, series, firstItem, lastItem, pass, passCount);
+//	        	
+//	        	
+//				   // FIXME: draw all passes of all previously skipped selected items
+//				   for(series = 0; series < ((MultipleItemSelector)itemSelector).getSelectedSeriesCount(); series++) {
+//					   int[] selectedItems = ((MultipleItemSelector)itemSelector).getSelectedItems(series);
+//					   for(int i = 0; i < selectedItems.length; i++) {
+//				        	for(pass = 0; pass < passCount - 1; pass++) {
+//				        		System.out.println("ItemSelectionXYLineAndShapeRenderer.drawItem(): draw skipped pass " + pass + " for selected item " + selectedItems[i]);
+//				        		super.drawItem(fG2, ((XYLineAndShapeRenderer.State)this), fDataArea, this.getInfo(), fPlot, fPlot.getDomainAxis(), fPlot.getRangeAxis(), dataset, series, selectedItems[i], null, pass);
+//				        	}
+//					   }
+//				   }
+//
+//        	}
+//        };
+//    }
+	
+	
+    /**
+     * Returns <code>true</code> if the specified pass is the one for drawing the selected items that have been pushed to draw as last elements.
+     *
+     * @param pass  the pass.
+     *
+     * @return A boolean.
+     */
+    protected boolean isSelectedItemPass(int pass) {
+        return pass == 2;
+    }
+	
+    
+    @Override
+    public int getPassCount() {
+        return 3;
+    }
+	
+    
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		this.multipleItemsSelector.setItemDrawnAtLast(this);
+	}
+
+	
+   @Override
+    public void drawItem(Graphics2D g2, XYItemRendererState state,
+            Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot,
+            ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset,
+            int series, int item, CrosshairState crosshairState, int pass) {
+
+
+	   // Mouse over selected item or multiple selected items
+	   if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item))	{
+		   // First pass, push the selected item and skip the drawing
+		   if(this.isLinePass(pass))	{
+
+			   // Mouse over
+			   if(this.multipleItemsSelector.isMouseOverItem(series, item))	{
+				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, true);
+			   }
+			   // Multiple selection
+			   else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
+				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, false);
+			   }
+			   return;
+		   }
+		   // Second pass, skip the drawing
+		   else if(this.isItemPass(pass))	{
+			   return;
+		   }
+		   // Third pass, pop the selected item and draw all the previously skipped passes
+		   else if(this.isSelectedItemPass(pass))	{
+			   
+			   item = this.multipleItemsSelector.popItemToDrawAsLast(series);
+			   // draw all skipped passes of the selected item
+			   for(int i = 0; i < this.getPassCount() - 1; i++) {
+				   if(series > -1 && item > -1)	{
+					   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, i);
+				   }
+			   }
+
+			   // FIXME: draw all passes of all previously skipped selected items
+//			   for(series = 0; series < ((MultipleItemSelector)this.itemSelector).getSelectedSeriesCount(); series++) {
+//				   int[] selectedItems = ((MultipleItemSelector)this.itemSelector).getSelectedItems(series);
+//				   for(int i = 0; i < selectedItems.length; i++) {
+//			        	for(pass = 0; pass < this.getPassCount() - 1; pass++) {
+//			        		System.out.println("ItemSelectionXYLineAndShapeRenderer.drawItem(): draw skipped pass " + pass + " for selected item " + item);
+//			        		super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, selectedItems[i], crosshairState, pass);
+//			        	}
+//				   }
+//			   }
+			   
+			   
+			   
+		   }
+			
+	   }
+	   // Normal item
+	   else 	{
+		   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
+	   }
+
+    }
+
+
+
+
+
+}
\ No newline at end of file
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYStepRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYStepRenderer.java	(revision 1334)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYStepRenderer.java	(revision 1335)
@@ -1,586 +1,586 @@
-package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Font;
-import java.awt.GradientPaint;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Shape;
-import java.awt.geom.Line2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
-
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.entity.EntityCollection;
-import org.jfree.chart.labels.XYToolTipGenerator;
-import org.jfree.chart.plot.CrosshairState;
-import org.jfree.chart.plot.IntervalMarker;
-import org.jfree.chart.plot.Marker;
-import org.jfree.chart.plot.PlotOrientation;
-import org.jfree.chart.plot.PlotRenderingInfo;
-import org.jfree.chart.plot.ValueMarker;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYItemRendererState;
-import org.jfree.chart.renderer.xy.XYStepRenderer;
-import org.jfree.data.Range;
-import org.jfree.data.xy.XYDataset;
-import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.text.TextUtilities;
-import org.jfree.ui.GradientPaintTransformer;
-import org.jfree.ui.LengthAdjustmentType;
-import org.jfree.ui.RectangleAnchor;
-import org.jfree.ui.RectangleEdge;
-import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
-import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.RendererUtils;
-import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
-
-public class ItemSelectionXYStepRenderer extends XYStepRenderer implements IRendererWithItemSelection {
-
-
-
-	/**
-	 * Chart item selector.
-	 */
-	protected MultipleItemsSelector multipleItemsSelector;
-
-
-
-	/**
-	 * State value to keep track of the type of rendering pass and skip some selection rendering modifications during the line pass.
-	 */
-	protected boolean isLinePass = true;
-	
-	
-	/**
-	 * Label that will be drawn for the selected item in drawing pass.
-	 */
-	protected String tmpSelectedItemLabel = null;
-	
-	/**
-	 *
-	 */
-	public ItemSelectionXYStepRenderer() {
-		this(true, false);
-	}
-
-	/**
-	 *
-	 * @param linesVisible
-	 * @param shapesVisible
-	 */
-	public ItemSelectionXYStepRenderer(boolean linesVisible, boolean shapesVisible) {
-		this.setBaseLinesVisible(linesVisible);
-		this.setBaseShapesVisible(shapesVisible);
-		this.setShapesVisible(true);
-
-		// Multiple items selector
-		this.multipleItemsSelector = new MultipleItemsSelector(this);
-
-		// Labels
-		this.initItemLabelGenerator();
-		// Tooltips
-		this.initToolTipGenerator(this);
-	}
-
-
-	/**
-	 * Initializes the item label generator.
-	 */
-	public void initItemLabelGenerator()	{
-		// TODO
-	}
-
-	/**
-	 * Initializes the tool tip generator.
-	 */
-	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
-		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
-
-			@Override
-			public String generateToolTip(XYDataset dataset, int series, int item) {
-
-				// Hexadecimal color
-				Color color = (Color) getSeriesPaint(series);
-				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
-				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
-
-				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series)
-						+ "</span></p><p><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getY(item)) + ChartsEngineCoreMessages.charts_labelValueSeparator
-						+ " </b><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getX(item)) + "</b></p></body><html>";
-			}
-		});
-	}
-
-
-	@Override
-	public Paint getItemOutlinePaint(int series, int item) {
-		// Trace the shape outline
-		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
-			return super.getItemOutlinePaint(series, item);
-		}
-		// Do not trace not selected item outline
-		return null;
-	}
-
-
-	@Override
-	public Font getItemLabelFont(int series, int item) {
-
-		Font font = super.getItemLabelFont(series, item);
-
-		// Change item label font size and style
-//		if(this.itemSelector.isSelectedItem(series, item)) {
-			font = font.deriveFont(Font.BOLD, font.getSize());
-	//	}
-		return font;
-	}
-
-
-	/**
-	 * @return the itemSelector
-	 */
-	public MouseOverItemSelector getItemsSelector() {
-		return multipleItemsSelector;
-	}
-
-
-
-	@Override
-	public void updateDatasetForDrawingSelectedItemAsLast() {
-		// FIXME: put the mouse over item series at last in the dataset
-//		this.getPlot().getDatasetRenderingOrder().
-		
-//		int index = this.multipleItemsSelector.getMouseOverSeries();
-//		if(index != -1)	{
-//			this.getPlot().getDataset().setDatasetRenderingOrder();
-//		}
-		
-		// create a new dataset with the mouse over series at last position
-//		if(this.multipleItemsSelector.getMouseOverSeries() != -1)	{
-//			System.out.println("ItemSelectionXYStepRenderer.updateDatasetForDrawingSelectedItemAsLast() update dataset order");
-//			XYSeriesCollection dataset = (XYSeriesCollection) this.getPlot().getDataset();
-//			XYSeriesCollection newDataset = new XYSeriesCollection();
-//			for(int i = 0; i < dataset.getSeriesCount(); i++) {
-//				if(!this.multipleItemsSelector.isMouseOverSeries(i))	{
-//					newDataset.addSeries(dataset.getSeries(i));
-//				}
-//			}
-//			newDataset.addSeries(dataset.getSeries(this.multipleItemsSelector.getMouseOverSeries()));
-//			this.getPlot().setDataset(newDataset);
-//			
-//		}
-		
-		// FIXME: temporary ugly workaround, set the rendering order according to the mouse over series and the half of the series count
-//		if(this.multipleItemsSelector.getMouseOverSeries() <= this.getPlot().getDataset().getSeriesCount() / 2)	{
-//			this.getPlot().setSeriesRenderingOrder(SeriesRenderingOrder.FORWARD);
-//		}
-//		else	{
-//			this.getPlot().setSeriesRenderingOrder(SeriesRenderingOrder.REVERSE);
-//		}
-	}
-
-
-    /**
-     * Draws a vertical line on the chart to represent a 'range marker'.
-     *
-     * @param g2  the graphics device.
-     * @param plot  the plot.
-     * @param domainAxis  the domain axis.
-     * @param marker  the marker line.
-     * @param dataArea  the axis data area.
-     */
-    @Override
-    public void drawDomainMarker(Graphics2D g2, XYPlot plot,
-            ValueAxis domainAxis, Marker marker, Rectangle2D dataArea) {
-
-    	// Value marker
-        if (marker instanceof ValueMarker) {
-            ValueMarker vm = (ValueMarker) marker;
-            double value = vm.getValue();
-            Range range = domainAxis.getRange();
-            if (!range.contains(value)) {
-                return;
-            }
-
-            double v = domainAxis.valueToJava2D(value, dataArea,
-                    plot.getDomainAxisEdge());
-
-            PlotOrientation orientation = plot.getOrientation();
-            Line2D line = null;
-            if (orientation == PlotOrientation.HORIZONTAL) {
-                line = new Line2D.Double(dataArea.getMinX(), v,
-                        dataArea.getMaxX(), v);
-            }
-            else if (orientation == PlotOrientation.VERTICAL) {
-                line = new Line2D.Double(v, dataArea.getMinY(), v,
-                        dataArea.getMaxY());
-            } else {
-                throw new IllegalStateException();
-            }
-
-            final Composite originalComposite = g2.getComposite();
-            g2.setComposite(AlphaComposite.getInstance(
-                    AlphaComposite.SRC_OVER, marker.getAlpha()));
-            g2.setPaint(marker.getPaint());
-            g2.setStroke(marker.getStroke());
-            g2.draw(line);
-
-            String label = marker.getLabel();
-            RectangleAnchor anchor = marker.getLabelAnchor();
-            if (label != null) {
-                Font labelFont = marker.getLabelFont();
-                g2.setFont(labelFont);
-                g2.setPaint(marker.getLabelPaint());
-                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
-                        g2, orientation, dataArea, line.getBounds2D(),
-                        marker.getLabelOffset(),
-                        LengthAdjustmentType.EXPAND, anchor);
-
-                // Draw rotated marker labels rather than horizontal
-                TextUtilities.drawRotatedString(label, g2,
-             	       (float) coordinates.getX(), (float) coordinates.getY() - 3,
-             	       marker.getLabelTextAnchor(), 3.14 / 2, (float) coordinates.getX(), (float) coordinates.getY());
-
-            }
-            g2.setComposite(originalComposite);
-        }
-        // Interval marker
-        else if (marker instanceof IntervalMarker) {
-            IntervalMarker im = (IntervalMarker) marker;
-            double start = im.getStartValue();
-            double end = im.getEndValue();
-            Range range = domainAxis.getRange();
-            if (!(range.intersects(start, end))) {
-                return;
-            }
-
-            double start2d = domainAxis.valueToJava2D(start, dataArea,
-                    plot.getDomainAxisEdge());
-            double end2d = domainAxis.valueToJava2D(end, dataArea,
-                    plot.getDomainAxisEdge());
-            double low = Math.min(start2d, end2d);
-            double high = Math.max(start2d, end2d);
-
-            PlotOrientation orientation = plot.getOrientation();
-            Rectangle2D rect = null;
-            if (orientation == PlotOrientation.HORIZONTAL) {
-                // clip top and bottom bounds to data area
-                low = Math.max(low, dataArea.getMinY());
-                high = Math.min(high, dataArea.getMaxY());
-                rect = new Rectangle2D.Double(dataArea.getMinX(),
-                        low, dataArea.getWidth(),
-                        high - low);
-            }
-            else if (orientation == PlotOrientation.VERTICAL) {
-                // clip left and right bounds to data area
-                low = Math.max(low, dataArea.getMinX());
-                high = Math.min(high, dataArea.getMaxX());
-                rect = new Rectangle2D.Double(low,
-                        dataArea.getMinY(), high - low,
-                        dataArea.getHeight());
-            }
-
-            final Composite originalComposite = g2.getComposite();
-            g2.setComposite(AlphaComposite.getInstance(
-                    AlphaComposite.SRC_OVER, marker.getAlpha()));
-            Paint p = marker.getPaint();
-            if (p instanceof GradientPaint) {
-                GradientPaint gp = (GradientPaint) p;
-                GradientPaintTransformer t = im.getGradientPaintTransformer();
-                if (t != null) {
-                    gp = t.transform(gp, rect);
-                }
-                g2.setPaint(gp);
-            }
-            else {
-                g2.setPaint(p);
-            }
-            g2.fill(rect);
-
-            // now draw the outlines, if visible...
-            if (im.getOutlinePaint() != null && im.getOutlineStroke() != null) {
-                if (orientation == PlotOrientation.VERTICAL) {
-                    Line2D line = new Line2D.Double();
-                    double y0 = dataArea.getMinY();
-                    double y1 = dataArea.getMaxY();
-                    g2.setPaint(im.getOutlinePaint());
-                    g2.setStroke(im.getOutlineStroke());
-                    if (range.contains(start)) {
-                        line.setLine(start2d, y0, start2d, y1);
-                        g2.draw(line);
-                    }
-                    if (range.contains(end)) {
-                        line.setLine(end2d, y0, end2d, y1);
-                        g2.draw(line);
-                    }
-                }
-                else { // PlotOrientation.HORIZONTAL
-                    Line2D line = new Line2D.Double();
-                    double x0 = dataArea.getMinX();
-                    double x1 = dataArea.getMaxX();
-                    g2.setPaint(im.getOutlinePaint());
-                    g2.setStroke(im.getOutlineStroke());
-                    if (range.contains(start)) {
-                        line.setLine(x0, start2d, x1, start2d);
-                        g2.draw(line);
-                    }
-                    if (range.contains(end)) {
-                        line.setLine(x0, end2d, x1, end2d);
-                        g2.draw(line);
-                    }
-                }
-            }
-
-            String label = marker.getLabel();
-            RectangleAnchor anchor = marker.getLabelAnchor();
-            if (label != null) {
-                Font labelFont = marker.getLabelFont();
-                g2.setFont(labelFont);
-                g2.setPaint(marker.getLabelPaint());
-                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
-                        g2, orientation, dataArea, rect,
-                        marker.getLabelOffset(), marker.getLabelOffsetType(),
-                        anchor);
-
-                // Draw rotated marker labels rather than horizontal
-                TextUtilities.drawRotatedString(label, g2,
-             	       (float) coordinates.getX(), (float) coordinates.getY() - 3,
-             	       marker.getLabelTextAnchor(), 3.14 / 2, (float) coordinates.getX(), (float) coordinates.getY());
-            }
-            g2.setComposite(originalComposite);
-
-        }
-
-    }
-
-    
-    /**
-     * Returns <code>true</code> if the specified pass is the one for drawing the selected items that have been pushed to draw as last elements.
-     *
-     * @param pass  the pass.
-     *
-     * @return A boolean.
-     */
-    protected boolean isSelectedItemPass(int pass) {
-        return pass == 2;
-    }
-	
-    
-    @Override
-    public int getPassCount() {
-        return 3;
-    }
-
-    @Override
-    public void drawItem(Graphics2D g2, XYItemRendererState state, Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot, ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset, int series, int item, CrosshairState crosshairState, int pass) {
-    	
-    	isLinePass = isLinePass(pass);
-    	
-    	// Mouse over selected item or multiple selected items
-    	if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item))	{
-    		// First pass, push the selected item and skip the drawing
-    		if(this.isLinePass(pass))	{
-
- 			   // Push the mouse over item
- 			   if(this.multipleItemsSelector.isMouseOverItem(series, item))	{
- 				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, true);
- 			   }
- 			   // FIXME: Push the entire mouse over series to all its items as last (ne fonctionne pas car les autres séries sont déjà tracées à cet instant,
- 			   // il faudrait pouvoir swapper avec une autre series ou sinon modifier les Plot.render() pour swapper complètement le tracé de series) 
-// 			   else if(this.multipleItemsSelector.isMouseOverSeries(series))	{
-// 				  this.multipleItemsSelector.pushItemToDrawAsLast(series, item, false);
-// 			   }
- 			   // Multiple selection
- 			   else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
- 				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, false);
- 			   }
- 			   return;
- 		   }
- 		   // Second pass, skip the drawing
- 		   else if(this.isItemPass(pass))	{
- 			   return;
- 		   }
- 		   // Third pass, pop the selected item and draw all the previously skipped passes
- 		   else if(this.isSelectedItemPass(pass))	{
-
-				  EntityCollection entities = null;
-		            if(info != null) {
-		            	entities = info.getOwner().getEntityCollection();
-		            }
-
- 			   
- 			   item = this.multipleItemsSelector.popItemToDrawAsLast(series);
- 			   // draw all skipped passes of the selected item
- 			   for(int i = 0; i < this.getPassCount() - 1; i++) {
- 				   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, i);
- 			   }
- 			   
-			   // force shape rendering because the XYStepRenderer doesn't manage it by default
-			   drawSecondaryPass(g2, plot, dataset, pass, series, item, domainAxis, dataArea, rangeAxis, crosshairState, entities);
-
-	           	// Multiple selection highlighting
-	        	if(this.multipleItemsSelector.isSelectedItem(series, item))	{
-	            	this.drawSelectedItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
-	            }
-
-
- 			   // FIXME: draw all passes of all previously skipped selected items
-// 			   for(series = 0; series < ((MultipleItemSelector)this.itemSelector).getSelectedSeriesCount(); series++) {
-// 				   int[] selectedItems = ((MultipleItemSelector)this.itemSelector).getSelectedItems(series);
-// 				   for(int i = 0; i < selectedItems.length; i++) {
-// 			        	for(pass = 0; pass < this.getPassCount() - 1; pass++) {
-// 			        		System.out.println("ItemSelectionXYLineAndShapeRenderer.drawItem(): draw skipped pass " + pass + " for selected item " + item);
-// 			        		super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, selectedItems[i], crosshairState, pass);
-// 			        	}
-// 				   }
-// 			   }
- 			   
- 			   
- 			   
- 		   }
- 			
- 	   }
- 	   // Normal item
- 	   else 	{
- 		   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
- 		   
- 		  // force shape rendering because the XYStepRenderer doesn't manage it by default
-//  		  EntityCollection entities = null;
-//           if(info != null) {
-//           	entities = info.getOwner().getEntityCollection();
-//           }
-//
-//           drawSecondaryPass(g2, plot, dataset, pass, series, item, domainAxis, dataArea, rangeAxis, crosshairState, entities);
- 	   }
-
-    }
-
-
-
-    /**
-     * Draws the item using selected item rendering.
-     * @param g2
-     * @param state
-     * @param dataArea
-     * @param info
-     * @param plot
-     * @param domainAxis
-     * @param rangeAxis
-     * @param dataset
-     * @param series
-     * @param item
-     * @param crosshairState
-     * @param pass
-     */
-	public void drawSelectedItem(Graphics2D g2, XYItemRendererState state, Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot, ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset, int series, int item, CrosshairState crosshairState, int pass)	{
-	      // get the selected item screen coords
-      double x1 = dataset.getXValue(series, item);
-      double y1 = dataset.getYValue(series, item);
-      if (Double.isNaN(y1) || Double.isNaN(x1)) {
-          return;
-      }
-      RectangleEdge xAxisLocation = plot.getDomainAxisEdge();
-      RectangleEdge yAxisLocation = plot.getRangeAxisEdge();
-      int shapeScreenX = (int) domainAxis.valueToJava2D(x1, dataArea, xAxisLocation);
-      int shapeScreenY = (int) rangeAxis.valueToJava2D(y1, dataArea, yAxisLocation);
-
-      // Construct and draw the label
-      String label = getSelectedItemLabelFromDataset(dataset, series, item);
-      if(label != null)	{
-    	  
-    	  int labelScreenX = shapeScreenX - 50;
-    	  int labelScreenY = shapeScreenY - 60;
-
-    	  
-	      g2.setPaint(getItemPaint(series, item));
-	      g2.setStroke(new BasicStroke(1));
-
-	      
-	      Font font = getBaseItemLabelFont();
-	      
-	      // compute the multi line label bounds
-	      String[] lines = label.split("\n");
-	      double width = 0;
-	      double height = 0;
-	      for(int i = 0; i < lines.length; i++) {
-	    	  if(i == 0)	{
-	    		  font = getBaseItemLabelFont().deriveFont(Font.BOLD);
-	    	  }
-	    	  else	{
-	    	      font = getBaseItemLabelFont();
-	    	  }
-	    	  
-	    	  Rectangle2D lineBounds = font.getStringBounds(lines[i], g2.getFontRenderContext());
-	    	  if(lineBounds.getWidth() > width)	{
-	    		  width = lineBounds.getWidth();
-	    	  }
-	    	  height += lineBounds.getHeight(); 
-	      }
-	      
-	      labelScreenX -= width / 2;
-
-	      
-	      // label background
-	      int margin = 10;
-	      width += margin;
-	      height += margin;
-	      Shape labelBackground = new RoundRectangle2D.Double(labelScreenX -margin / 2, labelScreenY -height + 10, width, height, 5, 5);
-		
-	      
-	      // line between the shape and the label background
-	      g2.drawLine(shapeScreenX, shapeScreenY, (int) (labelScreenX + width / 2), (int) (labelScreenY + height / 2 - (margin * 2)));
-
-	      // background
-	      int opacity = 180;
-	      if(this.multipleItemsSelector.isMouseOverItem(series, item))	{
-	    	  opacity = 255;
-	      }
-	      g2.setPaint(new Color(250, 250, 250, opacity));
-	      g2.fill(labelBackground);
-
-	      // background outline
-	      g2.setPaint(getItemPaint(series, item));
-	      g2.draw(labelBackground);
-
-	      labelScreenY -= height - margin;
-	      
-	      
-	      // label
-	      for(int i = 0; i < lines.length; i++) {
-	    	  if(i == 0)	{
-	    		  font = getBaseItemLabelFont().deriveFont(Font.BOLD);
-	    	  }
-	    	  else	{
-	    	      font = getBaseItemLabelFont();
-	    	  }
-		      g2.setFont(font);
-	    	  g2.drawString(lines[i], labelScreenX, labelScreenY += g2.getFontMetrics().getHeight());
-	      }
-  
-      }
-	}
-	
-	/**
-	 * Constructs the label for the specified selected item using the dataset.
-	 * @param dataset
-	 * @param series
-	 * @param item
-	 * @return
-	 */
-	public String getSelectedItemLabelFromDataset(XYDataset dataset, int series, int item)	{
-		return "test label";
-	}
-
-	@Override
-	public void init() {
-		// TODO Auto-generated method stub
-		
-	}
-}
+package org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.renderers;
+
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Font;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.Paint;
+import java.awt.Shape;
+import java.awt.geom.Line2D;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+
+import org.jfree.chart.axis.ValueAxis;
+import org.jfree.chart.entity.EntityCollection;
+import org.jfree.chart.labels.XYToolTipGenerator;
+import org.jfree.chart.plot.CrosshairState;
+import org.jfree.chart.plot.IntervalMarker;
+import org.jfree.chart.plot.Marker;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.PlotRenderingInfo;
+import org.jfree.chart.plot.ValueMarker;
+import org.jfree.chart.plot.XYPlot;
+import org.jfree.chart.renderer.xy.XYItemRendererState;
+import org.jfree.chart.renderer.xy.XYStepRenderer;
+import org.jfree.data.Range;
+import org.jfree.data.xy.XYDataset;
+import org.jfree.data.xy.XYSeriesCollection;
+import org.jfree.text.TextUtilities;
+import org.jfree.ui.GradientPaintTransformer;
+import org.jfree.ui.LengthAdjustmentType;
+import org.jfree.ui.RectangleAnchor;
+import org.jfree.ui.RectangleEdge;
+import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
+import org.txm.chartsengine.jfreechart.core.renderers.MouseOverItemSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.MultipleItemsSelector;
+import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.RendererUtils;
+import org.txm.chartsengine.jfreechart.core.themes.highcharts.defaulttheme.swing.CustomHTMLToolTip;
+
+public class ItemSelectionXYStepRenderer extends XYStepRenderer implements IRendererWithItemSelection {
+
+
+
+	/**
+	 * Chart item selector.
+	 */
+	protected MultipleItemsSelector multipleItemsSelector;
+
+
+
+	/**
+	 * State value to keep track of the type of rendering pass and skip some selection rendering modifications during the line pass.
+	 */
+	protected boolean isLinePass = true;
+	
+	
+	/**
+	 * Label that will be drawn for the selected item in drawing pass.
+	 */
+	protected String tmpSelectedItemLabel = null;
+	
+	/**
+	 *
+	 */
+	public ItemSelectionXYStepRenderer() {
+		this(true, false);
+	}
+
+	/**
+	 *
+	 * @param linesVisible
+	 * @param shapesVisible
+	 */
+	public ItemSelectionXYStepRenderer(boolean linesVisible, boolean shapesVisible) {
+		this.setBaseLinesVisible(linesVisible);
+		this.setBaseShapesVisible(shapesVisible);
+		this.setShapesVisible(true);
+
+		// Multiple items selector
+		this.multipleItemsSelector = new MultipleItemsSelector(this);
+
+		// Labels
+		this.initItemLabelGenerator();
+		// Tooltips
+		this.initToolTipGenerator(this);
+	}
+
+
+	/**
+	 * Initializes the item label generator.
+	 */
+	public void initItemLabelGenerator()	{
+		// TODO
+	}
+
+	/**
+	 * Initializes the tool tip generator.
+	 */
+	public void initToolTipGenerator(final IRendererWithItemSelection renderer)	{
+		this.setBaseToolTipGenerator(new XYToolTipGenerator() {
+
+			@Override
+			public String generateToolTip(XYDataset dataset, int series, int item) {
+
+				// Hexadecimal color
+				Color color = (Color) getSeriesPaint(series);
+				String hex = "#" + Integer.toHexString(color.getRGB()).substring(2);
+				XYSeriesCollection xyDataset = (XYSeriesCollection) dataset;
+
+				return CustomHTMLToolTip.getDefaultHTMLBody(renderer, hex) + "<p><span style=\"color: " + hex + ";\">" + xyDataset.getSeriesKey(series)
+						+ "</span></p><p><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getY(item)) + ChartsEngineCoreMessages.EMPTY
+						+ " </b><b>" + RendererUtils.valuesNumberFormat.format(xyDataset.getSeries(series).getX(item)) + "</b></p></body><html>";
+			}
+		});
+	}
+
+
+	@Override
+	public Paint getItemOutlinePaint(int series, int item) {
+		// Trace the shape outline
+		if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item)) {
+			return super.getItemOutlinePaint(series, item);
+		}
+		// Do not trace not selected item outline
+		return null;
+	}
+
+
+	@Override
+	public Font getItemLabelFont(int series, int item) {
+
+		Font font = super.getItemLabelFont(series, item);
+
+		// Change item label font size and style
+//		if(this.itemSelector.isSelectedItem(series, item)) {
+			font = font.deriveFont(Font.BOLD, font.getSize());
+	//	}
+		return font;
+	}
+
+
+	/**
+	 * @return the itemSelector
+	 */
+	public MouseOverItemSelector getItemsSelector() {
+		return multipleItemsSelector;
+	}
+
+
+
+	@Override
+	public void updateDatasetForDrawingSelectedItemAsLast() {
+		// FIXME: put the mouse over item series at last in the dataset
+//		this.getPlot().getDatasetRenderingOrder().
+		
+//		int index = this.multipleItemsSelector.getMouseOverSeries();
+//		if(index != -1)	{
+//			this.getPlot().getDataset().setDatasetRenderingOrder();
+//		}
+		
+		// create a new dataset with the mouse over series at last position
+//		if(this.multipleItemsSelector.getMouseOverSeries() != -1)	{
+//			System.out.println("ItemSelectionXYStepRenderer.updateDatasetForDrawingSelectedItemAsLast() update dataset order");
+//			XYSeriesCollection dataset = (XYSeriesCollection) this.getPlot().getDataset();
+//			XYSeriesCollection newDataset = new XYSeriesCollection();
+//			for(int i = 0; i < dataset.getSeriesCount(); i++) {
+//				if(!this.multipleItemsSelector.isMouseOverSeries(i))	{
+//					newDataset.addSeries(dataset.getSeries(i));
+//				}
+//			}
+//			newDataset.addSeries(dataset.getSeries(this.multipleItemsSelector.getMouseOverSeries()));
+//			this.getPlot().setDataset(newDataset);
+//			
+//		}
+		
+		// FIXME: temporary ugly workaround, set the rendering order according to the mouse over series and the half of the series count
+//		if(this.multipleItemsSelector.getMouseOverSeries() <= this.getPlot().getDataset().getSeriesCount() / 2)	{
+//			this.getPlot().setSeriesRenderingOrder(SeriesRenderingOrder.FORWARD);
+//		}
+//		else	{
+//			this.getPlot().setSeriesRenderingOrder(SeriesRenderingOrder.REVERSE);
+//		}
+	}
+
+
+    /**
+     * Draws a vertical line on the chart to represent a 'range marker'.
+     *
+     * @param g2  the graphics device.
+     * @param plot  the plot.
+     * @param domainAxis  the domain axis.
+     * @param marker  the marker line.
+     * @param dataArea  the axis data area.
+     */
+    @Override
+    public void drawDomainMarker(Graphics2D g2, XYPlot plot,
+            ValueAxis domainAxis, Marker marker, Rectangle2D dataArea) {
+
+    	// Value marker
+        if (marker instanceof ValueMarker) {
+            ValueMarker vm = (ValueMarker) marker;
+            double value = vm.getValue();
+            Range range = domainAxis.getRange();
+            if (!range.contains(value)) {
+                return;
+            }
+
+            double v = domainAxis.valueToJava2D(value, dataArea,
+                    plot.getDomainAxisEdge());
+
+            PlotOrientation orientation = plot.getOrientation();
+            Line2D line = null;
+            if (orientation == PlotOrientation.HORIZONTAL) {
+                line = new Line2D.Double(dataArea.getMinX(), v,
+                        dataArea.getMaxX(), v);
+            }
+            else if (orientation == PlotOrientation.VERTICAL) {
+                line = new Line2D.Double(v, dataArea.getMinY(), v,
+                        dataArea.getMaxY());
+            } else {
+                throw new IllegalStateException();
+            }
+
+            final Composite originalComposite = g2.getComposite();
+            g2.setComposite(AlphaComposite.getInstance(
+                    AlphaComposite.SRC_OVER, marker.getAlpha()));
+            g2.setPaint(marker.getPaint());
+            g2.setStroke(marker.getStroke());
+            g2.draw(line);
+
+            String label = marker.getLabel();
+            RectangleAnchor anchor = marker.getLabelAnchor();
+            if (label != null) {
+                Font labelFont = marker.getLabelFont();
+                g2.setFont(labelFont);
+                g2.setPaint(marker.getLabelPaint());
+                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
+                        g2, orientation, dataArea, line.getBounds2D(),
+                        marker.getLabelOffset(),
+                        LengthAdjustmentType.EXPAND, anchor);
+
+                // Draw rotated marker labels rather than horizontal
+                TextUtilities.drawRotatedString(label, g2,
+             	       (float) coordinates.getX(), (float) coordinates.getY() - 3,
+             	       marker.getLabelTextAnchor(), 3.14 / 2, (float) coordinates.getX(), (float) coordinates.getY());
+
+            }
+            g2.setComposite(originalComposite);
+        }
+        // Interval marker
+        else if (marker instanceof IntervalMarker) {
+            IntervalMarker im = (IntervalMarker) marker;
+            double start = im.getStartValue();
+            double end = im.getEndValue();
+            Range range = domainAxis.getRange();
+            if (!(range.intersects(start, end))) {
+                return;
+            }
+
+            double start2d = domainAxis.valueToJava2D(start, dataArea,
+                    plot.getDomainAxisEdge());
+            double end2d = domainAxis.valueToJava2D(end, dataArea,
+                    plot.getDomainAxisEdge());
+            double low = Math.min(start2d, end2d);
+            double high = Math.max(start2d, end2d);
+
+            PlotOrientation orientation = plot.getOrientation();
+            Rectangle2D rect = null;
+            if (orientation == PlotOrientation.HORIZONTAL) {
+                // clip top and bottom bounds to data area
+                low = Math.max(low, dataArea.getMinY());
+                high = Math.min(high, dataArea.getMaxY());
+                rect = new Rectangle2D.Double(dataArea.getMinX(),
+                        low, dataArea.getWidth(),
+                        high - low);
+            }
+            else if (orientation == PlotOrientation.VERTICAL) {
+                // clip left and right bounds to data area
+                low = Math.max(low, dataArea.getMinX());
+                high = Math.min(high, dataArea.getMaxX());
+                rect = new Rectangle2D.Double(low,
+                        dataArea.getMinY(), high - low,
+                        dataArea.getHeight());
+            }
+
+            final Composite originalComposite = g2.getComposite();
+            g2.setComposite(AlphaComposite.getInstance(
+                    AlphaComposite.SRC_OVER, marker.getAlpha()));
+            Paint p = marker.getPaint();
+            if (p instanceof GradientPaint) {
+                GradientPaint gp = (GradientPaint) p;
+                GradientPaintTransformer t = im.getGradientPaintTransformer();
+                if (t != null) {
+                    gp = t.transform(gp, rect);
+                }
+                g2.setPaint(gp);
+            }
+            else {
+                g2.setPaint(p);
+            }
+            g2.fill(rect);
+
+            // now draw the outlines, if visible...
+            if (im.getOutlinePaint() != null && im.getOutlineStroke() != null) {
+                if (orientation == PlotOrientation.VERTICAL) {
+                    Line2D line = new Line2D.Double();
+                    double y0 = dataArea.getMinY();
+                    double y1 = dataArea.getMaxY();
+                    g2.setPaint(im.getOutlinePaint());
+                    g2.setStroke(im.getOutlineStroke());
+                    if (range.contains(start)) {
+                        line.setLine(start2d, y0, start2d, y1);
+                        g2.draw(line);
+                    }
+                    if (range.contains(end)) {
+                        line.setLine(end2d, y0, end2d, y1);
+                        g2.draw(line);
+                    }
+                }
+                else { // PlotOrientation.HORIZONTAL
+                    Line2D line = new Line2D.Double();
+                    double x0 = dataArea.getMinX();
+                    double x1 = dataArea.getMaxX();
+                    g2.setPaint(im.getOutlinePaint());
+                    g2.setStroke(im.getOutlineStroke());
+                    if (range.contains(start)) {
+                        line.setLine(x0, start2d, x1, start2d);
+                        g2.draw(line);
+                    }
+                    if (range.contains(end)) {
+                        line.setLine(x0, end2d, x1, end2d);
+                        g2.draw(line);
+                    }
+                }
+            }
+
+            String label = marker.getLabel();
+            RectangleAnchor anchor = marker.getLabelAnchor();
+            if (label != null) {
+                Font labelFont = marker.getLabelFont();
+                g2.setFont(labelFont);
+                g2.setPaint(marker.getLabelPaint());
+                Point2D coordinates = calculateDomainMarkerTextAnchorPoint(
+                        g2, orientation, dataArea, rect,
+                        marker.getLabelOffset(), marker.getLabelOffsetType(),
+                        anchor);
+
+                // Draw rotated marker labels rather than horizontal
+                TextUtilities.drawRotatedString(label, g2,
+             	       (float) coordinates.getX(), (float) coordinates.getY() - 3,
+             	       marker.getLabelTextAnchor(), 3.14 / 2, (float) coordinates.getX(), (float) coordinates.getY());
+            }
+            g2.setComposite(originalComposite);
+
+        }
+
+    }
+
+    
+    /**
+     * Returns <code>true</code> if the specified pass is the one for drawing the selected items that have been pushed to draw as last elements.
+     *
+     * @param pass  the pass.
+     *
+     * @return A boolean.
+     */
+    protected boolean isSelectedItemPass(int pass) {
+        return pass == 2;
+    }
+	
+    
+    @Override
+    public int getPassCount() {
+        return 3;
+    }
+
+    @Override
+    public void drawItem(Graphics2D g2, XYItemRendererState state, Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot, ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset, int series, int item, CrosshairState crosshairState, int pass) {
+    	
+    	isLinePass = isLinePass(pass);
+    	
+    	// Mouse over selected item or multiple selected items
+    	if(this.multipleItemsSelector.isMouseOverItem(series, item) || this.multipleItemsSelector.isSelectedItem(series, item))	{
+    		// First pass, push the selected item and skip the drawing
+    		if(this.isLinePass(pass))	{
+
+ 			   // Push the mouse over item
+ 			   if(this.multipleItemsSelector.isMouseOverItem(series, item))	{
+ 				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, true);
+ 			   }
+ 			   // FIXME: Push the entire mouse over series to all its items as last (ne fonctionne pas car les autres séries sont déjà tracées à cet instant,
+ 			   // il faudrait pouvoir swapper avec une autre series ou sinon modifier les Plot.render() pour swapper complètement le tracé de series) 
+// 			   else if(this.multipleItemsSelector.isMouseOverSeries(series))	{
+// 				  this.multipleItemsSelector.pushItemToDrawAsLast(series, item, false);
+// 			   }
+ 			   // Multiple selection
+ 			   else if(this.multipleItemsSelector.isSelectedItem(series, item))	{
+ 				   this.multipleItemsSelector.pushItemToDrawAsLast(series, item, false);
+ 			   }
+ 			   return;
+ 		   }
+ 		   // Second pass, skip the drawing
+ 		   else if(this.isItemPass(pass))	{
+ 			   return;
+ 		   }
+ 		   // Third pass, pop the selected item and draw all the previously skipped passes
+ 		   else if(this.isSelectedItemPass(pass))	{
+
+				  EntityCollection entities = null;
+		            if(info != null) {
+		            	entities = info.getOwner().getEntityCollection();
+		            }
+
+ 			   
+ 			   item = this.multipleItemsSelector.popItemToDrawAsLast(series);
+ 			   // draw all skipped passes of the selected item
+ 			   for(int i = 0; i < this.getPassCount() - 1; i++) {
+ 				   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, i);
+ 			   }
+ 			   
+			   // force shape rendering because the XYStepRenderer doesn't manage it by default
+			   drawSecondaryPass(g2, plot, dataset, pass, series, item, domainAxis, dataArea, rangeAxis, crosshairState, entities);
+
+	           	// Multiple selection highlighting
+	        	if(this.multipleItemsSelector.isSelectedItem(series, item))	{
+	            	this.drawSelectedItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
+	            }
+
+
+ 			   // FIXME: draw all passes of all previously skipped selected items
+// 			   for(series = 0; series < ((MultipleItemSelector)this.itemSelector).getSelectedSeriesCount(); series++) {
+// 				   int[] selectedItems = ((MultipleItemSelector)this.itemSelector).getSelectedItems(series);
+// 				   for(int i = 0; i < selectedItems.length; i++) {
+// 			        	for(pass = 0; pass < this.getPassCount() - 1; pass++) {
+// 			        		System.out.println("ItemSelectionXYLineAndShapeRenderer.drawItem(): draw skipped pass " + pass + " for selected item " + item);
+// 			        		super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, selectedItems[i], crosshairState, pass);
+// 			        	}
+// 				   }
+// 			   }
+ 			   
+ 			   
+ 			   
+ 		   }
+ 			
+ 	   }
+ 	   // Normal item
+ 	   else 	{
+ 		   super.drawItem(g2, state, dataArea, info, plot, domainAxis, rangeAxis, dataset, series, item, crosshairState, pass);
+ 		   
+ 		  // force shape rendering because the XYStepRenderer doesn't manage it by default
+//  		  EntityCollection entities = null;
+//           if(info != null) {
+//           	entities = info.getOwner().getEntityCollection();
+//           }
+//
+//           drawSecondaryPass(g2, plot, dataset, pass, series, item, domainAxis, dataArea, rangeAxis, crosshairState, entities);
+ 	   }
+
+    }
+
+
+
+    /**
+     * Draws the item using selected item rendering.
+     * @param g2
+     * @param state
+     * @param dataArea
+     * @param info
+     * @param plot
+     * @param domainAxis
+     * @param rangeAxis
+     * @param dataset
+     * @param series
+     * @param item
+     * @param crosshairState
+     * @param pass
+     */
+	public void drawSelectedItem(Graphics2D g2, XYItemRendererState state, Rectangle2D dataArea, PlotRenderingInfo info, XYPlot plot, ValueAxis domainAxis, ValueAxis rangeAxis, XYDataset dataset, int series, int item, CrosshairState crosshairState, int pass)	{
+	      // get the selected item screen coords
+      double x1 = dataset.getXValue(series, item);
+      double y1 = dataset.getYValue(series, item);
+      if (Double.isNaN(y1) || Double.isNaN(x1)) {
+          return;
+      }
+      RectangleEdge xAxisLocation = plot.getDomainAxisEdge();
+      RectangleEdge yAxisLocation = plot.getRangeAxisEdge();
+      int shapeScreenX = (int) domainAxis.valueToJava2D(x1, dataArea, xAxisLocation);
+      int shapeScreenY = (int) rangeAxis.valueToJava2D(y1, dataArea, yAxisLocation);
+
+      // Construct and draw the label
+      String label = getSelectedItemLabelFromDataset(dataset, series, item);
+      if(label != null)	{
+    	  
+    	  int labelScreenX = shapeScreenX - 50;
+    	  int labelScreenY = shapeScreenY - 60;
+
+    	  
+	      g2.setPaint(getItemPaint(series, item));
+	      g2.setStroke(new BasicStroke(1));
+
+	      
+	      Font font = getBaseItemLabelFont();
+	      
+	      // compute the multi line label bounds
+	      String[] lines = label.split("\n");
+	      double width = 0;
+	      double height = 0;
+	      for(int i = 0; i < lines.length; i++) {
+	    	  if(i == 0)	{
+	    		  font = getBaseItemLabelFont().deriveFont(Font.BOLD);
+	    	  }
+	    	  else	{
+	    	      font = getBaseItemLabelFont();
+	    	  }
+	    	  
+	    	  Rectangle2D lineBounds = font.getStringBounds(lines[i], g2.getFontRenderContext());
+	    	  if(lineBounds.getWidth() > width)	{
+	    		  width = lineBounds.getWidth();
+	    	  }
+	    	  height += lineBounds.getHeight(); 
+	      }
+	      
+	      labelScreenX -= width / 2;
+
+	      
+	      // label background
+	      int margin = 10;
+	      width += margin;
+	      height += margin;
+	      Shape labelBackground = new RoundRectangle2D.Double(labelScreenX -margin / 2, labelScreenY -height + 10, width, height, 5, 5);
+		
+	      
+	      // line between the shape and the label background
+	      g2.drawLine(shapeScreenX, shapeScreenY, (int) (labelScreenX + width / 2), (int) (labelScreenY + height / 2 - (margin * 2)));
+
+	      // background
+	      int opacity = 180;
+	      if(this.multipleItemsSelector.isMouseOverItem(series, item))	{
+	    	  opacity = 255;
+	      }
+	      g2.setPaint(new Color(250, 250, 250, opacity));
+	      g2.fill(labelBackground);
+
+	      // background outline
+	      g2.setPaint(getItemPaint(series, item));
+	      g2.draw(labelBackground);
+
+	      labelScreenY -= height - margin;
+	      
+	      
+	      // label
+	      for(int i = 0; i < lines.length; i++) {
+	    	  if(i == 0)	{
+	    		  font = getBaseItemLabelFont().deriveFont(Font.BOLD);
+	    	  }
+	    	  else	{
+	    	      font = getBaseItemLabelFont();
+	    	  }
+		      g2.setFont(font);
+	    	  g2.drawString(lines[i], labelScreenX, labelScreenY += g2.getFontMetrics().getHeight());
+	      }
+  
+      }
+	}
+	
+	/**
+	 * Constructs the label for the specified selected item using the dataset.
+	 * @param dataset
+	 * @param series
+	 * @param item
+	 * @return
+	 */
+	public String getSelectedItemLabelFromDataset(XYDataset dataset, int series, int item)	{
+		return "test label";
+	}
+
+	@Override
+	public void init() {
+		// TODO Auto-generated method stub
+		
+	}
+}
\ No newline at end of file
Index: tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java
===================================================================
--- tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java	(revision 1334)
+++ tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java	(revision 1335)
@@ -229,7 +229,7 @@
 			String[] split = line.split("=", 2); //$NON-NLS-1$
 			if (split.length == 2) {
 				if (hasLine(split[0])) {
-					System.out.println(TXMCoreMessages.QueryIndex_2+line);
+					System.out.println(TXMCoreMessages.warningDDotDuplicateQueryEntryDDot+line);
 				} else {
 					QueryResult result = corpus.query(new CQLQuery(split[1]), "Q"+nquery++, false); //$NON-NLS-1$
 					int[] starts = result.getStarts();
@@ -338,7 +338,7 @@
 		try {
 			toTxt(outfile, 0, lines.size(), encoding, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+			System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 			return false;
 		}
 		return true;
@@ -721,4 +721,4 @@
 		return this.getClass().getSimpleName();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java
===================================================================
--- tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java	(revision 1334)
+++ tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java	(revision 1335)
@@ -155,10 +155,10 @@
 			String[] split = line.split("=", 2); //$NON-NLS-1$
 			if (split.length == 2) {
 				if (hasLine(split[0])) {
-					System.out.println(TXMCoreMessages.QueryIndex_2+line);
+					System.out.println(TXMCoreMessages.warningDDotDuplicateQueryEntryDDot+line);
 				} else {
 					if (addLine(split[0], new CQLQuery(split[1])) == null) {
-						System.out.println(TXMCoreMessages.QueryIndex_3+line);
+						System.out.println(TXMCoreMessages.warningDDotQueryFailedDDot+line);
 					}
 					monitor.worked(1);
 				}
@@ -179,7 +179,7 @@
 		try {
 			toTxt(outfile, 0, lines.size(), encoding, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(IndexCoreMessages.Index_7 + Log.toString(e));
+			System.err.println(IndexCoreMessages.failedToExportLexiconDDot + Log.toString(e));
 			return false;
 		}
 		return true;
@@ -422,4 +422,4 @@
 		return this.getClass().getSimpleName();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages.properties
===================================================================
--- tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages.properties	(revision 1335)
@@ -1,11 +1,10 @@
-
-RESULT_TYPE = Word cloud
-
-error_couldNotInstallRPackage     = Could not install the {0} package.
-error_rPackagesInstallationFailed = The necessary R packages have not been installed properly, it is not possible to complete the installation of the WordCloud command.\nSee instructions at https://groupes.renater.fr/wiki/txm-users/public/extensions#wordcloud 
-
-info_aborting               = Aborting word cloud computing.
-info_installingRPackage     = Installing {0} R package...
-info_loadingRPackage        = Loading package:
-info_openingWordCloudResult = Opening word cloud result.
-info_rPackagesLoaded        = R packages loaded. Now running WordCloud.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_couldNotInstallRPackage=Could not install the {0} package.
+error_rPackagesInstallationFailed=The necessary R packages have not been installed properly, it is not possible to complete the installation of the WordCloud command.\nSee instructions at https\://groupes.renater.fr/wiki/txm-users/public/extensions\#wordcloud 
+info_aborting=Aborting word cloud computing.
+info_installingRPackage=Installing {0} R package...
+info_loadingRPackage=Loading package\:
+info_openingWordCloudResult=Opening word cloud result.
+info_rPackagesLoaded=R packages loaded. Now running WordCloud.
+RESULT_TYPE=Word cloud
Index: tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.wordcloud.core/src/org/txm/wordcloud/core/messages/messages_fr.properties	(revision 1335)
@@ -1,11 +1,10 @@
-
-RESULT_TYPE = Nuage de mots
-
-error_couldNotInstallRPackage     = Le package R {0} n'a pas pu être installé. Raison : {1}. 
-error_rPackagesInstallationFailed = Les packages nécessaires au fonctionnement de la fonctionnalité n'ont pas pu être installés. Voir les instructions pour installation manuelle à l'adresse https://groupes.renater.fr/wiki/txm-users/public/extensions#wordcloud
-
-info_aborting               = Abandon du calcul du nuage de mots.
-info_installingRPackage     = Installation du package R {0}...
-info_loadingRPackage        = Chargement du package : 
-info_openingWordCloudResult = Ouverture du résultat.
-info_rPackagesLoaded        = Les packages R ont été chargés. Lancement du calcul.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_couldNotInstallRPackage=Le package R {0} n'a pas pu être installé. Raison \: {1}. 
+error_rPackagesInstallationFailed=Les packages nécessaires au fonctionnement de la fonctionnalité n'ont pas pu être installés. Voir les instructions pour installation manuelle à l'adresse https\://groupes.renater.fr/wiki/txm-users/public/extensions\#wordcloud
+info_aborting=Abandon du calcul du nuage de mots.
+info_installingRPackage=Installation du package R {0}...
+info_loadingRPackage=Chargement du package \: 
+info_openingWordCloudResult=Ouverture du résultat.
+info_rPackagesLoaded=Les packages R ont été chargés. Lancement du calcul.
+RESULT_TYPE=Nuage de mots
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/PartitionIndexToLexicalTable.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/PartitionIndexToLexicalTable.java	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/handlers/PartitionIndexToLexicalTable.java	(revision 1335)
@@ -79,18 +79,18 @@
 //
 //		if (!voc.isComputedWithPartition()) {
 //			
-//			System.out.println(TXMUIMessages.IndexToLexicalTable_0);
-//			StatusLine.setMessage(TXMUIMessages.IndexToLexicalTable_0);
+//			System.out.println(TXMUIMessages.cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded);
+//			StatusLine.setMessage(TXMUIMessages.cannotCreateALexicalTableFromAnIndexCreatedWithACorpusMoreThanOneColumnIsNeeded);
 //			return false;
 //		}
 //
-//		System.out.println(LexicalTableUIMessages.ComputeLexicalTable_3);
+//		System.out.println(LexicalTableUIMessages.openingMargeConfigurationDialog);
 //		ArrayList<String> choices = new ArrayList<String>();
-//		choices.add(LexicalTableUIMessages.ComputeLexicalTable_16);
-//		choices.add(LexicalTableUIMessages.ComputeLexicalTable_12);
+//		choices.add(LexicalTableUIMessages.useAllOccurrences);
+//		choices.add(LexicalTableUIMessages.userIndexOccurrences);
 //		ListSelectionDialog dialog = new ListSelectionDialog(shell, 
 //				choices, new ArrayContentProvider(), new LabelProvider(), 
-//				LexicalTableUIMessages.ComputeLexicalTable_13);
+//				LexicalTableUIMessages.selectWhichMarginsYouWantToUse);
 //		
 //		int ret = dialog.open();
 //		//System.out.println("ret= "+ret);
@@ -122,4 +122,4 @@
 //		return true;
 //	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/preferences/IndexPreferencesPage.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/preferences/IndexPreferencesPage.java	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/preferences/IndexPreferencesPage.java	(revision 1335)
@@ -21,12 +21,12 @@
 	public void init(IWorkbench workbench) {
 		
 		this.setPreferenceStore(new TXMPreferenceStore(IndexPreferences.getInstance().getPreferencesNodeQualifier()));
-		this.setTitle(IndexUIMessages.preference_title);
+		this.setTitle(IndexUIMessages.index);
 		this.setImageDescriptor(IndexAdapterFactory.ICON);
 	}
 
 	@Override
 	protected void createFieldEditors() {
-		this.addField(new IntegerFieldEditor(TXMPreferences.N_LINES_PER_PAGE, IndexUIMessages.preference_number_of_lines_per_page, this.getFieldEditorParent()));
+		this.addField(new IntegerFieldEditor(TXMPreferences.N_LINES_PER_PAGE, IndexUIMessages.numberOfLinesPerResultPage, this.getFieldEditorParent()));
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages.properties	(revision 1335)
@@ -1,31 +1,16 @@
-
-ComputeIndex_0 = Opening Index results
-
-IndexEditor_0  = Index: query is empty
-IndexEditor_1  = ** Failed to compute index
-IndexEditor_10 = CQP error:
-IndexEditor_17 = 
-IndexEditor_18 = 
-IndexEditor_2  = Index of <{0}> with property: {1} in the corpus: {2}
-IndexEditor_20 = Index of <{0}> with property: {1} in the partition: {2}
-IndexEditor_22 = Couldn't initialize Index table
-IndexEditor_25 = 
-IndexEditor_26 = 
-IndexEditor_27 = 
-IndexEditor_28 = 
-IndexEditor_29 = Opening the Index results
-IndexEditor_3  = 
-IndexEditor_31 = 
-IndexEditor_33 = Computing index
-IndexEditor_36 = 
-IndexEditor_37 = 
-IndexEditor_4  = 
-IndexEditor_5  = 
-IndexEditor_6  = 
-IndexEditor_7  = 
-IndexEditor_8  = Page size
-
-composite_infos = Infos
-
-preference_number_of_lines_per_page = Number of lines per result page
-preference_title                    = Index
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+computingIndex=Computing index
+couldntInitializeIndexTable=Couldn't initialize Index table
+cQPErrorDDot=CQP error\:
+failedToComputeIndex=** Failed to compute index
+index=Index
+indexDDotQueryIsEmpty=Index\: query is empty
+IndexEditor_17=
+indexOfInfP0SupWithPropertyDDotP1InTheCorpusDDotP2=Index of <{0}> with property\: {1} in the corpus\: {2}
+indexOfInfP0SupWithPropertyDDotP1InThePartitionDDotP2=Index of <{0}> with property\: {1} in the partition\: {2}
+infos=Infos
+numberOfLinesPerResultPage=Number of lines per result page
+openingIndexResults=Opening Index results
+openingTheIndexResults=Opening the Index results
+pageSize=Page size
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,26 +1,13 @@
-
-ComputeIndex_0 = Открытие Индекса
-
-IndexEditor_0  = Запрос пуст
-IndexEditor_1  = ** Не удалось вычислить индекс
-IndexEditor_10 = N/A_CQP error:
-IndexEditor_17 = 
-IndexEditor_18 = 
-IndexEditor_2  = Индекс <{0}> со свойством {1} в корпусе {2}
-IndexEditor_20 = Индекс <{0}> со свойством {1} в корпусе {2}
-IndexEditor_22 = Не удается инициализировать таблицу индекса
-IndexEditor_25 = 
-IndexEditor_26 = 
-IndexEditor_27 = 
-IndexEditor_28 = 
-IndexEditor_29 = Открытие таблицы индекса
-IndexEditor_3  = 
-IndexEditor_31 = 
-IndexEditor_33 = Расчет индекса
-IndexEditor_36 = 
-IndexEditor_37 = 
-IndexEditor_4  = 
-IndexEditor_5  = 
-IndexEditor_6  = 
-IndexEditor_7  = 
-IndexEditor_8  = Число результатов на странице: 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+computingIndex=Расчет индекса
+couldntInitializeIndexTable=Не удается инициализировать таблицу индекса
+cQPErrorDDot=N/A_CQP error\:
+failedToComputeIndex=** Не удалось вычислить индекс
+indexDDotQueryIsEmpty=Запрос пуст
+IndexEditor_17=
+indexOfInfP0SupWithPropertyDDotP1InTheCorpusDDotP2=Индекс <{0}> со свойством {1} в корпусе {2}
+indexOfInfP0SupWithPropertyDDotP1InThePartitionDDotP2=Индекс <{0}> со свойством {1} в корпусе {2}
+openingIndexResults=Открытие Индекса
+openingTheIndexResults=Открытие таблицы индекса
+pageSize=Число результатов на странице\: 
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,26 +1,13 @@
-
-ComputeIndex_0 = Ouverture de l'Index
-
-IndexEditor_0  = La requête est vide
-IndexEditor_1  = ** Échec du calcul de l'index
-IndexEditor_10 = Echec de la récupération de la dernière erreur CQP :  
-IndexEditor_17 = 
-IndexEditor_18 = 
-IndexEditor_2  = Index de <{0}> avec la propriété {1} dans le corpus {2}
-IndexEditor_20 = Index de <{0}> avec la propriété {1} dans la partition {2}
-IndexEditor_22 = Impossible d'initialiser le tableau d'index
-IndexEditor_25 = 
-IndexEditor_26 = 
-IndexEditor_27 = 
-IndexEditor_28 = 
-IndexEditor_29 = Ouverture du tableau d'index
-IndexEditor_3  = 
-IndexEditor_31 = 
-IndexEditor_33 = Calcul de l'index
-IndexEditor_36 = 
-IndexEditor_37 = 
-IndexEditor_4  = 
-IndexEditor_5  = 
-IndexEditor_6  = 
-IndexEditor_7  = 
-IndexEditor_8  = Résultats par page 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+computingIndex=Calcul de l'index
+couldntInitializeIndexTable=Impossible d'initialiser le tableau d'index
+cQPErrorDDot=Echec de la récupération de la dernière erreur CQP \:  
+failedToComputeIndex=** Échec du calcul de l'index
+indexDDotQueryIsEmpty=La requête est vide
+IndexEditor_17=
+indexOfInfP0SupWithPropertyDDotP1InTheCorpusDDotP2=Index de <{0}> avec la propriété {1} dans le corpus {2}
+indexOfInfP0SupWithPropertyDDotP1InThePartitionDDotP2=Index de <{0}> avec la propriété {1} dans la partition {2}
+openingIndexResults=Ouverture de l'Index
+openingTheIndexResults=Ouverture du tableau d'index
+pageSize=Résultats par page 
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/messages/IndexUIMessages.java	(revision 1335)
@@ -1,54 +1,41 @@
-package org.txm.index.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Index UI messages.
- * 
- * @author sjacquot
- *
- */
-public class IndexUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.index.rcp.messages.messages"; //$NON-NLS-1$
-
-	public static String composite_infos;
-	
-	public static String preference_number_of_lines_per_page;
-	public static String preference_title;
-	
-	public static String IndexEditor_0;
-	public static String IndexEditor_1;
-	public static String IndexEditor_10;
-	public static String IndexEditor_17;
-	public static String IndexEditor_18;
-	public static String IndexEditor_2;
-	public static String IndexEditor_20;
-	public static String IndexEditor_22;
-	public static String IndexEditor_25;
-	public static String IndexEditor_26;
-	public static String IndexEditor_27;
-	public static String IndexEditor_28;
-	public static String IndexEditor_29;
-	public static String IndexEditor_3;
-	public static String IndexEditor_31;
-	public static String IndexEditor_33;
-	public static String IndexEditor_36;
-	public static String IndexEditor_37;
-	public static String IndexEditor_4;
-	public static String IndexEditor_5;
-	public static String IndexEditor_6;
-	public static String IndexEditor_7;
-	public static String IndexEditor_8;
-	public static String ComputeIndex_0;
-
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexUIMessages.class);
-	}
-
-	private IndexUIMessages() {
-	}
-}
+package org.txm.index.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Index UI messages.
+ * 
+ * @author sjacquot
+ *
+ */
+public class IndexUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.index.rcp.messages.messages"; //$NON-NLS-1$
+
+	public static String infos; 
+	
+	public static String numberOfLinesPerResultPage; 
+	public static String index; 
+	
+	public static String indexDDotQueryIsEmpty; 
+	public static String failedToComputeIndex; 
+	public static String cQPErrorDDot; 
+	public static String IndexEditor_17;
+	public static String indexOfInfP0SupWithPropertyDDotP1InTheCorpusDDotP2; 
+	public static String indexOfInfP0SupWithPropertyDDotP1InThePartitionDDotP2; 
+	public static String couldntInitializeIndexTable; 
+	public static String openingTheIndexResults; 
+	public static String computingIndex; 
+	public static String pageSize; 
+	public static String openingIndexResults; 
+
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexUIMessages.class);
+	}
+
+	private IndexUIMessages() {
+	}
+}
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java	(revision 1335)
@@ -175,7 +175,7 @@
 //		paramArea.setLayout(new FormLayout());
 
 		// info&navigation panel
-		final GLComposite infosArea = this.getBottomToolbar().installGLComposite(IndexUIMessages.composite_infos, 1, false);
+		final GLComposite infosArea = this.getBottomToolbar().installGLComposite(IndexUIMessages.infos, 1, false);
 		infosArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		infosArea.getLayout().numColumns = 5; // nav panel + labels
 		
@@ -303,7 +303,7 @@
 		
 		
 		Label lNLigneppage = new Label(this.getExtendedParametersGroup(), SWT.NONE);
-		lNLigneppage.setText(IndexUIMessages.IndexEditor_8);
+		lNLigneppage.setText(IndexUIMessages.pageSize);
 
 		nLinesPerPageSpinner = new Spinner(this.getExtendedParametersGroup(), SWT.BORDER);
 		nLinesPerPageSpinner.setMinimum(0);
@@ -445,7 +445,7 @@
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(TXMUIMessages.SORT_COLUMN);
+				StatusLine.setMessage(TXMUIMessages.sortingColumn);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -460,7 +460,7 @@
 					}
 				}
 
-				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+				StatusLine.setMessage(TXMUIMessages.sortDone);
 				fillResultArea();
 			}
 
@@ -497,7 +497,7 @@
 						index.sortLines(SortMode.FREQUNIT, false);
 					}
 				}
-				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+				StatusLine.setMessage(TXMUIMessages.sortDone);
 				fillResultArea();
 			}
 
@@ -597,10 +597,10 @@
 		navigationArea.setNextEnabled(to < index.getV());
 		navigationArea.setLastEnabled(to < index.getV());
 
-		lFminInfo.setText(TXMCoreMessages.FMIN_2 + index.getFmin());
-		lFmaxInfo.setText(TXMCoreMessages.FMAX_2 + index.getFmax());
+		lFminInfo.setText(TXMCoreMessages.fmin + index.getFmin());
+		lFmaxInfo.setText(TXMCoreMessages.fmax + index.getFmax());
 		lTInfo.setText(TXMCoreMessages.common_t + index.getT());
-		lVInfo.setText(TXMCoreMessages.V + index.getV());
+		lVInfo.setText(TXMCoreMessages.v + index.getV());
 
 		lVInfo.getParent().layout();
 
@@ -630,7 +630,7 @@
 		if (!this.queryWidget.isDisposed()) {
 			this.queryWidget.setFocus();
 		}
-		StatusLine.setMessage(IndexUIMessages.IndexEditor_29);
+		StatusLine.setMessage(IndexUIMessages.openingTheIndexResults);
 	}
 
 	/**
@@ -654,4 +654,4 @@
 	public Query getQuery() {
 		return queryWidget.getQuery();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 1334)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 1335)
@@ -173,7 +173,7 @@
 		//extendedParametersComposite.setLayout(new FormLayout());
 
 		// info&navigation panel
-		final GLComposite infosArea = this.getBottomToolbar().installGLComposite(IndexUIMessages.composite_infos, 1, false);
+		final GLComposite infosArea = this.getBottomToolbar().installGLComposite(IndexUIMessages.infos, 1, false);
 		infosArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		infosArea.getLayout().numColumns = 5; // nav panel + labels
 		
@@ -237,7 +237,7 @@
 		
 		
 		Label lNLigneppage = new Label(this.getExtendedParametersGroup(), SWT.NONE);
-		lNLigneppage.setText(IndexUIMessages.IndexEditor_8);
+		lNLigneppage.setText(IndexUIMessages.pageSize);
 		
 		nLinesPerPageSpinner = new Spinner(this.getExtendedParametersGroup(), SWT.BORDER);
 		nLinesPerPageSpinner.setMinimum(0);
@@ -380,7 +380,7 @@
 		unitColumn.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				StatusLine.setMessage(TXMUIMessages.SORT_COLUMN);
+				StatusLine.setMessage(TXMUIMessages.sortingColumn);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -395,7 +395,7 @@
 					}
 				}
 
-				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+				StatusLine.setMessage(TXMUIMessages.sortDone);
 				fillResultArea();
 			}
 
@@ -424,7 +424,7 @@
 						index.sortLines(SortMode.FREQUNIT, false);
 					}
 				}
-				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+				StatusLine.setMessage(TXMUIMessages.sortDone);
 				fillResultArea();
 			}
 
@@ -507,10 +507,10 @@
 		navigationArea.setNextEnabled(to < index.getV());
 		navigationArea.setLastEnabled(to < index.getV());
 
-		lFminInfo.setText(TXMCoreMessages.FMIN_2 + index.getFmin());
-		lFmaxInfo.setText(TXMCoreMessages.FMAX_2 + index.getFmax());
+		lFminInfo.setText(TXMCoreMessages.fmin + index.getFmin());
+		lFmaxInfo.setText(TXMCoreMessages.fmax + index.getFmax());
 		lTInfo.setText(TXMCoreMessages.common_t + index.getT());
-		lVInfo.setText(TXMCoreMessages.V + index.getV());
+		lVInfo.setText(TXMCoreMessages.v + index.getV());
 
 		lVInfo.getParent().layout();
 
@@ -540,7 +540,7 @@
 		if (!this.queryWidget.isDisposed()) {
 			this.queryWidget.setFocus();
 		}
-		StatusLine.setMessage(IndexUIMessages.IndexEditor_29);
+		StatusLine.setMessage(IndexUIMessages.openingTheIndexResults);
 	}
 
 	/**
@@ -559,4 +559,4 @@
 	public Query getQuery() {
 		return queryWidget.getQuery();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreateSubCorpus.java	(revision 1335)
@@ -69,13 +69,13 @@
 		
 		selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
 		if (selection == null) {
-			System.out.println(TXMUIMessages.CreateSubCorpus_1+HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor());
+			System.out.println(TXMUIMessages.noSelectionForDDot+HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor());
 			return null;
 		}
 		Object firstElement = selection.getFirstElement();
 		
 		if (!(firstElement instanceof CQPCorpus)) {
-			System.out.println(TXMUIMessages.CreateSubCorpus_3+firstElement);
+			System.out.println(TXMUIMessages.selectionIsNotACorpusDDot+firstElement);
 			return null;
 		}
 		
@@ -86,23 +86,23 @@
 		int code = d.open();
 		if (code == Window.OK) {
 			JobHandler jobhandler = new JobHandler(NLS.bind(
-					TXMUIMessages.CreateSubCorpus_create, corpus.getName())) {
+					TXMUIMessages.creatingASubcorpusOnP0, corpus.getName())) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {		
 					this.runInit(monitor);
 					JobsTimer.start();
 					try {
-						monitor.beginTask(TXMUIMessages.CreateSubCorpus_begin, 100);
+						monitor.beginTask(TXMUIMessages.creatingASubcorpusInTheSearchEngine, 100);
 						final Subcorpus subcorpus;
 
 						if (d.isAdvancedSelected() || d.isAssistedSelected()) {
 							CQLQuery q = new CQLQuery(d.getQuery());
-							System.out.println(NLS.bind(TXMUIMessages.CreateSubcorpus_9,
+							System.out.println(NLS.bind(TXMUIMessages.computeSubCorpusOnP0QueryDDotP1,
 								corpus.getName(), q.getQueryString())); 
 							subcorpus = corpus.createSubcorpus(q, d.getName());
 						} 
 						else {
-							System.out.println(NLS.bind(TXMUIMessages.CreateSubcorpus_7,
+							System.out.println(NLS.bind(TXMUIMessages.computeSubCorpusOnP0StructsDDotP1AmpPropsP2DDotP3,
 							new Object[]{corpus.getName(), d.getStructuralUnit(),
 									d.getStructuralUnitProperty(), d.getValues()}));
 							
@@ -121,15 +121,15 @@
 						if(subcorpus == null)
 						{
 							monitor.done();
-							System.out.println(TXMUIMessages.CreateSubCorpus_0);
+							System.out.println(TXMUIMessages.errorDDotSubcorpusWasNotCreated);
 							return Status.CANCEL_STATUS;
 						}
 						
-						System.out.println(NLS.bind(TXMUIMessages.CreateSubcorpus_8
+						System.out.println(NLS.bind(TXMUIMessages.doneDDotP0Created
 								, subcorpus.getName()));
 						monitor.worked(50);
 
-						monitor.subTask(TXMUIMessages.RefreshingCorporaView);
+						monitor.subTask(TXMUIMessages.refreshingCorpora);
 						syncExec(new Runnable() {
 							@Override
 							public void run() {
@@ -147,9 +147,9 @@
 						Log.severe(e.toString());
 						
 						try {
-							System.out.println(TXMUIMessages.LastCQPError+CQPSearchEngine.getCqiClient().getLastCQPError());
+							System.out.println(TXMUIMessages.lastCQPErrorDDot+CQPSearchEngine.getCqiClient().getLastCQPError());
 						} catch (Exception e1) {
-							System.out.println(TXMUIMessages.CreateSubCorpus_2+e1);
+							System.out.println(TXMUIMessages.failedToGetLastCQPErrorDDot+e1);
 							org.txm.rcp.utils.Logger.printStackTrace(e1);
 						}
 					} finally {
@@ -164,4 +164,4 @@
 		return null;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreatePartition.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreatePartition.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/CreatePartition.java	(revision 1335)
@@ -78,20 +78,20 @@
 		int code = d.open();
 		if (code == Window.OK) {
 			try {
-				JobHandler jobhandler = new JobHandler(NLS.bind(TXMUIMessages.CreatePartition_0, corpus.getName())) {
+				JobHandler jobhandler = new JobHandler(NLS.bind(TXMUIMessages.creatingANewPartitionWithP0, corpus.getName())) {
 					@Override
 					protected IStatus run(IProgressMonitor monitor) {
 						this.runInit(monitor);
 						try {
 							JobsTimer.start();
-							monitor.beginTask(NLS.bind(TXMUIMessages.CreatePartition_0, corpus.getName()), 100);
+							monitor.beginTask(NLS.bind(TXMUIMessages.creatingANewPartitionWithP0, corpus.getName()), 100);
 							
-							Log.info(NLS.bind(TXMUIMessages.CreatePartition_0, corpus.getName()));
+							Log.info(NLS.bind(TXMUIMessages.creatingANewPartitionWithP0, corpus.getName()));
 							
 							final Partition partition = d.getPartition();
 							if (partition == null) {
 								monitor.done();
-								Log.severe(TXMUIMessages.CreatePartition_2);
+								Log.severe(TXMUIMessages.errorDDotThePartitionWasNotCreated);
 								return Status.CANCEL_STATUS;
 							}
 							try {
@@ -103,9 +103,9 @@
 							}
 							monitor.worked(95);
 
-							Log.info(NLS.bind(TXMUIMessages.CreatePartition_6, partition.getPartsCount()));
+							Log.info(NLS.bind(TXMUIMessages.doneDDotP0Parts, partition.getPartsCount()));
 							
-							monitor.subTask(TXMUIMessages.RefreshingCorporaView);
+							monitor.subTask(TXMUIMessages.refreshingCorpora);
 							syncExec(new Runnable() {
 								@Override
 								public void run() {
@@ -128,9 +128,9 @@
 				jobhandler.startJob();
 
 			} catch (Exception e) {
-				Log.severe(NLS.bind(TXMUIMessages.Error_creating_partition, e));
+				Log.severe(NLS.bind(TXMUIMessages.errorWhileCreatingAPartitionDDotP0, e));
 			}
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/ExportCorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/ExportCorpus.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/ExportCorpus.java	(revision 1335)
@@ -109,22 +109,22 @@
 			lastopenedfile = filepath;
 			final File outfile = new File(filepath);
 			JobHandler jobhandler = new JobHandler(NLS.bind(
-					TXMUIMessages.ExportCorpus_3, corpus.getName())) {
+					TXMUIMessages.exportingP0ThisMayTakeAWhile, corpus.getName())) {
 				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					this.runInit(monitor);
 					try {
 						monitor.beginTask(
-								NLS.bind(TXMUIMessages.ExportCorpus_3,
+								NLS.bind(TXMUIMessages.exportingP0ThisMayTakeAWhile,
 										corpus.getName()), 100);
 						
 
 						if (!corpus.export(outfile, this)) {
 							System.out.println(NLS.bind(
-									TXMUIMessages.ExportCorpus_0, corpus.getName()));
+									TXMUIMessages.failedToExportCorpusP0, corpus.getName()));
 						}
 
-						System.out.println(TXMUIMessages.bind(TXMUIMessages.ExportCorpus_4,outfile.getAbsolutePath()));
+						System.out.println(TXMUIMessages.bind(TXMUIMessages.doneTheCreatedBinaryFileIsP0,outfile.getAbsolutePath()));
 						monitor.worked(100);
 					} catch (ThreadDeath td) {
 						return Status.CANCEL_STATUS;
@@ -139,4 +139,4 @@
 
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/OpenBiblio.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/OpenBiblio.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/handlers/base/OpenBiblio.java	(revision 1335)
@@ -79,11 +79,11 @@
 			textids = new ArrayList<String>(corpus.getProject().getTextsID());
 			if (textids.size() == 0)
 			{
-				System.out.println(NLS.bind(TXMUIMessages.OpenBiblio_1, corpus.getName()));
+				System.out.println(NLS.bind(TXMUIMessages.noTextInCorpusDDotP0, corpus.getName()));
 				return null;
 			}
 
-			ComboDialog dialog = new ComboDialog(shell, TXMUIMessages.OpenBiblio_2, textids, textids.get(0));
+			ComboDialog dialog = new ComboDialog(shell, TXMUIMessages.selectTextId, textids, textids.get(0));
 			if (dialog.open() == Window.OK)
 			{
 				String textid = dialog.getSelectedValue();
@@ -109,7 +109,7 @@
 
 		Text text = corpus.getProject().getText(textid);
 		if (text == null) {
-			System.out.println(NLS.bind(TXMUIMessages.OpenBiblio_7, textid, corpus.getName()));
+			System.out.println(NLS.bind(TXMUIMessages.couldNotFindTextP0InCorpusP1, textid, corpus.getName()));
 			return null;
 		}
 
@@ -129,12 +129,12 @@
 			return null;
 		}
 		if (text.getBiblioPath() == null) {
-			System.out.println(NLS.bind(TXMUIMessages.OpenBiblio_9, text.getName()));
+			System.out.println(NLS.bind(TXMUIMessages.textP0HasNoBibliographicRecord, text.getName()));
 			return null;
 		}
 		String url = text.getBiblioPath().toString();
 		if (url.trim().length() == 0) {
-			System.out.println(NLS.bind(TXMUIMessages.OpenBiblio_9, text.getName()));
+			System.out.println(NLS.bind(TXMUIMessages.textP0HasNoBibliographicRecord, text.getName()));
 			return null;
 		}
 		TXMBrowser attachedBrowserEditor = OpenBrowser.openEdition(url);
@@ -142,4 +142,4 @@
 		return null;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java	(revision 1335)
@@ -98,21 +98,21 @@
 	@Override
 	public void createFieldEditors() {
 
-		cqi_use_network = new BooleanFieldEditor(CQPLibPreferences.CQI_NETWORK_MODE, CQPUIMessages.CQPPreferencePage_1, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
-		cqi_server_path_to_cqplib = new DirectoryFieldEditor(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPUIMessages.CQPPreferencePage_0, getFieldEditorParent());
-		cqi_server_is_remote = new BooleanFieldEditor(CQPLibPreferences.CQI_SERVER_IS_REMOTE, CQPUIMessages.CQPPreferencePage_10, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
-		cqi_server_host = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_HOST, CQPUIMessages.CQPPreferencePage_11, getFieldEditorParent());
-		cqi_server_port = new IntegerFieldEditor(CQPLibPreferences.CQI_SERVER_PORT, CQPUIMessages.CQPPreferencePage_12, getFieldEditorParent());
-		cqi_server_user = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_LOGIN, CQPUIMessages.CQPPreferencePage_13, getFieldEditorParent());
+		cqi_use_network = new BooleanFieldEditor(CQPLibPreferences.CQI_NETWORK_MODE, CQPUIMessages.useNetworkProtocol, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
+		cqi_server_path_to_cqplib = new DirectoryFieldEditor(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB, CQPUIMessages.cQPlibPath, getFieldEditorParent());
+		cqi_server_is_remote = new BooleanFieldEditor(CQPLibPreferences.CQI_SERVER_IS_REMOTE, CQPUIMessages.ampRemoteCWBServerAddressDDot, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
+		cqi_server_host = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_HOST, CQPUIMessages.cWBServerDDotAmphostDDot, getFieldEditorParent());
+		cqi_server_port = new IntegerFieldEditor(CQPLibPreferences.CQI_SERVER_PORT, CQPUIMessages.cWBServerDDotAmpportDDot, getFieldEditorParent());
+		cqi_server_user = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_LOGIN, CQPUIMessages.cWBServerDDotAmploginDDot, getFieldEditorParent());
 
-		cqi_server_password = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_PASSWORD, CQPUIMessages.CQPPreferencePage_14, getFieldEditorParent());
+		cqi_server_password = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_PASSWORD, CQPUIMessages.cWBServerDDotAmppasswordDDot, getFieldEditorParent());
 
-		cqi_server_path_to_executable = new FileFieldEditor(CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, CQPUIMessages.CQPPreferencePage_15, getFieldEditorParent());
+		cqi_server_path_to_executable = new FileFieldEditor(CQPLibPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, CQPUIMessages.pathToCWBServerBinary, getFieldEditorParent());
 
 //		cqi_server_path_to_registry = new DirectoryFieldEditor(CQI_SERVER_PATH_TO_REGISTRY, CQPUIMessages.CQPPreferencePage_16, getFieldEditorParent());
 		
-		cqi_server_path_to_init_file = new FileFieldEditor(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE, CQPUIMessages.CQPPreferencePage_17, getFieldEditorParent());
-		cqi_server_additional_options = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, CQPUIMessages.CQPPreferencePage_18, getFieldEditorParent());
+		cqi_server_path_to_init_file = new FileFieldEditor(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE, CQPUIMessages.pathToCWBServerInitializationFile, getFieldEditorParent());
+		cqi_server_additional_options = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, CQPUIMessages.additionalAmpoptionsForTheCWBServerDDot, getFieldEditorParent());
 
 		addField(cqi_use_network);
 		addField(cqi_server_path_to_cqplib);
@@ -208,4 +208,4 @@
 		if (update)
 			updateFieldsState(useNetwork, serverIsRemote);
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages.properties	(revision 1335)
@@ -1,11 +1,12 @@
-
-CQPPreferencePage_0  = CQPlib path
-CQPPreferencePage_1  = Use network protocol
-CQPPreferencePage_10 = &Remote CWB server address:
-CQPPreferencePage_11 = CWB server: &host:
-CQPPreferencePage_12 = CWB server: &port:
-CQPPreferencePage_13 = CWB server: &login:
-CQPPreferencePage_14 = CWB server: &password:
-CQPPreferencePage_15 = Path to CWB server binary
-CQPPreferencePage_17 = Path to CWB server initialization file
-CQPPreferencePage_18 = Additional &options for the CWB server:
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+additionalAmpoptionsForTheCWBServerDDot=Additional &options for the CWB server\:
+ampRemoteCWBServerAddressDDot=&Remote CWB server address\:
+cQPlibPath=CQPlib path
+cWBServerDDotAmphostDDot=CWB server\: &host\:
+cWBServerDDotAmploginDDot=CWB server\: &login\:
+cWBServerDDotAmppasswordDDot=CWB server\: &password\:
+cWBServerDDotAmpportDDot=CWB server\: &port\:
+pathToCWBServerBinary=Path to CWB server binary
+pathToCWBServerInitializationFile=Path to CWB server initialization file
+useNetworkProtocol=Use network protocol
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,10 +1,11 @@
-
-CQPPreferencePage_1  = Использовать сетевой протокол
-CQPPreferencePage_10 = Удаленный &сервер CWB
-CQPPreferencePage_11 = Удаленный сервер: &имя машины
-CQPPreferencePage_12 = Удаленный сервер: &номер порта
-CQPPreferencePage_13 = Удаленный сервер: &логин
-CQPPreferencePage_14 = Удаленный сервер: &пароль
-CQPPreferencePage_15 = Путь к исполняемому &файлу 'cqpserver'
-CQPPreferencePage_17 = Путь к файлу инициализации сервера CWB
-CQPPreferencePage_18 = Дополнительные опции сервера CWB: 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+additionalAmpoptionsForTheCWBServerDDot=Дополнительные опции сервера CWB\: 
+ampRemoteCWBServerAddressDDot=Удаленный &сервер CWB
+cWBServerDDotAmphostDDot=Удаленный сервер\: &имя машины
+cWBServerDDotAmploginDDot=Удаленный сервер\: &логин
+cWBServerDDotAmppasswordDDot=Удаленный сервер\: &пароль
+cWBServerDDotAmpportDDot=Удаленный сервер\: &номер порта
+pathToCWBServerBinary=Путь к исполняемому &файлу 'cqpserver'
+pathToCWBServerInitializationFile=Путь к файлу инициализации сервера CWB
+useNetworkProtocol=Использовать сетевой протокол
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/CQPUIMessages.java
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/CQPUIMessages.java	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/CQPUIMessages.java	(revision 1335)
@@ -14,16 +14,16 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.searchengine.cqp.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String CQPPreferencePage_0;
-	public static String CQPPreferencePage_1;
-	public static String CQPPreferencePage_10;
-	public static String CQPPreferencePage_11;
-	public static String CQPPreferencePage_12;
-	public static String CQPPreferencePage_13;
-	public static String CQPPreferencePage_14;
-	public static String CQPPreferencePage_15;
-	public static String CQPPreferencePage_17;
-	public static String CQPPreferencePage_18;
+	public static String cQPlibPath; 
+	public static String useNetworkProtocol; 
+	public static String ampRemoteCWBServerAddressDDot; 
+	public static String cWBServerDDotAmphostDDot; 
+	public static String cWBServerDDotAmpportDDot; 
+	public static String cWBServerDDotAmploginDDot; 
+	public static String cWBServerDDotAmppasswordDDot; 
+	public static String pathToCWBServerBinary; 
+	public static String pathToCWBServerInitializationFile; 
+	public static String additionalAmpoptionsForTheCWBServerDDot; 
 	
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,11 +1,12 @@
-﻿
-CQPPreferencePage_0  = Chemin vers CQPlib
-CQPPreferencePage_1  = Utiliser le protocole réseau
-CQPPreferencePage_10 = &Serveur CWB distant
-CQPPreferencePage_11 = Serveur distant : nom de machine
-CQPPreferencePage_12 = Serveur distant : numéro de &port
-CQPPreferencePage_13 = Serveur distant : &login
-CQPPreferencePage_14 = Serveur distant : &mot de passe
-CQPPreferencePage_15 = Chemin vers le fichier &exécutable 'cqpserver'
-CQPPreferencePage_17 = Chemin vers le fichier d'initialisation du serveur CWB
-CQPPreferencePage_18 = Options additionnelles pour le serveur CWB : 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+additionalAmpoptionsForTheCWBServerDDot=Options additionnelles pour le serveur CWB \: 
+ampRemoteCWBServerAddressDDot=&Serveur CWB distant
+cQPlibPath=Chemin vers CQPlib
+cWBServerDDotAmphostDDot=Serveur distant \: nom de machine
+cWBServerDDotAmploginDDot=Serveur distant \: &login
+cWBServerDDotAmppasswordDDot=Serveur distant \: &mot de passe
+cWBServerDDotAmpportDDot=Serveur distant \: numéro de &port
+pathToCWBServerBinary=Chemin vers le fichier &exécutable 'cqpserver'
+pathToCWBServerInitializationFile=Chemin vers le fichier d'initialisation du serveur CWB
+useNetworkProtocol=Utiliser le protocole réseau
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/Submit.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/Submit.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/Submit.java	(revision 1335)
@@ -70,7 +70,7 @@
 		if (editor instanceof TxtEditor) {
 			final TxtEditor Teditor = (TxtEditor) editor;
 			final ISelection selection = Teditor.getSelectionProvider().getSelection();
-			JobHandler job = new JobHandler(TXMUIMessages.Submit_0, true) {
+			JobHandler job = new JobHandler(TXMUIMessages.saveScript, true) {
 
 				@Override
 				protected IStatus run(final IProgressMonitor monitor) {
@@ -110,4 +110,4 @@
 		}
 		return event;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/OpenEmptyEditor.java	(revision 1335)
@@ -57,7 +57,7 @@
 		scripts.mkdir();
 		if (!scripts.exists())
 		{
-			System.out.println(NLS.bind(TXMUIMessages.OpenEmptyEditor_2, scripts));
+			System.out.println(NLS.bind(TXMUIMessages.couldNotFindDirectoryDDotP0, scripts));
 			return null;
 		}
 		
@@ -65,7 +65,7 @@
 		Rscripts.mkdir();
 		if (!Rscripts.exists())
 		{
-			System.out.println(NLS.bind(TXMUIMessages.OpenEmptyEditor_2, Rscripts));
+			System.out.println(NLS.bind(TXMUIMessages.couldNotFindDirectoryDDotP0, Rscripts));
 			return null;
 		}
 		
@@ -89,4 +89,4 @@
 		return null;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/rcp/commands/R/ShowSvgHelp.java	(revision 1335)
@@ -45,12 +45,12 @@
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
-		MessageDialog.openInformation(new Shell(), TXMUIMessages.ShowSvgHelp_0, 
-				TXMUIMessages.ShowSvgHelp_1 +
-				TXMUIMessages.ShowSvgHelp_2 +
-				TXMUIMessages.ShowSvgHelp_3 +
-				TXMUIMessages.ShowSvgHelp_4 +
-				TXMUIMessages.ShowSvgHelp_5);
+		MessageDialog.openInformation(new Shell(), TXMUIMessages.graphicsKeyboardShortcuts, 
+				TXMUIMessages.panDDotRightMousePlusDrag +
+				TXMUIMessages.zoomInAmpoutDDotMouseWheelORShiftPlusRightMousePlusDrag +
+				TXMUIMessages.zoomToSelectionDDotCtrlPlusLeftMousePlusdrag +
+				TXMUIMessages.EMPTY +
+				TXMUIMessages.resetTheViewDDotF5);
 		return event;
 		
 		/*
@@ -62,4 +62,4 @@
 		 */
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages.properties	(revision 1335)
@@ -1,49 +1,44 @@
-
-CheckRPackages_0  = TXM could not load the 'textometry' R package. The Cooccurence, Specificity and Progression commands won't be available
-CheckRPackages_1  = TXM could not load the 'FactoMineR' R package. The Correspondance analysis, Classification commands won't be available
-CheckRPackages_13 = An error occured while getting RWorkspace insance: 
-CheckRPackages_14 = The '
-CheckRPackages_15 = ' package is not installed. Trying to install it now...
-CheckRPackages_19 = Done: '
-CheckRPackages_2  = R package diagnostic
-CheckRPackages_20 = ' installed successfully.
-CheckRPackages_21 = The '
-CheckRPackages_22 = ' package was not installed. Please install it manually:\n * Run R\n * and execute 'install.packages("
-CheckRPackages_23 = "')
-CheckRPackages_24 = Error while installing package: 
-CheckRPackages_25 = The R StatEngine is not running. Trying to reinstall the packages (RServe, FactoMineR, textometry,...
-CheckRPackages_26 = TXM could not reinstall R packages. Please do it manually (see manual).
-CheckRPackages_3  = Necessary packages are ready.
-CheckRPackages_31 = ERROR: Rlist first element is not REXPInteger: 
-CheckRPackages_32 = ERROR: REval list size is 0: 
-CheckRPackages_33 = ERROR: REval is not a list: 
-CheckRPackages_35 = Updating the 
-CheckRPackages_36 = \ (
-CheckRPackages_37 = ) R package up to version 
-CheckRPackages_4  = R package diagnostic
-CheckRPackages_42 = Update of '
-CheckRPackages_43 = ' failed (current version is still 
-CheckRPackages_44 = ). Warning: Windows users need to restart TXM.
-CheckRPackages_5  = Some packages are missing. See console for details.
-CheckRPackages_9  = Checking R packages...
-
-RConsole_0 = Connecting RConsole to RWorkspace stdout and stderr.
-RConsole_1 = Error while initializing RConsole: 
-
-RPreferencePage_0 = Run RServe in debug mode
-RPreferencePage_1 = Port (default is 6311)
-RPreferencePage_2 = Path to R binary
-RPreferencePage_3 = Remote connection
-RPreferencePage_4 = Server address
-RPreferencePage_5 = User
-RPreferencePage_6 = Password
-RPreferencePage_7 = Use file based R data transfert
-RPreferencePage_8 = R args
-RPreferencePage_9 = Rserve args
-
-RVariablesView_1 = Refresh variables
-RVariablesView_2 = Show eval logs
-RVariablesView_9 = "TXM name {0} >> R name {1}
-
-SendToR_0 = Sending to R Workspace:
-SendToR_3 = Refreshing views
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+anErrorOccuredWhileGettingRWorkspaceInsanceDDot=An error occured while getting RWorkspace insance\: 
+checkingRPackages=Checking R packages...
+CheckRPackages_23="')
+CheckRPackages_36=\ (
+connectingRConsoleToRWorkspaceStdoutAndStderr=Connecting RConsole to RWorkspace stdout and stderr.
+doneDDot=Done\: '
+eRRORDDotREvalIsNotAListDDot=ERROR\: REval is not a list\: 
+eRRORDDotREvalListSizeIs0DDot=ERROR\: REval list size is 0\: 
+eRRORDDotRlistFirstElementIsNotREXPIntegerDDot=ERROR\: Rlist first element is not REXPInteger\: 
+errorWhileInitializingRConsoleDDot=Error while initializing RConsole\: 
+errorWhileInstallingPackageDDot=Error while installing package\: 
+failedCurrentVersionIsStill=' failed (current version is still 
+installedSuccessfully=' installed successfully.
+necessaryPackagesAreReady=Necessary packages are ready.
+packageIsNotInstalledTryingToInstallItNow=' package is not installed. Trying to install it now...
+packageWasNotInstalledPleaseInstallItManuallyDDotRunRAndExecuteInstallpackages=' package was not installed. Please install it manually\:\n * Run R\n * and execute 'install.packages("
+password=Password
+pathToRBinary=Path to R binary
+portDefaultIs6311=Port (default is 6311)
+rArgs=R args
+refreshingViews=Refreshing views
+refreshVariables=Refresh variables
+remoteConnection=Remote connection
+rPackageDiagnostic=R package diagnostic
+rPackageUpToVersion=) R package up to version 
+rserveArgs=Rserve args
+runRServeInDebugMode=Run RServe in debug mode
+sendingToRWorkspaceDDot=Sending to R Workspace\:
+serverAddress=Server address
+showEvalLogs=Show eval logs
+somePackagesAreMissingSeeConsoleForDetails=Some packages are missing. See console for details.
+the=The '
+theRStatEngineIsNotRunningTryingToReinstallThePackagesRServeFactoMineRTextometry=The R StatEngine is not running. Trying to reinstall the packages (RServe, FactoMineR, textometry,...
+tXMCouldNotLoadTheFactoMineRRPackageTheCorrespondanceAnalysisClassificationCommandsWontBeAvailable=TXM could not load the 'FactoMineR' R package. The Correspondance analysis, Classification commands won't be available
+tXMCouldNotLoadTheTextometryRPackageTheCooccurenceSpecificityAndProgressionCommandsWontBeAvailable=TXM could not load the 'textometry' R package. The Cooccurence, Specificity and Progression commands won't be available
+tXMCouldNotReinstallRPackagesPleaseDoItManuallySeeManual=TXM could not reinstall R packages. Please do it manually (see manual).
+tXMNameP0SupSupRNameP1="TXM name {0} >> R name {1}
+updateOf=Update of '
+updatingThe=Updating the 
+useFileBasedRDataTransfert=Use file based R data transfert
+user=User
+warningDDotWindowsUsersNeedToRestartTXM=). Warning\: Windows users need to restart TXM.
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/RUIMessages.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/RUIMessages.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/RUIMessages.java	(revision 1335)
@@ -13,55 +13,53 @@
 
 	private static final String BUNDLE_NAME = "org.txm.statsengine.r.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String RPreferencePage_0;
-	public static String RPreferencePage_1;
-	public static String RPreferencePage_2;
-	public static String RPreferencePage_3;
-	public static String RPreferencePage_4;
-	public static String RPreferencePage_5;
-	public static String RPreferencePage_6;
-	public static String RPreferencePage_7;
+	public static String runRServeInDebugMode; 
+	public static String portDefaultIs6311; 
+	public static String pathToRBinary; 
+	public static String remoteConnection; 
+	public static String serverAddress; 
+	public static String user; 
+	public static String password; 
+	public static String useFileBasedRDataTransfert; 
 
-	public static String RPreferencePage_8;
+	public static String rArgs; 
 
-	public static String RPreferencePage_9;
+	public static String rserveArgs; 
 
-	public static String CheckRPackages_0;
-	public static String CheckRPackages_1;
-	public static String CheckRPackages_13;
-	public static String CheckRPackages_14;
-	public static String CheckRPackages_15;
-	public static String CheckRPackages_19;
-	public static String CheckRPackages_2;
-	public static String CheckRPackages_20;
-	public static String CheckRPackages_21;
-	public static String CheckRPackages_22;
+	public static String tXMCouldNotLoadTheTextometryRPackageTheCooccurenceSpecificityAndProgressionCommandsWontBeAvailable; 
+	public static String tXMCouldNotLoadTheFactoMineRRPackageTheCorrespondanceAnalysisClassificationCommandsWontBeAvailable; 
+	public static String anErrorOccuredWhileGettingRWorkspaceInsanceDDot; 
+	public static String the; 
+	public static String packageIsNotInstalledTryingToInstallItNow; 
+	public static String doneDDot; 
+	public static String rPackageDiagnostic; 
+	public static String installedSuccessfully; 
+	public static String packageWasNotInstalledPleaseInstallItManuallyDDotRunRAndExecuteInstallpackages; 
 	public static String CheckRPackages_23;
-	public static String CheckRPackages_24;
-	public static String CheckRPackages_25;
-	public static String CheckRPackages_26;
-	public static String CheckRPackages_3;
-	public static String CheckRPackages_31;
-	public static String CheckRPackages_32;
-	public static String CheckRPackages_33;
-	public static String CheckRPackages_35;
+	public static String errorWhileInstallingPackageDDot; 
+	public static String theRStatEngineIsNotRunningTryingToReinstallThePackagesRServeFactoMineRTextometry; 
+	public static String tXMCouldNotReinstallRPackagesPleaseDoItManuallySeeManual; 
+	public static String necessaryPackagesAreReady; 
+	public static String eRRORDDotRlistFirstElementIsNotREXPIntegerDDot; 
+	public static String eRRORDDotREvalListSizeIs0DDot; 
+	public static String eRRORDDotREvalIsNotAListDDot; 
+	public static String updatingThe; 
 	public static String CheckRPackages_36;
-	public static String CheckRPackages_37;
-	public static String CheckRPackages_4;
-	public static String CheckRPackages_42;
-	public static String CheckRPackages_43;
-	public static String CheckRPackages_44;
-	public static String CheckRPackages_5;
-	public static String CheckRPackages_9;
+	public static String rPackageUpToVersion; 
+	public static String updateOf; 
+	public static String failedCurrentVersionIsStill; 
+	public static String warningDDotWindowsUsersNeedToRestartTXM; 
+	public static String somePackagesAreMissingSeeConsoleForDetails; 
+	public static String checkingRPackages; 
 
-	public static String SendToR_0;
-	public static String SendToR_3;
+	public static String sendingToRWorkspaceDDot; 
+	public static String refreshingViews; 
 
-	public static String RConsole_0;
-	public static String RConsole_1;
-	public static String RVariablesView_1;
-	public static String RVariablesView_2;
-	public static String RVariablesView_9;
+	public static String connectingRConsoleToRWorkspaceStdoutAndStderr; 
+	public static String errorWhileInitializingRConsoleDDot; 
+	public static String refreshVariables; 
+	public static String showEvalLogs; 
+	public static String tXMNameP0SupSupRNameP1; 
 
 	static {
 		// initialize resource bundle
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,14 +1,13 @@
-
-RPreferencePage_2 = Путь к исполняемому &файлу R
-RPreferencePage_3 = Удаленное соединение
-RPreferencePage_4 = Адрес сервера
-RPreferencePage_5 = Пользователь
-RPreferencePage_6 = Пароль
-RPreferencePage_7 = Использовать передачу данных R через файл
-
-RVariablesView_1 = Обновить переменные
-RVariablesView_2 = Показать отчет об оценках
-RVariablesView_9 = имя TXM {0} >> имя R {1}
-
-SendToR_0 = Передача в рабочее пространство R: 
-SendToR_3 = Поиск видов...
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+password=Пароль
+pathToRBinary=Путь к исполняемому &файлу R
+refreshingViews=Поиск видов...
+refreshVariables=Обновить переменные
+remoteConnection=Удаленное соединение
+sendingToRWorkspaceDDot=Передача в рабочее пространство R\: 
+serverAddress=Адрес сервера
+showEvalLogs=Показать отчет об оценках
+tXMNameP0SupSupRNameP1=имя TXM {0} >> имя R {1}
+useFileBasedRDataTransfert=Использовать передачу данных R через файл
+user=Пользователь
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,16 +1,15 @@
-
-RPreferencePage_0 = RServe lancé en mode debug
-RPreferencePage_1 = Port (valeur par défaut : 6311)
-RPreferencePage_2 = Chemin vers l'&exécutable de R
-RPreferencePage_3 = Connexion distante
-RPreferencePage_4 = Adresse du serveur
-RPreferencePage_5 = Utilisateur
-RPreferencePage_6 = Mot de passe
-RPreferencePage_7 = Utiliser la transmission de données R par fichier
-
-RVariablesView_1 = Rafraîchir les variables
-RVariablesView_2 = Afficher le journal des évaluations
-RVariablesView_9 = nom TXM {0} >> nom R {1}
-
-SendToR_0 = Transfert vers l'espace de travail R : 
-SendToR_3 = Rechargement des vues...
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+password=Mot de passe
+pathToRBinary=Chemin vers l'&exécutable de R
+portDefaultIs6311=Port (valeur par défaut \: 6311)
+refreshingViews=Rechargement des vues...
+refreshVariables=Rafraîchir les variables
+remoteConnection=Connexion distante
+runRServeInDebugMode=RServe lancé en mode debug
+sendingToRWorkspaceDDot=Transfert vers l'espace de travail R \: 
+serverAddress=Adresse du serveur
+showEvalLogs=Afficher le journal des évaluations
+tXMNameP0SupSupRNameP1=nom TXM {0} >> nom R {1}
+useFileBasedRDataTransfert=Utiliser la transmission de données R par fichier
+user=Utilisateur
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RConsole.java	(revision 1335)
@@ -231,7 +231,7 @@
 	public void connectToRWorkspace() {
 		if (!readyToDisplay && Toolbox.getEngineManager(EngineType.STATS).isCurrentEngineAvailable()) {
 			RWorkspace rw = null;
-			Log.warning(RUIMessages.RConsole_0);
+			Log.warning(RUIMessages.connectingRConsoleToRWorkspaceStdoutAndStderr);
 			try {
 				rw = RWorkspace.getRWorkspaceInstance();
 				if (rw == null) return;
@@ -246,7 +246,7 @@
 					readyToDisplay = true;
 				//}
 			} catch (RWorkspaceException e) {
-				System.out.println(RUIMessages.RConsole_1 + e);
+				System.out.println(RUIMessages.errorWhileInitializingRConsoleDDot + e);
 				Log.printStackTrace(e);
 			}
 		}
@@ -308,4 +308,4 @@
 			rc.reconnectToRWorkspace();
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/views/RVariablesView.java	(revision 1335)
@@ -221,7 +221,7 @@
 		Button export = new Button(parent, SWT.PUSH);
 		export.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 				false));
-		export.setText(RUIMessages.RVariablesView_1);
+		export.setText(RUIMessages.refreshVariables);
 		export.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent arg0) {
@@ -235,7 +235,7 @@
 		
 		Button logs = new Button(parent, SWT.PUSH);
 		logs.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,	false));
-		logs.setText(RUIMessages.RVariablesView_2);
+		logs.setText(RUIMessages.showEvalLogs);
 		logs.addSelectionListener(new SelectionListener() {
 			@Override
 			public void widgetSelected(SelectionEvent arg0) {
@@ -336,7 +336,7 @@
 			if (symbol == null)
 				return name;
 			else
-				return NLS.bind(RUIMessages.RVariablesView_9, name, symbol);
+				return NLS.bind(RUIMessages.tXMNameP0SupSupRNameP1, name, symbol);
 		}
 
 		/* (non-Javadoc)
@@ -474,4 +474,4 @@
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToRCommand.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToRCommand.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/SendToRCommand.java	(revision 1335)
@@ -66,19 +66,19 @@
 		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
 
 		final List list = selection.toList();
-		JobHandler jobhandler = new JobHandler(RUIMessages.SendToR_0+ list) {
+		JobHandler jobhandler = new JobHandler(RUIMessages.sendingToRWorkspaceDDot+ list) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				try {
 					JobsTimer.start();
 					
-					monitor.beginTask(RUIMessages.SendToR_0+ list, 100);
+					monitor.beginTask(RUIMessages.sendingToRWorkspaceDDot+ list, 100);
 					int delta = 100 / list.size();
 					for(Object o : list) {
 						if (o instanceof TXMResult) {
 							try {
-								monitor.subTask(RUIMessages.SendToR_0+ o);
+								monitor.subTask(RUIMessages.sendingToRWorkspaceDDot+ o);
 								this.acquireSemaphore();
 								send((TXMResult)o);
 								this.releaseSemaphore();
@@ -92,7 +92,7 @@
 						}
 					}
 					
-					monitor.subTask(RUIMessages.SendToR_3);
+					monitor.subTask(RUIMessages.refreshingViews);
 					this.syncExec(new Runnable() {
 						@Override
 						public void run() {
@@ -161,4 +161,4 @@
 		}
 	}
 	 */
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/handlers/CheckRPackages.java	(revision 1335)
@@ -48,8 +48,8 @@
 				"cluster",  //$NON-NLS-1$
 				"scatterplot3d")); //$NON-NLS-1$
 		
-		errorMessages.put("textometry", RUIMessages.CheckRPackages_0); //$NON-NLS-1$
-		errorMessages.put("FactoMineR", RUIMessages.CheckRPackages_1); //$NON-NLS-1$
+		errorMessages.put("textometry", RUIMessages.tXMCouldNotLoadTheTextometryRPackageTheCooccurenceSpecificityAndProgressionCommandsWontBeAvailable); //$NON-NLS-1$
+		errorMessages.put("FactoMineR", RUIMessages.tXMCouldNotLoadTheFactoMineRRPackageTheCorrespondanceAnalysisClassificationCommandsWontBeAvailable); //$NON-NLS-1$
 	}
 
 	@Override
@@ -61,9 +61,9 @@
 		
 		Shell shell = new Shell();
 		if (check()) {
-			MessageDialog.openInformation(shell, RUIMessages.CheckRPackages_2, RUIMessages.CheckRPackages_3);
+			MessageDialog.openInformation(shell, RUIMessages.rPackageDiagnostic, RUIMessages.necessaryPackagesAreReady);
 		} else {
-			MessageDialog.openError(shell, RUIMessages.CheckRPackages_4, RUIMessages.CheckRPackages_5);
+			MessageDialog.openError(shell, RUIMessages.rPackageDiagnostic, RUIMessages.somePackagesAreMissingSeeConsoleForDetails);
 		}
 		return null;
 	}
@@ -83,7 +83,7 @@
 	}
 
 	public static boolean check() {
-		System.out.print(RUIMessages.CheckRPackages_9);
+		System.out.print(RUIMessages.checkingRPackages);
 		//Log.info("Checking R packages...");
 		
 		String method = "internal"; // default method is internal //$NON-NLS-1$
@@ -97,7 +97,7 @@
 				rw = RWorkspace.getRWorkspaceInstance();
 			} catch (RWorkspaceException e) {
 				Log.printStackTrace(e);
-				System.out.println(RUIMessages.CheckRPackages_13+e);
+				System.out.println(RUIMessages.anErrorOccuredWhileGettingRWorkspaceInsanceDDot+e);
 				return false;
 			}
 			for (String p : packages.keySet()) {
@@ -121,32 +121,32 @@
 					}
 				} else { // package is not present, install it
 					try {
-						System.out.println(RUIMessages.CheckRPackages_14+p+RUIMessages.CheckRPackages_15);
+						System.out.println(RUIMessages.the+p+RUIMessages.packageIsNotInstalledTryingToInstallItNow);
 						try {rw.eval("detach(\"package:"+p+"\", character.only = TRUE)");} catch(Exception tmpE){} // unload package to be able to reinstall it //$NON-NLS-1$ //$NON-NLS-2$
 						
 						rw.eval("install.packages(\""+p+"\", dependencies=TRUE, method=\""+method+"\", repos=\"http://cran.rstudio.com\");"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 						
 						try {
 							rw.eval("library(\""+p+"\")"); //$NON-NLS-1$ //$NON-NLS-2$
-							System.out.println(RUIMessages.CheckRPackages_19+p+RUIMessages.CheckRPackages_20);
+							System.out.println(RUIMessages.doneDDot+p+RUIMessages.installedSuccessfully);
 						} catch (Exception e) {
 							Log.printStackTrace(e);
-							System.out.println(RUIMessages.CheckRPackages_21+p+RUIMessages.CheckRPackages_22+p+RUIMessages.CheckRPackages_23);
+							System.out.println(RUIMessages.the+p+RUIMessages.packageWasNotInstalledPleaseInstallItManuallyDDotRunRAndExecuteInstallpackages+p+RUIMessages.CheckRPackages_23);
 							ret = false;
 						}
 					} catch (Exception e) {
 						Log.printStackTrace(e);
-						System.out.println(RUIMessages.CheckRPackages_24+e);
+						System.out.println(RUIMessages.errorWhileInstallingPackageDDot+e);
 						ret = false;
 					}
 				}
 			}
 		} else {
-			System.out.println(RUIMessages.CheckRPackages_25);
+			System.out.println(RUIMessages.theRStatEngineIsNotRunningTryingToReinstallThePackagesRServeFactoMineRTextometry);
 			try {
 				installRPAckagesViaRscript();
 			} catch(Exception e) {
-				System.out.println(RUIMessages.CheckRPackages_26);
+				System.out.println(RUIMessages.tXMCouldNotReinstallRPackagesPleaseDoItManuallySeeManual);
 			}
 			ret = false;
 		}
@@ -178,13 +178,13 @@
 					REXPInteger rExpInt = (REXPInteger)elem;
 					return buildVersion(rExpInt);
 				} else {
-					System.out.println(RUIMessages.CheckRPackages_31+elem);
+					System.out.println(RUIMessages.eRRORDDotRlistFirstElementIsNotREXPIntegerDDot+elem);
 				}
 			} else {
-				System.out.println(RUIMessages.CheckRPackages_32+rList);
+				System.out.println(RUIMessages.eRRORDDotREvalListSizeIs0DDot+rList);
 			}
 		} else {
-			System.out.println(RUIMessages.CheckRPackages_33+rRez);
+			System.out.println(RUIMessages.eRRORDDotREvalIsNotAListDDot+rRez);
 		}	
 		return ""; //$NON-NLS-1$
 	}
@@ -204,7 +204,7 @@
 		//System.out.println("comp "+(packages.get(p))+" to "+(v));
 		//System.out.println(packages.get(p).compareTo(v));
 		if (packages.get(p).compareTo(currentVersion) > 0) {
-			System.out.println(RUIMessages.CheckRPackages_35+p+RUIMessages.CheckRPackages_36+currentVersion+RUIMessages.CheckRPackages_37+packages.get(p));
+			System.out.println(RUIMessages.updatingThe+p+RUIMessages.CheckRPackages_36+currentVersion+RUIMessages.rPackageUpToVersion+packages.get(p));
 			
 			try {rw.eval("detach(\"package:"+p+"\", character.only = TRUE)");} catch(Exception tmpE){} // unload package to be able to reinstall it //$NON-NLS-1$ //$NON-NLS-2$
 			
@@ -215,10 +215,10 @@
 			try {rw.eval("library(\""+p+"\")");} catch(Exception tmpE){} // reload it //$NON-NLS-1$ //$NON-NLS-2$
 			String newVersion = getVersion(rw, p);
 			if (!newVersion.equals(packages.get(p))) {
-				System.out.println(RUIMessages.CheckRPackages_42+p+RUIMessages.CheckRPackages_43+newVersion+RUIMessages.CheckRPackages_44);
+				System.out.println(RUIMessages.updateOf+p+RUIMessages.failedCurrentVersionIsStill+newVersion+RUIMessages.warningDDotWindowsUsersNeedToRestartTXM);
 				return false;
 			}
 		}
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java	(revision 1334)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/preferences/RPreferencePage.java	(revision 1335)
@@ -87,7 +87,7 @@
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(RPreferences.getInstance().getPreferencesNodeQualifier()));
-		//this.setTitle(RUIMessages.RPreferencePage_0);
+		//this.setTitle(RUIMessages.runRServeInDebugMode);
 		//FIXME todo if needed
 		//setDescription(Messages.RPreferencePage_1);
 		//this.setImageDescriptor(SpecificitiesAdapterFactory.ICON);
@@ -104,35 +104,35 @@
 	@Override
 	public void createFieldEditors() {
 
-		r_debug = new BooleanFieldEditor(RPreferences.DEBUG, RUIMessages.RPreferencePage_0, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
+		r_debug = new BooleanFieldEditor(RPreferences.DEBUG, RUIMessages.runRServeInDebugMode, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
 		addField(r_debug);
 		
-		r_is_remote = new BooleanFieldEditor(RPreferences.REMOTE, RUIMessages.RPreferencePage_3, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
+		r_is_remote = new BooleanFieldEditor(RPreferences.REMOTE, RUIMessages.remoteConnection, BooleanFieldEditor.DEFAULT, getFieldEditorParent());
 		addField(r_is_remote);
 
-		r_path_to_executable = new FileFieldEditor(RPreferences.PATH_TO_EXECUTABLE, RUIMessages.RPreferencePage_2, getFieldEditorParent());
+		r_path_to_executable = new FileFieldEditor(RPreferences.PATH_TO_EXECUTABLE, RUIMessages.pathToRBinary, getFieldEditorParent());
 		addField(r_path_to_executable);
 		
-		r_rargs = new StringFieldEditor(RPreferences.RARGS, RUIMessages.RPreferencePage_8, getFieldEditorParent());
+		r_rargs = new StringFieldEditor(RPreferences.RARGS, RUIMessages.rArgs, getFieldEditorParent());
 		addField(r_rargs);
 		
-		r_rserveargs = new StringFieldEditor(RPreferences.RSERVEARGS, RUIMessages.RPreferencePage_9, getFieldEditorParent());
+		r_rserveargs = new StringFieldEditor(RPreferences.RSERVEARGS, RUIMessages.rserveArgs, getFieldEditorParent());
 		addField(r_rserveargs);
 				
-		r_use_file_transfert = new BooleanFieldEditor(RPreferences.FILE_TRANSFERT, RUIMessages.RPreferencePage_7, BooleanFieldEditor.DEFAULT,
+		r_use_file_transfert = new BooleanFieldEditor(RPreferences.FILE_TRANSFERT, RUIMessages.useFileBasedRDataTransfert, BooleanFieldEditor.DEFAULT,
 				getFieldEditorParent());
 		addField(r_use_file_transfert);
 
-		r_server_adress = new StringFieldEditor(RPreferences.SERVER_ADDRESS, RUIMessages.RPreferencePage_4, getFieldEditorParent());
+		r_server_adress = new StringFieldEditor(RPreferences.SERVER_ADDRESS, RUIMessages.serverAddress, getFieldEditorParent());
 		addField(r_server_adress);
 		
-		r_port = new IntegerFieldEditor(RPreferences.PORT, RUIMessages.RPreferencePage_1, getFieldEditorParent());
+		r_port = new IntegerFieldEditor(RPreferences.PORT, RUIMessages.portDefaultIs6311, getFieldEditorParent());
 		addField(r_port);
 
-		r_user = new StringFieldEditor(RPreferences.USER, RUIMessages.RPreferencePage_5, getFieldEditorParent());
+		r_user = new StringFieldEditor(RPreferences.USER, RUIMessages.user, getFieldEditorParent());
 		addField(r_user);
 
-		r_password = new StringFieldEditor(RPreferences.PASSWORD, RUIMessages.RPreferencePage_6, getFieldEditorParent());
+		r_password = new StringFieldEditor(RPreferences.PASSWORD, RUIMessages.password, getFieldEditorParent());
 		addField(r_password);
 		
 //		r_svg_device = new StringFieldEditor(R_SVG_DEVICE, Messages.RPreferencePage_5,
@@ -200,8 +200,8 @@
 				RWorkspace.setUseFileCommunication(RPreferences.getInstance().getBoolean(RPreferences.FILE_TRANSFERT));
 			}
 		} catch (Exception e) {
-			System.err.println(TXMUIMessages.FAILED_TO_SAVE_PREFERENCES + e);
+			System.err.println(TXMUIMessages.failedToSavePreferencesDDot + e);
 		}
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/views/knowledgerepositories/KRView.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/views/knowledgerepositories/KRView.java	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/views/knowledgerepositories/KRView.java	(revision 1335)
@@ -240,7 +240,7 @@
 				return ((AnnotationType) element).getId()+((AnnotationType) element).getEffect().toSuffix();
 			else if (element instanceof TypedValue)
 				return ((TypedValue) element).getStandardName();
-			return NLS.bind(TXMUIMessages.QueriesView_10, element);
+			return NLS.bind(TXMUIMessages.errorWithElementP0, element);
 		}
 
 		/* (non-Javadoc)
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/KRAnnotation.java	(revision 1335)
@@ -129,7 +129,7 @@
 	}
 
 	public String getName() {
-		return KRAnnotationUIMessages.KRAnnotation_1;
+		return KRAnnotationUIMessages.squencesDeMotsCatgorievaleur;
 	}
 	
 	@Override
@@ -152,8 +152,8 @@
 		
 		TableViewerColumn annotationColumnViewer = new TableViewerColumn(viewer, SWT.CENTER, position);
 		annotationColumn = annotationColumnViewer.getColumn();
-		annotationColumn.setText(KRAnnotationUIMessages.ConcordancesEditor_15);
-		annotationColumn.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_17);
+		annotationColumn.setText(KRAnnotationUIMessages.category);
+		annotationColumn.setToolTipText(KRAnnotationUIMessages.keywordsAnnotation);
 		annotationColumn.setAlignment(SWT.CENTER);
 		annotationColumn.pack();
 		annotationColumn.addControlListener(new ConcordanceColumnSizeControlListener(annotationColumn));
@@ -215,24 +215,24 @@
 
 			typesList.addAll(krtypes);
 
-			Log.warning(KRAnnotationUIMessages.KRAnnotation_4+typesList);
+			Log.warning(KRAnnotationUIMessages.availableAnnotationTypesDDot+typesList);
 			break;
 		}
 
 		if (currentKnowledgeRepository == null) {
-			System.out.println(KRAnnotationUIMessages.KRAnnotation_5);
+			System.out.println(KRAnnotationUIMessages.errorDDotNoSuitableKnowledgeRepositoryFound);
 			return false;
 		}
 
-		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.KRAnnotation_6);
+		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.concordanceAnnotationArea);
 		annotationArea.getLayout().numColumns = 12;
 		annotationArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
 		addRemoveCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		String affectLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_22"); //$NON-NLS-1$
-		if (affectLabel == null) affectLabel= KRAnnotationUIMessages.ConcordancesEditor_22;
+		if (affectLabel == null) affectLabel= KRAnnotationUIMessages.affect;
 		String removeLabel = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_24"); //$NON-NLS-1$
-		if (removeLabel == null) removeLabel= KRAnnotationUIMessages.ConcordancesEditor_24;
+		if (removeLabel == null) removeLabel= KRAnnotationUIMessages.delete;
 		String items[] = {affectLabel, removeLabel};
 		addRemoveCombo.setItems(items);
 		addRemoveCombo.select(0);
@@ -242,7 +242,7 @@
 				if (addRemoveCombo.getSelectionIndex() == 0) { // add
 					annotationValuesText.setEnabled(true);
 					String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
-					if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
+					if (withLabelText == null) withLabelText= KRAnnotationUIMessages.withTheCategory;
 					withLabel.setText(withLabelText);
 					if (equalLabel != null) equalLabel.setText("="); //$NON-NLS-1$
 				} else { // remove
@@ -263,7 +263,7 @@
 
 		withLabel = new Label(annotationArea, SWT.NONE);
 		String withLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
-		if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
+		if (withLabelText == null) withLabelText= KRAnnotationUIMessages.withTheCategory;
 		withLabel.setText(withLabelText);
 		withLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
@@ -360,7 +360,7 @@
 
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addAnnotationTypeLink = new Button(annotationArea, SWT.PUSH);
-			addAnnotationTypeLink.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_115);
+			addAnnotationTypeLink.setToolTipText(KRAnnotationUIMessages.addANewCategory);
 			addAnnotationTypeLink.setImage(IImageKeys.getImage(IImageKeys.ACTION_ADD));
 			addAnnotationTypeLink.setEnabled(true);
 			addAnnotationTypeLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, false));
@@ -372,7 +372,7 @@
 
 					LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
-					InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), KRAnnotationUIMessages.ConcordancesEditor_82, KRAnnotationUIMessages.ConcordancesEditor_81, "", null); //$NON-NLS-3$ //$NON-NLS-1$
+					InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), KRAnnotationUIMessages.newCategory, KRAnnotationUIMessages.pleaseEnterTheNewTypeName, "", null); //$NON-NLS-3$ //$NON-NLS-1$
 					if (dialog.open() == InputDialog.OK) {
 						String name = dialog.getValue();
 						if (name.trim().length() == 0) return;
@@ -416,13 +416,13 @@
 		Label valueLabel = new Label(annotationArea, SWT.NONE);
 		String valueLabelText = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_80"); //$NON-NLS-1$
 		if (valueLabelText == null) {
-			valueLabelText= KRAnnotationUIMessages.ConcordancesEditor_80;
+			valueLabelText= KRAnnotationUIMessages.valueEquals;
 		}
 		valueLabel.setText(valueLabelText);
 		valueLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
 		annotationValuesText = new Text(annotationArea, SWT.BORDER);
-		annotationValuesText.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_32);
+		annotationValuesText.setToolTipText(KRAnnotationUIMessages.enterAValueForAnId);
 		GridData gdata2 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata2.widthHint = 200;
 		annotationValuesText.setLayoutData(gdata2);
@@ -441,7 +441,7 @@
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addTypedValueLink = new Button(annotationArea, SWT.PUSH);
 			addTypedValueLink.setText("..."); //$NON-NLS-1$
-			addTypedValueLink.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_79);
+			addTypedValueLink.setToolTipText(KRAnnotationUIMessages.selectAValueAmongTheList);
 			addTypedValueLink.setEnabled(true);
 			addTypedValueLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, false));
 			addTypedValueLink.addSelectionListener(new SelectionListener() {
@@ -457,7 +457,7 @@
 
 					ListDialog dialog = new ListDialog(e.widget.getDisplay().getActiveShell());
 					String title = currentKnowledgeRepository.getString(editor.getLocale(), "ConcordancesEditor_100"); //$NON-NLS-1$
-					if (title == null) title = KRAnnotationUIMessages.ConcordancesEditor_100;
+					if (title == null) title = KRAnnotationUIMessages.availableValuesForP0;
 					dialog.setTitle(ConcordanceUIMessages.bind(title, type.getName()));//+"valeurs de "+type.getName());
 					dialog.setContentProvider(new ArrayContentProvider());
 					dialog.setLabelProvider(new SimpleLabelProvider() {
@@ -493,7 +493,7 @@
 
 		affectCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		affectCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		String items2[] = {KRAnnotationUIMessages.ConcordancesEditor_35, KRAnnotationUIMessages.ConcordancesEditor_49};
+		String items2[] = {KRAnnotationUIMessages.selectedLines, KRAnnotationUIMessages.allLines};
 		affectCombo.setItems(items2);
 		affectCombo.select(0);
 		gdata = new GridData(SWT.CENTER, SWT.CENTER, false, false);
@@ -501,8 +501,8 @@
 		affectCombo.setLayoutData(gdata);
 
 		affectAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAnnotationButton.setText(KRAnnotationUIMessages.ConcordancesEditor_85);
-		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
+		affectAnnotationButton.setText(KRAnnotationUIMessages.oK);
+		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.proceedToAnnotation);
 		affectAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -515,7 +515,7 @@
 						List<Match> matches = concordance.getMatches();
 						affectMatchesToSelection(matches);
 					} catch (CqiClientException e1) {
-						Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
+						Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceDDot+e1);
 						Log.printStackTrace(e1);
 						return;
 					}
@@ -526,7 +526,7 @@
 			public void widgetDefaultSelected(SelectionEvent e) { }
 		});
 		Button saveAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		saveAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_76);
+		saveAnnotationButton.setToolTipText(KRAnnotationUIMessages.saveTheAnnotations);
 		saveAnnotationButton.setImage(IImageKeys.getImage(IImageKeys.PENCIL_SAVE));
 
 		saveAnnotationButton.addSelectionListener(new SelectionListener() {
@@ -554,7 +554,7 @@
 		});
 		
 		Button closeButton = new Button(annotationArea, SWT.PUSH);
-		closeButton.setToolTipText(KRAnnotationUIMessages.KRAnnotation_16);
+		closeButton.setToolTipText(KRAnnotationUIMessages.closeTheToolbarWithoutSaving);
 		closeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_DELETE));
 		closeButton.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
 		closeButton.addSelectionListener(new SelectionListener() {
@@ -599,7 +599,7 @@
 		final String svalue = annotationValuesText.getText();
 		final boolean doAffect = addRemoveCombo.getSelectionIndex() == 0; // add is default
 
-		JobHandler job = new JobHandler(KRAnnotationUIMessages.ConcordancesEditor_36, true) {
+		JobHandler job = new JobHandler(KRAnnotationUIMessages.annotatingConcordanceSelection, true) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
@@ -610,11 +610,11 @@
 						deleteAnnotationValues(matches, type, this);
 					}
 				} catch(Exception e) {
-					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
+					Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceSelectionDDot+e);
 					Log.printStackTrace(e);
 					return Status.CANCEL_STATUS;
 				} catch(ThreadDeath td) {
-					System.out.println(KRAnnotationUIMessages.KRAnnotation_17);
+					System.out.println(KRAnnotationUIMessages.annotationCanceledByUser);
 					return Status.CANCEL_STATUS;
 				}
 
@@ -688,7 +688,7 @@
 					return;
 				}
 			} catch (Exception e1) {
-				System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
+				System.out.println(KRAnnotationUIMessages.errorWhileDeletingAnnotationDDot+e1);
 				Log.printStackTrace(e1);
 				return;
 			}
@@ -721,8 +721,8 @@
 				if (matches.size() > NALERTAFFECTANNOTATIONS) {
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"confirm_annotate",  //$NON-NLS-1$
-							KRAnnotationUIMessages.ConcordancesEditor_86, 
-							KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
+							KRAnnotationUIMessages.confirmAnnotationAffectation, 
+							KRAnnotationUIMessages.youAreAboutToAnnotate+matches.size()+KRAnnotationUIMessages.elementsContinue);
 
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
@@ -733,7 +733,7 @@
 		});
 
 		// get value from combo text value
-		Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
+		Log.warning(KRAnnotationUIMessages.lookingForTypedValueWithIdEquals+svalue);
 		final KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(type.getKnowledgeRepository());
 		value_to_add = kr.getValue(type, svalue);
 
@@ -744,8 +744,8 @@
 				public void run() {
 					String title = kr.getString(editor.getLocale(), "ConcordancesEditor_110"); //$NON-NLS-1$
 					String content = kr.getString(editor.getLocale(), "ConcordancesEditor_112"); //$NON-NLS-1$
-					if (title == null ) title = KRAnnotationUIMessages.ConcordancesEditor_110;
-					if (content == null ) content = KRAnnotationUIMessages.ConcordancesEditor_112;
+					if (title == null ) title = KRAnnotationUIMessages.newValueP0ForCategoryP1;
+					if (content == null ) content = KRAnnotationUIMessages.theValueP0IsNotAssociatedWithTheCategoryP1AssociateIt;
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"create_value", //$NON-NLS-1$
 							ConcordanceUIMessages.bind(title, svalue, type.getName()),  
@@ -767,7 +767,7 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String mess = ConcordanceUIMessages.bind(KRAnnotationUIMessages.ConcordancesEditor_58, svalue);
+					String mess = ConcordanceUIMessages.bind(KRAnnotationUIMessages.noValueFoundWithTheP0Id, svalue);
 					System.out.println(mess);
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Annotation canceled", mess); //$NON-NLS-1$
 				}
@@ -783,16 +783,16 @@
 
 			// did we had problems ?
 			if (existingAnnots!=null && existingAnnots.size() > 0) {
-				String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-						KRAnnotationUIMessages.ConcordancesEditor_62;
+				String message = KRAnnotationUIMessages.couldNotAnnotateTheValue+value_to_add.getStandardName()+
+						KRAnnotationUIMessages.onCertainSequences;
 				for (Match m : existingAnnots.keySet()) {
-					message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
+					message += KRAnnotationUIMessages.theSequence+m+KRAnnotationUIMessages.isOverlappingWith;
 
 					for (Annotation existingAnnot : existingAnnots.get(m)) {
 						if (existingAnnot.getStart() < m.getStart()){
-							message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+							message += KRAnnotationUIMessages.theEndOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						} else {
-							message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
+							message += KRAnnotationUIMessages.theStartOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						}
 					}
 				}
@@ -800,7 +800,7 @@
 				job.syncExec(new Runnable() {
 					@Override
 					public void run() {
-						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.ConcordancesEditor_73, final_message);
+						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.aboutAnnotations, final_message);
 					}
 				});
 			}
@@ -812,7 +812,7 @@
 			}
 			concordance.reloadCurrentLines();
 		} catch (Exception e1) {
-			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
+			System.out.println(KRAnnotationUIMessages.errorWhileAffectionAnnotationDDot+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -922,4 +922,4 @@
 	public boolean needToUpdateIndexes() {
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/WordAnnotationToolbar.java	(revision 1335)
@@ -116,7 +116,7 @@
 	private TableViewerColumn annotationColumnViewer;
 
 	public String getName() {
-		return KRAnnotationUIMessages.WordAnnotationToolbar_1;
+		return KRAnnotationUIMessages.motsPropritsInfDfaut;
 	}
 	
 	@Override
@@ -169,8 +169,8 @@
 				if (matches.size() > NALERTAFFECTANNOTATIONS) {
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"confirm_annotate",  //$NON-NLS-1$
-							KRAnnotationUIMessages.ConcordancesEditor_86, 
-							KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
+							KRAnnotationUIMessages.confirmAnnotationAffectation, 
+							KRAnnotationUIMessages.youAreAboutToAnnotate+matches.size()+KRAnnotationUIMessages.elementsContinue);
 
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
@@ -181,7 +181,7 @@
 		});
 
 		// get value from combo text value
-		Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
+		Log.warning(KRAnnotationUIMessages.lookingForTypedValueWithIdEquals+svalue);
 		final KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(type.getKnowledgeRepository());
 		value_to_add = kr.getValue(type, svalue);
 
@@ -194,7 +194,7 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String mess = KRAnnotationUIMessages.bind(KRAnnotationUIMessages.ConcordancesEditor_58, svalue);
+					String mess = KRAnnotationUIMessages.bind(KRAnnotationUIMessages.noValueFoundWithTheP0Id, svalue);
 					System.out.println(mess);
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Annotation canceled", mess); //$NON-NLS-1$
 				}
@@ -210,16 +210,16 @@
 
 			// did we had problems ?
 			if (existingAnnots!=null && existingAnnots.size() > 0) {
-				String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-						KRAnnotationUIMessages.ConcordancesEditor_62;
+				String message = KRAnnotationUIMessages.couldNotAnnotateTheValue+value_to_add.getStandardName()+
+						KRAnnotationUIMessages.onCertainSequences;
 				for (Match m : existingAnnots.keySet()) {
-					message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
+					message += KRAnnotationUIMessages.theSequence+m+KRAnnotationUIMessages.isOverlappingWith;
 
 					for (Annotation existingAnnot : existingAnnots.get(m)) {
 						if (existingAnnot.getStart() < m.getStart()){
-							message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+							message += KRAnnotationUIMessages.theEndOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						} else {
-							message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
+							message += KRAnnotationUIMessages.theStartOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						}
 					}
 				}
@@ -227,7 +227,7 @@
 				job.syncExec(new Runnable() {
 					@Override
 					public void run() {
-						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.ConcordancesEditor_73, final_message);
+						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.aboutAnnotations, final_message);
 					}
 				});
 			}
@@ -239,7 +239,7 @@
 			}
 			concordance.reloadCurrentLines();
 		} catch (Exception e1) {
-			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
+			System.out.println(KRAnnotationUIMessages.errorWhileAffectionAnnotationDDot+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -276,7 +276,7 @@
 				return;
 			}
 		} catch (Exception e1) {
-			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
+			System.out.println(KRAnnotationUIMessages.errorWhileDeletingAnnotationDDot+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -298,18 +298,18 @@
 		final AnnotationType type = getSelectedAnnotationType();
 		final String svalue = annotationValuesText.getText();
 
-		JobHandler job = new JobHandler(KRAnnotationUIMessages.ConcordancesEditor_36, true) {
+		JobHandler job = new JobHandler(KRAnnotationUIMessages.annotatingConcordanceSelection, true) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
 				try {
 					affectAnnotationValues(matches, type, svalue, this);
 				} catch(Exception e) {
-					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
+					Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceSelectionDDot+e);
 					Log.printStackTrace(e);
 					return Status.CANCEL_STATUS;
 				} catch(ThreadDeath td) {
-					System.out.println(KRAnnotationUIMessages.WordAnnotationToolbar_2);
+					System.out.println(KRAnnotationUIMessages.annotationCanceledByUser);
 					return Status.CANCEL_STATUS;
 				}
 
@@ -338,8 +338,8 @@
 		
 		annotationColumnViewer = new TableViewerColumn(viewer, SWT.CENTER, position);
 		annotationColumn = annotationColumnViewer.getColumn();
-		annotationColumn.setText(KRAnnotationUIMessages.WordAnnotationToolbar_3);
-		annotationColumn.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_17);
+		annotationColumn.setText(KRAnnotationUIMessages.property);
+		annotationColumn.setToolTipText(KRAnnotationUIMessages.keywordsAnnotation);
 		annotationColumn.setAlignment(SWT.CENTER);
 		annotationColumn.pack();
 		annotationColumn.setResizable(true);
@@ -407,9 +407,9 @@
 
 		typesList.addAll(krtypes);
 
-		Log.warning(KRAnnotationUIMessages.WordAnnotationToolbar_10+typesList);
+		Log.warning(KRAnnotationUIMessages.availableAnnotationTypesDDot+typesList);
 
-		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.WordAnnotationToolbar_11);
+		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.concordanceAnnotationArea);
 		annotationArea.getLayout().numColumns = 12;
 		annotationArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
@@ -489,7 +489,7 @@
 		equalLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
 		annotationValuesText = new Text(annotationArea, SWT.BORDER);
-		annotationValuesText.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_32);
+		annotationValuesText.setToolTipText(KRAnnotationUIMessages.enterAValueForAnId);
 		GridData gdata2 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata2.widthHint = 200;
 		annotationValuesText.setLayoutData(gdata2);
@@ -506,8 +506,8 @@
 		});
 
 		affectAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAnnotationButton.setText(KRAnnotationUIMessages.ConcordancesEditor_85);
-		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
+		affectAnnotationButton.setText(KRAnnotationUIMessages.oK);
+		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.proceedToAnnotation);
 		affectAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -520,8 +520,8 @@
 		});
 
 		affectAllAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAllAnnotationButton.setText(KRAnnotationUIMessages.WordAnnotationToolbar_12);
-		affectAllAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
+		affectAllAnnotationButton.setText(KRAnnotationUIMessages.all);
+		affectAllAnnotationButton.setToolTipText(KRAnnotationUIMessages.proceedToAnnotation);
 		affectAllAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAllAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -531,7 +531,7 @@
 					List<Match> matches = concordance.getMatches();
 					affectMatchesToSelection(matches);
 				} catch (CqiClientException e1) {
-					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
+					Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceDDot+e1);
 					Log.printStackTrace(e1);
 					return;
 				}
@@ -543,7 +543,7 @@
 		
 		addAnnotationTypeButton = new Button(annotationArea, SWT.PUSH);
 		addAnnotationTypeButton.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
-		addAnnotationTypeButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_115);
+		addAnnotationTypeButton.setToolTipText(KRAnnotationUIMessages.addANewCategory);
 		addAnnotationTypeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_ADD));
 		addAnnotationTypeButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -570,7 +570,7 @@
 		});
 		
 		Button closeButton = new Button(annotationArea, SWT.PUSH);
-		closeButton.setToolTipText(KRAnnotationUIMessages.WordAnnotationToolbar_13);
+		closeButton.setToolTipText(KRAnnotationUIMessages.closeTheToolbarWithoutSaving);
 		closeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_REMOVE));
 		
 		closeButton.addSelectionListener(new SelectionListener() {
@@ -599,7 +599,7 @@
 
 		LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 		if (typeName == null) typeName = ""; //$NON-NLS-1$
-		InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), KRAnnotationUIMessages.WordAnnotationToolbar_15, KRAnnotationUIMessages.WordAnnotationToolbar_16, typeName, null); //$NON-NLS-3$
+		InputDialog dialog = new InputDialog(e.widget.getDisplay().getActiveShell(), KRAnnotationUIMessages.nouvelleProprit, KRAnnotationUIMessages.nomDeLaPropritPatternEqualsazaz09Plus, typeName, null); //$NON-NLS-3$
 		if (dialog.open() == InputDialog.OK) {
 			String name = dialog.getValue();
 			if (name.trim().length() == 0) return;
@@ -736,4 +736,4 @@
 	public boolean needToUpdateIndexes() {
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/concordance/SimpleKRAnnotation.java	(revision 1335)
@@ -112,7 +112,7 @@
 
 	@Override
 	public String getName() {
-		return KRAnnotationUIMessages.SimpleKRAnnotation_1;
+		return KRAnnotationUIMessages.squencesDeMotsCatgorie;
 	}
 		
 	@Override
@@ -135,8 +135,8 @@
 		
 		TableViewerColumn annotationColumnViewer = new TableViewerColumn(viewer, SWT.CENTER, position);
 		annotationColumn = annotationColumnViewer.getColumn();
-		annotationColumn.setText(KRAnnotationUIMessages.ConcordancesEditor_15);
-		annotationColumn.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_17);
+		annotationColumn.setText(KRAnnotationUIMessages.category);
+		annotationColumn.setToolTipText(KRAnnotationUIMessages.keywordsAnnotation);
 		annotationColumn.pack();
 		annotationColumn.setAlignment(SWT.CENTER);
 
@@ -195,17 +195,17 @@
 		}
 		annotations.setViewAnnotation(tagAnnotationType);
 		
-		Log.warning(KRAnnotationUIMessages.SimpleKRAnnotation_4+typesList);
+		Log.warning(KRAnnotationUIMessages.availableAnnotationTypesDDot+typesList);
 
-		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.SimpleKRAnnotation_5);
+		annotationArea = new GLComposite(parent, SWT.NONE, KRAnnotationUIMessages.concordanceAnnotationArea);
 		annotationArea.getLayout().numColumns = 12;
 		annotationArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
 		addRemoveCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		String affectLabel = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_22"); //$NON-NLS-1$
-		if (affectLabel == null) affectLabel= KRAnnotationUIMessages.ConcordancesEditor_22;
+		if (affectLabel == null) affectLabel= KRAnnotationUIMessages.affect;
 		String removeLabel = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_24"); //$NON-NLS-1$
-		if (removeLabel == null) removeLabel= KRAnnotationUIMessages.ConcordancesEditor_24;
+		if (removeLabel == null) removeLabel= KRAnnotationUIMessages.delete;
 		String items[] = {affectLabel, removeLabel};
 		addRemoveCombo.setItems(items);
 		addRemoveCombo.select(0);
@@ -215,7 +215,7 @@
 				if (addRemoveCombo.getSelectionIndex() == 0) { // add
 					annotationValuesText.setEnabled(true);
 					String withLabelText = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
-					if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
+					if (withLabelText == null) withLabelText= KRAnnotationUIMessages.withTheCategory;
 					withLabel.setText(withLabelText);
 				} else { // remove
 					annotationValuesText.setEnabled(false);
@@ -234,12 +234,12 @@
 
 		withLabel = new Label(annotationArea, SWT.NONE);
 		String withLabelText = currentKnowledgeRepository.getString(getLocale(), "ConcordancesEditor_83"); //$NON-NLS-1$
-		if (withLabelText == null) withLabelText= KRAnnotationUIMessages.ConcordancesEditor_83;
+		if (withLabelText == null) withLabelText= KRAnnotationUIMessages.withTheCategory;
 		withLabel.setText(withLabelText);
 		withLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 
 		annotationValuesText = new Text(annotationArea, SWT.BORDER);
-		annotationValuesText.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_32);
+		annotationValuesText.setToolTipText(KRAnnotationUIMessages.enterAValueForAnId);
 		GridData gdata2 = new GridData(SWT.FILL, SWT.CENTER, false, false);
 		gdata2.widthHint = 200;
 		annotationValuesText.setLayoutData(gdata2);
@@ -258,7 +258,7 @@
 		if (currentKnowledgeRepository instanceof LocalKnowledgeRepository) {
 			addTypedValueLink = new Button(annotationArea, SWT.PUSH);
 			addTypedValueLink.setText("..."); //$NON-NLS-1$
-			addTypedValueLink.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_77);
+			addTypedValueLink.setToolTipText(KRAnnotationUIMessages.openTheListOfCategories);
 			addTypedValueLink.setEnabled(true);
 			addTypedValueLink.setLayoutData(new GridData(SWT.FILL,	SWT.CENTER, false, false));
 			addTypedValueLink.addSelectionListener(new SelectionListener() {
@@ -273,7 +273,7 @@
 					LocalKnowledgeRepository kr = (LocalKnowledgeRepository)currentKnowledgeRepository;
 
 					ListDialog dialog = new ListDialog(e.widget.getDisplay().getActiveShell());
-					dialog.setTitle(KRAnnotationUIMessages.ConcordancesEditor_99);//+"valeurs de "+type.getName());
+					dialog.setTitle(KRAnnotationUIMessages.listOfCategories);//+"valeurs de "+type.getName());
 					dialog.setContentProvider(new ArrayContentProvider());
 					dialog.setLabelProvider(new SimpleLabelProvider() {
 						public String getColumnText(Object element, int columnIndex) {
@@ -308,7 +308,7 @@
 
 		affectCombo = new Combo(annotationArea, SWT.READ_ONLY);
 		affectCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
-		String items2[] = {KRAnnotationUIMessages.ConcordancesEditor_35, KRAnnotationUIMessages.ConcordancesEditor_49};
+		String items2[] = {KRAnnotationUIMessages.selectedLines, KRAnnotationUIMessages.allLines};
 		affectCombo.setItems(items2);
 		affectCombo.select(0);
 		gdata = new GridData(SWT.CENTER, SWT.CENTER, false, false);
@@ -316,8 +316,8 @@
 		affectCombo.setLayoutData(gdata);
 
 		affectAnnotationButton = new Button(annotationArea, SWT.PUSH);
-		affectAnnotationButton.setText(KRAnnotationUIMessages.ConcordancesEditor_85);
-		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.ConcordancesEditor_116);
+		affectAnnotationButton.setText(KRAnnotationUIMessages.oK);
+		affectAnnotationButton.setToolTipText(KRAnnotationUIMessages.proceedToAnnotation);
 		affectAnnotationButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		affectAnnotationButton.addSelectionListener(new SelectionListener() {
 			@Override
@@ -330,7 +330,7 @@
 						List<Match> matches = concordance.getMatches();
 						affectMatchesToSelection(matches);
 					} catch (CqiClientException e1) {
-						Log.severe(KRAnnotationUIMessages.ConcordancesEditor_53+e1);
+						Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceDDot+e1);
 						Log.printStackTrace(e1);
 						return;
 					}
@@ -342,7 +342,7 @@
 		});
 		
 		Button closeButton = new Button(annotationArea, SWT.PUSH);
-		closeButton.setToolTipText(KRAnnotationUIMessages.SimpleKRAnnotation_10);
+		closeButton.setToolTipText(KRAnnotationUIMessages.closeTheToolbarWithoutSaving);
 		closeButton.setImage(IImageKeys.getImage(IImageKeys.ACTION_DELETE));
 		closeButton.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
 		closeButton.addSelectionListener(new SelectionListener() {
@@ -392,7 +392,7 @@
 		final String svalue = annotationValuesText.getText();
 		final boolean doAffect = addRemoveCombo.getSelectionIndex() == 0; // add is default
 
-		JobHandler job = new JobHandler(KRAnnotationUIMessages.ConcordancesEditor_36, true) {
+		JobHandler job = new JobHandler(KRAnnotationUIMessages.annotatingConcordanceSelection, true) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				this.runInit(monitor);
@@ -403,11 +403,11 @@
 						deleteAnnotationValues(matches, type, this);
 					}
 				} catch(Exception e) {
-					Log.severe(KRAnnotationUIMessages.ConcordancesEditor_40+e);
+					Log.severe(KRAnnotationUIMessages.errorWhileAnnotatingConcordanceSelectionDDot+e);
 					Log.printStackTrace(e);
 					return Status.CANCEL_STATUS;
 				} catch(ThreadDeath td) {
-					System.out.println(KRAnnotationUIMessages.SimpleKRAnnotation_11);
+					System.out.println(KRAnnotationUIMessages.annotationCanceledByUser);
 					return Status.CANCEL_STATUS;
 				}
 
@@ -475,7 +475,7 @@
 				return;
 			}
 		} catch (Exception e1) {
-			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_54+e1);
+			System.out.println(KRAnnotationUIMessages.errorWhileDeletingAnnotationDDot+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -507,8 +507,8 @@
 				if (matches.size() > NALERTAFFECTANNOTATIONS) {
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"confirm_annotate",  //$NON-NLS-1$
-							KRAnnotationUIMessages.ConcordancesEditor_86, 
-							KRAnnotationUIMessages.ConcordancesEditor_87+matches.size()+KRAnnotationUIMessages.ConcordancesEditor_108);
+							KRAnnotationUIMessages.confirmAnnotationAffectation, 
+							KRAnnotationUIMessages.youAreAboutToAnnotate+matches.size()+KRAnnotationUIMessages.elementsContinue);
 
 					if (dialog.open() == ConfirmDialog.CANCEL) {
 						System.out.println("Annotation aborted by user."); //$NON-NLS-1$
@@ -519,7 +519,7 @@
 		});
 
 		// get value from combo text value
-		Log.warning(KRAnnotationUIMessages.ConcordancesEditor_57+svalue);
+		Log.warning(KRAnnotationUIMessages.lookingForTypedValueWithIdEquals+svalue);
 		final KnowledgeRepository kr = KnowledgeRepositoryManager.getKnowledgeRepository(type.getKnowledgeRepository());
 		value_to_add = kr.getValue(type, svalue);
 
@@ -530,8 +530,8 @@
 				public void run() {
 					String title = kr.getString(getLocale(), "ConcordancesEditor_110"); //$NON-NLS-1$
 					String content = kr.getString(getLocale(), "ConcordancesEditor_112"); //$NON-NLS-1$
-					if (title == null ) title = KRAnnotationUIMessages.ConcordancesEditor_110;
-					if (content == null ) content = KRAnnotationUIMessages.ConcordancesEditor_112;
+					if (title == null ) title = KRAnnotationUIMessages.newValueP0ForCategoryP1;
+					if (content == null ) content = KRAnnotationUIMessages.theValueP0IsNotAssociatedWithTheCategoryP1AssociateIt;
 					ConfirmDialog dialog = new ConfirmDialog(Display.getCurrent().getActiveShell(), 
 							"create_value", //$NON-NLS-1$
 							ConcordanceUIMessages.bind(title, svalue, type.getName()),  
@@ -553,7 +553,7 @@
 			job.syncExec(new Runnable() {
 				@Override
 				public void run() {
-					String mess = ConcordanceUIMessages.bind(KRAnnotationUIMessages.ConcordancesEditor_58, svalue);
+					String mess = ConcordanceUIMessages.bind(KRAnnotationUIMessages.noValueFoundWithTheP0Id, svalue);
 					System.out.println(mess);
 					MessageDialog.openError(Display.getCurrent().getActiveShell(), "Annotation canceled", mess); //$NON-NLS-1$
 				}
@@ -561,7 +561,7 @@
 			return;
 		}
 
-		Log.info(KRAnnotationUIMessages.ConcordancesEditor_59+value_to_add+KRAnnotationUIMessages.ConcordancesEditor_60+matches);
+		Log.info(KRAnnotationUIMessages.aFFECT+value_to_add+KRAnnotationUIMessages.toSELECTIONEquals+matches);
 
 		// finally we can 'try' to create the annotations \o/
 		try {
@@ -569,16 +569,16 @@
 
 			// did we had problems ?
 			if (existingAnnots!=null && existingAnnots.size() > 0) {
-				String message = KRAnnotationUIMessages.ConcordancesEditor_61+value_to_add.getStandardName()+
-						KRAnnotationUIMessages.ConcordancesEditor_62;
+				String message = KRAnnotationUIMessages.couldNotAnnotateTheValue+value_to_add.getStandardName()+
+						KRAnnotationUIMessages.onCertainSequences;
 				for (Match m : existingAnnots.keySet()) {
-					message += KRAnnotationUIMessages.ConcordancesEditor_63+m+KRAnnotationUIMessages.ConcordancesEditor_64;
+					message += KRAnnotationUIMessages.theSequence+m+KRAnnotationUIMessages.isOverlappingWith;
 
 					for (Annotation existingAnnot : existingAnnots.get(m)) {
 						if (existingAnnot.getStart() < m.getStart()){
-							message += KRAnnotationUIMessages.ConcordancesEditor_65+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_66+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
+							message += KRAnnotationUIMessages.theEndOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						} else {
-							message += KRAnnotationUIMessages.ConcordancesEditor_69+existingAnnot.getType()+KRAnnotationUIMessages.ConcordancesEditor_70+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_71+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_72;
+							message += KRAnnotationUIMessages.theStartOfAStructure+existingAnnot.getType()+KRAnnotationUIMessages.at+existingAnnot.getStart()+KRAnnotationUIMessages.ConcordancesEditor_67+existingAnnot.getEnd()+KRAnnotationUIMessages.ConcordancesEditor_68;
 						}
 					}
 				}
@@ -586,7 +586,7 @@
 				job.syncExec(new Runnable() {
 					@Override
 					public void run() {
-						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.ConcordancesEditor_73, final_message);
+						MessageDialog.openInformation(editor.getSite().getShell(), KRAnnotationUIMessages.aboutAnnotations, final_message);
 					}
 				});
 			}
@@ -595,7 +595,7 @@
 				annotManager.checkData();
 			}
 		} catch (Exception e1) {
-			System.out.println(KRAnnotationUIMessages.ConcordancesEditor_74+e1);
+			System.out.println(KRAnnotationUIMessages.errorWhileAffectionAnnotationDDot+e1);
 			Log.printStackTrace(e1);
 			return;
 		}
@@ -705,4 +705,4 @@
 	public boolean needToUpdateIndexes() {
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ExportStandoff.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ExportStandoff.java	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/commands/ExportStandoff.java	(revision 1335)
@@ -86,7 +86,7 @@
 		dialog.setFileName(corpus.getID()+"_annotations.zip");
 		dialog.setFilterExtensions(new String[]{"*.zip"});
 		if (dialog.open() != null) {
-			StatusLine.setMessage(TXMUIMessages.ExportAnnotation_0);
+			StatusLine.setMessage(TXMUIMessages.exportingAnnotations);
 			String filepath = dialog.getFilterPath();
 			String filename = dialog.getFileName();
 
@@ -152,4 +152,4 @@
 		jobhandler.startJob(true);
 		return true;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages_ru.properties	(revision 1335)
@@ -0,0 +1,2 @@
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages_fr.properties	(revision 1335)
@@ -0,0 +1,2 @@
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/KRAnnotationUIMessages.java
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/KRAnnotationUIMessages.java	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/KRAnnotationUIMessages.java	(revision 1335)
@@ -1,92 +1,81 @@
-package org.txm.annotation.kr.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-/**
- * KR annotation UI messages.
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class KRAnnotationUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.annotation.kr.rcp.messages.messages"; //$NON-NLS-1$
-	
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, KRAnnotationUIMessages.class);
-	}
-
-	private KRAnnotationUIMessages() {
-	}
-
-	public static String ConcordancesEditor_100;
-	public static String ConcordancesEditor_108;
-	public static String ConcordancesEditor_110;
-	public static String ConcordancesEditor_112;
-	public static String ConcordancesEditor_115;
-	public static String ConcordancesEditor_116;
-	public static String ConcordancesEditor_15;
-	public static String ConcordancesEditor_17;
-	public static String ConcordancesEditor_22;
-	public static String ConcordancesEditor_24;
-	public static String ConcordancesEditor_32;
-	public static String ConcordancesEditor_35;
-	public static String ConcordancesEditor_36;
-	public static String ConcordancesEditor_40;
-	public static String ConcordancesEditor_49;
-	public static String ConcordancesEditor_53;
-	public static String ConcordancesEditor_54;
-	public static String ConcordancesEditor_57;
-	public static String ConcordancesEditor_58;
-	public static String ConcordancesEditor_59;
-	public static String ConcordancesEditor_60;
-	public static String ConcordancesEditor_61;
-	public static String ConcordancesEditor_62;
-	public static String ConcordancesEditor_63;
-	public static String ConcordancesEditor_64;
-	public static String ConcordancesEditor_65;
-	public static String ConcordancesEditor_66;
-	public static String ConcordancesEditor_67;
-	public static String ConcordancesEditor_68;
-	public static String ConcordancesEditor_69;
-	public static String ConcordancesEditor_70;
-	public static String ConcordancesEditor_71;
-	public static String ConcordancesEditor_72;
-	public static String ConcordancesEditor_73;
-	public static String ConcordancesEditor_74;
-	public static String ConcordancesEditor_76;
-	public static String ConcordancesEditor_77;
-	public static String ConcordancesEditor_79;
-	public static String ConcordancesEditor_80;
-	public static String ConcordancesEditor_81;
-	public static String ConcordancesEditor_82;
-	public static String ConcordancesEditor_83;
-	public static String ConcordancesEditor_85;
-	public static String ConcordancesEditor_86;
-	public static String ConcordancesEditor_87;
-	public static String ConcordancesEditor_99;
-	public static String KRAnnotation_1;
-	public static String KRAnnotation_16;
-	public static String KRAnnotation_17;
-	public static String KRAnnotation_4;
-	public static String KRAnnotation_5;
-	public static String KRAnnotation_6;
-	public static String SimpleKRAnnotation_1;
-	public static String SimpleKRAnnotation_10;
-	public static String SimpleKRAnnotation_11;
-	public static String SimpleKRAnnotation_4;
-	public static String SimpleKRAnnotation_5;
-	public static String WordAnnotationToolbar_1;
-	public static String WordAnnotationToolbar_10;
-	public static String WordAnnotationToolbar_11;
-	public static String WordAnnotationToolbar_12;
-	public static String WordAnnotationToolbar_13;
-	public static String WordAnnotationToolbar_15;
-	public static String WordAnnotationToolbar_16;
-	public static String WordAnnotationToolbar_2;
-	public static String WordAnnotationToolbar_3;
-}
+package org.txm.annotation.kr.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+/**
+ * KR annotation UI messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class KRAnnotationUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.annotation.kr.rcp.messages.messages"; //$NON-NLS-1$
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, KRAnnotationUIMessages.class);
+	}
+
+	private KRAnnotationUIMessages() {
+	}
+
+	public static String availableValuesForP0; 
+	public static String elementsContinue; 
+	public static String newValueP0ForCategoryP1; 
+	public static String theValueP0IsNotAssociatedWithTheCategoryP1AssociateIt; 
+	public static String addANewCategory; 
+	public static String proceedToAnnotation; 
+	public static String category; 
+	public static String keywordsAnnotation; 
+	public static String affect; 
+	public static String delete; 
+	public static String enterAValueForAnId; 
+	public static String selectedLines; 
+	public static String annotatingConcordanceSelection; 
+	public static String errorWhileAnnotatingConcordanceSelectionDDot; 
+	public static String allLines; 
+	public static String errorWhileAnnotatingConcordanceDDot; 
+	public static String errorWhileDeletingAnnotationDDot; 
+	public static String lookingForTypedValueWithIdEquals; 
+	public static String noValueFoundWithTheP0Id; 
+	public static String aFFECT; 
+	public static String toSELECTIONEquals; 
+	public static String couldNotAnnotateTheValue; 
+	public static String onCertainSequences; 
+	public static String theSequence; 
+	public static String isOverlappingWith; 
+	public static String theEndOfAStructure; 
+	public static String at; 
+	public static String ConcordancesEditor_67;
+	public static String ConcordancesEditor_68;
+	public static String theStartOfAStructure; 
+	public static String aboutAnnotations; 
+	public static String errorWhileAffectionAnnotationDDot; 
+	public static String saveTheAnnotations; 
+	public static String openTheListOfCategories; 
+	public static String selectAValueAmongTheList; 
+	public static String valueEquals; 
+	public static String pleaseEnterTheNewTypeName; 
+	public static String newCategory; 
+	public static String withTheCategory; 
+	public static String oK; 
+	public static String confirmAnnotationAffectation; 
+	public static String youAreAboutToAnnotate; 
+	public static String listOfCategories; 
+	public static String squencesDeMotsCatgorievaleur; 
+	public static String closeTheToolbarWithoutSaving; 
+	public static String annotationCanceledByUser; 
+	public static String availableAnnotationTypesDDot; 
+	public static String errorDDotNoSuitableKnowledgeRepositoryFound; 
+	public static String concordanceAnnotationArea; 
+	public static String squencesDeMotsCatgorie; 
+	public static String motsPropritsInfDfaut; 
+	public static String all; 
+	public static String nouvelleProprit; 
+	public static String nomDeLaPropritPatternEqualsazaz09Plus; 
+	public static String property; 
+}
Index: tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.annotation.kr.rcp/src/org/txm/annotation/kr/rcp/messages/messages.properties	(revision 1335)
@@ -1,66 +1,57 @@
-ConcordancesEditor_100=Available values for {0}
-ConcordancesEditor_108=\ elements. Continue ?
-ConcordancesEditor_110=New value {0} for category {1}  
-ConcordancesEditor_112=The value {0} is not associated with the category {1}. Associate it ?   
-ConcordancesEditor_115=Add a new category
-ConcordancesEditor_116=Proceed to annotation
-ConcordancesEditor_15=Category
-ConcordancesEditor_17=Keywords annotation
-ConcordancesEditor_22=Affect
-ConcordancesEditor_24=Delete
-ConcordancesEditor_32=Enter a value for an id
-ConcordancesEditor_35=selected lines
-ConcordancesEditor_36=Annotating concordance selection...
-ConcordancesEditor_40=Error while annotating concordance selection: 
-ConcordancesEditor_49=all lines
-ConcordancesEditor_53=Error while annotating concordance: 
-ConcordancesEditor_54=Error while deleting annotation: 
-ConcordancesEditor_57=Looking for TypedValue with id=
-ConcordancesEditor_58=No value found with the {0} id.
-ConcordancesEditor_59=AFFECT 
-ConcordancesEditor_60=\ to SELECTION=
-ConcordancesEditor_61=Could not annotate the value '
-ConcordancesEditor_62='.\n on certain sequences. \n
-ConcordancesEditor_63=\t- The sequence 
-ConcordancesEditor_64=\ is overlapping with \n
-ConcordancesEditor_65=\t\t- the end of a structure 
-ConcordancesEditor_66=, at [
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+aboutAnnotations=About annotations
+addANewCategory=Add a new category
+affect=Affect
+aFFECT=AFFECT 
+all=All
+allLines=all lines
+annotatingConcordanceSelection=Annotating concordance selection...
+annotationCanceledByUser=Annotation canceled by user.
+at=, at [
+availableAnnotationTypesDDot=Available annotation types\: 
+availableValuesForP0=Available values for {0}
+category=Category
+closeTheToolbarWithoutSaving=Close the toolbar without saving
+concordanceAnnotationArea=Concordance Annotation area
 ConcordancesEditor_67=\ - 
 ConcordancesEditor_68=]\n
-ConcordancesEditor_69=\t\t- the start of a structure 
-ConcordancesEditor_70=, at [
-ConcordancesEditor_71=\ - 
-ConcordancesEditor_72=]\n
-ConcordancesEditor_73=About annotations
-ConcordancesEditor_74=Error while affection annotation: 
-ConcordancesEditor_76=Save the annotations
-ConcordancesEditor_77=Open the list of categories
-ConcordancesEditor_79=Select a value among the list
-ConcordancesEditor_80=value=
-ConcordancesEditor_81=Please enter the new type name
-ConcordancesEditor_82=New category
-ConcordancesEditor_83=with the category
-ConcordancesEditor_85=OK
-ConcordancesEditor_86=Confirm annotation affectation
-ConcordancesEditor_87=You are about to annotate  
-ConcordancesEditor_99=List of categories
-KRAnnotation_1=S�quences de mots (cat�gorie/valeur)
-KRAnnotation_16=Close the toolbar without saving
-KRAnnotation_17=Annotation canceled by user.
-KRAnnotation_4=Available annotation types: 
-KRAnnotation_5=Error: no suitable KnowledgeRepository found
-KRAnnotation_6=Concordance Annotation area
-SimpleKRAnnotation_1=S�quences de mots (cat�gorie)
-SimpleKRAnnotation_10=Close the toolbar without saving
-SimpleKRAnnotation_11=Annotation canceled by user.
-SimpleKRAnnotation_4=Available annotation types: 
-SimpleKRAnnotation_5=Concordance Annotation area
-WordAnnotationToolbar_1=Mots (propri�t�s) <- d�faut
-WordAnnotationToolbar_10=Available annotation types: 
-WordAnnotationToolbar_11=Concordance Annotation area
-WordAnnotationToolbar_12=All
-WordAnnotationToolbar_13=Close the toolbar without saving
-WordAnnotationToolbar_15=Nouvelle propri�t�
-WordAnnotationToolbar_16=Nom de la propri�t� pattern=[a-z][-a-z0-9]+
-WordAnnotationToolbar_2=Annotation canceled by user.
-WordAnnotationToolbar_3=Property
+confirmAnnotationAffectation=Confirm annotation affectation
+couldNotAnnotateTheValue=Could not annotate the value '
+delete=Delete
+elementsContinue=\ elements. Continue ?
+enterAValueForAnId=Enter a value for an id
+errorDDotNoSuitableKnowledgeRepositoryFound=Error\: no suitable KnowledgeRepository found
+errorWhileAffectionAnnotationDDot=Error while affection annotation\: 
+errorWhileAnnotatingConcordanceDDot=Error while annotating concordance\: 
+errorWhileAnnotatingConcordanceSelectionDDot=Error while annotating concordance selection\: 
+errorWhileDeletingAnnotationDDot=Error while deleting annotation\: 
+isOverlappingWith=\ is overlapping with \n
+keywordsAnnotation=Keywords annotation
+listOfCategories=List of categories
+lookingForTypedValueWithIdEquals=Looking for TypedValue with id\=
+motsPropritsInfDfaut=Mots (propri�t�s) <- d�faut
+newCategory=New category
+newValueP0ForCategoryP1=New value {0} for category {1}  
+nomDeLaPropritPatternEqualsazaz09Plus=Nom de la propri�t� pattern\=[a-z][-a-z0-9]+
+nouvelleProprit=Nouvelle propri�t�
+noValueFoundWithTheP0Id=No value found with the {0} id.
+oK=OK
+onCertainSequences='.\n on certain sequences. \n
+openTheListOfCategories=Open the list of categories
+pleaseEnterTheNewTypeName=Please enter the new type name
+proceedToAnnotation=Proceed to annotation
+property=Property
+saveTheAnnotations=Save the annotations
+selectAValueAmongTheList=Select a value among the list
+selectedLines=selected lines
+squencesDeMotsCatgorie=S�quences de mots (cat�gorie)
+squencesDeMotsCatgorievaleur=S�quences de mots (cat�gorie/valeur)
+theEndOfAStructure=\t\t- the end of a structure 
+theSequence=\t- The sequence 
+theStartOfAStructure=\t\t- the start of a structure 
+theValueP0IsNotAssociatedWithTheCategoryP1AssociateIt=The value {0} is not associated with the category {1}. Associate it ?   
+toSELECTIONEquals=\ to SELECTION\=
+valueEquals=value\=
+withTheCategory=with the category
+youAreAboutToAnnotate=You are about to annotate  
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/statsengine/r/function/SpecificitiesR.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/statsengine/r/function/SpecificitiesR.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/statsengine/r/function/SpecificitiesR.java	(revision 1335)
@@ -141,9 +141,9 @@
 		try {
 			res = r.asDoubleMatrix();
 		} catch (Exception e) {
-			throw new StatException(SpecificitiesCoreMessages.ComputeError_FAILED_TO_GET_SPECIFICITIES + e.getMessage(), e);
+			throw new StatException(SpecificitiesCoreMessages.failedToGetTheSpecificitesDDot + e.getMessage(), e);
 		}
-		Log.finest((res.length * res[0].length) + SpecificitiesCoreMessages.Specificites_2);
+		Log.finest((res.length * res[0].length) + SpecificitiesCoreMessages.specificityIndexComputed);
 
 		return res;
 	}
@@ -151,4 +151,4 @@
 	public double[][] getScores() {
 		return specIndex;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages.properties
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages.properties	(revision 1335)
@@ -1,25 +1,18 @@
-
-ChartsError_CANT_CREATE_SPECIFICITIES_FILE_CHART = Can''t create specificities chart file (charts engine: {0})
-
-Charts_BANALITY_MARKER_LABEL                     = Banality: {0}
-Charts_X_AXIS_LABEL                              = Part
-Charts_Y_AXIS_LABEL                              = Score
-
-ComputeError_FAILED_TO_GET_SPECIFICITIES    = ** Failed to get the specificites: 
-ComputeError_FOUND_AND_WANTED_ROWS_MISMATCH = ** Number of rows wanted ({0}) and found ({1}) mismatch.
-
-RESULT_TYPE = Specificities
-
-RelativeFrequency_3 = Relative Frequency %
-
-SELECTION_RESULT_TYPE = Specificities selection
-
-SpecificitesResult_0 = ** No specificities index array.
-SpecificitesResult_1 = ** The specificity index array does not properly represent a matrix.
-SpecificitesResult_2 = ** The lexical table cannot be null.
-SpecificitesResult_6 = ** Reference to non existing row.
-SpecificitesResult_8 = Unit
-
-Specificites_2       = \ specificity index computed
-
-error_errorWhileComputingSpecificities = Error while computing specificities: {0}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+banalityDDotP0=Banality\: {0}
+cantCreateSpecificitiesChartFileChartsEngineDDotP0=Can''t create specificities chart file (charts engine\: {0})
+error_errorWhileComputingSpecificities=Error while computing specificities\: {0}
+failedToGetTheSpecificitesDDot=** Failed to get the specificites\: 
+noSpecificitiesIndexArray=** No specificities index array.
+numberOfRowsWantedP0AndFoundP1Mismatch=** Number of rows wanted ({0}) and found ({1}) mismatch.
+part=Part
+referenceToNonExistingRow=** Reference to non existing row.
+relativeFrequencyPercent=Relative Frequency %
+RESULT_TYPE=Specificities
+score=Score
+specificitiesSelection=Specificities selection
+specificityIndexComputed=\ specificity index computed
+theLexicalTableCannotBeNull=** The lexical table cannot be null.
+theSpecificityIndexArrayDoesNotProperlyRepresentAMatrix=** The specificity index array does not properly represent a matrix.
+unit=Unit
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java	(revision 1335)
@@ -1,48 +1,48 @@
-package org.txm.specificities.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-
-
-/**
- * Specificities core messages. 
- * 
- * @author mdecorde
- * @author sjacquot
- *
- */
-public class SpecificitiesCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.specificities.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String RESULT_TYPE;
-	public static String SELECTION_RESULT_TYPE;
-	
-	public static String ChartsError_CANT_CREATE_SPECIFICITIES_FILE_CHART;
-	
-	public static String Charts_X_AXIS_LABEL;
-	public static String Charts_Y_AXIS_LABEL;
-	public static String Charts_BANALITY_MARKER_LABEL;
-
-	public static String ComputeError_FAILED_TO_GET_SPECIFICITIES;
-	public static String ComputeError_FOUND_AND_WANTED_ROWS_MISMATCH;
-	
-	public static String Specificites_2;
-	public static String SpecificitesResult_0;
-	public static String SpecificitesResult_1;
-	public static String SpecificitesResult_2;
-	public static String SpecificitesResult_6;
-	public static String SpecificitesResult_8;
-	public static String RelativeFrequency_3;
-
-
-
-	public static String error_errorWhileComputingSpecificities;
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, SpecificitiesCoreMessages.class);
-	}
-
-}
+package org.txm.specificities.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+
+
+/**
+ * Specificities core messages. 
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class SpecificitiesCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.specificities.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String RESULT_TYPE;
+	public static String specificitiesSelection; 
+	
+	public static String cantCreateSpecificitiesChartFileChartsEngineDDotP0; 
+	
+	public static String part; 
+	public static String score; 
+	public static String banalityDDotP0; 
+
+	public static String failedToGetTheSpecificitesDDot; 
+	public static String numberOfRowsWantedP0AndFoundP1Mismatch; 
+	
+	public static String specificityIndexComputed; 
+	public static String noSpecificitiesIndexArray; 
+	public static String theSpecificityIndexArrayDoesNotProperlyRepresentAMatrix; 
+	public static String theLexicalTableCannotBeNull; 
+	public static String referenceToNonExistingRow; 
+	public static String unit; 
+	public static String relativeFrequencyPercent; 
+
+
+
+	public static String error_errorWhileComputingSpecificities;
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, SpecificitiesCoreMessages.class);
+	}
+
+}
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_ru.properties	(revision 1335)
@@ -1,6 +1,5 @@
-
-RESULT_TYPE = Специфичность
-
-SELECTION_RESULT_TYPE = 
-
-error_errorWhileComputingSpecificities = ** Ошибка во время расчета специфичности: {0}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_errorWhileComputingSpecificities=** Ошибка во время расчета специфичности\: {0}
+RESULT_TYPE=Специфичность
+specificitiesSelection=
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_fr.properties	(revision 1335)
@@ -1,25 +1,18 @@
-
-ChartsError_CANT_CREATE_SPECIFICITIES_FILE_CHART = Impossible de créer le fichier du graphique des spécificités (moteur de production de graphiques: {0})
-
-Charts_BANALITY_MARKER_LABEL                     = Banalité : {0}
-Charts_X_AXIS_LABEL                              = Partie
-Charts_Y_AXIS_LABEL                              = Score
-
-ComputeError_FAILED_TO_GET_SPECIFICITIES    = ** Echec d'accès aux spécificités : 
-ComputeError_FOUND_AND_WANTED_ROWS_MISMATCH = ** Le nombre de lignes prévu ({0}) et trouvé ({1}) ne correspondent pas.
-
-RESULT_TYPE = Spécificités
-
-RelativeFrequency_3 = Fréquence Relative %
-
-SELECTION_RESULT_TYPE = Sélection de spécificités
-
-SpecificitesResult_0 = ** Pas de tableau d'index de spécificité
-SpecificitesResult_1 = ** Le tableau d'index des spécificités ne correspond pas à une matrice
-SpecificitesResult_2 = ** La table lexicale ne peut être nulle.
-SpecificitesResult_6 = ** Référence à une ligne inexistante
-SpecificitesResult_8 = Unité
-
-Specificites_2       = \ spécificités calculées
-
-error_errorWhileComputingSpecificities = ** Erreur lors du calcul des spécificités : {0}
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+banalityDDotP0=Banalité \: {0}
+cantCreateSpecificitiesChartFileChartsEngineDDotP0=Impossible de créer le fichier du graphique des spécificités (moteur de production de graphiques\: {0})
+error_errorWhileComputingSpecificities=** Erreur lors du calcul des spécificités \: {0}
+failedToGetTheSpecificitesDDot=** Echec d'accès aux spécificités \: 
+noSpecificitiesIndexArray=** Pas de tableau d'index de spécificité
+numberOfRowsWantedP0AndFoundP1Mismatch=** Le nombre de lignes prévu ({0}) et trouvé ({1}) ne correspondent pas.
+part=Partie
+referenceToNonExistingRow=** Référence à une ligne inexistante
+relativeFrequencyPercent=Fréquence Relative %
+RESULT_TYPE=Spécificités
+score=Score
+specificitiesSelection=Sélection de spécificités
+specificityIndexComputed=\ spécificités calculées
+theLexicalTableCannotBeNull=** La table lexicale ne peut être nulle.
+theSpecificityIndexArrayDoesNotProperlyRepresentAMatrix=** Le tableau d'index des spécificités ne correspond pas à une matrice
+unit=Unité
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/Specificities.java	(revision 1335)
@@ -220,16 +220,16 @@
 		this.symbol = symbol;
 
 		if (this.lexicalTable == null) {
-			throw new IllegalArgumentException(SpecificitiesCoreMessages.SpecificitesResult_2);
+			throw new IllegalArgumentException(SpecificitiesCoreMessages.theLexicalTableCannotBeNull);
 		}
 		this.name = name;
 
 		if (specIndex == null || specIndex.length == 0) {
-			throw new IllegalArgumentException(SpecificitiesCoreMessages.SpecificitesResult_0);
+			throw new IllegalArgumentException(SpecificitiesCoreMessages.noSpecificitiesIndexArray);
 		}
 		boolean ok = CheckArray.checkMatrixRepresentation(specIndex);
 		if (!ok) {
-			throw new IllegalArgumentException(SpecificitiesCoreMessages.SpecificitesResult_1);
+			throw new IllegalArgumentException(SpecificitiesCoreMessages.theSpecificityIndexArrayDoesNotProperlyRepresentAMatrix);
 		}
 
 		this.indices = specIndex;
@@ -259,13 +259,13 @@
 		if (this.rownames != null && this.rownames.size() != 0) {
 			if (this.rownames.size() != specIndex.length) {
 				throw new IllegalArgumentException(
-						SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.ComputeError_FOUND_AND_WANTED_ROWS_MISMATCH, this.rownames.size(), specIndex.length));
+						SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.numberOfRowsWantedP0AndFoundP1Mismatch, this.rownames.size(), specIndex.length));
 			}
 
 			rowindex = ArrayIndex.getIndex(this.lexicalTable.getRowNames().asStringsArray(), this.rownames.toArray(new String[] {}));
 			for (int i : rowindex) {
 				if (i == -1) {
-					throw new IllegalArgumentException(SpecificitiesCoreMessages.SpecificitesResult_6);
+					throw new IllegalArgumentException(SpecificitiesCoreMessages.referenceToNonExistingRow);
 				}
 			}
 		}
@@ -565,7 +565,7 @@
 			String[] names = getPartShortNames();
 			// if ("UTF-8".equals(encoding)) writer.write('\ufeff'); // UTF-8 BOM
 			//write column header
-			String txt = SpecificitiesCoreMessages.SpecificitesResult_8+colseparator+"F"; //$NON-NLS-1$
+			String txt = SpecificitiesCoreMessages.unit+colseparator+"F"; //$NON-NLS-1$
 			for(String colname : names) {
 				txt += colseparator+ "f_"+colname + colseparator + "Score"; //$NON-NLS-1$ //$NON-NLS-2$
 			}
@@ -749,4 +749,4 @@
 
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java	(revision 1335)
@@ -144,7 +144,7 @@
 
 	@Override
 	public String getResultype() {
-		return SpecificitiesCoreMessages.SELECTION_RESULT_TYPE;
+		return SpecificitiesCoreMessages.specificitiesSelection;
 	}
 
 
@@ -266,4 +266,4 @@
 	}
 
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/jfreechart/JFCSpecificitiesBarChartCreator.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/jfreechart/JFCSpecificitiesBarChartCreator.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/jfreechart/JFCSpecificitiesBarChartCreator.java	(revision 1335)
@@ -46,11 +46,11 @@
 
         if(drawBars)	{
 			// Create the bar chart
-	        chart = this.getChartsEngine().createXYBarChart(dataset, specificitiesSelection.getName(), SpecificitiesCoreMessages.Charts_X_AXIS_LABEL, SpecificitiesCoreMessages.Charts_Y_AXIS_LABEL, true, false);
+	        chart = this.getChartsEngine().createXYBarChart(dataset, specificitiesSelection.getName(), SpecificitiesCoreMessages.part, SpecificitiesCoreMessages.score, true, false);
         }
         else	{
 			// Create the line chart
-	        chart = this.getChartsEngine().createXYLineChart(result, dataset, specificitiesSelection.getName(), SpecificitiesCoreMessages.Charts_X_AXIS_LABEL, SpecificitiesCoreMessages.Charts_Y_AXIS_LABEL,
+	        chart = this.getChartsEngine().createXYLineChart(result, dataset, specificitiesSelection.getName(), SpecificitiesCoreMessages.part, SpecificitiesCoreMessages.score,
 	        		true, false, true, true, true, false, false);
         }
 
@@ -77,7 +77,7 @@
         // Add positive banality marker
         Marker marker = new ValueMarker(banality);
         marker.setPaint(Color.RED);
-        marker.setLabel(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.Charts_BANALITY_MARKER_LABEL, banality));
+        marker.setLabel(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.banalityDDotP0, banality));
         marker.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
         marker.setLabelTextAnchor(TextAnchor.BOTTOM_RIGHT);
         chart.getXYPlot().addRangeMarker(marker);
@@ -86,7 +86,7 @@
         // Add negative banality marker
         marker = new ValueMarker(-banality);
         marker.setPaint(Color.RED);
-        marker.setLabel(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.Charts_BANALITY_MARKER_LABEL, -banality));
+        marker.setLabel(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.banalityDDotP0, -banality));
         marker.setLabelAnchor(RectangleAnchor.TOP_RIGHT);
         marker.setLabelTextAnchor(TextAnchor.BOTTOM_RIGHT);
         chart.getXYPlot().addRangeMarker(marker);
@@ -148,7 +148,7 @@
 	        // Custom range axis to cut the values to minimum and maximum values
 	        chart.getXYPlot().setRangeAxis(new ExtendedNumberAxis((NumberAxis) chart.getXYPlot().getRangeAxis(), true, true, minimumValue, maximumValue));
 			
-	        chart.getXYPlot().setDomainAxis(new SymbolAxisBetweenTicks(SpecificitiesCoreMessages.Charts_X_AXIS_LABEL, xAxisSymbols));
+	        chart.getXYPlot().setDomainAxis(new SymbolAxisBetweenTicks(SpecificitiesCoreMessages.part, xAxisSymbols));
         }
         
 		super.updateChart(result);
@@ -165,4 +165,4 @@
 	
 	
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/r/RSpecificitiesBarChartCreator.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/r/RSpecificitiesBarChartCreator.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/r/RSpecificitiesBarChartCreator.java	(revision 1335)
@@ -162,7 +162,7 @@
 
 		}
 		catch (Exception e) {
-			Log.severe(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.ChartsError_CANT_CREATE_SPECIFICITIES_FILE_CHART, this.getChartsEngine().getName()) + e);
+			Log.severe(SpecificitiesCoreMessages.bind(SpecificitiesCoreMessages.cantCreateSpecificitiesChartFileChartsEngineDDotP0, this.getChartsEngine().getName()) + e);
 		}
 
 		return file;
@@ -176,4 +176,4 @@
 		return SpecificitiesSelection.class;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrast.java	(revision 1335)
@@ -113,7 +113,7 @@
 		String[] rowNames = getRowNames();
 
 		//write column header
-		String txt = SpecificitiesCoreMessages.SpecificitesResult_8+colseparator+"F"; //$NON-NLS-1$
+		String txt = SpecificitiesCoreMessages.unit+colseparator+"F"; //$NON-NLS-1$
 		for(String colname : getColNames()) {
 			txt += colseparator+ "f_"+colname + colseparator + "Score"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -282,4 +282,4 @@
 		return this.getClass().getSimpleName();
 	}
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/RelativeFrequency.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/RelativeFrequency.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/RelativeFrequency.java	(revision 1335)
@@ -32,7 +32,7 @@
 
 	@Override
 	public String getName() {
-		return SpecificitiesCoreMessages.RelativeFrequency_3;
+		return SpecificitiesCoreMessages.relativeFrequencyPercent;
 	}
 
 	@Override
@@ -57,4 +57,4 @@
 	public boolean canCompute() {
 		return itable != null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrasts.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrasts.java	(revision 1334)
+++ tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/Contrasts.java	(revision 1335)
@@ -38,7 +38,7 @@
 	
 	public boolean compute() throws Exception {
 		for (Contrast m : mesures) {
-			System.out.println(TXMCoreMessages.Contrasts_0+m.getName());
+			System.out.println(TXMCoreMessages.computingDDot+m.getName());
 			m.compute();
 		}
 		return true;
@@ -51,4 +51,4 @@
 	public ArrayList<ContrastMethod> getMethods() {
 		return methods;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/ArrayIndex.java
===================================================================
--- tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/ArrayIndex.java	(revision 1334)
+++ tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/ArrayIndex.java	(revision 1335)
@@ -53,12 +53,12 @@
 	 */
 	public static final int[] zeroToOneBasedIndex(int[] zero_based, int length) {
 		if (zero_based == null || zero_based.length == 0) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.ArrayIndex_0);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.theIndexArrayCanNotBeNullOrEmpty);
 		}
 		int[] one_based = new int[zero_based.length];
 		for (int i = 0; i < zero_based.length; i++) {
 			if (zero_based[i] < 0 || zero_based[i] >= length) {
-				throw new IllegalArgumentException(StatsEngineCoreMessages.ArrayIndex_1);
+				throw new IllegalArgumentException(StatsEngineCoreMessages.aZerobasedIndexCannotBeInf0OrSupToTheNumberOfIndexedElements);
 			}
 			one_based[i] = zero_based[i] + 1;
 		}
@@ -98,4 +98,4 @@
 		}
 		return result;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java
===================================================================
--- tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java	(revision 1334)
+++ tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/utils/VectorizeArray.java	(revision 1335)
@@ -66,19 +66,19 @@
 	 */
 	public final static double[] vectorizeByInner(double[][] matrix) {
 		if (matrix == null || matrix.length == 0) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_0);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix);
 		}
 		int inner_length = matrix[0].length;
 		if (inner_length < 1) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_1);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0);
 		}
 		double[] vector = new double[matrix.length * matrix[0].length];
 		for (int i = 0; i < matrix.length; i++) {
 			if (matrix[i] == null) {
-				throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_10);
+				throw new IllegalArgumentException(StatsEngineCoreMessages.anInnerArrayCannotBeNull);
 			}
 			if (inner_length != matrix[i].length) {
-				throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_3);
+				throw new IllegalArgumentException(StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength);
 			}
 			System.arraycopy(matrix[i], 0, vector, i * inner_length,
 					inner_length);
@@ -113,19 +113,19 @@
 	 */
 	public final static int[] vectorizeByInner(int[][] matrix) {
 		if (matrix == null || matrix.length == 0) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_4);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix);
 		}
 		int inner_length = matrix[0].length;
 		if (inner_length < 1) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_5);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0);
 		}
 		int[] vector = new int[matrix.length * matrix[0].length];
 		for (int i = 0; i < matrix.length; i++) {
 			if (matrix[i] == null) {
-				throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_10);
+				throw new IllegalArgumentException(StatsEngineCoreMessages.anInnerArrayCannotBeNull);
 			}
 			if (inner_length != matrix[i].length) {
-				throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_7);
+				throw new IllegalArgumentException(StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength);
 			}
 			System.arraycopy(matrix[i], 0, vector, i * inner_length, inner_length);
 		}
@@ -159,20 +159,20 @@
 	 */
 	public final static double[] vectorizeByOuter(double[][] matrix) {
 		if (matrix == null || matrix.length == 0) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_8);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.nothingToDoWithAnEmptyMatrix);
 		}
 		int inner_length = matrix[0].length;
 		int outer_length = matrix.length;
 		if (inner_length < 1) {
-			throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_9);
+			throw new IllegalArgumentException(StatsEngineCoreMessages.innerArraysMustBeOfDimensionSup0);
 		}
 		double[] vector = new double[matrix.length * matrix[0].length];
 		for (int i = 0; i < matrix.length; i++) {
 			if (matrix[i] == null) {
-				throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_10);
+				throw new IllegalArgumentException(StatsEngineCoreMessages.anInnerArrayCannotBeNull);
 			}
 			if (inner_length != matrix[i].length) {
-				throw new IllegalArgumentException(StatsEngineCoreMessages.VectorizeArray_11);
+				throw new IllegalArgumentException(StatsEngineCoreMessages.allTheInnerArrayDoNotHaveTheSameLength);
 			}
 			for (int j = 0; j < matrix[i].length; j++) {
 				vector[(j * outer_length) + i] = matrix[i][j];
@@ -182,4 +182,4 @@
 		return vector;
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages.properties
===================================================================
--- tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages.properties	(revision 1335)
@@ -1,39 +1,25 @@
-
-ArrayIndex_0 = ** The index array can not be null or empty.
-ArrayIndex_1 = ** A zero-based index cannot be < 0 or > to the number of indexed elements.
-
-Factor_0 = ** Not implemented
-
-MatrixImpl_10 = Row index (
-MatrixImpl_11 = ) too big (max 
-MatrixImpl_13 = Col index (
-MatrixImpl_14 = ) too big (max 
-MatrixImpl_19 = R object evaluated to null.
-MatrixImpl_2  = dim(
-MatrixImpl_20 = Unknown type: 
-MatrixImpl_21 = mode
-MatrixImpl_22 = Row index (
-MatrixImpl_23 = ) too big (max 
-MatrixImpl_28 = Column index (
-MatrixImpl_29 = ) too big (max 
-MatrixImpl_4  = Row names of a contingency table cannot be null.
-MatrixImpl_6  = Column names of a contingency table cannot be null
-MatrixImpl_67 = Matrix: failed to get nrow: 
-MatrixImpl_73 = MatrixImpl: Error: column size differs: original
-MatrixImpl_79 = Failed to get row names
-MatrixImpl_88 = Cannot delete all lines
-
-QuantitativeDataStructureImpl_2 = ** Cannot delete a non-existing object.
-
-VectorizeArray_0  = ** Nothing to do with an empty matrix
-VectorizeArray_1  = ** Inner arrays must be of dimension > 0.
-VectorizeArray_10 = ** An inner array cannot be null.
-VectorizeArray_11 = ** All the inner array do not have the same length.
-VectorizeArray_3  = ** All the inner array do not have the same length.
-VectorizeArray_4  = ** Nothing to do with an empty matrix
-VectorizeArray_5  = ** Inner arrays must be of dimension > 0.
-VectorizeArray_7  = ** All the inner array do not have the same length.
-VectorizeArray_8  = ** Nothing to do with an empty matrix
-VectorizeArray_9  = ** Inner arrays must be of dimension > 0.
-
-error_statsEngineNotReadyCancelingCommand = Statistics Engine is not ready, canceling command.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+allTheInnerArrayDoNotHaveTheSameLength=** All the inner array do not have the same length.
+anInnerArrayCannotBeNull=** An inner array cannot be null.
+aZerobasedIndexCannotBeInf0OrSupToTheNumberOfIndexedElements=** A zero-based index cannot be < 0 or > to the number of indexed elements.
+cannotDeleteAllLines=Cannot delete all lines
+cannotDeleteANonexistingObject=** Cannot delete a non-existing object.
+colIndex=Col index (
+columnIndex=Column index (
+columnNamesOfAContingencyTableCannotBeNull=Column names of a contingency table cannot be null
+dim=dim(
+error_statsEngineNotReadyCancelingCommand=Statistics Engine is not ready, canceling command.
+failedToGetRowNames=Failed to get row names
+innerArraysMustBeOfDimensionSup0=** Inner arrays must be of dimension > 0.
+matrixDDotFailedToGetNrowDDot=Matrix\: failed to get nrow\: 
+matrixImplDDotErrorDDotColumnSizeDiffersDDotOriginal=MatrixImpl\: Error\: column size differs\: original
+mode=mode
+nothingToDoWithAnEmptyMatrix=** Nothing to do with an empty matrix
+notImplemented=** Not implemented
+rObjectEvaluatedToNull=R object evaluated to null.
+rowIndex=Row index (
+rowNamesOfAContingencyTableCannotBeNull=Row names of a contingency table cannot be null.
+theIndexArrayCanNotBeNullOrEmpty=** The index array can not be null or empty.
+tooBigMax=) too big (max 
+unknownTypeDDot=Unknown type\: 
Index: tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/StatsEngineCoreMessages.java
===================================================================
--- tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/StatsEngineCoreMessages.java	(revision 1334)
+++ tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/StatsEngineCoreMessages.java	(revision 1335)
@@ -1,61 +1,51 @@
-package org.txm.statsengine.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Statistics engine core messages.
- * 
- * @author sjacquot
- *
- */
-public class StatsEngineCoreMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.statsengine.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String error_statsEngineNotReadyCancelingCommand;
-
-	
-	public static String VectorizeArray_0;
-	public static String VectorizeArray_1;
-	public static String VectorizeArray_10;
-	public static String VectorizeArray_11;
-	public static String VectorizeArray_3;
-	public static String VectorizeArray_4;
-	public static String VectorizeArray_5;
-	public static String VectorizeArray_7;
-	public static String VectorizeArray_8;
-	public static String VectorizeArray_9;
-
-	public static String ArrayIndex_0;
-	public static String ArrayIndex_1;
-	public static String Factor_0;
-	public static String MatrixImpl_10;
-	public static String MatrixImpl_11;
-	public static String MatrixImpl_13;
-	public static String MatrixImpl_14;
-	public static String MatrixImpl_19;
-	public static String MatrixImpl_2;
-	public static String MatrixImpl_20;
-	public static String MatrixImpl_21;
-	public static String MatrixImpl_22;
-	public static String MatrixImpl_23;
-	public static String MatrixImpl_28;
-	public static String MatrixImpl_29;
-	public static String MatrixImpl_4;
-	public static String MatrixImpl_6;
-	public static String MatrixImpl_67;
-	public static String MatrixImpl_73;
-	public static String MatrixImpl_79;
-	public static String MatrixImpl_88;
-
-	public static String QuantitativeDataStructureImpl_2;
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, StatsEngineCoreMessages.class);
-	}
-
-	private StatsEngineCoreMessages() {
-	}
-}
+package org.txm.statsengine.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Statistics engine core messages.
+ * 
+ * @author sjacquot
+ *
+ */
+public class StatsEngineCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.statsengine.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String error_statsEngineNotReadyCancelingCommand;
+
+	
+	public static String nothingToDoWithAnEmptyMatrix; 
+	public static String innerArraysMustBeOfDimensionSup0; 
+	public static String anInnerArrayCannotBeNull; 
+	public static String allTheInnerArrayDoNotHaveTheSameLength; 
+
+	public static String theIndexArrayCanNotBeNullOrEmpty; 
+	public static String aZerobasedIndexCannotBeInf0OrSupToTheNumberOfIndexedElements; 
+	public static String notImplemented; 
+	public static String rowIndex; 
+	public static String tooBigMax; 
+	public static String colIndex; 
+	public static String rObjectEvaluatedToNull; 
+	public static String dim; 
+	public static String unknownTypeDDot; 
+	public static String mode; 
+	public static String columnIndex; 
+	public static String rowNamesOfAContingencyTableCannotBeNull; 
+	public static String columnNamesOfAContingencyTableCannotBeNull; 
+	public static String matrixDDotFailedToGetNrowDDot; 
+	public static String matrixImplDDotErrorDDotColumnSizeDiffersDDotOriginal; 
+	public static String failedToGetRowNames; 
+	public static String cannotDeleteAllLines; 
+
+	public static String cannotDeleteANonexistingObject; 
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, StatsEngineCoreMessages.class);
+	}
+
+	private StatsEngineCoreMessages() {
+	}
+}
Index: tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-error_statsEngineNotReadyCancelingCommand = 
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_statsEngineNotReadyCancelingCommand=
Index: tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.statsengine.core/src/org/txm/statsengine/core/messages/messages_fr.properties	(revision 1335)
@@ -1,39 +1,25 @@
-
-ArrayIndex_0 = ** Le tableau d'index ne peut pas être nul ou vide.
-ArrayIndex_1 = ** Un index commençant à 0 ne peut pas être inférieur à 0 ou supérieur au nombre d'éléments indexés.
-
-Factor_0 = ** Non implémenté
-
-MatrixImpl_10 = Index de ligne (
-MatrixImpl_11 = ) trop grand (max 
-MatrixImpl_13 = Index de colonne (
-MatrixImpl_14 = ) trop grand (max 
-MatrixImpl_19 = L'objet R a une valeur nulle.
-MatrixImpl_2  = dim(
-MatrixImpl_20 = Type inconnu : 
-MatrixImpl_21 = mode
-MatrixImpl_22 = Index de ligne (
-MatrixImpl_23 = ) trop grand (max 
-MatrixImpl_28 = Index de colonne (
-MatrixImpl_29 = ) trop grand (max 
-MatrixImpl_4  = Les noms de lignes d'une matrice de contingence ne peuvent pas être nuls.
-MatrixImpl_6  = Les noms de colonnes d'une matrice de contingence ne peuvent pas être nuls.
-MatrixImpl_67 = Matrice: impossible d'obtenir le nombre de lignes: 
-MatrixImpl_73 = MatrixImpl: Erreur: la taille des colonnes diffère de l'originale
-MatrixImpl_79 = Impossible d'obtenir les noms de lignes
-MatrixImpl_88 = Impossible de supprimer toutes les lignes
-
-QuantitativeDataStructureImpl_2 = ** Impossible de supprimer un objet qui n'existe pas.
-
-VectorizeArray_0  = ** Rien à faire avec une matrice vide
-VectorizeArray_1  = ** Les tableaux internes doivent avoir une dimension supérieure à 0
-VectorizeArray_10 = ** Un tableau interne ne peut pas être nul
-VectorizeArray_11 = ** Les tableaux internes n'ont pas tous la même dimension.
-VectorizeArray_3  = ** Les tableaux internes n'ont pas tous la même dimension.
-VectorizeArray_4  = ** Rien à faire avec une matrice vide
-VectorizeArray_5  = ** Les tableaux internes doivent avoir une dimension supérieure à 0
-VectorizeArray_7  = * Les tableaux internes n'ont pas tous la même dimension.
-VectorizeArray_8  = ** Rien à faire avec une matrice vide
-VectorizeArray_9  = ** Les tableaux internes doivent avoir une dimension supérieure à 0
-
-error_statsEngineNotReadyCancelingCommand = Le moteur de statistiques n'est pas initialisé, annulation de la commande.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+allTheInnerArrayDoNotHaveTheSameLength=** Les tableaux internes n'ont pas tous la même dimension.
+anInnerArrayCannotBeNull=** Un tableau interne ne peut pas être nul
+aZerobasedIndexCannotBeInf0OrSupToTheNumberOfIndexedElements=** Un index commençant à 0 ne peut pas être inférieur à 0 ou supérieur au nombre d'éléments indexés.
+cannotDeleteAllLines=Impossible de supprimer toutes les lignes
+cannotDeleteANonexistingObject=** Impossible de supprimer un objet qui n'existe pas.
+colIndex=Index de colonne (
+columnIndex=Index de colonne (
+columnNamesOfAContingencyTableCannotBeNull=Les noms de colonnes d'une matrice de contingence ne peuvent pas être nuls.
+dim=dim(
+error_statsEngineNotReadyCancelingCommand=Le moteur de statistiques n'est pas initialisé, annulation de la commande.
+failedToGetRowNames=Impossible d'obtenir les noms de lignes
+innerArraysMustBeOfDimensionSup0=** Les tableaux internes doivent avoir une dimension supérieure à 0
+matrixDDotFailedToGetNrowDDot=Matrice\: impossible d'obtenir le nombre de lignes\: 
+matrixImplDDotErrorDDotColumnSizeDiffersDDotOriginal=MatrixImpl\: Erreur\: la taille des colonnes diffère de l'originale
+mode=mode
+nothingToDoWithAnEmptyMatrix=** Rien à faire avec une matrice vide
+notImplemented=** Non implémenté
+rObjectEvaluatedToNull=L'objet R a une valeur nulle.
+rowIndex=Index de ligne (
+rowNamesOfAContingencyTableCannotBeNull=Les noms de lignes d'une matrice de contingence ne peuvent pas être nuls.
+theIndexArrayCanNotBeNullOrEmpty=** Le tableau d'index ne peut pas être nul ou vide.
+tooBigMax=) trop grand (max 
+unknownTypeDDot=Type inconnu \: 
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java	(revision 1335)
@@ -1,38 +1,38 @@
-package org.txm.lexicaltable.rcp.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Lexical table UI messages.
- * 
- * @author sjacquot
- *
- */
-public class LexicalTableUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.txm.lexicaltable.rcp.messages.messages"; //$NON-NLS-1$
-	
-	public static String LexicalTableEditor_1;
-	public static String LexicalTableEditor_10;
-	public static String LexicalTableEditor_11;
-	public static String LexicalTableEditor_12;
-	public static String LexicalTableEditor_13;
-	public static String LexicalTableEditor_14;
-	public static String LexicalTableEditor_15;
-	public static String LexicalTableEditor_18;
-	public static String ComputeLexicalTable_12;
-	public static String ComputeLexicalTable_13;
-	public static String ComputeLexicalTable_16;
-	public static String ComputeLexicalTable_3;
-	public static String ComputeLexicalTable_5;
-	public static String ComputeLexicalTable_6;
-	public static String ComputeLexicalTable_7;
-	
-
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, LexicalTableUIMessages.class);
-	}
-}
+package org.txm.lexicaltable.rcp.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Lexical table UI messages.
+ * 
+ * @author sjacquot
+ *
+ */
+public class LexicalTableUIMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.lexicaltable.rcp.messages.messages"; //$NON-NLS-1$
+	
+	public static String errorDDotDifferentColumnsNumberDDotBeforeP0AfterP1; 
+	public static String mergeOrDeleteColumns; 
+	public static String mergeColsDDotP0; 
+	public static String deleteColsDDotP0; 
+	public static String mergeOrDeleteRows; 
+	public static String failedToImportLexicalTable; 
+	public static String errorWhileImportingDataDDotP0; 
+	public static String mergingLines; 
+	public static String userIndexOccurrences; 
+	public static String selectWhichMarginsYouWantToUse; 
+	public static String useAllOccurrences; 
+	public static String openingMargeConfigurationDialog; 
+	public static String canNotCreateALexicalTableWithAnIndexCreatedOnACorpus; 
+	public static String vocabulariesMustShareTheSamePropertiesDDotP0; 
+	public static String vocabulariesMustShareTheSamePartitionDDotP0; 
+	
+
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, LexicalTableUIMessages.class);
+	}
+}
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties	(revision 1335)
@@ -1,17 +1,17 @@
-
-ComputeLexicalTable_12 = User index occurrences
-ComputeLexicalTable_13 = Select which margins you want to use
-ComputeLexicalTable_16 = Use all occurrences
-ComputeLexicalTable_3  = Opening marge configuration dialog
-ComputeLexicalTable_5  = ** Can not create a lexical table with an index created on a corpus.
-ComputeLexicalTable_6  = ** Vocabularies must share the same properties: {0}.
-ComputeLexicalTable_7  = ** Vocabularies must share the same partition: {0}.
-
-LexicalTableEditor_1  = ** Error: different columns number: before {0} after {1}.
-LexicalTableEditor_10 = Merge or Delete columns
-LexicalTableEditor_11 = Merge cols: {0}
-LexicalTableEditor_12 = Delete cols: {0}
-LexicalTableEditor_13 = Merge or Delete rows
-LexicalTableEditor_14 = ** Failed to import lexical table.
-LexicalTableEditor_15 = ** Error while importing data: {0}.
-LexicalTableEditor_18 = Merging lines
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+canNotCreateALexicalTableWithAnIndexCreatedOnACorpus=** Can not create a lexical table with an index created on a corpus.
+deleteColsDDotP0=Delete cols\: {0}
+errorDDotDifferentColumnsNumberDDotBeforeP0AfterP1=** Error\: different columns number\: before {0} after {1}.
+errorWhileImportingDataDDotP0=** Error while importing data\: {0}.
+failedToImportLexicalTable=** Failed to import lexical table.
+mergeColsDDotP0=Merge cols\: {0}
+mergeOrDeleteColumns=Merge or Delete columns
+mergeOrDeleteRows=Merge or Delete rows
+mergingLines=Merging lines
+openingMargeConfigurationDialog=Opening marge configuration dialog
+selectWhichMarginsYouWantToUse=Select which margins you want to use
+useAllOccurrences=Use all occurrences
+userIndexOccurrences=User index occurrences
+vocabulariesMustShareTheSamePartitionDDotP0=** Vocabularies must share the same partition\: {0}.
+vocabulariesMustShareTheSamePropertiesDDotP0=** Vocabularies must share the same properties\: {0}.
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_ru.properties	(revision 1335)
@@ -1,17 +1,17 @@
-
-ComputeLexicalTable_12 = Употребления в индексе
-ComputeLexicalTable_13 = Выберите пределы для расчетов
-ComputeLexicalTable_16 = Использовать все употребления
-ComputeLexicalTable_3  = Открытие диалогового окна конфигурации пределов
-ComputeLexicalTable_5  = ** Невозможно построить словарную таблицу из Индекса, рассчитанного на корпусе
-ComputeLexicalTable_6  = ** Списки значений должны строиться на одинаковых сочетаниях свойств: {0}
-ComputeLexicalTable_7  = ** Списки значений должны иметь одинаковое распределение: {0}
-
-LexicalTableEditor_1  = ** Ошибка: Не совпадает число колонок: до {0} после {1}
-LexicalTableEditor_10 = Объед. или Удал. колонок
-LexicalTableEditor_11 = Объед. колонок: {0}
-LexicalTableEditor_12 = Удал. колонок: {0}
-LexicalTableEditor_13 = Объед. или Удал. строк
-LexicalTableEditor_14 = ** Не удалось импортировать словарную таблицу
-LexicalTableEditor_15 = ** Ошибка при импортировании данных: {0}
-LexicalTableEditor_18 = Объединение строк
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+canNotCreateALexicalTableWithAnIndexCreatedOnACorpus=** Невозможно построить словарную таблицу из Индекса, рассчитанного на корпусе
+deleteColsDDotP0=Удал. колонок\: {0}
+errorDDotDifferentColumnsNumberDDotBeforeP0AfterP1=** Ошибка\: Не совпадает число колонок\: до {0} после {1}
+errorWhileImportingDataDDotP0=** Ошибка при импортировании данных\: {0}
+failedToImportLexicalTable=** Не удалось импортировать словарную таблицу
+mergeColsDDotP0=Объед. колонок\: {0}
+mergeOrDeleteColumns=Объед. или Удал. колонок
+mergeOrDeleteRows=Объед. или Удал. строк
+mergingLines=Объединение строк
+openingMargeConfigurationDialog=Открытие диалогового окна конфигурации пределов
+selectWhichMarginsYouWantToUse=Выберите пределы для расчетов
+useAllOccurrences=Использовать все употребления
+userIndexOccurrences=Употребления в индексе
+vocabulariesMustShareTheSamePartitionDDotP0=** Списки значений должны иметь одинаковое распределение\: {0}
+vocabulariesMustShareTheSamePropertiesDDotP0=** Списки значений должны строиться на одинаковых сочетаниях свойств\: {0}
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_fr.properties	(revision 1335)
@@ -1,17 +1,17 @@
-
-ComputeLexicalTable_12 = Total toutes les occurrences recenses par l'index 
-ComputeLexicalTable_13 = Sélectionnez les marges à utiliser
-ComputeLexicalTable_16 = Total  toutes les occurrences du corpus 
-ComputeLexicalTable_3  = Ouverture de la boite de dialogue de configuration des marges
-ComputeLexicalTable_5  = ** Impossible de créer une table lexicale à partir d'un index créé sur un corpus.
-ComputeLexicalTable_6  = ** Les vocabulaires doivent être composés de la même combinaison de propriétés : {0}.
-ComputeLexicalTable_7  = ** Les vocabulaires doivent avoir la même partition : {0}.
-
-LexicalTableEditor_1  = ** Erreur : le nombre de colonne diffère : avant {0} après {1}.
-LexicalTableEditor_10 = Fusion ou Suppr. de colonnes
-LexicalTableEditor_11 = Fusion de colonnes : {0}
-LexicalTableEditor_12 = Suppr. de colonnes : {0}
-LexicalTableEditor_13 = Fusion ou Suppr. de lignes
-LexicalTableEditor_14 = ** L'importation de la table lexicale a échoué.
-LexicalTableEditor_15 = ** Erreur lors de l'importation des données : {0}.
-LexicalTableEditor_18 = Fusion de lignes
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+canNotCreateALexicalTableWithAnIndexCreatedOnACorpus=** Impossible de créer une table lexicale à partir d'un index créé sur un corpus.
+deleteColsDDotP0=Suppr. de colonnes \: {0}
+errorDDotDifferentColumnsNumberDDotBeforeP0AfterP1=** Erreur \: le nombre de colonne diffère \: avant {0} après {1}.
+errorWhileImportingDataDDotP0=** Erreur lors de l'importation des données \: {0}.
+failedToImportLexicalTable=** L'importation de la table lexicale a échoué.
+mergeColsDDotP0=Fusion de colonnes \: {0}
+mergeOrDeleteColumns=Fusion ou Suppr. de colonnes
+mergeOrDeleteRows=Fusion ou Suppr. de lignes
+mergingLines=Fusion de lignes
+openingMargeConfigurationDialog=Ouverture de la boite de dialogue de configuration des marges
+selectWhichMarginsYouWantToUse=Sélectionnez les marges à utiliser
+useAllOccurrences=Total  toutes les occurrences du corpus 
+userIndexOccurrences=Total toutes les occurrences recenses par l'index 
+vocabulariesMustShareTheSamePartitionDDotP0=** Les vocabulaires doivent avoir la même partition \: {0}.
+vocabulariesMustShareTheSamePropertiesDDotP0=** Les vocabulaires doivent être composés de la même combinaison de propriétés \: {0}.
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/ColumnSelectionListener.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/ColumnSelectionListener.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/ColumnSelectionListener.java	(revision 1335)
@@ -52,7 +52,7 @@
 	 */
 	@Override
 	public void widgetSelected(SelectionEvent e) {
-		StatusLine.setMessage(TXMUIMessages.SORT_COLUMN);
+		StatusLine.setMessage(TXMUIMessages.sortingColumn);
 		this.editor.sort(this.col, this.index);
 		StatusLine.setMessage(""); //$NON-NLS-1$
 	}
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java	(revision 1335)
@@ -132,7 +132,7 @@
 		table.setLinesVisible(true);
 
 		if (!(iEditorInput instanceof ITablableEditorInput)) {
-			throw new IllegalArgumentException(TXMUIMessages.TableEditor_0);
+			throw new IllegalArgumentException(TXMUIMessages.canNotCreateATableWithTheProvidedInformationDDotP0);
 		}
 
 		ITablableEditorInput tableInput = (ITablableEditorInput) iEditorInput;
@@ -223,4 +223,4 @@
 	public void setFocus() {
 		viewer.getControl().setFocus();
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditorInput.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditorInput.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditorInput.java	(revision 1335)
@@ -95,14 +95,14 @@
 
 			@Override
 			public String[] getColumnTitles() {
-				return new String[] { TXMUIMessages.FrequencyListEditorInput_3,
+				return new String[] { TXMUIMessages.form,
 						TXMCoreMessages.common_frequency };
 			}
 
 			@Override
 			public String[] getColumnTypes() {
-				return new String[] { TXMUIMessages.FrequencyListEditorInput_5,
-						TXMUIMessages.FrequencyListEditorInput_6 };
+				return new String[] { TXMUIMessages.string,
+						TXMUIMessages.integer };
 			}
 
 			@Override
@@ -119,7 +119,7 @@
 									v = res.getRow(i).asIntArray();
 								} catch (StatException e) {
 									System.err.println(NLS.bind(
-											TXMUIMessages.GraphicalLogger_0, e));
+											TXMUIMessages.errorDDotP0, e));
 								}
 								row.add(v);
 							}
@@ -174,4 +174,4 @@
 		return this.getResult().getProperty();
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java	(revision 1335)
@@ -245,11 +245,11 @@
 			
 			// Merge or delete columns button
 			mergeDeleteColumnsButton = new Button(extendedParametersArea, SWT.PUSH);
-			mergeDeleteColumnsButton.setText(LexicalTableUIMessages.LexicalTableEditor_10);
+			mergeDeleteColumnsButton.setText(LexicalTableUIMessages.mergeOrDeleteColumns);
 			mergeDeleteColumnsButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
-					StatusLine.setMessage(LexicalTableUIMessages.LexicalTableEditor_18);
+					StatusLine.setMessage(LexicalTableUIMessages.mergingLines);
 					ArrayList<Object> selection = new ArrayList<Object>();
 					MergeDeleteDialog d = new MergeDeleteDialog(e.display.getActiveShell(), new ArrayList<Object>(collist), selection, -1);
 
@@ -272,7 +272,7 @@
 							}
 							String newname = d.getMergeName();
 
-							System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_11, colindices));
+							System.out.println(NLS.bind(LexicalTableUIMessages.mergeColsDDotP0, colindices));
 							double[] firstcol = cols.get(colindices.get(0));
 
 							// merge selected cols into the first one
@@ -315,7 +315,7 @@
 							refreshTable(true);
 						} else// delete
 						{
-							System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_12, colindices));
+							System.out.println(NLS.bind(LexicalTableUIMessages.deleteColsDDotP0, colindices));
 							lexicalTable.getData().removeCols(colindices);
 
 							collist = new ArrayList<Object>();
@@ -347,7 +347,7 @@
 
 			// Merge or delete lines button
 			mergeDeleteRowsButton = new Button(extendedParametersArea, SWT.PUSH);
-			mergeDeleteRowsButton.setText(LexicalTableUIMessages.LexicalTableEditor_13);
+			mergeDeleteRowsButton.setText(LexicalTableUIMessages.mergeOrDeleteRows);
 			mergeDeleteRowsButton.addSelectionListener(new SelectionListener() {
 				@Override
 				public void widgetSelected(SelectionEvent e) {
@@ -470,8 +470,8 @@
 	 */
 	public void refreshInfos() {
 		try {
-			this.setContentDescription(TXMCoreMessages.common_t + lexicalTable.getData().getTotal() + TXMCoreMessages.V + lexicalTable.getData().getNRows()
-					+ TXMCoreMessages.FMIN_2 + lexicalTable.getData().getFMin() + TXMCoreMessages.FMAX_2 + lexicalTable.getData().getFMax());
+			this.setContentDescription(TXMCoreMessages.common_t + lexicalTable.getData().getTotal() + TXMCoreMessages.v + lexicalTable.getData().getNRows()
+					+ TXMCoreMessages.fmin + lexicalTable.getData().getFMin() + TXMCoreMessages.fmax + lexicalTable.getData().getFMax());
 		} catch (Exception e3) {
 			// TODO Auto-generated catch block
 			org.txm.rcp.utils.Logger.printStackTrace(e3);
@@ -672,7 +672,7 @@
 				String[] colnames = lexicalTable.getColNames().asStringsArray();
 				TableColumn[] cols = viewer.getTable().getColumns();
 				if (colnames.length > cols.length) {
-					Log.severe(LexicalTableUIMessages.bind(LexicalTableUIMessages.LexicalTableEditor_1, Arrays.toString(cols), Arrays.toString(colnames)));
+					Log.severe(LexicalTableUIMessages.bind(LexicalTableUIMessages.errorDDotDifferentColumnsNumberDDotBeforeP0AfterP1, Arrays.toString(cols), Arrays.toString(colnames)));
 					return;
 				}
 				for (int i = 0; i < colnames.length ; i++) {
@@ -684,10 +684,10 @@
 				viewer.getTable().getParent().layout();
 				refreshTable(false);
 			} else {
-				Log.severe(LexicalTableUIMessages.LexicalTableEditor_14);
+				Log.severe(LexicalTableUIMessages.failedToImportLexicalTable);
 			}
 		} catch(Exception e) {
-			Log.severe(LexicalTableUIMessages.bind(LexicalTableUIMessages.LexicalTableEditor_15, e));
+			Log.severe(LexicalTableUIMessages.bind(LexicalTableUIMessages.errorWhileImportingDataDDotP0, e));
 			org.txm.rcp.utils.Logger.printStackTrace(e);
 		}
 	}
@@ -714,7 +714,7 @@
 			} else if (index == -1) { // freqs
 				try {
 					lexicalTable.getData().sortByFreqs(reverse);
-					StatusLine.setMessage(TXMUIMessages.SORT_DONE);
+					StatusLine.setMessage(TXMUIMessages.sortDone);
 				} catch (Exception e2) {
 					org.txm.rcp.utils.Logger.printStackTrace(e2);
 				}
@@ -774,4 +774,4 @@
 	@Override
 	public void updateResultFromEditor() {
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/MergeDeleteDialog.java	(revision 1335)
@@ -80,7 +80,7 @@
 	@Override
 	protected void configureShell(Shell shell) {
 	      super.configureShell(shell);
-	      shell.setText(TXMUIMessages.MergeDeleteDialog_1);
+	      shell.setText(TXMUIMessages.mergeDelete);
 	   }
 
 
@@ -92,7 +92,7 @@
 		super.createDialogArea(parent);
 
 		mergeRadio = new Button(mainArea, SWT.RADIO);
-		mergeRadio.setText(TXMUIMessages.MergeDeleteDialog_0);
+		mergeRadio.setText(TXMUIMessages.merge);
 		mergeRadio.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,
 				2, 1));
 		mergeRadio.setSelection(true);
@@ -103,7 +103,7 @@
 				2, 1));
 		
 		newname = new Text(mainArea, SWT.SINGLE | SWT.BORDER);
-		newname.setText(TXMUIMessages.MergeDeleteDialog_4);
+		newname.setText(TXMUIMessages.mergeResultName);
 		newname.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 4,
 				1));
 
@@ -146,4 +146,4 @@
 	public String getMergeName() {
 		return mergename;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java	(revision 1335)
@@ -82,15 +82,15 @@
 			IWorkbenchWindow window = TXMWindows.getActiveWindow();
 			List<PartitionIndex> vocabularies = ((IStructuredSelection) HandlerUtil.getCurrentSelection(event)).toList();
 			
-			Log.info(LexicalTableUIMessages.ComputeLexicalTable_3);
+			Log.info(LexicalTableUIMessages.openingMargeConfigurationDialog);
 			ArrayList<String> choices = new ArrayList<String>();
-			choices.add(LexicalTableUIMessages.ComputeLexicalTable_16);
-			choices.add(LexicalTableUIMessages.ComputeLexicalTable_12);
+			choices.add(LexicalTableUIMessages.useAllOccurrences);
+			choices.add(LexicalTableUIMessages.userIndexOccurrences);
 			ListDialog dialog = new ListDialog(window.getShell());
 			dialog.setInput(choices);
 			dialog.setLabelProvider(new LabelProvider());
 			dialog.setContentProvider(new ArrayContentProvider());
-			dialog.setTitle(LexicalTableUIMessages.ComputeLexicalTable_13);
+			dialog.setTitle(LexicalTableUIMessages.selectWhichMarginsYouWantToUse);
 
 			int ret = dialog.open();
 			boolean useAllOccurrences = false;
@@ -101,7 +101,7 @@
 					return null;
 				}
 				String sel = (String) dialog.getResult()[0];
-				if(sel.equals(LexicalTableUIMessages.ComputeLexicalTable_16)) {
+				if(sel.equals(LexicalTableUIMessages.useAllOccurrences)) {
 					useAllOccurrences = true;
 				}
 			} else {
@@ -120,8 +120,8 @@
 			vocabularies = vocabularies.subList(0, 1);
 			for (PartitionIndex voc : vocabularies) {
 				if (!voc.isComputedWithPartition()) {
-					System.out.println(LexicalTableUIMessages.ComputeLexicalTable_5);
-					StatusLine.setMessage(LexicalTableUIMessages.ComputeLexicalTable_5);
+					System.out.println(LexicalTableUIMessages.canNotCreateALexicalTableWithAnIndexCreatedOnACorpus);
+					StatusLine.setMessage(LexicalTableUIMessages.canNotCreateALexicalTableWithAnIndexCreatedOnACorpus);
 					return false;
 				}
 			}
@@ -129,7 +129,7 @@
 			List<WordProperty> properties = vocabularies.get(0).getProperties();
 			for (PartitionIndex voc : vocabularies) {
 				if (!properties.equals(voc.getProperties())) {
-					Log.warning(NLS.bind(LexicalTableUIMessages.ComputeLexicalTable_6, properties));
+					Log.warning(NLS.bind(LexicalTableUIMessages.vocabulariesMustShareTheSamePropertiesDDotP0, properties));
 					return false;
 				}
 			}
@@ -138,7 +138,7 @@
 			Partition firstPartition = firstIndex.getPartition();
 			for (PartitionIndex voc : vocabularies) {
 				if (!firstPartition.equals(voc.getPartition())) {
-					Log.warning(NLS.bind(LexicalTableUIMessages.ComputeLexicalTable_7, firstPartition));
+					Log.warning(NLS.bind(LexicalTableUIMessages.vocabulariesMustShareTheSamePartitionDDotP0, firstPartition));
 					return false;
 				}
 			}
@@ -456,4 +456,4 @@
 	
 	
 	
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/MergeLines.java	(revision 1335)
@@ -68,8 +68,8 @@
 				return null;
 
 			String newname = ""; //$NON-NLS-1$
-			InputDialog d = new InputDialog(shell, TXMUIMessages.MergeCols_1,
-					TXMUIMessages.MergeLines_2, "", null); //$NON-NLS-1$ 
+			InputDialog d = new InputDialog(shell, TXMUIMessages.newName,
+					TXMUIMessages.editTheNameOfTheNewLineCreatedByTheMergedLines, "", null); //$NON-NLS-1$ 
 			if (d.open() == Window.OK)
 				newname = d.getValue();
 			else
@@ -93,7 +93,7 @@
 	static public void mergeLines(LexicalTableEditor LTeditor, String newname,
 			int[] selection) {
 		// sum the lines
-		StatusLine.setMessage(LexicalTableUIMessages.LexicalTableEditor_18);
+		StatusLine.setMessage(LexicalTableUIMessages.mergingLines);
 		List<double[]> cols = LTeditor.getCols();
 		LexicalTable table = LTeditor.getLexicalTable();
 		TableViewer lineTableViewer = LTeditor.getlineTableViewer();
@@ -128,4 +128,4 @@
 		}
 		StatusLine.setMessage(""); //$NON-NLS-1$
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java	(revision 1335)
@@ -77,7 +77,7 @@
 			return;
 
 		if (selection.length == LTeditor.getLexicalTable().getNRows()) {
-			System.out.println(TXMUIMessages.DeleteLines_0);
+			System.out.println(TXMUIMessages.theTableMustContainAtLeastOneLine);
 			return;
 		}
 
@@ -104,4 +104,4 @@
 		}
 	}
 
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/___MergeCols.java	(revision 1335)
@@ -67,8 +67,8 @@
 				return null;
 
 			String newname = ""; //$NON-NLS-1$
-			InputDialog d = new InputDialog(shell, TXMUIMessages.MergeCols_1,
-					TXMUIMessages.MergeCols_2, "", null); //$NON-NLS-1$ 
+			InputDialog d = new InputDialog(shell, TXMUIMessages.newName,
+					TXMUIMessages.editTheNameOfTheNewColumnCreatedByTheMergedColumns, "", null); //$NON-NLS-1$ 
 			if (d.open() == Window.OK)
 				newname = d.getValue();
 			else
@@ -110,16 +110,16 @@
 			// reset col name
 			table.getColNames().setString(selectedCols[0], newname);
 			try {
-				System.out.println(NLS.bind(TXMUIMessages.MergeCols_5
+				System.out.println(NLS.bind(TXMUIMessages.namesDDot
 						, Arrays.toString(table.getRowNames().asStringsArray())));
 			} catch (Exception e1) {
 				// TODO Auto-generated catch block
 				org.txm.rcp.utils.Logger.printStackTrace(e1);
 			}
 			;
-			System.out.println(TXMUIMessages.MergeCols_6);
+			System.out.println(TXMUIMessages.endOfColumnMerge);
 			LTeditor.refreshTable();
 		}
 		return null;
 	}
-}
+}
\ No newline at end of file
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_ru.properties	(revision 1334)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_ru.properties	(revision 1335)
@@ -1,2 +1,3 @@
-
-RESULT_TYPE = Словарная таблица
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+RESULT_TYPE=Словарная таблица
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_fr.properties	(revision 1334)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages_fr.properties	(revision 1335)
@@ -1,8 +1,7 @@
-
-RESULT_TYPE = Table lexicale
-
-error_lineXDoesNotHaveXXolumns           = La ligne {0} n'a pas {1} colonne(s).
-error_marginIsHigherThanThePartitionSize = Erreur : les marges sont plus grandes que la taille des parties.
-error_notEnoughColumns                   = Pas assez de colonnes : minimum 2 (ici : {0}).
-
-info_buildingLexicalTableWith = Construction de la table lexicale avec : {0}.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_lineXDoesNotHaveXXolumns=La ligne {0} n'a pas {1} colonne(s).
+error_marginIsHigherThanThePartitionSize=Erreur \: les marges sont plus grandes que la taille des parties.
+error_notEnoughColumns=Pas assez de colonnes \: minimum 2 (ici \: {0}).
+info_buildingLexicalTableWith=Construction de la table lexicale avec \: {0}.
+RESULT_TYPE=Table lexicale
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/LexicalTableCoreMessages.java
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/LexicalTableCoreMessages.java	(revision 1334)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/LexicalTableCoreMessages.java	(revision 1335)
@@ -1,27 +1,27 @@
-package org.txm.lexicaltable.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-import org.txm.utils.messages.Utf8NLS;
-
-/**
- * Lexical table core messages.
- * 
- * @author sjacquot
- *
- */
-public class LexicalTableCoreMessages extends NLS {
-	
-	private static final String BUNDLE_NAME = "org.txm.lexicaltable.core.messages.messages"; //$NON-NLS-1$
-	
-	public static String RESULT_TYPE;
-	
-	public static String info_buildingLexicalTableWith;
-	public static String error_marginIsHigherThanThePartitionSize;
-	public static String error_notEnoughColumns;
-	public static String error_lineXDoesNotHaveXXolumns;
-
-	static {
-		// initialize resource bundle
-		Utf8NLS.initializeMessages(BUNDLE_NAME, LexicalTableCoreMessages.class);
-	}
-}
+package org.txm.lexicaltable.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Lexical table core messages.
+ * 
+ * @author sjacquot
+ *
+ */
+public class LexicalTableCoreMessages extends NLS {
+	
+	private static final String BUNDLE_NAME = "org.txm.lexicaltable.core.messages.messages"; //$NON-NLS-1$
+	
+	public static String RESULT_TYPE;
+	
+	public static String info_buildingLexicalTableWith;
+	public static String error_marginIsHigherThanThePartitionSize;
+	public static String error_notEnoughColumns;
+	public static String error_lineXDoesNotHaveXXolumns;
+
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, LexicalTableCoreMessages.class);
+	}
+}
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages.properties
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages.properties	(revision 1334)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/messages/messages.properties	(revision 1335)
@@ -1,8 +1,7 @@
-
-RESULT_TYPE = Lexical table
-
-error_lineXDoesNotHaveXXolumns           = Line {0} does not have {1} column(s).
-error_marginIsHigherThanThePartitionSize = Error: margin is higher than the partition size.
-error_notEnoughColumns                   = Not enough columns: minimum 2 (here: {0}).
-
-info_buildingLexicalTableWith = Building lexical table with: {0}.
+#TXM messages generated by the PluginMessagesManager class
+#Mon Nov 12 17:18:22 CET 2018
+error_lineXDoesNotHaveXXolumns=Line {0} does not have {1} column(s).
+error_marginIsHigherThanThePartitionSize=Error\: margin is higher than the partition size.
+error_notEnoughColumns=Not enough columns\: minimum 2 (here\: {0}).
+info_buildingLexicalTableWith=Building lexical table with\: {0}.
+RESULT_TYPE=Lexical table
