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 1223)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 1224)
@@ -641,12 +641,13 @@
 						try {
 							cooc.sort(currentComparator);
 						} catch (CqiClientException e) {
-							Log.severe(CooccurrenceUIMessages.bind(CooccurrenceUIMessages.editor_error, e.getLocalizedMessage()));
+							Log.severe(TXMCoreMessages.error_errorWhileSortingResult);
+							org.txm.rcp.utils.Logger.printStackTrace(e);
 						}
 					}
 				});
 			} catch (Exception e) {
-				Log.severe(CooccurrenceUIMessages.bind(CooccurrenceUIMessages.editor_error, e.getLocalizedMessage()));
+				Log.severe(TXMCoreMessages.error_errorWhileSortingResult);
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 			TXMEditor.packColumns(this.viewer);
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 1223)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/messages/CooccurrenceUIMessages.java	(revision 1224)
@@ -38,8 +38,6 @@
 	public static String CooccurrencesEditor_8;
 	public static String CooccurrencesEditor_9;
 
-	public static String editor_error;
-
 	static {
 		// initialize resource bundle
 		Utf8NLS.initializeMessages(BUNDLE_NAME, CooccurrenceUIMessages.class);
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 1223)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_ru.properties	(revision 1224)
@@ -5,17 +5,14 @@
 ColsRowsInfosEditor_0 = Ошибочный ввод
 ColsRowsInfosEditor_2 = Информация: {0}
 
-ComputeCorrespondanceAnalysisDialog_0 = Факторный анализ соответствий {0}
+ComputeCorrespondanceAnalysis_0  = Расчет факторного анализа соответствий
+ComputeCorrespondanceAnalysis_1  = ** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок в таблице
+ComputeCorrespondanceAnalysis_13 = ** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок
+ComputeCorrespondanceAnalysis_14 = Открытие результатов факторного анализа соответствий
+ComputeCorrespondanceAnalysis_15 = Создание окна ФАС
+ComputeCorrespondanceAnalysis_4  = ** Невозможно провести факторный анализ соответствий при наличии только 
+ComputeCorrespondanceAnalysis_8  = Загрузка результатов факторного анализа
 
-ComputeCorrespondanceAnalysis_0       = Расчет факторного анализа соответствий
-ComputeCorrespondanceAnalysis_1       = ** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок в таблице
-ComputeCorrespondanceAnalysis_13      = ** Невозможно провести факторный анализ соответствий при наличии менее 4-х колонок
-ComputeCorrespondanceAnalysis_14      = Открытие результатов факторного анализа соответствий
-ComputeCorrespondanceAnalysis_15      = Создание окна ФАС
-ComputeCorrespondanceAnalysis_3       = ** Ошибка
-ComputeCorrespondanceAnalysis_4       = ** Невозможно провести факторный анализ соответствий при наличии только 
-ComputeCorrespondanceAnalysis_8       = Загрузка результатов факторного анализа
-
 CorrespondanceAnalysisEditorInput_0  = Собственные значения
 CorrespondanceAnalysisEditorInput_1  = Факт. план
 CorrespondanceAnalysisEditorInput_11 = ∑
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 1223)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/CAUIMessages.java	(revision 1224)
@@ -34,11 +34,9 @@
 	public static String ComputeCorrespondanceAnalysis_14;
 	public static String ComputeCorrespondanceAnalysis_15;
 	public static String ComputeCorrespondanceAnalysis_1;
-	public static String ComputeCorrespondanceAnalysis_3;
 	public static String ComputeCorrespondanceAnalysis_4;
 	public static String ComputeCorrespondanceAnalysis_8;
 	
-	public static String ComputeCorrespondanceAnalysisDialog_0;
 	
 	public static String CorrespondanceAnalysisEditorInput_0;
 	public static String CorrespondanceAnalysisEditorInput_11;
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 1223)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages_fr.properties	(revision 1224)
@@ -8,19 +8,16 @@
 ColRowInfosLabelProvider_9  = χ²
 
 ColsRowsInfosEditor_0 = Entrée erronée
-ColsRowsInfosEditor_2 = Infos: {0}
+ColsRowsInfosEditor_2 = Infos : {0}
 
-ComputeCorrespondanceAnalysisDialog_0 = Analyse factorielle des correspondances avec {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
 
-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_3       = ** Erreur
-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 = ∑
@@ -40,3 +37,5 @@
 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 = 
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 1223)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/messages/messages.properties	(revision 1224)
@@ -12,17 +12,14 @@
 ColsRowsInfosEditor_0 = Wrong input
 ColsRowsInfosEditor_2 = Infos: {0}
 
-ComputeCorrespondanceAnalysisDialog_0 = Correspondence analysis with {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...
 
-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_3       = ** Error
-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 = ∑
@@ -31,9 +28,6 @@
 CorrespondanceAnalysisEditorInput_5  = Eigenvalue
 CorrespondanceAnalysisEditorInput_8  = Rows infos
 CorrespondanceAnalysisEditorInput_9  = Cols infos
-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}
 
 PreferencePage_0                       = Quality column format
 PreferencePage_1                       = Contribution column format
@@ -45,3 +39,7 @@
 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}
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 1223)
+++ tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/RelativeFrequency.java	(revision 1224)
@@ -1,18 +1,20 @@
 package org.txm.functions.contrasts;
 
-import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.results.TXMParameters;
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
+import org.txm.specificities.core.messages.SpecificitiesCoreMessages;
 import org.txm.statsengine.r.core.RWorkspace;
 
 public class RelativeFrequency extends Contrast {
 	
 	private ILexicalTable itable;
 
+	/**
+	 * 
+	 * @param table
+	 */
 	public RelativeFrequency(LexicalTable table) {
 		super(table);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
@@ -23,14 +25,14 @@
 		frequencies = RWorkspace.getRWorkspaceInstance().evalToInt2D(itable.getSymbol());
 		
 		// compute
-		String cmd = symbol +" <- 100*"+itable.getSymbol()+" / rowSums("+itable.getSymbol()+")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		String cmd = symbol +" <- 100*" + itable.getSymbol() + " / rowSums(" + itable.getSymbol() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		indices = RWorkspace.getRWorkspaceInstance().evalToDouble2D(cmd);
 		return true;
 	}
 
 	@Override
 	public String getName() {
-		return TXMCoreMessages.RelativeFrequency_3;
+		return SpecificitiesCoreMessages.RelativeFrequency_3;
 	}
 
 	@Override
Index: tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/AbsoluteFrequency.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/AbsoluteFrequency.java	(revision 1223)
+++ tmp/org.txm.specificities.core/src/org/txm/functions/contrasts/AbsoluteFrequency.java	(revision 1224)
@@ -1,8 +1,6 @@
 package org.txm.functions.contrasts;
 
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.results.TXMParameters;
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
 import org.txm.statsengine.core.StatException;
@@ -31,17 +29,17 @@
 
 	@Override
 	public String getName() {
-		return TXMCoreMessages.AbsoluteFrequency_1;
+		return TXMCoreMessages.common_absoluteFrequency;
 	}
 
 	@Override
 	public String getSimpleName() {
-		return TXMCoreMessages.AbsoluteFrequency_1;
+		return TXMCoreMessages.common_absoluteFrequency;
 	}
 
 	@Override
 	public String getDetails() {
-		return TXMCoreMessages.AbsoluteFrequency_1;
+		return TXMCoreMessages.common_absoluteFrequency;
 	}
 
 	@Override
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 1223)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages.properties	(revision 1224)
@@ -10,6 +10,8 @@
 
 RESULT_TYPE = Specificities
 
+RelativeFrequency_3 = Relative Frequency %
+
 SELECTION_RESULT_TYPE = Specificities selection
 
 SpecificitesResult_0 = ** No specificities index array.
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 1223)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/SpecificitiesCoreMessages.java	(revision 1224)
@@ -34,7 +34,10 @@
 	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 {
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 1223)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/messages/messages_fr.properties	(revision 1224)
@@ -10,6 +10,8 @@
 
 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é
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java	(revision 1223)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java	(revision 1224)
@@ -4,9 +4,9 @@
 import org.eclipse.swt.layout.GridData;
 
 /**
- * extends the index editor to : 
- * set the number of property to 1 
- * hide the query field
+ * Extends the index editor to :
+ * - set the number of property to 1 
+ * - hide the query field
  * 
  *  @author mdecorde.
  */
@@ -19,6 +19,7 @@
 		super._createPartControl();
 		
 		this.propertiesSelector.setMaxPropertyNumber(1);
+		
 		this.queryWidget.setText("[]"); //$NON-NLS-1$
 		this.queryWidget.setEnabled(false);
 		this.queryWidget.setVisible(false);
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 1223)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 1224)
@@ -72,7 +72,7 @@
 import org.txm.utils.logger.Log;
 
 /**
- * display an index/lexicon parameters and result.
+ * Index editor.
  *
  * @author mdecorde
  */
@@ -509,7 +509,7 @@
 
 		lFminInfo.setText(TXMCoreMessages.FMIN_2 + index.getFmin());
 		lFmaxInfo.setText(TXMCoreMessages.FMAX_2 + index.getFmax());
-		lTInfo.setText(TXMCoreMessages.T + index.getT());
+		lTInfo.setText(TXMCoreMessages.common_t + index.getT());
 		lVInfo.setText(TXMCoreMessages.V + index.getV());
 
 		lVInfo.getParent().layout();
@@ -544,7 +544,7 @@
 	}
 
 	/**
-	 * Gets the corpus.
+	 * Gets the corpus of the index.
 	 *
 	 * @return the corpus
 	 */
@@ -553,14 +553,9 @@
 	}
 
 	/**
-	 * Sets the focus.
-	 *
-	 * @param query the new focus
+	 * Gets the query of the query widget.
+	 * @return
 	 */
-	public void setFocus(String query) {
-		this.queryWidget.setText(query);
-	}
-
 	public Query getQuery() {
 		return queryWidget.getQuery();
 	}
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 1223)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java	(revision 1224)
@@ -599,7 +599,7 @@
 
 		lFminInfo.setText(TXMCoreMessages.FMIN_2 + index.getFmin());
 		lFmaxInfo.setText(TXMCoreMessages.FMAX_2 + index.getFmax());
-		lTInfo.setText(TXMCoreMessages.T + index.getT());
+		lTInfo.setText(TXMCoreMessages.common_t + index.getT());
 		lVInfo.setText(TXMCoreMessages.V + index.getV());
 
 		lVInfo.getParent().layout();
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 1223)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/ProgressionUIMessages.java	(revision 1224)
@@ -18,8 +18,6 @@
 	public static String ProgressionEventCallBack_error_missing_default_edition;
 	public static String ProgressionEventCallBack_error_missing_text;
 	
-	public static String common_ok;
-
 	public static String ProgressionPreferencePage_3;
 	public static String ProgressionPreferencePage_6;
 	public static String ProgressionPreferencePage_7;
@@ -45,12 +43,8 @@
 
 	public static String ProgressionEditor_select_property_file;
 
-	public static String error_error2;
-
 	public static String error_theQueryIsAlreadyRepresentedByACurveInTheGraphic;
 
-	public static String preferences_multipleLineStrokeStyles;
-	
 	static {
 		// initializes resource bundle
 		Utf8NLS.initializeMessages(BUNDLE_NAME, ProgressionUIMessages.class);
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 1223)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/messages/messages.properties	(revision 1224)
@@ -1,5 +1,4 @@
 
-common_ok=
 ProgressionDialog_1  = Chart type:
 ProgressionDialog_11 = Bandewidth multiplier:
 ProgressionDialog_15 = Repeat same values
@@ -7,21 +6,20 @@
 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
 
+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_error2=
 error_theQueryIsAlreadyRepresentedByACurveInTheGraphic = The query {0} is already represented by a curve in the graphic. Please use another query.
-preferences_multipleLineStrokeStyles=
-
-ProgressionEventCallBack_error=Error: 
-ProgressionEventCallBack_error_missing_default_edition=Default edition is missing.
-ProgressionEventCallBack_error_missing_text=Text {0} is missing.
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Part.java	(revision 1224)
@@ -31,6 +31,7 @@
 
 import org.eclipse.osgi.util.NLS;
 import org.txm.core.messages.TXMCoreMessages;
+import org.txm.searchengine.core.messages.SearchEngineCoreMessages;
 import org.txm.searchengine.cqp.CQPSearchEngine;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.query.CQLQuery;
@@ -79,7 +80,8 @@
 	@Override
 	protected boolean _compute() throws Exception {
 
-		Log.finest(NLS.bind(TXMCoreMessages.CREATING_PART, this.getName(), this.pQuery));
+		Log.info(NLS.bind(SearchEngineCoreMessages.info_partXCreatedWithQueryZ, this.getName(), this.pQuery));
+		
 		long start = System.currentTimeMillis();
 		try {
 			super._compute();
@@ -94,7 +96,7 @@
 			}
 		}
 		long end = System.currentTimeMillis();
-		Log.finest(NLS.bind(TXMCoreMessages.info_partCreatedInXMs, this.getParent().getName() + "_" + this.getName(), (end - start))); //$NON-NLS-1
+		Log.finest(NLS.bind(SearchEngineCoreMessages.info_partCreatedInXMs, this.getParent().getName() + "_" + this.getName(), (end - start))); //$NON-NLS-1
 
 		return true;
 	}
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java	(revision 1224)
@@ -49,6 +49,7 @@
 import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMParameters;
 import org.txm.core.results.TXMResult;
+import org.txm.searchengine.core.messages.SearchEngineCoreMessages;
 import org.txm.searchengine.cqp.CQPPreferences;
 import org.txm.searchengine.cqp.CQPSearchEngine;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -133,7 +134,7 @@
 			this.userName = "no_name";
 		}
 		
-		Log.info(NLS.bind(TXMCoreMessages.info_creatingNewPartition, this.getParent(), this.userName));
+		Log.info(NLS.bind(SearchEngineCoreMessages.info_creatingNewPartition, this.getParent(), this.userName));
 		long start = System.currentTimeMillis();
 		for (int i = 0; i < pQueries.size(); i++) {
 			String queryS = pQueries.get(i);
@@ -148,7 +149,7 @@
 			new Part(this, partName, queryS);
 		}
 		long end = System.currentTimeMillis();
-		Log.info(NLS.bind(TXMCoreMessages.info_partitionCreatedInXMs, this.userName, (end - start)));
+		Log.info(NLS.bind(SearchEngineCoreMessages.info_partitionCreatedInXMs, this.userName, (end - start)));
 
 		return pQueries.size() > 0;
 	}
@@ -255,7 +256,7 @@
 			return true;
 		}
 		
-		Log.finest(NLS.bind(TXMCoreMessages.info_creatingNewPartition, this.getParent(), this.userName));
+		Log.finest(NLS.bind(SearchEngineCoreMessages.info_creatingNewPartition, this.getParent(), this.userName));
 		
 		if (this.pProperty != null) {
 			_compute_with_property();
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java	(revision 1224)
@@ -43,6 +43,7 @@
 import org.txm.objects.CorpusBuild;
 import org.txm.objects.Project;
 import org.txm.objects.SavedQuery;
+import org.txm.searchengine.core.messages.SearchEngineCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.clientExceptions.InvalidCqpIdException;
 import org.txm.searchengine.cqp.core.functions.selection.SelectionResult;
@@ -244,12 +245,11 @@
 	 * @return the subcorpus
 	 * @throws CqiClientException the cqi client exception
 	 */
-	public Subcorpus createSubcorpus(CQLQuery query, String subcorpusName,
-			boolean registered) throws CqiClientException {
+	public Subcorpus createSubcorpus(CQLQuery query, String subcorpusName, boolean registered) throws CqiClientException {
+		
 		Subcorpus subcorpus;
 		String subcorpusCqpId = subcorpusNamePrefix + getNextSubcorpusCounter().toString();
-		Log.finest(TXMCoreMessages.CREATING_SUBCORPUS + this.getQualifiedCqpId()
-				+ " " + subcorpusName + " " + query.getQueryString()); //$NON-NLS-1$ //$NON-NLS-2$
+		Log.finest(TXMCoreMessages.bind(SearchEngineCoreMessages.info_creatingSubcorpusXFromCorpusYWithTheQueryZ, subcorpusName, this.getQualifiedCqpId(), query.getQueryString()));
 
 		long start = System.currentTimeMillis();
 		try {
@@ -264,8 +264,8 @@
 			throw new CqiClientException(e);
 		}
 		long end = System.currentTimeMillis();
-		Log.finest(TXMCoreMessages.SUBCORPUS_CREATED + subcorpusName
-				+ TXMCoreMessages.Corpus_8 + (end - start));
+		
+		Log.info(TXMCoreMessages.bind(SearchEngineCoreMessages.SUBCORPUS_CREATED, subcorpusName, (end - start)));
 
 //		if (!registered) subcorpus.registerToParent();
 		return subcorpus;
@@ -405,7 +405,7 @@
 //	 *             the cqi client exception
 //	 */
 //	public void dropPartition(Partition partition) throws CqiClientException {
-//		Log.finest(TXMCoreMessages.info_deletingPartition + partition.getName());
+//		Log.finest(SearchEngineCoreMessages.info_deletingPartition + partition.getName());
 //		for (Part part : partition.getParts())
 //			try {
 //				CorpusManager.getCorpusManager().getCqiClient().dropSubCorpus(part.getQualifiedCqpId());
@@ -423,9 +423,8 @@
 	 * @throws CqiClientException
 	 *             the cqi client exception
 	 */
-	public void dropQueryResult(QueryResult queryResult)
-			throws CqiClientException {
-		Log.finest(TXMCoreMessages.DROP_QUERYRESULT + queryResult.getName());
+	public void dropQueryResult(QueryResult queryResult) throws CqiClientException {
+		Log.info(SearchEngineCoreMessages.DROP_QUERYRESULT + queryResult.getName());
 		try {
 			CorpusManager.getCorpusManager().getCqiClient().dropSubCorpus(queryResult.getQualifiedCqpId());
 		} catch (Exception e) {
@@ -443,7 +442,7 @@
 	 *             the cqi client exception
 	 */
 	public boolean dropSubcorpus(CQPCorpus subcorpus) throws CqiClientException {
-		Log.finest(NLS.bind(TXMCoreMessages.DROP_SUBCORPUS, subcorpus.getName()));
+		Log.finest(NLS.bind(SearchEngineCoreMessages.DROP_SUBCORPUS, subcorpus.getName()));
 		subcorpus.dropAllSubcorpora();
 //		subcorpus.dropAllPartitions();
 		try {
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/creationdelete partition et subcorpus.java	(revision 1224)
@@ -283,7 +283,7 @@
 //	 *             the cqi client exception
 //	 */
 //	public void dropPartition(Partition partition) throws CqiClientException {
-//		Log.finest(TXMCoreMessages.info_deletingPartition + partition.getName());
+//		Log.finest(SearchEngineCoreMessages.info_deletingPartition + partition.getName());
 //		for (Part part : partition.getParts())
 //			try {
 //				CQPSearchEngine.getCqiClient().dropSubCorpus(part.getQualifiedCqpId());
@@ -303,7 +303,7 @@
 //	 */
 //	public void dropQueryResult(QueryResult queryResult)
 //			throws CqiClientException {
-//		Log.finest(TXMCoreMessages.DROP_QUERYRESULT + queryResult.getName());
+//		Log.finest(SearchEngineCoreMessages.DROP_QUERYRESULT + queryResult.getName());
 //		try {
 //			CQPSearchEngine.getCqiClient().dropSubCorpus(queryResult.getQualifiedCqpId());
 //		} catch (Exception e) {
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Subcorpus.java	(revision 1224)
@@ -38,6 +38,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMParameters;
+import org.txm.searchengine.core.messages.SearchEngineCoreMessages;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.CQPSearchEngine;
 import org.txm.searchengine.cqp.NetCqiClient;
@@ -45,6 +46,7 @@
 import org.txm.searchengine.cqp.clientExceptions.InvalidCqpIdException;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
 import org.txm.searchengine.cqp.core.functions.selection.SelectionResult;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.searchengine.cqp.corpus.query.CQLQuery;
 import org.txm.searchengine.cqp.corpus.query.Match;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
@@ -185,7 +187,7 @@
 				throw new CqiClientException(e);
 			}
 			long end = System.currentTimeMillis();
-			Log.finest(NLS.bind(TXMCoreMessages.END_SUBCORPUS_SIZE, new Object[]{this.pID, this.size, (end - start)}));
+			Log.finest(NLS.bind(SearchEngineCoreMessages.END_SUBCORPUS_SIZE, new Object[]{this.pID, this.size, (end - start)}));
 		}
 		return this.size;
 	}
@@ -256,7 +258,7 @@
 	@Override
 	public boolean checkCqpId(String pID) throws InvalidCqpIdException {
 		if (!AbstractCqiClient.checkSubcorpusId(pID))
-			throw new InvalidCqpIdException(pID + TXMCoreMessages.Subcorpus_3);
+			throw new InvalidCqpIdException(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.Subcorpus_3, pID));
 		return true;
 	}
 
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/AbstractCqiClient.java	(revision 1224)
@@ -37,16 +37,16 @@
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.searchengine.cqp.corpus.CQPCorpus;
 import org.txm.searchengine.cqp.corpus.CorpusManager;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.QueryResult;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
+import org.txm.searchengine.cqp.corpus.query.CQLQuery;
 import org.txm.searchengine.cqp.corpus.query.Match;
-import org.txm.searchengine.cqp.corpus.query.CQLQuery;
 import org.txm.searchengine.cqp.serverException.CqiCqpErrorNoSuchCorpus;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
 import org.txm.utils.logger.Log;
@@ -60,6 +60,10 @@
 
 	static Pattern pattern = Pattern.compile("\\p{Upper}(\\p{Upper}|\\p{Digit}|[_-])*"); //$NON-NLS-1$
 	static Pattern pattern2 = Pattern.compile("\\p{Upper}(\\p{Lower}|\\p{Digit}|[_-])*"); //$NON-NLS-1$
+
+	String lastError;
+
+	
 	/**
 	 * Check wether <code>id</code> is a valid CQi for a corpus.
 	 *
@@ -83,11 +87,11 @@
 		return pattern2.matcher(id).matches();
 	}
 	
-	String lastError;
 	public synchronized String getLastError(){	
-		if(lastError != null && lastError.length() > 0)
+		if(lastError != null && lastError.length() > 0) {
 			return lastError;
-		return TXMCoreMessages.AbstractCqiClient_2;
+		}
+		return CQPSearchEngineCoreMessages.AbstractCqiClient_2;
 	}
 	
 	public List<String> getSingleData(Property prop) throws IOException, CqiServerError, CqiClientException {
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages_fr.properties	(revision 1224)
@@ -0,0 +1,76 @@
+
+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}.
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java	(revision 1224)
@@ -15,7 +15,75 @@
 
 	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);
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/messages.properties	(revision 1224)
@@ -0,0 +1,76 @@
+
+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}.
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/functions/summary/Summary.java	(revision 1224)
@@ -11,11 +11,13 @@
 import org.txm.objects.Page;
 import org.txm.objects.Text;
 import org.txm.searchengine.cqp.CQPSearchEngine;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.searchengine.cqp.corpus.MainCorpus;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.QueryResult;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
 import org.txm.searchengine.cqp.corpus.query.CQLQuery;
+import org.txm.utils.logger.Log;
 
 public class Summary extends TXMResult {
 	
@@ -172,7 +174,7 @@
 		if (wordids.length == 1 && textids.length == 1) {
 			Text text = corpus.getProject().getText(textids[0]);
 			if (text == null) {
-				System.out.println(TXMCoreMessages.Summary_13+textids[0]+TXMCoreMessages.Summary_14);
+				Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.Summary_13, textids[0]));
 				return null;
 			}
 
@@ -188,14 +190,14 @@
 				}
 			}
 			if (edition == null) {
-				System.out.println(TXMCoreMessages.Summary_15);
+				System.out.println(CQPSearchEngineCoreMessages.Summary_15);
 				return null;
 			}
 
 			node.wordid = wordids[0];
 			return edition.getPageForWordId(wordids[0]);
 		} else {
-			System.out.println(TXMCoreMessages.Summary_16+Arrays.toString(textids)+TXMCoreMessages.Summary_17+Arrays.toString(wordids));
+			Log.severe(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.Summary_16, Arrays.toString(textids), Arrays.toString(wordids)));
 			return null;
 		}
 	}
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiClient.java	(revision 1224)
@@ -4,6 +4,7 @@
 
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.searchengine.cqp.serverException.CqiClErrorCorpusAccess;
 import org.txm.searchengine.cqp.serverException.CqiClErrorInternal;
 import org.txm.searchengine.cqp.serverException.CqiClErrorNoSuchAttribute;
@@ -60,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(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 		switch (b) {
 		case 0x00:// cf cqi.h:29
 			return CQI_PADDING;
 		case 0x01:// cf cqi.h:37
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				return CQI_STATUS_OK;
@@ -76,12 +77,12 @@
 			case 0x04:// cf cqi.h:42
 				return CQI_STATUS_PING_OK;
 			default:
-				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_3+b+TXMCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
 			}
 		case 0x02:// cf cqi.h:45
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 
-			lastError = TXMCoreMessages.MemCqiClient_0+" CQI_ERROR ("+b+")";
+			lastError = CQPSearchEngineCoreMessages.MemCqiClient_0+" CQI_ERROR ("+b+")";
 
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
@@ -93,10 +94,10 @@
 			case 0x04:// cf cqi.h:42
 				throw new CqiErrorSyntaxError();
 			default:
-				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_5+b+TXMCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_5+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
 			}
 		case 0x03:// cf cqi.h:53
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				return CQI_DATA_BYTE;
@@ -121,12 +122,12 @@
 			case 0x0B:// cf cqi.h:42
 				return CQI_DATA_INT_TABLE;
 			default:
-				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_7+b+TXMCoreMessages.MemCqiClient_9+b2); //$NON-NLS-2$
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_7+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
 			}
 		case 0x04:// cf cqi.h:67
 
-			lastError = TXMCoreMessages.MemCqiClient_1+"CL_ERROR ("+b+")";
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = CQPSearchEngineCoreMessages.MemCqiClient_1+"CL_ERROR ("+b+")";
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				lastError += ": NoSuchAttribute error";
@@ -151,13 +152,13 @@
 				throw new CqiClErrorInternal();
 			default:
 				lastError += ": Unknown error";
-				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_3+b+TXMCoreMessages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
 			}
 
 		case 0x05:// cf cqi.h:94
 
-			lastError = TXMCoreMessages.MemCqiClient_2+"CQI_CQP_ERROR ("+b+")";
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = CQPSearchEngineCoreMessages.MemCqiClient_2+"CQI_CQP_ERROR ("+b+")";
+			Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
 			switch (b2) {
 			case 0x01:// cf cqi.h:39
 				lastError += ": General error";
@@ -175,10 +176,10 @@
 				lastError = getLastCQPError();
 				throw new CqiCqpErrorSyntax();
 			default:
-				throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_3+b+TXMCoreMessages.MemCqiClient_9+b2);
+				throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_3+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
 			}
 		default:
-			throw new CqiErrorGeneralError(TXMCoreMessages.MemCqiClient_10+b+TXMCoreMessages.MemCqiClient_9+b2);
+			throw new CqiErrorGeneralError(CQPSearchEngineCoreMessages.MemCqiClient_10+b+CQPSearchEngineCoreMessages.MemCqiClient_9+b2);
 		}
 		//return null;
 	}
@@ -349,7 +350,7 @@
 			throws IOException, UnexpectedAnswerException, CqiServerError {
 		Boolean ret = server.query(arg0);
 		if(ret == null || !ret) {
-			System.out.println(TXMCoreMessages.MemCqiClient_11);
+			System.out.println(CQPSearchEngineCoreMessages.MemCqiClient_11);
 			throwExceptionFromCqi(server.getErrorCode());
 		}
 	}
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiServer.java	(revision 1224)
@@ -35,11 +35,12 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.txm.core.messages.TXMCoreMessages;
+import org.txm.searchengine.core.messages.SearchEngineCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
 import org.txm.utils.logger.Log;
 
@@ -281,7 +282,7 @@
 					try {
 						while ((line = br.readLine()) != null) {
 							if (debug)
-								System.out.println(TXMCoreMessages.NetCqiServer_0 + line);
+								System.out.println(CQPSearchEngineCoreMessages.NetCqiServer_0 + line);
 						}
 					} catch (IOException e) {
 						// TODO Auto-generated catch block
@@ -300,7 +301,7 @@
 					try {
 						while ((line = br.readLine()) != null) {
 							if (debug)
-								System.out.println(TXMCoreMessages.NetCqiServer_1 + line);
+								System.out.println(CQPSearchEngineCoreMessages.NetCqiServer_1 + line);
 						}
 					} catch (IOException e) {
 						// TODO Auto-generated catch block
@@ -324,7 +325,7 @@
 	 */
 	@Override
 	public Boolean stop() {
-		Log.finest(TXMCoreMessages.STOPING_SERVER);
+		Log.info(SearchEngineCoreMessages.info_stoppingSearchEngine);
 
 		try {
 			process.destroy();
@@ -333,7 +334,7 @@
 			Log.finest(Log.toString(e));
 			return false;
 		}
-		Log.finest(TXMCoreMessages.SERVER_STOPED);
+		Log.info(SearchEngineCoreMessages.info_searchEngineStopped);
 		return true;
 	}
 
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/NetCqiClient.java	(revision 1224)
@@ -44,6 +44,7 @@
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
 import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.searchengine.cqp.serverException.CqiClErrorCorpusAccess;
 import org.txm.searchengine.cqp.serverException.CqiClErrorInternal;
 import org.txm.searchengine.cqp.serverException.CqiClErrorNoSuchAttribute;
@@ -169,9 +170,10 @@
 	 * @throws IOException
 	 *             Signals that an I/O exception has occurred.
 	 */
-	private synchronized String readString() throws UnexpectedAnswerException,
-	CqiServerError, IOException {
-		Log.finest(TXMCoreMessages.READING_STRING_FROM_CQI_SERVER);
+	private synchronized String readString() throws UnexpectedAnswerException, CqiServerError, IOException {
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_STRING_FROM_CQI_SERVER);
+		
 		if (readHeaderFromServer() != CQI_DATA_STRING) {
 			throw new UnexpectedAnswerException();
 		}
@@ -179,7 +181,9 @@
 		byte[] bytes = new byte[length];
 		this.streamFromServer.readFully(bytes);
 		String res = new String(bytes, "UTF-8"); //$NON-NLS-1$
-		Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_STRING_FROM_CQI_SERVER, res));
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_STRING_FROM_CQI_SERVER, res));
+		
 		return res;
 	}
 
@@ -195,16 +199,19 @@
 	 * @throws IOException
 	 *             Signals that an I/O exception has occurred.
 	 */
-	private synchronized boolean readBoolean()
-			throws UnexpectedAnswerException, CqiServerError, IOException {
+	private synchronized boolean readBoolean() throws UnexpectedAnswerException, CqiServerError, IOException {
 		byte b = 0;
-		Log.finest(TXMCoreMessages.READING_BOOLEAN_FROM_CQI_SERVER);
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_BOOLEAN_FROM_CQI_SERVER);
+		
 		if (readHeaderFromServer() != CQI_DATA_BOOL) {
 			throw new UnexpectedAnswerException();
 		}
 		b = this.streamFromServer.readByte();
 		boolean res = (b == 1);
-		Log.finest(TXMCoreMessages.READ_BOOLEAN_FROM_CQI_SERVER);
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BOOLEAN_FROM_CQI_SERVER, res));
+		
 		return res;
 	}
 
@@ -220,14 +227,17 @@
 	 * @throws IOException
 	 *             Signals that an I/O exception has occurred.
 	 */
-	private synchronized int readInt() throws UnexpectedAnswerException,
-	CqiServerError, IOException {
-		Log.finest(TXMCoreMessages.READING_INTEGER_FROM_CQI_SERVER);
+	private synchronized int readInt() throws UnexpectedAnswerException, CqiServerError, IOException {
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_INTEGER_FROM_CQI_SERVER);
+		
 		if (readHeaderFromServer() != CQI_DATA_INT) {
 			throw new UnexpectedAnswerException();
 		}
 		int res = this.streamFromServer.readInt();
-		Log.finest(TXMCoreMessages.READ_INTEGER_FROM_CQI_SERVER + res);
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INTEGER_FROM_CQI_SERVER, res));
+		
 		return res;
 	}
 
@@ -243,9 +253,10 @@
 	 * @throws IOException
 	 *             Signals that an I/O exception has occurred.
 	 */
-	private synchronized String[] readStringArray()
-			throws UnexpectedAnswerException, CqiServerError, IOException {
-		Log.finest(TXMCoreMessages.READING_STRING_ARRAY_FROM_CQI_SERVER);
+	private synchronized String[] readStringArray() throws UnexpectedAnswerException, CqiServerError, IOException {
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_STRING_ARRAY_FROM_CQI_SERVER);
+		
 		byte[] header = readHeaderFromServer();
 		if (header != CQI_DATA_STRING_LIST) {
 			throw new UnexpectedAnswerException();
@@ -287,8 +298,9 @@
 		// long end = System.currentTimeMillis();
 		// System.out.println(nByteRead + " bytes read in " +(end-start)+ "ms ("
 		// + (nByteRead/(1+end-start)) + "kb/s)");
-		Log.finest(TXMCoreMessages.READ_STRING_ARRAY_FROM_CQI_SERVER
-				+ Arrays.asList(strings));
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_STRING_ARRAY_FROM_CQI_SERVER, Arrays.asList(strings)));
+		
 		return strings;
 	}
 
@@ -341,7 +353,9 @@
 	 */
 	private synchronized int[] readIntList() throws UnexpectedAnswerException,
 	CqiServerError, IOException {
-		Log.finest(TXMCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		
 		if ((readHeaderFromServer()) != CQI_DATA_INT_LIST) {
 			throw new UnexpectedAnswerException();
 		}
@@ -363,7 +377,9 @@
 		 * for(int i=0; i<arrayLength; i++){ ints[i] =
 		 * this.streamFromServer.readInt(); }
 		 */
-		// Log.finest(Messages.READ_INT_ARRAY_FROM_CQI_SERVER+Arrays.asList(ints));
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(ints)));
+		
 		return ints;
 	}
 
@@ -420,9 +436,10 @@
 	 * @throws IOException
 	 *             Signals that an I/O exception has occurred.
 	 */
-	private synchronized int[][] readIntTable()
-			throws UnexpectedAnswerException, CqiServerError, IOException {
-		Log.finest(TXMCoreMessages.READING_2D_INT_ARRAY_FROM_CQI_SERVER);
+	private synchronized int[][] readIntTable() throws UnexpectedAnswerException, CqiServerError, IOException {
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_2D_INT_ARRAY_FROM_CQI_SERVER);
+		
 		if ((readHeaderFromServer()) != CQI_DATA_INT_TABLE) {
 			throw new UnexpectedAnswerException();
 		}
@@ -432,8 +449,9 @@
 		for (int i = 0; i < nRow; i++)
 			for (int j = 0; j < nCol; j++)
 				ints[i][j] = this.streamFromServer.readInt();
-		Log.finest(TXMCoreMessages.READ_2D_INT_ARRAY_FROM_CQI_SERVER
-				+ Arrays.asList(ints));
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_2D_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(ints)));
+		
 		return ints;
 	}
 
@@ -445,17 +463,19 @@
 	 * @throws UnexpectedAnswerException Signals that the data read on the socket is unexpected
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
-	private synchronized int[] readIntInt() throws IOException,
-	UnexpectedAnswerException, CqiServerError {
-		Log.finest(TXMCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+	private synchronized int[] readIntInt() throws IOException,	UnexpectedAnswerException, CqiServerError {
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		
 		if (readHeaderFromServer() != CQI_DATA_INT_INT) {
 			throw new UnexpectedAnswerException();
 		}
 		int[] res = new int[2];
 		res[0] = this.streamFromServer.readInt();
 		res[1] = this.streamFromServer.readInt();
-		Log.finest(TXMCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER
-				+ Arrays.asList(res));
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(res)));
+		
 		return res;
 	}
 
@@ -467,9 +487,10 @@
 	 * @throws UnexpectedAnswerException Signals that the data read on the socket is unexpected
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
-	private synchronized int[] readIntIntIntInt() throws IOException,
-	UnexpectedAnswerException, CqiServerError {
-		Log.finest(TXMCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+	private synchronized int[] readIntIntIntInt() throws IOException, UnexpectedAnswerException, CqiServerError {
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_INT_ARRAY_FROM_CQI_SERVER);
+		
 		if (readHeaderFromServer() != CQI_DATA_INT_INT_INT_INT) {
 			throw new UnexpectedAnswerException();
 		}
@@ -478,8 +499,8 @@
 		res[1] = this.streamFromServer.readInt();
 		res[2] = this.streamFromServer.readInt();
 		res[3] = this.streamFromServer.readInt();
-		Log.finest(TXMCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER
-				+ Arrays.asList(res));
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.READ_INT_ARRAY_FROM_CQI_SERVER, Arrays.asList(res)));
 		return res;
 	}
 
@@ -495,17 +516,22 @@
 	 * @throws IOException
 	 *             Signals that an I/O exception has occurred.
 	 */
-	private synchronized byte[] readHeaderFromServer()
-			throws UnexpectedAnswerException, CqiServerError, IOException {
-		Log.finest(TXMCoreMessages.READING_HEADER_FROM_CQI_SERVER);
+	private synchronized byte[] readHeaderFromServer() throws UnexpectedAnswerException, CqiServerError, IOException {
+		
+		Log.finest(CQPSearchEngineCoreMessages.READING_HEADER_FROM_CQI_SERVER);
+		
 		byte b = this.streamFromServer.readByte();
-		Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+		
+		Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+		
 		switch (b) {
 		case 0x00:// cf cqi.h:29
 			return CQI_PADDING;
 		case 0x01:// cf cqi.h:37
 			b = this.streamFromServer.readByte();
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				return CQI_STATUS_OK;
@@ -518,8 +544,10 @@
 			}
 		case 0x02:// cf cqi.h:45
 			b = this.streamFromServer.readByte();
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
-			lastError = TXMCoreMessages.MemCqiClient_0+b;
+			
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			
+			lastError = CQPSearchEngineCoreMessages.MemCqiClient_0+b;
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				throw new CqiErrorGeneralError();
@@ -532,7 +560,9 @@
 			}
 		case 0x03:// cf cqi.h:53
 			b = this.streamFromServer.readByte();
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				return CQI_DATA_BYTE;
@@ -560,8 +590,10 @@
 		case 0x04:// cf cqi.h:67
 
 			b = this.streamFromServer.readByte();
-			lastError = TXMCoreMessages.MemCqiClient_1+b;
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = CQPSearchEngineCoreMessages.MemCqiClient_1+b;
+			
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				throw new CqiClErrorNoSuchAttribute();
@@ -582,8 +614,10 @@
 		case 0x05:// cf cqi.h:94
 
 			b = this.streamFromServer.readByte();
-			lastError = TXMCoreMessages.MemCqiClient_2+b;
-			Log.finest(TXMCoreMessages.bind(TXMCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			lastError = CQPSearchEngineCoreMessages.MemCqiClient_2+b;
+			
+			Log.finest(CQPSearchEngineCoreMessages.bind(CQPSearchEngineCoreMessages.READ_BYTE_FROM_CQI_SERVER, b));
+			
 			switch (b) {
 			case 0x01:// cf cqi.h:39
 				throw new CqiCqpErrorErrorGeneral();
@@ -611,8 +645,7 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
-	private synchronized String genericStringToString(String string,
-			byte[] function) throws UnexpectedAnswerException, IOException,
+	private synchronized String genericStringToString(String string, byte[] function) throws UnexpectedAnswerException, IOException,
 			CqiServerError {
 		this.streamToServer.write(function);
 		this.writeString(string);
@@ -629,9 +662,7 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
-	private synchronized String[] genericStringToStringArray(String string,
-			byte[] function) throws UnexpectedAnswerException, IOException,
-			CqiServerError {
+	private synchronized String[] genericStringToStringArray(String string, byte[] function) throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.streamToServer.write(function);
 		this.writeString(string);
 		return readStringArray();
@@ -649,9 +680,7 @@
 	 * @throws UnexpectedAnswerException Signals that the data read on the socket is unexpected
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
-	private synchronized String[] genericStringXIntArraytoStringArray(
-			String string, int[] ints, byte[] function) throws IOException,
-			UnexpectedAnswerException, CqiServerError {
+	private synchronized String[] genericStringXIntArraytoStringArray( String string, int[] ints, byte[] function) throws IOException, UnexpectedAnswerException, CqiServerError {
 		// long start = System.currentTimeMillis();
 		this.streamToServer.write(function);
 		// System.out.println(System.currentTimeMillis()-start);
@@ -676,9 +705,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
-	private synchronized int[] genericStringXIntArraytoIntArray(String string,
-			int[] ints, byte[] function) throws UnexpectedAnswerException,
-			CqiServerError, IOException {
+	private synchronized int[] genericStringXIntArraytoIntArray(String string, int[] ints, byte[] function) throws UnexpectedAnswerException, CqiServerError, IOException {
 		this.streamToServer.write(function);
 		this.writeString(string);
 		this.writeIntArray(ints);
@@ -710,11 +737,9 @@
 				this.socket = new Socket();
 				this.serverAddress = new InetSocketAddress(host, port);
 				this.socket.connect(serverAddress);
-				this.streamToServer = new DataOutputStream(this.socket
-						.getOutputStream());
-				this.streamFromServer = new DataInputStream(this.socket
-						.getInputStream());
-				System.out.print(TXMCoreMessages.CqiClient_32);
+				this.streamToServer = new DataOutputStream(this.socket.getOutputStream());
+				this.streamFromServer = new DataInputStream(this.socket.getInputStream());
+				Log.info(CQPSearchEngineCoreMessages.CqiClient_32);
 				return;
 			} catch (IOException e) {
 				System.err.print("."); //$NON-NLS-1$
@@ -726,7 +751,7 @@
 
 			attempts--;
 		}
-		throw new ServerNotFoundException(TXMCoreMessages.CqiClient_33);
+		throw new ServerNotFoundException(CQPSearchEngineCoreMessages.CqiClient_33);
 	}
 
 	// CQI_ERROR_CONNECT_REFUSED
@@ -741,18 +766,18 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized boolean connect(String username, String password)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized boolean connect(String username, String password) throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.username = username;
 		this.password = password;
-		Log.finest(TXMCoreMessages.CONNECTING_CQI_CLIENT + username
-				+ ":" + password + "@" + host + ":" + port); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		
+		Log.finest(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.CONNECTING_CQI_CLIENT, username, password, host, port));
+		
 		this.streamToServer.write(CQI_CTRL_CONNECT);
 		this.writeString(username);
 		this.writeString(password);
 		try {
 			readHeaderFromServer();
-			Log.finest(TXMCoreMessages.CQI_CLIENT_CONNECTED);
+			Log.finest(CQPSearchEngineCoreMessages.CQI_CLIENT_CONNECTED);
 			return true;
 		} catch (CqiErrorConnectRefused e) {
 			return false;
@@ -775,18 +800,18 @@
 	 *             Signals that an I/O exception has occurred.
 	 */
 	@Override
-	public synchronized boolean disconnect() throws UnexpectedAnswerException,
-	CqiServerError, IOException {
+	public synchronized boolean disconnect() throws UnexpectedAnswerException, CqiServerError, IOException {
 		this.streamToServer.write(CQI_CTRL_BYE);
 		return (readHeaderFromServer() == CQI_STATUS_BYE_OK);
 	}
 
 	String lastError;
 	@Override
-	public synchronized String getLastError(){	
-		if(lastError != null && lastError.length() > 0)
+	public synchronized String getLastError() {
+		if(lastError != null && lastError.length() > 0) {
 			return lastError;
-		return TXMCoreMessages.AbstractCqiClient_2;
+		}
+		return CQPSearchEngineCoreMessages.AbstractCqiClient_2;
 	}
 
 	// CQI_CTRL_LAST_GENERAL_ERROR
@@ -799,16 +824,17 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String getLastCqiError() throws UnexpectedAnswerException, IOException,
-	CqiServerError {
-		Log.severe(TXMCoreMessages.CqiClient_0);
+	public synchronized String getLastCqiError() throws UnexpectedAnswerException, IOException, CqiServerError {
+		
+		Log.severe(CQPSearchEngineCoreMessages.CqiClient_0);
+		
 		this.streamToServer.write(CQI_CTRL_LAST_GENERAL_ERROR);
 
 		try {
 			String ret = readString();
 			return getLastCQPError()+"\t"+ret; //$NON-NLS-1$
 		} catch (CqiServerError e) {
-			System.out.println(TXMCoreMessages.NetCqiClient_1+e);
+			Log.severe(CQPSearchEngineCoreMessages.NetCqiClient_1 + e);
 			return "error"; //$NON-NLS-1$
 		}
 	}
@@ -829,7 +855,7 @@
 			String ret = readString();
 			return ret;
 		} catch (Exception e) {
-			System.out.println(TXMCoreMessages.NetCqiClient_3+e);
+			Log.severe(CQPSearchEngineCoreMessages.NetCqiClient_3 + e);
 			return "error"; //$NON-NLS-1$
 		}
 	}
@@ -844,8 +870,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String[] listCorpora()
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized String[] listCorpora() throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.streamToServer.write(CQI_CORPUS_LIST_CORPORA);
 		return readStringArray();
 	}
@@ -861,8 +886,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String corpusCharset(String corpus)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized String corpusCharset(String corpus) throws UnexpectedAnswerException, IOException, CqiServerError {
 		return genericStringToString(corpus, CQI_CORPUS_CHARSET);
 	}
 
@@ -877,8 +901,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String[] corpusProperties(String corpus)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized String[] corpusProperties(String corpus) throws UnexpectedAnswerException, IOException, CqiServerError {
 		return genericStringToStringArray(corpus, CQI_CORPUS_PROPERTIES);
 	}
 
@@ -893,10 +916,8 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String[] corpusPositionalAttributes(String corpusID)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringToStringArray(corpusID,
-				CQI_CORPUS_POSITIONAL_ATTRIBUTES);
+	public synchronized String[] corpusPositionalAttributes(String corpusID) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringToStringArray(corpusID, CQI_CORPUS_POSITIONAL_ATTRIBUTES);
 	}
 
 	// CQI_CQP_ERROR_NO_SUCH_CORPUS
@@ -910,10 +931,8 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String[] corpusStructuralAttributes(String corpus)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringToStringArray(corpus,
-				CQI_CORPUS_STRUCTURAL_ATTRIBUTES);
+	public synchronized String[] corpusStructuralAttributes(String corpus) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringToStringArray(corpus, CQI_CORPUS_STRUCTURAL_ATTRIBUTES);
 	}
 
 	// CQI_CQP_ERROR_NO_SUCH_CORPUS, CQI_CL_ERROR_NO_SUCH_ATTRIBUTE,
@@ -928,9 +947,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized boolean corpusStructuralAttributeHasValues(
-			String attribute) throws UnexpectedAnswerException, IOException,
-			CqiServerError {
+	public synchronized boolean corpusStructuralAttributeHasValues(String attribute) throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.streamToServer.write(CQI_CORPUS_STRUCTURAL_ATTRIBUTE_HAS_VALUES);
 		this.writeString(attribute);
 		return readBoolean();
@@ -947,10 +964,8 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String[] corpusAlignementAttributes(String corpus)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringToStringArray(corpus,
-				CQI_CORPUS_ALIGNMENT_ATTRIBUTES);
+	public synchronized String[] corpusAlignementAttributes(String corpus) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringToStringArray(corpus, CQI_CORPUS_ALIGNMENT_ATTRIBUTES);
 	}
 
 	// CQI_CQP_ERROR_NO_SUCH_CORPUS
@@ -964,8 +979,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String corpusFullName(String corpus)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized String corpusFullName(String corpus) throws UnexpectedAnswerException, IOException, CqiServerError {
 		return genericStringToString(corpus, CQI_CORPUS_FULL_NAME);
 	}
 
@@ -979,8 +993,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String[] corpusInfo(String corpus)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized String[] corpusInfo(String corpus) throws UnexpectedAnswerException, IOException, CqiServerError {
 		throw new UnsupportedOperationException();
 	}
 
@@ -1007,8 +1020,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized int attributeSize(String attribute) throws IOException,
-	UnexpectedAnswerException, CqiServerError {
+	public synchronized int attributeSize(String attribute) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CL_ATTRIBUTE_SIZE);
 		this.writeString(attribute);
 		return readInt();
@@ -1027,8 +1039,7 @@
 	 * @returns the number of entries in the lexicon of a positional attribute
 	 */
 	@Override
-	public synchronized int lexiconSize(String attribute) throws IOException,
-	UnexpectedAnswerException, CqiServerError {
+	public synchronized int lexiconSize(String attribute) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CL_LEXICON_SIZE);
 		this.writeString(attribute);
 		return readInt();
@@ -1043,8 +1054,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized void dropAttribute(String attribute)
-			throws IOException, UnexpectedAnswerException, CqiServerError {
+	public synchronized void dropAttribute(String attribute) throws IOException, UnexpectedAnswerException, CqiServerError {
 		throw new UnsupportedOperationException();
 	}
 
@@ -1059,8 +1069,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized int[] str2Id(String attribute, String[] strings)
-			throws IOException, UnexpectedAnswerException, CqiServerError {
+	public synchronized int[] str2Id(String attribute, String[] strings) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CL_STR2ID);
 		this.writeString(attribute);
 		this.writeStringArray(strings);
@@ -1078,11 +1087,8 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized String[] id2Str(String attribute, int[] ids)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-
-		return genericStringXIntArraytoStringArray(attribute, ids,
-				CQI_CL_ID2STR);
+	public synchronized String[] id2Str(String attribute, int[] ids) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringXIntArraytoStringArray(attribute, ids, CQI_CL_ID2STR);
 	}
 
 	/**
@@ -1096,8 +1102,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized int[] id2Freq(String attribute, int[] ids)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized int[] id2Freq(String attribute, int[] ids) throws UnexpectedAnswerException, IOException, CqiServerError {
 		return genericStringXIntArraytoIntArray(attribute, ids, CQI_CL_ID2FREQ);
 	}
 
@@ -1112,8 +1117,7 @@
 	 * @throws CqiServerError Signals that the cqi server raised an error
 	 */
 	@Override
-	public synchronized int[] cpos2Id(String attribute, int[] cpos)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized int[] cpos2Id(String attribute, int[] cpos) throws UnexpectedAnswerException, IOException, CqiServerError {
 		return genericStringXIntArraytoIntArray(attribute, cpos, CQI_CL_CPOS2ID);
 	}
 
@@ -1128,8 +1132,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized String[] cpos2Str(String attribute, int[] cpos)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized String[] cpos2Str(String attribute, int[] cpos) throws UnexpectedAnswerException, IOException, CqiServerError {
 		
 		if (corporacache.get(attribute) == null) {
 			corporacache.put(attribute, new CqpDataProxy(this, attribute, true));
@@ -1144,10 +1147,8 @@
 //				CQI_CL_CPOS2STR);
 	}
 	
-	public synchronized String[] _cpos2Str(String attribute, int[] cpos)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringXIntArraytoStringArray(attribute, cpos,
-				CQI_CL_CPOS2STR);
+	public synchronized String[] _cpos2Str(String attribute, int[] cpos) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringXIntArraytoStringArray(attribute, cpos, CQI_CL_CPOS2STR);
 	}
 
 	/**
@@ -1162,10 +1163,8 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] cpos2Struc(String attribute, int[] cpos)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringXIntArraytoIntArray(attribute, cpos,
-				CQI_CL_CPOS2STRUC);
+	public synchronized int[] cpos2Struc(String attribute, int[] cpos) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringXIntArraytoIntArray(attribute, cpos, CQI_CL_CPOS2STRUC);
 	}
 
 	/**
@@ -1180,10 +1179,8 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] cpos2LBound(String attribute, int[] cpos)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringXIntArraytoIntArray(attribute, cpos,
-				CQI_CL_CPOS2LBOUND);
+	public synchronized int[] cpos2LBound(String attribute, int[] cpos) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringXIntArraytoIntArray(attribute, cpos, CQI_CL_CPOS2LBOUND);
 	}
 
 	/**
@@ -1198,10 +1195,8 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] cpos2RBound(String attribute, int[] cpos)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringXIntArraytoIntArray(attribute, cpos,
-				CQI_CL_CPOS2RBOUND);
+	public synchronized int[] cpos2RBound(String attribute, int[] cpos) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringXIntArraytoIntArray(attribute, cpos, CQI_CL_CPOS2RBOUND);
 	}
 
 	/**
@@ -1216,10 +1211,8 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] cpos2Alg(String attribute, int[] cpos)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringXIntArraytoIntArray(attribute, cpos,
-				CQI_CL_CPOS2ALG);
+	public synchronized int[] cpos2Alg(String attribute, int[] cpos) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringXIntArraytoIntArray(attribute, cpos, CQI_CL_CPOS2ALG);
 	}
 
 	/**
@@ -1234,8 +1227,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized String[] struc2Str(String attribute, int[] strucs)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized String[] struc2Str(String attribute, int[] strucs) throws UnexpectedAnswerException, IOException, CqiServerError {
 		return _struc2Str(attribute, strucs);
 	}
 	
@@ -1250,10 +1242,8 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 * @throws CqiServerError the cqi server error
 	 */
-	public synchronized String[] _struc2Str(String attribute, int[] strucs)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
-		return genericStringXIntArraytoStringArray(attribute, strucs,
-				CQI_CL_STRUC2STR);
+	public synchronized String[] _struc2Str(String attribute, int[] strucs) throws UnexpectedAnswerException, IOException, CqiServerError {
+		return genericStringXIntArraytoStringArray(attribute, strucs, CQI_CL_STRUC2STR);
 	}
 
 	/**
@@ -1267,8 +1257,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] id2Cpos(String attribute, int id)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized int[] id2Cpos(String attribute, int id) throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.streamToServer.write(CQI_CL_ID2CPOS);
 		this.writeString(attribute);
 		this.streamToServer.writeInt(id);
@@ -1287,8 +1276,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] idList2Cpos(String attribute, int[] ids)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized int[] idList2Cpos(String attribute, int[] ids) throws UnexpectedAnswerException, IOException, CqiServerError {
 		return genericStringXIntArraytoIntArray(attribute, ids,
 				CQI_CL_IDLIST2CPOS);
 	}
@@ -1305,8 +1293,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] regex2Id(String attribute, String regex)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized int[] regex2Id(String attribute, String regex) throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.streamToServer.write(CQI_CL_REGEX2ID);
 		this.writeString(attribute);
 		this.writeString(regex);
@@ -1324,8 +1311,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] struc2Cpos(String attribute, int struc)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized int[] struc2Cpos(String attribute, int struc) throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.streamToServer.write(CQI_CL_STRUC2CPOS);
 		this.writeString(attribute);
 		this.streamToServer.writeInt(struc);
@@ -1345,8 +1331,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized int[] alg2Cpos(String attribute, int struc)
-			throws UnexpectedAnswerException, IOException, CqiServerError {
+	public synchronized int[] alg2Cpos(String attribute, int struc) throws UnexpectedAnswerException, IOException, CqiServerError {
 		this.streamToServer.write(CQI_CL_ALG2CPOS);
 		this.writeString(attribute);
 		this.streamToServer.writeInt(struc);
@@ -1364,8 +1349,7 @@
 	 * @throws CqiServerError the cqi server error
 	 */
 	@Override
-	public synchronized void cqpQuery(String motherCorpus, String subcorpus,
-			String query) throws IOException, UnexpectedAnswerException, CqiServerError {
+	public synchronized void cqpQuery(String motherCorpus, String subcorpus, String query) throws IOException, UnexpectedAnswerException, CqiServerError {
 		//System.out.println("CQPQUERY: Mother: "+motherCorpus+", sub:"+subcorpus+", "+query);
 		this.streamToServer.write(CQI_CQP_QUERY);
 		this.writeString(motherCorpus);
@@ -1403,8 +1387,7 @@
 	 * @throws CqiCqpErrorNoSuchCorpus the cqi cqp error no such corpus
 	 */
 	@Override
-	public synchronized String[] listSubcorpora(String corpus)
-			throws UnexpectedAnswerException, IOException, CqiCqpErrorNoSuchCorpus {
+	public synchronized String[] listSubcorpora(String corpus) throws UnexpectedAnswerException, IOException, CqiCqpErrorNoSuchCorpus {
 		try {
 			return genericStringToStringArray(corpus, CQI_CQP_LIST_SUBCORPORA);
 		} catch (CqiCqpErrorNoSuchCorpus e) {
@@ -1430,8 +1413,7 @@
 	 *             the cqi server error
 	 */
 	@Override
-	public synchronized int subCorpusSize(String subcorpus) throws IOException,
-	UnexpectedAnswerException, CqiServerError {
+	public synchronized int subCorpusSize(String subcorpus) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CQP_SUBCORPUS_SIZE);
 		this.writeString(subcorpus);
 		return this.readInt();
@@ -1455,8 +1437,7 @@
 	 *             the cqi server error
 	 */
 	@Override
-	public synchronized boolean subCorpusHasField(String subcorpus, byte field)
-			throws IOException, UnexpectedAnswerException, CqiServerError {
+	public synchronized boolean subCorpusHasField(String subcorpus, byte field) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CQP_SUBCORPUS_HAS_FIELD);
 		this.writeString(subcorpus);
 		this.streamToServer.writeByte(field);
@@ -1486,9 +1467,7 @@
 	 *             the cqi server error
 	 */
 	@Override
-	public synchronized int[] dumpSubCorpus(String subcorpus, byte field,
-			int first, int last) throws IOException, UnexpectedAnswerException,
-			CqiServerError {
+	public synchronized int[] dumpSubCorpus(String subcorpus, byte field, int first, int last) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CQP_DUMP_SUBCORPUS);
 		this.writeString(subcorpus);
 		this.streamToServer.writeByte(field);
@@ -1511,8 +1490,7 @@
 	 *             the cqi server error
 	 */
 	@Override
-	public synchronized void dropSubCorpus(String subcorpus) throws IOException,
-	UnexpectedAnswerException, CqiServerError {
+	public synchronized void dropSubCorpus(String subcorpus) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CQP_DROP_SUBCORPUS);
 		this.writeString(subcorpus);
 		this.readHeaderFromServer();
@@ -1542,9 +1520,7 @@
 	 *             the cqi server error
 	 */
 	@Override
-	public synchronized int[][] fdist1(String subcorpus, int cutoff,
-			byte field, String attribute) throws IOException,
-			UnexpectedAnswerException, CqiServerError {
+	public synchronized int[][] fdist1(String subcorpus, int cutoff, byte field, String attribute) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CQP_FDIST_1);
 		this.writeString(subcorpus);
 		this.streamToServer.writeInt(cutoff);
@@ -1580,9 +1556,7 @@
 	 *             the cqi server error
 	 */
 	@Override
-	public synchronized int[][] fdist2(String subcorpus, int cutoff,
-			byte field1, String attribute1, byte field2, String attribute2)
-					throws IOException, UnexpectedAnswerException, CqiServerError {
+	public synchronized int[][] fdist2(String subcorpus, int cutoff, byte field1, String attribute1, byte field2, String attribute2) throws IOException, UnexpectedAnswerException, CqiServerError {
 		this.streamToServer.write(CQI_CQP_FDIST_1);
 		this.writeString(subcorpus);
 		this.streamToServer.writeInt(cutoff);
@@ -1598,7 +1572,7 @@
 		try {
 			return connect(username, password);
 		} catch (Exception e) {
-			System.out.println(TXMCoreMessages.NetCqiClient_5+e);
+			System.out.println(CQPSearchEngineCoreMessages.NetCqiClient_5+e);
 			return false;
 		}
 	}
@@ -1765,7 +1739,7 @@
 		} catch(Exception e) { System.out.println("Exception : "+e);} //$NON-NLS-1$
 
 		try {
-			System.out.println(TXMCoreMessages.NetCqiClient_97+Arrays.toString(client.dumpSubCorpus(subcorpusid, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 10)));
+			System.out.println(CQPSearchEngineCoreMessages.NetCqiClient_97+Arrays.toString(client.dumpSubCorpus(subcorpusid, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 10)));
 		} catch(Exception e) { System.out.println("Exception : "+e);} //$NON-NLS-1$
 
 		try {
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/PatchCwbRegistry.java	(revision 1224)
@@ -36,6 +36,7 @@
 import java.io.OutputStreamWriter;
 
 import org.txm.core.messages.TXMCoreMessages;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.utils.logger.Log;
 
 // TODO: Auto-generated Javadoc
@@ -122,8 +123,8 @@
 		}
 		corpusEncoding = corpusEncoding.toLowerCase();
 
-		Log.info(TXMCoreMessages.PatchCwbRegistry_2 + corpus
-				+ TXMCoreMessages.PatchCwbRegistry_23 + corpusEncoding);
+		Log.info(CQPSearchEngineCoreMessages.PatchCwbRegistry_2 + corpus
+				+ CQPSearchEngineCoreMessages.PatchCwbRegistry_23 + corpusEncoding);
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("##:: charset") || line.startsWith("charset")) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -140,14 +141,14 @@
 	}
 	
 	/**
-	 * Change the language value.
+	 * Changes the language value.
 	 *
 	 * @param registryfile the registry file to patch
 	 * @param corpusLanguage the new language value
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
-	public static void patchLanguage(File registryfile, String corpusLanguage)
-			throws IOException {
+	public static void patchLanguage(File registryfile, String corpusLanguage)throws IOException {
+		
 		String corpus = registryfile.getName();
 
 		// HOME INFO
@@ -155,14 +156,13 @@
 
 		String encoding = "UTF-8"; //$NON-NLS-1$
 		//if (OSDetector.isFamilyWindows()) encoding = "ISO-8859-1"; //$NON-NLS-1$
-		BufferedReader reader = new BufferedReader(new InputStreamReader(
-				new FileInputStream(registryfile), encoding));
-		OutputStreamWriter writer = new OutputStreamWriter(
-				new FileOutputStream(temp), encoding);
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(registryfile), encoding));
+		OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(temp), encoding);
 
 		corpusLanguage = corpusLanguage.toLowerCase();
-		Log.info(TXMCoreMessages.PatchCwbRegistry_34 + corpus
-				+ TXMCoreMessages.PatchCwbRegistry_35 + corpusLanguage);
+		
+		Log.info(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.PatchCwbRegistry_34, corpus, corpusLanguage));
+		
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("##:: language") || line.startsWith("language")) { //$NON-NLS-1$ //$NON-NLS-2$
@@ -185,44 +185,45 @@
 	 * @param targetcorpus the aligned corpus
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
-	public static boolean patchAlignment(File registryfile, String targetcorpus)
-			throws IOException {
+	public static boolean patchAlignment(File registryfile, String targetcorpus) throws IOException {
+		
 		targetcorpus = targetcorpus.toLowerCase();
 		String corpus = registryfile.getName();
 
 		if (!new File(registryfile.getParent(), targetcorpus).exists()) {
-			System.out.println(TXMCoreMessages.PatchCwbRegistry_3+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
+			Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_3+" : "+new File(registryfile.getParent(), targetcorpus)); //$NON-NLS-1$
 			return false;
 		}
 		if (!registryfile.exists()) {
-			System.out.println(TXMCoreMessages.PatchCwbRegistry_13+registryfile.getAbsolutePath());
+			Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_13+registryfile.getAbsolutePath());
 			return false;
 		}
+		
 		boolean alignmentwritten = false;
 		// HOME INFO
 		File temp = File.createTempFile("temp", ".registry", registryfile.getParentFile()); //$NON-NLS-1$ //$NON-NLS-2$
 
 		String encoding = "UTF-8"; //$NON-NLS-1$
 		//if (OSDetector.isFamilyWindows()) encoding = "ISO-8859-1"; //$NON-NLS-1$
-		BufferedReader reader = new BufferedReader(new InputStreamReader(
-				new FileInputStream(registryfile), encoding));
-		OutputStreamWriter writer = new OutputStreamWriter(
-				new FileOutputStream(temp), encoding);
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(registryfile), encoding));
+		OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(temp), encoding);
 
-		Log.info(TXMCoreMessages.PatchCwbRegistry_4 + corpus
-				+ TXMCoreMessages.PatchCwbRegistry_5 + targetcorpus);
+		Log.info(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.PatchCwbRegistry_4, corpus, targetcorpus));
+		
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("ALIGNED " + targetcorpus)) { //$NON-NLS-1$
 				alignmentwritten = true;
 				writer.write(line + "\n"); //$NON-NLS-1$
-			} else if (line.startsWith("# Yours sincerely, the Encode tool.")) { //$NON-NLS-1$
+			}
+			else if (line.startsWith("# Yours sincerely, the Encode tool.")) { //$NON-NLS-1$
 				if (!alignmentwritten) {
 					writer.write("ALIGNED " + targetcorpus + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
 					alignmentwritten = true;
 				}
 				writer.write("# Yours sincerely, the Encode tool."); //$NON-NLS-1$
-			} else {
+			}
+			else {
 				writer.write(line + "\n"); //$NON-NLS-1$
 			}
 			line = reader.readLine();
@@ -242,14 +243,13 @@
 	 * @return true, if successful
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 */
-	public static boolean patchAttribute(File registryfile, String oldname, String newname)
-			throws IOException {
+	public static boolean patchAttribute(File registryfile, String oldname, String newname) throws IOException {
 		
 		boolean found = false;
 		String datapath = ""; //$NON-NLS-1$
 		
 		if (!registryfile.exists()) {
-			Log.warning(TXMCoreMessages.PatchCwbRegistry_16);
+			Log.warning(CQPSearchEngineCoreMessages.PatchCwbRegistry_16);
 			return false;
 		}
 
@@ -258,17 +258,16 @@
 
 		String encoding = "UTF-8"; //$NON-NLS-1$
 		//if (OSDetector.isFamilyWindows()) encoding = "ISO-8859-1"; //$NON-NLS-1$
-		BufferedReader reader = new BufferedReader(new InputStreamReader(
-				new FileInputStream(registryfile), encoding));
-		OutputStreamWriter writer = new OutputStreamWriter(
-				new FileOutputStream(temp), encoding);
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(registryfile), encoding));
+		OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(temp), encoding);
 
 		String line = reader.readLine();
 		while (line != null) {
 			if (line.startsWith("ATTRIBUTE "+oldname)) { //$NON-NLS-1$
 				writer.write("ATTRIBUTE "+newname+"\n"); //$NON-NLS-1$ //$NON-NLS-2$
 				found = true;
-			} else {
+			}
+			else {
 				if (line.startsWith("HOME")) { //$NON-NLS-1$
 					datapath = line.substring(5);
 				}
@@ -284,22 +283,24 @@
 				for (File f : datadir.listFiles())
 					if (f.getName().startsWith(oldname+".")) //$NON-NLS-1$
 						f.renameTo(new File(f.getParent(), f.getName().replace(oldname+".", newname+"."))); //$NON-NLS-1$ //$NON-NLS-2$
-			} else {
-				System.out.println(TXMCoreMessages.PatchCwbRegistry_27+datadir +TXMCoreMessages.ValidateXml_2);
+			}
+			else {
+				System.out.println(CQPSearchEngineCoreMessages.PatchCwbRegistry_27+datadir +TXMCoreMessages.ValidateXml_2);
 				writer.close();
 				reader.close();
 				return false;
 			}
 		}
-		else
-		{
-			System.out.println(TXMCoreMessages.PatchCwbRegistry_28);
+		else {
+			Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_28);
 			
-			if(!found)
-				System.out.println(oldname +TXMCoreMessages.PatchCwbRegistry_29+registryfile);
+			if(!found) {
+				Log.severe(oldname +CQPSearchEngineCoreMessages.PatchCwbRegistry_29+registryfile);
+			}
 			
-			if(!(datapath.length() > 0))
-				System.out.println(TXMCoreMessages.PatchCwbRegistry_27+oldname +TXMCoreMessages.PatchCwbRegistry_29+registryfile);
+			if(!(datapath.length() > 0)) {
+				Log.severe(CQPSearchEngineCoreMessages.PatchCwbRegistry_27+oldname +CQPSearchEngineCoreMessages.PatchCwbRegistry_29+registryfile);
+			}
 			writer.close();
 			reader.close();
 			return false;
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgs.java	(revision 1224)
@@ -44,6 +44,7 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.txm.core.messages.TXMCoreMessages;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -85,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(TXMCoreMessages.BuildCwbEncodeArgs_0, xmlfile));
+			System.out.println(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.BuildCwbEncodeArgs_0, xmlfile));
 			return false;
 		}
 		URL u = xmlfile.toURI().toURL();
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbEncode.java	(revision 1224)
@@ -36,12 +36,10 @@
 
 import org.eclipse.osgi.util.NLS;
 import org.txm.Toolbox;
-import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.preferences.TBXPreferences;
-import org.txm.core.preferences.TXMPreferences;
 import org.txm.libs.cqp.CQPLibPreferences;
-import org.txm.searchengine.cqp.CQPPreferences;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.stat.utils.ConsoleProgressBar;
 import org.txm.utils.OSDetector;
 import org.txm.utils.io.IOUtils;
@@ -310,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(TXMCoreMessages.CwbEncode_0 + directory);
+			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_0 + directory);
 			return;
 		}
 		if (!bin.exists()) {
-			System.err.println(TXMCoreMessages.CwbEncode_21 + bin);
+			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_21 + bin);
 			return;
 		}
 		if (!registry.exists()) {
-			System.err.println(TXMCoreMessages.CwbEncode_23 + registry);
+			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_23 + registry);
 			return;
 		}
 		if (!corpora.exists()) {
-			System.err.println(TXMCoreMessages.CwbEncode_25 + corpora);
+			System.err.println(CQPSearchEngineCoreMessages.CwbEncode_25 + corpora);
 			return;
 		}
 
 		for (File corpus : corpora.listFiles()) {
 			if (!corpus.isDirectory()) continue;
 			
-			System.out.println(TXMCoreMessages.CwbEncode_27 + corpus.getName());
+			System.out.println(CQPSearchEngineCoreMessages.CwbEncode_27 + corpus.getName());
 			File data = new File(corpus, "data"); //$NON-NLS-1$
 
 			if (!data.exists()) {
-				System.err.println(TXMCoreMessages.CwbEncode_29 + data);
+				System.err.println(CQPSearchEngineCoreMessages.CwbEncode_29 + 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(TXMCoreMessages.CwbEncode_32, regpath, datapath));
+			System.out.println(NLS.bind(CQPSearchEngineCoreMessages.CwbEncode_32, regpath, datapath));
 			try {
 				PatchCwbRegistry.patch(new File(regpath), new File(datapath));
 			} catch (IOException e) {
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/CwbProcess.java	(revision 1224)
@@ -37,9 +37,9 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.preferences.TXMPreferences;
 import org.txm.libs.cqp.CQPLibPreferences;
 import org.txm.searchengine.cqp.clientExceptions.ServerNotFoundException;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 import org.txm.utils.logger.Log;
 
 // TODO: Auto-generated Javadoc
@@ -116,7 +116,7 @@
 	 */
 	protected boolean run(List<String> cmd, boolean monitorOutput, boolean waitFor) throws ServerNotFoundException, InterruptedException, IOException {
 		
-		Log.info(TXMCoreMessages.CwbProcess_1 + StringUtils.join(cmd, " ")); //$NON-NLS-1$ 
+		Log.info(CQPSearchEngineCoreMessages.CwbProcess_1 + StringUtils.join(cmd, " ")); //$NON-NLS-1$ 
 		
 		//System.out.println(StringUtils.join(cmd, " "));
 		for (String s : cmd) {
@@ -176,12 +176,12 @@
 	}
 
 	/**
-	 * Stop the cwb process.
+	 * Stop the CWB process.
 	 */
 	public void stop() {
-		Log.finest(TXMCoreMessages.CwbProcess_3 + name.toUpperCase());
+		Log.finest(CQPSearchEngineCoreMessages.CwbProcess_3 + name.toUpperCase());
 		this.process.destroy();
-		Log.finest(TXMCoreMessages.CwbProcess_4+name.toUpperCase());
+		Log.finest(CQPSearchEngineCoreMessages.CwbProcess_4 + name.toUpperCase());
 	}
 
 	/**
@@ -266,7 +266,7 @@
 		String cwbLoc = CQPLibPreferences.getInstance().getString(CQPLibPreferences.CQI_SERVER_PATH_TO_CQPLIB)+File.separator;
 
 		if (!new File(cwbLoc).exists()) {
-			Log.severe(TXMCoreMessages.CwbProcess_5+cwbLoc);
+			Log.severe(CQPSearchEngineCoreMessages.CwbProcess_5 + cwbLoc);
 			return null;
 		}
 
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 1223)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromCQP.java	(revision 1224)
@@ -44,6 +44,7 @@
 import javax.xml.stream.XMLStreamException;
 
 import org.txm.core.messages.TXMCoreMessages;
+import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -85,7 +86,7 @@
 	public boolean process(File cqpfile)
 			throws XMLStreamException, FactoryConfigurationError, IOException {
 		if (cqpfile == null || !cqpfile.exists()) {
-			System.out.println(TXMCoreMessages.bind(TXMCoreMessages.BuildCwbEncodeArgs_0, cqpfile));
+			System.out.println(TXMCoreMessages.bind(CQPSearchEngineCoreMessages.BuildCwbEncodeArgs_0, cqpfile));
 			return false;
 		}
 
Index: tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/messages.properties
===================================================================
--- tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/messages.properties	(revision 1223)
+++ tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/messages.properties	(revision 1224)
@@ -3,6 +3,7 @@
 QueryIndexEditor_1  = replacing line:
 QueryIndexEditor_10 = queries
 QueryIndexEditor_11 = 
+QueryIndexEditor_12 = Add the query
 QueryIndexEditor_2  = Failed to add line with query:
 QueryIndexEditor_3  = Line added.
 QueryIndexEditor_4  = Load from a file
Index: tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/messages_fr.properties
===================================================================
--- tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/messages_fr.properties	(revision 1223)
+++ tmp/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/messages_fr.properties	(revision 1224)
@@ -2,7 +2,7 @@
 QueryIndexEditor_0  = Index de requête de : 
 QueryIndexEditor_1  = remplacement des lignes : 
 QueryIndexEditor_10 = requêtes
-QueryIndexEditor_11 =
+QueryIndexEditor_11 = 
 QueryIndexEditor_12 = Ajouter la requête 
 QueryIndexEditor_2  = Erreur lors de l'ajout de la requête : 
 QueryIndexEditor_3  = Requête ajoutée
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 1223)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java	(revision 1224)
@@ -470,7 +470,7 @@
 	 */
 	public void refreshInfos() {
 		try {
-			this.setContentDescription(TXMCoreMessages.T + lexicalTable.getData().getTotal() + TXMCoreMessages.V + lexicalTable.getData().getNRows()
+			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());
 		} catch (Exception e3) {
 			// TODO Auto-generated catch block
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 0)
+++ tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/SearchEngineCoreMessages.java	(revision 1224)
@@ -0,0 +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() {
+	}
+	
+}

Property changes on: tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/SearchEngineCoreMessages.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

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 0)
+++ tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages.properties	(revision 1224)
@@ -0,0 +1,16 @@
+
+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...

Property changes on: tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

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 0)
+++ tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages_fr.properties	(revision 1224)
@@ -0,0 +1,16 @@
+
+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...

Property changes on: tmp/org.txm.searchengine.core/src/org/txm/searchengine/core/messages/messages_fr.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.searchengine.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.searchengine.core/META-INF/MANIFEST.MF	(revision 1223)
+++ tmp/org.txm.searchengine.core/META-INF/MANIFEST.MF	(revision 1224)
@@ -1,6 +1,8 @@
 Manifest-Version: 1.0
 Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexport
-Export-Package: org.txm.searchengine.core
+Export-Package: org.txm.searchengine.core,
+ org.txm.searchengine.core.corpus,
+ org.txm.searchengine.core.messages
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: Searchengine core
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 1223)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages_fr.properties	(revision 1224)
@@ -1,4 +1,15 @@
 
+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 : \	
@@ -17,7 +28,6 @@
 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_connected                 = Connecté.
 info_connectingToRAt           = Connexion à R à {0}:{1}.
 info_connectingToRAtWithUser   = Connexion à R à {0}:{1} avec l'utilisateur {2}.
 info_lastSafeEvalExpression    = Dernier 'safeeval' : {0}.
@@ -28,14 +38,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'.
-
-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}
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 1223)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/RCoreMessages.java	(revision 1224)
@@ -30,7 +30,6 @@
 	public static String error_rserveIsAlreadyRunningOnPort;
 	public static String error_rservePathNotSet;
 	public static String error_youNeedRSoftware;
-	public static String info_connected;
 	public static String info_connectingToRAt;
 	public static String info_connectingToRAtWithUser;
 	public static String info_lastSafeEvalExpression;
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 1223)
+++ tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/messages/messages.properties	(revision 1224)
@@ -1,4 +1,15 @@
 
+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: 
@@ -17,7 +28,6 @@
 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_connected                 = Connected.
 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}.
@@ -28,14 +38,3 @@
 info_statisticsEngineLaunched  = Statistical Engine launched
 info_tryingToStartRFrom        = Try to start R from: {0}...
 info_tryingToStartRWithRPath   = Try to start R with path: 'R'.
-
-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}
\ 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 1223)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 1224)
@@ -1,31 +1,16 @@
 
-AbsoluteFrequency_1 = Absolute Frequency
-
-AbstractCqiClient_2 = No error.
-
-ApplicationWorkbenchAdvisor_13 = ** Could not create TXMHOME directory: {0}
+ApplicationWorkbenchAdvisor_13 = ** Could not create TXMHOME directory: {0}.
 ApplicationWorkbenchAdvisor_14 = \ evaluating extension:
 ApplicationWorkbenchAdvisor_15 = Loading extensions...
-ApplicationWorkbenchAdvisor_39 = Missing folder in TXM install dir: {0}
-ApplicationWorkbenchAdvisor_40 = Failed to copy TXM files from TXMINSTALL DIR to TXMHOME: {0}
+ApplicationWorkbenchAdvisor_40 = Failed to copy TXM files from TXMINSTALL DIR to TXMHOME: {0}.
 ApplicationWorkbenchAdvisor_6  = Exception:
 
-Base_0  = Binary directory 
-Base_22 = 'corpora' element missing from 'base' element
-Base_3  = \ does not exist?
-Base_4  = Parent directory 
-Base_5  = \ does not exist?
-Base_6  = Error: linkGrp/link/@target malformed: 
+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: 
 
-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.
-
-CREATING_PART      = Part {0} created with query {1}
-CREATING_SUBCORPUS = Subcorpus {1} created from corpus {0} with the query {2}
-
 CatalogManager_0 = ** Manager Error during initialization: 
 CatalogManager_1 = \ does not exist.
 
@@ -60,28 +45,6 @@
 Corpus_5        = No values given
 Corpus_8        = \ in \	\	\	\	\	\	\	\	
 
-CqiClient_0  = Get 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 : 
-
-DROP_QUERYRESULT = Deleting query results {0}
-DROP_SUBCORPUS   = Deleting subcorpus {0}
-
-END_SUBCORPUS_SIZE = Size of subcorpus {0} ({1}) computed in {2} ms
-
 Error_CONNECTION_FAILED = ** Error : while connection to search engine, with the following parameters: 
 
 FMAX_2 = , fmax 
@@ -99,29 +62,8 @@
 GroovyImportScriptRunner_1 = > beginning execution of 
 GroovyImportScriptRunner_3 = > end of execution 
 
-LEXICON = Lexicon 
-
 MainCorpus_0 = \ is not a valid CQP ID for a corpus. It must be in uppercase characters.
-MainCorpus_2 = Delete binary directory: 
 
-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  = getLastCQiError: 
-NetCqiClient_3  = getLastCQPError: 
-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: 
-
 Page_3 = ** Malformed URL, file 
 
 PartitionFocus_1 = The focus cannot be null or empty.
@@ -130,38 +72,15 @@
 PartitionFocus_4 = ** Unknown partition name.
 
 Partition_18     = Failed to get last CQP error: 
-Partition_21     = Warning: the partition could not be saved in workspace: 
 Partition_9      = ** Failed to create part: 
 
-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 registry
-PatchCwbRegistry_29 = could not be found in registry file 
-PatchCwbRegistry_3  = ** The target corpus doesn't exist
-PatchCwbRegistry_34 = Updating 
-PatchCwbRegistry_35 = language to 
-PatchCwbRegistry_4  = Add Alignment attribute to corpus 
-PatchCwbRegistry_5  = registry: 
-
-Project_0  = Use directory name to build corpus declaration
-Project_1  = The corpus declaration file is not found too: 
-Project_10 = Project.load: workspace XML file error: 
-Project_11 = Failed to load base parameters from file: 
-Project_14 = Error: no version in import.xml file
-Project_15 = Error: the corpus version is too old to be loaded.
-Project_17 = Error: skipping the loading of corpus: 
-Project_18 = PARAMS: 
-Project_2  = Warning in corpus definition: no name attribute defined in its XML file : {0}
-Project_26 = ** Error: ''{0}'' corpus directory is not conformant to TXM corpus binary format: corpus skipped."
+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 
-Project_6  = Failed to load corpus with params: 
-Project_7  = Failed to load base with parameters file: 
-Project_8  = Can't read corpus parameters file: 
+Project_28     = TXM needs folders: 
+Project_31     = and file 
 
 QUERY = Query on {0} : {1} <- {2}
 
@@ -172,32 +91,6 @@
 
 QueryResult_0 = \ is not a valid CQP Id for a subcorpus. It must be an uppercase characters followed by lowercase characters.
 
-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}
-
-RelativeFrequency_3 = Relative Frequency %
-
-SERVER_STOPED = Search Engine stopped
-
-STOPING_SERVER = Stopping the Search Engine
-
-SUBCORPUS_CREATED = Subcorpus {0} created in {1} ms
-SUBCORPUS_LEXICON = Computing the lexicon of subcorpus {0}
-SUBCORPUS_SIZE    = Computing the size of subcorpus {0}
-
 Selection_26 = Failed to get sup values of 
 Selection_5  = Text metadata: 
 Selection_6  = Selection error: the corpus 
@@ -207,17 +100,6 @@
 
 StructuralUnitProperty_0 = ** Failed to access structural property values 
 
-Subcorpus_2 = Warning: the subcorpus could not be saved in workspace: 
-Subcorpus_3 = \ is not a valid CQP ID for a subcorpus. It must be an uppercase character followed by lowercase characters.
-
-Summary_13 = Error : text 
-Summary_14 = is null
-Summary_15 = Error : edition default is null
-Summary_16 = Error: textids
-Summary_17 = and wordids
-
-T = t 
-
 TSCmd_30 = Query was: 
 TSCmd_31 = matches found.
 
@@ -226,13 +108,8 @@
 
 TSCorpus_0        = Couldn't read corpus: 
 
-TSResult_0  = Number of match 
-TSResult_13 = Cannot found tigerXml file: 
-TSResult_14 = Ts: conc: Failed to create xml file
-TSResult_18 = Starting injection
-TSResult_2  = Number of sub match 
-TSResult_7  = Can't find 
-TSResult_8  = in TS export methods 
+TSResult_0 = Number of match 
+TSResult_2 = Number of sub match 
 
 TigerXmlIndexing_2 = ERROR: !exists
 TigerXmlIndexing_3 = ERROR: !read
@@ -258,58 +135,47 @@
 Toolbox_37                        = kill `ps aux | grep cqpserver | awk '/-P 
 Toolbox_38                        = / {print $2}'`
 Toolbox_39                        = Failed to exec '
-Toolbox_4                         = With parameters: 
 Toolbox_40                        = ': 
 Toolbox_connected_to_corpus_sever = connected
-Toolbox_workspace_init            = Loading subcorpora and partitions... 
 Toolbox_workspace_init_failed     = ** Error during workspace initialization:
 Toolbox_wrong_port                = ** Error : the connexion to the server failed: wrong port format
 
-TxmObject_2 = Failed to save attribute 
-
 V = , v 
 
-VMAX_1 = Vmax
-
 ValidateXml_0 = XmlValidation: 
 ValidateXml_1 = is a directory
 ValidateXml_2 = does not exists
 ValidateXml_3 = is not read-able
 
-Workspace_2 = ** Failed to load workspace: 
-Workspace_3 = Project: 
-Workspace_4 = \	Base: 
-Workspace_6 = ** Failed to create empty workspace file: 
-Workspace_8 = Workspace XML file is mal formed. We need to recreate one...
+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
 
-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_thresholds      = Thresholds
-common_units           = Units
+error_error                   = ** Error: {0}.
+error_error2                  = Error
+error_errorWhileSortingResult = Error while sorting result.
 
-error_error  = ** Error: {0}.
-error_error2 = Error
-
-info_creatingNewPartition  = Creating new partion of corpus {0}: {1}.
-info_deletingPartition     = Deleting partition {0}.
-info_partCreatedInXMs      = Part {0} created in {1} ms
-info_partitionCreatedInXMs = Partition {0} created in {1} ms
+info_connected = Connected.
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 1223)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 1224)
@@ -1,6 +1,5 @@
 
 ApplicationWorkbenchAdvisor_13 = ** Не удалось создать папку TXMHOME : {0}
-ApplicationWorkbenchAdvisor_39 = Не хватает папки в директории установки TXM : {0}
 ApplicationWorkbenchAdvisor_40 = ** Не удалось скопировать файлы из папки TXMINSTALL в TXMHOME: {0}
 
 common_cols            = 
@@ -21,4 +20,8 @@
 common_thresholds      = Пороги
 common_units           = Единицы
 
-error_error2 = 
+error_error                   = ** Ошибка: {0}
+error_error2                  = Ошибка
+error_errorWhileSortingResult = 
+
+info_connected = 
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 1223)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 1224)
@@ -36,46 +36,46 @@
 	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;
 	public static String common_units;
+	public static String common_t;
+	public static String common_vMax;
 
+	
+	
 	public static String error_error2;
 	public static String error_error;
+	public static String error_errorWhileSortingResult;
+
+
 	
-	public static String info_deletingPartition;
-	public static String info_partitionCreatedInXMs;
+	public static String info_connected;
 
 	
 	public static String ApplicationWorkbenchAdvisor_13;
 	public static String ApplicationWorkbenchAdvisor_14;
 	public static String ApplicationWorkbenchAdvisor_15;
-	public static String ApplicationWorkbenchAdvisor_39;
 	public static String ApplicationWorkbenchAdvisor_40;
 	public static String ApplicationWorkbenchAdvisor_6;
 	public static String FMAX_2;
 	public static String FMIN_2;
-	public static String T;
 	public static String V;
-	public static String VMAX_1;
 
 	
-	public static String AbsoluteFrequency_1;
-	public static String AbstractCqiClient_2;
+
+	
+	public static String common_absoluteFrequency;
+
 	public static String Base_0;
-	public static String Base_22;
 	public static String Base_3;
 	public static String Base_4;
 	public static String Base_5;
 	public static String Base_6;
-	public static String BuildCwbEncodeArgs_0;
 	public static String Catalog_0;
 	public static String CatalogManager_0;
 	public static String CatalogManager_1;
-	public static String CONNECTING_CQI_CLIENT;
 	public static String Contrasts_0;
 	public static String Convert5To6_10;
 	public static String Convert5To6_11;
@@ -101,26 +101,7 @@
 	public static String Corpus_8;
 	public static String CorpusManager_0;
 	public static String CorpusManager_1;
-	public static String CQI_CLIENT_CONNECTED;
-	public static String CqiClient_0;
-	public static String CqiClient_32;
-	public static String CqiClient_33;
-	public static String CREATING_PART;
-	public static String CREATING_SUBCORPUS;
-	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 DROP_QUERYRESULT;
-	public static String DROP_SUBCORPUS;
-	public static String END_SUBCORPUS_SIZE;
+
 	public static String Error_CONNECTION_FAILED;
 	public static String Filter_7;
 	public static String FilterManager_0;
@@ -129,101 +110,35 @@
 	public static String GroovyImportScriptRunner_0;
 	public static String GroovyImportScriptRunner_1;
 	public static String GroovyImportScriptRunner_3;
-	public static String LEXICON;
 	public static String MainCorpus_0;
-	public static String MainCorpus_2;
-	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 info_creatingNewPartition;
+	
+	
 	public static String Page_3;
-	public static String info_partCreatedInXMs;
 	public static String Partition_18;
-	public static String Partition_21;
 	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 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_35;
-	public static String PatchCwbRegistry_3;
-	public static String PatchCwbRegistry_4;
-	public static String PatchCwbRegistry_5;
-	public static String Project_0;
-	public static String Project_10;
 	public static String Project_11;
-	public static String Project_14;
-	public static String Project_15;
 	public static String Project_17;
 	public static String Project_18;
-	public static String Project_1;
 	public static String Project_26;
 	public static String Project_26_079;
 	public static String Project_28;
-	public static String Project_2;
 	public static String Project_31;
-	public static String Project_6;
-	public static String Project_7;
-	public static String Project_8;
 	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 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;
-	public static String RelativeFrequency_3;
 	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 SERVER_STOPED;
-	public static String STOPING_SERVER;
 	public static String StructuralUnitProperty_0;
-	public static String Subcorpus_2;
-	public static String Subcorpus_3;
-	public static String SUBCORPUS_CREATED;
-	public static String SUBCORPUS_LEXICON;
-	public static String SUBCORPUS_SIZE;
-	public static String Summary_13;
-	public static String Summary_14;
-	public static String Summary_15;
-	public static String Summary_16;
-	public static String Summary_17;
 	public static String TigerXmlIndexing_2;
 	public static String TigerXmlIndexing_3;
 	public static String TigerXmlIndexing_6;
@@ -248,9 +163,7 @@
 	public static String Toolbox_38;
 	public static String Toolbox_39;
 	public static String Toolbox_40;
-	public static String Toolbox_4;
 	public static String Toolbox_connected_to_corpus_sever;
-	public static String Toolbox_workspace_init;
 	public static String Toolbox_workspace_init_failed;
 	public static String Toolbox_wrong_port;
 	public static String TSCmd_30;
@@ -259,25 +172,41 @@
 	public static String TSCorpusManager_0;
 	public static String TSCorpusManager_1;
 	public static String TSResult_0;
-	public static String TSResult_13;
-	public static String TSResult_14;
-	public static String TSResult_18;
 	public static String TSResult_2;
-	public static String TSResult_7;
-	public static String TSResult_8;
-	public static String TxmObject_2;
 	public static String ValidateXml_0;
 	public static String ValidateXml_1;
 	public static String ValidateXml_2;
 	public static String ValidateXml_3;
-	public static String Workspace_2;
-	public static String Workspace_3;
-	public static String Workspace_4;
-	public static String Workspace_6;
-	public static String Workspace_8;
 	
 	
+	/**
+	 * Bind the given message's substitution locations with the given string values.
+	 * @param message
+	 * @param binding1
+	 * @param binding2
+	 * @param binding3
+	 * @return
+	 */
+	// FIXME: do a method that takes vargs instead of these 2 methods
+	public static String bind(String message, Object binding1, Object binding2, Object binding3) {
+		return bind(message, new Object[] {binding1, binding2, binding3});
+	}
 	
+	/**
+	 * Bind the given message's substitution locations with the given string values.
+	 * @param message
+	 * @param binding1
+	 * @param binding2
+	 * @param binding3
+	 * @param binding4
+	 * @return
+	 */
+	// FIXME: do a method that takes vargs instead of these 2 methods
+	public static String bind(String message, Object binding1, Object binding2, Object binding3, Object binding4) {
+		return bind(message, new Object[] {binding1, binding2, binding3, binding4});
+	}
+	
+	
 	static {
 		// initialize resource bundle
 		Utf8NLS.initializeMessages(BUNDLE_NAME, TXMCoreMessages.class);
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 1223)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 1224)
@@ -1,28 +1,13 @@
 
-AbsoluteFrequency_1 = Fréquence absolue
+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}.
 
-AbstractCqiClient_2 = Pas d'erreur à notifier.
+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é : 
 
-ApplicationWorkbenchAdvisor_13 = ** Échec de la création du dossier TXMHOME : {0}
-ApplicationWorkbenchAdvisor_39 = Dossier manquant dans le dossier d''installation de TXM : {0}
-ApplicationWorkbenchAdvisor_40 = ** Échec de la copie des fichiers TXM du dossier TXMINSTALL vers TXMHOME : {0}
-
-Base_0  = Dossier binaire 
-Base_22 = L'élément 'corpora' est absent de l'élément 'base'
-Base_3  = \ n'existe pas ?
-Base_4  = Le dossier parent 
-Base_5  = \ n'existe pas ?
-Base_6  = Erreur: linkGrp/link/@target mal formé : 
-
-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.
-
-CREATING_PART      = Partie {0} créée à partir de la requête {1}
-CREATING_SUBCORPUS = Création du sous-corpus {1} à partir du corpus {0} et de la requête {2}
-
 CatalogManager_0 = ** Erreur du gestionnaire de catalogue : initialisation 
 CatalogManager_1 = \ n'existe pas.
 
@@ -57,28 +42,6 @@
 Corpus_5        = Pas de valeur donnée
 Corpus_8        = \ dans
 
-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 = Patch le fichier registry {0} avec {1}
-
-CwbProcess_1 = Démarrage 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 : 
-
-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
-
 Error_CONNECTION_FAILED = ** Echec de connexion au moteur de recherche avec les paramètres suivants : 
 
 FilterManager_0 = ** Erreur du gestionnaire de filtre : initialisation 
@@ -92,29 +55,8 @@
 GroovyImportScriptRunner_1 = > début de l'exécution de 
 GroovyImportScriptRunner_3 = > fin de l'exécution
 
-LEXICON = Lexique
-
 MainCorpus_0 = \ n'est pas un identifiant de corpus CQP valide. Il doit être en majuscule.
-MainCorpus_2 = Suppression du dossier de corpus binaire : 
 
-MemCqiClient_0  = Erreur interne CQi : 
-MemCqiClient_1  = Erreur 
-MemCqiClient_10 = Codes CQP inconnus : b1 
-MemCqiClient_11 = Erreur de requête
-MemCqiClient_2  = Attention 
-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 auserveur : 
-NetCqiClient_97 = client.dumpSubCorpus(subcorpus, NetCqiClient.CQI_CONST_FIELD_MATCH, 1, 2) : 
-
-NetCqiServer_0 = ** cqpserver stdout: 
-NetCqiServer_1 = ** cqpserver stderr: 
-
 Page_3 = ** URL mal formée, fichier 
 
 PartitionFocus_1 = Le focus ne doit pas être vide ou nul.
@@ -123,38 +65,15 @@
 PartitionFocus_4 = ** Nom de partition inconnu.
 
 Partition_18     = Erreur lors de la récupération de la dernière erreur CQP : 
-Partition_21     = Attention : la partition n'a pu être sauvegardée
 Partition_9      = ** Echec de la création de la partie :
 
-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 
-PatchCwbRegistry_35 = à 
-PatchCwbRegistry_4  = Ajout au corpus 
-PatchCwbRegistry_5  = de l'attribut d'alignement 
-
-Project_0  = Utiliser le nom de dossier pour générer la déclaration de corpus
-Project_1  = Le fichier de déclaration de corpus n'a pas été trouvé
-Project_10 = Project.load: erreur dans le fichier XML du workspace: 
-Project_11 = Erreur lors  de la récupération des 
-Project_14 = Erreur : le fichier 'import.xml' ne contient pas de version
-Project_15 = Erreur : la version du fichier 'import.xml' est trop ancienne pour que le corpus soit chargé
-Project_17 = Erreur : le corpus ne sera pas chargé
-Project_18 = Paramètres : 
-Project_2  = Attention, l''attribut ''name'' du corpus n''est pas défini dans la définition XML du fichier {0}.
-Project_26 = ** Erreur : le dossier d''entrée n''est pas conforme au format de corpus binaire de TXM :
+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
-Project_6  = Erreur lors du chargement du corpus avec : 
-Project_7  = Erreur lors du chargement du corpus avec : 
-Project_8  = Le fichier de paramétrage de corpus est introuvable (ou illisible). : {0}. Le corpus correspondant ne sera pas disponible. 
+Project_28     = TXM a besoin des dossiers suivants : 
+Project_31     = et le fichier
 
 QUERY = Requête sur {0} : {1} <- {2}
 
@@ -165,32 +84,6 @@
 
 QueryResult_0 = \ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
 
-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          = Chaine reçue du serveur CQi : {0}
-
-RelativeFrequency_3 = Fréquence Relative %
-
-SERVER_STOPED = Moteur de recherche arrêté
-
-STOPING_SERVER = Arrêt du moteur de recherche
-
-SUBCORPUS_CREATED = Sous-corpus {0} créé en {1} ms
-SUBCORPUS_LEXICON = Calcul du lexique du sous-corpus {0}
-SUBCORPUS_SIZE    = Calcul de la taille du sous-corpus {0}
-
 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
@@ -200,15 +93,6 @@
 
 StructuralUnitProperty_0 = ** Echec de lecture des valeurs de la propriété de structure 
 
-Subcorpus_2 = Attention : le sous-corpus n'a pu être sauvegardé.
-Subcorpus_3 = \ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
-
-Summary_13 = Erreur : text
-Summary_14 = a pour valeur  'null'
-Summary_15 = Erreur : edition a pour valeur 'null'
-Summary_16 = Erreur : textids
-Summary_17 = et wordids
-
 TSCmd_30 = La requête était : 
 TSCmd_31 = résultats trouvés
 
@@ -217,13 +101,8 @@
 
 TSCorpus_0        = Erreur : le corpus n'a pas les droits de lecture
 
-TSResult_0  = Nombre de match
-TSResult_13 = Erreur : le fichier tigerXML est introuvable : 
-TSResult_14 = Erreur : la concordance n'a pu être enregistré dans le fichier XML
-TSResult_18 = Début de l'injection
-TSResult_2  = Nombre de sous graph
-TSResult_7  = Erreur : la méthode d'export 
-TSResult_8  = est introuvable
+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
@@ -249,26 +128,17 @@
 Toolbox_37                        = kill `ps aux | grep cqpserver | awk '/-P 
 Toolbox_38                        = / {print $2}'`
 Toolbox_39                        = Echec de l'exécution de '
-Toolbox_4                         = Avec les paramètres suivants :
 Toolbox_40                        = ' :
 Toolbox_connected_to_corpus_sever = connecté.
-Toolbox_workspace_init            = Chargement des sous-corpus et des partitions...
 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
 
-TxmObject_2 = Erreur de la sauvegarde de l'attribut
-
 ValidateXml_0 = Validation XML : 
 ValidateXml_1 = est un dossier
 ValidateXml_2 = n'existe pas
 ValidateXml_3 = n'a pas les bon droits de lecture
 
-Workspace_2 = ** Echec du chargement de l'espace de travail :
-Workspace_3 = Projet : 
-Workspace_4 = \	Base : 
-Workspace_6 = ** Echec de la création du fichier d'espace de travail : 
-Workspace_8 = Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré...
-
+common_absoluteFrequency         = Fréquence absolue
 common_cols                      = Colonnes
 common_delete                    = Supprimer
 common_description               = Description
@@ -289,13 +159,12 @@
 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_error                   = ** Erreur : {0}.
+error_error2                  = Erreur
+error_errorWhileSortingResult = Erreur pendant le tri du résultat.
 
-info_creatingNewPartition  = Création d''une nouvelle partition du corpus {0} : {1}.
-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_connected = Connecté.
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 1223)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/preferences/TreeTaggerPreferencePage.java	(revision 1224)
@@ -80,9 +80,9 @@
 
 		runOptions.setLayout(new GridLayout(3, false));
 
-		// TREETAGGER TRAIN OPTIONS
+		// TREETAGGER TRAINING OPTIONS
 		Group runTrainOptions = new Group(this.getFieldEditorParent(), SWT.BORDER);
-		runTrainOptions.setText("TreeTagger Train process options");
+		runTrainOptions.setText("TreeTagger Training process options");
 		GridData gdata2 = new GridData(GridData.FILL, GridData.FILL, true, false, 3, 1);
 		runTrainOptions.setLayoutData(gdata2);
 		runTrainOptions.setLayout(new GridLayout(3, false));
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 1223)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_ru.properties	(revision 1224)
@@ -1,4 +1,3 @@
 
 TreeTaggerPreferencePage_1 = Путь к установочной папке TreeTagger
 TreeTaggerPreferencePage_2 = Путь к папке с языковыми моделами для TreeTagger
-TreeTaggerPreferencePage_3 = Опции [разделитель '  ' (2 пробела)]
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 1223)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages_fr.properties	(revision 1224)
@@ -1,5 +1,3 @@
 
-TreeTaggerPreferencePage_0 = Ne pas normaliser les apostrophes à ' 
 TreeTaggerPreferencePage_1 = Chemin du dossier d'installation
 TreeTaggerPreferencePage_2 = Chemin du dossier de modèles linguistiques
-TreeTaggerPreferencePage_3 = Options [séparées par '  ' (2 blancs)]
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 1223)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/TreeTaggerUIMessages.java	(revision 1224)
@@ -15,10 +15,8 @@
 
 	private static final String BUNDLE_NAME = "org.txm.treetagger.rcp.messages.messages"; //$NON-NLS-1$
 	
-	public static String TreeTaggerPreferencePage_0;
 	public static String TreeTaggerPreferencePage_1;
 	public static String TreeTaggerPreferencePage_2;
-	public static String TreeTaggerPreferencePage_3;
 	
 	static {
 		// initialize resource bundle
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 1223)
+++ tmp/org.txm.treetagger.rcp/src/org/txm/treetagger/rcp/messages/messages.properties	(revision 1224)
@@ -1,5 +1,3 @@
 
-TreeTaggerPreferencePage_0 = Don't normalize apostrophes to '
 TreeTaggerPreferencePage_1 = Path to install directory
 TreeTaggerPreferencePage_2 = Path to models directory
-TreeTaggerPreferencePage_3 = Options [separated by '  ' (2 spaces)]
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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/structures/SimpleSubcorpusPanel.java	(revision 1224)
@@ -17,6 +17,7 @@
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.rcp.actions.CreateSubcorpusDialog;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -89,8 +90,7 @@
 		try {
 			structuralUnits = corpus.getOrderedStructuralUnits();
 		} catch (Exception e) {
-			Log.severe(TXMUIMessages.ERROR
-					+ Log.toString(e));
+			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.error_error, Log.toString(e)));
 			return;
 		}
 
@@ -181,8 +181,7 @@
 	 */
 	protected void reloadValues() {
 		List<String> values = null;
-		selectedStructuralUnitProperty = selectableStructuralUnitProperties
-				.get(propertyCombo.getSelectionIndex());
+		selectedStructuralUnitProperty = selectableStructuralUnitProperties.get(propertyCombo.getSelectionIndex());
 		//System.out.println("Selectable su prop: "+selectableStructuralUnitProperties); //$NON-NLS-1$
 		//System.out.println("Selected line: "+propertyCombo.getSelectionIndex()); //$NON-NLS-1$
 		//System.out.println("Combo values: "+Arrays.toString(propertyCombo.getItems())); //$NON-NLS-1$
@@ -191,8 +190,7 @@
 			values = selectedStructuralUnitProperty.getOrderedValues(corpus);
 			Collections.sort(values);
 		} catch (CqiClientException e) {
-			Log.severe(TXMUIMessages.ERROR
-					+ Log.toString(e));
+			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.error_error, Log.toString(e)));
 			return;
 		}
 
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/FloatField.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/FloatField.java	(revision 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/parameters/FloatField.java	(revision 1224)
@@ -5,7 +5,9 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 import org.kohsuke.args4j.NamedOptionDef;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.rcp.messages.TXMUIMessages;
+import org.txm.utils.logger.Log;
 
 public class FloatField extends LabelField {
 	Text dt;
@@ -21,7 +23,7 @@
 		try {
 			return Float.parseFloat(dt.getText());
 		} catch (Exception e) { 
-			System.out.println(TXMUIMessages.ERROR+e.getMessage());
+			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.error_error, Log.toString(e)));
 		}
 		return null;
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ThresholdsGroup.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ThresholdsGroup.java	(revision 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/ThresholdsGroup.java	(revision 1224)
@@ -4,11 +4,8 @@
 package org.txm.rcp.swt.widget;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -19,7 +16,7 @@
 import org.txm.rcp.editors.listeners.ComputeSelectionListener;
 
 /**
- * Widget to manage shared thresholds : fmin, fmax and vmax.
+ * Widget to manage shared threshold filters : fmin, fmax and vmax.
  * 
  * @author sjacquot
  *
@@ -140,7 +137,7 @@
 		
 		// Vmax
 		this.vMaxLabel = new Label(this, SWT.NONE);
-		this.vMaxLabel.setText(TXMCoreMessages.VMAX_1);
+		this.vMaxLabel.setText(TXMCoreMessages.common_vMax);
 		this.vMaxLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		vMaxSpinner = new Spinner(this, SWT.BORDER);
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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/handlers/scripts/ExecuteGroovyText.java	(revision 1224)
@@ -27,9 +27,6 @@
 //
 package org.txm.rcp.handlers.scripts;
 
-import groovy.lang.Binding;
-import groovy.lang.GroovyShell;
-
 import java.io.File;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
@@ -41,9 +38,7 @@
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.osgi.util.NLS;
@@ -51,14 +46,15 @@
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.ide.FileStoreEditorInput;
 import org.txm.Toolbox;
-import org.txm.core.preferences.TBXPreferences;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.Application;
 import org.txm.rcp.editors.TxtEditor;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.corpora.CorporaView;
+import org.txm.utils.logger.Log;
 
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
+
 // TODO: Auto-generated Javadoc
 /**
  * execute a selection of Groovy code from the TxtEditor 
@@ -157,7 +153,7 @@
 					System.out.println("Executing text selection..."); //$NON-NLS-1$
 					long time = System.currentTimeMillis();
 					shell.evaluate(text);
-					System.out.println("Done: " + (System.currentTimeMillis() - time) + TXMUIMessages.ExecuteScript_13); //$NON-NLS-1$
+					Log.info(NLS.bind(TXMUIMessages.ExecuteScript_12, (System.currentTimeMillis() - time)));
 				} catch (ThreadDeath td) { 
 					return Status.CANCEL_STATUS;
 				} catch (CompilationFailedException e) {
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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/actions/CreatePartitionDialog.java	(revision 1224)
@@ -55,6 +55,7 @@
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Text;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.swt.widget.PartitionComposer;
 import org.txm.rcp.swt.widget.QueryWidget;
@@ -212,8 +213,7 @@
 		try {
 			structuralUnits = corpus.getOrderedStructuralUnits();
 		} catch (CqiClientException e) {
-			Log.severe(TXMUIMessages.ERROR
-					+ Log.toString(e));
+			Log.severe(TXMCoreMessages.bind(TXMCoreMessages.error_error, Log.toString(e)));
 			return null;
 		}
 		structuralUnitsFinal = new ArrayList<StructuralUnit>();
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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties	(revision 1224)
@@ -16,11 +16,8 @@
 AddBase_31 = ** Не удалось загрузить бинарный корпус: {0}
 AddBase_32 = Загрузка корпуса в платформу
 AddBase_33 = Перезагрузка платформы
-AddBase_34 = Рабочая среда TXM не инициализирована. Пожалуйста, перезагрузите TXM.
 AddBase_4  = ** Не удалось загрузить бинарный корпу (null error).
 
-AddProject_3 = Введите название проекта
-
 AdvancePreferencePage_1  = Папка установки TXM
 AdvancePreferencePage_12 = Уровень детализации отчета
 AdvancePreferencePage_13 = Добавить технический комментарий
@@ -31,40 +28,18 @@
 
 ApplicationWorkbenchAdvisor_0           = Инициализация платформы...
 ApplicationWorkbenchAdvisor_1           = Инициализация платформы...
-ApplicationWorkbenchAdvisor_11          = Загрузка демонстрационных корпусов
-ApplicationWorkbenchAdvisor_12          = ** Ошибка: переменная среды ''TXMHOME'' задана ({0}), но нет папки: 
 ApplicationWorkbenchAdvisor_16          = N/A_Removing old corpus backup directory {0}. 
 ApplicationWorkbenchAdvisor_18          = Corpora backuped: {0} 
 ApplicationWorkbenchAdvisor_2           = Загрузка опций установки TXM из: {0}
-ApplicationWorkbenchAdvisor_22          = N/A_Processing folder: 
-ApplicationWorkbenchAdvisor_23          = \ ...
-ApplicationWorkbenchAdvisor_24          = N/A_Failed moving old corpus from 
-ApplicationWorkbenchAdvisor_26          = N/A_ to 
 ApplicationWorkbenchAdvisor_27          = Рабочая папка TXM уже существует. Загрузить ранее созданные корпусы?
 ApplicationWorkbenchAdvisor_28          = Сохранение рабочей папки...
 ApplicationWorkbenchAdvisor_3           = Проверка наличия рабочей папки
 ApplicationWorkbenchAdvisor_30          = Перемещение существующих корпусов...
-ApplicationWorkbenchAdvisor_31          = ** Не удалось создать рабочее пространство 'default.xml'
 ApplicationWorkbenchAdvisor_34          = ** Ошибка: не удалсоь создать папку для сохранения корпуса
 ApplicationWorkbenchAdvisor_37          = \ в 
-ApplicationWorkbenchAdvisor_41          = ** Не удалось задать опции: {0}
-ApplicationWorkbenchAdvisor_43          = Corpora {0} not restored, since this setup provides more recent ones.
-ApplicationWorkbenchAdvisor_43_single   = Corpus {0} not restored, since this setup provides more recent ones.
 ApplicationWorkbenchAdvisor_44          = ** Невозможно перенести корпус 
-ApplicationWorkbenchAdvisor_45          = ** Файл не читается: {0}
 ApplicationWorkbenchAdvisor_47          = ** Невозможно сохранить существующие корпусы:
-ApplicationWorkbenchAdvisor_48          = \nCorpus ''{0}'' could not be restored and are moved to ''{1}''.
 ApplicationWorkbenchAdvisor_5           = Стандартный выход
-ApplicationWorkbenchAdvisor_51          = ** Не удалось загрузить корпус из файла: 
-ApplicationWorkbenchAdvisor_52          = ** Не удалось загрузить демонстрационные корпусы: {0}
-ApplicationWorkbenchAdvisor_53          = Восстановление корпусов из 
-ApplicationWorkbenchAdvisor_54          = Преобразование корпусов из формата TXM 0.5 
-ApplicationWorkbenchAdvisor_55          = \ в формат TXM 0.6.
-ApplicationWorkbenchAdvisor_56          = ** Не удалось преобразовать корпус в формат TXM 0.6
-ApplicationWorkbenchAdvisor_58          = Загрузка корпуса 0.6 
-ApplicationWorkbenchAdvisor_59          = ** Ошибка во время загрузки 
-ApplicationWorkbenchAdvisor_60          = ** Ошибка: корпус 
-ApplicationWorkbenchAdvisor_61          = \ не является бинарным корпусом TXM 0.6
 ApplicationWorkbenchAdvisor_7           = Создание рабочего пространства пользователя TXM.
 ApplicationWorkbenchAdvisor_8           = Путь установки: {0}
 ApplicationWorkbenchAdvisor_9           = ** Ошибка чтения файла опций установки
@@ -114,8 +89,6 @@
 ComplexSubcorpusPanel_4  = Запрос 
 ComplexSubcorpusPanel_5  = Обновить
 
-ComputeIndexFromLines_0 = Выполнить команду Индекс на выделении
-
 ConvertCorpus_0 = 
 
 CorporaView_0 = Корпус
@@ -134,9 +107,6 @@
 CorpusPage_42 = 4.\	Чтобы
 CorpusPage_43 = начать импортирование,
 CorpusPage_44 = \ нажмите на этот значок: 
-CorpusPage_46 = Папка с исходными материалами не содержала файл 'import.xml'. Создан новый.
-CorpusPage_47 = Ошибка при создании файла 'import.xml' 
-CorpusPage_48 = Загрузка параметров импорта из файла: 
 CorpusPage_49 = N/A_Default
 CorpusPage_5  = N/A_caract�res blancs s�parateurs
 CorpusPage_50 = Параметры модуля: 
@@ -196,7 +166,6 @@
 DeleteFile_2 = ** Не удалось удалить файл 
 
 DeleteInCorporaView_1 = ** Ошибка при удалении подкорпуса {0}
-DeleteInCorporaView_2 = ** Ошибка при удалении распределения {0}
 
 DeleteLines_0 = Таблица должна содержать хотя бы одну строчку
 
@@ -206,8 +175,6 @@
 DeleteObject_4  = Ошибка во время удаления {0} : {1}
 DeleteObject_5  = Удаление {0}
 
-ERROR = N/A_Error: 
-
 ElementTreeLabelProvider_0 = ** Ошибка: элемент не записан 
 ElementTreeLabelProvider_1 = ** Ошибка: объект не является 'org.w3c.Element'
 
@@ -226,18 +193,12 @@
 
 ExecuteGroovyScriptFromFile_2 = Скрипт Groovy должен находиться в папке {0} {1}
 
-ExecuteGroovyScript_0         = \ мс
 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' не существует: 
-ExecuteScriptImport_3 = N/A_Error: the folder {0} still exists. Cannot continue import. You can delete it manually and restart the import.
-ExecuteScriptImport_5 = ** Ошибка в параметрах словарной сегментации: импортирование прервано.
-ExecuteScriptImport_6 = Импортирование не завершено.
-ExecuteScriptImport_7 = Импортирование завершено: 
-ExecuteScriptImport_8 = ** Ошибка при загрузке корпуса
 
 ExecuteScript_3       = ** Не найдено ни одного интерпретатора для расширения файла скрипта 
 
@@ -271,7 +232,6 @@
 ExportResult_5 = ** Не удается прочитать {0}
 ExportResult_6 = ** Не удалось экспортировать результат {0}: {1}
 
-FAILED_TO_PARSE_OPTIONS    = ** Не удалось проанализировать опции TXM {0}: {1}
 FAILED_TO_SAVE_PREFERENCES = ** Не удалось сохранить персональные настройки
 
 FileExplorerPreferencePage_0 = Рег. выр. скрытых файлов
@@ -318,7 +278,6 @@
 ImportSelectedText_2  = ** Буфер обмена пуст
 ImportSelectedText_3  = Подтвердить
 ImportSelectedText_4  = Корпус {0} будет удален
-ImportSelectedText_6  = ** Внутренняя ошибка: не удается найти проект 'default' 
 
 IndexToLexicalTable_0 = Невозможно составить словарную таблицу из Индекса, полученного на Корпусе
 
@@ -438,18 +397,6 @@
 
 PropertySelector_0 = Выбрать свойство
 
-PurgeCorpora_0  = Осторожно! Эта команда приведет к удалению всех выделенных корпусов. Продолжить?
-PurgeCorpora_1  = Удаляемые корпуса 
-PurgeCorpora_10 = Создание нового рабочего пространства
-PurgeCorpora_12 = Перезагрузка платформы
-PurgeCorpora_13 = ** Ошибка: не удалось найти рабочее пространство: 
-PurgeCorpora_2  = ** Внимание! не были удалены корпуса: 
-PurgeCorpora_3  = Осторожно! Эта команда приведет к удалению всех корпусов. Продолжить?
-PurgeCorpora_4  = ** Ошибка: переменная окружения 'TXMHOME' не задана (ее значение по умолчанию -  '$HOME/TXM'). Работа прекращена.
-PurgeCorpora_5  = Удаление всех корпусов
-PurgeCorpora_7  = ** Не удалось удалить корпуса
-PurgeCorpora_9  = ** Не удалось удалить регистр
-
 QueriesView_1  = Экспортировать всё
 QueriesView_10 = ошибка: 
 QueriesView_5  = Запросы:\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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 1224)
@@ -19,11 +19,8 @@
 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_34 = L'espace de travail de TXM n'est pas initialisé, veuillez redémarrer TXM.
 AddBase_4  = ** Échec de chargement du corpus binaire(null error).
 
-AddProject_3 = Saisissez le nom du projet
-
 AdvancePreferencePage_0  = Afficher la stacktrace
 AdvancePreferencePage_1  = Dossier d'installation de TXM
 AdvancePreferencePage_12 = Niveau de détails du journal
@@ -37,42 +34,18 @@
 
 ApplicationWorkbenchAdvisor_0           = Initialisation de la plateforme...
 ApplicationWorkbenchAdvisor_1           = Initialisation de la plateforme...
-ApplicationWorkbenchAdvisor_11          = Chargement des corpus d'exemple 
-ApplicationWorkbenchAdvisor_12          = ** Erreur : la variable d''environnement ''TXMHOME'' est bien définie ({0}) mais le dossier n''existe pas : 
 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_22          = Traitement du dossier : 
-ApplicationWorkbenchAdvisor_23          = \ ...
-ApplicationWorkbenchAdvisor_24          = Erreur lors du déplacement du corpus depuis  
-ApplicationWorkbenchAdvisor_26          = \ vers  
 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_31          = ** Échec de la création de l'espace de travail 'default.xml'
 ApplicationWorkbenchAdvisor_34          = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé
 ApplicationWorkbenchAdvisor_37          = \ vers 
-ApplicationWorkbenchAdvisor_41          = ** Échec de réglage des préférences : {0}
-ApplicationWorkbenchAdvisor_43          = Les corpus {0} ont été mis à jour avec une version plus récente.
-ApplicationWorkbenchAdvisor_43_single   = Le corpus {0} a été mis à jour avec une version plus récente.
 ApplicationWorkbenchAdvisor_44          = ** Impossible de déplacer le corpus 
-ApplicationWorkbenchAdvisor_45          = ** Impossible de lire le fichier {0}
 ApplicationWorkbenchAdvisor_47          = ** Impossible de sauvegarder les corpus existants : 
-ApplicationWorkbenchAdvisor_48          = \nCorpus ''{0}'' non restauré et déplacé vers ''{1}''
 ApplicationWorkbenchAdvisor_5           = Sortie standard
-ApplicationWorkbenchAdvisor_51          = ** Échec du chargement du corpus depuis le fichier : 
-ApplicationWorkbenchAdvisor_52          = ** Échec du chargement des corpus d''exemple : {0}
-ApplicationWorkbenchAdvisor_53          = Rechargement des corpus existants depuis le dossier ''{0}''.
-ApplicationWorkbenchAdvisor_54          = Conversion du corpus au format TXM 0.5 
-ApplicationWorkbenchAdvisor_55          = \ au format TXM 0.6.
-ApplicationWorkbenchAdvisor_56          = ** Échec de la conversion du corpus au format TXM 0.6
-ApplicationWorkbenchAdvisor_58          = Chargement du corpus 0.6 
-ApplicationWorkbenchAdvisor_59          = ** Erreur lors du chargement de 
-ApplicationWorkbenchAdvisor_60          = ** Erreur : le répertoire 
-ApplicationWorkbenchAdvisor_61          = \ n'est pas un corpus binaire.
-ApplicationWorkbenchAdvisor_68          = Mise en place du thème par défaut
-ApplicationWorkbenchAdvisor_69          = Erreur lors du chargement du thème : 
 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
@@ -136,8 +109,6 @@
 ComputeCooccurrences_0 = Chargement du tableau de cooccurrents
 ComputeCooccurrences_1 = ** Impossible de calculer les cooccurrents de la sélection
 
-ComputeIndexFromLines_0 = Envoyer la sélection vers la commande Index
-
 ConvertCorpus_0 = La conversion du corpus a échoué.
 
 CorporaView_0 = Corpus
@@ -162,9 +133,6 @@
 CorpusPage_42  = 3.\	
 CorpusPage_43  = Lancer l'import du corpus.
 CorpusPage_44  = Construire l'édition
-CorpusPage_46  = Le dossier des sources ne contient pas de fichier 'import.xml'. Un nouveau a été créé.
-CorpusPage_47  = Erreur lors de la création du fichier 'import.xml' 
-CorpusPage_48  = Chargement des paramètres d'import depuis le fichier : 
 CorpusPage_49  = Défaut
 CorpusPage_5   = Espaces
 CorpusPage_50  = Paramètres du module : 
@@ -232,7 +200,6 @@
 DeleteFile_2 = ** Échec de la suppression du fichier 
 
 DeleteInCorporaView_1 = ** Erreur lors de la suppression du sous-corpus {0}
-DeleteInCorporaView_2 = ** Erreur lors de la suppression de la partition {0}
 
 DeleteLines_0 = Le tableau doit comporter au moins une ligne
 
@@ -242,8 +209,6 @@
 DeleteObject_4  = Erreur lors de la suppression de {0} : {1}
 DeleteObject_5  = Suppression de {0}
 
-ERROR = Erreur : 
-
 ElementTreeLabelProvider_0 = ** Erreur : élément non enregistré 
 ElementTreeLabelProvider_1 = ** Erreur: l'objet n'est pas un 'org.w3c.Element'
 
@@ -262,26 +227,16 @@
 
 ExecuteGroovyScriptFromFile_2 = Le script Groovy {1} doit être dans le dossier {0}
 
-ExecuteGroovyScript_0         = \ ms
 ExecuteGroovyScript_1         = Erreur lors de l'initialisation des paramètres
 ExecuteGroovyScript_2         = L'utilisateur a intérompu l'exécution du script
 
-ExecuteRScript_11 = Exécution de {0}
-ExecuteRScript_12 = Terminé : 
-ExecuteRScript_13 = \ ms
-
 ExecuteScriptImport_0 = Début de l'importation
-ExecuteScriptImport_1 = ** Le fichier de script {0} n''existe pas
+ExecuteScriptImport_1 = ** Le fichier de script {0} n''existe pas
 ExecuteScriptImport_2 = ** Erreur: le dossier 'corpora' n'existe pas : 
-ExecuteScriptImport_3 = Erreur: le dossier {0} n''a pu être supprimé et existe toujours. L''import est interrompu. Vous pouvez supprimer manuellement le dossier et recommencer l''import
-ExecuteScriptImport_5 = ** Erreur de paramètres du Tokenizer : abandon de l'import.
-ExecuteScriptImport_6 = L'import n'a pas abouti.
-ExecuteScriptImport_7 = Importation terminée : 
-ExecuteScriptImport_8 = ** Erreur lors du chargement du corpus
 
 ExecuteScript_0       = Exécution de {0} ...
-ExecuteScript_1       = Sauver le fichier avant d'exécuter ?
-ExecuteScript_11      = Exécution Groovy...
+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 
@@ -325,7 +280,6 @@
 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_PARSE_OPTIONS    = ** Échec de l''analyse des options de TXM {0} : {1}
 FAILED_TO_SAVE_PREFERENCES = ** Échec de la sauvegarde des préférences
 
 FileExplorerPreferencePage_0 = Exp. Rég. des fichiers cachés
@@ -373,7 +327,6 @@
 ImportSelectedText_2  = ** Le presse-papier est vide
 ImportSelectedText_3  = Confirmer
 ImportSelectedText_4  = Le corpus {0} va être supprimé
-ImportSelectedText_6  = ** Erreur interne : impossible de trouver le projet 'default' 
 
 IndexToLexicalTable_0 = Impossible de créer une table lexicale à partir d'un Index créé sur un Corpus
 
@@ -495,18 +448,6 @@
 
 PropertySelector_0 = Sélectionner une propriété
 
-PurgeCorpora_0  = Attention ! Cette commande va supprimer tous les corpus sélectionnés. Continuer ?
-PurgeCorpora_1  = Corpus à supprimer 
-PurgeCorpora_10 = Création d'un nouvel espace de travail
-PurgeCorpora_12 = Redémarrage de la plateforme
-PurgeCorpora_13 = ** Erreur : espace de travail introuvable : 
-PurgeCorpora_2  = ** Attention : corpus non supprimés : 
-PurgeCorpora_3  = Attention ! Cette commande va supprimer tous les corpus. Continuer ?
-PurgeCorpora_4  = ** Erreur : la variable d'environnement 'TXMHOME' n'est pas configurée (sa valeur standard est '$HOME/TXM'). Abandon.
-PurgeCorpora_5  = Supprime tous les corpus
-PurgeCorpora_7  = ** Échec de la suppression des corpus
-PurgeCorpora_9  = ** Échec de la suppression du registre
-
 QueriesView_1  = Tout exporter
 QueriesView_10 = Erreur : 
 QueriesView_5  = Requêtes :\n
@@ -531,17 +472,14 @@
 
 RestartTXM_1 = Redémarrer TXM
 
-RunGroovyScript_0  = Exécution du script
-RunGroovyScript_1  = &Exécuter un script
-RunGroovyScript_10 = Répertoire de sources :
-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
+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
 
-SEARCH = &Искать
-
 SORT_COLUMN = Tri de la colonne...
 SORT_DONE   = Tri terminé.
 
@@ -606,9 +544,7 @@
 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_save_error                = Erreur, les parametres des plans textuels ne sont pas enregistrés.
 TextualPlansSection_title                     = Plans textuels
-TextualPlansSection_update_error              = Erreur, les parametres des plans textuels ne sont pas chargés.
 
 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
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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 1224)
@@ -8,13 +8,79 @@
 	
 	private static final String BUNDLE_NAME = "org.txm.rcp.messages.messages"; //$NON-NLS-1$
 	
+
+
+	public static String common_areYouSure;
+	public static String common_beginning;
+	public static String common_displayOptions;
+	public static String common_end;
+	public static String common_enterRegularExpressionOfYourSearch;
+	public static String common_refresh;
+	
+	public static String error_invalidRegularExpression;
+	
+	public static String info_txmIsReady;
+	
 	public static String preferences_advanced_enableResultsPersistence;
 	public static String preferences_advanced_showAllResultNodesInCorporaView;
+
+
 	
 	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
 	public static String About_Menu_Label;
 	public static String AdapterFactory_0;
-	public static String info_txmIsReady;
 	public static String AddBase_17;
 	public static String AddBase_19;
 	public static String AddBase_1;
@@ -28,9 +94,7 @@
 	public static String AddBase_31;
 	public static String AddBase_32;
 	public static String AddBase_33;
-	public static String AddBase_34;
 	public static String AddBase_4;
-	public static String AddProject_3;
 	public static String AdvancePreferencePage_0;
 	public static String AdvancePreferencePage_12;
 	public static String AdvancePreferencePage_13;
@@ -49,45 +113,20 @@
 	public static String Application_8;
 	public static String Application_9;
 	public static String ApplicationWorkbenchAdvisor_0;
-	public static String ApplicationWorkbenchAdvisor_11;
-	public static String ApplicationWorkbenchAdvisor_12;
-
 	public static String ApplicationWorkbenchAdvisor_16;
 	public static String ApplicationWorkbenchAdvisor_18;
 	public static String ApplicationWorkbenchAdvisor_1;
 	public static String ApplicationWorkbenchAdvisor_21;
-	public static String ApplicationWorkbenchAdvisor_22;
-	public static String ApplicationWorkbenchAdvisor_23;
-	public static String ApplicationWorkbenchAdvisor_24;
-	public static String ApplicationWorkbenchAdvisor_26;
 	public static String ApplicationWorkbenchAdvisor_27;
 	public static String ApplicationWorkbenchAdvisor_28;
 	public static String ApplicationWorkbenchAdvisor_2;
 	public static String ApplicationWorkbenchAdvisor_30;
-	public static String ApplicationWorkbenchAdvisor_31;
 	public static String ApplicationWorkbenchAdvisor_34;
 	public static String ApplicationWorkbenchAdvisor_37;
 	public static String ApplicationWorkbenchAdvisor_3;
-	public static String ApplicationWorkbenchAdvisor_41;
-	public static String ApplicationWorkbenchAdvisor_43;
-	public static String ApplicationWorkbenchAdvisor_43_single;
 	public static String ApplicationWorkbenchAdvisor_44;
-	public static String ApplicationWorkbenchAdvisor_45;
 	public static String ApplicationWorkbenchAdvisor_47;
-	public static String ApplicationWorkbenchAdvisor_48;
-	public static String ApplicationWorkbenchAdvisor_51;
-	public static String ApplicationWorkbenchAdvisor_52;
-	public static String ApplicationWorkbenchAdvisor_53;
-	public static String ApplicationWorkbenchAdvisor_54;
-	public static String ApplicationWorkbenchAdvisor_55;
-	public static String ApplicationWorkbenchAdvisor_56;
-	public static String ApplicationWorkbenchAdvisor_58;
-	public static String ApplicationWorkbenchAdvisor_59;
 	public static String ApplicationWorkbenchAdvisor_5;
-	public static String ApplicationWorkbenchAdvisor_60;
-	public static String ApplicationWorkbenchAdvisor_61;
-	public static String ApplicationWorkbenchAdvisor_68;
-	public static String ApplicationWorkbenchAdvisor_69;
 	public static String ApplicationWorkbenchAdvisor_72;
 	public static String ApplicationWorkbenchAdvisor_73;
 	public static String ApplicationWorkbenchAdvisor_74;
@@ -150,7 +189,6 @@
 	public static String ComputeCoocMatrix_3;
 	public static String ComputeCoocMatrix_4;
 	public static String ComputeCoocMatrix_7;
-	public static String ComputeIndexFromLines_0;
 	public static String ConvertCorpus_0;
 	public static String CorporaView_0;
 	public static String CorporaView_3;
@@ -172,9 +210,6 @@
 	public static String CorpusPage_42;
 	public static String CorpusPage_43;
 	public static String CorpusPage_44;
-	public static String CorpusPage_46;
-	public static String CorpusPage_47;
-	public static String CorpusPage_48;
 	public static String CorpusPage_49;
 	public static String CorpusPage_4;
 	public static String CorpusPage_50;
@@ -190,9 +225,6 @@
 	public static String CorpusPage_6;
 	public static String CorpusPage_7;
 	public static String CorpusPage_8;
-	public static String CorpusPage_90;
-	public static String CorpusPage_91;
-	public static String CorpusPage_92;
 	public static String CorpusPage_93;
 	public static String CorpusPage_9;
 	public static String CreateFile_1;
@@ -240,9 +272,7 @@
 	public static String DeleteFile_0;
 	public static String DeleteFile_2;
 	public static String DeleteInCorporaView_1;
-	public static String DeleteInCorporaView_2;
 	public static String DeleteLines_0;
-	public static String common_areYouSure;
 	public static String DeleteObject_0;
 	public static String DeleteObject_10;
 	public static String DeleteObject_3;
@@ -261,9 +291,7 @@
 	public static String EmpantWidget_7;
 	public static String EmpantWidget_8;
 	public static String EmpantWidget_9;
-	public static String ERROR;
 	public static String Error_creating_partition;
-	public static String ExecuteGroovyScript_0;
 	public static String ExecuteGroovyScript_1;
 	public static String ExecuteGroovyScript_2;
 	public static String ExecuteGroovyScript_9;
@@ -271,8 +299,9 @@
 	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;
@@ -280,17 +309,9 @@
 	public static String ExecuteScript_5;
 	public static String ExecuteScript_6;
 	public static String ExecuteScript_7;
-	public static String ExecuteScript_11;
-	public static String ExecuteScript_12;
-	public static String ExecuteScript_13;
 	public static String ExecuteScriptImport_0;
 	public static String ExecuteScriptImport_1;
 	public static String ExecuteScriptImport_2;
-	public static String ExecuteScriptImport_3;
-	public static String ExecuteScriptImport_5;
-	public static String ExecuteScriptImport_6;
-	public static String ExecuteScriptImport_7;
-	public static String ExecuteScriptImport_8;
 	public static String Exit_Menu_Label;
 	public static String Explorer_0;
 	public static String Explorer_1;
@@ -319,7 +340,6 @@
 	public static String ExportResult_6;
 	public static String ExportSVG_1;
 	public static String ExportSVG_3;
-	public static String FAILED_TO_PARSE_OPTIONS;
 	public static String FAILED_TO_SAVE_PREFERENCES;
 	public static String FileExplorerPreferencePage_0;
 	public static String FileExplorerPreferencePage_1;
@@ -362,7 +382,6 @@
 	public static String ImportSelectedText_2;
 	public static String ImportSelectedText_3;
 	public static String ImportSelectedText_4;
-	public static String ImportSelectedText_6;
 	public static String IndexToLexicalTable_0;
 	public static String InternalCorpusView_0;
 	public static String InternalCorpusView_1;
@@ -388,13 +407,6 @@
 	public static String LanguageSwitchHandler_7;
 	public static String LastCQPError;
 	public static String LineLabelProvider_1;
-	public static String LoadBinaryCorpus_10;
-	public static String LoadBinaryCorpus_11;
-	public static String LoadBinaryCorpus_12;
-	public static String LoadBinaryCorpus_13;
-	public static String LoadBinaryCorpus_14;
-	public static String LoadBinaryCorpus_15;
-	public static String LoadBinaryCorpus_4;
 	public static String LocalePreferencePage_1;
 	public static String LocalePreferencePage_2;
 	public static String MacrosExplorer_0;
@@ -416,7 +428,6 @@
 	public static String MergeLines_2;
 	public static String MetadataPage_1;
 	public static String MetadataPage_2;
-	public static String common_refresh;
 	public static String MetadataPage_4;
 	public static String MetadataPage_5;
 	public static String MetadataPage_7;
@@ -425,7 +436,6 @@
 	public static String NumberOfLines;
 	public static String ObjectSelectionDialog_0;
 	public static String ObjectSelectionDialog_3;
-	public static String error_invalidRegularExpression;
 	public static String ObjectSelector_0;
 	public static String ObjectSelector_1;
 	public static String OpenBiblio_1;
@@ -461,17 +471,6 @@
 	public static String PropertiesSelector_1;
 	public static String PropertiesSelector_2;
 	public static String PropertySelector_0;
-	public static String PurgeCorpora_0;
-	public static String PurgeCorpora_10;
-	public static String PurgeCorpora_12;
-	public static String PurgeCorpora_13;
-	public static String PurgeCorpora_1;
-	public static String PurgeCorpora_2;
-	public static String PurgeCorpora_3;
-	public static String PurgeCorpora_4;
-	public static String PurgeCorpora_5;
-	public static String PurgeCorpora_7;
-	public static String PurgeCorpora_9;
 	public static String QueriesView_10;
 	public static String QueriesView_1;
 	public static String QueriesView_5;
@@ -492,7 +491,6 @@
 	public static String RenameFile_3;
 	public static String RestartTXM_1;
 	public static String RunGroovyScript_0;
-	public static String RunGroovyScript_10;
 	public static String RunGroovyScript_1;
 	public static String RunGroovyScript_2;
 	public static String RunGroovyScript_3;
@@ -534,7 +532,6 @@
 	public static String TablableVector_0;
 	public static String TableEditor_0;
 	public static String TableKeyListener_0;
-	public static String common_enterRegularExpressionOfYourSearch;
 	public static String TableKeyListener_6;
 	public static String TableSorter_0;
 	public static String TextometriePreferencePage_0;
@@ -546,36 +543,26 @@
 	public static String TextualPlansSection_outsidetext_tooltip;
 	public static String TextualPlansSection_outsidetexttoedit_label;
 	public static String TextualPlansSection_outsidetexttoedit_tooltip;
-	public static String TextualPlansSection_save_error;
 	public static String TextualPlansSection_title;
-	public static String TextualPlansSection_update_error;
-	public static String common_beginning;
 	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 common_end;
 	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 common_displayOptions;
-	public static String SEARCH;
 
+
 	
 	static {
 		// initialize resource bundle
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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 1224)
@@ -19,11 +19,8 @@
 AddBase_31 = ** Could not unzip binary corpus:
 AddBase_32 = Loading the corpus in the platform
 AddBase_33 = Restarting the platform
-AddBase_34 = TXM workspace is not initialized, please restart TXM.
 AddBase_4  = ** Failed to load binary corpus (null error).
 
-AddProject_3 = Enter project name
-
 AdvancePreferencePage_0  = Print the stacktrace
 AdvancePreferencePage_1  = TXM Install directory
 AdvancePreferencePage_12 = Log level
@@ -37,43 +34,19 @@
 
 ApplicationWorkbenchAdvisor_0           = Initializing platform...
 ApplicationWorkbenchAdvisor_1           = Initialization of the platform
-ApplicationWorkbenchAdvisor_11          = Loading sample corpora
-ApplicationWorkbenchAdvisor_12          = ** Error: ''TXMHOME'' environment variable is set ({0}), but the directory doesn''t exist:
 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_22          = Processing folder:
-ApplicationWorkbenchAdvisor_23          = \ ...
-ApplicationWorkbenchAdvisor_24          = Failed moving old corpus from
-ApplicationWorkbenchAdvisor_26          = \ to
 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_31          = ** Failed to create TXM default.xml workspace
 ApplicationWorkbenchAdvisor_34          = ** Could not create backup directory :
 ApplicationWorkbenchAdvisor_37          = \ to
-ApplicationWorkbenchAdvisor_41          = Failed to set preferences: {0}
-ApplicationWorkbenchAdvisor_43          = Corpora {0} not restored, since this setup provides more recent ones.
-ApplicationWorkbenchAdvisor_43_single   = Corpus {0} not restored, since this setup provides more recent ones.
 ApplicationWorkbenchAdvisor_44          = ** Failed to move corpus
-ApplicationWorkbenchAdvisor_45          = ** Failed to read file {0}
 ApplicationWorkbenchAdvisor_47          = ** Failed to backup existing corpora:
-ApplicationWorkbenchAdvisor_48          = \nCorpus ''{0}'' could not be restored and are moved to ''{1}''.
 ApplicationWorkbenchAdvisor_5           = System Output
-ApplicationWorkbenchAdvisor_51          = ** Failed to load corpus from file:
-ApplicationWorkbenchAdvisor_52          = ** Failed to load sample corpora: {0}
-ApplicationWorkbenchAdvisor_53          = Restoring corpora from folder ''{0}''
-ApplicationWorkbenchAdvisor_54          = Converting TXM 0.5 format corpus
-ApplicationWorkbenchAdvisor_55          = \ to TXM 0.6 format.
-ApplicationWorkbenchAdvisor_56          = ** Failed to convert corpus to TXM 0.6 format
-ApplicationWorkbenchAdvisor_58          = Loading 0.6 corpus
-ApplicationWorkbenchAdvisor_59          = ** Error while loading
-ApplicationWorkbenchAdvisor_60          = ** Error: the 
-ApplicationWorkbenchAdvisor_61          = \ directory is not a binary corpus
-ApplicationWorkbenchAdvisor_68          = Setting default TXM theme
-ApplicationWorkbenchAdvisor_69          = Failed to set default CSS theme:
 ApplicationWorkbenchAdvisor_7           = Creating TXM user working directory.
 ApplicationWorkbenchAdvisor_72          = Start job: load install preferences
 ApplicationWorkbenchAdvisor_73          = Start job: check TXMHOME
@@ -157,8 +130,6 @@
 ComputeCooccurrences_0 = Opening cooccurrents table
 ComputeCooccurrences_1 = cannot compute cooccurrences with the selection
 
-ComputeIndexFromLines_0 = Send selection to Index
-
 ConvertCorpus_0 = Corpus conversion failed.
 
 CorporaView_0 = Corpus
@@ -183,9 +154,6 @@
 CorpusPage_42  = 3.\	
 CorpusPage_43  = Start corpus import.
 CorpusPage_44  = Build edition
-CorpusPage_46  = The source directory does not contain import.xml. Creating a new one.
-CorpusPage_47  = Error while creating 'import.xml' file
-CorpusPage_48  = Load import parameters from file:
 CorpusPage_49  = Default
 CorpusPage_5   = Spaces
 CorpusPage_50  = module UI parameters:
@@ -201,9 +169,6 @@
 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_90  = Error: the selected file is not a directory: 
-CorpusPage_91  = Error: can not read the selected file: 
-CorpusPage_92  = Error: corpus name is invalid (remove special characters and punctuation ; must not with a number): 
 CorpusPage_93  = Import stopped: corpus name does not matches the '[A-Z][-A-Z0-9]{1,20}' pattern: 
 
 CreateFile_1 = New file: {0}
@@ -261,7 +226,6 @@
 DeleteFile_2 = ** Failed to delete file
 
 DeleteInCorporaView_1 = ** Failed to delete subcorpus {0}
-DeleteInCorporaView_2 = ** Failed to delete partition {0}
 
 DeleteLines_0 = The table must contain at least one line
 
@@ -273,8 +237,6 @@
 
 DownloadJobHandler_0 = Downloading...
 
-ERROR = Error:
-
 ElementTreeLabelProvider_0 = ** Error: element not registered
 ElementTreeLabelProvider_1 = ** Error: object is not an 'org.w3c.Element'
 
@@ -293,7 +255,6 @@
 
 ExecuteGroovyScriptFromFile_2 = The {1} Groovy script must be in the {0} folder. 
 
-ExecuteGroovyScript_0         = \ ms
 ExecuteGroovyScript_1         = Error during parameters initialisation
 ExecuteGroovyScript_2         = The user canceled the script execution
 ExecuteGroovyScript_9         = Error during script execution: 
@@ -302,22 +263,13 @@
 ExecuteLastGroovyScript_1 = Executing last script: 
 ExecuteLastGroovyScript_3 = Error: Current Groovy script directory does not exist: 
 
-ExecuteRScript_11 = Running {0}
-ExecuteRScript_12 = Done:
-ExecuteRScript_13 = \ ms
-
 ExecuteScriptImport_0 = Import started
 ExecuteScriptImport_1 = ** {0} script file doesn''t exist
 ExecuteScriptImport_2 = ** Error: 'corpora' directory doesn't exist:
-ExecuteScriptImport_3 = Error: the folder {0} still exists. Cannot continue import. You can delete it manually and restart the import.
-ExecuteScriptImport_5 = ** Tokenizer parameters error: import aborted.
-ExecuteScriptImport_6 = The import process failed.
-ExecuteScriptImport_7 = Import done:
-ExecuteScriptImport_8 = ** Error while loading corpus
 
 ExecuteScript_0       = Execution of {0}
-ExecuteScript_1       = Save file before execution ?
-ExecuteScript_11      = Executing Groovy script...
+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
@@ -361,7 +313,6 @@
 ExportSVG_1 = {1} file saved in {0}
 ExportSVG_3 = Failed to export file {0} with device {1}
 
-FAILED_TO_PARSE_OPTIONS    = Failed to parse TXM options {0}: {1}
 FAILED_TO_SAVE_PREFERENCES = Failed to save preferences:
 
 FileExplorerPreferencePage_0 = Regexp pattern to hide files
@@ -415,7 +366,6 @@
 ImportSelectedText_2  = ** Clipboard is empty
 ImportSelectedText_3  = Confirm
 ImportSelectedText_4  = The corpus  and the corpus {0} will be deleted
-ImportSelectedText_6  = ** Internal error: ImportSelectedText failed to get default project
 
 IndexToLexicalTable_0 = Cannot create a Lexical Table from an Index created with a Corpus (more than one column is needed)
 
@@ -450,14 +400,6 @@
 
 LineLabelProvider_1 = Should not happen
 
-LoadBinaryCorpus_10 = The new binary corpus '
-LoadBinaryCorpus_11 = ' could not be loaded.
-LoadBinaryCorpus_12 = Restoring previous corpus...
-LoadBinaryCorpus_13 = Failed to delete corrupted corpus: 
-LoadBinaryCorpus_14 = . Could not restore 
-LoadBinaryCorpus_15 = Failed to restore backup corpus: 
-LoadBinaryCorpus_4  = Failed to get the new binary corpus
-
 LocalePreferencePage_1 = Configuration of the user interface language
 LocalePreferencePage_2 = User interface language
 
@@ -546,18 +488,6 @@
 
 PropertySelector_0 = Select a property
 
-PurgeCorpora_0  = Warning! this command will delete the selected corpora, Continue ?
-PurgeCorpora_1  = Corpora to delete
-PurgeCorpora_10 = Creating new workspace
-PurgeCorpora_12 = Restarting platform
-PurgeCorpora_13 = ** Error: could not find workspace:
-PurgeCorpora_2  = ** Warning: Failed to delete corpora:
-PurgeCorpora_3  = Warning! this command will delete all your corpora, Continue ?
-PurgeCorpora_4  = ** Error: 'TXMHOME' environment variable is not set (its standard value is '$HOME/TXM'). Aborting
-PurgeCorpora_5  = Delete all corpora
-PurgeCorpora_7  = ** Failed to delete corpora
-PurgeCorpora_9  = ** Failed to delete registry
-
 QueriesView_1  = Export all
 QueriesView_10 = Error with element {0}
 QueriesView_5  = Queries:\n
@@ -582,17 +512,14 @@
 
 RestartTXM_1 = Restart TXM
 
-RunGroovyScript_0  = Script execution
-RunGroovyScript_1  = &Run script
-RunGroovyScript_10 = Sources folder:
-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
+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
 
-SEARCH = &Search
-
 SORT_COLUMN = Sorting column...
 SORT_DONE   = Sort done.
 
@@ -667,9 +594,7 @@
 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_save_error                = Textual plan parameters not saved.
 TextualPlansSection_title                     = Textual planes
-TextualPlansSection_update_error              = Textual plan section parameters not updated.
 
 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
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 1223)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/input/AbstractSVGGraphicable.java	(revision 1224)
@@ -39,45 +39,36 @@
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.utils.logger.Log;
 
-// TODO: Auto-generated Javadoc
 /**
- * Define a tab displaying a graphics in a multi-tab editor.
+ * Defines a tab displaying a graphics in a multi-tab editor.
  * 
  * @author sloiseau
  * 
  */
-public abstract class AbstractSVGGraphicable extends AbstractEditorInput
-		implements SVGGraphicable {
+public abstract class AbstractSVGGraphicable extends AbstractEditorInput implements SVGGraphicable {
 
 	/** The path. */
 	protected IPath path;
 
 	/**
-	 * Create and write the desired SVG Graphic in the given file object.
+	 * Creates and writes the desired SVG Graphic in the given file object.
 	 *
 	 * @param file the file
 	 */
 	abstract public void doSVGGraphic(File file);
 
-	/* (non-Javadoc)
-	 * @see org.txm.rcp.editors.SVGGraphicable#getIPath()
-	 */
 	@Override
 	public IPath getIPath() {
 		if (this.path == null) {
 			File tmp = null;
 			try {
-				String txmhome = Toolbox.getTxmHomePath();
-				File resultDir = new File(txmhome, "results"); //$NON-NLS-1$
+				File resultDir = new File(Toolbox.getTxmHomePath(), "results"); //$NON-NLS-1$
 				resultDir.mkdirs();
 				tmp = File.createTempFile("txm", ".svg", resultDir); //$NON-NLS-1$ //$NON-NLS-2$
-			} catch (IOException e) {
-				Log.severe(TXMUIMessages.CANT_CREATE_GRAPHIC + e);
-			}
 			// System.out.println(tmp.getAbsolutePath());
 			doSVGGraphic(tmp);
-			try {
-				this.path = Path.fromOSString(tmp.getCanonicalPath());
+			this.path = Path.fromOSString(tmp.getCanonicalPath());
+			
 			} catch (IOException e) {
 				Log.severe(TXMUIMessages.CANT_CREATE_GRAPHIC + e);
 			}
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 1223)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages.properties	(revision 1224)
@@ -3,17 +3,14 @@
 
 DetailsFromPartition = Index:\n\	Partition {0}\n\	query {1}\n\	properties {2}\n\	Fmin {3}\n\	Fmax {4}
 
-Index_0 = ** Error while computing lexicon:\n 
 Index_1 = Console : 
 Index_7 = ** Failed to export Lexicon : 
 
 LEXICON_RESULT_TYPE = Lexicon
 
-LexiconDetailsFromCorpus = Lexicon:\n\	Corpus {0}\n\	query {1}\n\	properties {2}\n\	Fmin {3}\n\	Fmax {4}
+Lexicon_0 = Forms and frequencies tables must have the same size.
+Lexicon_3 = Lexicon: 
 
-LexiconDetailsFromPartition = Lexicon:\n\	Partition {0}\n\	query {1}\n\	properties {2}\n\	Fmin {3}\n\	Fmax {4}
-
-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}...
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 1223)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/IndexCoreMessages.java	(revision 1224)
@@ -24,13 +24,8 @@
 
 	public static String Lexicon_0;
 	public static String Lexicon_3;
-	public static String LexiconDetailsFromPartition;
-	public static String LexiconDetailsFromCorpus;
+	public static String SUBCORPUS_LEXICON;
 
-	//FIXME unused key
-	public static String Index_0;
-	//end of fixme
-	
 	static {
 		// initialize resource bundle
 		Utf8NLS.initializeMessages(BUNDLE_NAME, IndexCoreMessages.class);
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 1223)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_ru.properties	(revision 1224)
@@ -5,8 +5,4 @@
 
 LEXICON_RESULT_TYPE = Словарь
 
-LexiconDetailsFromCorpus = Словарь:\n\	Корпус {0}\n\	Запрос {1}\n\	Свойства {2}\n\	Fmin {3}\n\	Fmax {4}
-
-LexiconDetailsFromPartition = Словарь:\n\	Распределение {0}\n\	Запрос {1}\n\	Свойства {2}\n\	Fmin {3}\n\	Fmax {4}
-
 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 1223)
+++ tmp/org.txm.index.core/src/org/txm/index/core/messages/messages_fr.properties	(revision 1224)
@@ -3,17 +3,14 @@
 
 DetailsFromPartition = Index:\n\	Partition {0}\n\	Requête {1}\n\	propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
 
-Index_0 = ** Erreur lors du calcul du lexique : \n
 Index_1 = console : 
 Index_7 = ** Echec de l'exportation du Lexique : 
 
 LEXICON_RESULT_TYPE = Lexique
 
-LexiconDetailsFromCorpus = Lexique :\n\	Corpus {0}\n\	Requête {1}\n\	Propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
+Lexicon_0 = Le tableau des formes et des fréquences doivent avoir la même longueur.
+Lexicon_3 = Lexique :
 
-LexiconDetailsFromPartition = Lexique :\n\	Partition {0}\n\	Requête {1}\n\	Propriétés {2}\n\	Fmin {3}\n\	Fmax {4}
-
-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}...
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 1223)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Lexicon.java	(revision 1224)
@@ -235,7 +235,7 @@
 	protected boolean computewithSubCorpus(Subcorpus corpus, Property property, IProgressMonitor monitor) throws CqiClientException {
 
 		//System.out.println("not found");
-		Log.finest(TXMCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
+		Log.finest(IndexCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
 		//long start = System.currentTimeMillis();
 		int[][] fdist = null;
 		AbstractCqiClient cqi = CorpusManager.getCorpusManager().getCqiClient();
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 1223)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/___Lexicon2.java	(revision 1224)
@@ -238,7 +238,7 @@
 //		}
 		
 		//System.out.println("not found");
-		Log.finest(TXMCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
+		Log.finest(IndexCoreMessages.SUBCORPUS_LEXICON + corpus.getName());
 		//long start = System.currentTimeMillis();
 		int[][] fdist = null;
 		Subcorpus tmp = null;
